From e416a5092417e5cfae0f96dae98c7b976b693c3c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 3 Sep 2019 12:03:07 +0200
Subject: [PATCH 001/257] MOBILE-3139 core: Unlock plugin and libraries
 versions

---
 config.xml   |  42 ++++++-------
 package.json | 170 +++++++++++++++++++++++++--------------------------
 2 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/config.xml b/config.xml
index 1ab1ad371..d1681d129 100644
--- a/config.xml
+++ b/config.xml
@@ -113,33 +113,33 @@
         <icon height="1024" src="resources/ios/icon/icon-1024.png" width="1024" />
         <splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
     </platform>
-    <plugin name="com-darryncampbell-cordova-plugin-intent" spec="1.1.8" />
-    <plugin name="cordova-android-support-gradle-release" spec="3.0.1">
+    <plugin name="com-darryncampbell-cordova-plugin-intent" spec="^1.1.8" />
+    <plugin name="cordova-android-support-gradle-release" spec="^3.0.1">
         <variable name="ANDROID_SUPPORT_VERSION" value="27.1.0" />
     </plugin>
-    <plugin name="cordova-clipboard" spec="1.3.0" />
-    <plugin name="cordova-plugin-badge" spec="0.8.8" />
-    <plugin name="cordova-plugin-camera" spec="4.1.0" />
-    <plugin name="cordova-plugin-customurlscheme" spec="4.4.0">
+    <plugin name="cordova-clipboard" spec="^1.3.0" />
+    <plugin name="cordova-plugin-badge" spec="^0.8.8" />
+    <plugin name="cordova-plugin-camera" spec="^4.1.0" />
+    <plugin name="cordova-plugin-customurlscheme" spec="^4.4.0">
         <variable name="URL_SCHEME" value="moodlemobile" />
     </plugin>
-    <plugin name="cordova-plugin-device" spec="2.0.3" />
-    <plugin name="cordova-plugin-file" spec="6.0.2" />
+    <plugin name="cordova-plugin-device" spec="^2.0.3" />
+    <plugin name="cordova-plugin-file" spec="^6.0.2" />
     <plugin name="cordova-plugin-file-opener2" spec="2.0.19" />
-    <plugin name="cordova-plugin-file-transfer" spec="1.7.1" />
-    <plugin name="cordova-plugin-globalization" spec="1.11.0" />
-    <plugin name="cordova-plugin-inappbrowser" spec="3.1.0" />
-    <plugin name="cordova-plugin-ionic-keyboard" spec="2.1.3" />
+    <plugin name="cordova-plugin-file-transfer" spec="^1.7.1" />
+    <plugin name="cordova-plugin-globalization" spec="^1.11.0" />
+    <plugin name="cordova-plugin-inappbrowser" spec="^3.1.0" />
+    <plugin name="cordova-plugin-ionic-keyboard" spec="^2.1.3" />
     <plugin name="cordova-plugin-local-notification" spec="https://github.com/moodlemobile/cordova-plugin-local-notification.git#moodle" />
-    <plugin name="cordova-plugin-media-capture" spec="3.0.3" />
-    <plugin name="cordova-plugin-network-information" spec="2.0.2" />
-    <plugin name="cordova-plugin-screen-orientation" spec="3.0.2" />
-    <plugin name="cordova-plugin-splashscreen" spec="5.0.3" />
-    <plugin name="cordova-plugin-statusbar" spec="2.4.3" />
-    <plugin name="cordova-plugin-whitelist" spec="1.3.4" />
-    <plugin name="cordova-plugin-zip" spec="3.1.0" />
-    <plugin name="cordova-sqlite-storage" spec="2.6.0" />
-    <plugin name="nl.kingsquare.cordova.background-audio" spec="1.0.1" />
+    <plugin name="cordova-plugin-media-capture" spec="^3.0.3" />
+    <plugin name="cordova-plugin-network-information" spec="^2.0.2" />
+    <plugin name="cordova-plugin-screen-orientation" spec="^3.0.2" />
+    <plugin name="cordova-plugin-splashscreen" spec="^5.0.3" />
+    <plugin name="cordova-plugin-statusbar" spec="^2.4.3" />
+    <plugin name="cordova-plugin-whitelist" spec="^1.3.4" />
+    <plugin name="cordova-plugin-zip" spec="^3.1.0" />
+    <plugin name="cordova-sqlite-storage" spec="^2.6.0" />
+    <plugin name="nl.kingsquare.cordova.background-audio" spec="^1.0.1" />
     <plugin name="phonegap-plugin-push" spec="https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v3">
         <variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
         <variable name="FCM_VERSION" value="17.5.+" />
diff --git a/package.json b/package.json
index 8d5fda2e1..caab7e861 100644
--- a/package.json
+++ b/package.json
@@ -40,102 +40,102 @@
     "windows.store": "npx electron-windows-store --input-directory .\\desktop\\dist\\win-unpacked --output-directory .\\desktop\\store -a .\\resources\\desktop -m .\\desktop\\assets\\windows\\AppXManifest.xml --package-version 0.0.0.0 --package-name MoodleDesktop"
   },
   "dependencies": {
-    "@angular/animations": "5.2.10",
-    "@angular/common": "5.2.10",
-    "@angular/compiler": "5.2.10",
-    "@angular/compiler-cli": "5.2.10",
-    "@angular/core": "5.2.10",
-    "@angular/forms": "5.2.10",
-    "@angular/http": "5.2.10",
-    "@angular/platform-browser": "5.2.10",
-    "@angular/platform-browser-dynamic": "5.2.10",
-    "@ionic-native/badge": "4.17.0",
-    "@ionic-native/camera": "4.17.0",
-    "@ionic-native/clipboard": "4.17.0",
-    "@ionic-native/core": "4.11.0",
-    "@ionic-native/device": "4.17.0",
-    "@ionic-native/file": "4.17.0",
-    "@ionic-native/file-opener": "4.17.0",
-    "@ionic-native/file-transfer": "4.17.0",
-    "@ionic-native/globalization": "4.17.0",
-    "@ionic-native/in-app-browser": "4.17.0",
-    "@ionic-native/keyboard": "4.17.0",
-    "@ionic-native/local-notifications": "4.17.0",
-    "@ionic-native/media-capture": "4.17.0",
-    "@ionic-native/network": "4.17.0",
-    "@ionic-native/push": "4.17.0",
-    "@ionic-native/screen-orientation": "4.17.0",
-    "@ionic-native/splash-screen": "4.17.0",
-    "@ionic-native/sqlite": "4.17.0",
-    "@ionic-native/status-bar": "4.17.0",
-    "@ionic-native/web-intent": "4.17.0",
-    "@ionic-native/zip": "4.17.0",
-    "@ngx-translate/core": "8.0.0",
-    "@ngx-translate/http-loader": "2.0.1",
-    "@types/cordova": "0.0.34",
-    "@types/cordova-plugin-file-transfer": "0.0.3",
-    "@types/cordova-plugin-globalization": "0.0.3",
-    "@types/cordova-plugin-network-information": "0.0.3",
-    "@types/node": "8.10.19",
-    "@types/promise.prototype.finally": "2.0.2",
-    "chart.js": "2.7.2",
-    "com-darryncampbell-cordova-plugin-intent": "1.1.7",
+    "@angular/animations": "^5.2.10",
+    "@angular/common": "^5.2.10",
+    "@angular/compiler": "^5.2.10",
+    "@angular/compiler-cli": "^5.2.10",
+    "@angular/core": "^5.2.10",
+    "@angular/forms": "^5.2.10",
+    "@angular/http": "^5.2.10",
+    "@angular/platform-browser": "^5.2.10",
+    "@angular/platform-browser-dynamic": "^5.2.10",
+    "@ionic-native/badge": "^4.17.0",
+    "@ionic-native/camera": "^4.17.0",
+    "@ionic-native/clipboard": "^4.17.0",
+    "@ionic-native/core": "^4.11.0",
+    "@ionic-native/device": "^4.17.0",
+    "@ionic-native/file": "^4.17.0",
+    "@ionic-native/file-opener": "^4.17.0",
+    "@ionic-native/file-transfer": "^4.17.0",
+    "@ionic-native/globalization": "^4.17.0",
+    "@ionic-native/in-app-browser": "^4.17.0",
+    "@ionic-native/keyboard": "^4.17.0",
+    "@ionic-native/local-notifications": "^4.17.0",
+    "@ionic-native/media-capture": "^4.17.0",
+    "@ionic-native/network": "^4.17.0",
+    "@ionic-native/push": "^4.17.0",
+    "@ionic-native/screen-orientation": "^4.17.0",
+    "@ionic-native/splash-screen": "^4.17.0",
+    "@ionic-native/sqlite": "^4.17.0",
+    "@ionic-native/status-bar": "^4.17.0",
+    "@ionic-native/web-intent": "^4.17.0",
+    "@ionic-native/zip": "^4.17.0",
+    "@ngx-translate/core": "^8.0.0",
+    "@ngx-translate/http-loader": "^2.0.1",
+    "@types/cordova": "^0.0.34",
+    "@types/cordova-plugin-file-transfer": "^0.0.3",
+    "@types/cordova-plugin-globalization": "^0.0.3",
+    "@types/cordova-plugin-network-information": "^0.0.3",
+    "@types/node": "^8.10.19",
+    "@types/promise.prototype.finally": "^2.0.2",
+    "chart.js": "^2.7.2",
+    "com-darryncampbell-cordova-plugin-intent": "^1.1.7",
     "cordova": "8.1.2",
     "cordova-android": "7.1.2",
-    "cordova-android-support-gradle-release": "3.0.1",
-    "cordova-clipboard": "1.3.0",
+    "cordova-android-support-gradle-release": "^3.0.1",
+    "cordova-clipboard": "^1.3.0",
     "cordova-ios": "4.5.5",
-    "cordova-plugin-badge": "0.8.8",
-    "cordova-plugin-camera": "4.1.0",
-    "cordova-plugin-customurlscheme": "4.4.0",
-    "cordova-plugin-device": "2.0.3",
-    "cordova-plugin-file": "6.0.2",
+    "cordova-plugin-badge": "^0.8.8",
+    "cordova-plugin-camera": "^4.1.0",
+    "cordova-plugin-customurlscheme": "^4.4.0",
+    "cordova-plugin-device": "^2.0.3",
+    "cordova-plugin-file": "^6.0.2",
     "cordova-plugin-file-opener2": "2.0.19",
-    "cordova-plugin-file-transfer": "1.7.1",
-    "cordova-plugin-globalization": "1.11.0",
-    "cordova-plugin-inappbrowser": "3.1.0",
-    "cordova-plugin-ionic-keyboard": "2.1.3",
+    "cordova-plugin-file-transfer": "^1.7.1",
+    "cordova-plugin-globalization": "^1.11.0",
+    "cordova-plugin-inappbrowser": "^3.1.0",
+    "cordova-plugin-ionic-keyboard": "^2.1.3",
     "cordova-plugin-local-notification": "git+https://github.com/moodlemobile/cordova-plugin-local-notification.git#moodle",
-    "cordova-plugin-media-capture": "3.0.3",
-    "cordova-plugin-network-information": "2.0.2",
-    "cordova-plugin-screen-orientation": "3.0.2",
-    "cordova-plugin-splashscreen": "5.0.3",
-    "cordova-plugin-statusbar": "2.4.3",
-    "cordova-plugin-whitelist": "1.3.4",
-    "cordova-plugin-zip": "3.1.0",
-    "cordova-sqlite-storage": "2.6.0",
-    "cordova-support-google-services": "1.2.1",
-    "es6-promise-plugin": "4.2.2",
-    "font-awesome": "4.7.0",
+    "cordova-plugin-media-capture": "^3.0.3",
+    "cordova-plugin-network-information": "^2.0.2",
+    "cordova-plugin-screen-orientation": "^3.0.2",
+    "cordova-plugin-splashscreen": "^5.0.3",
+    "cordova-plugin-statusbar": "^2.4.3",
+    "cordova-plugin-whitelist": "^1.3.4",
+    "cordova-plugin-zip": "^3.1.0",
+    "cordova-sqlite-storage": "^2.6.0",
+    "cordova-support-google-services": "^1.2.1",
+    "es6-promise-plugin": "^4.2.2",
+    "font-awesome": "^4.7.0",
     "ionic-angular": "3.9.3",
-    "ionicons": "3.0.0",
-    "jszip": "3.1.5",
-    "moment": "2.22.2",
-    "nl.kingsquare.cordova.background-audio": "1.0.1",
-    "phonegap-plugin-multidex": "1.0.0",
+    "ionicons": "^3.0.0",
+    "jszip": "^3.1.5",
+    "moment": "^2.22.2",
+    "nl.kingsquare.cordova.background-audio": "^1.0.1",
+    "phonegap-plugin-multidex": "^1.0.0",
     "phonegap-plugin-push": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v3",
-    "promise.prototype.finally": "3.1.0",
-    "rxjs": "5.5.11",
-    "sw-toolbox": "3.6.0",
-    "ts-md5": "1.2.4",
-    "web-animations-js": "2.3.1",
-    "zone.js": "0.8.26"
+    "promise.prototype.finally": "^3.1.0",
+    "rxjs": "^5.5.11",
+    "sw-toolbox": "^3.6.0",
+    "ts-md5": "^1.2.4",
+    "web-animations-js": "^2.3.1",
+    "zone.js": "^0.8.26"
   },
   "devDependencies": {
     "@ionic/app-scripts": "3.2.2",
-    "electron-builder-lib": "20.23.1",
-    "electron-rebuild": "1.8.1",
+    "electron-builder-lib": "^20.23.1",
+    "electron-rebuild": "^1.8.1",
     "gulp": "4.0.2",
-    "gulp-clip-empty-files": "0.1.2",
-    "gulp-concat": "2.6.1",
-    "gulp-flatten": "0.4.0",
-    "gulp-rename": "1.3.0",
-    "gulp-slash": "1.1.3",
-    "gulp-util": "3.0.8",
-    "node-loader": "0.6.0",
-    "through": "2.3.8",
-    "typescript": "2.6.2",
-    "webpack-merge": "4.1.2"
+    "gulp-clip-empty-files": "^0.1.2",
+    "gulp-concat": "^2.6.1",
+    "gulp-flatten": "^0.4.0",
+    "gulp-rename": "^1.3.0",
+    "gulp-slash": "^1.1.3",
+    "gulp-util": "^3.0.8",
+    "node-loader": "^0.6.0",
+    "through": "^2.3.8",
+    "typescript": "^2.6.2",
+    "webpack-merge": "^4.1.2"
   },
   "browser": {
     "electron": false

From e6d86042b623d7728cb964a0f8151d1548a7a62c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 3 Sep 2019 12:05:26 +0200
Subject: [PATCH 002/257] MOBILE-3139 core: Update platform versions

---
 config.xml        |   4 +-
 package-lock.json | 896 +++++++++++++++++++---------------------------
 package.json      |   4 +-
 3 files changed, 379 insertions(+), 525 deletions(-)

diff --git a/config.xml b/config.xml
index d1681d129..43605fd7c 100644
--- a/config.xml
+++ b/config.xml
@@ -156,6 +156,6 @@
     <config-file parent="FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED" target="*-Info.plist">
         <string>YES</string>
     </config-file>
-    <engine name="android" spec="7.1.2" />
-    <engine name="ios" spec="4.5.5" />
+    <engine name="android" spec="8.0.0" />
+    <engine name="ios" spec="5.0.1" />
 </widget>
diff --git a/package-lock.json b/package-lock.json
index c82b49deb..ee0b1bf29 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1198,8 +1198,7 @@
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
     "accepts": {
       "version": "1.3.5",
@@ -1269,6 +1268,19 @@
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
       "dev": true
     },
+    "android-versions": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.4.0.tgz",
+      "integrity": "sha512-GnomfYsBq+nZh3c3UH/4r9Jt6FuTxdhUJbeHIdYOH5xBhQ8I0ZzC2/RM5IFFIjrzuNWSHb8JWP1lPK0/a26jrg==",
+      "requires": {
+        "semver": "^5.4.1"
+      }
+    },
+    "ansi": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
+      "integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE="
+    },
     "ansi-colors": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
@@ -1805,8 +1817,7 @@
     "base64-js": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
-      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
-      "dev": true
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
     },
     "bcrypt-pbkdf": {
       "version": "1.0.1",
@@ -1824,6 +1835,11 @@
       "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
       "dev": true
     },
+    "big-integer": {
+      "version": "1.6.44",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.44.tgz",
+      "integrity": "sha512-7MzElZPTyJ2fNvBkPxtFQ2fWIkVmuzw41+BZHSzpEq3ymB2MfeKp1+yXl/tS75xCx+WnyV+yb0kp+K1C3UNwmQ=="
+    },
     "big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -1919,6 +1935,22 @@
         "type-is": "~1.6.16"
       }
     },
+    "bplist-creator": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz",
+      "integrity": "sha1-N98VNgkoJLh8QvlXsBNEEXNyrkU=",
+      "requires": {
+        "stream-buffers": "~2.2.0"
+      }
+    },
+    "bplist-parser": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
+      "integrity": "sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=",
+      "requires": {
+        "big-integer": "^1.6.7"
+      }
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -7261,212 +7293,27 @@
       }
     },
     "cordova-android": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-7.1.2.tgz",
-      "integrity": "sha512-w28HJGtfAZCT96hVH9BMppWMnmDTZplKu2NRQZN2dCr5e9r7aHpay41MYy9IBkh8+7E7lMo/jZkRwBDNr4VnEg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-8.0.0.tgz",
+      "integrity": "sha512-Ipv8HbVJpxEyYFSFLTEOaLRp0yxBtJVNbgSuDEB4naa34FzQaRWSNiiMcPJnO+x3hRXNt7pcwa46hARNzhn7+w==",
       "requires": {
-        "abbrev": "*",
-        "android-versions": "1.3.0",
-        "ansi": "*",
-        "balanced-match": "*",
-        "base64-js": "1.2.0",
-        "big-integer": "*",
-        "bplist-parser": "*",
-        "brace-expansion": "*",
-        "concat-map": "*",
-        "cordova-common": "2.2.5",
-        "cordova-registry-mapper": "*",
-        "elementtree": "0.1.6",
-        "glob": "5.0.15",
-        "inflight": "*",
-        "inherits": "*",
-        "minimatch": "*",
-        "nopt": "3.0.1",
-        "once": "*",
-        "path-is-absolute": "*",
-        "plist": "2.1.0",
-        "properties-parser": "0.2.3",
-        "q": "1.4.1",
-        "sax": "0.3.5",
-        "semver": "*",
-        "shelljs": "0.5.3",
-        "underscore": "*",
-        "unorm": "*",
-        "wrappy": "*",
-        "xmlbuilder": "8.2.2",
-        "xmldom": "*"
+        "android-versions": "^1.3.0",
+        "cordova-common": "^3.1.0",
+        "elementtree": "^0.1.7",
+        "nopt": "^4.0.1",
+        "properties-parser": "^0.3.1",
+        "q": "^1.4.1",
+        "shelljs": "^0.5.3"
       },
       "dependencies": {
-        "abbrev": {
-          "version": "1.1.1",
-          "bundled": true
-        },
-        "android-versions": {
-          "version": "1.3.0",
-          "bundled": true,
-          "requires": {
-            "semver": "^5.4.1"
-          }
-        },
-        "ansi": {
-          "version": "0.3.1",
-          "bundled": true
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "base64-js": {
-          "version": "1.2.0",
-          "bundled": true
-        },
-        "big-integer": {
-          "version": "1.6.32",
-          "bundled": true
-        },
-        "bplist-parser": {
-          "version": "0.1.1",
-          "bundled": true,
-          "requires": {
-            "big-integer": "^1.6.7"
-          }
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "bundled": true,
-          "requires": {
-            "balanced-match": "^1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true
-        },
-        "cordova-common": {
-          "version": "2.2.5",
-          "bundled": true,
-          "requires": {
-            "ansi": "^0.3.1",
-            "bplist-parser": "^0.1.0",
-            "cordova-registry-mapper": "^1.1.8",
-            "elementtree": "0.1.6",
-            "glob": "^5.0.13",
-            "minimatch": "^3.0.0",
-            "plist": "^2.1.0",
-            "q": "^1.4.1",
-            "shelljs": "^0.5.3",
-            "underscore": "^1.8.3",
-            "unorm": "^1.3.3"
-          }
-        },
-        "cordova-registry-mapper": {
-          "version": "1.1.15",
-          "bundled": true
-        },
-        "elementtree": {
-          "version": "0.1.6",
-          "bundled": true,
-          "requires": {
-            "sax": "0.3.5"
-          }
-        },
-        "glob": {
-          "version": "5.0.15",
-          "bundled": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
         "nopt": {
-          "version": "3.0.1",
-          "bundled": true,
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
           "requires": {
-            "abbrev": "1"
+            "abbrev": "1",
+            "osenv": "^0.1.4"
           }
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "plist": {
-          "version": "2.1.0",
-          "bundled": true,
-          "requires": {
-            "base64-js": "1.2.0",
-            "xmlbuilder": "8.2.2",
-            "xmldom": "0.1.x"
-          }
-        },
-        "properties-parser": {
-          "version": "0.2.3",
-          "bundled": true
-        },
-        "q": {
-          "version": "1.4.1",
-          "bundled": true
-        },
-        "sax": {
-          "version": "0.3.5",
-          "bundled": true
-        },
-        "semver": {
-          "version": "5.5.0",
-          "bundled": true
-        },
-        "shelljs": {
-          "version": "0.5.3",
-          "bundled": true
-        },
-        "underscore": {
-          "version": "1.9.1",
-          "bundled": true
-        },
-        "unorm": {
-          "version": "1.4.1",
-          "bundled": true
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "xmlbuilder": {
-          "version": "8.2.2",
-          "bundled": true
-        },
-        "xmldom": {
-          "version": "0.1.27",
-          "bundled": true
         }
       }
     },
@@ -7491,297 +7338,84 @@
       "resolved": "https://registry.npmjs.org/cordova-clipboard/-/cordova-clipboard-1.3.0.tgz",
       "integrity": "sha512-IGk4LZm/DJ0Xk/jgakHm4wa+A/lrRP3QfzMAHDG7oWLJS4ISOpfI32Wez4ndnENItRslGyBVyJyKD83CxELCAw=="
     },
-    "cordova-ios": {
-      "version": "4.5.5",
-      "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-4.5.5.tgz",
-      "integrity": "sha512-3+30m2dZ2yii7kg+H7cgpdpkXpMj54zoX5imjGGG4Z7dPXKmalTLc/9rLq+Iaa+Q1BqyOrUFaHopWOODRU6vCg==",
+    "cordova-common": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-3.2.0.tgz",
+      "integrity": "sha512-EvlQ6PirfR65hGDoQvsluW00uSS2MTVIRKQ3c1Xvsddx7D5T5JgF3fHWkGik/Y/8yNcpI0zI2NcJyie2z/ak2A==",
       "requires": {
-        "abbrev": "*",
-        "ansi": "*",
-        "balanced-match": "*",
-        "base64-js": "1.2.0",
-        "big-integer": "*",
-        "bplist-creator": "*",
-        "bplist-parser": "*",
-        "brace-expansion": "*",
-        "concat-map": "*",
-        "cordova-common": "2.2.5",
-        "cordova-registry-mapper": "*",
-        "elementtree": "0.1.6",
-        "glob": "5.0.15",
-        "inflight": "*",
-        "inherits": "*",
-        "ios-sim": "6.1.3",
-        "minimatch": "*",
-        "nopt": "3.0.6",
-        "once": "*",
-        "path-is-absolute": "*",
-        "plist": "2.1.0",
-        "q": "1.5.1",
-        "sax": "0.3.5",
-        "shelljs": "0.5.3",
-        "simctl": "*",
-        "simple-plist": "0.2.1",
-        "stream-buffers": "2.2.0",
-        "tail": "0.4.0",
-        "underscore": "*",
-        "unorm": "*",
-        "uuid": "3.0.1",
-        "wrappy": "*",
-        "xcode": "0.9.3",
-        "xml-escape": "1.1.0",
-        "xmlbuilder": "8.2.2",
-        "xmldom": "*"
+        "ansi": "^0.3.1",
+        "bplist-parser": "^0.1.0",
+        "cross-spawn": "^6.0.5",
+        "elementtree": "0.1.7",
+        "endent": "^1.1.1",
+        "fs-extra": "^8.0.0",
+        "glob": "^7.1.2",
+        "minimatch": "^3.0.0",
+        "plist": "^3.0.1",
+        "q": "^1.4.1",
+        "strip-bom": "^3.0.0",
+        "underscore": "^1.8.3",
+        "which": "^1.3.0"
       },
       "dependencies": {
-        "abbrev": {
-          "version": "1.1.1",
-          "bundled": true
-        },
-        "ansi": {
-          "version": "0.3.1",
-          "bundled": true
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "base64-js": {
-          "version": "1.2.0",
-          "bundled": true
-        },
-        "big-integer": {
-          "version": "1.6.32",
-          "bundled": true
-        },
-        "bplist-creator": {
-          "version": "0.0.7",
-          "bundled": true,
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "requires": {
-            "stream-buffers": "~2.2.0"
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
           }
         },
-        "bplist-parser": {
-          "version": "0.1.1",
-          "bundled": true,
+        "fs-extra": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
           "requires": {
-            "big-integer": "^1.6.7"
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
           }
         },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "bundled": true,
-          "requires": {
-            "balanced-match": "^1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true
-        },
-        "cordova-common": {
-          "version": "2.2.5",
-          "bundled": true,
-          "requires": {
-            "ansi": "^0.3.1",
-            "bplist-parser": "^0.1.0",
-            "cordova-registry-mapper": "^1.1.8",
-            "elementtree": "0.1.6",
-            "glob": "^5.0.13",
-            "minimatch": "^3.0.0",
-            "plist": "^2.1.0",
-            "q": "^1.4.1",
-            "shelljs": "^0.5.3",
-            "underscore": "^1.8.3",
-            "unorm": "^1.3.3"
-          }
-        },
-        "cordova-registry-mapper": {
-          "version": "1.1.15",
-          "bundled": true
-        },
-        "elementtree": {
-          "version": "0.1.6",
-          "bundled": true,
-          "requires": {
-            "sax": "0.3.5"
-          }
-        },
-        "glob": {
-          "version": "5.0.15",
-          "bundled": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true
-        },
-        "ios-sim": {
-          "version": "6.1.3",
-          "bundled": true,
-          "requires": {
-            "bplist-parser": "^0.0.6",
-            "nopt": "1.0.9",
-            "plist": "^2.1.0",
-            "simctl": "^1.1.1"
-          },
-          "dependencies": {
-            "bplist-parser": {
-              "version": "0.0.6",
-              "bundled": true
-            },
-            "nopt": {
-              "version": "1.0.9",
-              "bundled": true,
-              "requires": {
-                "abbrev": "1"
-              }
-            }
-          }
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
+        "graceful-fs": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+          "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="
         },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+        }
+      }
+    },
+    "cordova-ios": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-5.0.1.tgz",
+      "integrity": "sha512-JcFyDmlyzY2OQJo0eHpuFERFqvO4daHl8HL96RhUVjJVtuoqXHsOF0xTuQSAqIbefelMPEWwY3Lc/dvT4ttTwQ==",
+      "requires": {
+        "cordova-common": "^3.1.0",
+        "ios-sim": "^8.0.1",
+        "nopt": "^4.0.1",
+        "plist": "^3.0.1",
+        "q": "^1.5.1",
+        "shelljs": "^0.5.3",
+        "unorm": "^1.4.1",
+        "xcode": "^2.0.0",
+        "xml-escape": "^1.1.0"
+      },
+      "dependencies": {
         "nopt": {
-          "version": "3.0.6",
-          "bundled": true,
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
           "requires": {
-            "abbrev": "1"
+            "abbrev": "1",
+            "osenv": "^0.1.4"
           }
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "plist": {
-          "version": "2.1.0",
-          "bundled": true,
-          "requires": {
-            "base64-js": "1.2.0",
-            "xmlbuilder": "8.2.2",
-            "xmldom": "0.1.x"
-          }
-        },
-        "q": {
-          "version": "1.5.1",
-          "bundled": true
-        },
-        "sax": {
-          "version": "0.3.5",
-          "bundled": true
-        },
-        "shelljs": {
-          "version": "0.5.3",
-          "bundled": true
-        },
-        "simctl": {
-          "version": "1.1.1",
-          "bundled": true,
-          "requires": {
-            "shelljs": "^0.2.6",
-            "tail": "^0.4.0"
-          },
-          "dependencies": {
-            "shelljs": {
-              "version": "0.2.6",
-              "bundled": true
-            }
-          }
-        },
-        "simple-plist": {
-          "version": "0.2.1",
-          "bundled": true,
-          "requires": {
-            "bplist-creator": "0.0.7",
-            "bplist-parser": "0.1.1",
-            "plist": "2.0.1"
-          },
-          "dependencies": {
-            "base64-js": {
-              "version": "1.1.2",
-              "bundled": true
-            },
-            "plist": {
-              "version": "2.0.1",
-              "bundled": true,
-              "requires": {
-                "base64-js": "1.1.2",
-                "xmlbuilder": "8.2.2",
-                "xmldom": "0.1.x"
-              }
-            }
-          }
-        },
-        "stream-buffers": {
-          "version": "2.2.0",
-          "bundled": true
-        },
-        "tail": {
-          "version": "0.4.0",
-          "bundled": true
-        },
-        "underscore": {
-          "version": "1.9.1",
-          "bundled": true
-        },
-        "unorm": {
-          "version": "1.4.1",
-          "bundled": true
-        },
-        "uuid": {
-          "version": "3.0.1",
-          "bundled": true
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "xcode": {
-          "version": "0.9.3",
-          "bundled": true,
-          "requires": {
-            "pegjs": "^0.10.0",
-            "simple-plist": "^0.2.1",
-            "uuid": "3.0.1"
-          }
-        },
-        "xml-escape": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "xmlbuilder": {
-          "version": "8.2.2",
-          "bundled": true
-        },
-        "xmldom": {
-          "version": "0.1.27",
-          "bundled": true
         }
       }
     },
@@ -8037,6 +7671,16 @@
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
       "dev": true
     },
+    "dedent": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+      "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
+    },
+    "deep-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
+    },
     "default-compare": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
@@ -8122,6 +7766,11 @@
         }
       }
     },
+    "defined": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
+      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM="
+    },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -8534,6 +8183,21 @@
       "integrity": "sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==",
       "dev": true
     },
+    "elementtree": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
+      "integrity": "sha1-mskb5uUvtuYkTE5UpKw+2K6OKcA=",
+      "requires": {
+        "sax": "1.1.4"
+      },
+      "dependencies": {
+        "sax": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
+          "integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk="
+        }
+      }
+    },
     "elliptic": {
       "version": "6.4.1",
       "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
@@ -8570,6 +8234,16 @@
         "once": "^1.4.0"
       }
     },
+    "endent": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/endent/-/endent-1.3.0.tgz",
+      "integrity": "sha512-C8AryqPPwtydqcpO5AF6k9Bd1EpFkQtvsefJqS3y3n8TG13Jy63MascDxTOULZYqrUde+dK6BjNc6LIMr3iI2A==",
+      "requires": {
+        "dedent": "^0.7.0",
+        "fast-json-parse": "^1.0.3",
+        "objectorarray": "^1.0.3"
+      }
+    },
     "enhanced-resolve": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
@@ -8952,6 +8626,11 @@
       "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
       "dev": true
     },
+    "fast-json-parse": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz",
+      "integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw=="
+    },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
@@ -9346,6 +9025,14 @@
       "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
       "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
     },
+    "for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "requires": {
+        "is-callable": "^1.1.3"
+      }
+    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -9449,8 +9136,7 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
       "version": "1.2.9",
@@ -10007,7 +9693,6 @@
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
       "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-      "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -11548,7 +11233,6 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -11592,6 +11276,32 @@
       "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-3.0.0.tgz",
       "integrity": "sha1-QLja9P16MRUL0AIWD2ZJbiKpjDw="
     },
+    "ios-sim": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/ios-sim/-/ios-sim-8.0.2.tgz",
+      "integrity": "sha512-P7nEG771bfd+JoMRjnis1gpZOkjTUUxu+4Ek1Z+eoaEEoT9byllU9pxfQ8Df7hL3gSkIQxNwTSLhos2I8tWUQA==",
+      "requires": {
+        "bplist-parser": "^0.0.6",
+        "nopt": "1.0.9",
+        "plist": "^3.0.1",
+        "simctl": "^2"
+      },
+      "dependencies": {
+        "bplist-parser": {
+          "version": "0.0.6",
+          "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz",
+          "integrity": "sha1-ONo0cYF9+dRKs4kuJ3B7u9daEbk="
+        },
+        "nopt": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.9.tgz",
+          "integrity": "sha1-O8DXy6e/sNWmdtvtfA6+SKT9RU4=",
+          "requires": {
+            "abbrev": "1"
+          }
+        }
+      }
+    },
     "ipaddr.js": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
@@ -11883,8 +11593,7 @@
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "isobject": {
       "version": "2.1.0",
@@ -11972,7 +11681,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "dev": true,
       "requires": {
         "graceful-fs": "^4.1.6"
       }
@@ -13000,6 +12708,11 @@
       "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
       "dev": true
     },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+    },
     "nl.kingsquare.cordova.background-audio": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/nl.kingsquare.cordova.background-audio/-/nl.kingsquare.cordova.background-audio-1.0.1.tgz",
@@ -13396,6 +13109,11 @@
         }
       }
     },
+    "object-inspect": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
+      "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="
+    },
     "object-keys": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
@@ -13527,6 +13245,14 @@
         }
       }
     },
+    "objectorarray": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.3.tgz",
+      "integrity": "sha512-kPoflSYkAf/Onvjr4ZLaq37vDuOXjVzfwLCRuORRzYGdXkHa/vacPT0RgR+KmtkwOYFcxTMM62BRrZk8GGKHjw==",
+      "requires": {
+        "tape": "^4.8.0"
+      }
+    },
     "on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
@@ -13540,7 +13266,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -13584,8 +13309,7 @@
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
     },
     "os-locale": {
       "version": "1.4.0",
@@ -13609,14 +13333,12 @@
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
     "osenv": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "dev": true,
       "requires": {
         "os-homedir": "^1.0.0",
         "os-tmpdir": "^1.0.0"
@@ -13749,8 +13471,7 @@
     "path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
     },
     "path-parse": {
       "version": "1.0.5",
@@ -13812,11 +13533,6 @@
         "sha.js": "^2.4.8"
       }
     },
-    "pegjs": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz",
-      "integrity": "sha1-z4uvrm7d/0tafvsYUmnqr0YQ3b0="
-    },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -13861,7 +13577,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
       "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
-      "dev": true,
       "requires": {
         "base64-js": "^1.2.3",
         "xmlbuilder": "^9.0.7",
@@ -13975,6 +13690,14 @@
         "function-bind": "^1.1.1"
       }
     },
+    "properties-parser": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz",
+      "integrity": "sha1-ExbpU5/7/ZOEXjabIRAiq9R4dxo=",
+      "requires": {
+        "string.prototype.codepointat": "^0.2.0"
+      }
+    },
     "proxy-addr": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
@@ -14432,6 +14155,14 @@
         "signal-exit": "^3.0.2"
       }
     },
+    "resumer": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz",
+      "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=",
+      "requires": {
+        "through": "~2.3.4"
+      }
+    },
     "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
@@ -14874,8 +14605,7 @@
     "semver": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
-      "dev": true
+      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
     },
     "semver-greatest-satisfied-range": {
       "version": "1.1.0",
@@ -14984,7 +14714,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
       "requires": {
         "shebang-regex": "^1.0.0"
       }
@@ -14992,8 +14721,12 @@
     "shebang-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+    },
+    "shelljs": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz",
+      "integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM="
     },
     "signal-exit": {
       "version": "3.0.2",
@@ -15001,6 +14734,32 @@
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
       "dev": true
     },
+    "simctl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/simctl/-/simctl-2.0.0.tgz",
+      "integrity": "sha512-5rB7rN4N3b0z0nFdy9eczVssXqrv2aAgdVRksPVqVoiDtvXmfzNvebp3EMdId2sAUzXIflarQlx4P0hjVQEzKQ==",
+      "requires": {
+        "shelljs": "^0.2.6",
+        "tail": "^0.4.0"
+      },
+      "dependencies": {
+        "shelljs": {
+          "version": "0.2.6",
+          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
+          "integrity": "sha1-kEktcv/MgVmXa6umL7D2iE8MM3g="
+        }
+      }
+    },
+    "simple-plist": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.0.0.tgz",
+      "integrity": "sha512-043L2rO80LVF7zfZ+fqhsEkoJFvW8o59rt/l4ctx1TJWoTx7/jkiS1R5TatD15Z1oYnuLJytzE7gcnnBuIPL2g==",
+      "requires": {
+        "bplist-creator": "0.0.7",
+        "bplist-parser": "0.1.1",
+        "plist": "^3.0.1"
+      }
+    },
     "slash": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/slash/-/slash-0.1.3.tgz",
@@ -15307,6 +15066,11 @@
         "readable-stream": "^2.0.2"
       }
     },
+    "stream-buffers": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz",
+      "integrity": "sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ="
+    },
     "stream-exhaust": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
@@ -15349,6 +15113,21 @@
         "strip-ansi": "^3.0.0"
       }
     },
+    "string.prototype.codepointat": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz",
+      "integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="
+    },
+    "string.prototype.trim": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz",
+      "integrity": "sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=",
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.5.0",
+        "function-bind": "^1.0.2"
+      }
+    },
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -15432,12 +15211,70 @@
       "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
       "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ="
     },
+    "tail": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/tail/-/tail-0.4.0.tgz",
+      "integrity": "sha1-0p3nJ1DMmdseBTr/E8NZ7PtxMAI="
+    },
     "tapable": {
       "version": "0.2.9",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz",
       "integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==",
       "dev": true
     },
+    "tape": {
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/tape/-/tape-4.11.0.tgz",
+      "integrity": "sha512-yixvDMX7q7JIs/omJSzSZrqulOV51EC9dK8dM0TzImTIkHWfe2/kFyL5v+d9C+SrCMaICk59ujsqFAVidDqDaA==",
+      "requires": {
+        "deep-equal": "~1.0.1",
+        "defined": "~1.0.0",
+        "for-each": "~0.3.3",
+        "function-bind": "~1.1.1",
+        "glob": "~7.1.4",
+        "has": "~1.0.3",
+        "inherits": "~2.0.4",
+        "minimist": "~1.2.0",
+        "object-inspect": "~1.6.0",
+        "resolve": "~1.11.1",
+        "resumer": "~0.0.0",
+        "string.prototype.trim": "~1.1.2",
+        "through": "~2.3.8"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+        },
+        "path-parse": {
+          "version": "1.0.6",
+          "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+          "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+        },
+        "resolve": {
+          "version": "1.11.1",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
+          "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        }
+      }
+    },
     "tar": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
@@ -15478,8 +15315,7 @@
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
     },
     "through2": {
       "version": "2.0.3",
@@ -15857,6 +15693,11 @@
       "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
       "dev": true
     },
+    "underscore": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
+      "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
+    },
     "undertaker": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz",
@@ -15905,8 +15746,12 @@
     "universalify": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
-      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
-      "dev": true
+      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc="
+    },
+    "unorm": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz",
+      "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA=="
     },
     "unpipe": {
       "version": "1.0.0",
@@ -16053,8 +15898,7 @@
     "uuid": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
-      "dev": true
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
     },
     "v8flags": {
       "version": "3.1.3",
@@ -17353,7 +17197,6 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
       "requires": {
         "isexe": "^2.0.0"
       }
@@ -17407,8 +17250,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "ws": {
       "version": "3.3.2",
@@ -17421,6 +17263,20 @@
         "ultron": "~1.1.0"
       }
     },
+    "xcode": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/xcode/-/xcode-2.0.0.tgz",
+      "integrity": "sha512-5xF6RCjAdDEiEsbbZaS/gBRt3jZ/177otZcpoLCjGN/u1LrfgH7/Sgeeavpr/jELpyDqN2im3AKosl2G2W8hfw==",
+      "requires": {
+        "simple-plist": "^1.0.0",
+        "uuid": "^3.3.2"
+      }
+    },
+    "xml-escape": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/xml-escape/-/xml-escape-1.1.0.tgz",
+      "integrity": "sha1-OQTBQ/qOs6ADDsZG0pAqLxtwbEQ="
+    },
     "xml2js": {
       "version": "0.4.19",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
@@ -17434,14 +17290,12 @@
     "xmlbuilder": {
       "version": "9.0.7",
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
-      "dev": true
+      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
     },
     "xmldom": {
       "version": "0.1.27",
       "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
-      "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=",
-      "dev": true
+      "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
     },
     "xtend": {
       "version": "4.0.1",
diff --git a/package.json b/package.json
index caab7e861..fd7498cd4 100644
--- a/package.json
+++ b/package.json
@@ -81,10 +81,10 @@
     "chart.js": "^2.7.2",
     "com-darryncampbell-cordova-plugin-intent": "^1.1.7",
     "cordova": "8.1.2",
-    "cordova-android": "7.1.2",
+    "cordova-android": "8.0.0",
     "cordova-android-support-gradle-release": "^3.0.1",
     "cordova-clipboard": "^1.3.0",
-    "cordova-ios": "4.5.5",
+    "cordova-ios": "5.0.1",
     "cordova-plugin-badge": "^0.8.8",
     "cordova-plugin-camera": "^4.1.0",
     "cordova-plugin-customurlscheme": "^4.4.0",

From 6053e1cc62e45b2a5c901f7dfa96017a7f300dbd Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 3 Sep 2019 12:14:23 +0200
Subject: [PATCH 003/257] MOBILE-3139 core: Fix missing peer dependency warning

---
 package-lock.json | 60 +++++++++++++++++++++++++++++++----------------
 package.json      |  1 +
 2 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ee0b1bf29..4088d7a77 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1234,15 +1234,14 @@
       }
     },
     "ajv": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-      "dev": true,
+      "version": "6.10.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
       "requires": {
-        "co": "^4.6.0",
-        "fast-deep-equal": "^1.0.0",
+        "fast-deep-equal": "^2.0.1",
         "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.3.0"
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       }
     },
     "ajv-keywords": {
@@ -8621,10 +8620,9 @@
       }
     },
     "fast-deep-equal": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-      "dev": true
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
     },
     "fast-json-parse": {
       "version": "1.0.3",
@@ -8634,8 +8632,7 @@
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-      "dev": true
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
     },
     "faye-websocket": {
       "version": "0.10.0",
@@ -11651,10 +11648,9 @@
       "dev": true
     },
     "json-schema-traverse": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-      "dev": true
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -12777,6 +12773,12 @@
           "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
           "dev": true
         },
+        "fast-deep-equal": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+          "dev": true
+        },
         "form-data": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
@@ -12796,6 +12798,20 @@
           "requires": {
             "ajv": "^5.3.0",
             "har-schema": "^2.0.0"
+          },
+          "dependencies": {
+            "ajv": {
+              "version": "5.5.2",
+              "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+              "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+              "dev": true,
+              "requires": {
+                "co": "^4.6.0",
+                "fast-deep-equal": "^1.0.0",
+                "fast-json-stable-stringify": "^2.0.0",
+                "json-schema-traverse": "^0.3.0"
+              }
+            }
           }
         },
         "http-signature": {
@@ -12809,6 +12825,12 @@
             "sshpk": "^1.7.0"
           }
         },
+        "json-schema-traverse": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+          "dev": true
+        },
         "mime-db": {
           "version": "1.36.0",
           "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz",
@@ -15815,7 +15837,6 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       },
@@ -15823,8 +15844,7 @@
         "punycode": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-          "dev": true
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
         }
       }
     },
diff --git a/package.json b/package.json
index fd7498cd4..8f366c35e 100644
--- a/package.json
+++ b/package.json
@@ -78,6 +78,7 @@
     "@types/cordova-plugin-network-information": "^0.0.3",
     "@types/node": "^8.10.19",
     "@types/promise.prototype.finally": "^2.0.2",
+    "ajv": "^6.10.2",
     "chart.js": "^2.7.2",
     "com-darryncampbell-cordova-plugin-intent": "^1.1.7",
     "cordova": "8.1.2",

From ae83ae03548762e1ff68cce652372b6f1085dadd Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Wed, 4 Sep 2019 12:20:45 +0200
Subject: [PATCH 004/257] MOBILE-3133 android: Fix back button on fullscreen
 video

---
 MainActivity.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++
 config.xml        |  1 +
 2 files changed, 57 insertions(+)
 create mode 100755 MainActivity.java

diff --git a/MainActivity.java b/MainActivity.java
new file mode 100755
index 000000000..74acfbb07
--- /dev/null
+++ b/MainActivity.java
@@ -0,0 +1,56 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Based on the template node_modules/cordova-android/bin/templates/project/Activity.java
+
+package com.moodle.moodlemobile;
+
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.View;
+import org.apache.cordova.*;
+
+public class MainActivity extends CordovaActivity
+{
+    @Override
+    public void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+
+        // enable Cordova apps to be started in the background
+        Bundle extras = getIntent().getExtras();
+        if (extras != null && extras.getBoolean("cdvStartInBackground", false)) {
+            moveTaskToBack(true);
+        }
+
+        // Set by <content src="index.html" /> in config.xml
+        loadUrl(launchUrl);
+    }
+
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+        // Forward back key events to the web view.
+        if (this.appView != null && event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
+            View webview = this.appView.getView();
+
+            if (webview != null) {
+                webview.dispatchKeyEvent(event);
+            }
+
+            return true;
+        }
+
+        return super.dispatchKeyEvent(event);
+    }
+}
diff --git a/config.xml b/config.xml
index 1ab1ad371..0c1b4bc5d 100644
--- a/config.xml
+++ b/config.xml
@@ -42,6 +42,7 @@
         <param name="ios-package" onload="true" value="CDVStatusBar" />
     </feature>
     <platform name="android">
+        <resource-file src="MainActivity.java" target="app/src/main/java/com/moodle/moodlemobile/MainActivity.java" />
         <resource-file src="google-services.json" target="app/google-services.json" />
         <splash qualifier="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
         <splash qualifier="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />

From c3acfeacf7630a9a6437c419a84850585f95af37 Mon Sep 17 00:00:00 2001
From: sam marshall <s.marshall@open.ac.uk>
Date: Wed, 4 Sep 2019 15:18:12 +0100
Subject: [PATCH 005/257] MOBILE-3140 Blocks: Make blocks work if displaydata
 not specified

If displaydata is not specified in mobile.php for a block, it
did not work due to a JavaScript error.
---
 src/core/siteplugins/providers/helper.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/siteplugins/providers/helper.ts b/src/core/siteplugins/providers/helper.ts
index b6c33d0fc..304c6626e 100644
--- a/src/core/siteplugins/providers/helper.ts
+++ b/src/core/siteplugins/providers/helper.ts
@@ -664,7 +664,8 @@ export class CoreSitePluginsHelperProvider {
 
         const uniqueName = this.sitePluginsProvider.getHandlerUniqueName(plugin, handlerName),
             blockName = (handlerSchema.moodlecomponent || plugin.component).replace('block_', ''),
-            prefixedTitle = this.getPrefixedString(plugin.addon, handlerSchema.displaydata.title || 'pluginname');
+            titleString = (handlerSchema.displaydata && handlerSchema.displaydata.title) ? handlerSchema.displaydata.title : 'pluginname',
+            prefixedTitle = this.getPrefixedString(plugin.addon, titleString);
 
         this.blockDelegate.registerHandler(
             new CoreSitePluginsBlockHandler(uniqueName, prefixedTitle, blockName, handlerSchema, initResult));

From 06c0a266b79eeefd68c6bc6ea4c74238d0ec58e8 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 5 Sep 2019 09:23:44 +0200
Subject: [PATCH 006/257] MOBILE-3132 mod: Fill context menu even if there's an
 error

---
 src/addon/mod/assign/components/index/index.ts   | 3 +--
 src/addon/mod/book/components/index/index.ts     | 5 ++---
 src/addon/mod/chat/components/index/index.ts     | 5 ++---
 src/addon/mod/choice/components/index/index.ts   | 3 +--
 src/addon/mod/data/components/index/index.ts     | 4 +---
 src/addon/mod/folder/components/index/index.ts   | 3 +--
 src/addon/mod/forum/components/index/index.ts    | 3 +--
 src/addon/mod/glossary/components/index/index.ts | 3 +--
 src/addon/mod/imscp/components/index/index.ts    | 2 +-
 src/addon/mod/lesson/components/index/index.ts   | 5 ++---
 src/addon/mod/lti/components/index/index.ts      | 3 +--
 src/addon/mod/page/components/index/index.ts     | 4 ++--
 src/addon/mod/quiz/components/index/index.ts     | 5 ++---
 src/addon/mod/resource/components/index/index.ts | 3 +--
 src/addon/mod/scorm/components/index/index.ts    | 3 +--
 src/addon/mod/survey/components/index/index.ts   | 3 +--
 src/addon/mod/wiki/components/index/index.ts     | 3 +--
 src/addon/mod/workshop/components/index/index.ts | 3 +--
 18 files changed, 23 insertions(+), 40 deletions(-)

diff --git a/src/addon/mod/assign/components/index/index.ts b/src/addon/mod/assign/components/index/index.ts
index 26d57888e..a576d75a5 100644
--- a/src/addon/mod/assign/components/index/index.ts
+++ b/src/addon/mod/assign/components/index/index.ts
@@ -219,8 +219,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
                     }
                 });
             });
-        }).then(() => {
-            // All data obtained, now fill the context menu.
+        }).finally(() => {
             this.fillContextMenu(refresh);
         });
     }
diff --git a/src/addon/mod/book/components/index/index.ts b/src/addon/mod/book/components/index/index.ts
index 569060aa3..56ed8c12e 100644
--- a/src/addon/mod/book/components/index/index.ts
+++ b/src/addon/mod/book/components/index/index.ts
@@ -163,12 +163,11 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
                     // We could load the main file but the download failed. Show error message.
                     this.domUtils.showErrorModal('core.errordownloadingsomefiles', true);
                 }
-
-                // All data obtained, now fill the context menu.
-                this.fillContextMenu(refresh);
             }).catch(() => {
                 // Ignore errors, they're handled inside the loadChapter function.
             });
+        }).finally(() => {
+            this.fillContextMenu(refresh);
         });
     }
 
diff --git a/src/addon/mod/chat/components/index/index.ts b/src/addon/mod/chat/components/index/index.ts
index 585c6f4e8..9b8f1f4ac 100644
--- a/src/addon/mod/chat/components/index/index.ts
+++ b/src/addon/mod/chat/components/index/index.ts
@@ -82,12 +82,11 @@ export class AddonModChatIndexComponent extends CoreCourseModuleMainActivityComp
 
             this.dataRetrieved.emit(chat);
 
-            // All data obtained, now fill the context menu.
-            this.fillContextMenu(refresh);
-
             return this.chatProvider.areSessionsAvailable().then((available) => {
                 this.sessionsAvailable = available;
             });
+        }).finally(() => {
+            this.fillContextMenu(refresh);
         });
     }
 
diff --git a/src/addon/mod/choice/components/index/index.ts b/src/addon/mod/choice/components/index/index.ts
index b543e4013..514dbae8a 100644
--- a/src/addon/mod/choice/components/index/index.ts
+++ b/src/addon/mod/choice/components/index/index.ts
@@ -154,8 +154,7 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
             return this.fetchOptions(hasOffline).then(() => {
                 return this.fetchResults();
             });
-        }).then(() => {
-            // All data obtained, now fill the context menu.
+        }).finally(() => {
             this.fillContextMenu(refresh);
         });
     }
diff --git a/src/addon/mod/data/components/index/index.ts b/src/addon/mod/data/components/index/index.ts
index bc3463842..2bc9aab6f 100644
--- a/src/addon/mod/data/components/index/index.ts
+++ b/src/addon/mod/data/components/index/index.ts
@@ -247,12 +247,10 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
 
                 return this.fetchEntriesData();
             });
-        }).then(() => {
-            // All data obtained, now fill the context menu.
-            this.fillContextMenu(refresh);
         }).finally(() => {
             this.canAdd = canAdd;
             this.canSearch = canSearch;
+            this.fillContextMenu(refresh);
         });
     }
 
diff --git a/src/addon/mod/folder/components/index/index.ts b/src/addon/mod/folder/components/index/index.ts
index d8c296b00..11e08acde 100644
--- a/src/addon/mod/folder/components/index/index.ts
+++ b/src/addon/mod/folder/components/index/index.ts
@@ -129,8 +129,7 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
             }
 
             this.showModuleData(folder);
-
-            // All data obtained, now fill the context menu.
+        }).finally(() => {
             this.fillContextMenu(refresh);
         });
     }
diff --git a/src/addon/mod/forum/components/index/index.ts b/src/addon/mod/forum/components/index/index.ts
index b3a4209b6..78e4d4d84 100644
--- a/src/addon/mod/forum/components/index/index.ts
+++ b/src/addon/mod/forum/components/index/index.ts
@@ -244,8 +244,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
             this.domUtils.showErrorModalDefault(message, 'addon.mod_forum.errorgetforum', true);
 
             this.loadMoreError = true; // Set to prevent infinite calls with infinite-loading.
-        }).then(() => {
-            // All data obtained, now fill the context menu.
+        }).finally(() => {
             this.fillContextMenu(refresh);
         });
     }
diff --git a/src/addon/mod/glossary/components/index/index.ts b/src/addon/mod/glossary/components/index/index.ts
index ed3d807e9..74296d771 100644
--- a/src/addon/mod/glossary/components/index/index.ts
+++ b/src/addon/mod/glossary/components/index/index.ts
@@ -158,8 +158,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
             }));
 
             return Promise.all(promises);
-        }).then(() => {
-            // All data obtained, now fill the context menu.
+        }).finally(() => {
             this.fillContextMenu(refresh);
         });
     }
diff --git a/src/addon/mod/imscp/components/index/index.ts b/src/addon/mod/imscp/components/index/index.ts
index 3b793da19..1c7dce1b2 100644
--- a/src/addon/mod/imscp/components/index/index.ts
+++ b/src/addon/mod/imscp/components/index/index.ts
@@ -112,7 +112,7 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
                 this.domUtils.showErrorModal('core.errordownloadingsomefiles', true);
             }
 
-            // All data obtained, now fill the context menu.
+        }).finally(() => {
             this.fillContextMenu(refresh);
         });
     }
diff --git a/src/addon/mod/lesson/components/index/index.ts b/src/addon/mod/lesson/components/index/index.ts
index b179e7993..65411e0f2 100644
--- a/src/addon/mod/lesson/components/index/index.ts
+++ b/src/addon/mod/lesson/components/index/index.ts
@@ -211,6 +211,8 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
                     this.lessonReady(refresh);
                 }
             });
+        }).finally(() => {
+            this.fillContextMenu(refresh);
         });
     }
 
@@ -336,9 +338,6 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
             // Store the password in DB.
             this.lessonProvider.storePassword(this.lesson.id, this.password);
         }
-
-        // All data obtained, now fill the context menu.
-        this.fillContextMenu(refresh);
     }
 
     /**
diff --git a/src/addon/mod/lti/components/index/index.ts b/src/addon/mod/lti/components/index/index.ts
index f61c1e50f..600ca24b5 100644
--- a/src/addon/mod/lti/components/index/index.ts
+++ b/src/addon/mod/lti/components/index/index.ts
@@ -67,8 +67,7 @@ export class AddonModLtiIndexComponent extends CoreCourseModuleMainActivityCompo
             this.lti = ltiData;
             this.description = this.lti.intro || this.description;
             this.dataRetrieved.emit(this.lti);
-        }).then(() => {
-            // All data obtained, now fill the context menu.
+        }).finally(() => {
             this.fillContextMenu(refresh);
         });
     }
diff --git a/src/addon/mod/page/components/index/index.ts b/src/addon/mod/page/components/index/index.ts
index 254bc0f38..bec1d8d23 100644
--- a/src/addon/mod/page/components/index/index.ts
+++ b/src/addon/mod/page/components/index/index.ts
@@ -127,8 +127,6 @@ export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComp
 
             // Get the page HTML.
             promises.push(this.pageHelper.getPageHtml(this.module.contents, this.module.id).then((content) => {
-                // All data obtained, now fill the context menu.
-                this.fillContextMenu(refresh);
 
                 this.contents = content;
 
@@ -139,6 +137,8 @@ export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComp
             }));
 
             return Promise.all(promises);
+        }).finally(() => {
+            this.fillContextMenu(refresh);
         });
     }
 }
diff --git a/src/addon/mod/quiz/components/index/index.ts b/src/addon/mod/quiz/components/index/index.ts
index cabdb8406..c5b8ae1f7 100644
--- a/src/addon/mod/quiz/components/index/index.ts
+++ b/src/addon/mod/quiz/components/index/index.ts
@@ -224,11 +224,10 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
             });
 
         }).then(() => {
-            // All data obtained, now fill the context menu.
-            this.fillContextMenu(refresh);
-
             // Quiz is ready to be shown, move it to the variable that is displayed.
             this.quiz = this.quizData;
+        }).finally(() => {
+            this.fillContextMenu(refresh);
         });
     }
 
diff --git a/src/addon/mod/resource/components/index/index.ts b/src/addon/mod/resource/components/index/index.ts
index ab8ccffac..52ec1bcfc 100644
--- a/src/addon/mod/resource/components/index/index.ts
+++ b/src/addon/mod/resource/components/index/index.ts
@@ -135,8 +135,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
             } else {
                 this.mode = 'external';
             }
-        }).then(() => {
-            // All data obtained, now fill the context menu.
+        }).finally(() => {
             this.fillContextMenu(refresh);
         });
     }
diff --git a/src/addon/mod/scorm/components/index/index.ts b/src/addon/mod/scorm/components/index/index.ts
index 6672548b7..ea51cd2a4 100644
--- a/src/addon/mod/scorm/components/index/index.ts
+++ b/src/addon/mod/scorm/components/index/index.ts
@@ -254,8 +254,7 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
                     }
                 });
             });
-        }).then(() => {
-            // All data obtained, now fill the context menu.
+        }).finally(() => {
             this.fillContextMenu(refresh);
         });
     }
diff --git a/src/addon/mod/survey/components/index/index.ts b/src/addon/mod/survey/components/index/index.ts
index 8b6cfbb65..23b279d47 100644
--- a/src/addon/mod/survey/components/index/index.ts
+++ b/src/addon/mod/survey/components/index/index.ts
@@ -126,8 +126,7 @@ export class AddonModSurveyIndexComponent extends CoreCourseModuleMainActivityCo
             if (!this.survey.surveydone && !this.hasOffline) {
                 return this.fetchQuestions();
             }
-        }).then(() => {
-            // All data obtained, now fill the context menu.
+        }).finally(() => {
             this.fillContextMenu(refresh);
         });
     }
diff --git a/src/addon/mod/wiki/components/index/index.ts b/src/addon/mod/wiki/components/index/index.ts
index cb91ef072..79b2b9089 100644
--- a/src/addon/mod/wiki/components/index/index.ts
+++ b/src/addon/mod/wiki/components/index/index.ts
@@ -299,8 +299,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
                     return this.fetchWikiPage();
                 });
             });
-        }).then(() => {
-            // All data obtained, now fill the context menu.
+        }).finally(() => {
             this.fillContextMenu(refresh);
         }).catch((error) => {
             if (this.pageWarning) {
diff --git a/src/addon/mod/workshop/components/index/index.ts b/src/addon/mod/workshop/components/index/index.ts
index 6e96123a2..7369f8a5e 100644
--- a/src/addon/mod/workshop/components/index/index.ts
+++ b/src/addon/mod/workshop/components/index/index.ts
@@ -231,8 +231,7 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
             });
         }).then(() => {
             return this.setPhaseInfo();
-        }).then(() => {
-            // All data obtained, now fill the context menu.
+        }).finally(() => {
             this.fillContextMenu(refresh);
         });
     }

From 4e590b26dc8f0fe83d9fdafaa51c00a0fd7f8543 Mon Sep 17 00:00:00 2001
From: Mark Johnson <mark.johnson@open.ac.uk>
Date: Wed, 11 Sep 2019 09:20:56 +0100
Subject: [PATCH 007/257] MOBILE-3143 Tabs: Prevent tabs disappearing when
 scrolling down.

---
 src/components/tabs/tabs.ts | 48 +++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/src/components/tabs/tabs.ts b/src/components/tabs/tabs.ts
index ba7b9fdb1..5715c32bb 100644
--- a/src/components/tabs/tabs.ts
+++ b/src/components/tabs/tabs.ts
@@ -223,10 +223,8 @@ export class CoreTabsComponent implements OnInit, AfterViewInit, OnChanges, OnDe
             return;
         }
 
-        setTimeout(() => {
-            this.calculateMaxSlides();
-            this.updateSlides();
-        });
+        this.calculateMaxSlides();
+        this.updateSlides();
     }
 
     /**
@@ -352,32 +350,30 @@ export class CoreTabsComponent implements OnInit, AfterViewInit, OnChanges, OnDe
 
         this.slideChanged();
 
-        setTimeout(() => {
-            this.calculateTabBarHeight();
-            this.slides.update();
-            this.slides.resize();
+        this.calculateTabBarHeight();
+        this.slides.update();
+        this.slides.resize();
 
-            if (!this.hasSliddenToInitial && this.selected && this.selected >= this.slidesShown) {
-                this.hasSliddenToInitial = true;
-                this.shouldSlideToInitial = true;
-
-                setTimeout(() => {
-                    if (this.shouldSlideToInitial) {
-                        this.slides.slideTo(this.selected, 0);
-                        this.shouldSlideToInitial = false;
-                        this.updateAriaHidden(); // Slide's slideTo() sets aria-hidden to true, update it.
-                    }
-                }, 400);
-
-                return;
-            } else if (this.selected) {
-                this.hasSliddenToInitial = true;
-            }
+        if (!this.hasSliddenToInitial && this.selected && this.selected >= this.slidesShown) {
+            this.hasSliddenToInitial = true;
+            this.shouldSlideToInitial = true;
 
             setTimeout(() => {
-                this.updateAriaHidden(); // Slide's update() sets aria-hidden to true, update it.
+                if (this.shouldSlideToInitial) {
+                    this.slides.slideTo(this.selected, 0);
+                    this.shouldSlideToInitial = false;
+                    this.updateAriaHidden(); // Slide's slideTo() sets aria-hidden to true, update it.
+                }
             }, 400);
-        });
+
+            return;
+        } else if (this.selected) {
+            this.hasSliddenToInitial = true;
+        }
+
+        setTimeout(() => {
+            this.updateAriaHidden(); // Slide's update() sets aria-hidden to true, update it.
+        }, 400);
     }
 
     protected calculateMaxSlides(): void {

From b55cab45d71650a87372dce00f2e036dd7927003 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Tue, 10 Sep 2019 16:29:25 +0200
Subject: [PATCH 008/257] MOBILE-3147 scripts: Script to remove jsdoc types

---
 scripts/remove-jsdocs-types.js | 71 ++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 scripts/remove-jsdocs-types.js

diff --git a/scripts/remove-jsdocs-types.js b/scripts/remove-jsdocs-types.js
new file mode 100644
index 000000000..0392c4d1c
--- /dev/null
+++ b/scripts/remove-jsdocs-types.js
@@ -0,0 +1,71 @@
+const fs = require('fs')
+const path = require('path')
+
+const srcPath = path.join(__dirname, '..', 'src')
+
+function findFiles(dirPath) {
+    const result = []
+    const entries = fs.readdirSync(dirPath, {withFileTypes: true})
+
+    entries.forEach((entry) => {
+        const entryPath = path.join(dirPath, entry.name)
+        if (entry.isFile() && entry.name.endsWith('.ts')) {
+            result.push(entryPath)
+        } else if (entry.isDirectory()) {
+            result.push(...findFiles(entryPath))
+        }
+    })
+
+    return result
+}
+
+findFiles(srcPath).forEach((file) => {
+    let src = fs.readFileSync(file, 'utf-8')
+
+    // Fix wrong use of @type instead of @return.
+    src = src.replace(/(\n +\* \@param [^\n]*\n +\* )\@type /g, (match, p1) => p1 + '@return ')
+    
+    // Remove square brackets and default values from @param lines.
+    src = src.replace(/(\n +\* @param +\{[^\n]+\} +)\[(\w+)[^\]\n]*\]/g, (match, p1, p2) => p1 + p2)
+
+    // Remove types from @param and @return lines.
+    src = src.replace(/(\n +\* \@(?:param|returns?) *)([a-zA-Z0-9_]+ *)?(\{[^\n]*)/g, (match, p1, p2, p3) => {
+        p2 = p2 || ''
+        let brackets = 1;
+        let end = 0;
+        for (let i = 1; brackets > 0 && i < p3.length; i++) {
+            if (p3[i] == '{') {
+                brackets++
+            } else if (p3[i] == '}') {
+                brackets--
+                end = i + 1
+            }
+        }
+        p1 = p1.trimEnd().replace('@returns', '@return')
+        p2 = p2.trim()
+        p3 = p3.slice(end).trim().replace(/^([a-zA-Z0-9_]+) +/, '$1 ')
+        if (!p2 && !p3) return ''
+        return p1 + ' ' + p2 + (p2 && p3 ? ' ' + p3 : p3)
+    })
+
+    // Remove @type lines.
+    src = src.replace(/\n +\* \@type .*\n/g, '\n')
+
+    // Remove consecutive empty doc lines.
+    src = src.replace(/\n *\* *(\n *\*\/? *\n)/g, (match, p1) => p1)
+
+    // Remove empty docs.
+    src = src.replace(/\n *\/\*\*[ \n\*]+\*\/ *\n/g, '\n')
+
+    // Fix indentation.
+    src = src.replace(/(\n +\* +(?:@param \w+|@return) )([^\n]*)((?:\n +\* +[^@\n][^\n]+)+)/g, (match, p1, p2, p3) => {
+        const indent = p1.length
+        p3 = p3.replace(/(\n +\*)( +)([^\n]+)/g, (match, p1, p2, p3) => {
+            p2 = new Array(Math.max(0, indent - p1.length + 1)).join(' ')
+            return p1 + p2 + p3
+        })
+        return p1 + p2 + p3
+    })
+
+    fs.writeFileSync(file, src)
+})

From a7c2d22cb89fc428e433d7143b3270bc5cb37239 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Tue, 10 Sep 2019 16:48:56 +0200
Subject: [PATCH 009/257] MOBILE-3147 doc: Remove jsdoc types from all
 typescript files

---
 .../badges/pages/issued-badge/issued-badge.ts |   4 +-
 .../badges/pages/user-badges/user-badges.ts   |   6 +-
 .../badges/providers/badge-link-handler.ts    |  20 +-
 src/addon/badges/providers/badges.ts          |  26 +-
 .../badges/providers/mybadges-link-handler.ts |  20 +-
 .../badges/providers/push-click-handler.ts    |   8 +-
 src/addon/badges/providers/user-handler.ts    |  14 +-
 .../activitymodules/activitymodules.ts        |   4 +-
 .../providers/block-handler.ts                |  10 +-
 .../block/badges/providers/block-handler.ts   |  10 +-
 .../block/blogmenu/providers/block-handler.ts |  10 +-
 .../blogrecent/providers/block-handler.ts     |  10 +-
 .../block/blogtags/providers/block-handler.ts |  10 +-
 .../calendarmonth/providers/block-handler.ts  |  10 +-
 .../providers/block-handler.ts                |  10 +-
 .../block/comments/providers/block-handler.ts |  10 +-
 .../providers/block-handler.ts                |  10 +-
 .../glossaryrandom/providers/block-handler.ts |  10 +-
 .../block/html/providers/block-handler.ts     |  10 +-
 .../learningplans/providers/block-handler.ts  |  10 +-
 .../components/myoverview/myoverview.ts       |  14 +-
 .../myoverview/providers/block-handler.ts     |  12 +-
 .../newsitems/providers/block-handler.ts      |  10 +-
 .../onlineusers/providers/block-handler.ts    |  10 +-
 .../privatefiles/providers/block-handler.ts   |  10 +-
 .../recentactivity/providers/block-handler.ts |  10 +-
 .../recentlyaccessedcourses.ts                |   6 +-
 .../providers/block-handler.ts                |  10 +-
 .../recentlyaccesseditems.ts                  |   8 +-
 .../providers/block-handler.ts                |  10 +-
 .../providers/recentlyaccesseditems.ts        |  10 +-
 .../rssclient/providers/block-handler.ts      |  10 +-
 .../selfcompletion/providers/block-handler.ts |  10 +-
 .../components/sitemainmenu/sitemainmenu.ts   |   4 +-
 .../sitemainmenu/providers/block-handler.ts   |  10 +-
 .../starredcourses/starredcourses.ts          |   6 +-
 .../starredcourses/providers/block-handler.ts |  10 +-
 .../block/tags/providers/block-handler.ts     |  10 +-
 .../timeline/components/events/events.ts      |  10 +-
 .../timeline/components/timeline/timeline.ts  |  16 +-
 .../block/timeline/providers/block-handler.ts |  12 +-
 .../block/timeline/providers/timeline.ts      |  52 +-
 src/addon/blog/components/entries/entries.ts  |  12 +-
 src/addon/blog/providers/blog.ts              |  28 +-
 .../blog/providers/course-option-handler.ts   |  30 +-
 .../blog/providers/index-link-handler.ts      |  20 +-
 src/addon/blog/providers/mainmenu-handler.ts  |   4 +-
 src/addon/blog/providers/tag-area-handler.ts  |  10 +-
 src/addon/blog/providers/user-handler.ts      |  14 +-
 .../calendar/components/calendar/calendar.ts  |  26 +-
 .../upcoming-events/upcoming-events.ts        |  20 +-
 src/addon/calendar/pages/day/day.ts           |  50 +-
 .../calendar/pages/edit-event/edit-event.ts   |  22 +-
 src/addon/calendar/pages/event/event.ts       |  30 +-
 src/addon/calendar/pages/index/index.ts       |  30 +-
 src/addon/calendar/pages/list/list.ts         |  64 +-
 src/addon/calendar/pages/settings/settings.ts |   2 +-
 .../calendar/providers/calendar-offline.ts    |  78 +-
 src/addon/calendar/providers/calendar-sync.ts |  28 +-
 src/addon/calendar/providers/calendar.ts      | 426 ++++-----
 src/addon/calendar/providers/helper.ts        |  64 +-
 .../calendar/providers/mainmenu-handler.ts    |   4 +-
 .../calendar/providers/sync-cron-handler.ts   |   8 +-
 .../calendar/providers/view-link-handler.ts   |  20 +-
 .../competency/components/course/course.ts    |   8 +-
 .../pages/competencies/competencies.ts        |   6 +-
 .../competency/pages/competency/competency.ts |   6 +-
 .../competencysummary/competencysummary.ts    |   6 +-
 src/addon/competency/pages/plan/plan.ts       |   6 +-
 .../competency/pages/planlist/planlist.ts     |   6 +-
 .../providers/competency-link-handler.ts      |  20 +-
 src/addon/competency/providers/competency.ts  | 174 ++--
 .../providers/course-option-handler.ts        |  30 +-
 src/addon/competency/providers/helper.ts      |  10 +-
 .../competency/providers/mainmenu-handler.ts  |   4 +-
 .../competency/providers/plan-link-handler.ts |  20 +-
 .../providers/plans-link-handler.ts           |  20 +-
 .../providers/push-click-handler.ts           |   8 +-
 .../providers/user-competency-link-handler.ts |  20 +-
 .../competency/providers/user-handler.ts      |  14 +-
 .../components/report/report.ts               |   4 +-
 .../providers/course-option-handler.ts        |  28 +-
 .../providers/coursecompletion.ts             |  50 +-
 .../providers/user-handler.ts                 |  14 +-
 src/addon/files/pages/list/list.ts            |   6 +-
 src/addon/files/providers/files.ts            | 100 +-
 src/addon/files/providers/helper.ts           |   4 +-
 src/addon/files/providers/mainmenu-handler.ts |   4 +-
 .../airnotifier/pages/devices/devices.ts      |   8 +-
 .../airnotifier/providers/airnotifier.ts      |  20 +-
 .../airnotifier/providers/handler.ts          |   6 +-
 src/addon/messageoutput/providers/delegate.ts |  14 +-
 .../confirmed-contacts/confirmed-contacts.ts  |  16 +-
 .../contact-requests/contact-requests.ts      |  16 +-
 .../messages/components/contacts/contacts.ts  |  22 +-
 .../components/discussions/discussions.ts     |  18 +-
 src/addon/messages/pages/contacts/contacts.ts |   6 +-
 .../conversation-info/conversation-info.ts    |  16 +-
 .../messages/pages/discussion/discussion.ts   |  86 +-
 .../group-conversations.ts                    |  68 +-
 src/addon/messages/pages/index/index.ts       |   4 +-
 src/addon/messages/pages/search/search.ts     |  16 +-
 src/addon/messages/pages/settings/settings.ts |  12 +-
 .../providers/contact-request-link-handler.ts |  20 +-
 .../providers/discussion-link-handler.ts      |  20 +-
 .../messages/providers/index-link-handler.ts  |  20 +-
 .../messages/providers/mainmenu-handler.ts    |  32 +-
 .../messages/providers/messages-offline.ts    |  86 +-
 src/addon/messages/providers/messages.ts      | 715 +++++++-------
 .../messages/providers/push-click-handler.ts  |   8 +-
 .../messages/providers/settings-handler.ts    |   4 +-
 .../messages/providers/sync-cron-handler.ts   |   8 +-
 src/addon/messages/providers/sync.ts          |  44 +-
 .../providers/user-add-contact-handler.ts     |  27 +-
 .../providers/user-block-contact-handler.ts   |  23 +-
 .../providers/user-send-message-handler.ts    |  14 +-
 .../assign/classes/base-feedback-handler.ts   |  90 +-
 .../assign/classes/base-submission-handler.ts | 130 +--
 .../classes/feedback-plugin-component.ts      |   4 +-
 .../classes/submission-plugin-component.ts    |   2 +-
 .../feedback-plugin/feedback-plugin.ts        |   2 +-
 .../mod/assign/components/index/index.ts      |  28 +-
 .../submission-plugin/submission-plugin.ts    |   2 +-
 .../components/submission/submission.ts       |  28 +-
 .../feedback/comments/component/comments.ts   |   6 +-
 .../feedback/comments/providers/handler.ts    |  94 +-
 .../feedback/editpdf/providers/handler.ts     |  18 +-
 .../assign/feedback/file/providers/handler.ts |  18 +-
 .../edit-feedback-modal.ts                    |  10 +-
 src/addon/mod/assign/pages/edit/edit.ts       |  14 +-
 src/addon/mod/assign/pages/index/index.ts     |   2 +-
 .../pages/submission-list/submission-list.ts  |  12 +-
 .../submission-review/submission-review.ts    |   8 +-
 .../mod/assign/providers/assign-offline.ts    | 136 +--
 src/addon/mod/assign/providers/assign-sync.ts |  60 +-
 src/addon/mod/assign/providers/assign.ts      | 376 ++++----
 .../mod/assign/providers/feedback-delegate.ts | 191 ++--
 src/addon/mod/assign/providers/helper.ts      | 178 ++--
 .../mod/assign/providers/list-link-handler.ts |   2 +-
 .../mod/assign/providers/module-handler.ts    |  16 +-
 .../mod/assign/providers/prefetch-handler.ts  |  94 +-
 .../assign/providers/push-click-handler.ts    |   8 +-
 .../assign/providers/submission-delegate.ts   | 271 +++---
 .../mod/assign/providers/sync-cron-handler.ts |   8 +-
 .../submission/comments/component/comments.ts |   2 +-
 .../submission/comments/providers/handler.ts  |  30 +-
 .../submission/file/providers/handler.ts      | 120 +--
 .../onlinetext/component/onlinetext.ts        |   2 +-
 .../onlinetext/providers/handler.ts           | 106 +--
 src/addon/mod/book/components/index/index.ts  |  16 +-
 src/addon/mod/book/pages/index/index.ts       |   2 +-
 src/addon/mod/book/pages/toc/toc.ts           |   2 +-
 src/addon/mod/book/providers/book.ts          |  93 +-
 src/addon/mod/book/providers/link-handler.ts  |  10 +-
 .../mod/book/providers/list-link-handler.ts   |  10 +-
 .../mod/book/providers/module-handler.ts      |  18 +-
 .../mod/book/providers/prefetch-handler.ts    |  28 +-
 .../mod/book/providers/tag-area-handler.ts    |  10 +-
 src/addon/mod/chat/components/index/index.ts  |   8 +-
 src/addon/mod/chat/pages/chat/chat.ts         |  16 +-
 src/addon/mod/chat/pages/index/index.ts       |   2 +-
 .../session-messages/session-messages.ts      |  10 +-
 src/addon/mod/chat/pages/sessions/sessions.ts |  12 +-
 src/addon/mod/chat/pages/users/users.ts       |   4 +-
 src/addon/mod/chat/providers/chat.ts          | 130 +--
 .../mod/chat/providers/module-handler.ts      |  16 +-
 .../mod/chat/providers/prefetch-handler.ts    |  46 +-
 .../mod/choice/components/index/index.ts      |  34 +-
 src/addon/mod/choice/pages/index/index.ts     |   2 +-
 src/addon/mod/choice/providers/choice.ts      | 146 +--
 .../mod/choice/providers/module-handler.ts    |  16 +-
 src/addon/mod/choice/providers/offline.ts     |  44 +-
 .../mod/choice/providers/prefetch-handler.ts  |  46 +-
 .../mod/choice/providers/sync-cron-handler.ts |   8 +-
 src/addon/mod/choice/providers/sync.ts        |  34 +-
 .../data/classes/field-plugin-component.ts    |   6 +-
 .../mod/data/components/action/action.ts      |   2 +-
 src/addon/mod/data/components/index/index.ts  |  32 +-
 .../fields/checkbox/component/checkbox.ts     |   2 +-
 .../data/fields/checkbox/providers/handler.ts |  42 +-
 .../mod/data/fields/date/providers/handler.ts |  42 +-
 .../mod/data/fields/file/component/file.ts    |   6 +-
 .../mod/data/fields/file/providers/handler.ts |  46 +-
 .../data/fields/latlong/component/latlong.ts  |  14 +-
 .../data/fields/latlong/providers/handler.ts  |  42 +-
 .../mod/data/fields/menu/providers/handler.ts |  42 +-
 .../fields/multimenu/component/multimenu.ts   |   2 +-
 .../fields/multimenu/providers/handler.ts     |  42 +-
 .../data/fields/number/providers/handler.ts   |  20 +-
 .../data/fields/picture/component/picture.ts  |  12 +-
 .../data/fields/picture/providers/handler.ts  |  46 +-
 .../fields/radiobutton/providers/handler.ts   |  42 +-
 .../mod/data/fields/text/providers/handler.ts |  42 +-
 .../fields/textarea/component/textarea.ts     |   4 +-
 .../data/fields/textarea/providers/handler.ts |  34 +-
 .../mod/data/fields/url/providers/handler.ts  |  18 +-
 src/addon/mod/data/pages/edit/edit.ts         |  16 +-
 src/addon/mod/data/pages/entry/entry.ts       |  24 +-
 src/addon/mod/data/pages/index/index.ts       |   2 +-
 src/addon/mod/data/pages/search/search.ts     |  12 +-
 .../data/providers/approve-link-handler.ts    |  20 +-
 src/addon/mod/data/providers/data.ts          | 350 +++----
 .../data/providers/default-field-handler.ts   |  40 +-
 .../mod/data/providers/delete-link-handler.ts |  20 +-
 .../mod/data/providers/edit-link-handler.ts   |  20 +-
 .../mod/data/providers/fields-delegate.ts     | 105 +--
 src/addon/mod/data/providers/helper.ts        | 190 ++--
 .../mod/data/providers/list-link-handler.ts   |   2 +-
 .../mod/data/providers/module-handler.ts      |  16 +-
 src/addon/mod/data/providers/offline.ts       | 100 +-
 .../mod/data/providers/prefetch-handler.ts    |  92 +-
 .../mod/data/providers/show-link-handler.ts   |  20 +-
 .../mod/data/providers/sync-cron-handler.ts   |   8 +-
 src/addon/mod/data/providers/sync.ts          |  48 +-
 .../mod/data/providers/tag-area-handler.ts    |  10 +-
 .../mod/feedback/components/index/index.ts    |  46 +-
 .../mod/feedback/pages/attempt/attempt.ts     |   2 +-
 src/addon/mod/feedback/pages/form/form.ts     |  10 +-
 src/addon/mod/feedback/pages/index/index.ts   |   2 +-
 .../pages/nonrespondents/nonrespondents.ts    |  12 +-
 .../feedback/pages/respondents/respondents.ts |  14 +-
 .../providers/analysis-link-handler.ts        |  20 +-
 .../providers/complete-link-handler.ts        |  20 +-
 src/addon/mod/feedback/providers/feedback.ts  | 382 ++++----
 src/addon/mod/feedback/providers/helper.ts    |  96 +-
 .../feedback/providers/list-link-handler.ts   |   2 +-
 .../mod/feedback/providers/module-handler.ts  |  16 +-
 src/addon/mod/feedback/providers/offline.ts   |  44 +-
 .../feedback/providers/prefetch-handler.ts    |  62 +-
 .../feedback/providers/print-link-handler.ts  |  20 +-
 .../feedback/providers/push-click-handler.ts  |   8 +-
 .../providers/show-entries-link-handler.ts    |  20 +-
 .../show-non-respondents-link-handler.ts      |  20 +-
 .../feedback/providers/sync-cron-handler.ts   |   8 +-
 src/addon/mod/feedback/providers/sync.ts      |  46 +-
 .../mod/folder/components/index/index.ts      |   8 +-
 src/addon/mod/folder/pages/index/index.ts     |   2 +-
 src/addon/mod/folder/providers/folder.ts      |  45 +-
 src/addon/mod/folder/providers/helper.ts      |   4 +-
 .../mod/folder/providers/module-handler.ts    |  16 +-
 .../folder/providers/pluginfile-handler.ts    |   8 +-
 .../mod/folder/providers/prefetch-handler.ts  |  26 +-
 src/addon/mod/forum/components/index/index.ts |  42 +-
 src/addon/mod/forum/components/post/post.ts   |  16 +-
 .../mod/forum/pages/discussion/discussion.ts  |  40 +-
 src/addon/mod/forum/pages/index/index.ts      |   2 +-
 .../pages/new-discussion/new-discussion.ts    |  30 +-
 .../sort-order-selector.ts                    |   2 +-
 .../providers/discussion-link-handler.ts      |  22 +-
 src/addon/mod/forum/providers/forum.ts        | 280 +++---
 src/addon/mod/forum/providers/helper.ts       | 136 ++-
 .../mod/forum/providers/index-link-handler.ts |  20 +-
 .../mod/forum/providers/module-handler.ts     |  26 +-
 src/addon/mod/forum/providers/offline.ts      | 156 +--
 .../mod/forum/providers/post-link-handler.ts  |  20 +-
 .../mod/forum/providers/prefetch-handler.ts   |  64 +-
 .../mod/forum/providers/push-click-handler.ts |   8 +-
 .../mod/forum/providers/sync-cron-handler.ts  |   8 +-
 src/addon/mod/forum/providers/sync.ts         | 106 +--
 .../mod/forum/providers/tag-area-handler.ts   |  10 +-
 .../mod/glossary/components/index/index.ts    |  40 +-
 .../components/mode-picker/mode-picker.ts     |   6 +-
 src/addon/mod/glossary/pages/edit/edit.ts     |   4 +-
 src/addon/mod/glossary/pages/entry/entry.ts   |   8 +-
 src/addon/mod/glossary/pages/index/index.ts   |   2 +-
 .../glossary/providers/edit-link-handler.ts   |  20 +-
 .../glossary/providers/entry-link-handler.ts  |  10 +-
 src/addon/mod/glossary/providers/glossary.ts  | 420 ++++-----
 src/addon/mod/glossary/providers/helper.ts    |  54 +-
 .../mod/glossary/providers/module-handler.ts  |  18 +-
 src/addon/mod/glossary/providers/offline.ts   |  84 +-
 .../glossary/providers/prefetch-handler.ts    |  50 +-
 .../glossary/providers/sync-cron-handler.ts   |   8 +-
 src/addon/mod/glossary/providers/sync.ts      |  60 +-
 .../glossary/providers/tag-area-handler.ts    |  10 +-
 src/addon/mod/imscp/components/index/index.ts |  12 +-
 src/addon/mod/imscp/pages/index/index.ts      |   2 +-
 src/addon/mod/imscp/pages/toc/toc.ts          |   6 +-
 src/addon/mod/imscp/providers/imscp.ts        |  94 +-
 .../mod/imscp/providers/list-link-handler.ts  |   2 +-
 .../mod/imscp/providers/module-handler.ts     |  16 +-
 .../mod/imscp/providers/pluginfile-handler.ts |   8 +-
 .../mod/imscp/providers/prefetch-handler.ts   |  38 +-
 src/addon/mod/label/providers/label.ts        |  64 +-
 .../mod/label/providers/module-handler.ts     |  18 +-
 .../mod/label/providers/prefetch-handler.ts   |  20 +-
 .../mod/lesson/components/index/index.ts      |  48 +-
 src/addon/mod/lesson/pages/index/index.ts     |   2 +-
 .../mod/lesson/pages/menu-modal/menu-modal.ts |   3 +-
 .../pages/password-modal/password-modal.ts    |   4 +-
 src/addon/mod/lesson/pages/player/player.ts   |  46 +-
 .../lesson/pages/user-retake/user-retake.ts   |  12 +-
 .../lesson/providers/grade-link-handler.ts    |  22 +-
 src/addon/mod/lesson/providers/helper.ts      |  44 +-
 .../lesson/providers/index-link-handler.ts    |  32 +-
 .../mod/lesson/providers/lesson-offline.ts    | 190 ++--
 src/addon/mod/lesson/providers/lesson-sync.ts |  74 +-
 src/addon/mod/lesson/providers/lesson.ts      | 891 +++++++++---------
 .../mod/lesson/providers/list-link-handler.ts |   2 +-
 .../mod/lesson/providers/module-handler.ts    |  16 +-
 .../mod/lesson/providers/prefetch-handler.ts  |  88 +-
 .../lesson/providers/push-click-handler.ts    |   8 +-
 .../lesson/providers/report-link-handler.ts   |  48 +-
 .../mod/lesson/providers/sync-cron-handler.ts |   8 +-
 src/addon/mod/lti/components/index/index.ts   |  10 +-
 src/addon/mod/lti/pages/index/index.ts        |   2 +-
 src/addon/mod/lti/providers/lti.ts            |  48 +-
 src/addon/mod/lti/providers/module-handler.ts |  16 +-
 src/addon/mod/page/components/index/index.ts  |   6 +-
 src/addon/mod/page/pages/index/index.ts       |   2 +-
 src/addon/mod/page/providers/helper.ts        |  10 +-
 .../mod/page/providers/list-link-handler.ts   |   2 +-
 .../mod/page/providers/module-handler.ts      |  16 +-
 src/addon/mod/page/providers/page.ts          |  49 +-
 .../mod/page/providers/pluginfile-handler.ts  |   8 +-
 .../mod/page/providers/prefetch-handler.ts    |  26 +-
 .../delaybetweenattempts/providers/handler.ts |  12 +-
 .../ipaddress/providers/handler.ts            |  12 +-
 .../numattempts/providers/handler.ts          |  12 +-
 .../offlineattempts/providers/handler.ts      |  28 +-
 .../openclosedate/providers/handler.ts        |  20 +-
 .../accessrules/password/providers/handler.ts |  72 +-
 .../safebrowser/providers/handler.ts          |  12 +-
 .../securewindow/providers/handler.ts         |  12 +-
 .../timelimit/providers/handler.ts            |  24 +-
 src/addon/mod/quiz/classes/auto-save.ts       |  40 +-
 src/addon/mod/quiz/components/index/index.ts  |  34 +-
 src/addon/mod/quiz/pages/attempt/attempt.ts   |   8 +-
 src/addon/mod/quiz/pages/index/index.ts       |   2 +-
 .../navigation-modal/navigation-modal.ts      |   5 +-
 src/addon/mod/quiz/pages/player/player.ts     |  46 +-
 .../pages/preflight-modal/preflight-modal.ts  |   2 +-
 src/addon/mod/quiz/pages/review/review.ts     |  20 +-
 .../quiz/providers/access-rules-delegate.ts   | 147 ++-
 .../mod/quiz/providers/grade-link-handler.ts  |  10 +-
 src/addon/mod/quiz/providers/helper.ts        |  90 +-
 .../mod/quiz/providers/index-link-handler.ts  |  10 +-
 .../mod/quiz/providers/module-handler.ts      |  16 +-
 .../mod/quiz/providers/prefetch-handler.ts    | 124 +--
 .../mod/quiz/providers/push-click-handler.ts  |   8 +-
 src/addon/mod/quiz/providers/quiz-offline.ts  |  90 +-
 src/addon/mod/quiz/providers/quiz-sync.ts     |  78 +-
 src/addon/mod/quiz/providers/quiz.ts          | 674 ++++++-------
 .../mod/quiz/providers/review-link-handler.ts |  22 +-
 .../mod/quiz/providers/sync-cron-handler.ts   |   8 +-
 .../mod/resource/components/index/index.ts    |   6 +-
 src/addon/mod/resource/pages/index/index.ts   |   2 +-
 src/addon/mod/resource/providers/helper.ts    |  30 +-
 .../resource/providers/list-link-handler.ts   |   2 +-
 .../mod/resource/providers/module-handler.ts  |  28 +-
 .../resource/providers/pluginfile-handler.ts  |   8 +-
 .../resource/providers/prefetch-handler.ts    |  42 +-
 src/addon/mod/resource/providers/resource.ts  |  50 +-
 src/addon/mod/scorm/classes/data-model-12.ts  |  82 +-
 src/addon/mod/scorm/components/index/index.ts |  48 +-
 src/addon/mod/scorm/pages/index/index.ts      |   2 +-
 src/addon/mod/scorm/pages/player/player.ts    |  20 +-
 src/addon/mod/scorm/pages/toc/toc.ts          |   2 +-
 src/addon/mod/scorm/providers/helper.ts       |  80 +-
 .../mod/scorm/providers/module-handler.ts     |  16 +-
 .../mod/scorm/providers/pluginfile-handler.ts |   8 +-
 .../mod/scorm/providers/prefetch-handler.ts   | 125 ++-
 .../mod/scorm/providers/scorm-offline.ts      | 236 ++---
 src/addon/mod/scorm/providers/scorm-sync.ts   | 139 ++-
 src/addon/mod/scorm/providers/scorm.ts        | 442 +++++----
 .../mod/scorm/providers/sync-cron-handler.ts  |   8 +-
 .../mod/survey/components/index/index.ts      |  24 +-
 src/addon/mod/survey/pages/index/index.ts     |   2 +-
 src/addon/mod/survey/providers/helper.ts      |  12 +-
 .../mod/survey/providers/module-handler.ts    |  16 +-
 src/addon/mod/survey/providers/offline.ts     |  50 +-
 .../mod/survey/providers/prefetch-handler.ts  |  48 +-
 src/addon/mod/survey/providers/survey.ts      | 100 +-
 .../mod/survey/providers/sync-cron-handler.ts |   8 +-
 src/addon/mod/survey/providers/sync.ts        |  34 +-
 src/addon/mod/url/components/index/index.ts   |  12 +-
 src/addon/mod/url/pages/index/index.ts        |   2 +-
 src/addon/mod/url/providers/helper.ts         |   2 +-
 src/addon/mod/url/providers/module-handler.ts |  26 +-
 src/addon/mod/url/providers/url.ts            |  54 +-
 src/addon/mod/wiki/components/index/index.ts  |  74 +-
 .../subwiki-picker/subwiki-picker.ts          |   6 +-
 src/addon/mod/wiki/pages/edit/edit.ts         |  22 +-
 src/addon/mod/wiki/pages/index/index.ts       |   2 +-
 .../mod/wiki/providers/create-link-handler.ts |  18 +-
 .../mod/wiki/providers/edit-link-handler.ts   |  10 +-
 .../mod/wiki/providers/module-handler.ts      |  16 +-
 .../providers/page-or-map-link-handler.ts     |  20 +-
 .../mod/wiki/providers/prefetch-handler.ts    |  68 +-
 .../mod/wiki/providers/sync-cron-handler.ts   |   8 +-
 .../mod/wiki/providers/tag-area-handler.ts    |  10 +-
 src/addon/mod/wiki/providers/wiki-offline.ts  |  76 +-
 src/addon/mod/wiki/providers/wiki-sync.ts     |  64 +-
 src/addon/mod/wiki/providers/wiki.ts          | 309 +++---
 .../accumulative/providers/handler.ts         |  24 +-
 .../assessment/comments/providers/handler.ts  |  24 +-
 .../assessment/numerrors/providers/handler.ts |  24 +-
 .../assessment/rubric/providers/handler.ts    |  24 +-
 .../assessment-strategy.ts                    |   8 +-
 .../mod/workshop/components/index/index.ts    |  34 +-
 .../workshop/pages/assessment/assessment.ts   |  12 +-
 .../pages/edit-submission/edit-submission.ts  |  12 +-
 src/addon/mod/workshop/pages/index/index.ts   |   2 +-
 src/addon/mod/workshop/pages/phase/phase.ts   |   2 +-
 .../workshop/pages/submission/submission.ts   |  16 +-
 .../providers/assessment-strategy-delegate.ts |  57 +-
 src/addon/mod/workshop/providers/helper.ts    | 212 ++---
 .../workshop/providers/list-link-handler.ts   |   2 +-
 .../mod/workshop/providers/module-handler.ts  |  16 +-
 src/addon/mod/workshop/providers/offline.ts   | 230 ++---
 .../workshop/providers/prefetch-handler.ts    |  72 +-
 .../workshop/providers/sync-cron-handler.ts   |   8 +-
 src/addon/mod/workshop/providers/sync.ts      |  70 +-
 src/addon/mod/workshop/providers/workshop.ts  | 540 +++++------
 src/addon/notes/components/list/list.ts       |  26 +-
 src/addon/notes/pages/add/add.ts              |   2 +-
 .../notes/providers/course-option-handler.ts  |  20 +-
 src/addon/notes/providers/notes-offline.ts    | 104 +-
 src/addon/notes/providers/notes-sync.ts       |  24 +-
 src/addon/notes/providers/notes.ts            | 120 +--
 .../notes/providers/sync-cron-handler.ts      |   8 +-
 src/addon/notes/providers/user-handler.ts     |  16 +-
 .../components/actions/actions.ts             |   4 +-
 src/addon/notifications/pages/list/list.ts    |  12 +-
 .../notifications/pages/settings/settings.ts  |  16 +-
 .../notifications/providers/cron-handler.ts   |  22 +-
 src/addon/notifications/providers/helper.ts   |  14 +-
 .../providers/mainmenu-handler.ts             |   6 +-
 .../notifications/providers/notifications.ts  | 104 +-
 .../providers/push-click-handler.ts           |   8 +-
 .../providers/settings-handler.ts             |   4 +-
 .../qbehaviour/adaptive/providers/handler.ts  |  10 +-
 .../adaptivenopenalty/providers/handler.ts    |  10 +-
 .../deferredcbm/providers/handler.ts          |  38 +-
 .../deferredfeedback/providers/handler.ts     |  44 +-
 .../immediatecbm/providers/handler.ts         |  10 +-
 .../immediatefeedback/providers/handler.ts    |  10 +-
 .../informationitem/providers/handler.ts      |  20 +-
 .../interactive/providers/handler.ts          |  10 +-
 .../interactivecountback/providers/handler.ts |  10 +-
 .../manualgraded/providers/handler.ts         |  44 +-
 .../qtype/calculated/providers/handler.ts     |  40 +-
 .../calculatedmulti/providers/handler.ts      |  28 +-
 .../calculatedsimple/providers/handler.ts     |  28 +-
 .../ddimageortext/classes/ddimageortext.ts    |  52 +-
 .../qtype/ddimageortext/providers/handler.ts  |  34 +-
 src/addon/qtype/ddmarker/classes/ddmarker.ts  | 116 +--
 .../qtype/ddmarker/classes/graphics_api.ts    |  10 +-
 src/addon/qtype/ddmarker/providers/handler.ts |  40 +-
 src/addon/qtype/ddwtos/classes/ddwtos.ts      |  66 +-
 src/addon/qtype/ddwtos/providers/handler.ts   |  34 +-
 .../qtype/description/providers/handler.ts    |  20 +-
 src/addon/qtype/essay/providers/handler.ts    |  48 +-
 .../qtype/gapselect/providers/handler.ts      |  34 +-
 src/addon/qtype/match/providers/handler.ts    |  34 +-
 .../qtype/multianswer/providers/handler.ts    |  40 +-
 .../qtype/multichoice/providers/handler.ts    |  52 +-
 .../qtype/randomsamatch/providers/handler.ts  |  28 +-
 .../qtype/shortanswer/providers/handler.ts    |  28 +-
 .../qtype/truefalse/providers/handler.ts      |  38 +-
 .../remotethemes/providers/remotethemes.ts    |  42 +-
 .../pages/course-storage/course-storage.ts    |   6 +-
 .../providers/coursemenu-handler.ts           |  18 +-
 .../checkbox/providers/handler.ts             |  16 +-
 .../datetime/providers/handler.ts             |  16 +-
 .../menu/providers/handler.ts                 |  16 +-
 .../text/providers/handler.ts                 |  16 +-
 .../textarea/providers/handler.ts             |  16 +-
 src/app/app.component.ts                      |   4 +-
 src/classes/base-sync.ts                      |  87 +-
 src/classes/cache.ts                          |  22 +-
 src/classes/delegate.ts                       |  91 +-
 src/classes/interceptor.ts                    |   6 +-
 src/classes/site.ts                           | 329 +++----
 src/classes/sqlitedb.ts                       | 330 +++----
 src/components/attachments/attachments.ts     |   8 +-
 src/components/chart/chart.ts                 |   4 +-
 .../context-menu/context-menu-item.ts         |   6 +-
 .../context-menu/context-menu-popover.ts      |   6 +-
 src/components/context-menu/context-menu.ts   |   8 +-
 .../course-picker-menu-popover.ts             |   6 +-
 .../download-refresh/download-refresh.ts      |   4 +-
 .../dynamic-component/dynamic-component.ts    |   8 +-
 src/components/file/file.ts                   |  10 +-
 src/components/icon/icon.ts                   |   4 +-
 src/components/iframe/iframe.ts               |   2 -
 .../infinite-loading/infinite-loading.ts      |  10 +-
 src/components/ion-tabs/ion-tabs.ts           |  31 +-
 src/components/local-file/local-file.ts       |  10 +-
 .../navbar-buttons/navbar-buttons.ts          |  14 +-
 src/components/recaptcha/recaptchamodal.ts    |   2 +-
 .../rich-text-editor/rich-text-editor.ts      |  38 +-
 src/components/search-box/search-box.ts       |   2 +-
 .../send-message-form/send-message-form.ts    |   6 +-
 src/components/show-password/show-password.ts |   2 +-
 src/components/split-view/split-view.ts       |  18 +-
 src/components/style/style.ts                 |   6 +-
 src/components/tabs/tab.ts                    |   4 +-
 src/components/tabs/tabs.ts                   |  14 +-
 .../block/classes/base-block-component.ts     |  24 +-
 src/core/block/classes/base-block-handler.ts  |  12 +-
 src/core/block/components/block/block.ts      |  10 +-
 .../components/course-blocks/course-blocks.ts |   4 +-
 src/core/block/providers/delegate.ts          |  53 +-
 src/core/block/providers/helper.ts            |   6 +-
 .../comments/components/comments/comments.ts  |  10 +-
 src/core/comments/pages/add/add.ts            |   2 +-
 src/core/comments/pages/viewer/viewer.ts      |  32 +-
 src/core/comments/providers/comments.ts       | 148 +--
 src/core/comments/providers/offline.ts        | 116 +--
 .../comments/providers/sync-cron-handler.ts   |   8 +-
 src/core/comments/providers/sync.ts           |  52 +-
 .../components/compile-html/compile-html.ts   |  12 +-
 src/core/compile/providers/compile.ts         |  30 +-
 src/core/contentlinks/classes/base-handler.ts |  33 +-
 .../classes/module-grade-handler.ts           |  34 +-
 .../classes/module-index-handler.ts           |  17 +-
 .../classes/module-list-handler.ts            |  17 +-
 .../pages/choose-site/choose-site.ts          |   2 +-
 src/core/contentlinks/providers/delegate.ts   |  77 +-
 src/core/contentlinks/providers/helper.ts     |  56 +-
 .../classes/activity-prefetch-handler.ts      |  64 +-
 src/core/course/classes/activity-sync.ts      |  10 +-
 .../course/classes/main-activity-component.ts |  56 +-
 .../course/classes/main-resource-component.ts |  28 +-
 .../course/classes/module-prefetch-handler.ts | 128 ++-
 .../classes/resource-prefetch-handler.ts      |  54 +-
 src/core/course/components/format/format.ts   |  38 +-
 .../module-completion/module-completion.ts    |   2 +-
 src/core/course/components/module/module.ts   |  10 +-
 .../course/components/tag-area/tag-area.ts    |   2 +-
 .../components/singleactivity.ts              |   8 +-
 .../singleactivity/providers/handler.ts       |  36 +-
 .../formats/topics/providers/handler.ts       |   2 +-
 .../course/formats/weeks/providers/handler.ts |  14 +-
 .../pages/list-mod-type/list-mod-type.ts      |   4 +-
 .../section-selector/section-selector.ts      |   2 +-
 src/core/course/pages/section/section.ts      |  18 +-
 src/core/course/providers/course-offline.ts   |  34 +-
 .../providers/course-tag-area-handler.ts      |  10 +-
 src/core/course/providers/course.ts           | 278 +++---
 src/core/course/providers/default-format.ts   |  48 +-
 src/core/course/providers/default-module.ts   |  20 +-
 src/core/course/providers/format-delegate.ts  | 159 ++--
 src/core/course/providers/helper.ts           | 316 +++----
 src/core/course/providers/log-cron-handler.ts |  10 +-
 src/core/course/providers/log-helper.ts       | 124 +--
 src/core/course/providers/module-delegate.ts  | 116 +--
 .../providers/module-prefetch-delegate.ts     | 343 ++++---
 .../providers/modules-tag-area-handler.ts     |  10 +-
 src/core/course/providers/options-delegate.ts | 176 ++--
 .../course/providers/sync-cron-handler.ts     |   8 +-
 src/core/course/providers/sync.ts             |  24 +-
 .../course-list-item/course-list-item.ts      |   2 +-
 .../course-options-menu.ts                    |   2 +-
 .../course-progress/course-progress.ts        |  12 +-
 .../components/my-courses/my-courses.ts       |   8 +-
 .../available-courses/available-courses.ts    |   4 +-
 .../courses/pages/categories/categories.ts    |   6 +-
 .../pages/course-preview/course-preview.ts    |  22 +-
 src/core/courses/pages/dashboard/dashboard.ts |   8 +-
 src/core/courses/pages/search/search.ts       |   6 +-
 .../self-enrol-password.ts                    |   4 +-
 .../courses/providers/course-link-handler.ts  |  48 +-
 .../providers/courses-index-link-handler.ts   |  10 +-
 src/core/courses/providers/courses.ts         | 300 +++---
 .../providers/dashboard-link-handler.ts       |  20 +-
 src/core/courses/providers/dashboard.ts       |  28 +-
 .../providers/enrol-push-click-handler.ts     |   8 +-
 src/core/courses/providers/helper.ts          |  28 +-
 .../courses/providers/mainmenu-handler.ts     |   8 +-
 .../providers/request-push-click-handler.ts   |   8 +-
 src/core/emulator/classes/filesystem.ts       | 104 +-
 .../emulator/classes/inappbrowserobject.ts    |  18 +-
 src/core/emulator/classes/sqlitedb.ts         |  18 +-
 .../pages/capture-media/capture-media.ts      |  10 +-
 src/core/emulator/providers/badge.ts          |  19 +-
 src/core/emulator/providers/camera.ts         |   6 +-
 src/core/emulator/providers/capture-helper.ts |  16 +-
 src/core/emulator/providers/clipboard.ts      |   6 +-
 src/core/emulator/providers/file-opener.ts    |  14 +-
 src/core/emulator/providers/file-transfer.ts  |  44 +-
 src/core/emulator/providers/file.ts           | 228 +++--
 src/core/emulator/providers/globalization.ts  |  36 +-
 src/core/emulator/providers/helper.ts         |  36 +-
 src/core/emulator/providers/inappbrowser.ts   |   8 +-
 .../emulator/providers/local-notifications.ts | 167 ++--
 src/core/emulator/providers/media-capture.ts  |  12 +-
 src/core/emulator/providers/network.ts        |   6 +-
 src/core/emulator/providers/push.ts           |  22 +-
 src/core/emulator/providers/zip.ts            |  14 +-
 .../fileuploader/providers/album-handler.ts   |   8 +-
 .../fileuploader/providers/audio-handler.ts   |   8 +-
 .../fileuploader/providers/camera-handler.ts  |   8 +-
 src/core/fileuploader/providers/delegate.ts   |  39 +-
 .../fileuploader/providers/file-handler.ts    |   8 +-
 .../fileuploader/providers/fileuploader.ts    | 113 ++-
 src/core/fileuploader/providers/helper.ts     | 168 ++--
 .../fileuploader/providers/video-handler.ts   |   8 +-
 src/core/grades/components/course/course.ts   |   8 +-
 src/core/grades/pages/courses/courses.ts      |   6 +-
 src/core/grades/pages/grade/grade.ts          |   4 +-
 .../grades/providers/course-option-handler.ts |  30 +-
 src/core/grades/providers/grades.ts           | 112 +--
 src/core/grades/providers/helper.ts           | 116 +--
 src/core/grades/providers/mainmenu-handler.ts |   4 +-
 .../grades/providers/overview-link-handler.ts |  20 +-
 src/core/grades/providers/user-handler.ts     |  24 +-
 .../grades/providers/user-link-handler.ts     |  22 +-
 .../login/pages/credentials/credentials.ts    |   8 +-
 .../login/pages/email-signup/email-signup.ts  |  14 +-
 .../forgotten-password/forgotten-password.ts  |   2 +-
 src/core/login/pages/init/init.ts             |   2 +-
 src/core/login/pages/reconnect/reconnect.ts   |   6 +-
 .../login/pages/site-policy/site-policy.ts    |   2 +-
 src/core/login/pages/site/site.ts             |  10 +-
 src/core/login/pages/sites/sites.ts           |   6 +-
 src/core/login/providers/helper.ts            | 250 +++--
 src/core/mainmenu/pages/menu/menu.ts          |   2 +-
 src/core/mainmenu/pages/more/more.ts          |   4 +-
 src/core/mainmenu/providers/delegate.ts       |  19 +-
 src/core/mainmenu/providers/mainmenu.ts       |  24 +-
 .../pushnotifications/providers/delegate.ts   |  39 +-
 .../providers/pushnotifications.ts            | 115 ++-
 .../providers/register-cron-handler.ts        |  10 +-
 .../providers/unregister-cron-handler.ts      |   6 +-
 .../classes/base-behaviour-handler.ts         |  20 +-
 .../classes/base-question-component.ts        |  16 +-
 .../question/classes/base-question-handler.ts |  54 +-
 .../question/components/question/question.ts  |   2 +-
 .../question/providers/behaviour-delegate.ts  |  41 +-
 src/core/question/providers/delegate.ts       | 129 ++-
 src/core/question/providers/helper.ts         | 112 +--
 src/core/question/providers/question.ts       | 167 ++--
 src/core/rating/pages/ratings/ratings.ts      |   4 +-
 src/core/rating/providers/offline.ts          |  94 +-
 src/core/rating/providers/rating.ts           | 128 +--
 src/core/rating/providers/sync.ts             |  56 +-
 src/core/settings/pages/list/list.ts          |   4 +-
 .../settings/pages/space-usage/space-usage.ts |  16 +-
 .../pages/synchronization/synchronization.ts  |   6 +-
 src/core/settings/providers/delegate.ts       |  10 +-
 src/core/settings/providers/helper.ts         |  24 +-
 .../pages/choose-site/choose-site.ts          |   2 +-
 src/core/sharedfiles/pages/list/list.ts       |  16 +-
 src/core/sharedfiles/providers/helper.ts      |  34 +-
 src/core/sharedfiles/providers/sharedfiles.ts |  42 +-
 .../sharedfiles/providers/upload-handler.ts   |   8 +-
 src/core/sitehome/components/index/index.ts   |   4 +-
 .../sitehome/providers/index-link-handler.ts  |  20 +-
 src/core/sitehome/providers/sitehome.ts       |  20 +-
 .../classes/call-ws-click-directive.ts        |   2 +-
 .../siteplugins/classes/call-ws-directive.ts  |   8 +-
 .../classes/compile-init-component.ts         |   4 +-
 .../handlers/assign-feedback-handler.ts       |  12 +-
 .../handlers/assign-submission-handler.ts     |  14 +-
 .../classes/handlers/base-handler.ts          |   2 +-
 .../classes/handlers/block-handler.ts         |  10 +-
 .../classes/handlers/course-format-handler.ts |  18 +-
 .../classes/handlers/course-option-handler.ts |  28 +-
 .../classes/handlers/main-menu-handler.ts     |   2 +-
 .../handlers/message-output-handler.ts        |   2 +-
 .../classes/handlers/module-handler.ts        |  18 +-
 .../handlers/module-prefetch-handler.ts       |  68 +-
 .../handlers/question-behaviour-handler.ts    |   8 +-
 .../classes/handlers/question-handler.ts      |   6 +-
 .../handlers/quiz-access-rule-handler.ts      |  58 +-
 .../classes/handlers/settings-handler.ts      |   2 +-
 .../classes/handlers/user-handler.ts          |  20 +-
 .../handlers/user-profile-field-handler.ts    |  14 +-
 .../workshop-assessment-strategy-handler.ts   |  28 +-
 .../assign-feedback/assign-feedback.ts        |   2 +-
 .../assign-submission/assign-submission.ts    |   2 +-
 .../components/course-format/course-format.ts |   8 +-
 .../components/course-option/course-option.ts |   2 +-
 .../components/module-index/module-index.ts   |  12 +-
 .../plugin-content/plugin-content.ts          |  34 +-
 .../directives/call-ws-new-content.ts         |   2 +-
 src/core/siteplugins/directives/call-ws.ts    |   2 +-
 .../pages/module-index/module-index.ts        |   4 +-
 .../pages/plugin-page/plugin-page.ts          |   4 +-
 src/core/siteplugins/providers/helper.ts      | 222 ++---
 src/core/siteplugins/providers/siteplugins.ts | 162 ++--
 src/core/tag/pages/index-area/index-area.ts   |  10 +-
 src/core/tag/pages/index/index.ts             |   6 +-
 src/core/tag/pages/search/search.ts           |  10 +-
 src/core/tag/providers/area-delegate.ts       |  31 +-
 src/core/tag/providers/helper.ts              |   4 +-
 src/core/tag/providers/index-link-handler.ts  |  22 +-
 src/core/tag/providers/mainmenu-handler.ts    |   4 +-
 src/core/tag/providers/search-link-handler.ts |  22 +-
 src/core/tag/providers/tag.ts                 | 120 +--
 .../components/participants/participants.ts   |  12 +-
 src/core/user/pages/about/about.ts            |   2 +-
 src/core/user/pages/profile/profile.ts        |   6 +-
 .../user/providers/course-option-handler.ts   |  36 +-
 src/core/user/providers/helper.ts             |  12 +-
 src/core/user/providers/offline.ts            |  14 +-
 .../providers/participants-link-handler.ts    |  20 +-
 src/core/user/providers/sync-cron-handler.ts  |   8 +-
 src/core/user/providers/sync.ts               |   8 +-
 src/core/user/providers/tag-area-handler.ts   |  10 +-
 src/core/user/providers/user-delegate.ts      |  49 +-
 src/core/user/providers/user-handler.ts       |  14 +-
 src/core/user/providers/user-link-handler.ts  |  20 +-
 .../providers/user-profile-field-delegate.ts  |  46 +-
 src/core/user/providers/user.ts               | 172 ++--
 src/directives/auto-rows.ts                   |   2 +-
 src/directives/external-content.ts            |  14 +-
 src/directives/format-text.ts                 |  37 +-
 src/directives/link.ts                        |   2 +-
 src/directives/supress-events.ts              |   2 +-
 src/pipes/bytes-to-size.ts                    |   4 +-
 src/pipes/create-links.ts                     |   4 +-
 src/pipes/date-day-or-time.ts                 |   4 +-
 src/pipes/duration.ts                         |   4 +-
 src/pipes/format-date.ts                      |  10 +-
 src/pipes/no-tags.ts                          |   4 +-
 src/pipes/seconds-to-hms.ts                   |   4 +-
 src/pipes/time-ago.ts                         |   4 +-
 src/pipes/to-locale-string.ts                 |   4 +-
 src/providers/app.ts                          |  72 +-
 src/providers/config.ts                       |  16 +-
 src/providers/cron.ts                         |  91 +-
 src/providers/db.ts                           |  10 +-
 src/providers/events.ts                       |  20 +-
 src/providers/file-helper.ts                  |  58 +-
 src/providers/file-session.ts                 |  52 +-
 src/providers/file.ts                         | 263 +++---
 src/providers/filepool.ts                     | 764 ++++++++-------
 src/providers/groups.ts                       | 138 ++-
 src/providers/init.ts                         |  15 +-
 src/providers/lang.ts                         |  46 +-
 src/providers/local-notifications.ts          | 108 +--
 src/providers/logger.ts                       |  10 +-
 src/providers/plugin-file-delegate.ts         |  28 +-
 src/providers/sites-factory.ts                |  18 +-
 src/providers/sites.ts                        | 270 +++---
 src/providers/sync.ts                         |  56 +-
 src/providers/update-manager.ts               |  51 +-
 src/providers/urlschemes.ts                   |  35 +-
 src/providers/utils/dom.ts                    | 366 ++++---
 src/providers/utils/iframe.ts                 |  28 +-
 src/providers/utils/mimetype.ts               |  88 +-
 src/providers/utils/text.ts                   | 190 ++--
 src/providers/utils/time.ts                   |  50 +-
 src/providers/utils/url.ts                    |  80 +-
 src/providers/utils/utils.ts                  | 281 +++---
 src/providers/ws.ts                           | 140 ++-
 749 files changed, 15872 insertions(+), 16313 deletions(-)

diff --git a/src/addon/badges/pages/issued-badge/issued-badge.ts b/src/addon/badges/pages/issued-badge/issued-badge.ts
index ff79f7841..d33990ddb 100644
--- a/src/addon/badges/pages/issued-badge/issued-badge.ts
+++ b/src/addon/badges/pages/issued-badge/issued-badge.ts
@@ -65,7 +65,7 @@ export class AddonBadgesIssuedBadgePage {
     /**
      * Fetch the issued badge required for the view.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     fetchIssuedBadge(): Promise<any> {
         const promises = [];
@@ -101,7 +101,7 @@ export class AddonBadgesIssuedBadgePage {
     /**
      * Refresh the badges.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshBadges(refresher: any): void {
         this.badgesProvider.invalidateUserBadges(this.courseId, this.userId).finally(() => {
diff --git a/src/addon/badges/pages/user-badges/user-badges.ts b/src/addon/badges/pages/user-badges/user-badges.ts
index cde1db77a..fe5ea5c1c 100644
--- a/src/addon/badges/pages/user-badges/user-badges.ts
+++ b/src/addon/badges/pages/user-badges/user-badges.ts
@@ -64,7 +64,7 @@ export class AddonBadgesUserBadgesPage {
     /**
      * Fetch all the badges required for the view.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     fetchBadges(): Promise<any> {
         this.currentTime = this.timeUtils.timestamp();
@@ -79,7 +79,7 @@ export class AddonBadgesUserBadgesPage {
     /**
      * Refresh the badges.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshBadges(refresher: any): void {
         this.badgesProvider.invalidateUserBadges(this.courseId, this.userId).finally(() => {
@@ -92,7 +92,7 @@ export class AddonBadgesUserBadgesPage {
     /**
      * Navigate to a particular badge.
      *
-     * @param {string} badgeHash Badge to load.
+     * @param badgeHash Badge to load.
      */
     loadIssuedBadge(badgeHash: string): void {
         this.badgeHash = badgeHash;
diff --git a/src/addon/badges/providers/badge-link-handler.ts b/src/addon/badges/providers/badge-link-handler.ts
index 144acad5c..0f98f0f0d 100644
--- a/src/addon/badges/providers/badge-link-handler.ts
+++ b/src/addon/badges/providers/badge-link-handler.ts
@@ -33,11 +33,11 @@ export class AddonBadgesBadgeLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -53,11 +53,11 @@ export class AddonBadgesBadgeLinkHandler extends CoreContentLinksHandlerBase {
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
 
diff --git a/src/addon/badges/providers/badges.ts b/src/addon/badges/providers/badges.ts
index 019341e39..f2b16814b 100644
--- a/src/addon/badges/providers/badges.ts
+++ b/src/addon/badges/providers/badges.ts
@@ -35,8 +35,8 @@ export class AddonBadgesProvider {
      * This method is called quite often and thus should only perform a quick
      * check, we should not be calling WS from here.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if enabled, false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if enabled, false otherwise.
      */
     isPluginEnabled(siteId?: string): Promise<boolean> {
 
@@ -54,9 +54,9 @@ export class AddonBadgesProvider {
     /**
      * Get the cache key for the get badges call.
      *
-     * @param {number} courseId ID of the course to get the badges from.
-     * @param {number} userId ID of the user to get the badges from.
-     * @return {string} Cache key.
+     * @param courseId ID of the course to get the badges from.
+     * @param userId ID of the user to get the badges from.
+     * @return Cache key.
      */
     protected getBadgesCacheKey(courseId: number, userId: number): string {
         return this.ROOT_CACHE_KEY + 'badges:' + courseId + ':' + userId;
@@ -65,10 +65,10 @@ export class AddonBadgesProvider {
     /**
      * Get issued badges for a certain user in a course.
      *
-     * @param {number} courseId ID of the course to get the badges from.
-     * @param {number} userId ID of the user to get the badges from.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}Promise to be resolved when the badges are retrieved.
+     * @param courseId ID of the course to get the badges from.
+     * @param userId ID of the user to get the badges from.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise to be resolved when the badges are retrieved.
      */
     getUserBadges(courseId: number, userId: number, siteId?: string): Promise<any> {
 
@@ -98,10 +98,10 @@ export class AddonBadgesProvider {
     /**
      * Invalidate get badges WS call.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} userId ID of the user to get the badges from.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when data is invalidated.
+     * @param courseId Course ID.
+     * @param userId ID of the user to get the badges from.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when data is invalidated.
      */
     invalidateUserBadges(courseId: number, userId: number, siteId?: string): Promise<any> {
 
diff --git a/src/addon/badges/providers/mybadges-link-handler.ts b/src/addon/badges/providers/mybadges-link-handler.ts
index 190e575ac..f9ea5e8a3 100644
--- a/src/addon/badges/providers/mybadges-link-handler.ts
+++ b/src/addon/badges/providers/mybadges-link-handler.ts
@@ -34,11 +34,11 @@ export class AddonBadgesMyBadgesLinkHandler extends CoreContentLinksHandlerBase
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -54,11 +54,11 @@ export class AddonBadgesMyBadgesLinkHandler extends CoreContentLinksHandlerBase
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
 
diff --git a/src/addon/badges/providers/push-click-handler.ts b/src/addon/badges/providers/push-click-handler.ts
index 1aabf4f28..c36e1e3e2 100644
--- a/src/addon/badges/providers/push-click-handler.ts
+++ b/src/addon/badges/providers/push-click-handler.ts
@@ -33,8 +33,8 @@ export class AddonBadgesPushClickHandler implements CorePushNotificationsClickHa
     /**
      * Check if a notification click is handled by this handler.
      *
-     * @param {any} notification The notification to check.
-     * @return {boolean} Whether the notification click is handled by this handler
+     * @param notification The notification to check.
+     * @return Whether the notification click is handled by this handler
      */
     handles(notification: any): boolean | Promise<boolean> {
         const data = notification.customdata || {};
@@ -50,8 +50,8 @@ export class AddonBadgesPushClickHandler implements CorePushNotificationsClickHa
     /**
      * Handle the notification click.
      *
-     * @param {any} notification The notification to check.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param notification The notification to check.
+     * @return Promise resolved when done.
      */
     handleClick(notification: any): Promise<any> {
         const data = notification.customdata || {};
diff --git a/src/addon/badges/providers/user-handler.ts b/src/addon/badges/providers/user-handler.ts
index fb34cd633..5c8e705e3 100644
--- a/src/addon/badges/providers/user-handler.ts
+++ b/src/addon/badges/providers/user-handler.ts
@@ -30,7 +30,7 @@ export class AddonBadgesUserHandler implements CoreUserProfileHandler {
     /**
      * Check if handler is enabled.
      *
-     * @return {Promise<boolean>} Always enabled.
+     * @return Always enabled.
      */
     isEnabled(): Promise<boolean> {
         return this.badgesProvider.isPluginEnabled();
@@ -39,11 +39,11 @@ export class AddonBadgesUserHandler implements CoreUserProfileHandler {
     /**
      * Check if handler is enabled for this user in this context.
      *
-     * @param {any} user     User to check.
-     * @param {number} courseId Course ID.
-     * @param  {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param  {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return  {boolean}   True if enabled, false otherwise.
+     * @param user User to check.
+     * @param courseId Course ID.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return True if enabled, false otherwise.
      */
     isEnabledForUser(user: any, courseId: number, navOptions?: any, admOptions?: any): boolean {
 
@@ -58,7 +58,7 @@ export class AddonBadgesUserHandler implements CoreUserProfileHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreUserProfileHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(user: any, courseId: number): CoreUserProfileHandlerData {
         return {
diff --git a/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts b/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts
index 69a0122bb..6a96b2169 100644
--- a/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts
+++ b/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts
@@ -52,7 +52,7 @@ export class AddonBlockActivityModulesComponent extends CoreBlockBaseComponent i
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         return this.courseProvider.invalidateSections(this.instanceId);
@@ -61,7 +61,7 @@ export class AddonBlockActivityModulesComponent extends CoreBlockBaseComponent i
     /**
      * Fetch the data to render the block.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchContent(): Promise<any> {
         return this.courseProvider.getSections(this.instanceId, false, true).then((sections) => {
diff --git a/src/addon/block/activitymodules/providers/block-handler.ts b/src/addon/block/activitymodules/providers/block-handler.ts
index 752d23a47..aeee44e52 100644
--- a/src/addon/block/activitymodules/providers/block-handler.ts
+++ b/src/addon/block/activitymodules/providers/block-handler.ts
@@ -32,11 +32,11 @@ export class AddonBlockActivityModulesHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/badges/providers/block-handler.ts b/src/addon/block/badges/providers/block-handler.ts
index d6cfb677a..4b9b6971e 100644
--- a/src/addon/block/badges/providers/block-handler.ts
+++ b/src/addon/block/badges/providers/block-handler.ts
@@ -33,11 +33,11 @@ export class AddonBlockBadgesHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/blogmenu/providers/block-handler.ts b/src/addon/block/blogmenu/providers/block-handler.ts
index 231137b8e..86446a1fe 100644
--- a/src/addon/block/blogmenu/providers/block-handler.ts
+++ b/src/addon/block/blogmenu/providers/block-handler.ts
@@ -33,11 +33,11 @@ export class AddonBlockBlogMenuHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/blogrecent/providers/block-handler.ts b/src/addon/block/blogrecent/providers/block-handler.ts
index 55f03cb8e..8fca85a70 100644
--- a/src/addon/block/blogrecent/providers/block-handler.ts
+++ b/src/addon/block/blogrecent/providers/block-handler.ts
@@ -33,11 +33,11 @@ export class AddonBlockBlogRecentHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/blogtags/providers/block-handler.ts b/src/addon/block/blogtags/providers/block-handler.ts
index aa2a17495..a73d45f17 100644
--- a/src/addon/block/blogtags/providers/block-handler.ts
+++ b/src/addon/block/blogtags/providers/block-handler.ts
@@ -33,11 +33,11 @@ export class AddonBlockBlogTagsHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/calendarmonth/providers/block-handler.ts b/src/addon/block/calendarmonth/providers/block-handler.ts
index 80e85edf8..4f1724ea6 100644
--- a/src/addon/block/calendarmonth/providers/block-handler.ts
+++ b/src/addon/block/calendarmonth/providers/block-handler.ts
@@ -33,11 +33,11 @@ export class AddonBlockCalendarMonthHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/calendarupcoming/providers/block-handler.ts b/src/addon/block/calendarupcoming/providers/block-handler.ts
index c58a0d080..edadfb05c 100644
--- a/src/addon/block/calendarupcoming/providers/block-handler.ts
+++ b/src/addon/block/calendarupcoming/providers/block-handler.ts
@@ -33,11 +33,11 @@ export class AddonBlockCalendarUpcomingHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/comments/providers/block-handler.ts b/src/addon/block/comments/providers/block-handler.ts
index ada6e1654..594b262f7 100644
--- a/src/addon/block/comments/providers/block-handler.ts
+++ b/src/addon/block/comments/providers/block-handler.ts
@@ -32,11 +32,11 @@ export class AddonBlockCommentsHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/completionstatus/providers/block-handler.ts b/src/addon/block/completionstatus/providers/block-handler.ts
index 88fca4ec8..7edac6643 100644
--- a/src/addon/block/completionstatus/providers/block-handler.ts
+++ b/src/addon/block/completionstatus/providers/block-handler.ts
@@ -32,11 +32,11 @@ export class AddonBlockCompletionStatusHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/glossaryrandom/providers/block-handler.ts b/src/addon/block/glossaryrandom/providers/block-handler.ts
index d639ccb16..8e54cf602 100644
--- a/src/addon/block/glossaryrandom/providers/block-handler.ts
+++ b/src/addon/block/glossaryrandom/providers/block-handler.ts
@@ -32,11 +32,11 @@ export class AddonBlockGlossaryRandomHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/html/providers/block-handler.ts b/src/addon/block/html/providers/block-handler.ts
index a5603fb53..4d91839c1 100644
--- a/src/addon/block/html/providers/block-handler.ts
+++ b/src/addon/block/html/providers/block-handler.ts
@@ -32,11 +32,11 @@ export class AddonBlockHtmlHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/learningplans/providers/block-handler.ts b/src/addon/block/learningplans/providers/block-handler.ts
index fa98be638..e831019be 100644
--- a/src/addon/block/learningplans/providers/block-handler.ts
+++ b/src/addon/block/learningplans/providers/block-handler.ts
@@ -32,11 +32,11 @@ export class AddonBlockLearningPlansHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/myoverview/components/myoverview/myoverview.ts b/src/addon/block/myoverview/components/myoverview/myoverview.ts
index ed68b9205..06c57fd6e 100644
--- a/src/addon/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addon/block/myoverview/components/myoverview/myoverview.ts
@@ -133,7 +133,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         const promises = [];
@@ -161,7 +161,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     /**
      * Fetch the courses for my overview.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchContent(): Promise<any> {
         return this.coursesHelper.getUserCoursesWithOptions(this.sort).then((courses) => {
@@ -197,7 +197,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     /**
      * The filter has changed.
      *
-     * @param {any} Received Event.
+     * @param Received Event.
      */
     filterChanged(event: any): void {
         const newValue = event.target.value && event.target.value.trim().toLowerCase();
@@ -239,7 +239,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     /**
      * Prefetch all the shown courses.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     prefetchCourses(): Promise<any> {
         const selected = this.selectedFilter,
@@ -264,7 +264,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     /**
      * Init courses filters.
      *
-     * @param {any[]} courses Courses to filter.
+     * @param courses Courses to filter.
      */
     initCourseFilters(courses: any[]): void {
         if (this.showSortFilter) {
@@ -319,7 +319,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     /**
      * The selected courses sort filter have changed.
      *
-     * @param {string} sort New sorting.
+     * @param sort New sorting.
      */
     switchSort(sort: string): void {
         this.sort = sort;
@@ -344,7 +344,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     /**
      * If switch button that enables the filter input is shown or not.
      *
-     * @return {boolean} If switch button that enables the filter input is shown or not.
+     * @return If switch button that enables the filter input is shown or not.
      */
     showFilterSwitchButton(): boolean {
         return this.loaded && this.courses['all'] && this.courses['all'].length > 5;
diff --git a/src/addon/block/myoverview/providers/block-handler.ts b/src/addon/block/myoverview/providers/block-handler.ts
index e0a593b9a..f7d434747 100644
--- a/src/addon/block/myoverview/providers/block-handler.ts
+++ b/src/addon/block/myoverview/providers/block-handler.ts
@@ -34,7 +34,7 @@ export class AddonBlockMyOverviewHandler extends CoreBlockBaseHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.sitesProvider.getCurrentSite().isVersionGreaterEqualThan('3.6') ||
@@ -44,11 +44,11 @@ export class AddonBlockMyOverviewHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/newsitems/providers/block-handler.ts b/src/addon/block/newsitems/providers/block-handler.ts
index c077474d8..86b12b57f 100644
--- a/src/addon/block/newsitems/providers/block-handler.ts
+++ b/src/addon/block/newsitems/providers/block-handler.ts
@@ -32,11 +32,11 @@ export class AddonBlockNewsItemsHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/onlineusers/providers/block-handler.ts b/src/addon/block/onlineusers/providers/block-handler.ts
index 353835c83..78505b0de 100644
--- a/src/addon/block/onlineusers/providers/block-handler.ts
+++ b/src/addon/block/onlineusers/providers/block-handler.ts
@@ -32,11 +32,11 @@ export class AddonBlockOnlineUsersHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/privatefiles/providers/block-handler.ts b/src/addon/block/privatefiles/providers/block-handler.ts
index f0284df97..811aea153 100644
--- a/src/addon/block/privatefiles/providers/block-handler.ts
+++ b/src/addon/block/privatefiles/providers/block-handler.ts
@@ -32,11 +32,11 @@ export class AddonBlockPrivateFilesHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/recentactivity/providers/block-handler.ts b/src/addon/block/recentactivity/providers/block-handler.ts
index ac69af02b..b3d6042a4 100644
--- a/src/addon/block/recentactivity/providers/block-handler.ts
+++ b/src/addon/block/recentactivity/providers/block-handler.ts
@@ -33,11 +33,11 @@ export class AddonBlockRecentActivityHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts b/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
index 92697e4f0..7db55fcfd 100644
--- a/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
+++ b/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
@@ -79,7 +79,7 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         const promises = [];
@@ -104,7 +104,7 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
     /**
      * Fetch the courses for recent courses.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchContent(): Promise<any> {
         return this.coursesHelper.getUserCoursesWithOptions('lastaccess', 10).then((courses) => {
@@ -133,7 +133,7 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
     /**
      * Prefetch all the shown courses.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     prefetchCourses(): Promise<any> {
         const initialIcon = this.prefetchCoursesData.icon;
diff --git a/src/addon/block/recentlyaccessedcourses/providers/block-handler.ts b/src/addon/block/recentlyaccessedcourses/providers/block-handler.ts
index 3af9cf0dd..0f70d2768 100644
--- a/src/addon/block/recentlyaccessedcourses/providers/block-handler.ts
+++ b/src/addon/block/recentlyaccessedcourses/providers/block-handler.ts
@@ -32,11 +32,11 @@ export class AddonBlockRecentlyAccessedCoursesHandler extends CoreBlockBaseHandl
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts b/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts
index e1c9bf372..6aa7b3650 100644
--- a/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts
+++ b/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts
@@ -50,7 +50,7 @@ export class AddonBlockRecentlyAccessedItemsComponent extends CoreBlockBaseCompo
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         return this.recentItemsProvider.invalidateRecentItems();
@@ -59,7 +59,7 @@ export class AddonBlockRecentlyAccessedItemsComponent extends CoreBlockBaseCompo
     /**
      * Fetch the data to render the block.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchContent(): Promise<any> {
         return this.recentItemsProvider.getRecentItems().then((items) => {
@@ -70,8 +70,8 @@ export class AddonBlockRecentlyAccessedItemsComponent extends CoreBlockBaseCompo
     /**
      * Event clicked.
      *
-     * @param {Event} e    Click event.
-     * @param {any} item   Activity item info.
+     * @param e Click event.
+     * @param item Activity item info.
      */
     action(e: Event, item: any): void {
         e.preventDefault();
diff --git a/src/addon/block/recentlyaccesseditems/providers/block-handler.ts b/src/addon/block/recentlyaccesseditems/providers/block-handler.ts
index dfadcc542..928f33e1b 100644
--- a/src/addon/block/recentlyaccesseditems/providers/block-handler.ts
+++ b/src/addon/block/recentlyaccesseditems/providers/block-handler.ts
@@ -32,11 +32,11 @@ export class AddonBlockRecentlyAccessedItemsHandler extends CoreBlockBaseHandler
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/recentlyaccesseditems/providers/recentlyaccesseditems.ts b/src/addon/block/recentlyaccesseditems/providers/recentlyaccesseditems.ts
index f07f386d5..a24bc035c 100644
--- a/src/addon/block/recentlyaccesseditems/providers/recentlyaccesseditems.ts
+++ b/src/addon/block/recentlyaccesseditems/providers/recentlyaccesseditems.ts
@@ -30,7 +30,7 @@ export class AddonBlockRecentlyAccessedItemsProvider {
     /**
      * Get cache key for get last accessed items value WS call.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getRecentItemsCacheKey(): string {
         return this.ROOT_CACHE_KEY + ':recentitems';
@@ -39,8 +39,8 @@ export class AddonBlockRecentlyAccessedItemsProvider {
     /**
      * Get last accessed items.
      *
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any[]>} Promise resolved when the info is retrieved.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved when the info is retrieved.
      */
     getRecentItems(siteId?: string): Promise<any[]> {
 
@@ -63,8 +63,8 @@ export class AddonBlockRecentlyAccessedItemsProvider {
     /**
      * Invalidates get last accessed items WS call.
      *
-     * @param {string} [siteId] Site ID to invalidate. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param siteId Site ID to invalidate. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateRecentItems(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/addon/block/rssclient/providers/block-handler.ts b/src/addon/block/rssclient/providers/block-handler.ts
index 8976f2182..770f74398 100644
--- a/src/addon/block/rssclient/providers/block-handler.ts
+++ b/src/addon/block/rssclient/providers/block-handler.ts
@@ -33,11 +33,11 @@ export class AddonBlockRssClientHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/selfcompletion/providers/block-handler.ts b/src/addon/block/selfcompletion/providers/block-handler.ts
index 57d716e5a..f9ea51d35 100644
--- a/src/addon/block/selfcompletion/providers/block-handler.ts
+++ b/src/addon/block/selfcompletion/providers/block-handler.ts
@@ -32,11 +32,11 @@ export class AddonBlockSelfCompletionHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts b/src/addon/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
index 23bfb74ca..19030b3cc 100644
--- a/src/addon/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
+++ b/src/addon/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
@@ -54,7 +54,7 @@ export class AddonBlockSiteMainMenuComponent extends CoreBlockBaseComponent impl
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         const promises = [];
@@ -73,7 +73,7 @@ export class AddonBlockSiteMainMenuComponent extends CoreBlockBaseComponent impl
     /**
      * Fetch the data to render the block.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchContent(): Promise<any> {
         return this.courseProvider.getSections(this.siteHomeId, false, true).then((sections) => {
diff --git a/src/addon/block/sitemainmenu/providers/block-handler.ts b/src/addon/block/sitemainmenu/providers/block-handler.ts
index dcaf4fe01..b7118a5f4 100644
--- a/src/addon/block/sitemainmenu/providers/block-handler.ts
+++ b/src/addon/block/sitemainmenu/providers/block-handler.ts
@@ -32,11 +32,11 @@ export class AddonBlockSiteMainMenuHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts b/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts
index ca25f3354..ca7e3156e 100644
--- a/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts
+++ b/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts
@@ -79,7 +79,7 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         const promises = [];
@@ -104,7 +104,7 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
     /**
      * Fetch the courses.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchContent(): Promise<any> {
         return this.coursesHelper.getUserCoursesWithOptions('timemodified', 0, 'isfavourite').then((courses) => {
@@ -133,7 +133,7 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
     /**
      * Prefetch all the shown courses.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     prefetchCourses(): Promise<any> {
         const initialIcon = this.prefetchCoursesData.icon;
diff --git a/src/addon/block/starredcourses/providers/block-handler.ts b/src/addon/block/starredcourses/providers/block-handler.ts
index c7abc3485..c65f01aff 100644
--- a/src/addon/block/starredcourses/providers/block-handler.ts
+++ b/src/addon/block/starredcourses/providers/block-handler.ts
@@ -32,11 +32,11 @@ export class AddonBlockStarredCoursesHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/tags/providers/block-handler.ts b/src/addon/block/tags/providers/block-handler.ts
index f1c7d4cd8..963ae63f3 100644
--- a/src/addon/block/tags/providers/block-handler.ts
+++ b/src/addon/block/tags/providers/block-handler.ts
@@ -33,11 +33,11 @@ export class AddonBlockTagsHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/timeline/components/events/events.ts b/src/addon/block/timeline/components/events/events.ts
index a4f50e96a..07dbf0ac0 100644
--- a/src/addon/block/timeline/components/events/events.ts
+++ b/src/addon/block/timeline/components/events/events.ts
@@ -89,9 +89,9 @@ export class AddonBlockTimelineEventsComponent implements OnChanges {
     /**
      * Filter the events by time.
      *
-     * @param {number} start Number of days to start getting events from today. E.g. -1 will get events from yesterday.
-     * @param {number} [end] Number of days after the start.
-     * @return {any[]} Filtered events.
+     * @param start Number of days to start getting events from today. E.g. -1 will get events from yesterday.
+     * @param end Number of days after the start.
+     * @return Filtered events.
      */
     protected filterEventsByTime(start: number, end?: number): any[] {
         start = moment().add(start, 'days').startOf('day').unix();
@@ -121,8 +121,8 @@ export class AddonBlockTimelineEventsComponent implements OnChanges {
     /**
      * Action clicked.
      *
-     * @param {Event} e     Click event.
-     * @param {string} url  Url of the action.
+     * @param e Click event.
+     * @param url Url of the action.
      */
     action(e: Event, url: string): void {
         e.preventDefault();
diff --git a/src/addon/block/timeline/components/timeline/timeline.ts b/src/addon/block/timeline/components/timeline/timeline.ts
index 20976cc5b..8325cbcf3 100644
--- a/src/addon/block/timeline/components/timeline/timeline.ts
+++ b/src/addon/block/timeline/components/timeline/timeline.ts
@@ -75,7 +75,7 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         const promises = [];
@@ -94,7 +94,7 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
     /**
      * Fetch the courses for my overview.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchContent(): Promise<any> {
         if (this.sort == 'sortbydates') {
@@ -120,8 +120,8 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
     /**
      * Load more events.
      *
-     * @param {any} course Course.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param course Course.
+     * @return Promise resolved when done.
      */
     loadMoreCourse(course: any): Promise<any> {
         return this.timelineProvider.getActionEventsByCourse(course.id, course.canLoadMore).then((courseEvents) => {
@@ -135,8 +135,8 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
     /**
      * Fetch the timeline.
      *
-     * @param {number} [afterEventId] The last event id.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param afterEventId The last event id.
+     * @return Promise resolved when done.
      */
     protected fetchMyOverviewTimeline(afterEventId?: number): Promise<any> {
         return this.timelineProvider.getActionEventsByTimesort(afterEventId).then((events) => {
@@ -148,7 +148,7 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
     /**
      * Fetch the timeline by courses.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchMyOverviewTimelineByCourses(): Promise<any> {
         return this.coursesHelper.getUserCoursesWithOptions().then((courses) => {
@@ -210,7 +210,7 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
     /**
      * Change timeline sort being viewed.
      *
-     * @param {string} sort New sorting.
+     * @param sort New sorting.
      */
     switchSort(sort: string): void {
         this.sort = sort;
diff --git a/src/addon/block/timeline/providers/block-handler.ts b/src/addon/block/timeline/providers/block-handler.ts
index 8973fbc5d..e116002b7 100644
--- a/src/addon/block/timeline/providers/block-handler.ts
+++ b/src/addon/block/timeline/providers/block-handler.ts
@@ -37,7 +37,7 @@ export class AddonBlockTimelineHandler extends CoreBlockBaseHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.timelineProvider.isAvailable().then((enabled) => {
@@ -49,11 +49,11 @@ export class AddonBlockTimelineHandler extends CoreBlockBaseHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/addon/block/timeline/providers/timeline.ts b/src/addon/block/timeline/providers/timeline.ts
index 148aed267..6f90184e8 100644
--- a/src/addon/block/timeline/providers/timeline.ts
+++ b/src/addon/block/timeline/providers/timeline.ts
@@ -32,10 +32,10 @@ export class AddonBlockTimelineProvider {
     /**
      * Get calendar action events for the given course.
      *
-     * @param {number} courseId Only events in this course.
-     * @param {number} [afterEventId] The last seen event id.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<{events: any[], canLoadMore: number}>} Promise resolved when the info is retrieved.
+     * @param courseId Only events in this course.
+     * @param afterEventId The last seen event id.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved when the info is retrieved.
      */
     getActionEventsByCourse(courseId: number, afterEventId?: number, siteId?: string):
             Promise<{ events: any[], canLoadMore: number }> {
@@ -68,8 +68,8 @@ export class AddonBlockTimelineProvider {
     /**
      * Get cache key for get calendar action events for the given course value WS call.
      *
-     * @param {number} courseId Only events in this course.
-     * @return {string} Cache key.
+     * @param courseId Only events in this course.
+     * @return Cache key.
      */
     protected getActionEventsByCourseCacheKey(courseId: number): string {
         return this.getActionEventsByCoursesCacheKey() + ':' + courseId;
@@ -78,9 +78,9 @@ export class AddonBlockTimelineProvider {
     /**
      * Get calendar action events for a given list of courses.
      *
-     * @param {number[]} courseIds Course IDs.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<{[s: string]: {events: any[], canLoadMore: number}}>} Promise resolved when the info is retrieved.
+     * @param courseIds Course IDs.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved when the info is retrieved.
      */
     getActionEventsByCourses(courseIds: number[], siteId?: string): Promise<{ [s: string]:
             { events: any[], canLoadMore: number } }> {
@@ -114,7 +114,7 @@ export class AddonBlockTimelineProvider {
     /**
      * Get cache key for get calendar action events for a given list of courses value WS call.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getActionEventsByCoursesCacheKey(): string {
         return this.ROOT_CACHE_KEY + 'bycourse';
@@ -123,9 +123,9 @@ export class AddonBlockTimelineProvider {
     /**
      * Get calendar action events based on the timesort value.
      *
-     * @param {number} [afterEventId] The last seen event id.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<{events: any[], canLoadMore: number}>} Promise resolved when the info is retrieved.
+     * @param afterEventId The last seen event id.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved when the info is retrieved.
      */
     getActionEventsByTimesort(afterEventId: number, siteId?: string): Promise<{ events: any[], canLoadMore: number }> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -167,7 +167,7 @@ export class AddonBlockTimelineProvider {
     /**
      * Get prefix cache key for calendar action events based on the timesort value WS calls.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getActionEventsByTimesortPrefixCacheKey(): string {
         return this.ROOT_CACHE_KEY + 'bytimesort:';
@@ -176,9 +176,9 @@ export class AddonBlockTimelineProvider {
     /**
      * Get cache key for get calendar action events based on the timesort value WS call.
      *
-     * @param {number} [afterEventId] The last seen event id.
-     * @param {number} [limit] Limit num of the call.
-     * @return {string} Cache key.
+     * @param afterEventId The last seen event id.
+     * @param limit Limit num of the call.
+     * @return Cache key.
      */
     protected getActionEventsByTimesortCacheKey(afterEventId?: number, limit?: number): string {
         afterEventId = afterEventId || 0;
@@ -190,8 +190,8 @@ export class AddonBlockTimelineProvider {
     /**
      * Invalidates get calendar action events for a given list of courses WS call.
      *
-     * @param {string} [siteId] Site ID to invalidate. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param siteId Site ID to invalidate. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateActionEventsByCourses(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -202,8 +202,8 @@ export class AddonBlockTimelineProvider {
     /**
      * Invalidates get calendar action events based on the timesort value WS call.
      *
-     * @param {string} [siteId] Site ID to invalidate. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param siteId Site ID to invalidate. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateActionEventsByTimesort(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -214,8 +214,8 @@ export class AddonBlockTimelineProvider {
     /**
      * Returns whether or not My Overview is available for a certain site.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if available, resolved with false or rejected otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if available, resolved with false or rejected otherwise.
      */
     isAvailable(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -232,9 +232,9 @@ export class AddonBlockTimelineProvider {
     /**
      * Handles course events, filtering and treating if more can be loaded.
      *
-     * @param {any} course Object containing response course events info.
-     * @param {number} timeFrom Current time to filter events from.
-     * @return {{events: any[], canLoadMore: number}} Object with course events and last loaded event id if more can be loaded.
+     * @param course Object containing response course events info.
+     * @param timeFrom Current time to filter events from.
+     * @return Object with course events and last loaded event id if more can be loaded.
      */
     protected treatCourseEvents(course: any, timeFrom: number): { events: any[], canLoadMore: number } {
         const canLoadMore: number =
diff --git a/src/addon/blog/components/entries/entries.ts b/src/addon/blog/components/entries/entries.ts
index aa66beaef..3cd10ebd6 100644
--- a/src/addon/blog/components/entries/entries.ts
+++ b/src/addon/blog/components/entries/entries.ts
@@ -104,8 +104,8 @@ export class AddonBlogEntriesComponent implements OnInit {
     /**
      * Fetch blog entries.
      *
-     * @param {boolean} [refresh] Empty events array first.
-     * @return {Promise<any>}         Promise with the entries.
+     * @param refresh Empty events array first.
+     * @return Promise with the entries.
      */
     private fetchEntries(refresh: boolean = false): Promise<any> {
         this.loadMoreError = false;
@@ -174,7 +174,7 @@ export class AddonBlogEntriesComponent implements OnInit {
     /**
      * Toggle between showing only my entries or not.
      *
-     * @param {boolean} enabled If true, filter my entries. False otherwise.
+     * @param enabled If true, filter my entries. False otherwise.
      */
     onlyMyEntriesToggleChanged(enabled: boolean): void {
         if (enabled) {
@@ -198,8 +198,8 @@ export class AddonBlogEntriesComponent implements OnInit {
     /**
      * Function to load more entries.
      *
-     * @param {any} [infiniteComplete] Infinite scroll complete function. Only used from core-infinite-loading.
-     * @return {Promise<any>} Resolved when done.
+     * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
+     * @return Resolved when done.
      */
     loadMore(infiniteComplete?: any): Promise<any> {
         return this.fetchEntries().finally(() => {
@@ -210,7 +210,7 @@ export class AddonBlogEntriesComponent implements OnInit {
     /**
      * Refresh blog entries on PTR.
      *
-     * @param {any}     refresher  Refresher instance.
+     * @param refresher Refresher instance.
      */
     refresh(refresher?: any): void {
         const promises = this.entries.map((entry) => {
diff --git a/src/addon/blog/providers/blog.ts b/src/addon/blog/providers/blog.ts
index 90b875283..a816fd9d3 100644
--- a/src/addon/blog/providers/blog.ts
+++ b/src/addon/blog/providers/blog.ts
@@ -40,8 +40,8 @@ export class AddonBlogProvider {
      * This method is called quite often and thus should only perform a quick
      * check, we should not be calling WS from here.
      *
-     * @param  {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if enabled, resolved with false or rejected otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if enabled, resolved with false or rejected otherwise.
      */
     isPluginEnabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -53,8 +53,8 @@ export class AddonBlogProvider {
     /**
      * Get the cache key for the blog entries.
      *
-     * @param  {any}     [filter]     Filter to apply on search.
-     * @return {string}          Cache key.
+     * @param filter Filter to apply on search.
+     * @return Cache key.
      */
     getEntriesCacheKey(filter: any = {}): string {
         return this.ROOT_CACHE_KEY + this.utils.sortAndStringify(filter);
@@ -63,10 +63,10 @@ export class AddonBlogProvider {
     /**
      * Get blog entries.
      *
-     * @param  {any}     [filter]     Filter to apply on search.
-     * @param  {any}     [page=0]     Page of the blog entries to fetch.
-     * @param  {string}  [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise to be resolved when the entries are retrieved.
+     * @param filter Filter to apply on search.
+     * @param page Page of the blog entries to fetch.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise to be resolved when the entries are retrieved.
      */
     getEntries(filter: any = {}, page: number = 0, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -88,9 +88,9 @@ export class AddonBlogProvider {
     /**
      * Invalidate blog entries WS call.
      *
-     * @param  {any}     [filter]     Filter to apply on search
-     * @param  {string}  [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved when data is invalidated.
+     * @param filter Filter to apply on search
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when data is invalidated.
      */
     invalidateEntries(filter: any = {}, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -101,9 +101,9 @@ export class AddonBlogProvider {
     /**
      * Trigger the blog_entries_viewed event.
      *
-     * @param  {any}     [filter]     Filter to apply on search.
-     * @param  {string}  [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise to be resolved when done.
+     * @param filter Filter to apply on search.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise to be resolved when done.
      */
     logView(filter: any = {}, siteId?: string): Promise<any> {
         this.pushNotificationsProvider.logViewListEvent('blog', 'core_blog_view_entries', filter, siteId);
diff --git a/src/addon/blog/providers/course-option-handler.ts b/src/addon/blog/providers/course-option-handler.ts
index 5617d6c92..34140ca2a 100644
--- a/src/addon/blog/providers/course-option-handler.ts
+++ b/src/addon/blog/providers/course-option-handler.ts
@@ -37,10 +37,10 @@ export class AddonBlogCourseOptionHandler implements CoreCourseOptionsHandler {
     /**
      * Should invalidate the data to determine if the handler is enabled for a certain course.
      *
-     * @param {number} courseId The course ID.
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param courseId The course ID.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved when done.
      */
     invalidateEnabledForCourse(courseId: number, navOptions?: any, admOptions?: any): Promise<any> {
         return this.courseProvider.invalidateCourseBlocks(courseId);
@@ -49,7 +49,7 @@ export class AddonBlogCourseOptionHandler implements CoreCourseOptionsHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.blogProvider.isPluginEnabled();
@@ -58,11 +58,11 @@ export class AddonBlogCourseOptionHandler implements CoreCourseOptionsHandler {
     /**
      * Whether or not the handler is enabled for a certain course.
      *
-     * @param {number} courseId The course ID.
-     * @param {any} accessData Access type and data. Default, guest, ...
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @param courseId The course ID.
+     * @param accessData Access type and data. Default, guest, ...
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabledForCourse(courseId: number, accessData: any, navOptions?: any, admOptions?: any): boolean | Promise<boolean> {
         return this.courseHelper.hasABlockNamed(courseId, 'blog_menu').then((enabled) => {
@@ -77,9 +77,9 @@ export class AddonBlogCourseOptionHandler implements CoreCourseOptionsHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @param {Injector} injector Injector.
-     * @param {number} course The course.
-     * @return {CoreCourseOptionsHandlerData|Promise<CoreCourseOptionsHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param course The course.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, course: any): CoreCourseOptionsHandlerData | Promise<CoreCourseOptionsHandlerData> {
         return {
@@ -92,8 +92,8 @@ export class AddonBlogCourseOptionHandler implements CoreCourseOptionsHandler {
     /**
      * Called when a course is downloaded. It should prefetch all the data to be able to see the addon in offline.
      *
-     * @param {any} course The course.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param course The course.
+     * @return Promise resolved when done.
      */
     prefetch(course: any): Promise<any> {
         const siteId = this.sitesProvider.getCurrentSiteId();
diff --git a/src/addon/blog/providers/index-link-handler.ts b/src/addon/blog/providers/index-link-handler.ts
index 0670b322b..ab728fd06 100644
--- a/src/addon/blog/providers/index-link-handler.ts
+++ b/src/addon/blog/providers/index-link-handler.ts
@@ -34,11 +34,11 @@ export class AddonBlogIndexLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -62,11 +62,11 @@ export class AddonBlogIndexLinkHandler extends CoreContentLinksHandlerBase {
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
 
diff --git a/src/addon/blog/providers/mainmenu-handler.ts b/src/addon/blog/providers/mainmenu-handler.ts
index e45bfd06f..4f157e5bb 100644
--- a/src/addon/blog/providers/mainmenu-handler.ts
+++ b/src/addon/blog/providers/mainmenu-handler.ts
@@ -29,7 +29,7 @@ export class AddonBlogMainMenuHandler implements CoreMainMenuHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.blogProvider.isPluginEnabled();
@@ -38,7 +38,7 @@ export class AddonBlogMainMenuHandler implements CoreMainMenuHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreMainMenuHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(): CoreMainMenuHandlerData {
         return {
diff --git a/src/addon/blog/providers/tag-area-handler.ts b/src/addon/blog/providers/tag-area-handler.ts
index 41413d824..7d38f48c2 100644
--- a/src/addon/blog/providers/tag-area-handler.ts
+++ b/src/addon/blog/providers/tag-area-handler.ts
@@ -30,7 +30,7 @@ export class AddonBlogTagAreaHandler implements CoreTagAreaHandler {
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.blogProvider.isPluginEnabled();
@@ -39,8 +39,8 @@ export class AddonBlogTagAreaHandler implements CoreTagAreaHandler {
     /**
      * Parses the rendered content of a tag index and returns the items.
      *
-     * @param {string} content Rendered content.
-     * @return {any[]|Promise<any[]>} Area items (or promise resolved with the items).
+     * @param content Rendered content.
+     * @return Area items (or promise resolved with the items).
      */
     parseContent(content: string): any[] | Promise<any[]> {
         return this.tagHelper.parseFeedContent(content);
@@ -49,8 +49,8 @@ export class AddonBlogTagAreaHandler implements CoreTagAreaHandler {
     /**
      * Get the component to use to display items.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return CoreTagFeedComponent;
diff --git a/src/addon/blog/providers/user-handler.ts b/src/addon/blog/providers/user-handler.ts
index fe19563b8..6911ba70d 100644
--- a/src/addon/blog/providers/user-handler.ts
+++ b/src/addon/blog/providers/user-handler.ts
@@ -31,7 +31,7 @@ export class AddonBlogUserHandler implements CoreUserProfileHandler {
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.blogProvider.isPluginEnabled();
@@ -40,11 +40,11 @@ export class AddonBlogUserHandler implements CoreUserProfileHandler {
     /**
      * Check if handler is enabled for this user in this context.
      *
-     * @param {any} user User to check.
-     * @param {number} courseId Course ID.
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {boolean|Promise<boolean>} Promise resolved with true if enabled, resolved with false otherwise.
+     * @param user User to check.
+     * @param courseId Course ID.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved with true if enabled, resolved with false otherwise.
      */
     isEnabledForUser(user: any, courseId: number, navOptions?: any, admOptions?: any): boolean | Promise<boolean> {
         return true;
@@ -53,7 +53,7 @@ export class AddonBlogUserHandler implements CoreUserProfileHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreUserProfileHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(user: any, courseId: number): CoreUserProfileHandlerData {
         return {
diff --git a/src/addon/calendar/components/calendar/calendar.ts b/src/addon/calendar/components/calendar/calendar.ts
index 269310608..391116337 100644
--- a/src/addon/calendar/components/calendar/calendar.ts
+++ b/src/addon/calendar/components/calendar/calendar.ts
@@ -134,8 +134,8 @@ export class AddonCalendarCalendarComponent implements OnInit, OnChanges, OnDest
     /**
      * Fetch contacts.
      *
-     * @param {boolean} [refresh=false] True if we are refreshing events.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh True if we are refreshing events.
+     * @return Promise resolved when done.
      */
     fetchData(refresh: boolean = false): Promise<any> {
         const promises = [];
@@ -184,7 +184,7 @@ export class AddonCalendarCalendarComponent implements OnInit, OnChanges, OnDest
     /**
      * Fetch the events for current month.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     fetchEvents(): Promise<any> {
         // Don't pass courseId and categoryId, we'll filter them locally.
@@ -238,7 +238,7 @@ export class AddonCalendarCalendarComponent implements OnInit, OnChanges, OnDest
     /**
      * Load categories to be able to filter events.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected loadCategories(): Promise<any> {
         if (this.categoriesRetrieved) {
@@ -285,8 +285,8 @@ export class AddonCalendarCalendarComponent implements OnInit, OnChanges, OnDest
     /**
      * Refresh events.
      *
-     * @param {boolean} [afterChange] Whether the refresh is done after an event has changed or has been synced.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param afterChange Whether the refresh is done after an event has changed or has been synced.
+     * @return Promise resolved when done.
      */
     refreshData(afterChange?: boolean): Promise<any> {
         const promises = [];
@@ -340,8 +340,8 @@ export class AddonCalendarCalendarComponent implements OnInit, OnChanges, OnDest
     /**
      * An event was clicked.
      *
-     * @param {any} calendarEvent Calendar event..
-     * @param {MouseEvent} event Mouse event.
+     * @param calendarEvent Calendar event..
+     * @param event Mouse event.
      */
     eventClicked(calendarEvent: any, event: MouseEvent): void {
         this.onEventClicked.emit(calendarEvent.id);
@@ -351,7 +351,7 @@ export class AddonCalendarCalendarComponent implements OnInit, OnChanges, OnDest
     /**
      * A day was clicked.
      *
-     * @param {number} day Day.
+     * @param day Day.
      */
     dayClicked(day: number): void {
         this.onDayClicked.emit({day: day, month: this.month, year: this.year});
@@ -461,7 +461,7 @@ export class AddonCalendarCalendarComponent implements OnInit, OnChanges, OnDest
     /**
      * Sort events by timestart.
      *
-     * @param {any[]} events List to sort.
+     * @param events List to sort.
      */
     protected sortEvents(events: any[]): any[] {
         return events.sort((a, b) => {
@@ -476,7 +476,7 @@ export class AddonCalendarCalendarComponent implements OnInit, OnChanges, OnDest
     /**
      * Undelete a certain event.
      *
-     * @param {number} eventId Event ID.
+     * @param eventId Event ID.
      */
     protected undeleteEvent(eventId: number): void {
         if (!this.weeks) {
@@ -498,8 +498,8 @@ export class AddonCalendarCalendarComponent implements OnInit, OnChanges, OnDest
 
     /**
      * Returns if the event is in the past or not.
-     * @param  {any}     event Event object.
-     * @return {boolean}       True if it's in the past.
+     * @param event Event object.
+     * @return True if it's in the past.
      */
     isEventPast(event: any): boolean {
         return (event.timestart + event.timeduration) < this.currentTime;
diff --git a/src/addon/calendar/components/upcoming-events/upcoming-events.ts b/src/addon/calendar/components/upcoming-events/upcoming-events.ts
index d56a3470b..43489bd80 100644
--- a/src/addon/calendar/components/upcoming-events/upcoming-events.ts
+++ b/src/addon/calendar/components/upcoming-events/upcoming-events.ts
@@ -106,8 +106,8 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, OnChanges,
     /**
      * Fetch data.
      *
-     * @param {boolean} [refresh=false] True if we are refreshing events.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh True if we are refreshing events.
+     * @return Promise resolved when done.
      */
     fetchData(refresh: boolean = false): Promise<any> {
         const promises = [];
@@ -151,7 +151,7 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, OnChanges,
     /**
      * Fetch upcoming events.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     fetchEvents(): Promise<any> {
         // Don't pass courseId and categoryId, we'll filter them locally.
@@ -185,7 +185,7 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, OnChanges,
     /**
      * Load categories to be able to filter events.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected loadCategories(): Promise<any> {
         if (this.categoriesRetrieved) {
@@ -225,8 +225,8 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, OnChanges,
     /**
      * Refresh events.
      *
-     * @param {boolean} [afterChange] Whether the refresh is done after an event has changed or has been synced.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param afterChange Whether the refresh is done after an event has changed or has been synced.
+     * @return Promise resolved when done.
      */
     refreshData(afterChange?: boolean): Promise<any> {
         const promises = [];
@@ -249,7 +249,7 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, OnChanges,
     /**
      * An event was clicked.
      *
-     * @param {any} event Event.
+     * @param event Event.
      */
     eventClicked(event: any): void {
         this.onEventClicked.emit(event.id);
@@ -258,7 +258,7 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, OnChanges,
     /**
      * Merge online events with the offline events of that period.
      *
-     * @return {any[]} Merged events.
+     * @return Merged events.
      */
     protected mergeEvents(): any[] {
         if (!this.offlineEvents.length && !this.deletedEvents.length) {
@@ -302,7 +302,7 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, OnChanges,
     /**
      * Sort events by timestart.
      *
-     * @param {any[]} events List to sort.
+     * @param events List to sort.
      */
     protected sortEvents(events: any[]): any[] {
         return events.sort((a, b) => {
@@ -317,7 +317,7 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, OnChanges,
     /**
      * Undelete a certain event.
      *
-     * @param {number} eventId Event ID.
+     * @param eventId Event ID.
      */
     protected undeleteEvent(eventId: number): void {
         const event = this.onlineEvents.find((event) => {
diff --git a/src/addon/calendar/pages/day/day.ts b/src/addon/calendar/pages/day/day.ts
index c3b566f88..d87725e8f 100644
--- a/src/addon/calendar/pages/day/day.ts
+++ b/src/addon/calendar/pages/day/day.ts
@@ -208,9 +208,9 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     /**
      * Fetch all the data required for the view.
      *
-     * @param {boolean} [sync] Whether it should try to synchronize offline events.
-     * @param {boolean} [showErrors] Whether to show sync errors to the user.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param sync Whether it should try to synchronize offline events.
+     * @param showErrors Whether to show sync errors to the user.
+     * @return Promise resolved when done.
      */
     fetchData(sync?: boolean, showErrors?: boolean): Promise<any> {
 
@@ -280,7 +280,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     /**
      * Fetch the events for current day.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     fetchEvents(): Promise<any> {
         // Don't pass courseId and categoryId, we'll filter them locally.
@@ -328,7 +328,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     /**
      * Merge online events with the offline events of that period.
      *
-     * @return {any[]} Merged events.
+     * @return Merged events.
      */
     protected mergeEvents(): any[] {
         this.hasOffline = false;
@@ -389,7 +389,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     /**
      * Sort events by timestart.
      *
-     * @param {any[]} events List to sort.
+     * @param events List to sort.
      */
     protected sortEvents(events: any[]): any[] {
         return events.sort((a, b) => {
@@ -404,10 +404,10 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     /**
      * Refresh the data.
      *
-     * @param {any} [refresher] Refresher.
-     * @param {Function} [done] Function to call when done.
-     * @param {boolean} [showErrors] Whether to show sync errors to the user.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @param done Function to call when done.
+     * @param showErrors Whether to show sync errors to the user.
+     * @return Promise resolved when done.
      */
     doRefresh(refresher?: any, done?: () => void, showErrors?: boolean): Promise<any> {
         if (this.loaded) {
@@ -423,10 +423,10 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     /**
      * Refresh the data.
      *
-     * @param {boolean} [sync] Whether it should try to synchronize offline events.
-     * @param {boolean} [showErrors] Whether to show sync errors to the user.
-     * @param {boolean} [afterChange] Whether the refresh is done after an event has changed or has been synced.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param sync Whether it should try to synchronize offline events.
+     * @param showErrors Whether to show sync errors to the user.
+     * @param afterChange Whether the refresh is done after an event has changed or has been synced.
+     * @return Promise resolved when done.
      */
     refreshData(sync?: boolean, showErrors?: boolean, afterChange?: boolean): Promise<any> {
         this.syncIcon = 'spinner';
@@ -449,7 +449,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     /**
      * Load categories to be able to filter events.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected loadCategories(): Promise<any> {
         return this.coursesProvider.getCategories(0, true).then((cats) => {
@@ -467,8 +467,8 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     /**
      * Try to synchronize offline events.
      *
-     * @param {boolean} [showErrors] Whether to show sync errors to the user.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param showErrors Whether to show sync errors to the user.
+     * @return Promise resolved when done.
      */
     protected sync(showErrors?: boolean): Promise<any> {
         return this.calendarSync.syncEvents().then((result) => {
@@ -495,7 +495,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     /**
      * Navigate to a particular event.
      *
-     * @param {number} eventId Event to load.
+     * @param eventId Event to load.
      */
     gotoEvent(eventId: number): void {
         if (eventId < 0) {
@@ -511,7 +511,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     /**
      * Show the context menu.
      *
-     * @param {MouseEvent} event Event.
+     * @param event Event.
      */
     openCourseFilter(event: MouseEvent): void {
         this.coursesHelper.selectCourse(event, this.courses, this.courseId).then((result) => {
@@ -532,7 +532,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     /**
      * Open page to create/edit an event.
      *
-     * @param {number} [eventId] Event ID to edit.
+     * @param eventId Event ID to edit.
      */
     openEdit(eventId?: number): void {
         const params: any = {};
@@ -658,9 +658,9 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     /**
      * Find an event and mark it as deleted.
      *
-     * @param {number} eventId Event ID.
-     * @param {boolean} deleted Whether to mark it as deleted or not.
-     * @return {boolean} Whether the event was found.
+     * @param eventId Event ID.
+     * @param deleted Whether to mark it as deleted or not.
+     * @return Whether the event was found.
      */
     protected markAsDeleted(eventId: number, deleted: boolean): boolean {
         const event = this.onlineEvents.find((event) => {
@@ -678,8 +678,8 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
 
     /**
      * Returns if the event is in the past or not.
-     * @param  {any}     event Event object.
-     * @return {boolean}       True if it's in the past.
+     * @param event Event object.
+     * @return True if it's in the past.
      */
     isEventPast(event: any): boolean {
         return (event.timestart + event.timeduration) < this.currentTime;
diff --git a/src/addon/calendar/pages/edit-event/edit-event.ts b/src/addon/calendar/pages/edit-event/edit-event.ts
index b8d8ef9f4..df1f0f8c7 100644
--- a/src/addon/calendar/pages/edit-event/edit-event.ts
+++ b/src/addon/calendar/pages/edit-event/edit-event.ts
@@ -148,8 +148,8 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
     /**
      * Fetch the data needed to render the form.
      *
-     * @param {boolean} [refresh] Whether it's refreshing data.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Whether it's refreshing data.
+     * @return Promise resolved when done.
      */
     protected fetchData(refresh?: boolean): Promise<any> {
         let accessInfo;
@@ -289,9 +289,9 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
     /**
      * Load an event data into the form.
      *
-     * @param {any} event Event data.
-     * @param {boolean} isOffline Whether the data is from offline or not.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param event Event data.
+     * @param isOffline Whether the data is from offline or not.
+     * @return Promise resolved when done.
      */
     protected loadEventData(event: any, isOffline: boolean): Promise<any> {
         const courseId = event.course ? event.course.id : event.courseid;
@@ -344,7 +344,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
     /**
      * Pull to refresh.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshData(refresher: any): void {
         const promises = [
@@ -375,7 +375,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
     /**
      * A course was selected, get its groups.
      *
-     * @param {number} courseId Course ID.
+     * @param courseId Course ID.
      */
     groupCourseSelected(courseId: number): void {
         if (!courseId) {
@@ -396,8 +396,8 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
     /**
      * Load groups of a certain course.
      *
-     * @param {number} courseId Course ID.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param courseId Course ID.
+     * @return Promise resolved when done.
      */
     protected loadGroups(courseId: number): Promise<any> {
         this.loadingGroups = true;
@@ -515,7 +515,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
     /**
      * Convenience function to update or return to event list depending on device.
      *
-     * @param {number} [event] Event.
+     * @param event Event.
      */
     protected returnToList(event?: any): void {
         // Unblock the sync because the view will be destroyed and the sync process could be triggered before ngOnDestroy.
@@ -568,7 +568,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
     /**
      * Check if we can leave the page or not.
      *
-     * @return {boolean|Promise<void>} Resolved if we can leave it, rejected if not.
+     * @return Resolved if we can leave it, rejected if not.
      */
     ionViewCanLeave(): boolean | Promise<void> {
 
diff --git a/src/addon/calendar/pages/event/event.ts b/src/addon/calendar/pages/event/event.ts
index 8edc9b96e..21b503b5a 100644
--- a/src/addon/calendar/pages/event/event.ts
+++ b/src/addon/calendar/pages/event/event.ts
@@ -144,9 +144,9 @@ export class AddonCalendarEventPage implements OnDestroy {
     /**
      * Fetches the event and updates the view.
      *
-     * @param {boolean} [sync] Whether it should try to synchronize offline events.
-     * @param {boolean} [showErrors] Whether to show sync errors to the user.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param sync Whether it should try to synchronize offline events.
+     * @param showErrors Whether to show sync errors to the user.
+     * @return Promise resolved when done.
      */
     fetchEvent(sync?: boolean, showErrors?: boolean): Promise<any> {
         const currentSite = this.sitesProvider.getCurrentSite(),
@@ -312,7 +312,7 @@ export class AddonCalendarEventPage implements OnDestroy {
     /**
      * Add a reminder for this event.
      *
-     * @param {Event} e    Click event.
+     * @param e Click event.
      */
     addNotificationTime(e: Event): void {
         e.preventDefault();
@@ -342,8 +342,8 @@ export class AddonCalendarEventPage implements OnDestroy {
     /**
      * Cancel the selected notification.
      *
-     * @param {number} id  Reminder ID.
-     * @param {Event} e    Click event.
+     * @param id Reminder ID.
+     * @param e Click event.
      */
     cancelNotification(id: number, e: Event): void {
         e.preventDefault();
@@ -359,10 +359,10 @@ export class AddonCalendarEventPage implements OnDestroy {
     /**
      * Refresh the data.
      *
-     * @param {any} [refresher] Refresher.
-     * @param {Function} [done] Function to call when done.
-     * @param {boolean} [showErrors] Whether to show sync errors to the user.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @param done Function to call when done.
+     * @param showErrors Whether to show sync errors to the user.
+     * @return Promise resolved when done.
      */
     doRefresh(refresher?: any, done?: () => void, showErrors?: boolean): Promise<any> {
         if (this.eventLoaded) {
@@ -378,9 +378,9 @@ export class AddonCalendarEventPage implements OnDestroy {
     /**
      * Refresh the event.
      *
-     * @param {boolean} [sync] Whether it should try to synchronize offline events.
-     * @param {boolean} [showErrors] Whether to show sync errors to the user.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param sync Whether it should try to synchronize offline events.
+     * @param showErrors Whether to show sync errors to the user.
+     * @return Promise resolved when done.
      */
     refreshEvent(sync?: boolean, showErrors?: boolean): Promise<any> {
         this.syncIcon = 'spinner';
@@ -511,8 +511,8 @@ export class AddonCalendarEventPage implements OnDestroy {
     /**
      * Check the result of an automatic sync or a manual sync not done by this page.
      *
-     * @param {boolean} isManual Whether it's a manual sync.
-     * @param {any} data Sync result.
+     * @param isManual Whether it's a manual sync.
+     * @param data Sync result.
      */
     protected checkSyncResult(isManual: boolean, data: any): void {
         if (!data) {
diff --git a/src/addon/calendar/pages/index/index.ts b/src/addon/calendar/pages/index/index.ts
index 8f3d5a129..e9dd336de 100644
--- a/src/addon/calendar/pages/index/index.ts
+++ b/src/addon/calendar/pages/index/index.ts
@@ -164,9 +164,9 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
     /**
      * Fetch all the data required for the view.
      *
-     * @param {boolean} [sync] Whether it should try to synchronize offline events.
-     * @param {boolean} [showErrors] Whether to show sync errors to the user.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param sync Whether it should try to synchronize offline events.
+     * @param showErrors Whether to show sync errors to the user.
+     * @return Promise resolved when done.
      */
     fetchData(sync?: boolean, showErrors?: boolean): Promise<any> {
 
@@ -230,10 +230,10 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
     /**
      * Refresh the data.
      *
-     * @param {any} [refresher] Refresher.
-     * @param {Function} [done] Function to call when done.
-     * @param {boolean} [showErrors] Whether to show sync errors to the user.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @param done Function to call when done.
+     * @param showErrors Whether to show sync errors to the user.
+     * @return Promise resolved when done.
      */
     doRefresh(refresher?: any, done?: () => void, showErrors?: boolean): Promise<any> {
         if (this.loaded) {
@@ -249,10 +249,10 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
     /**
      * Refresh the data.
      *
-     * @param {boolean} [sync] Whether it should try to synchronize offline events.
-     * @param {boolean} [showErrors] Whether to show sync errors to the user.
-     * @param {boolean} [afterChange] Whether the refresh is done after an event has changed or has been synced.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param sync Whether it should try to synchronize offline events.
+     * @param showErrors Whether to show sync errors to the user.
+     * @param afterChange Whether the refresh is done after an event has changed or has been synced.
+     * @return Promise resolved when done.
      */
     refreshData(sync?: boolean, showErrors?: boolean, afterChange?: boolean): Promise<any> {
         this.syncIcon = 'spinner';
@@ -276,7 +276,7 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
     /**
      * Navigate to a particular event.
      *
-     * @param {number} eventId Event to load.
+     * @param eventId Event to load.
      */
     gotoEvent(eventId: number): void {
         if (eventId < 0) {
@@ -292,7 +292,7 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
     /**
      * View a certain day.
      *
-     * @param {any} data Data with the year, month and day.
+     * @param data Data with the year, month and day.
      */
     gotoDay(data: any): void {
         const params: any = {
@@ -311,7 +311,7 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
     /**
      * Show the context menu.
      *
-     * @param {MouseEvent} event Event.
+     * @param event Event.
      */
     openCourseFilter(event: MouseEvent): void {
         this.coursesHelper.selectCourse(event, this.courses, this.courseId).then((result) => {
@@ -330,7 +330,7 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
     /**
      * Open page to create/edit an event.
      *
-     * @param {number} [eventId] Event ID to edit.
+     * @param eventId Event ID to edit.
      */
     openEdit(eventId?: number): void {
         const params: any = {};
diff --git a/src/addon/calendar/pages/list/list.ts b/src/addon/calendar/pages/list/list.ts
index 0b864a78a..77b8922d1 100644
--- a/src/addon/calendar/pages/list/list.ts
+++ b/src/addon/calendar/pages/list/list.ts
@@ -233,10 +233,10 @@ export class AddonCalendarListPage implements OnDestroy {
     /**
      * Fetch all the data required for the view.
      *
-     * @param {boolean} [refresh] Empty events array first.
-     * @param {boolean} [sync] Whether it should try to synchronize offline events.
-     * @param {boolean} [showErrors] Whether to show sync errors to the user.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Empty events array first.
+     * @param sync Whether it should try to synchronize offline events.
+     * @param showErrors Whether to show sync errors to the user.
+     * @return Promise resolved when done.
      */
     fetchData(refresh?: boolean, sync?: boolean, showErrors?: boolean): Promise<any> {
         this.initialTime = this.timeUtils.timestamp();
@@ -314,8 +314,8 @@ export class AddonCalendarListPage implements OnDestroy {
     /**
      * Fetches the events and updates the view.
      *
-     * @param {boolean} [refresh] Empty events array first.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Empty events array first.
+     * @return Promise resolved when done.
      */
     fetchEvents(refresh?: boolean): Promise<any> {
         this.loadMoreError = false;
@@ -388,8 +388,8 @@ export class AddonCalendarListPage implements OnDestroy {
     /**
      * Function to load more events.
      *
-     * @param {any} [infiniteComplete] Infinite scroll complete function. Only used from core-infinite-loading.
-     * @return {Promise<any>} Resolved when done.
+     * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
+     * @return Resolved when done.
      */
     loadMoreEvents(infiniteComplete?: any): Promise<any> {
         return this.fetchEvents().finally(() => {
@@ -400,7 +400,7 @@ export class AddonCalendarListPage implements OnDestroy {
     /**
      * Get filtered events.
      *
-     * @return {any[]} Filtered events.
+     * @return Filtered events.
      */
     protected getFilteredEvents(): any[] {
         if (!this.courseId) {
@@ -415,8 +415,8 @@ export class AddonCalendarListPage implements OnDestroy {
 
     /**
      * Returns if the current state should load categories or not.
-     * @param {any[]} events Events to parse.
-     * @return {boolean}  True if categories should be loaded.
+     * @param events Events to parse.
+     * @return True if categories should be loaded.
      */
     protected shouldLoadCategories(events: any[]): boolean {
         if (this.categoriesRetrieved || this.getCategories) {
@@ -433,7 +433,7 @@ export class AddonCalendarListPage implements OnDestroy {
     /**
      * Load categories to be able to filter events.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected loadCategories(): Promise<any> {
         return this.coursesProvider.getCategories(0, true).then((cats) => {
@@ -451,8 +451,8 @@ export class AddonCalendarListPage implements OnDestroy {
     /**
      * Merge a period of online events with the offline events of that period.
      *
-     * @param {any[]} onlineEvents Online events.
-     * @return {any[]} Merged events.
+     * @param onlineEvents Online events.
+     * @return Merged events.
      */
     protected mergeEvents(onlineEvents: any[]): any[] {
         if (!this.offlineEvents.length && !this.deletedEvents.length) {
@@ -501,7 +501,7 @@ export class AddonCalendarListPage implements OnDestroy {
     /**
      * Sort events by timestart.
      *
-     * @param {any[]} events List to sort.
+     * @param events List to sort.
      */
     protected sortEvents(events: any[]): any[] {
         return events.sort((a, b) => {
@@ -516,10 +516,10 @@ export class AddonCalendarListPage implements OnDestroy {
     /**
      * Refresh the data.
      *
-     * @param {any} [refresher] Refresher.
-     * @param {Function} [done] Function to call when done.
-     * @param {boolean} [showErrors] Whether to show sync errors to the user.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @param done Function to call when done.
+     * @param showErrors Whether to show sync errors to the user.
+     * @return Promise resolved when done.
      */
     doRefresh(refresher?: any, done?: () => void, showErrors?: boolean): Promise<any> {
         if (this.eventsLoaded) {
@@ -535,9 +535,9 @@ export class AddonCalendarListPage implements OnDestroy {
     /**
      * Refresh the events.
      *
-     * @param {boolean} [sync] Whether it should try to synchronize offline events.
-     * @param {boolean} [showErrors] Whether to show sync errors to the user.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param sync Whether it should try to synchronize offline events.
+     * @param showErrors Whether to show sync errors to the user.
+     * @return Promise resolved when done.
      */
     refreshEvents(sync?: boolean, showErrors?: boolean): Promise<any> {
         this.syncIcon = 'spinner';
@@ -561,9 +561,9 @@ export class AddonCalendarListPage implements OnDestroy {
      * Check date should be shown on event list for the current event.
      * If date has changed from previous to current event it should be shown.
      *
-     * @param {any} event       Current event where to show the date.
-     * @param {any} [prevEvent] Previous event where to compare the date with.
-     * @return {boolean}  If date has changed and should be shown.
+     * @param event Current event where to show the date.
+     * @param prevEvent Previous event where to compare the date with.
+     * @return If date has changed and should be shown.
      */
     protected showDate(event: any, prevEvent?: any): boolean {
         if (!prevEvent) {
@@ -578,8 +578,8 @@ export class AddonCalendarListPage implements OnDestroy {
     /**
      * Check if event ends the same date or not.
      *
-     * @param {any} event Event info.
-     * @return {boolean}  If date has changed and should be shown.
+     * @param event Event info.
+     * @return If date has changed and should be shown.
      */
     protected endsSameDay(event: any): boolean {
         if (!event.timeduration) {
@@ -594,7 +594,7 @@ export class AddonCalendarListPage implements OnDestroy {
     /**
      * Show the context menu.
      *
-     * @param {MouseEvent} event Event.
+     * @param event Event.
      */
     openCourseFilter(event: MouseEvent): void {
         this.coursesHelper.selectCourse(event, this.courses, this.courseId).then((result) => {
@@ -617,7 +617,7 @@ export class AddonCalendarListPage implements OnDestroy {
     /**
      * Open page to create/edit an event.
      *
-     * @param {number} [eventId] Event ID to edit.
+     * @param eventId Event ID to edit.
      */
     openEdit(eventId?: number): void {
         this.eventId = undefined;
@@ -644,7 +644,7 @@ export class AddonCalendarListPage implements OnDestroy {
     /**
      * Navigate to a particular event.
      *
-     * @param {number} eventId Event to load.
+     * @param eventId Event to load.
      */
     gotoEvent(eventId: number): void {
         this.eventId = eventId;
@@ -662,8 +662,8 @@ export class AddonCalendarListPage implements OnDestroy {
     /**
      * Find an event and mark it as deleted.
      *
-     * @param {number} eventId Event ID.
-     * @param {boolean} deleted Whether to mark it as deleted or not.
+     * @param eventId Event ID.
+     * @param deleted Whether to mark it as deleted or not.
      */
     protected markAsDeleted(eventId: number, deleted: boolean): void {
         const event = this.onlineEvents.find((event) => {
diff --git a/src/addon/calendar/pages/settings/settings.ts b/src/addon/calendar/pages/settings/settings.ts
index bebc4f1e9..9027272db 100644
--- a/src/addon/calendar/pages/settings/settings.ts
+++ b/src/addon/calendar/pages/settings/settings.ts
@@ -45,7 +45,7 @@ export class AddonCalendarSettingsPage {
     /**
      * Update default time.
      *
-     * @param {number} newTime New time.
+     * @param newTime New time.
      */
     updateDefaultTime(newTime: number): void {
         this.calendarProvider.setDefaultNotificationTime(newTime);
diff --git a/src/addon/calendar/providers/calendar-offline.ts b/src/addon/calendar/providers/calendar-offline.ts
index 5b0f02436..868d8558b 100644
--- a/src/addon/calendar/providers/calendar-offline.ts
+++ b/src/addon/calendar/providers/calendar-offline.ts
@@ -148,9 +148,9 @@ export class AddonCalendarOfflineProvider {
     /**
      * Delete an offline event.
      *
-     * @param {number} eventId Event ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if deleted, rejected if failure.
+     * @param eventId Event ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if deleted, rejected if failure.
      */
     deleteEvent(eventId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -165,8 +165,8 @@ export class AddonCalendarOfflineProvider {
     /**
      * Get the IDs of all the events created/edited/deleted in offline.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number[]>} Promise resolved with the IDs.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the IDs.
      */
     getAllEventsIds(siteId?: string): Promise<number[]> {
         const promises = [];
@@ -182,8 +182,8 @@ export class AddonCalendarOfflineProvider {
     /**
      * Get all the events deleted in offline.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with all the events deleted in offline.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with all the events deleted in offline.
      */
     getAllDeletedEvents(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -194,8 +194,8 @@ export class AddonCalendarOfflineProvider {
     /**
      * Get the IDs of all the events deleted in offline.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number[]>} Promise resolved with the IDs of all the events deleted in offline.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the IDs of all the events deleted in offline.
      */
     getAllDeletedEventsIds(siteId?: string): Promise<number[]> {
         return this.getAllDeletedEvents(siteId).then((events) => {
@@ -208,8 +208,8 @@ export class AddonCalendarOfflineProvider {
     /**
      * Get all the events created/edited in offline.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with events.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with events.
      */
     getAllEditedEvents(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -220,8 +220,8 @@ export class AddonCalendarOfflineProvider {
     /**
      * Get the IDs of all the events created/edited in offline.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number[]>} Promise resolved with events IDs.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with events IDs.
      */
     getAllEditedEventsIds(siteId?: string): Promise<number[]> {
         return this.getAllEditedEvents(siteId).then((events) => {
@@ -234,9 +234,9 @@ export class AddonCalendarOfflineProvider {
     /**
      * Get an event deleted in offline.
      *
-     * @param {number} eventId Event ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the deleted event.
+     * @param eventId Event ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the deleted event.
      */
     getDeletedEvent(eventId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -251,9 +251,9 @@ export class AddonCalendarOfflineProvider {
     /**
      * Get an offline event.
      *
-     * @param {number} eventId Event ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the event.
+     * @param eventId Event ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the event.
      */
     getEvent(eventId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -268,8 +268,8 @@ export class AddonCalendarOfflineProvider {
     /**
      * Check if there are offline events to send.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: true if has offline events, false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: true if has offline events, false otherwise.
      */
     hasEditedEvents(siteId?: string): Promise<boolean> {
         return this.getAllEditedEvents(siteId).then((events) => {
@@ -283,8 +283,8 @@ export class AddonCalendarOfflineProvider {
     /**
      * Check whether there's offline data for a site.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: true if has offline data, false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: true if has offline data, false otherwise.
      */
     hasOfflineData(siteId?: string): Promise<boolean> {
         return this.getAllEventsIds(siteId).then((ids) => {
@@ -295,9 +295,9 @@ export class AddonCalendarOfflineProvider {
     /**
      * Check if an event is deleted.
      *
-     * @param {number} eventId Event ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether the event is deleted.
+     * @param eventId Event ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether the event is deleted.
      */
     isEventDeleted(eventId: number, siteId?: string): Promise<boolean> {
         return this.getDeletedEvent(eventId, siteId).then((event) => {
@@ -310,11 +310,11 @@ export class AddonCalendarOfflineProvider {
     /**
      * Mark an event as deleted.
      *
-     * @param {number} eventId Event ID to delete.
-     * @param {number} name Name of the event to delete.
-     * @param {boolean} [deleteAll] If it's a repeated event. whether to delete all events of the series.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param eventId Event ID to delete.
+     * @param name Name of the event to delete.
+     * @param deleteAll If it's a repeated event. whether to delete all events of the series.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     markDeleted(eventId: number, name: string, deleteAll?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -332,11 +332,11 @@ export class AddonCalendarOfflineProvider {
     /**
      * Offline version for adding a new discussion to a forum.
      *
-     * @param {number} eventId Event ID. If it's a new event, set it to undefined/null.
-     * @param {any} data Event data.
-     * @param {number} [timeCreated] The time the event was created. If not defined, current time.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the stored event.
+     * @param eventId Event ID. If it's a new event, set it to undefined/null.
+     * @param data Event data.
+     * @param timeCreated The time the event was created. If not defined, current time.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the stored event.
      */
     saveEvent(eventId: number, data: any, timeCreated?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -373,9 +373,9 @@ export class AddonCalendarOfflineProvider {
     /**
      * Unmark an event as deleted.
      *
-     * @param {number} eventId Event ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if deleted, rejected if failure.
+     * @param eventId Event ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if deleted, rejected if failure.
      */
     unmarkDeleted(eventId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/addon/calendar/providers/calendar-sync.ts b/src/addon/calendar/providers/calendar-sync.ts
index bc9d96f33..d237e0897 100644
--- a/src/addon/calendar/providers/calendar-sync.ts
+++ b/src/addon/calendar/providers/calendar-sync.ts
@@ -59,9 +59,9 @@ export class AddonCalendarSyncProvider extends CoreSyncBaseProvider {
     /**
      * Try to synchronize all events in a certain site or in all sites.
      *
-     * @param {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     syncAllEvents(siteId?: string, force?: boolean): Promise<any> {
         return this.syncOnSites('all calendar events', this.syncAllEventsFunc.bind(this), [force], siteId);
@@ -70,9 +70,9 @@ export class AddonCalendarSyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync all events on a site.
      *
-     * @param {string} siteId Site ID to sync.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @return {Promise<any>}          Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     protected syncAllEventsFunc(siteId: string, force?: boolean): Promise<any> {
 
@@ -93,8 +93,8 @@ export class AddonCalendarSyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync a site events only if a certain time has passed since the last time.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the events are synced or if it doesn't need to be synced.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the events are synced or if it doesn't need to be synced.
      */
     syncEventsIfNeeded(siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -109,8 +109,8 @@ export class AddonCalendarSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize all offline events of a certain site.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved if sync is successful, rejected otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     syncEvents(siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -182,10 +182,10 @@ export class AddonCalendarSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize an offline event.
      *
-     * @param {number} eventId The event ID to sync.
-     * @param {any} result Object where to store the result of the sync.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected otherwise.
+     * @param eventId The event ID to sync.
+     * @param result Object where to store the result of the sync.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     protected syncOfflineEvent(eventId: number, result: any, siteId?: string): Promise<any> {
 
diff --git a/src/addon/calendar/providers/calendar.ts b/src/addon/calendar/providers/calendar.ts
index 892cb35cd..c518a989d 100644
--- a/src/addon/calendar/providers/calendar.ts
+++ b/src/addon/calendar/providers/calendar.ts
@@ -335,8 +335,8 @@ export class AddonCalendarProvider {
     /**
      * Check if a certain site allows deleting events.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>} Promise resolved with true if can delete.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if can delete.
      * @since 3.3
      */
     canDeleteEvents(siteId?: string): Promise<boolean> {
@@ -350,8 +350,8 @@ export class AddonCalendarProvider {
     /**
      * Check if a certain site allows deleting events.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether events can be deleted.
+     * @param site Site. If not defined, use current site.
+     * @return Whether events can be deleted.
      * @since 3.3
      */
     canDeleteEventsInSite(site?: CoreSite): boolean {
@@ -363,8 +363,8 @@ export class AddonCalendarProvider {
     /**
      * Check if a certain site allows creating and editing events.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>} Promise resolved with true if can create/edit.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if can create/edit.
      * @since 3.7.1
      */
     canEditEvents(siteId?: string): Promise<boolean> {
@@ -378,8 +378,8 @@ export class AddonCalendarProvider {
     /**
      * Check if a certain site allows creating and editing events.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether events can be created and edited.
+     * @param site Site. If not defined, use current site.
+     * @return Whether events can be created and edited.
      * @since 3.7.1
      */
     canEditEventsInSite(site?: CoreSite): boolean {
@@ -392,8 +392,8 @@ export class AddonCalendarProvider {
     /**
      * Check if a certain site allows viewing events in monthly view.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>} Promise resolved with true if monthly view is supported.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if monthly view is supported.
      * @since 3.4
      */
     canViewMonth(siteId?: string): Promise<boolean> {
@@ -407,8 +407,8 @@ export class AddonCalendarProvider {
     /**
      * Check if a certain site allows viewing events in monthly view.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether monthly view is supported.
+     * @param site Site. If not defined, use current site.
+     * @return Whether monthly view is supported.
      * @since 3.4
      */
     canViewMonthInSite(site?: CoreSite): boolean {
@@ -420,8 +420,8 @@ export class AddonCalendarProvider {
     /**
      * Removes expired events from local DB.
      *
-     * @param {string} [siteId] ID of the site the event belongs to. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param siteId ID of the site the event belongs to. If not defined, use current site.
+     * @return Promise resolved when done.
      */
     cleanExpiredEvents(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -442,12 +442,12 @@ export class AddonCalendarProvider {
     /**
      * Delete an event.
      *
-     * @param {number} eventId Event ID to delete.
-     * @param {string} name Name of the event to delete.
-     * @param {boolean} [deleteAll] If it's a repeated event. whether to delete all events of the series.
-     * @param {boolean} [forceOffline] True to always save it in offline.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param eventId Event ID to delete.
+     * @param name Name of the event to delete.
+     * @param deleteAll If it's a repeated event. whether to delete all events of the series.
+     * @param forceOffline True to always save it in offline.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     deleteEvent(eventId: number, name: string, deleteAll?: boolean, forceOffline?: boolean, siteId?: string): Promise<boolean> {
 
@@ -484,10 +484,10 @@ export class AddonCalendarProvider {
     /**
      * Delete an event. It will fail if offline or cannot connect.
      *
-     * @param {number} eventId Event ID to delete.
-     * @param {boolean} [deleteAll] If it's a repeated event. whether to delete all events of the series.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param eventId Event ID to delete.
+     * @param deleteAll If it's a repeated event. whether to delete all events of the series.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     deleteEventOnline(eventId: number, deleteAll?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -511,9 +511,9 @@ export class AddonCalendarProvider {
     /**
      * Delete a locally stored event cancelling all the reminders and notifications.
      *
-     * @param  {number}       eventId Event ID.
-     * @param  {string}       [siteId] ID of the site the event belongs to. If not defined, use current site.
-     * @return {Promise<any>}         Resolved when done.
+     * @param eventId Event ID.
+     * @param siteId ID of the site the event belongs to. If not defined, use current site.
+     * @return Resolved when done.
      */
     protected deleteLocalEvent(eventId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -538,8 +538,8 @@ export class AddonCalendarProvider {
     /**
      * Check if event ends the same day or not.
      *
-     * @param {any} event Event info.
-     * @return {boolean} If the .
+     * @param event Event info.
+     * @return If the .
      */
     endsSameDay(event: any): boolean {
         if (!event.timeduration) {
@@ -554,13 +554,13 @@ export class AddonCalendarProvider {
     /**
      * Format event time. Similar to calendar_format_event_time.
      *
-     * @param {any} event Event to format.
-     * @param {string} format Calendar time format (from getCalendarTimeFormat).
-     * @param {boolean} [useCommonWords=true] Whether to use common words like "Today", "Yesterday", etc.
-     * @param {number} [seenDay] Timestamp of day currently seen. If set, the function will not add links to this day.
-     * @param {number} [showTime=0] Determine the show time GMT timestamp.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<string>} Promise resolved with the formatted event time.
+     * @param event Event to format.
+     * @param format Calendar time format (from getCalendarTimeFormat).
+     * @param useCommonWords Whether to use common words like "Today", "Yesterday", etc.
+     * @param seenDay Timestamp of day currently seen. If set, the function will not add links to this day.
+     * @param showTime Determine the show time GMT timestamp.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the formatted event time.
      */
     formatEventTime(event: any, format: string, useCommonWords: boolean = true, seenDay?: number, showTime: number = 0,
             siteId?: string): Promise<string> {
@@ -630,9 +630,9 @@ export class AddonCalendarProvider {
     /**
      * Get access information for a calendar (either course calendar or site calendar).
      *
-     * @param {number} [courseId] Course ID. If not defined, site calendar.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with object with access information.
+     * @param courseId Course ID. If not defined, site calendar.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with object with access information.
      * @since 3.7
      */
     getAccessInformation(courseId?: number, siteId?: string): Promise<any> {
@@ -653,8 +653,8 @@ export class AddonCalendarProvider {
     /**
      * Get cache key for calendar access information WS calls.
      *
-     * @param {number} [courseId] Course ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getAccessInformationCacheKey(courseId?: number): string {
         return this.ROOT_CACHE_KEY + 'accessInformation:' + (courseId || 0);
@@ -663,8 +663,8 @@ export class AddonCalendarProvider {
     /**
      * Get all calendar events from local Db.
      *
-     * @param {string} [siteId] ID of the site the event belongs to. If not defined, use current site.
-     * @return {Promise<any[]>} Promise resolved with all the events.
+     * @param siteId ID of the site the event belongs to. If not defined, use current site.
+     * @return Promise resolved with all the events.
      */
     getAllEventsFromLocalDb(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -675,9 +675,9 @@ export class AddonCalendarProvider {
     /**
      * Get the type of events a user can create (either course calendar or site calendar).
      *
-     * @param {number} [courseId] Course ID. If not defined, site calendar.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with an object indicating the types.
+     * @param courseId Course ID. If not defined, site calendar.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with an object indicating the types.
      * @since 3.7
      */
     getAllowedEventTypes(courseId?: number, siteId?: string): Promise<any> {
@@ -709,8 +709,8 @@ export class AddonCalendarProvider {
     /**
      * Get cache key for calendar allowed event types WS calls.
      *
-     * @param {number} [courseId] Course ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getAllowedEventTypesCacheKey(courseId?: number): string {
         return this.ROOT_CACHE_KEY + 'allowedEventTypes:' + (courseId || 0);
@@ -719,8 +719,8 @@ export class AddonCalendarProvider {
     /**
      * Get the "look ahead" for a certain user.
      *
-     * @param  {string} [siteId] ID of the site. If not defined, use current site.
-     * @return {Promise<number>} Promise resolved with the look ahead (number of days).
+     * @param siteId ID of the site. If not defined, use current site.
+     * @return Promise resolved with the look ahead (number of days).
      */
     getCalendarLookAhead(siteId?: string): Promise<number> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -739,8 +739,8 @@ export class AddonCalendarProvider {
     /**
      * Get the time format to use in calendar.
      *
-     * @param  {string} [siteId] ID of the site. If not defined, use current site.
-     * @return {Promise<string>} Promise resolved with the format.
+     * @param siteId ID of the site. If not defined, use current site.
+     * @return Promise resolved with the format.
      */
     getCalendarTimeFormat(siteId?: string): Promise<string> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -766,9 +766,9 @@ export class AddonCalendarProvider {
     /**
      * Return the representation day. Equivalent to Moodle's calendar_day_representation.
      *
-     * @param {number} time Timestamp to get the day from.
-     * @param {boolean} [useCommonWords=true] Whether to use common words like "Today", "Yesterday", etc.
-     * @return {string} The formatted date/time.
+     * @param time Timestamp to get the day from.
+     * @param useCommonWords Whether to use common words like "Today", "Yesterday", etc.
+     * @return The formatted date/time.
      */
     getDayRepresentation(time: number, useCommonWords: boolean = true): string {
 
@@ -797,8 +797,8 @@ export class AddonCalendarProvider {
     /**
      * Get the configured default notification time.
      *
-     * @param  {string} [siteId] ID of the site. If not defined, use current site.
-     * @return {Promise<number>}  Promise resolved with the default time.
+     * @param siteId ID of the site. If not defined, use current site.
+     * @return Promise resolved with the default time.
      */
     getDefaultNotificationTime(siteId?: string): Promise<number> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -811,10 +811,10 @@ export class AddonCalendarProvider {
     /**
      * Get a calendar event. If the server request fails and data is not cached, try to get it from local DB.
      *
-     * @param {number}  id        Event ID.
-     * @param {boolean} [refresh] True when we should update the event data.
-     * @param {string} [siteId] ID of the site. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the event data is retrieved.
+     * @param id Event ID.
+     * @param refresh True when we should update the event data.
+     * @param siteId ID of the site. If not defined, use current site.
+     * @return Promise resolved when the event data is retrieved.
      */
     getEvent(id: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -848,10 +848,10 @@ export class AddonCalendarProvider {
     /**
      * Get a calendar event by ID. This function returns more data than getEvent, but it isn't available in all Moodles.
      *
-     * @param {number} id Event ID.
-     * @param {boolean} [refresh] True when we should update the event data.
-     * @param {string} [siteId] ID of the site. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the event data is retrieved.
+     * @param id Event ID.
+     * @param refresh True when we should update the event data.
+     * @param siteId ID of the site. If not defined, use current site.
+     * @return Promise resolved when the event data is retrieved.
      * @since 3.4
      */
     getEventById(id: number, siteId?: string): Promise<any> {
@@ -877,8 +877,8 @@ export class AddonCalendarProvider {
     /**
      * Get cache key for a single event WS call.
      *
-     * @param {number} id Event ID.
-     * @return {string} Cache key.
+     * @param id Event ID.
+     * @return Cache key.
      */
     protected getEventCacheKey(id: number): string {
         return this.ROOT_CACHE_KEY + 'events:' + id;
@@ -887,9 +887,9 @@ export class AddonCalendarProvider {
     /**
      * Get a calendar event from local Db.
      *
-     * @param  {number} id       Event ID.
-     * @param  {string} [siteId] ID of the site the event belongs to. If not defined, use current site.
-     * @return {Promise<any>}    Promise resolved when the event data is retrieved.
+     * @param id Event ID.
+     * @param siteId ID of the site the event belongs to. If not defined, use current site.
+     * @return Promise resolved when the event data is retrieved.
      */
     getEventFromLocalDb(id: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -913,10 +913,10 @@ export class AddonCalendarProvider {
     /**
      * Adds an event reminder and schedule a new notification.
      *
-     * @param  {any} event       Event to update its notification time.
-     * @param  {number} time     New notification setting timestamp.
-     * @param  {string} [siteId] ID of the site the event belongs to. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the notification is updated.
+     * @param event Event to update its notification time.
+     * @param time New notification setting timestamp.
+     * @param siteId ID of the site the event belongs to. If not defined, use current site.
+     * @return Promise resolved when the notification is updated.
      */
     addEventReminder(event: any, time: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -935,8 +935,8 @@ export class AddonCalendarProvider {
      * Return the normalised event type.
      * Activity events are normalised to be course events.
      *
-     * @param {any} event The event to get its type.
-     * @return {string} Event type.
+     * @param event The event to get its type.
+     * @return Event type.
      */
     getEventType(event: any): string {
         if (event.modulename) {
@@ -949,9 +949,9 @@ export class AddonCalendarProvider {
     /**
      * Remove an event reminder and cancel the notification.
      *
-     * @param  {number} id       Reminder ID.
-     * @param  {string} [siteId] ID of the site the event belongs to. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the notification is updated.
+     * @param id Reminder ID.
+     * @param siteId ID of the site the event belongs to. If not defined, use current site.
+     * @return Promise resolved when the notification is updated.
      */
     deleteEventReminder(id: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -966,14 +966,14 @@ export class AddonCalendarProvider {
     /**
      * Get calendar events for a certain day.
      *
-     * @param {number} year Year to get.
-     * @param {number} month Month to get.
-     * @param {number} day Day to get.
-     * @param {number} [courseId] Course to get.
-     * @param {number} [categoryId] Category to get.
-     * @param  {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the response.
+     * @param year Year to get.
+     * @param month Month to get.
+     * @param day Day to get.
+     * @param courseId Course to get.
+     * @param categoryId Category to get.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the response.
      */
     getDayEvents(year: number, month: number, day: number, courseId?: number, categoryId?: number, ignoreCache?: boolean,
             siteId?: string): Promise<any> {
@@ -1014,7 +1014,7 @@ export class AddonCalendarProvider {
     /**
      * Get prefix cache key for day events WS calls.
      *
-     * @return {string} Prefix Cache key.
+     * @return Prefix Cache key.
      */
     protected getDayEventsPrefixCacheKey(): string {
         return this.ROOT_CACHE_KEY + 'day:';
@@ -1023,10 +1023,10 @@ export class AddonCalendarProvider {
     /**
      * Get prefix cache key for a certain day for day events WS calls.
      *
-     * @param {number} year Year to get.
-     * @param {number} month Month to get.
-     * @param {number} day Day to get.
-     * @return {string} Prefix Cache key.
+     * @param year Year to get.
+     * @param month Month to get.
+     * @param day Day to get.
+     * @return Prefix Cache key.
      */
     protected getDayEventsDayPrefixCacheKey(year: number, month: number, day: number): string {
         return this.getDayEventsPrefixCacheKey() + year + ':' + month + ':' + day + ':';
@@ -1035,12 +1035,12 @@ export class AddonCalendarProvider {
     /**
      * Get cache key for day events WS calls.
      *
-     * @param {number} year Year to get.
-     * @param {number} month Month to get.
-     * @param {number} day Day to get.
-     * @param {number} [courseId] Course to get.
-     * @param {number} [categoryId] Category to get.
-     * @return {string} Cache key.
+     * @param year Year to get.
+     * @param month Month to get.
+     * @param day Day to get.
+     * @param courseId Course to get.
+     * @param categoryId Category to get.
+     * @return Cache key.
      */
     protected getDayEventsCacheKey(year: number, month: number, day: number, courseId?: number, categoryId?: number): string {
         return this.getDayEventsDayPrefixCacheKey(year, month, day) + (courseId ? courseId : '') + ':' +
@@ -1050,9 +1050,9 @@ export class AddonCalendarProvider {
     /**
      * Get a calendar reminders from local Db.
      *
-     * @param  {number} id       Event ID.
-     * @param  {string} [siteId] ID of the site the event belongs to. If not defined, use current site.
-     * @return {Promise<any>}    Promise resolved when the event data is retrieved.
+     * @param id Event ID.
+     * @param siteId ID of the site the event belongs to. If not defined, use current site.
+     * @return Promise resolved when the event data is retrieved.
      */
     getEventReminders(id: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1067,11 +1067,11 @@ export class AddonCalendarProvider {
      * E.g. using provider.getEventsList(undefined, 30, 30) is going to get the events starting after 30 days from now
      * and ending before 60 days from now.
      *
-     * @param {number} [initialTime] Timestamp when the first fetch was done. If not defined, current time.
-     * @param {number} [daysToStart=0] Number of days from now to start getting events.
-     * @param {number} [daysInterval=30] Number of days between timestart and timeend.
-     * @param {string} [siteId]          Site to get the events from. If not defined, use current site.
-     * @return {Promise<any[]>}          Promise to be resolved when the participants are retrieved.
+     * @param initialTime Timestamp when the first fetch was done. If not defined, current time.
+     * @param daysToStart Number of days from now to start getting events.
+     * @param daysInterval Number of days between timestart and timeend.
+     * @param siteId Site to get the events from. If not defined, use current site.
+     * @return Promise to be resolved when the participants are retrieved.
      */
     getEventsList(initialTime?: number, daysToStart: number = 0, daysInterval: number = AddonCalendarProvider.DAYS_INTERVAL,
             siteId?: string): Promise<any[]> {
@@ -1137,7 +1137,7 @@ export class AddonCalendarProvider {
     /**
      * Get prefix cache key for events list WS calls.
      *
-     * @return {string} Prefix Cache key.
+     * @return Prefix Cache key.
      */
     protected getEventsListPrefixCacheKey(): string {
         return this.ROOT_CACHE_KEY + 'events:';
@@ -1146,9 +1146,9 @@ export class AddonCalendarProvider {
     /**
      * Get cache key for events list WS calls.
      *
-     * @param {number} daysToStart  Number of days from now to start getting events.
-     * @param {number} daysInterval Number of days between timestart and timeend.
-     * @return {string} Cache key.
+     * @param daysToStart Number of days from now to start getting events.
+     * @param daysInterval Number of days between timestart and timeend.
+     * @return Cache key.
      */
     protected getEventsListCacheKey(daysToStart: number, daysInterval: number): string {
         return this.getEventsListPrefixCacheKey() + daysToStart + ':' + daysInterval;
@@ -1157,9 +1157,9 @@ export class AddonCalendarProvider {
     /**
      * Get calendar events from local Db that have the same repeatid.
      *
-     * @param {number} [repeatId] Repeat Id of the event.
-     * @param {string} [siteId] ID of the site the event belongs to. If not defined, use current site.
-     * @return {Promise<any[]>} Promise resolved with all the events.
+     * @param repeatId Repeat Id of the event.
+     * @param siteId ID of the site the event belongs to. If not defined, use current site.
+     * @return Promise resolved with all the events.
      */
     getLocalEventsByRepeatIdFromLocalDb(repeatId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1169,13 +1169,13 @@ export class AddonCalendarProvider {
     /**
      * Get monthly calendar events.
      *
-     * @param {number} year Year to get.
-     * @param {number} month Month to get.
-     * @param {number} [courseId] Course to get.
-     * @param {number} [categoryId] Category to get.
-     * @param  {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the response.
+     * @param year Year to get.
+     * @param month Month to get.
+     * @param courseId Course to get.
+     * @param categoryId Category to get.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the response.
      */
     getMonthlyEvents(year: number, month: number, courseId?: number, categoryId?: number, ignoreCache?: boolean, siteId?: string)
             : Promise<any> {
@@ -1230,7 +1230,7 @@ export class AddonCalendarProvider {
     /**
      * Get prefix cache key for monthly events WS calls.
      *
-     * @return {string} Prefix Cache key.
+     * @return Prefix Cache key.
      */
     protected getMonthlyEventsPrefixCacheKey(): string {
         return this.ROOT_CACHE_KEY + 'monthly:';
@@ -1239,9 +1239,9 @@ export class AddonCalendarProvider {
     /**
      * Get prefix cache key for a certain month for monthly events WS calls.
      *
-     * @param {number} year Year to get.
-     * @param {number} month Month to get.
-     * @return {string} Prefix Cache key.
+     * @param year Year to get.
+     * @param month Month to get.
+     * @return Prefix Cache key.
      */
     protected getMonthlyEventsMonthPrefixCacheKey(year: number, month: number): string {
         return this.getMonthlyEventsPrefixCacheKey() + year + ':' + month + ':';
@@ -1250,11 +1250,11 @@ export class AddonCalendarProvider {
     /**
      * Get cache key for monthly events WS calls.
      *
-     * @param {number} year Year to get.
-     * @param {number} month Month to get.
-     * @param {number} [courseId] Course to get.
-     * @param {number} [categoryId] Category to get.
-     * @return {string} Cache key.
+     * @param year Year to get.
+     * @param month Month to get.
+     * @param courseId Course to get.
+     * @param categoryId Category to get.
+     * @return Cache key.
      */
     protected getMonthlyEventsCacheKey(year: number, month: number, courseId?: number, categoryId?: number): string {
         return this.getMonthlyEventsMonthPrefixCacheKey(year, month) + (courseId ? courseId : '') + ':' +
@@ -1264,11 +1264,11 @@ export class AddonCalendarProvider {
     /**
      * Get upcoming calendar events.
      *
-     * @param {number} [courseId] Course to get.
-     * @param {number} [categoryId] Category to get.
-     * @param  {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the response.
+     * @param courseId Course to get.
+     * @param categoryId Category to get.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the response.
      */
     getUpcomingEvents(courseId?: number, categoryId?: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
 
@@ -1304,7 +1304,7 @@ export class AddonCalendarProvider {
     /**
      * Get prefix cache key for upcoming events WS calls.
      *
-     * @return {string} Prefix Cache key.
+     * @return Prefix Cache key.
      */
     protected getUpcomingEventsPrefixCacheKey(): string {
         return this.ROOT_CACHE_KEY + 'upcoming:';
@@ -1313,9 +1313,9 @@ export class AddonCalendarProvider {
     /**
      * Get cache key for upcoming events WS calls.
      *
-     * @param {number} [courseId] Course to get.
-     * @param {number} [categoryId] Category to get.
-     * @return {string} Cache key.
+     * @param courseId Course to get.
+     * @param categoryId Category to get.
+     * @return Cache key.
      */
     protected getUpcomingEventsCacheKey(courseId?: number, categoryId?: number): string {
         return this.getUpcomingEventsPrefixCacheKey() + (courseId ? courseId : '') + ':' + (categoryId ? categoryId : '');
@@ -1324,11 +1324,11 @@ export class AddonCalendarProvider {
     /**
      * Get URL to view a calendar.
      *
-     * @param {string} view The view to load: 'month', 'day', 'upcoming', etc.
-     * @param {number} [time] Time to load. If not defined, current time.
-     * @param {string} [courseId] Course to load. If not defined, all courses.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<string>} Promise resolved with the URL.x
+     * @param view The view to load: 'month', 'day', 'upcoming', etc.
+     * @param time Time to load. If not defined, current time.
+     * @param courseId Course to load. If not defined, all courses.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the URL.x
      */
     getViewUrl(view: string, time?: number, courseId?: string, siteId?: string): Promise<string> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1349,8 +1349,8 @@ export class AddonCalendarProvider {
     /**
      * Get the week days, already ordered according to a specified starting day.
      *
-     * @param {number} [startingDay=0] Starting day. 0=Sunday, 1=Monday, ...
-     * @return {any[]} Week days.
+     * @param startingDay Starting day. 0=Sunday, 1=Monday, ...
+     * @return Week days.
      */
     getWeekDays(startingDay?: number): any[] {
         startingDay = startingDay || 0;
@@ -1361,9 +1361,9 @@ export class AddonCalendarProvider {
     /**
      * Invalidates access information.
      *
-     * @param {number} [courseId] Course ID. If not defined, site calendar.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the data is invalidated.
+     * @param courseId Course ID. If not defined, site calendar.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAccessInformation(courseId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1374,9 +1374,9 @@ export class AddonCalendarProvider {
     /**
      * Invalidates allowed event types.
      *
-     * @param {number} [courseId] Course ID. If not defined, site calendar.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the data is invalidated.
+     * @param courseId Course ID. If not defined, site calendar.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAllowedEventTypes(courseId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1387,8 +1387,8 @@ export class AddonCalendarProvider {
     /**
      * Invalidates day events for all days.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAllDayEvents(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1399,10 +1399,10 @@ export class AddonCalendarProvider {
     /**
      * Invalidates day events for a certain day.
      *
-     * @param {number} year Year.
-     * @param {number} month Month.
-     * @param {number} day Day.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param year Year.
+     * @param month Month.
+     * @param day Day.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateDayEvents(year: number, month: number, day: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1413,8 +1413,8 @@ export class AddonCalendarProvider {
     /**
      * Invalidates events list and all the single events and related info.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<any[]>} Promise resolved when the list is invalidated.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved when the list is invalidated.
      */
     invalidateEventsList(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1433,9 +1433,9 @@ export class AddonCalendarProvider {
     /**
      * Invalidates a single event.
      *
-     * @param {number} eventId List of courses or course ids.
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the list is invalidated.
+     * @param eventId List of courses or course ids.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved when the list is invalidated.
      */
     invalidateEvent(eventId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1446,8 +1446,8 @@ export class AddonCalendarProvider {
     /**
      * Invalidates monthly events for all months.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAllMonthlyEvents(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1458,9 +1458,9 @@ export class AddonCalendarProvider {
     /**
      * Invalidates monthly events for a certain months.
      *
-     * @param {number} year Year.
-     * @param {number} month Month.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param year Year.
+     * @param month Month.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateMonthlyEvents(year: number, month: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1471,8 +1471,8 @@ export class AddonCalendarProvider {
     /**
      * Invalidates upcoming events for all courses and categories.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAllUpcomingEvents(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1483,10 +1483,10 @@ export class AddonCalendarProvider {
     /**
      * Invalidates upcoming events for a certain course or category.
      *
-     * @param {number} [courseId] Course ID.
-     * @param {number} [categoryId] Category ID.
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @param categoryId Category ID.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateUpcomingEvents(courseId?: number, categoryId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1497,8 +1497,8 @@ export class AddonCalendarProvider {
     /**
      * Invalidates look ahead setting.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateLookAhead(siteId?: string): Promise<any> {
         return this.userProvider.invalidateUserPreference('calendar_lookahead', siteId);
@@ -1507,8 +1507,8 @@ export class AddonCalendarProvider {
     /**
      * Invalidates time format setting.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateTimeFormat(siteId?: string): Promise<any> {
         return this.userProvider.invalidateUserPreference('calendar_timeformat', siteId);
@@ -1517,8 +1517,8 @@ export class AddonCalendarProvider {
     /**
      * Check if Calendar is disabled in a certain site.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether it's disabled.
+     * @param site Site. If not defined, use current site.
+     * @return Whether it's disabled.
      */
     isCalendarDisabledInSite(site?: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
@@ -1529,8 +1529,8 @@ export class AddonCalendarProvider {
     /**
      * Check if Calendar is disabled in a certain site.
      *
-     * @param  {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>}     Promise resolved with true if disabled, rejected or resolved with false otherwise.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if disabled, rejected or resolved with false otherwise.
      */
     isDisabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1541,8 +1541,8 @@ export class AddonCalendarProvider {
     /**
      * Check if the get event by ID WS is available.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>} Promise resolved with true if available.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if available.
      * @since 3.4
      */
     isGetEventByIdAvailable(siteId?: string): Promise<boolean> {
@@ -1556,8 +1556,8 @@ export class AddonCalendarProvider {
     /**
      * Check if the get event by ID WS is available in a certain site.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether it's available.
+     * @param site Site. If not defined, use current site.
+     * @return Whether it's available.
      * @since 3.4
      */
     isGetEventByIdAvailableInSite(site?: CoreSite): boolean {
@@ -1571,7 +1571,7 @@ export class AddonCalendarProvider {
      * If an event notification time is 0, cancel its scheduled notification (if any).
      * If local notification plugin is not enabled, resolve the promise.
      *
-     * @return {Promise}         Promise resolved when all the notifications have been scheduled.
+     * @return Promise resolved when all the notifications have been scheduled.
      */
     scheduleAllSitesEventsNotifications(): Promise<any[]> {
         const notificationsEnabled = this.localNotificationsProvider.isAvailable();
@@ -1603,10 +1603,10 @@ export class AddonCalendarProvider {
      * Schedules an event notification. If time is 0, cancel scheduled notification if any.
      * If local notification plugin is not enabled, resolve the promise.
      *
-     * @param  {any} event    Event to schedule.
-     * @param  {number} time     Notification setting time (in minutes). E.g. 10 means "notificate 10 minutes before start".
-     * @param  {string} [siteId] Site ID the event belongs to. If not defined, use current site.
-     * @return {Promise<void>}    Promise resolved when the notification is scheduled.
+     * @param event Event to schedule.
+     * @param time Notification setting time (in minutes). E.g. 10 means "notificate 10 minutes before start".
+     * @param siteId Site ID the event belongs to. If not defined, use current site.
+     * @return Promise resolved when the notification is scheduled.
      */
     protected scheduleEventNotification(event: any, reminderId: number, time: number, siteId?: string): Promise<void> {
         if (this.localNotificationsProvider.isAvailable()) {
@@ -1668,9 +1668,9 @@ export class AddonCalendarProvider {
      * If an event notification time is 0, cancel its scheduled notification (if any).
      * If local notification plugin is not enabled, resolve the promise.
      *
-     * @param  {any[]} events Events to schedule.
-     * @param  {string} [siteId] ID of the site the events belong to. If not defined, use current site.
-     * @return {Promise<any[]>}         Promise resolved when all the notifications have been scheduled.
+     * @param events Events to schedule.
+     * @param siteId ID of the site the events belong to. If not defined, use current site.
+     * @return Promise resolved when all the notifications have been scheduled.
      */
     scheduleEventsNotifications(events: any[], siteId?: string): Promise<any[]> {
 
@@ -1699,9 +1699,9 @@ export class AddonCalendarProvider {
     /**
      * Set the default notification time.
      *
-     * @param  {number} time     New default time.
-     * @param  {string} [siteId] ID of the site. If not defined, use current site.
-     * @return {Promise<any[]>}    Promise resolved when stored.
+     * @param time New default time.
+     * @param siteId ID of the site. If not defined, use current site.
+     * @return Promise resolved when stored.
      */
     setDefaultNotificationTime(time: number, siteId?: string): Promise<any[]> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -1714,9 +1714,9 @@ export class AddonCalendarProvider {
     /**
      * Store an event in local DB as it is.
      *
-     * @param {any} event Event to store.
-     * @param {string} [siteId] ID of the site the event belongs to. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when stored.
+     * @param event Event to store.
+     * @param siteId ID of the site the event belongs to. If not defined, use current site.
+     * @return Promise resolved when stored.
      */
     storeEventInLocalDb(event: any, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1780,9 +1780,9 @@ export class AddonCalendarProvider {
     /**
      * Store events in local DB.
      *
-     * @param {any[]} events  Events to store.
-     * @param  {string} [siteId] ID of the site the event belongs to. If not defined, use current site.
-     * @return {Promise<any[]>}         Promise resolved when the events are stored.
+     * @param events Events to store.
+     * @param siteId ID of the site the event belongs to. If not defined, use current site.
+     * @return Promise resolved when the events are stored.
      */
     protected storeEventsInLocalDB(events: any[], siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1798,13 +1798,13 @@ export class AddonCalendarProvider {
     /**
      * Submit a calendar event.
      *
-     * @param {number} eventId ID of the event. If undefined/null, create a new event.
-     * @param {any} formData Form data.
-     * @param {number} [timeCreated] The time the event was created. Only if modifying a new offline event.
-     * @param {boolean} [forceOffline] True to always save it in offline.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<{sent: boolean, event: any}>} Promise resolved with the event and a boolean indicating if data was
-     *                                                sent to server or stored in offline.
+     * @param eventId ID of the event. If undefined/null, create a new event.
+     * @param formData Form data.
+     * @param timeCreated The time the event was created. Only if modifying a new offline event.
+     * @param forceOffline True to always save it in offline.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the event and a boolean indicating if data was
+     *         sent to server or stored in offline.
      */
     submitEvent(eventId: number, formData: any, timeCreated?: number, forceOffline?: boolean, siteId?: string):
             Promise<{sent: boolean, event: any}> {
@@ -1842,10 +1842,10 @@ export class AddonCalendarProvider {
     /**
      * Submit an event, either to create it or to edit it. It will fail if offline or cannot connect.
      *
-     * @param {number} eventId ID of the event. If undefined/null, create a new event.
-     * @param {any} formData Form data.
-     * @param {string} [siteId] Site ID. If not provided, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param eventId ID of the event. If undefined/null, create a new event.
+     * @param formData Form data.
+     * @param siteId Site ID. If not provided, current site.
+     * @return Promise resolved when done.
      */
     submitEventOnline(eventId: number, formData: any, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/addon/calendar/providers/helper.ts b/src/addon/calendar/providers/helper.ts
index 7fd222659..6c2cd8a6b 100644
--- a/src/addon/calendar/providers/helper.ts
+++ b/src/addon/calendar/providers/helper.ts
@@ -49,8 +49,8 @@ export class AddonCalendarHelperProvider {
     /**
      * Calculate some day data based on a list of events for that day.
      *
-     * @param {any} day Day.
-     * @param {any[]} events Events.
+     * @param day Day.
+     * @param events Events.
      */
     calculateDayData(day: any, events: any[]): void {
         day.hasevents = events.length > 0;
@@ -71,9 +71,9 @@ export class AddonCalendarHelperProvider {
     /**
      * Check if current user can create/edit events.
      *
-     * @param {number} [courseId] Course ID. If not defined, site calendar.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether the user can create events.
+     * @param courseId Course ID. If not defined, site calendar.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether the user can create events.
      */
     canEditEvents(courseId?: number, siteId?: string): Promise<boolean> {
         return this.calendarProvider.canEditEvents(siteId).then((canEdit) => {
@@ -94,8 +94,8 @@ export class AddonCalendarHelperProvider {
      * Classify events into their respective months and days. If an event duration covers more than one day,
      * it will be included in all the days it lasts.
      *
-     * @param {any[]} events Events to classify.
-     * @return {{[monthId: string]: {[day: number]: any[]}}} Object with the classified events.
+     * @param events Events to classify.
+     * @return Object with the classified events.
      */
     classifyIntoMonths(events: any[]): {[monthId: string]: {[day: number]: any[]}} {
 
@@ -128,7 +128,7 @@ export class AddonCalendarHelperProvider {
     /**
      * Convenience function to format some event data to be rendered.
      *
-     * @param {any} e Event to format.
+     * @param e Event to format.
      */
     formatEventData(e: any): void {
         e.icon = this.EVENTICONS[e.eventtype] || false;
@@ -157,8 +157,8 @@ export class AddonCalendarHelperProvider {
     /**
      * Get options (name & value) for each allowed event type.
      *
-     * @param {any} eventTypes Result of getAllowedEventTypes.
-     * @return {{name: string, value: string}[]} Options.
+     * @param eventTypes Result of getAllowedEventTypes.
+     * @return Options.
      */
     getEventTypeOptions(eventTypes: any): {name: string, value: string}[] {
         const options = [];
@@ -185,9 +185,9 @@ export class AddonCalendarHelperProvider {
     /**
      * Get the month "id" (year + month).
      *
-     * @param {number} year Year.
-     * @param {number} month Month.
-     * @return {string} The "id".
+     * @param year Year.
+     * @param month Month.
+     * @return The "id".
      */
     getMonthId(year: number, month: number): string {
         return year + '#' + month;
@@ -198,10 +198,10 @@ export class AddonCalendarHelperProvider {
      *
      * The result has the same structure than getMonthlyEvents, but it only contains fields that are actually used by the app.
      *
-     * @param {number} year Year to get.
-     * @param {number} month Month to get.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the response.
+     * @param year Year to get.
+     * @param month Month to get.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the response.
      */
     getOfflineMonthWeeks(year: number, month: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -256,9 +256,9 @@ export class AddonCalendarHelperProvider {
     /**
      * Check if the data of an event has changed.
      *
-     * @param {any} data Current data.
-     * @param {any} [original] Original data.
-     * @return {boolean} True if data has changed, false otherwise.
+     * @param data Current data.
+     * @param original Original data.
+     * @return True if data has changed, false otherwise.
      */
     hasEventDataChanged(data: any, original?: any): boolean {
         if (!original) {
@@ -297,11 +297,11 @@ export class AddonCalendarHelperProvider {
     /**
      * Check if an event should be displayed based on the filter.
      *
-     * @param {any} event Event object.
-     * @param {number} courseId Course ID to filter.
-     * @param {number} categoryId Category ID the course belongs to.
-     * @param {any} categories Categories indexed by ID.
-     * @return {boolean} Whether it should be displayed.
+     * @param event Event object.
+     * @param courseId Course ID to filter.
+     * @param categoryId Category ID the course belongs to.
+     * @param categories Categories indexed by ID.
+     * @return Whether it should be displayed.
      */
     shouldDisplayEvent(event: any, courseId: number, categoryId: number, categories: any): boolean {
         if (event.eventtype == 'user' || event.eventtype == 'site') {
@@ -345,9 +345,9 @@ export class AddonCalendarHelperProvider {
      * Refresh the month & day for several created/edited/deleted events, and invalidate the months & days
      * for their repeated events if needed.
      *
-     * @param {{event: any, repeated: number}[]} events Events that have been touched and number of times each event is repeated.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Resolved when done.
+     * @param events Events that have been touched and number of times each event is repeated.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when done.
      */
     refreshAfterChangeEvents(events: {event: any, repeated: number}[], siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -458,10 +458,10 @@ export class AddonCalendarHelperProvider {
      * Refresh the month & day for a created/edited/deleted event, and invalidate the months & days
      * for their repeated events if needed.
      *
-     * @param {any} event Event that has been touched.
-     * @param {number} repeated Number of times the event is repeated.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Resolved when done.
+     * @param event Event that has been touched.
+     * @param repeated Number of times the event is repeated.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when done.
      */
     refreshAfterChangeEvent(event: any, repeated: number, siteId?: string): Promise<any> {
         return this.refreshAfterChangeEvents([{event: event, repeated: repeated}], siteId);
diff --git a/src/addon/calendar/providers/mainmenu-handler.ts b/src/addon/calendar/providers/mainmenu-handler.ts
index 0568eeb01..2b38a6507 100644
--- a/src/addon/calendar/providers/mainmenu-handler.ts
+++ b/src/addon/calendar/providers/mainmenu-handler.ts
@@ -29,7 +29,7 @@ export class AddonCalendarMainMenuHandler implements CoreMainMenuHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return !this.calendarProvider.isCalendarDisabledInSite();
@@ -38,7 +38,7 @@ export class AddonCalendarMainMenuHandler implements CoreMainMenuHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreMainMenuHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(): CoreMainMenuHandlerData {
         return {
diff --git a/src/addon/calendar/providers/sync-cron-handler.ts b/src/addon/calendar/providers/sync-cron-handler.ts
index 6aabcca74..a73e8d1a8 100644
--- a/src/addon/calendar/providers/sync-cron-handler.ts
+++ b/src/addon/calendar/providers/sync-cron-handler.ts
@@ -29,9 +29,9 @@ export class AddonCalendarSyncCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>} Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         return this.calendarSync.syncAllEvents(siteId, force);
@@ -40,7 +40,7 @@ export class AddonCalendarSyncCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return this.calendarSync.syncInterval;
diff --git a/src/addon/calendar/providers/view-link-handler.ts b/src/addon/calendar/providers/view-link-handler.ts
index e0ba641c0..630c4c4fb 100644
--- a/src/addon/calendar/providers/view-link-handler.ts
+++ b/src/addon/calendar/providers/view-link-handler.ts
@@ -35,11 +35,11 @@ export class AddonCalendarViewLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -90,11 +90,11 @@ export class AddonCalendarViewLinkHandler extends CoreContentLinksHandlerBase {
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         if (params.view && this.SUPPORTED_VIEWS.indexOf(params.view) == -1) {
diff --git a/src/addon/competency/components/course/course.ts b/src/addon/competency/components/course/course.ts
index 65cdb0643..c9c2a0c15 100644
--- a/src/addon/competency/components/course/course.ts
+++ b/src/addon/competency/components/course/course.ts
@@ -52,7 +52,7 @@ export class AddonCompetencyCourseComponent {
     /**
      * Fetches the competencies and updates the view.
      *
-     * @return {Promise<void>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchCourseCompetencies(): Promise<void> {
         return this.competencyProvider.getCourseCompetencies(this.courseId, this.userId).then((competencies) => {
@@ -70,7 +70,7 @@ export class AddonCompetencyCourseComponent {
     /**
      * Opens a competency.
      *
-     * @param {number} competencyId
+     * @param competencyId
      */
     openCompetency(competencyId: number): void {
         if (this.appProvider.isWide()) {
@@ -83,7 +83,7 @@ export class AddonCompetencyCourseComponent {
     /**
      * Opens the summary of a competency.
      *
-     * @param {number} competencyId
+     * @param competencyId
      */
     openCompetencySummary(competencyId: number): void {
         this.navCtrl.push('AddonCompetencyCompetencySummaryPage', {competencyId});
@@ -92,7 +92,7 @@ export class AddonCompetencyCourseComponent {
     /**
      * Refreshes the competencies.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshCourseCompetencies(refresher: any): void {
         this.competencyProvider.invalidateCourseCompetencies(this.courseId, this.userId).finally(() => {
diff --git a/src/addon/competency/pages/competencies/competencies.ts b/src/addon/competency/pages/competencies/competencies.ts
index 1278e318f..40eed9b3d 100644
--- a/src/addon/competency/pages/competencies/competencies.ts
+++ b/src/addon/competency/pages/competencies/competencies.ts
@@ -69,7 +69,7 @@ export class AddonCompetencyCompetenciesPage {
     /**
      * Fetches the competencies and updates the view.
      *
-     * @return {Promise<void>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchCompetencies(): Promise<void> {
         let promise;
@@ -102,7 +102,7 @@ export class AddonCompetencyCompetenciesPage {
     /**
      * Opens a competency.
      *
-     * @param {number} competencyId
+     * @param competencyId
      */
     openCompetency(competencyId: number): void {
         this.competencyId = competencyId;
@@ -118,7 +118,7 @@ export class AddonCompetencyCompetenciesPage {
     /**
      * Refreshes the competencies.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshCompetencies(refresher: any): void {
         let promise;
diff --git a/src/addon/competency/pages/competency/competency.ts b/src/addon/competency/pages/competency/competency.ts
index c3930b945..a9999c740 100644
--- a/src/addon/competency/pages/competency/competency.ts
+++ b/src/addon/competency/pages/competency/competency.ts
@@ -76,7 +76,7 @@ export class AddonCompetencyCompetencyPage {
     /**
      * Fetches the competency and updates the view.
      *
-     * @return {Promise<void>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchCompetency(): Promise<void> {
         let promise;
@@ -124,7 +124,7 @@ export class AddonCompetencyCompetencyPage {
     /**
      * Refreshes the competency.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshCompetency(refresher: any): void {
         let promise;
@@ -144,7 +144,7 @@ export class AddonCompetencyCompetencyPage {
     /**
      * Opens the summary of a competency.
      *
-     * @param {number} competencyId
+     * @param competencyId
      */
     openCompetencySummary(competencyId: number): void {
         // Decide which navCtrl to use. If this page is inside a split view, use the split view's master nav.
diff --git a/src/addon/competency/pages/competencysummary/competencysummary.ts b/src/addon/competency/pages/competencysummary/competencysummary.ts
index db4c7a32d..fc81a80fc 100644
--- a/src/addon/competency/pages/competencysummary/competencysummary.ts
+++ b/src/addon/competency/pages/competencysummary/competencysummary.ts
@@ -55,7 +55,7 @@ export class AddonCompetencyCompetencySummaryPage {
     /**
      * Fetches the competency summary and updates the view.
      *
-     * @return {Promise<void>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchCompetency(): Promise<void> {
         return this.competencyProvider.getCompetencySummary(this.competencyId).then((competency) => {
@@ -68,7 +68,7 @@ export class AddonCompetencyCompetencySummaryPage {
     /**
      * Refreshes the competency summary.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshCompetency(refresher: any): void {
         this.competencyProvider.invalidateCompetencySummary(this.competencyId).finally(() => {
@@ -81,7 +81,7 @@ export class AddonCompetencyCompetencySummaryPage {
     /**
      * Opens the summary of a competency.
      *
-     * @param {number} competencyId
+     * @param competencyId
      */
     openCompetencySummary(competencyId: number): void {
         // Decide which navCtrl to use. If this page is inside a split view, use the split view's master nav.
diff --git a/src/addon/competency/pages/plan/plan.ts b/src/addon/competency/pages/plan/plan.ts
index 33a01c8b8..acbb1e419 100644
--- a/src/addon/competency/pages/plan/plan.ts
+++ b/src/addon/competency/pages/plan/plan.ts
@@ -52,7 +52,7 @@ export class AddonCompetencyPlanPage {
     /**
      * Fetches the learning plan and updates the view.
      *
-     * @return {Promise<void>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchLearningPlan(): Promise<void> {
         return this.competencyProvider.getLearningPlan(this.planId).then((plan) => {
@@ -74,7 +74,7 @@ export class AddonCompetencyPlanPage {
     /**
      * Navigates to a particular competency.
      *
-     * @param {number} competencyId
+     * @param competencyId
      */
     openCompetency(competencyId: number): void {
         const navCtrl = this.svComponent ? this.svComponent.getMasterNav() : this.navCtrl;
@@ -88,7 +88,7 @@ export class AddonCompetencyPlanPage {
     /**
      * Refreshes the learning plan.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshLearningPlan(refresher: any): void {
         this.competencyProvider.invalidateLearningPlan(this.planId).finally(() => {
diff --git a/src/addon/competency/pages/planlist/planlist.ts b/src/addon/competency/pages/planlist/planlist.ts
index 6c05ab924..04994ac20 100644
--- a/src/addon/competency/pages/planlist/planlist.ts
+++ b/src/addon/competency/pages/planlist/planlist.ts
@@ -62,7 +62,7 @@ export class AddonCompetencyPlanListPage {
     /**
      * Fetches the learning plans and updates the view.
      *
-     * @return {Promise<void>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchLearningPlans(): Promise<void> {
         return this.competencyProvider.getLearningPlans(this.userId).then((plans) => {
@@ -89,7 +89,7 @@ export class AddonCompetencyPlanListPage {
     /**
      * Refreshes the learning plans.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshLearningPlans(refresher: any): void {
         this.competencyProvider.invalidateLearningPlans(this.userId).finally(() => {
@@ -102,7 +102,7 @@ export class AddonCompetencyPlanListPage {
     /**
      * Opens a learning plan.
      *
-     * @param {number} planId Learning plan to load.
+     * @param planId Learning plan to load.
      */
     openPlan(planId: number): void {
         this.planId = planId;
diff --git a/src/addon/competency/providers/competency-link-handler.ts b/src/addon/competency/providers/competency-link-handler.ts
index a85c8d1bb..9facae6b8 100644
--- a/src/addon/competency/providers/competency-link-handler.ts
+++ b/src/addon/competency/providers/competency-link-handler.ts
@@ -33,11 +33,11 @@ export class AddonCompetencyCompetencyLinkHandler extends CoreContentLinksHandle
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -59,11 +59,11 @@ export class AddonCompetencyCompetencyLinkHandler extends CoreContentLinksHandle
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         // Handler is disabled if all competency features are disabled.
diff --git a/src/addon/competency/providers/competency.ts b/src/addon/competency/providers/competency.ts
index f2ba8f2a6..ea0f6df89 100644
--- a/src/addon/competency/providers/competency.ts
+++ b/src/addon/competency/providers/competency.ts
@@ -48,8 +48,8 @@ export class AddonCompetencyProvider {
     /**
      * Check if all competencies features are disabled.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether all competency features are disabled.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether all competency features are disabled.
      */
     allCompetenciesDisabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -62,8 +62,8 @@ export class AddonCompetencyProvider {
     /**
      * Get cache key for user learning plans data WS calls.
      *
-     * @param {number} userId User ID.
-     * @return {string}         Cache key.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getLearningPlansCacheKey(userId: number): string {
         return this.ROOT_CACHE_KEY + 'userplans:' + userId;
@@ -72,8 +72,8 @@ export class AddonCompetencyProvider {
     /**
      * Get cache key for learning plan data WS calls.
      *
-     * @param {number} planId Plan ID.
-     * @return {string}         Cache key.
+     * @param planId Plan ID.
+     * @return Cache key.
      */
     protected getLearningPlanCacheKey(planId: number): string {
         return this.ROOT_CACHE_KEY + 'learningplan:' + planId;
@@ -82,9 +82,9 @@ export class AddonCompetencyProvider {
     /**
      * Get cache key for competency in plan data WS calls.
      *
-     * @param {number} planId Plan ID.
-     * @param {number} competencyId Competency ID.
-     * @return {string}         Cache key.
+     * @param planId Plan ID.
+     * @param competencyId Competency ID.
+     * @return Cache key.
      */
     protected getCompetencyInPlanCacheKey(planId: number, competencyId: number): string {
         return this.ROOT_CACHE_KEY + 'plancompetency:' + planId + ':' + competencyId;
@@ -93,10 +93,10 @@ export class AddonCompetencyProvider {
     /**
      * Get cache key for competency in course data WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} competencyId Competency ID.
-     * @param {number} userId User ID.
-     * @return {string}         Cache key.
+     * @param courseId Course ID.
+     * @param competencyId Competency ID.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getCompetencyInCourseCacheKey(courseId: number, competencyId: number, userId: number): string {
         return this.ROOT_CACHE_KEY + 'coursecompetency:' + userId + ':' + courseId + ':' + competencyId;
@@ -105,9 +105,9 @@ export class AddonCompetencyProvider {
     /**
      * Get cache key for competency summary data WS calls.
      *
-     * @param {number} competencyId Competency ID.
-     * @param {number} userId User ID.
-     * @return {string}         Cache key.
+     * @param competencyId Competency ID.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getCompetencySummaryCacheKey(competencyId: number, userId: number): string {
         return this.ROOT_CACHE_KEY + 'competencysummary:' + userId + ':' + competencyId;
@@ -116,8 +116,8 @@ export class AddonCompetencyProvider {
     /**
      * Get cache key for course competencies data WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @return {string}         Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getCourseCompetenciesCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'coursecompetencies:' + courseId;
@@ -126,9 +126,9 @@ export class AddonCompetencyProvider {
     /**
      * Returns whether competencies are enabled.
      *
-     * @param  {number} courseId Course ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} competencies if enabled for the given course, false otherwise.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return competencies if enabled for the given course, false otherwise.
      */
     isPluginForCourseEnabled(courseId: number, siteId?: string): Promise<any> {
         if (!this.sitesProvider.isLoggedIn()) {
@@ -143,9 +143,9 @@ export class AddonCompetencyProvider {
     /**
      * Get plans for a certain user.
      *
-     * @param  {number} [userId]    ID of the user. If not defined, current user.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}            Promise to be resolved when the plans are retrieved.
+     * @param userId ID of the user. If not defined, current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise to be resolved when the plans are retrieved.
      */
     getLearningPlans(userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -174,9 +174,9 @@ export class AddonCompetencyProvider {
     /**
      * Get a certain plan.
      *
-     * @param  {number} planId    ID of the plan.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}            Promise to be resolved when the plans are retrieved.
+     * @param planId ID of the plan.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise to be resolved when the plans are retrieved.
      */
     getLearningPlan(planId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -204,10 +204,10 @@ export class AddonCompetencyProvider {
     /**
      * Get a certain competency in a plan.
      *
-     * @param  {number} planId    ID of the plan.
-     * @param  {number} competencyId    ID of the competency.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}            Promise to be resolved when the plans are retrieved.
+     * @param planId ID of the plan.
+     * @param competencyId ID of the competency.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise to be resolved when the plans are retrieved.
      */
     getCompetencyInPlan(planId: number, competencyId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -236,12 +236,12 @@ export class AddonCompetencyProvider {
     /**
      * Get a certain competency in a course.
      *
-     * @param  {number} courseId    ID of the course.
-     * @param  {number} competencyId    ID of the competency.
-     * @param  {number} [userId]    ID of the user. If not defined, current user.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @param  {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<any>}            Promise to be resolved when the plans are retrieved.
+     * @param courseId ID of the course.
+     * @param competencyId ID of the competency.
+     * @param userId ID of the user. If not defined, current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise to be resolved when the plans are retrieved.
      */
     getCompetencyInCourse(courseId: number, competencyId: number, userId?: number, siteId?: string, ignoreCache?: boolean)
             : Promise<any> {
@@ -279,11 +279,11 @@ export class AddonCompetencyProvider {
     /**
      * Get a certain competency summary.
      *
-     * @param  {number} competencyId    ID of the competency.
-     * @param  {number} [userId]    ID of the user. If not defined, current user.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @param  {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<any>}            Promise to be resolved when the plans are retrieved.
+     * @param competencyId ID of the competency.
+     * @param userId ID of the user. If not defined, current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise to be resolved when the plans are retrieved.
      */
     getCompetencySummary(competencyId: number, userId?: number, siteId?: string, ignoreCache?: boolean): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -318,11 +318,11 @@ export class AddonCompetencyProvider {
     /**
      * Get all competencies in a course.
      *
-     * @param  {number} courseId    ID of the course.
-     * @param  {number} [userId]    ID of the user.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @param  {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<any>}            Promise to be resolved when the course competencies are retrieved.
+     * @param courseId ID of the course.
+     * @param userId ID of the user.
+     * @param siteId Site ID. If not defined, current site.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise to be resolved when the course competencies are retrieved.
      */
     getCourseCompetencies(courseId: number, userId?: number, siteId?: string, ignoreCache?: boolean): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -373,9 +373,9 @@ export class AddonCompetencyProvider {
     /**
      * Invalidates User Learning Plans data.
      *
-     * @param  {number} [userId]    ID of the user. If not defined, current user.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}            Promise resolved when the data is invalidated.
+     * @param userId ID of the user. If not defined, current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateLearningPlans(userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -388,9 +388,9 @@ export class AddonCompetencyProvider {
     /**
      * Invalidates Learning Plan data.
      *
-     * @param  {number} planId    ID of the plan.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the data is invalidated.
+     * @param planId ID of the plan.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateLearningPlan(planId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -401,10 +401,10 @@ export class AddonCompetencyProvider {
     /**
      * Invalidates Competency in Plan data.
      *
-     * @param  {number} planId    ID of the plan.
-     * @param  {number} competencyId    ID of the competency.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the data is invalidated.
+     * @param planId ID of the plan.
+     * @param competencyId ID of the competency.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCompetencyInPlan(planId: number, competencyId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -415,11 +415,11 @@ export class AddonCompetencyProvider {
     /**
      * Invalidates Competency in Course data.
      *
-     * @param  {number} courseId    ID of the course.
-     * @param  {number} competencyId    ID of the competency.
-     * @param  {number} [userId]    ID of the user. If not defined, current user.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the data is invalidated.
+     * @param courseId ID of the course.
+     * @param competencyId ID of the competency.
+     * @param userId ID of the user. If not defined, current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCompetencyInCourse(courseId: number, competencyId: number, userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -432,10 +432,10 @@ export class AddonCompetencyProvider {
     /**
      * Invalidates Competency Summary data.
      *
-     * @param  {number} competencyId    ID of the competency.
-     * @param  {number} [userId]    ID of the user. If not defined, current user.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the data is invalidated.
+     * @param competencyId ID of the competency.
+     * @param userId ID of the user. If not defined, current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCompetencySummary(competencyId: number, userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -448,10 +448,10 @@ export class AddonCompetencyProvider {
     /**
      * Invalidates Course Competencies data.
      *
-     * @param  {number} courseId    ID of the course.
-     * @param  {number} [userId]      ID of the user.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the data is invalidated.
+     * @param courseId ID of the course.
+     * @param userId ID of the user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCourseCompetencies(courseId: number, userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -477,13 +477,13 @@ export class AddonCompetencyProvider {
     /**
      * Report the competency as being viewed in plan.
      *
-     * @param  {number} planId    ID of the plan.
-     * @param  {number} competencyId  ID of the competency.
-     * @param  {number} planStatus    Current plan Status to decide what action should be logged.
-     * @param  {string} [name] Name of the competency.
-     * @param  {number} [userId] User ID. If not defined, current user.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the WS call is successful.
+     * @param planId ID of the plan.
+     * @param competencyId ID of the competency.
+     * @param planStatus Current plan Status to decide what action should be logged.
+     * @param name Name of the competency.
+     * @param userId User ID. If not defined, current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logCompetencyInPlanView(planId: number, competencyId: number, planStatus: number, name?: string, userId?: number,
             siteId?: string): Promise<any> {
@@ -519,12 +519,12 @@ export class AddonCompetencyProvider {
     /**
      * Report the competency as being viewed in course.
      *
-     * @param  {number} courseId        ID of the course.
-     * @param  {number} competencyId    ID of the competency.
-     * @param  {string} [name] Name of the competency.
-     * @param  {number} [userId] User ID. If not defined, current user.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the WS call is successful.
+     * @param courseId ID of the course.
+     * @param competencyId ID of the competency.
+     * @param name Name of the competency.
+     * @param userId User ID. If not defined, current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logCompetencyInCourseView(courseId: number, competencyId: number, name?: string, userId?: number, siteId?: string)
             : Promise<any> {
@@ -558,10 +558,10 @@ export class AddonCompetencyProvider {
     /**
      * Report the competency as being viewed.
      *
-     * @param  {number} competencyId    ID of the competency.
-     * @param  {string} [name] Name of the competency.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the WS call is successful.
+     * @param competencyId ID of the competency.
+     * @param name Name of the competency.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logCompetencyView(competencyId: number, name?: string, siteId?: string): Promise<any> {
         if (competencyId) {
diff --git a/src/addon/competency/providers/course-option-handler.ts b/src/addon/competency/providers/course-option-handler.ts
index 2f8176995..8462d1ef2 100644
--- a/src/addon/competency/providers/course-option-handler.ts
+++ b/src/addon/competency/providers/course-option-handler.ts
@@ -30,7 +30,7 @@ export class AddonCompetencyCourseOptionHandler implements CoreCourseOptionsHand
 
     /**
      * Whether or not the handler is enabled ona site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -39,11 +39,11 @@ export class AddonCompetencyCourseOptionHandler implements CoreCourseOptionsHand
     /**
      * Whether or not the handler is enabled for a certain course.
      *
-     * @param {number} courseId The course ID.
-     * @param {any} accessData Access type and data. Default, guest, ...
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @param courseId The course ID.
+     * @param accessData Access type and data. Default, guest, ...
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabledForCourse(courseId: number, accessData: any, navOptions?: any, admOptions?: any): boolean | Promise<boolean> {
         if (accessData && accessData.type == CoreCourseProvider.ACCESS_GUEST) {
@@ -62,9 +62,9 @@ export class AddonCompetencyCourseOptionHandler implements CoreCourseOptionsHand
     /**
      * Returns the data needed to render the handler.
      *
-     * @param {Injector} injector Injector.
-     * @param {number} course The course.
-     * @return {CoreCourseOptionsHandlerData|Promise<CoreCourseOptionsHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param course The course.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData?(injector: Injector, course: any): CoreCourseOptionsHandlerData | Promise<CoreCourseOptionsHandlerData> {
         return {
@@ -77,10 +77,10 @@ export class AddonCompetencyCourseOptionHandler implements CoreCourseOptionsHand
     /**
      * Should invalidate the data to determine if the handler is enabled for a certain course.
      *
-     * @param {number} courseId The course ID.
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param courseId The course ID.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved when done.
      */
     invalidateEnabledForCourse(courseId: number, navOptions?: any, admOptions?: any): Promise<any> {
         if (navOptions && typeof navOptions.competencies != 'undefined') {
@@ -94,8 +94,8 @@ export class AddonCompetencyCourseOptionHandler implements CoreCourseOptionsHand
     /**
      * Called when a course is downloaded. It should prefetch all the data to be able to see the addon in offline.
      *
-     * @param {any} course The course.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param course The course.
+     * @return Promise resolved when done.
      */
     prefetch(course: any): Promise<any> {
         // Get the competencies in the course.
diff --git a/src/addon/competency/providers/helper.ts b/src/addon/competency/providers/helper.ts
index bf95bd3ac..65f990a65 100644
--- a/src/addon/competency/providers/helper.ts
+++ b/src/addon/competency/providers/helper.ts
@@ -31,8 +31,8 @@ export class AddonCompetencyHelperProvider {
     /**
      * Convenient helper to get the user profile image.
      *
-     * @param  {number} userId User Id
-     * @return {Promise<any>}  User profile Image URL or true if default icon.
+     * @param userId User Id
+     * @return User profile Image URL or true if default icon.
      */
     getProfile(userId: number): Promise<any> {
         if (!userId || userId == this.sitesProvider.getCurrentSiteUserId()) {
@@ -50,8 +50,7 @@ export class AddonCompetencyHelperProvider {
     /**
      * Get the review status name translated.
      *
-     * @param {number} status
-     * @return {string}
+     * @param status
      */
     getCompetencyStatusName(status: number): string {
         let statusTranslateName;
@@ -76,8 +75,7 @@ export class AddonCompetencyHelperProvider {
     /**
      * Get the status name translated.
      *
-     * @param {number} status
-     * @return {string}
+     * @param status
      */
     getPlanStatusName(status: number): string {
         let statusTranslateName;
diff --git a/src/addon/competency/providers/mainmenu-handler.ts b/src/addon/competency/providers/mainmenu-handler.ts
index b45e84459..eea927c3d 100644
--- a/src/addon/competency/providers/mainmenu-handler.ts
+++ b/src/addon/competency/providers/mainmenu-handler.ts
@@ -29,7 +29,7 @@ export class AddonCompetencyMainMenuHandler implements CoreMainMenuHandler  {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         // Check the user has at least one learn plan available.
@@ -41,7 +41,7 @@ export class AddonCompetencyMainMenuHandler implements CoreMainMenuHandler  {
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreMainMenuHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(): CoreMainMenuHandlerData {
         return {
diff --git a/src/addon/competency/providers/plan-link-handler.ts b/src/addon/competency/providers/plan-link-handler.ts
index 1e20c5fe7..07a7ae848 100644
--- a/src/addon/competency/providers/plan-link-handler.ts
+++ b/src/addon/competency/providers/plan-link-handler.ts
@@ -33,11 +33,11 @@ export class AddonCompetencyPlanLinkHandler extends CoreContentLinksHandlerBase
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -53,11 +53,11 @@ export class AddonCompetencyPlanLinkHandler extends CoreContentLinksHandlerBase
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         // Handler is disabled if all competency features are disabled.
diff --git a/src/addon/competency/providers/plans-link-handler.ts b/src/addon/competency/providers/plans-link-handler.ts
index da08f33da..37a6f97c0 100644
--- a/src/addon/competency/providers/plans-link-handler.ts
+++ b/src/addon/competency/providers/plans-link-handler.ts
@@ -33,11 +33,11 @@ export class AddonCompetencyPlansLinkHandler extends CoreContentLinksHandlerBase
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -54,11 +54,11 @@ export class AddonCompetencyPlansLinkHandler extends CoreContentLinksHandlerBase
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         // Handler is disabled if all competency features are disabled.
diff --git a/src/addon/competency/providers/push-click-handler.ts b/src/addon/competency/providers/push-click-handler.ts
index eca567205..2122fe313 100644
--- a/src/addon/competency/providers/push-click-handler.ts
+++ b/src/addon/competency/providers/push-click-handler.ts
@@ -33,8 +33,8 @@ export class AddonCompetencyPushClickHandler implements CorePushNotificationsCli
     /**
      * Check if a notification click is handled by this handler.
      *
-     * @param {any} notification The notification to check.
-     * @return {boolean} Whether the notification click is handled by this handler
+     * @param notification The notification to check.
+     * @return Whether the notification click is handled by this handler
      */
     handles(notification: any): boolean | Promise<boolean> {
         if (this.utils.isTrueOrOne(notification.notif) && notification.moodlecomponent == 'moodle' &&
@@ -51,8 +51,8 @@ export class AddonCompetencyPushClickHandler implements CorePushNotificationsCli
     /**
      * Handle the notification click.
      *
-     * @param {any} notification The notification to check.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param notification The notification to check.
+     * @return Promise resolved when done.
      */
     handleClick(notification: any): Promise<any> {
         const contextUrlParams = this.urlUtils.extractUrlParams(notification.contexturl);
diff --git a/src/addon/competency/providers/user-competency-link-handler.ts b/src/addon/competency/providers/user-competency-link-handler.ts
index 06cee4f90..0af9deeef 100644
--- a/src/addon/competency/providers/user-competency-link-handler.ts
+++ b/src/addon/competency/providers/user-competency-link-handler.ts
@@ -33,11 +33,11 @@ export class AddonCompetencyUserCompetencyLinkHandler extends CoreContentLinksHa
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -53,11 +53,11 @@ export class AddonCompetencyUserCompetencyLinkHandler extends CoreContentLinksHa
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         // Handler is disabled if all competency features are disabled.
diff --git a/src/addon/competency/providers/user-handler.ts b/src/addon/competency/providers/user-handler.ts
index 7cdbaadac..b377f4e4d 100644
--- a/src/addon/competency/providers/user-handler.ts
+++ b/src/addon/competency/providers/user-handler.ts
@@ -47,7 +47,7 @@ export class AddonCompetencyUserHandler implements CoreUserProfileHandler {
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -56,11 +56,11 @@ export class AddonCompetencyUserHandler implements CoreUserProfileHandler {
     /**
      * Check if handler is enabled for this user in this context.
      *
-     * @param {any} user     User to check.
-     * @param {number} courseId Course ID.
-     * @param  {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param  {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return  {boolean|Promise<boolean>}   Promise resolved with true if enabled, resolved with false otherwise.
+     * @param user User to check.
+     * @param courseId Course ID.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved with true if enabled, resolved with false otherwise.
      */
     isEnabledForUser(user: any, courseId: number, navOptions?: any, admOptions?: any): boolean | Promise<boolean> {
         if (courseId) {
@@ -100,7 +100,7 @@ export class AddonCompetencyUserHandler implements CoreUserProfileHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreUserProfileHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(user: any, courseId: number): CoreUserProfileHandlerData {
         if (courseId) {
diff --git a/src/addon/coursecompletion/components/report/report.ts b/src/addon/coursecompletion/components/report/report.ts
index 50d12cf90..3b6371244 100644
--- a/src/addon/coursecompletion/components/report/report.ts
+++ b/src/addon/coursecompletion/components/report/report.ts
@@ -54,7 +54,7 @@ export class AddonCourseCompletionReportComponent implements OnInit {
     /**
      * Fetch compleiton data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchCompletion(): Promise<any> {
         return this.courseCompletionProvider.getCompletion(this.courseId, this.userId).then((completion) => {
@@ -77,7 +77,7 @@ export class AddonCourseCompletionReportComponent implements OnInit {
     /**
      * Refresh completion data on PTR.
      *
-     * @param {any} [refresher] Refresher instance.
+     * @param refresher Refresher instance.
      */
     refreshCompletion(refresher?: any): void {
         this.courseCompletionProvider.invalidateCourseCompletion(this.courseId, this.userId).finally(() => {
diff --git a/src/addon/coursecompletion/providers/course-option-handler.ts b/src/addon/coursecompletion/providers/course-option-handler.ts
index d0483b68a..fa71437db 100644
--- a/src/addon/coursecompletion/providers/course-option-handler.ts
+++ b/src/addon/coursecompletion/providers/course-option-handler.ts
@@ -30,7 +30,7 @@ export class AddonCourseCompletionCourseOptionHandler implements CoreCourseOptio
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.courseCompletionProvider.isPluginViewEnabled();
@@ -39,11 +39,11 @@ export class AddonCourseCompletionCourseOptionHandler implements CoreCourseOptio
     /**
      * Whether or not the handler is enabled for a certain course.
      *
-     * @param {number} courseId The course ID.
-     * @param {any} accessData Access type and data. Default, guest, ...
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @param courseId The course ID.
+     * @param accessData Access type and data. Default, guest, ...
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return True or promise resolved with true if enabled.
      */
      isEnabledForCourse(courseId: number, accessData: any, navOptions?: any, admOptions?: any): boolean | Promise<boolean> {
         if (accessData && accessData.type == CoreCourseProvider.ACCESS_GUEST) {
@@ -64,8 +64,8 @@ export class AddonCourseCompletionCourseOptionHandler implements CoreCourseOptio
     /**
      * Returns the data needed to render the handler.
      *
-     * @param {number} courseId The course ID.
-     * @return {CoreCourseOptionsHandlerData} Data.
+     * @param courseId The course ID.
+     * @return Data.
      */
     getDisplayData?(injector: Injector, courseId: number): CoreCourseOptionsHandlerData {
         return {
@@ -78,10 +78,10 @@ export class AddonCourseCompletionCourseOptionHandler implements CoreCourseOptio
     /**
      * Should invalidate the data to determine if the handler is enabled for a certain course.
      *
-     * @param {number} courseId The course ID.
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param courseId The course ID.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved when done.
      */
     invalidateEnabledForCourse(courseId: number, navOptions?: any, admOptions?: any): Promise<any> {
         return this.courseCompletionProvider.invalidateCourseCompletion(courseId);
@@ -90,8 +90,8 @@ export class AddonCourseCompletionCourseOptionHandler implements CoreCourseOptio
     /**
      * Called when a course is downloaded. It should prefetch all the data to be able to see the addon in offline.
      *
-     * @param {any} course The course.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param course The course.
+     * @return Promise resolved when done.
      */
     prefetch(course: any): Promise<any> {
         return this.courseCompletionProvider.getCompletion(course.id, undefined, {
diff --git a/src/addon/coursecompletion/providers/coursecompletion.ts b/src/addon/coursecompletion/providers/coursecompletion.ts
index 0a79a4766..64b4c6f01 100644
--- a/src/addon/coursecompletion/providers/coursecompletion.ts
+++ b/src/addon/coursecompletion/providers/coursecompletion.ts
@@ -39,9 +39,9 @@ export class AddonCourseCompletionProvider {
      * Returns whether or not the user can mark a course as self completed.
      * It can if it's configured in the course and it hasn't been completed yet.
      *
-     * @param {number} userId     User ID.
-     * @param {any}    completion Course completion.
-     * @return {boolean} True if user can mark course as self completed, false otherwise.
+     * @param userId User ID.
+     * @param completion Course completion.
+     * @return True if user can mark course as self completed, false otherwise.
      */
     canMarkSelfCompleted(userId: number, completion: any): boolean {
         let selfCompletionActive = false,
@@ -65,8 +65,8 @@ export class AddonCourseCompletionProvider {
     /**
      * Get completed status text. The language code returned is meant to be translated.
      *
-     * @param {any} completion Course completion.
-     * @return {string} Language code of the text to show.
+     * @param completion Course completion.
+     * @return Language code of the text to show.
      */
     getCompletedStatusText(completion: any): string {
         if (completion.completed) {
@@ -90,11 +90,11 @@ export class AddonCourseCompletionProvider {
     /**
      * Get course completion status for a certain course and user.
      *
-     * @param {number} courseId  Course ID.
-     * @param {number} [userId]  User ID. If not defined, use current user.
-     * @param {any}    [preSets] Presets to use when calling the WebService.
-     * @param {string} [siteId]  Site ID. If not defined, use current site.
-     * @return {Promise<any>} Promise to be resolved when the completion is retrieved.
+     * @param courseId Course ID.
+     * @param userId User ID. If not defined, use current user.
+     * @param preSets Presets to use when calling the WebService.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise to be resolved when the completion is retrieved.
      */
     getCompletion(courseId: number, userId?: number, preSets?: any, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -125,9 +125,9 @@ export class AddonCourseCompletionProvider {
     /**
      * Get cache key for get completion WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} useIid   User ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @param useIid User ID.
+     * @return Cache key.
      */
     protected getCompletionCacheKey(courseId: number, userId: number): string {
         return this.ROOT_CACHE_KEY + 'view:' + courseId + ':' + userId;
@@ -136,9 +136,9 @@ export class AddonCourseCompletionProvider {
     /**
      * Invalidates view course completion WS call.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} [userId] User ID. If not defined, use current user.
-     * @return {Promise<any>} Promise resolved when the list is invalidated.
+     * @param courseId Course ID.
+     * @param userId User ID. If not defined, use current user.
+     * @return Promise resolved when the list is invalidated.
      */
     invalidateCourseCompletion(courseId: number, userId?: number): Promise<any> {
         userId = userId || this.sitesProvider.getCurrentSiteUserId();
@@ -149,7 +149,7 @@ export class AddonCourseCompletionProvider {
     /**
      * Returns whether or not the view course completion plugin is enabled for the current site.
      *
-     * @return {boolean} True if plugin enabled, false otherwise.
+     * @return True if plugin enabled, false otherwise.
      */
    isPluginViewEnabled(): boolean {
        return this.sitesProvider.isLoggedIn();
@@ -158,9 +158,9 @@ export class AddonCourseCompletionProvider {
     /**
      * Returns whether or not the view course completion plugin is enabled for a certain course.
      *
-     * @param {number}  courseId           Course ID.
-     * @param {boolean} [preferCache=true] True if shouldn't call WS if data is cached, false otherwise.
-     * @return {Promise<boolean>} Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
+     * @param courseId Course ID.
+     * @param preferCache True if shouldn't call WS if data is cached, false otherwise.
+     * @return Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
      */
     isPluginViewEnabledForCourse(courseId: number, preferCache: boolean = true): Promise<boolean> {
         if (!courseId) {
@@ -187,9 +187,9 @@ export class AddonCourseCompletionProvider {
     /**
      * Returns whether or not the view course completion plugin is enabled for a certain user.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} [userId] User ID. If not defined, use current user.
-     * @return {Promise<boolean>} Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
+     * @param courseId Course ID.
+     * @param userId User ID. If not defined, use current user.
+     * @return Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
      */
     isPluginViewEnabledForUser(courseId: number, userId?: number): Promise<boolean> {
         // Check if user wants to view his own completion.
@@ -242,8 +242,8 @@ export class AddonCourseCompletionProvider {
     /**
      * Mark a course as self completed.
      *
-     * @param {number} courseId Course ID.
-     * @return {Promise<any>} Resolved on success.
+     * @param courseId Course ID.
+     * @return Resolved on success.
      */
     markCourseAsSelfCompleted(courseId: number): Promise<any> {
         const params = {
diff --git a/src/addon/coursecompletion/providers/user-handler.ts b/src/addon/coursecompletion/providers/user-handler.ts
index 8faf49ccd..5e3924689 100644
--- a/src/addon/coursecompletion/providers/user-handler.ts
+++ b/src/addon/coursecompletion/providers/user-handler.ts
@@ -42,7 +42,7 @@ export class AddonCourseCompletionUserHandler implements CoreUserProfileHandler
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.courseCompletionProvider.isPluginViewEnabled();
@@ -51,11 +51,11 @@ export class AddonCourseCompletionUserHandler implements CoreUserProfileHandler
     /**
      * Check if handler is enabled for this user in this context.
      *
-     * @param {any} user User to check.
-     * @param {number} courseId Course ID.
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {boolean|Promise<boolean>} Promise resolved with true if enabled, resolved with false otherwise.
+     * @param user User to check.
+     * @param courseId Course ID.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved with true if enabled, resolved with false otherwise.
      */
     isEnabledForUser(user: any, courseId: number, navOptions?: any, admOptions?: any): boolean | Promise<boolean> {
         if (!courseId) {
@@ -84,7 +84,7 @@ export class AddonCourseCompletionUserHandler implements CoreUserProfileHandler
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreUserProfileHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(user: any, courseId: number): CoreUserProfileHandlerData {
         return {
diff --git a/src/addon/files/pages/list/list.ts b/src/addon/files/pages/list/list.ts
index 2867acb5c..24aeb0390 100644
--- a/src/addon/files/pages/list/list.ts
+++ b/src/addon/files/pages/list/list.ts
@@ -89,7 +89,7 @@ export class AddonFilesListPage implements OnDestroy {
     /**
      * Refresh the data.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshData(refresher: any): void {
         this.refreshFiles().finally(() => {
@@ -144,7 +144,7 @@ export class AddonFilesListPage implements OnDestroy {
     /**
      * Fetch the files.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchFiles(): Promise<any> {
         let promise;
@@ -193,7 +193,7 @@ export class AddonFilesListPage implements OnDestroy {
     /**
      * Refresh the displayed files.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected refreshFiles(): Promise<any> {
         const promises = [];
diff --git a/src/addon/files/providers/files.ts b/src/addon/files/providers/files.ts
index 1db49f1da..f9051494f 100644
--- a/src/addon/files/providers/files.ts
+++ b/src/addon/files/providers/files.ts
@@ -31,7 +31,7 @@ export class AddonFilesProvider {
     /**
      * Check if core_user_get_private_files_info WS call is available.
      *
-     * @return {boolean} Whether the WS is available, false otherwise.
+     * @return Whether the WS is available, false otherwise.
      */
     canGetPrivateFilesInfo(): boolean {
         return this.sitesProvider.wsAvailableInCurrentSite('core_user_get_private_files_info');
@@ -40,7 +40,7 @@ export class AddonFilesProvider {
     /**
      * Check if user can view his private files.
      *
-     * @return {boolean} Whether the user can view his private files.
+     * @return Whether the user can view his private files.
      */
     canViewPrivateFiles(): boolean {
         return this.sitesProvider.getCurrentSite().canAccessMyFiles() && !this.isPrivateFilesDisabledInSite();
@@ -49,7 +49,7 @@ export class AddonFilesProvider {
     /**
      * Check if user can view site files.
      *
-     * @return {boolean} Whether the user can view site files.
+     * @return Whether the user can view site files.
      */
     canViewSiteFiles(): boolean {
         return !this.isSiteFilesDisabledInSite();
@@ -58,7 +58,7 @@ export class AddonFilesProvider {
     /**
      * Check if user can upload private files.
      *
-     * @return {boolean} Whether the user can upload private files.
+     * @return Whether the user can upload private files.
      */
     canUploadFiles(): boolean {
         const currentSite = this.sitesProvider.getCurrentSite();
@@ -69,9 +69,9 @@ export class AddonFilesProvider {
     /**
      * Get the list of files.
      *
-     * @param {any} params A list of parameters accepted by the Web service.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the files.
+     * @param params A list of parameters accepted by the Web service.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the files.
      */
     getFiles(params: any, siteId?: string): Promise<any[]> {
 
@@ -121,8 +121,8 @@ export class AddonFilesProvider {
     /**
      * Get cache key for file list WS calls.
      *
-     * @param {any} params Params of the WS.
-     * @return {string} Cache key.
+     * @param params Params of the WS.
+     * @return Cache key.
      */
     protected getFilesListCacheKey(params: any): string {
         const root = !params.component ? 'site' : 'my';
@@ -133,7 +133,7 @@ export class AddonFilesProvider {
     /**
      * Get the private files of the current user.
      *
-     * @return {Promise<any[]>} Promise resolved with the files.
+     * @return Promise resolved with the files.
      */
     getPrivateFiles(): Promise<any[]> {
         return this.getFiles(this.getPrivateFilesRootParams());
@@ -142,7 +142,7 @@ export class AddonFilesProvider {
     /**
      * Get params to get root private files directory.
      *
-     * @return {any} Params.
+     * @return Params.
      */
     protected getPrivateFilesRootParams(): any {
         return {
@@ -160,9 +160,9 @@ export class AddonFilesProvider {
     /**
      * Get private files info.
      *
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved with the info.
+     * @param userId User ID. If not defined, current user in the site.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with the info.
      */
     getPrivateFilesInfo(userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -183,8 +183,8 @@ export class AddonFilesProvider {
     /**
      * Get the cache key for private files info WS calls.
      *
-     * @param {number} userId User ID.
-     * @return {string} Cache key.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getPrivateFilesInfoCacheKey(userId: number): string {
         return this.getPrivateFilesInfoCommonCacheKey() + ':' + userId;
@@ -193,7 +193,7 @@ export class AddonFilesProvider {
     /**
      * Get the common part of the cache keys for private files info WS calls.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getPrivateFilesInfoCommonCacheKey(): string {
         return this.ROOT_CACHE_KEY + 'privateInfo';
@@ -202,7 +202,7 @@ export class AddonFilesProvider {
     /**
      * Get the site files.
      *
-     * @return {Promise<any[]>} Promise resolved with the files.
+     * @return Promise resolved with the files.
      */
     getSiteFiles(): Promise<any[]> {
         return this.getFiles(this.getSiteFilesRootParams());
@@ -211,7 +211,7 @@ export class AddonFilesProvider {
     /**
      * Get params to get root site files directory.
      *
-     * @return {any} Params.
+     * @return Params.
      */
     protected getSiteFilesRootParams(): any {
         return {
@@ -227,10 +227,10 @@ export class AddonFilesProvider {
     /**
      * Invalidates list of files in a certain directory.
      *
-     * @param {string} root Root of the directory ('my' for private files, 'site' for site files).
-     * @param {string} path Path to the directory.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param root Root of the directory ('my' for private files, 'site' for site files).
+     * @param path Path to the directory.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateDirectory(root: string, path: string, siteId?: string): Promise<any> {
         let params;
@@ -252,8 +252,8 @@ export class AddonFilesProvider {
     /**
      * Invalidates private files info for all users.
      *
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidatePrivateFilesInfo(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -264,9 +264,9 @@ export class AddonFilesProvider {
     /**
      * Invalidates private files info for a certain user.
      *
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param userId User ID. If not defined, current user in the site.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidatePrivateFilesInfoForUser(userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -279,8 +279,8 @@ export class AddonFilesProvider {
     /**
      * Check if Files is disabled in a certain site.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>} Promise resolved with true if disabled, rejected or resolved with false otherwise.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if disabled, rejected or resolved with false otherwise.
      */
     isDisabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -291,8 +291,8 @@ export class AddonFilesProvider {
     /**
      * Check if Files is disabled in a certain site.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether it's disabled.
+     * @param site Site. If not defined, use current site.
+     * @return Whether it's disabled.
      */
     isDisabledInSite(site: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
@@ -303,7 +303,7 @@ export class AddonFilesProvider {
     /**
      * Return whether or not the plugin is enabled.
      *
-     * @return {boolean} True if enabled, false otherwise.
+     * @return True if enabled, false otherwise.
      */
     isPluginEnabled(): boolean {
         return this.canViewPrivateFiles() || this.canViewSiteFiles() || this.canUploadFiles();
@@ -312,8 +312,8 @@ export class AddonFilesProvider {
     /**
      * Check if private files is disabled in a certain site.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>} Promise resolved with true if disabled, rejected or resolved with false otherwise.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if disabled, rejected or resolved with false otherwise.
      */
     isPrivateFilesDisabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -324,8 +324,8 @@ export class AddonFilesProvider {
     /**
      * Check if private files is disabled in a certain site.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether it's disabled.
+     * @param site Site. If not defined, use current site.
+     * @return Whether it's disabled.
      */
     isPrivateFilesDisabledInSite(site?: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
@@ -336,8 +336,8 @@ export class AddonFilesProvider {
     /**
      * Check if site files is disabled in a certain site.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>} Promise resolved with true if disabled, rejected or resolved with false otherwise.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if disabled, rejected or resolved with false otherwise.
      */
     isSiteFilesDisabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -348,8 +348,8 @@ export class AddonFilesProvider {
     /**
      * Check if site files is disabled in a certain site.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether it's disabled.
+     * @param site Site. If not defined, use current site.
+     * @return Whether it's disabled.
      */
     isSiteFilesDisabledInSite(site?: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
@@ -360,8 +360,8 @@ export class AddonFilesProvider {
     /**
      * Check if upload files is disabled in a certain site.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>} Promise resolved with true if disabled, rejected or resolved with false otherwise.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if disabled, rejected or resolved with false otherwise.
      */
     isUploadDisabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -372,8 +372,8 @@ export class AddonFilesProvider {
     /**
      * Check if upload files is disabled in a certain site.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether it's disabled.
+     * @param site Site. If not defined, use current site.
+     * @return Whether it's disabled.
      */
     isUploadDisabledInSite(site?: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
@@ -384,9 +384,9 @@ export class AddonFilesProvider {
     /**
      * Move a file from draft area to private files.
      *
-     * @param {number} draftId The draft area ID of the file.
-     * @param {string} [siteid] ID of the site. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved in success, rejected otherwise.
+     * @param draftId The draft area ID of the file.
+     * @param siteid ID of the site. If not defined, use current site.
+     * @return Promise resolved in success, rejected otherwise.
      */
     moveFromDraftToPrivate(draftId: number, siteId?: string): Promise<any> {
         const params = {
@@ -404,8 +404,8 @@ export class AddonFilesProvider {
     /**
      * Check the Moodle version in order to check if upload files is working.
      *
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<boolean>} Promise resolved with true if WS is working, false otherwise.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with true if WS is working, false otherwise.
      */
     versionCanUploadFiles(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/addon/files/providers/helper.ts b/src/addon/files/providers/helper.ts
index 4962b88e0..7cb3fa32d 100644
--- a/src/addon/files/providers/helper.ts
+++ b/src/addon/files/providers/helper.ts
@@ -30,8 +30,8 @@ export class AddonFilesHelperProvider {
     /**
      * Select a file, upload it and move it to private files.
      *
-     * @param {any} [info] Private files info. See AddonFilesProvider.getPrivateFilesInfo.
-     * @return {Promise<any>} Promise resolved when a file is uploaded, rejected otherwise.
+     * @param info Private files info. See AddonFilesProvider.getPrivateFilesInfo.
+     * @return Promise resolved when a file is uploaded, rejected otherwise.
      */
     uploadPrivateFile(info?: any): Promise<any> {
         // Calculate the max size.
diff --git a/src/addon/files/providers/mainmenu-handler.ts b/src/addon/files/providers/mainmenu-handler.ts
index bb47f8cb5..d362a44a8 100644
--- a/src/addon/files/providers/mainmenu-handler.ts
+++ b/src/addon/files/providers/mainmenu-handler.ts
@@ -29,7 +29,7 @@ export class AddonFilesMainMenuHandler implements CoreMainMenuHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.filesProvider.isPluginEnabled();
@@ -38,7 +38,7 @@ export class AddonFilesMainMenuHandler implements CoreMainMenuHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreMainMenuHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(): CoreMainMenuHandlerData {
         return {
diff --git a/src/addon/messageoutput/airnotifier/pages/devices/devices.ts b/src/addon/messageoutput/airnotifier/pages/devices/devices.ts
index ddb966afa..a9b581f37 100644
--- a/src/addon/messageoutput/airnotifier/pages/devices/devices.ts
+++ b/src/addon/messageoutput/airnotifier/pages/devices/devices.ts
@@ -47,7 +47,7 @@ export class AddonMessageOutputAirnotifierDevicesPage implements OnDestroy {
     /**
      * Fetches the list of devices.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchDevices(): Promise<any> {
         return this.airnotifierProivder.getUserDevices().then((devices) => {
@@ -94,7 +94,7 @@ export class AddonMessageOutputAirnotifierDevicesPage implements OnDestroy {
     /**
      * Refresh the list of devices.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshDevices(refresher: any): void {
         this.airnotifierProivder.invalidateUserDevices().finally(() => {
@@ -107,8 +107,8 @@ export class AddonMessageOutputAirnotifierDevicesPage implements OnDestroy {
     /**
      * Enable or disable a certain device.
      *
-     * @param {any} device The device object.
-     * @param {boolean} enable True to enable the device, false to disable it.
+     * @param device The device object.
+     * @param enable True to enable the device, false to disable it.
      */
     enableDevice(device: any, enable: boolean): void {
         device.updating = true;
diff --git a/src/addon/messageoutput/airnotifier/providers/airnotifier.ts b/src/addon/messageoutput/airnotifier/providers/airnotifier.ts
index 129c1ebf0..e67e134bb 100644
--- a/src/addon/messageoutput/airnotifier/providers/airnotifier.ts
+++ b/src/addon/messageoutput/airnotifier/providers/airnotifier.ts
@@ -34,10 +34,10 @@ export class AddonMessageOutputAirnotifierProvider {
     /**
      * Enables or disables a device.
      *
-     * @param {number} deviceId Device ID.
-     * @param {boolean} enable True to enable, false to disable.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if success.
+     * @param deviceId Device ID.
+     * @param enable True to enable, false to disable.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success.
      */
     enableDevice(deviceId: number, enable: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -62,7 +62,7 @@ export class AddonMessageOutputAirnotifierProvider {
     /**
      * Get the cache key for the get user devices call.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getUserDevicesCacheKey(): string {
         return this.ROOT_CACHE_KEY + 'userDevices';
@@ -71,8 +71,8 @@ export class AddonMessageOutputAirnotifierProvider {
     /**
      * Get user devices.
      *
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved with the devices.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with the devices.
      */
     getUserDevices(siteId?: string): Promise<any> {
         this.logger.debug('Get user devices');
@@ -95,8 +95,8 @@ export class AddonMessageOutputAirnotifierProvider {
     /**
      * Invalidate get user devices.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when data is invalidated.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when data is invalidated.
      */
     invalidateUserDevices(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -107,7 +107,7 @@ export class AddonMessageOutputAirnotifierProvider {
     /**
      * Returns whether or not the plugin is enabled for the current site.
      *
-     * @return {boolean} True if enabled, false otherwise.
+     * @return True if enabled, false otherwise.
      * @since 3.2
      */
     isEnabled(): boolean {
diff --git a/src/addon/messageoutput/airnotifier/providers/handler.ts b/src/addon/messageoutput/airnotifier/providers/handler.ts
index 8d5cc15ae..555c6e238 100644
--- a/src/addon/messageoutput/airnotifier/providers/handler.ts
+++ b/src/addon/messageoutput/airnotifier/providers/handler.ts
@@ -29,7 +29,7 @@ export class AddonMessageOutputAirnotifierHandler implements AddonMessageOutputH
     /**
      * Whether or not the module is enabled for the site.
      *
-     * @return {boolean} True if enabled, false otherwise.
+     * @return True if enabled, false otherwise.
      */
     isEnabled(): boolean {
         return this.airnotifierProvider.isEnabled();
@@ -38,8 +38,8 @@ export class AddonMessageOutputAirnotifierHandler implements AddonMessageOutputH
     /**
      * Returns the data needed to render the handler.
      *
-     * @param {any} processor The processor object.
-     * @return {CoreMainMenuHandlerData} Data.
+     * @param processor The processor object.
+     * @return Data.
      */
     getDisplayData(processor: any): AddonMessageOutputHandlerData {
         return {
diff --git a/src/addon/messageoutput/providers/delegate.ts b/src/addon/messageoutput/providers/delegate.ts
index 36ef9f416..dc11821cb 100644
--- a/src/addon/messageoutput/providers/delegate.ts
+++ b/src/addon/messageoutput/providers/delegate.ts
@@ -24,15 +24,14 @@ import { CoreSitesProvider } from '@providers/sites';
 export interface AddonMessageOutputHandler extends CoreDelegateHandler {
     /**
      * The name of the processor. E.g. 'airnotifier'.
-     * @type {string}
      */
     processorName: string;
 
     /**
      * Returns the data needed to render the handler.
      *
-     * @param {any} processor The processor object.
-     * @return {CoreMainMenuHandlerData} Data.
+     * @param processor The processor object.
+     * @return Data.
      */
     getDisplayData(processor: any): AddonMessageOutputHandlerData;
 }
@@ -43,31 +42,26 @@ export interface AddonMessageOutputHandler extends CoreDelegateHandler {
 export interface AddonMessageOutputHandlerData {
     /**
      * Handler's priority.
-     * @type {number}
      */
     priority: number;
 
     /**
      * Name of the page to load for the handler.
-     * @type {string}
      */
     page: string;
 
     /**
      * Label to display for the handler.
-     * @type {string}
      */
     label: string;
 
     /**
      * Name of the icon to display for the handler.
-     * @type {string}
      */
     icon: string;
 
     /**
      * Params to pass to the page.
-     * @type {any}
      */
     pageParams?: any;
 }
@@ -88,8 +82,8 @@ export interface AddonMessageOutputHandlerData {
     /**
      * Get the display data of the handler.
      *
-     * @param {string} processor The processor object.
-     * @return {AddonMessageOutputHandlerData} Data.
+     * @param processor The processor object.
+     * @return Data.
      */
     getDisplayData(processor: any): AddonMessageOutputHandlerData {
         return this.executeFunctionOnEnabled(processor.name, 'getDisplayData', processor);
diff --git a/src/addon/messages/components/confirmed-contacts/confirmed-contacts.ts b/src/addon/messages/components/confirmed-contacts/confirmed-contacts.ts
index 528b48a9a..53983afe9 100644
--- a/src/addon/messages/components/confirmed-contacts/confirmed-contacts.ts
+++ b/src/addon/messages/components/confirmed-contacts/confirmed-contacts.ts
@@ -80,8 +80,8 @@ export class AddonMessagesConfirmedContactsComponent implements OnInit, OnDestro
     /**
      * Fetch contacts.
      *
-     * @param {boolean} [refresh=false] True if we are refreshing contacts, false if we are loading more.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh True if we are refreshing contacts, false if we are loading more.
+     * @return Promise resolved when done.
      */
     fetchData(refresh: boolean = false): Promise<any> {
         this.loadMoreError = false;
@@ -112,8 +112,8 @@ export class AddonMessagesConfirmedContactsComponent implements OnInit, OnDestro
     /**
      * Refresh contacts.
      *
-     * @param {any} [refresher] Refresher.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @return Promise resolved when done.
      */
     refreshData(refresher?: any): Promise<any> {
         // No need to invalidate contacts, we always try to get the latest.
@@ -125,8 +125,8 @@ export class AddonMessagesConfirmedContactsComponent implements OnInit, OnDestro
     /**
      * Load more contacts.
      *
-     * @param {any} [infiniteComplete] Infinite scroll complete function. Only used from core-infinite-loading.
-     * @return {Promise<any>} Resolved when done.
+     * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
+     * @return Resolved when done.
      */
     loadMore(infiniteComplete?: any): Promise<any> {
         return this.fetchData().finally(() => {
@@ -137,8 +137,8 @@ export class AddonMessagesConfirmedContactsComponent implements OnInit, OnDestro
     /**
      * Notify that a contact has been selected.
      *
-     * @param {number} userId User id.
-     * @param {boolean} [onInit=false] Whether the contact is selected on initial load.
+     * @param userId User id.
+     * @param onInit Whether the contact is selected on initial load.
      */
     selectUser(userId: number, onInit: boolean = false): void {
         this.selectedUserId = userId;
diff --git a/src/addon/messages/components/contact-requests/contact-requests.ts b/src/addon/messages/components/contact-requests/contact-requests.ts
index 4a77bfdd1..1eb5aba36 100644
--- a/src/addon/messages/components/contact-requests/contact-requests.ts
+++ b/src/addon/messages/components/contact-requests/contact-requests.ts
@@ -71,8 +71,8 @@ export class AddonMessagesContactRequestsComponent implements OnInit, OnDestroy
     /**
      * Fetch contact requests.
      *
-     * @param {boolean} [refresh=false] True if we are refreshing contact requests, false if we are loading more.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh True if we are refreshing contact requests, false if we are loading more.
+     * @return Promise resolved when done.
      */
     fetchData(refresh: boolean = false): Promise<any> {
         this.loadMoreError = false;
@@ -103,8 +103,8 @@ export class AddonMessagesContactRequestsComponent implements OnInit, OnDestroy
     /**
      * Refresh contact requests.
      *
-     * @param {any} [refresher] Refresher.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @return Promise resolved when done.
      */
     refreshData(refresher?: any): Promise<any> {
         // Refresh the number of contacts requests to update badges.
@@ -119,8 +119,8 @@ export class AddonMessagesContactRequestsComponent implements OnInit, OnDestroy
     /**
      * Load more contact requests.
      *
-     * @param {any} [infiniteComplete] Infinite scroll complete function. Only used from core-infinite-loading.
-     * @return {Promise<any>} Resolved when done.
+     * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
+     * @return Resolved when done.
      */
     loadMore(infiniteComplete?: any): Promise<any> {
         return this.fetchData().finally(() => {
@@ -131,8 +131,8 @@ export class AddonMessagesContactRequestsComponent implements OnInit, OnDestroy
     /**
      * Notify that a contact has been selected.
      *
-     * @param {number} userId User id.
-     * @param {boolean} [onInit=false] Whether the contact is selected on initial load.
+     * @param userId User id.
+     * @param onInit Whether the contact is selected on initial load.
      */
     selectUser(userId: number, onInit: boolean = false): void {
         this.selectedUserId = userId;
diff --git a/src/addon/messages/components/contacts/contacts.ts b/src/addon/messages/components/contacts/contacts.ts
index 8df67aabb..311196532 100644
--- a/src/addon/messages/components/contacts/contacts.ts
+++ b/src/addon/messages/components/contacts/contacts.ts
@@ -101,8 +101,8 @@ export class AddonMessagesContactsComponent {
     /**
      * Refresh the data.
      *
-     * @param {any} [refresher] Refresher.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @return Promise resolved when done.
      */
     refreshData(refresher?: any): Promise<any> {
         let promise;
@@ -125,7 +125,7 @@ export class AddonMessagesContactsComponent {
     /**
      * Fetch contacts.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchData(): Promise<any> {
         this.loadingMessage = this.loadingMessages;
@@ -147,8 +147,8 @@ export class AddonMessagesContactsComponent {
 
     /**
      * Sort user list by fullname
-     * @param  {any[]} list List to sort.
-     * @return {any[]}      Sorted list.
+     * @param list List to sort.
+     * @return Sorted list.
      */
     protected sortUsers(list: any[]): any[] {
         return list.sort((a, b) => {
@@ -179,8 +179,8 @@ export class AddonMessagesContactsComponent {
     /**
      * Search users from the UI.
      *
-     * @param  {string}       query Text to search for.
-     * @return {Promise<any>}       Resolved when done.
+     * @param query Text to search for.
+     * @return Resolved when done.
      */
     search(query: string): Promise<any> {
         this.appProvider.closeKeyboard();
@@ -196,8 +196,8 @@ export class AddonMessagesContactsComponent {
     /**
      * Perform the search of users.
      *
-     * @param  {string}       query Text to search for.
-     * @return {Promise<any>}       Resolved when done.
+     * @param query Text to search for.
+     * @return Resolved when done.
      */
     protected performSearch(query: string): Promise<any> {
         return this.messagesProvider.searchContacts(query).then((result) => {
@@ -214,8 +214,8 @@ export class AddonMessagesContactsComponent {
     /**
      * Navigate to a particular discussion.
      *
-     * @param {number} discussionUserId Discussion Id to load.
-     * @param {boolean} [onlyWithSplitView=false]  Only go to Discussion if split view is on.
+     * @param discussionUserId Discussion Id to load.
+     * @param onlyWithSplitView Only go to Discussion if split view is on.
      */
     gotoDiscussion(discussionUserId: number, onlyWithSplitView: boolean = false): void {
         this.discussionUserId = discussionUserId;
diff --git a/src/addon/messages/components/discussions/discussions.ts b/src/addon/messages/components/discussions/discussions.ts
index 983e27a13..ddbd5c3f2 100644
--- a/src/addon/messages/components/discussions/discussions.ts
+++ b/src/addon/messages/components/discussions/discussions.ts
@@ -139,9 +139,9 @@ export class AddonMessagesDiscussionsComponent implements OnDestroy {
     /**
      * Refresh the data.
      *
-     * @param {any} [refresher] Refresher.
-     * @param {boolean} [refreshUnreadCounts=true] Whteher to refresh unread counts.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @param refreshUnreadCounts Whteher to refresh unread counts.
+     * @return Promise resolved when done.
      */
     refreshData(refresher?: any, refreshUnreadCounts: boolean = true): Promise<any> {
         const promises = [];
@@ -163,7 +163,7 @@ export class AddonMessagesDiscussionsComponent implements OnDestroy {
     /**
      * Fetch discussions.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchData(): Promise<any> {
         this.loadingMessage = this.loadingMessages;
@@ -208,8 +208,8 @@ export class AddonMessagesDiscussionsComponent implements OnDestroy {
     /**
      * Search messages cotaining text.
      *
-     * @param  {string}       query Text to search for.
-     * @return {Promise<any>}       Resolved when done.
+     * @param query Text to search for.
+     * @return Resolved when done.
      */
     searchMessage(query: string): Promise<any> {
         this.appProvider.closeKeyboard();
@@ -229,9 +229,9 @@ export class AddonMessagesDiscussionsComponent implements OnDestroy {
     /**
      * Navigate to a particular discussion.
      *
-     * @param {number} discussionUserId Discussion Id to load.
-     * @param {number} [messageId]      Message to scroll after loading the discussion. Used when searching.
-     * @param {boolean} [onlyWithSplitView=false]  Only go to Discussion if split view is on.
+     * @param discussionUserId Discussion Id to load.
+     * @param messageId Message to scroll after loading the discussion. Used when searching.
+     * @param onlyWithSplitView Only go to Discussion if split view is on.
      */
     gotoDiscussion(discussionUserId: number, messageId?: number, onlyWithSplitView: boolean = false): void {
         this.discussionUserId = discussionUserId;
diff --git a/src/addon/messages/pages/contacts/contacts.ts b/src/addon/messages/pages/contacts/contacts.ts
index 047961507..cde871624 100644
--- a/src/addon/messages/pages/contacts/contacts.ts
+++ b/src/addon/messages/pages/contacts/contacts.ts
@@ -91,9 +91,9 @@ export class AddonMessagesContactsPage implements OnDestroy {
     /**
      * Set the selected user and open the conversation in the split view if needed.
      *
-     * @param {string} tab Active tab: "contacts" or "requests".
-     * @param {number} [userId] Id of the selected user, undefined to use the last selected user in the tab.
-     * @param {boolean} [onInit=false] Whether the contact was selected on initial load.
+     * @param tab Active tab: "contacts" or "requests".
+     * @param userId Id of the selected user, undefined to use the last selected user in the tab.
+     * @param onInit Whether the contact was selected on initial load.
      */
     selectUser(tab: string, userId?: number, onInit: boolean = false): void {
         userId = userId || this.selectedUserId[tab];
diff --git a/src/addon/messages/pages/conversation-info/conversation-info.ts b/src/addon/messages/pages/conversation-info/conversation-info.ts
index b79ece62b..f28253463 100644
--- a/src/addon/messages/pages/conversation-info/conversation-info.ts
+++ b/src/addon/messages/pages/conversation-info/conversation-info.ts
@@ -52,7 +52,7 @@ export class AddonMessagesConversationInfoPage implements OnInit {
     /**
      * Fetch the required data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchData(): Promise<any> {
         // Get the conversation data first.
@@ -69,8 +69,8 @@ export class AddonMessagesConversationInfoPage implements OnInit {
     /**
      * Get conversation members.
      *
-     * @param {boolean} [loadingMore} Whether we are loading more data or just the first ones.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param [loadingMore} Whether we are loading more data or just the first ones.
+     * @return Promise resolved when done.
      */
     protected fetchMembers(loadingMore?: boolean): Promise<any> {
         this.loadMoreError = false;
@@ -91,8 +91,8 @@ export class AddonMessagesConversationInfoPage implements OnInit {
     /**
      * Function to load more members.
      *
-     * @param {any} [infiniteComplete] Infinite scroll complete function. Only used from core-infinite-loading.
-     * @return {Promise<any>} Resolved when done.
+     * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
+     * @return Resolved when done.
      */
     loadMoreMembers(infiniteComplete?: any): Promise<any> {
         return this.fetchMembers(true).catch((error) => {
@@ -106,8 +106,8 @@ export class AddonMessagesConversationInfoPage implements OnInit {
     /**
      * Refresh the data.
      *
-     * @param {any} [refresher] Refresher.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @return Promise resolved when done.
      */
     refreshData(refresher?: any): Promise<any> {
         const promises = [];
@@ -125,7 +125,7 @@ export class AddonMessagesConversationInfoPage implements OnInit {
     /**
      * Close modal.
      *
-     * @param {number} [userId] User conversation to load.
+     * @param userId User conversation to load.
      */
     closeModal(userId?: number): void {
         this.viewCtrl.dismiss(userId);
diff --git a/src/addon/messages/pages/discussion/discussion.ts b/src/addon/messages/pages/discussion/discussion.ts
index 26c1eb0fb..ef908e1c9 100644
--- a/src/addon/messages/pages/discussion/discussion.ts
+++ b/src/addon/messages/pages/discussion/discussion.ts
@@ -136,8 +136,8 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Adds a new message to the message list.
      *
-     * @param {any} message Message to be added.
-     * @param {boolean} [keep=true] If set the keep flag or not.
+     * @param message Message to be added.
+     * @param keep If set the keep flag or not.
      */
     protected addMessage(message: any, keep: boolean = true): void {
         /* Create a hash to identify the message. The text of online messages isn't reliable because it can have random data
@@ -156,7 +156,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Remove a message if it shouldn't be in the list anymore.
      *
-     * @param {string} hash Hash of the message to be removed.
+     * @param hash Hash of the message to be removed.
      */
     protected removeMessage(hash: any): void {
         if (this.keepMessageMap[hash]) {
@@ -197,7 +197,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Convenience function to fetch the conversation data.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected fetchData(): Promise<any> {
         let loader;
@@ -300,7 +300,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Convenience function to fetch messages.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected fetchMessages(): Promise<any> {
         this.loadMoreError = false;
@@ -351,7 +351,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Format and load a list of messages into the view.
      *
-     * @param {any[]} messages Messages to load.
+     * @param messages Messages to load.
      */
     protected loadMessages(messages: any[]): void {
         if (this.viewDestroyed) {
@@ -406,9 +406,9 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Get the conversation.
      *
-     * @param {number} conversationId Conversation ID.
-     * @param {number} userId User ID.
-     * @return {Promise<boolean>} Promise resolved with a boolean: whether the conversation exists or not.
+     * @param conversationId Conversation ID.
+     * @param userId User ID.
+     * @return Promise resolved with a boolean: whether the conversation exists or not.
      */
     protected getConversation(conversationId: number, userId: number): Promise<boolean> {
         let promise,
@@ -491,9 +491,9 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Get the messages of the conversation. Used if group messaging is supported.
      *
-     * @param {number} pagesToLoad Number of "pages" to load.
-     * @param  {number} [offset=0] Offset for message list.
-     * @return {Promise<any[]>} Promise resolved with the list of messages.
+     * @param pagesToLoad Number of "pages" to load.
+     * @param offset Offset for message list.
+     * @return Promise resolved with the list of messages.
      */
     protected getConversationMessages(pagesToLoad: number, offset: number = 0): Promise<any[]> {
         const excludePending = offset > 0;
@@ -527,12 +527,12 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Get a discussion. Can load several "pages".
      *
-     * @param  {number}  pagesToLoad          Number of pages to load.
-     * @param  {number}  [lfReceivedUnread=0] Number of unread received messages already fetched, so fetch will be done from this.
-     * @param  {number}  [lfReceivedRead=0]   Number of read received messages already fetched, so fetch will be done from this.
-     * @param  {number}  [lfSentUnread=0]     Number of unread sent messages already fetched, so fetch will be done from this.
-     * @param  {number}  [lfSentRead=0]       Number of read sent messages already fetched, so fetch will be done from this.
-     * @return {Promise<any>}  Resolved when done.
+     * @param pagesToLoad Number of pages to load.
+     * @param lfReceivedUnread Number of unread received messages already fetched, so fetch will be done from this.
+     * @param lfReceivedRead Number of read received messages already fetched, so fetch will be done from this.
+     * @param lfSentUnread Number of unread sent messages already fetched, so fetch will be done from this.
+     * @param lfSentRead Number of read sent messages already fetched, so fetch will be done from this.
+     * @return Resolved when done.
      */
     protected getDiscussionMessages(pagesToLoad: number, lfReceivedUnread: number = 0, lfReceivedRead: number = 0,
             lfSentUnread: number = 0, lfSentRead: number = 0): Promise<any> {
@@ -755,7 +755,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
 
     /**
      * Wait until fetching is false.
-     * @return {Promise<void>} Resolved when done.
+     * @return Resolved when done.
      */
     protected waitForFetch(): Promise<void> {
         if (!this.fetching) {
@@ -806,7 +806,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Copy message to clipboard.
      *
-     * @param {any} message Message to be copied.
+     * @param message Message to be copied.
      */
     copyMessage(message: any): void {
         const text = this.textUtils.decodeHTMLEntities(message.smallmessage || message.text || '');
@@ -816,8 +816,8 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Function to delete a message.
      *
-     * @param {any} message  Message object to delete.
-     * @param {number} index Index where the message is to delete it from the view.
+     * @param message Message object to delete.
+     * @param index Index where the message is to delete it from the view.
      */
     deleteMessage(message: any, index: number): void {
         const canDeleteAll = this.conversation && this.conversation.candeletemessagesforallusers,
@@ -857,8 +857,8 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Function to load previous messages.
      *
-     * @param {any} [infiniteComplete] Infinite scroll complete function. Only used from core-infinite-loading.
-     * @return {Promise<any>} Resolved when done.
+     * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
+     * @return Resolved when done.
      */
     loadPrevious(infiniteComplete?: any): Promise<any> {
         let infiniteHeight = this.infinite ? this.infinite.getHeight() : 0;
@@ -959,7 +959,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Sends a message to the server.
      *
-     * @param {string} text Message text.
+     * @param text Message text.
      */
     sendMessage(text: string): void {
         let message;
@@ -1046,9 +1046,9 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
      * Check date should be shown on message list for the current message.
      * If date has changed from previous to current message it should be shown.
      *
-     * @param {any} message       Current message where to show the date.
-     * @param {any} [prevMessage] Previous message where to compare the date with.
-     * @return {boolean}  If date has changed and should be shown.
+     * @param message Current message where to show the date.
+     * @param prevMessage Previous message where to compare the date with.
+     * @return If date has changed and should be shown.
      */
     showDate(message: any, prevMessage?: any): boolean {
         if (!prevMessage) {
@@ -1064,9 +1064,9 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
      * Check if the user info should be displayed for the current message.
      * User data is only displayed for group conversations if the previous message was from another user.
      *
-     * @param {any} message Current message where to show the user info.
-     * @param {any} [prevMessage] Previous message.
-     * @return {boolean} Whether user data should be shown.
+     * @param message Current message where to show the user info.
+     * @param prevMessage Previous message.
+     * @return Whether user data should be shown.
      */
     showUserData(message: any, prevMessage?: any): boolean {
         return this.isGroup && message.useridfrom != this.currentUserId && this.members[message.useridfrom] &&
@@ -1076,9 +1076,9 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Check if a css tail should be shown.
      *
-     * @param {any} message Current message where to show the user info.
-     * @param {any} [nextMessage] Next message.
-     * @return {boolean} Whether user data should be shown.
+     * @param message Current message where to show the user info.
+     * @param nextMessage Next message.
+     * @return Whether user data should be shown.
      */
     showTail(message: any, nextMessage?: any): boolean {
         return !nextMessage || nextMessage.useridfrom != message.useridfrom || nextMessage.showDate;
@@ -1125,7 +1125,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Change the favourite state of the current conversation.
      *
-     * @param {Function} [done] Function to call when done.
+     * @param done Function to call when done.
      */
     changeFavourite(done?: () => void): void {
         this.favouriteIcon = 'spinner';
@@ -1153,7 +1153,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Change the mute state of the current conversation.
      *
-     * @param {Function} [done] Function to call when done.
+     * @param done Function to call when done.
      */
     changeMute(done?: () => void): void {
         this.muteIcon = 'spinner';
@@ -1218,7 +1218,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Displays a confirmation modal to block the user of the individual conversation.
      *
-     * @return {Promise<any>} Promise resolved when user is blocked or dialog is cancelled.
+     * @return Promise resolved when user is blocked or dialog is cancelled.
      */
     blockUser(): Promise<any> {
         if (!this.otherMember) {
@@ -1249,7 +1249,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Delete the conversation.
      *
-     * @param {Function} [done] Function to call when done.
+     * @param done Function to call when done.
      */
     deleteConversation(done?: () => void): void {
         const confirmMessage = 'addon.messages.' + (this.isSelf ? 'deleteallselfconfirm' : 'deleteallconfirm');
@@ -1276,7 +1276,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Displays a confirmation modal to unblock the user of the individual conversation.
      *
-     * @return {Promise<any>} Promise resolved when user is unblocked or dialog is cancelled.
+     * @return Promise resolved when user is unblocked or dialog is cancelled.
      */
     unblockUser(): Promise<any> {
         if (!this.otherMember) {
@@ -1307,7 +1307,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Displays a confirmation modal to send a contact request to the other user of the individual conversation.
      *
-     * @return {Promise<any>} Promise resolved when the request is sent or the dialog is cancelled.
+     * @return Promise resolved when the request is sent or the dialog is cancelled.
      */
     createContactRequest(): Promise<any> {
         if (!this.otherMember) {
@@ -1338,7 +1338,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Confirms the contact request of the other user of the individual conversation.
      *
-     * @return {Promise<any>} Promise resolved when the request is confirmed.
+     * @return Promise resolved when the request is confirmed.
      */
     confirmContactRequest(): Promise<any> {
         if (!this.otherMember) {
@@ -1360,7 +1360,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Declines the contact request of the other user of the individual conversation.
      *
-     * @return {Promise<any>} Promise resolved when the request is confirmed.
+     * @return Promise resolved when the request is confirmed.
      */
     declineContactRequest(): Promise<any> {
         if (!this.otherMember) {
@@ -1382,7 +1382,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Displays a confirmation modal to remove the other user of the conversation from contacts.
      *
-     * @return {Promise<any>} Promise resolved when the request is sent or the dialog is cancelled.
+     * @return Promise resolved when the request is sent or the dialog is cancelled.
      */
     removeContact(): Promise<any> {
         if (!this.otherMember) {
diff --git a/src/addon/messages/pages/group-conversations/group-conversations.ts b/src/addon/messages/pages/group-conversations/group-conversations.ts
index 92b81f75e..de862bc39 100644
--- a/src/addon/messages/pages/group-conversations/group-conversations.ts
+++ b/src/addon/messages/pages/group-conversations/group-conversations.ts
@@ -256,8 +256,8 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     /**
      * Fetch conversations.
      *
-     * @param {booleam} [refreshUnreadCounts=true] Whether to refresh unread counts.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refreshUnreadCounts Whether to refresh unread counts.
+     * @return Promise resolved when done.
      */
     protected fetchData(refreshUnreadCounts: boolean = true): Promise<any> {
         this.loadingMessage = this.loadingString;
@@ -329,7 +329,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     /**
      * Fetch data for the expanded option.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchDataForExpandedOption(): Promise<any> {
         const expandedOption = this.getExpandedOption();
@@ -344,10 +344,10 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     /**
      * Fetch data for a certain option.
      *
-     * @param {any} option The option to fetch data for.
-     * @param {boolean} [loadingMore} Whether we are loading more data or just the first ones.
-     * @param {booleam} [getCounts] Whether to get counts data.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param option The option to fetch data for.
+     * @param [loadingMore} Whether we are loading more data or just the first ones.
+     * @param getCounts Whether to get counts data.
+     * @return Promise resolved when done.
      */
     fetchDataForOption(option: any, loadingMore?: boolean, getCounts?: boolean): Promise<void> {
         option.loadMoreError = false;
@@ -399,7 +399,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     /**
      * Fetch conversation counts.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchConversationCounts(): Promise<void> {
         // Always try to get the latest data.
@@ -417,10 +417,10 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     /**
      * Find a conversation in the list of loaded conversations.
      *
-     * @param {number} conversationId The conversation ID to search.
-     * @param {number} userId User ID to search (if no conversationId).
-     * @param {any} [option] The option to search in. If not defined, search in all options.
-     * @return {any} Conversation.
+     * @param conversationId The conversation ID to search.
+     * @param userId User ID to search (if no conversationId).
+     * @param option The option to search in. If not defined, search in all options.
+     * @return Conversation.
      */
     protected findConversation(conversationId: number, userId?: number, option?: any): any {
         if (conversationId) {
@@ -443,7 +443,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     /**
      * Get the option that is currently expanded, undefined if they are all collapsed.
      *
-     * @return {any} Option currently expanded.
+     * @return Option currently expanded.
      */
     protected getExpandedOption(): any {
         if (this.favourites.expanded) {
@@ -465,9 +465,9 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     /**
      * Navigate to a particular conversation.
      *
-     * @param {number} conversationId Conversation Id to load.
-     * @param {number} userId User of the conversation. Only if there is no conversationId.
-     * @param {number} [messageId] Message to scroll after loading the discussion. Used when searching.
+     * @param conversationId Conversation Id to load.
+     * @param userId User of the conversation. Only if there is no conversationId.
+     * @param messageId Message to scroll after loading the discussion. Used when searching.
      */
     gotoConversation(conversationId: number, userId?: number, messageId?: number): void {
         this.selectedConversationId = conversationId;
@@ -493,9 +493,9 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     /**
      * Function to load more conversations.
      *
-     * @param {any} option The option to fetch data for.
-     * @param {any} [infiniteComplete] Infinite scroll complete function. Only used from core-infinite-loading.
-     * @return {Promise<any>} Resolved when done.
+     * @param option The option to fetch data for.
+     * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
+     * @return Resolved when done.
      */
     loadMoreConversations(option: any, infiniteComplete?: any): Promise<any> {
         return this.fetchDataForOption(option, true).catch((error) => {
@@ -509,9 +509,9 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     /**
      * Load offline messages into the conversations.
      *
-     * @param {any} option The option where the messages should be loaded.
-     * @param {any[]} messages Offline messages.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param option The option where the messages should be loaded.
+     * @param messages Offline messages.
+     * @return Promise resolved when done.
      */
     protected loadOfflineMessages(option: any, messages: any[]): Promise<any> {
         const promises = [];
@@ -575,7 +575,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     /**
      * Add an offline conversation into the right list of conversations.
      *
-     * @param {any} conversation Offline conversation to add.
+     * @param conversation Offline conversation to add.
      */
     protected addOfflineConversation(conversation: any): void {
         const option = this.getConversationOption(conversation);
@@ -585,8 +585,8 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     /**
      * Add a last offline message into a conversation.
      *
-     * @param {any} conversation Conversation where to put the last message.
-     * @param {any} message Offline message to add.
+     * @param conversation Conversation where to put the last message.
+     * @param message Offline message to add.
      */
     protected addLastOfflineMessage(conversation: any, message: any): void {
         conversation.lastmessage = message.text;
@@ -598,8 +598,8 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     /**
      * Given a conversation, return its option (favourites, group, individual).
      *
-     * @param {any} conversation Conversation to check.
-     * @return {any} Option object.
+     * @param conversation Conversation to check.
+     * @return Option object.
      */
     protected getConversationOption(conversation: any): any {
         if (conversation.isfavourite) {
@@ -614,9 +614,9 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     /**
      * Refresh the data.
      *
-     * @param {any} [refresher] Refresher.
-     * @param {booleam} [refreshUnreadCounts=true] Whether to refresh unread counts.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @param refreshUnreadCounts Whether to refresh unread counts.
+     * @return Promise resolved when done.
      */
     refreshData(refresher?: any, refreshUnreadCounts: boolean = true): Promise<any> {
         // Don't invalidate conversations and so, they always try to get latest data.
@@ -636,7 +636,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     /**
      * Toogle the visibility of an option (expand/collapse).
      *
-     * @param {any} option The option to expand/collapse.
+     * @param option The option to expand/collapse.
      */
     toggle(option: any): void {
         if (option.expanded) {
@@ -654,9 +654,9 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     /**
      * Expand a certain option.
      *
-     * @param {any} option The option to expand.
-     * @param {booleam} [getCounts] Whether to get counts data.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param option The option to expand.
+     * @param getCounts Whether to get counts data.
+     * @return Promise resolved when done.
      */
     protected expandOption(option: any, getCounts?: boolean): Promise<any> {
         // Collapse all and expand the right one.
diff --git a/src/addon/messages/pages/index/index.ts b/src/addon/messages/pages/index/index.ts
index 66010ab05..44730992e 100644
--- a/src/addon/messages/pages/index/index.ts
+++ b/src/addon/messages/pages/index/index.ts
@@ -50,8 +50,8 @@ export class AddonMessagesIndexPage implements OnDestroy {
     /**
      * Navigate to a particular discussion.
      *
-     * @param {number} discussionUserId Discussion Id to load.
-     * @param {number} [messageId]      Message to scroll after loading the discussion. Used when searching.
+     * @param discussionUserId Discussion Id to load.
+     * @param messageId Message to scroll after loading the discussion. Used when searching.
      */
     gotoDiscussion(discussionUserId: number, messageId?: number): void {
         const params = {
diff --git a/src/addon/messages/pages/search/search.ts b/src/addon/messages/pages/search/search.ts
index 14d5b6ab1..54e5a74c7 100644
--- a/src/addon/messages/pages/search/search.ts
+++ b/src/addon/messages/pages/search/search.ts
@@ -103,10 +103,10 @@ export class AddonMessagesSearchPage implements OnDestroy {
     /**
      * Start a new search or load more results.
      *
-     * @param {string} query Text to search for.
-     * @param {strings} loadMore Load more contacts, noncontacts or messages. If undefined, start a new search.
-     * @param {any} [infiniteComplete] Infinite scroll complete function. Only used from core-infinite-loading.
-     * @return {Promise<any>} Resolved when done.
+     * @param query Text to search for.
+     * @param loadMore Load more contacts, noncontacts or messages. If undefined, start a new search.
+     * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
+     * @return Resolved when done.
      */
     search(query: string, loadMore?: 'contacts' | 'noncontacts' | 'messages', infiniteComplete?: any): Promise<any> {
         this.appProvider.closeKeyboard();
@@ -225,8 +225,8 @@ export class AddonMessagesSearchPage implements OnDestroy {
     /**
      * Open a conversation in the split view.
      *
-     * @param {any} result User or message.
-     * @param {boolean} [onInit=false] Whether the tser was selected on initial load.
+     * @param result User or message.
+     * @param onInit Whether the tser was selected on initial load.
      */
     openConversation(result: any, onInit: boolean = false): void {
         if (!onInit || this.splitviewCtrl.isOn()) {
@@ -244,8 +244,8 @@ export class AddonMessagesSearchPage implements OnDestroy {
     /**
      * Set the highlight values for each entry.
      *
-     * @param {any[]} results Results to highlight.
-     * @param {boolean} isUser Whether the results are from a user search or from a message search.
+     * @param results Results to highlight.
+     * @param isUser Whether the results are from a user search or from a message search.
      */
     setHighlight(results: any[], isUser: boolean): void {
         results.forEach((result) => {
diff --git a/src/addon/messages/pages/settings/settings.ts b/src/addon/messages/pages/settings/settings.ts
index d7e30cd01..b2eed0099 100644
--- a/src/addon/messages/pages/settings/settings.ts
+++ b/src/addon/messages/pages/settings/settings.ts
@@ -78,7 +78,7 @@ export class AddonMessagesSettingsPage implements OnDestroy {
     /**
      * Fetches preference data.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected fetchPreferences(): Promise<any> {
         return this.messagesProvider.getMessagePreferences().then((preferences) => {
@@ -133,7 +133,7 @@ export class AddonMessagesSettingsPage implements OnDestroy {
     /**
      * Save the contactable privacy setting..
      *
-     * @param {number|boolean} value The value to set.
+     * @param value The value to set.
      */
     saveContactablePrivacy(value: number | boolean): void {
         if (this.contactablePrivacy == this.previousContactableValue) {
@@ -164,9 +164,9 @@ export class AddonMessagesSettingsPage implements OnDestroy {
     /**
      * Change the value of a certain preference.
      *
-     * @param {any}    notification Notification object.
-     * @param {string} state        State name, ['loggedin', 'loggedoff'].
-     * @param {any}    processor    Notification processor.
+     * @param notification Notification object.
+     * @param state State name, ['loggedin', 'loggedoff'].
+     * @param processor Notification processor.
      */
     changePreference(notification: any, state: string, processor: any): void {
         if (this.groupMessagingEnabled) {
@@ -238,7 +238,7 @@ export class AddonMessagesSettingsPage implements OnDestroy {
     /**
      * Refresh the list of preferences.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshPreferences(refresher: any): void {
         this.messagesProvider.invalidateMessagePreferences().finally(() => {
diff --git a/src/addon/messages/providers/contact-request-link-handler.ts b/src/addon/messages/providers/contact-request-link-handler.ts
index aebf2e8cd..0b3696b41 100644
--- a/src/addon/messages/providers/contact-request-link-handler.ts
+++ b/src/addon/messages/providers/contact-request-link-handler.ts
@@ -33,11 +33,11 @@ export class AddonMessagesContactRequestLinkHandler extends CoreContentLinksHand
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -52,11 +52,11 @@ export class AddonMessagesContactRequestLinkHandler extends CoreContentLinksHand
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return this.messagesProvider.isPluginEnabled(siteId).then((enabled) => {
diff --git a/src/addon/messages/providers/discussion-link-handler.ts b/src/addon/messages/providers/discussion-link-handler.ts
index b916798c6..623738241 100644
--- a/src/addon/messages/providers/discussion-link-handler.ts
+++ b/src/addon/messages/providers/discussion-link-handler.ts
@@ -36,11 +36,11 @@ export class AddonMessagesDiscussionLinkHandler extends CoreContentLinksHandlerB
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -58,11 +58,11 @@ export class AddonMessagesDiscussionLinkHandler extends CoreContentLinksHandlerB
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return this.messagesProvider.isPluginEnabled(siteId).then((enabled) => {
diff --git a/src/addon/messages/providers/index-link-handler.ts b/src/addon/messages/providers/index-link-handler.ts
index 400bd4eb1..e711070c3 100644
--- a/src/addon/messages/providers/index-link-handler.ts
+++ b/src/addon/messages/providers/index-link-handler.ts
@@ -34,11 +34,11 @@ export class AddonMessagesIndexLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -58,11 +58,11 @@ export class AddonMessagesIndexLinkHandler extends CoreContentLinksHandlerBase {
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return this.messagesProvider.isPluginEnabled(siteId);
diff --git a/src/addon/messages/providers/mainmenu-handler.ts b/src/addon/messages/providers/mainmenu-handler.ts
index 0875f19b6..b39725450 100644
--- a/src/addon/messages/providers/mainmenu-handler.ts
+++ b/src/addon/messages/providers/mainmenu-handler.ts
@@ -89,7 +89,7 @@ export class AddonMessagesMainMenuHandler implements CoreMainMenuHandler, CoreCr
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.messagesProvider.isPluginEnabled();
@@ -98,7 +98,7 @@ export class AddonMessagesMainMenuHandler implements CoreMainMenuHandler, CoreCr
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreMainMenuHandlerToDisplay} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(): CoreMainMenuHandlerToDisplay {
         this.handler.page = this.messagesProvider.isGroupMessagingEnabled() ?
@@ -114,9 +114,9 @@ export class AddonMessagesMainMenuHandler implements CoreMainMenuHandler, CoreCr
     /**
      * Refreshes badge number.
      *
-     * @param {string} [siteId] Site ID or current Site if undefined.
-     * @param {boolean} [unreadOnly] If true only the unread conversations count is refreshed.
-     * @return {Promise<any>} Resolve when done.
+     * @param siteId Site ID or current Site if undefined.
+     * @param unreadOnly If true only the unread conversations count is refreshed.
+     * @return Resolve when done.
      */
     refreshBadge(siteId?: string, unreadOnly?: boolean): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -147,7 +147,7 @@ export class AddonMessagesMainMenuHandler implements CoreMainMenuHandler, CoreCr
     /**
      * Update badge number and push notifications counter from loaded data.
      *
-     * @param {string} siteId Site ID.
+     * @param siteId Site ID.
      */
     updateBadge(siteId: string): void {
         const totalCount = this.unreadCount + (this.contactRequestsCount || 0);
@@ -165,9 +165,9 @@ export class AddonMessagesMainMenuHandler implements CoreMainMenuHandler, CoreCr
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         if (this.sitesProvider.isCurrentSite(siteId)) {
@@ -186,7 +186,7 @@ export class AddonMessagesMainMenuHandler implements CoreMainMenuHandler, CoreCr
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         if (this.appProvider.isDesktop()) {
@@ -201,7 +201,7 @@ export class AddonMessagesMainMenuHandler implements CoreMainMenuHandler, CoreCr
     /**
      * Whether it's a synchronization process or not.
      *
-     * @return {boolean} True if is a sync process, false otherwise.
+     * @return True if is a sync process, false otherwise.
      */
     isSync(): boolean {
         // This is done to use only wifi if using the fallback function.
@@ -217,7 +217,7 @@ export class AddonMessagesMainMenuHandler implements CoreMainMenuHandler, CoreCr
     /**
      * Whether the process should be executed during a manual sync.
      *
-     * @return {boolean} True if is a manual sync process, false otherwise.
+     * @return True if is a manual sync process, false otherwise.
      */
     canManualSync(): boolean {
         return true;
@@ -226,8 +226,8 @@ export class AddonMessagesMainMenuHandler implements CoreMainMenuHandler, CoreCr
     /**
      * Get the latest unread received messages from a site.
      *
-     * @param  {string} [siteId] Site ID. Default current.
-     * @return {Promise<any>}    Promise resolved with the notifications.
+     * @param siteId Site ID. Default current.
+     * @return Promise resolved with the notifications.
      */
     protected fetchMessages(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -289,8 +289,8 @@ export class AddonMessagesMainMenuHandler implements CoreMainMenuHandler, CoreCr
     /**
      * Given a message, return the title and the text for the message.
      *
-     * @param  {any} message Message.
-     * @return {Promise<any>}        Promise resolved with an object with title and text.
+     * @param message Message.
+     * @return Promise resolved with an object with title and text.
      */
     protected getTitleAndText(message: any): Promise<any> {
         const data = {
diff --git a/src/addon/messages/providers/messages-offline.ts b/src/addon/messages/providers/messages-offline.ts
index 38737c50e..d9818cd83 100644
--- a/src/addon/messages/providers/messages-offline.ts
+++ b/src/addon/messages/providers/messages-offline.ts
@@ -97,11 +97,11 @@ export class AddonMessagesOfflineProvider {
     /**
      * Delete a message.
      *
-     * @param {number} conversationId Conversation ID.
-     * @param {string} message The message.
-     * @param {number} timeCreated The time the message was created.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if stored, rejected if failure.
+     * @param conversationId Conversation ID.
+     * @param message The message.
+     * @param timeCreated The time the message was created.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     deleteConversationMessage(conversationId: number, message: string, timeCreated: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -116,9 +116,9 @@ export class AddonMessagesOfflineProvider {
     /**
      * Delete all the messages in a conversation.
      *
-     * @param {number} conversationId Conversation ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if stored, rejected if failure.
+     * @param conversationId Conversation ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     deleteConversationMessages(conversationId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -131,11 +131,11 @@ export class AddonMessagesOfflineProvider {
     /**
      * Delete a message.
      *
-     * @param  {number} toUserId    User ID to send the message to.
-     * @param  {string} message     The message.
-     * @param  {number} timeCreated The time the message was created.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}       Promise resolved if stored, rejected if failure.
+     * @param toUserId User ID to send the message to.
+     * @param message The message.
+     * @param timeCreated The time the message was created.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     deleteMessage(toUserId: number, message: string, timeCreated: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -150,8 +150,8 @@ export class AddonMessagesOfflineProvider {
     /**
      * Get all messages where deviceoffline is set to 1.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>}    Promise resolved with messages.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with messages.
      */
     getAllDeviceOfflineMessages(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -171,8 +171,8 @@ export class AddonMessagesOfflineProvider {
     /**
      * Get all offline messages.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved with messages.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with messages.
      */
     getAllMessages(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -192,9 +192,9 @@ export class AddonMessagesOfflineProvider {
     /**
      * Get offline messages to send to a certain user.
      *
-     * @param {number} conversationId Conversation ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with messages.
+     * @param conversationId Conversation ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with messages.
      */
     getConversationMessages(conversationId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -209,9 +209,9 @@ export class AddonMessagesOfflineProvider {
     /**
      * Get offline messages to send to a certain user.
      *
-     * @param  {number} toUserId       User ID to get messages to.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>}    Promise resolved with messages.
+     * @param toUserId User ID to get messages to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with messages.
      */
     getMessages(toUserId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -222,9 +222,9 @@ export class AddonMessagesOfflineProvider {
     /**
      * Check if there are offline messages to send to a conversation.
      *
-     * @param {number} conversationId Conversation ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: true if has offline messages, false otherwise.
+     * @param conversationId Conversation ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: true if has offline messages, false otherwise.
      */
     hasConversationMessages(conversationId: number, siteId?: string): Promise<boolean> {
         return this.getConversationMessages(conversationId, siteId).then((messages) => {
@@ -235,9 +235,9 @@ export class AddonMessagesOfflineProvider {
     /**
      * Check if there are offline messages to send to a certain user.
      *
-     * @param  {number} toUserId User ID to check.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>}    Promise resolved with boolean: true if has offline messages, false otherwise.
+     * @param toUserId User ID to check.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: true if has offline messages, false otherwise.
      */
     hasMessages(toUserId: number, siteId?: string): Promise<boolean> {
         return this.getMessages(toUserId, siteId).then((messages) => {
@@ -248,8 +248,8 @@ export class AddonMessagesOfflineProvider {
     /**
      * Parse some fields of each offline conversation messages.
      *
-     * @param {any[]} messages List of messages to parse.
-     * @return {any[]} Parsed messages.
+     * @param messages List of messages to parse.
+     * @return Parsed messages.
      */
     protected parseConversationMessages(messages: any[]): any[] {
         if (!messages) {
@@ -268,10 +268,10 @@ export class AddonMessagesOfflineProvider {
     /**
      * Save a conversation message to be sent later.
      *
-     * @param {any} conversation Conversation.
-     * @param {string} message The message to send.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if stored, rejected if failure.
+     * @param conversation Conversation.
+     * @param message The message to send.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     saveConversationMessage(conversation: any, message: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -298,10 +298,10 @@ export class AddonMessagesOfflineProvider {
     /**
      * Save a message to be sent later.
      *
-     * @param  {number} toUserId User ID recipient of the message.
-     * @param  {string} message  The message to send.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved if stored, rejected if failure.
+     * @param toUserId User ID recipient of the message.
+     * @param message The message to send.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     saveMessage(toUserId: number, message: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -322,10 +322,10 @@ export class AddonMessagesOfflineProvider {
     /**
      * Set deviceoffline for a group of messages.
      *
-     * @param  {any} messages Messages to update. Should be the same entry as retrieved from the DB.
-     * @param  {boolean} value   Value to set.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved if stored, rejected if failure.
+     * @param messages Messages to update. Should be the same entry as retrieved from the DB.
+     * @param value Value to set.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     setMessagesDeviceOffline(messages: any, value: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/addon/messages/providers/messages.ts b/src/addon/messages/providers/messages.ts
index b4181773a..a16d9810f 100644
--- a/src/addon/messages/providers/messages.ts
+++ b/src/addon/messages/providers/messages.ts
@@ -67,9 +67,9 @@ export class AddonMessagesProvider {
     /**
      * Add a contact.
      *
-     * @param {number} userId  User ID of the person to add.
-     * @param {string} [siteId]  Site ID. If not defined, use current site.
-     * @return {Promise<any>}  Resolved when done.
+     * @param userId User ID of the person to add.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Resolved when done.
      * @deprecated since Moodle 3.6
      */
     addContact(userId: number, siteId?: string): Promise<any> {
@@ -87,9 +87,9 @@ export class AddonMessagesProvider {
     /**
      * Block a user.
      *
-     * @param {number} userId User ID of the person to block.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Resolved when done.
+     * @param userId User ID of the person to block.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Resolved when done.
      */
     blockContact(userId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -120,9 +120,9 @@ export class AddonMessagesProvider {
     /**
      * Confirm a contact request from another user.
      *
-     * @param {number} userId ID of the user who made the contact request.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Resolved when done.
+     * @param userId ID of the user who made the contact request.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Resolved when done.
      * @since 3.6
      */
     confirmContactRequest(userId: number, siteId?: string): Promise<any> {
@@ -149,9 +149,9 @@ export class AddonMessagesProvider {
     /**
      * Send a contact request to another user.
      *
-     * @param {number} userId ID of the receiver of the contact request.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Resolved when done.
+     * @param userId ID of the receiver of the contact request.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Resolved when done.
      * @since 3.6
      */
     createContactRequest(userId: number, siteId?: string): Promise<any> {
@@ -173,9 +173,9 @@ export class AddonMessagesProvider {
     /**
      * Decline a contact request from another user.
      *
-     * @param {number} userId ID of the user who made the contact request.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Resolved when done.
+     * @param userId ID of the user who made the contact request.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Resolved when done.
      * @since 3.6
      */
     declineContactRequest(userId: number, siteId?: string): Promise<any> {
@@ -200,10 +200,10 @@ export class AddonMessagesProvider {
     /**
      * Delete a conversation.
      *
-     * @param {number} conversationId Conversation to delete.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @return {Promise<any>} Promise resolved when the conversation has been deleted.
+     * @param conversationId Conversation to delete.
+     * @param siteId Site ID. If not defined, use current site.
+     * @param userId User ID. If not defined, current user in the site.
+     * @return Promise resolved when the conversation has been deleted.
      */
     deleteConversation(conversationId: number, siteId?: string, userId?: number): Promise<any> {
         return this.deleteConversations([conversationId], siteId, userId);
@@ -212,10 +212,10 @@ export class AddonMessagesProvider {
     /**
      * Delete several conversations.
      *
-     * @param {number[]} conversationIds Conversations to delete.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @return {Promise<any>} Promise resolved when the conversations have been deleted.
+     * @param conversationIds Conversations to delete.
+     * @param siteId Site ID. If not defined, use current site.
+     * @param userId User ID. If not defined, current user in the site.
+     * @return Promise resolved when the conversations have been deleted.
      */
     deleteConversations(conversationIds: number[], siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -243,9 +243,9 @@ export class AddonMessagesProvider {
     /**
      * Delete a message (online or offline).
      *
-     * @param {any} message    Message to delete.
-     * @param {boolean} [deleteForAll] Whether the message should be deleted for all users.
-     * @return {Promise<any>}  Promise resolved when the message has been deleted.
+     * @param message Message to delete.
+     * @param deleteForAll Whether the message should be deleted for all users.
+     * @return Promise resolved when the message has been deleted.
      */
     deleteMessage(message: any, deleteForAll?: boolean): Promise<any> {
         if (message.id) {
@@ -268,10 +268,10 @@ export class AddonMessagesProvider {
     /**
      * Delete a message from the server.
      *
-     * @param {number} id       Message ID.
-     * @param {number} read     1 if message is read, 0 otherwise.
-     * @param {number} [userId] User we want to delete the message for. If not defined, use current user.
-     * @return {Promise<any>}   Promise resolved when the message has been deleted.
+     * @param id Message ID.
+     * @param read 1 if message is read, 0 otherwise.
+     * @param userId User we want to delete the message for. If not defined, use current user.
+     * @return Promise resolved when the message has been deleted.
      */
     deleteMessageOnline(id: number, read: number, userId?: number): Promise<any> {
         const params: any = {
@@ -291,9 +291,9 @@ export class AddonMessagesProvider {
     /**
      * Delete a message for all users.
      *
-     * @param {number} id Message ID.
-     * @param {number} [userId] User we want to delete the message for. If not defined, use current user.
-     * @return {Promise<any>} Promise resolved when the message has been deleted.
+     * @param id Message ID.
+     * @param userId User we want to delete the message for. If not defined, use current user.
+     * @return Promise resolved when the message has been deleted.
      */
     deleteMessageForAllOnline(id: number, userId?: number): Promise<any> {
         const params: any = {
@@ -309,9 +309,9 @@ export class AddonMessagesProvider {
     /**
      * Format a conversation.
      *
-     * @param {any} conversation Conversation to format.
-     * @param {number} userId User ID viewing the conversation.
-     * @return {any} Formatted conversation.
+     * @param conversation Conversation to format.
+     * @param userId User ID viewing the conversation.
+     * @return Formatted conversation.
      */
     protected formatConversation(conversation: any, userId: number): any {
         const numMessages = conversation.messages.length,
@@ -346,8 +346,8 @@ export class AddonMessagesProvider {
     /**
      * Get the cache key for blocked contacts.
      *
-     * @param {number} userId The user who's contacts we're looking for.
-     * @return {string} Cache key.
+     * @param userId The user who's contacts we're looking for.
+     * @return Cache key.
      */
     protected getCacheKeyForBlockedContacts(userId: number): string {
         return this.ROOT_CACHE_KEY + 'blockedContacts:' + userId;
@@ -356,7 +356,7 @@ export class AddonMessagesProvider {
     /**
      * Get the cache key for contacts.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getCacheKeyForContacts(): string {
         return this.ROOT_CACHE_KEY + 'contacts';
@@ -365,7 +365,7 @@ export class AddonMessagesProvider {
     /**
      * Get the cache key for comfirmed contacts.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getCacheKeyForUserContacts(): string {
         return this.ROOT_CACHE_KEY + 'userContacts';
@@ -374,7 +374,7 @@ export class AddonMessagesProvider {
     /**
      * Get the cache key for contact requests.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getCacheKeyForContactRequests(): string {
         return this.ROOT_CACHE_KEY + 'contactRequests';
@@ -383,7 +383,7 @@ export class AddonMessagesProvider {
     /**
      * Get the cache key for contact requests count.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getCacheKeyForContactRequestsCount(): string {
         return this.ROOT_CACHE_KEY + 'contactRequestsCount';
@@ -392,8 +392,8 @@ export class AddonMessagesProvider {
     /**
      * Get the cache key for a discussion.
      *
-     * @param {number} userId The other person with whom the current user is having the discussion.
-     * @return {string} Cache key.
+     * @param userId The other person with whom the current user is having the discussion.
+     * @return Cache key.
      */
     protected getCacheKeyForDiscussion(userId: number): string {
         return this.ROOT_CACHE_KEY + 'discussion:' + userId;
@@ -402,8 +402,8 @@ export class AddonMessagesProvider {
     /**
      * Get the cache key for the message count.
      *
-     * @param {number} userId  User ID.
-     * @return {string} Cache key.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getCacheKeyForMessageCount(userId: number): string {
         return this.ROOT_CACHE_KEY + 'count:' + userId;
@@ -412,7 +412,7 @@ export class AddonMessagesProvider {
     /**
      * Get the cache key for unread conversation counts.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getCacheKeyForUnreadConversationCounts(): string {
         return this.ROOT_CACHE_KEY + 'unreadConversationCounts';
@@ -421,7 +421,7 @@ export class AddonMessagesProvider {
     /**
      * Get the cache key for the list of discussions.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getCacheKeyForDiscussions(): string {
         return this.ROOT_CACHE_KEY + 'discussions';
@@ -430,9 +430,9 @@ export class AddonMessagesProvider {
     /**
      * Get cache key for get conversations.
      *
-     * @param {number} userId User ID.
-     * @param {number} conversationId Conversation ID.
-     * @return {string} Cache key.
+     * @param userId User ID.
+     * @param conversationId Conversation ID.
+     * @return Cache key.
      */
     protected getCacheKeyForConversation(userId: number, conversationId: number): string {
         return this.ROOT_CACHE_KEY + 'conversation:' + userId + ':' + conversationId;
@@ -441,9 +441,9 @@ export class AddonMessagesProvider {
     /**
      * Get cache key for get conversations between users.
      *
-     * @param {number} userId User ID.
-     * @param {number} otherUserId Other user ID.
-     * @return {string} Cache key.
+     * @param userId User ID.
+     * @param otherUserId Other user ID.
+     * @return Cache key.
      */
     protected getCacheKeyForConversationBetweenUsers(userId: number, otherUserId: number): string {
         return this.ROOT_CACHE_KEY + 'conversationBetweenUsers:' + userId + ':' + otherUserId;
@@ -452,9 +452,9 @@ export class AddonMessagesProvider {
     /**
      * Get cache key for get conversation members.
      *
-     * @param {number} userId User ID.
-     * @param {number} conversationId Conversation ID.
-     * @return {string} Cache key.
+     * @param userId User ID.
+     * @param conversationId Conversation ID.
+     * @return Cache key.
      */
     protected getCacheKeyForConversationMembers(userId: number, conversationId: number): string {
         return this.ROOT_CACHE_KEY + 'conversationMembers:' + userId + ':' + conversationId;
@@ -463,9 +463,9 @@ export class AddonMessagesProvider {
     /**
      * Get cache key for get conversation messages.
      *
-     * @param {number} userId User ID.
-     * @param {number} conversationId Conversation ID.
-     * @return {string} Cache key.
+     * @param userId User ID.
+     * @param conversationId Conversation ID.
+     * @return Cache key.
      */
     protected getCacheKeyForConversationMessages(userId: number, conversationId: number): string {
         return this.ROOT_CACHE_KEY + 'conversationMessages:' + userId + ':' + conversationId;
@@ -474,10 +474,10 @@ export class AddonMessagesProvider {
     /**
      * Get cache key for get conversations.
      *
-     * @param {number} userId User ID.
-     * @param {number} [type] Filter by type.
-     * @param {boolean} [favourites] Filter favourites.
-     * @return {string} Cache key.
+     * @param userId User ID.
+     * @param type Filter by type.
+     * @param favourites Filter favourites.
+     * @return Cache key.
      */
     protected getCacheKeyForConversations(userId: number, type?: number, favourites?: boolean): string {
         return this.getCommonCacheKeyForUserConversations(userId) + ':' + type + ':' + favourites;
@@ -486,7 +486,7 @@ export class AddonMessagesProvider {
     /**
      * Get cache key for conversation counts.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getCacheKeyForConversationCounts(): string {
         return this.ROOT_CACHE_KEY + 'conversationCounts';
@@ -495,9 +495,9 @@ export class AddonMessagesProvider {
     /**
      * Get cache key for member info.
      *
-     * @param {number} userId User ID.
-     * @param {number} otherUserId The other user ID.
-     * @return {string} Cache key.
+     * @param userId User ID.
+     * @param otherUserId The other user ID.
+     * @return Cache key.
      */
     protected getCacheKeyForMemberInfo(userId: number, otherUserId: number): string {
         return this.ROOT_CACHE_KEY + 'memberInfo:' + userId + ':' + otherUserId;
@@ -506,8 +506,8 @@ export class AddonMessagesProvider {
     /**
      * Get cache key for get self conversation.
      *
-     * @param {number} userId User ID.
-     * @return {string} Cache key.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getCacheKeyForSelfConversation(userId: number): string {
         return this.ROOT_CACHE_KEY + 'selfconversation:' + userId;
@@ -516,8 +516,8 @@ export class AddonMessagesProvider {
     /**
      * Get common cache key for get user conversations.
      *
-     * @param {number} userId User ID.
-     * @return {string} Cache key.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getCommonCacheKeyForUserConversations(userId: number): string {
         return this.getRootCacheKeyForConversations() + userId;
@@ -526,7 +526,7 @@ export class AddonMessagesProvider {
     /**
      * Get root cache key for get conversations.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getRootCacheKeyForConversations(): string {
         return this.ROOT_CACHE_KEY + 'conversations:';
@@ -535,8 +535,8 @@ export class AddonMessagesProvider {
     /**
      * Get all the contacts of the current user.
      *
-     * @param  {string} [siteId]  Site ID. If not defined, use current site.
-     * @return {Promise<any>} Resolved with the WS data.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Resolved with the WS data.
      * @deprecated since Moodle 3.6
      */
     getAllContacts(siteId?: string): Promise<any> {
@@ -561,8 +561,8 @@ export class AddonMessagesProvider {
     /**
      * Get all the users blocked by the current user.
      *
-     * @param  {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Resolved with the WS data.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Resolved with the WS data.
      */
     getBlockedContacts(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -584,8 +584,8 @@ export class AddonMessagesProvider {
      *
      * This excludes the blocked users.
      *
-     * @param  {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Resolved with the WS data.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Resolved with the WS data.
      * @deprecated since Moodle 3.6
      */
     getContacts(siteId?: string): Promise<any> {
@@ -618,10 +618,10 @@ export class AddonMessagesProvider {
     /**
      * Get the list of user contacts.
      *
-     * @param {number} [limitFrom=0] Position of the first contact to fetch.
-     * @param {number} [limitNum] Number of contacts to fetch. Default is AddonMessagesProvider.LIMIT_CONTACTS.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<{contacts: any[], canLoadMore: boolean}>} Resolved with the list of user contacts.
+     * @param limitFrom Position of the first contact to fetch.
+     * @param limitNum Number of contacts to fetch. Default is AddonMessagesProvider.LIMIT_CONTACTS.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Resolved with the list of user contacts.
      * @since 3.6
      */
     getUserContacts(limitFrom: number = 0, limitNum: number = AddonMessagesProvider.LIMIT_CONTACTS , siteId?: string):
@@ -660,10 +660,10 @@ export class AddonMessagesProvider {
     /**
      * Get the contact request sent to the current user.
      *
-     * @param {number} [limitFrom=0] Position of the first contact request to fetch.
-     * @param {number} [limitNum] Number of contact requests to fetch. Default is AddonMessagesProvider.LIMIT_CONTACTS.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<{requests: any[], canLoadMore: boolean}>} Resolved with the list of contact requests.
+     * @param limitFrom Position of the first contact request to fetch.
+     * @param limitNum Number of contact requests to fetch. Default is AddonMessagesProvider.LIMIT_CONTACTS.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Resolved with the list of contact requests.
      * @since 3.6
      */
     getContactRequests(limitFrom: number = 0, limitNum: number =  AddonMessagesProvider.LIMIT_CONTACTS, siteId?: string):
@@ -702,8 +702,8 @@ export class AddonMessagesProvider {
     /**
      * Get the number of contact requests sent to the current user.
      *
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<number>} Resolved with the number of contact requests.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Resolved with the number of contact requests.
      * @since 3.6
      */
     getContactRequestsCount(siteId?: string): Promise<number> {
@@ -728,19 +728,19 @@ export class AddonMessagesProvider {
     /**
      * Get a conversation by the conversation ID.
      *
-     * @param {number} conversationId Conversation ID to fetch.
-     * @param {boolean} [includeContactRequests] Include contact requests.
-     * @param {boolean} [includePrivacyInfo] Include privacy info.
-     * @param {number} [messageOffset=0] Offset for messages list.
-     * @param {number} [messageLimit=1] Limit of messages. Defaults to 1 (last message).
-     *                                  We recommend getConversationMessages to get them.
-     * @param {number} [memberOffset=0] Offset for members list.
-     * @param {number} [memberLimit=2] Limit of members. Defaults to 2 (to be able to know the other user in individual ones).
-     *                                 We recommend getConversationMembers to get them.
-     * @param {boolean} [newestFirst=true] Whether to order messages by newest first.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @return {Promise<any>} Promise resolved with the response.
+     * @param conversationId Conversation ID to fetch.
+     * @param includeContactRequests Include contact requests.
+     * @param includePrivacyInfo Include privacy info.
+     * @param messageOffset Offset for messages list.
+     * @param messageLimit Limit of messages. Defaults to 1 (last message).
+     *                     We recommend getConversationMessages to get them.
+     * @param memberOffset Offset for members list.
+     * @param memberLimit Limit of members. Defaults to 2 (to be able to know the other user in individual ones).
+     *                    We recommend getConversationMembers to get them.
+     * @param newestFirst Whether to order messages by newest first.
+     * @param siteId Site ID. If not defined, use current site.
+     * @param userId User ID. If not defined, current user in the site.
+     * @return Promise resolved with the response.
      * @since 3.6
      */
     getConversation(conversationId: number, includeContactRequests?: boolean, includePrivacyInfo?: boolean,
@@ -774,20 +774,20 @@ export class AddonMessagesProvider {
     /**
      * Get a conversation between two users.
      *
-     * @param {number} otherUserId The other user ID.
-     * @param {boolean} [includeContactRequests] Include contact requests.
-     * @param {boolean} [includePrivacyInfo] Include privacy info.
-     * @param {number} [messageOffset=0] Offset for messages list.
-     * @param {number} [messageLimit=1] Limit of messages. Defaults to 1 (last message).
-     *                                  We recommend getConversationMessages to get them.
-     * @param {number} [memberOffset=0] Offset for members list.
-     * @param {number} [memberLimit=2] Limit of members. Defaults to 2 (to be able to know the other user in individual ones).
-     *                                 We recommend getConversationMembers to get them.
-     * @param {boolean} [newestFirst=true] Whether to order messages by newest first.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @param {boolean} [preferCache] True if shouldn't call WS if data is cached, false otherwise.
-     * @return {Promise<any>} Promise resolved with the response.
+     * @param otherUserId The other user ID.
+     * @param includeContactRequests Include contact requests.
+     * @param includePrivacyInfo Include privacy info.
+     * @param messageOffset Offset for messages list.
+     * @param messageLimit Limit of messages. Defaults to 1 (last message).
+     *                     We recommend getConversationMessages to get them.
+     * @param memberOffset Offset for members list.
+     * @param memberLimit Limit of members. Defaults to 2 (to be able to know the other user in individual ones).
+     *                    We recommend getConversationMembers to get them.
+     * @param newestFirst Whether to order messages by newest first.
+     * @param siteId Site ID. If not defined, use current site.
+     * @param userId User ID. If not defined, current user in the site.
+     * @param preferCache True if shouldn't call WS if data is cached, false otherwise.
+     * @return Promise resolved with the response.
      * @since 3.6
      */
     getConversationBetweenUsers(otherUserId: number, includeContactRequests?: boolean, includePrivacyInfo?: boolean,
@@ -822,12 +822,12 @@ export class AddonMessagesProvider {
     /**
      * Get a conversation members.
      *
-     * @param {number} conversationId Conversation ID to fetch.
-     * @param {number} [limitFrom=0] Offset for members list.
-     * @param {number} [limitTo] Limit of members.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @return {Promise<any>} Promise resolved with the response.
+     * @param conversationId Conversation ID to fetch.
+     * @param limitFrom Offset for members list.
+     * @param limitTo Limit of members.
+     * @param siteId Site ID. If not defined, use current site.
+     * @param userId User ID. If not defined, current user in the site.
+     * @return Promise resolved with the response.
      * @since 3.6
      */
     getConversationMembers(conversationId: number, limitFrom: number = 0, limitTo?: number, includeContactRequests?: boolean,
@@ -872,15 +872,15 @@ export class AddonMessagesProvider {
     /**
      * Get a conversation by the conversation ID.
      *
-     * @param {number} conversationId Conversation ID to fetch.
-     * @param {boolean} excludePending True to exclude messages pending to be sent.
-     * @param {number} [limitFrom=0] Offset for messages list.
-     * @param {number} [limitTo] Limit of messages.
-     * @param {boolean} [newestFirst=true] Whether to order messages by newest first.
-     * @param {number} [timeFrom] The timestamp from which the messages were created.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @return {Promise<any>} Promise resolved with the response.
+     * @param conversationId Conversation ID to fetch.
+     * @param excludePending True to exclude messages pending to be sent.
+     * @param limitFrom Offset for messages list.
+     * @param limitTo Limit of messages.
+     * @param newestFirst Whether to order messages by newest first.
+     * @param timeFrom The timestamp from which the messages were created.
+     * @param siteId Site ID. If not defined, use current site.
+     * @param userId User ID. If not defined, current user in the site.
+     * @return Promise resolved with the response.
      * @since 3.6
      */
     getConversationMessages(conversationId: number, excludePending: boolean, limitFrom: number = 0, limitTo?: number,
@@ -963,15 +963,15 @@ export class AddonMessagesProvider {
      * Get the discussions of a certain user. This function is used in Moodle sites higher than 3.6.
      * If the site is older than 3.6, please use getDiscussions.
      *
-     * @param {number} [type] Filter by type.
-     * @param {boolean} [favourites] Whether to restrict the results to contain NO favourite conversations (false), ONLY favourite
-     *                               conversation (true), or ignore any restriction altogether (undefined or null).
-     * @param {number} [limitFrom=0] The offset to start at.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @param {boolean} [forceCache] True if it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<any>} Promise resolved with the conversations.
+     * @param type Filter by type.
+     * @param favourites Whether to restrict the results to contain NO favourite conversations (false), ONLY favourite
+     *                   conversation (true), or ignore any restriction altogether (undefined or null).
+     * @param limitFrom The offset to start at.
+     * @param siteId Site ID. If not defined, use current site.
+     * @param userId User ID. If not defined, current user in the site.
+     * @param forceCache True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise resolved with the conversations.
      * @since 3.6
      */
     getConversations(type?: number, favourites?: boolean, limitFrom: number = 0, siteId?: string, userId?: number,
@@ -1041,9 +1041,9 @@ export class AddonMessagesProvider {
     /**
      * Get conversation counts by type.
      *
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<favourites: number, individual: number, group: number, self: number>} Promise resolved with favourite,
-     *                                      individual, group and self conversation counts.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with favourite,
+     *         individual, group and self conversation counts.
      * @since 3.6
      */
     getConversationCounts(siteId?: string): Promise<{favourites: number, individual: number, group: number, self: number}> {
@@ -1069,15 +1069,15 @@ export class AddonMessagesProvider {
     /**
      * Return the current user's discussion with another user.
      *
-     * @param  {number} userId               The ID of the other user.
-     * @param  {boolean} excludePending      True to exclude messages pending to be sent.
-     * @param  {number} [lfReceivedUnread=0] Number of unread received messages already fetched, so fetch will be done from this.
-     * @param  {number} [lfReceivedRead=0]   Number of read received messages already fetched, so fetch will be done from this.
-     * @param  {number} [lfSentUnread=0]     Number of unread sent messages already fetched, so fetch will be done from this.
-     * @param  {number} [lfSentRead=0]       Number of read sent messages already fetched, so fetch will be done from this.
-     * @param  {boolean} [toDisplay=true]    True if messages will be displayed to the user, either in view or in a notification.
-     * @param  {string} [siteId]             Site ID. If not defined, use current site.
-     * @return {Promise<any>}                     Promise resolved with messages and a boolean telling if can load more messages.
+     * @param userId The ID of the other user.
+     * @param excludePending True to exclude messages pending to be sent.
+     * @param lfReceivedUnread Number of unread received messages already fetched, so fetch will be done from this.
+     * @param lfReceivedRead Number of read received messages already fetched, so fetch will be done from this.
+     * @param lfSentUnread Number of unread sent messages already fetched, so fetch will be done from this.
+     * @param lfSentRead Number of read sent messages already fetched, so fetch will be done from this.
+     * @param toDisplay True if messages will be displayed to the user, either in view or in a notification.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with messages and a boolean telling if can load more messages.
      */
     getDiscussion(userId: number, excludePending: boolean, lfReceivedUnread: number = 0, lfReceivedRead: number = 0,
             lfSentUnread: number = 0, lfSentRead: number = 0, toDisplay: boolean = true, siteId?: string): Promise<any> {
@@ -1152,8 +1152,8 @@ export class AddonMessagesProvider {
      * Get the discussions of the current user. This function is used in Moodle sites older than 3.6.
      * If the site is 3.6 or higher, please use getConversations.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Resolved with an object where the keys are the user ID of the other user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved with an object where the keys are the user ID of the other user.
      */
     getDiscussions(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1240,9 +1240,9 @@ export class AddonMessagesProvider {
     /**
      * Get user images for all the discussions that don't have one already.
      *
-     * @param {any} discussions List of discussions.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}             Promise always resolved. Resolve param is the formatted discussions.
+     * @param discussions List of discussions.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise always resolved. Resolve param is the formatted discussions.
      */
     protected getDiscussionsUserImg(discussions: any, siteId?: string): Promise<any> {
         const promises = [];
@@ -1266,10 +1266,10 @@ export class AddonMessagesProvider {
     /**
      * Get conversation member info by user id, works even if no conversation betwen the users exists.
      *
-     * @param {number} otherUserId The other user ID.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @return {Promise<any>} Promise resolved with the member info.
+     * @param otherUserId The other user ID.
+     * @param siteId Site ID. If not defined, use current site.
+     * @param userId User ID. If not defined, current user in the site.
+     * @return Promise resolved with the member info.
      * @since 3.6
      */
     getMemberInfo(otherUserId: number, siteId?: string, userId?: number): Promise<any> {
@@ -1301,7 +1301,7 @@ export class AddonMessagesProvider {
     /**
      * Get the cache key for the get message preferences call.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getMessagePreferencesCacheKey(): string {
         return this.ROOT_CACHE_KEY + 'messagePreferences';
@@ -1310,8 +1310,8 @@ export class AddonMessagesProvider {
     /**
      * Get message preferences.
      *
-     * @param  {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>}         Promise resolved with the message preferences.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with the message preferences.
      */
     getMessagePreferences(siteId?: string): Promise<any> {
         this.logger.debug('Get message preferences');
@@ -1337,11 +1337,10 @@ export class AddonMessagesProvider {
     /**
      * Get messages according to the params.
      *
-     * @param  {any} params            Parameters to pass to the WS.
-     * @param  {any} preSets           Set of presets for the WS.
-     * @param  {boolean} [toDisplay=true] True if messages will be displayed to the user, either in view or in a notification.
-     * @param  {string} [siteId]          Site ID. If not defined, use current site.
-     * @return {Promise<any>}
+     * @param params Parameters to pass to the WS.
+     * @param preSets Set of presets for the WS.
+     * @param toDisplay True if messages will be displayed to the user, either in view or in a notification.
+     * @param siteId Site ID. If not defined, use current site.
      */
     protected getMessages(params: any, preSets: any, toDisplay: boolean = true, siteId?: string): Promise<any> {
         params['type'] = 'conversations';
@@ -1372,13 +1371,12 @@ export class AddonMessagesProvider {
     /**
      * Get the most recent messages.
      *
-     * @param  {any} params              Parameters to pass to the WS.
-     * @param  {any} preSets             Set of presets for the WS.
-     * @param  {number} [limitFromUnread=0] Number of read messages already fetched, so fetch will be done from this number.
-     * @param  {number} [limitFromRead=0]   Number of unread messages already fetched, so fetch will be done from this number.
-     * @param  {boolean} [toDisplay=true]   True if messages will be displayed to the user, either in view or in a notification.
-     * @param  {string} [siteId]            Site ID. If not defined, use current site.
-     * @return {Promise<any>}
+     * @param params Parameters to pass to the WS.
+     * @param preSets Set of presets for the WS.
+     * @param limitFromUnread Number of read messages already fetched, so fetch will be done from this number.
+     * @param limitFromRead Number of unread messages already fetched, so fetch will be done from this number.
+     * @param toDisplay True if messages will be displayed to the user, either in view or in a notification.
+     * @param siteId Site ID. If not defined, use current site.
      */
     protected getRecentMessages(params: any, preSets: any, limitFromUnread: number = 0, limitFromRead: number = 0,
             toDisplay: boolean = true, siteId?: string): Promise<any> {
@@ -1419,13 +1417,13 @@ export class AddonMessagesProvider {
     /**
      * Get a self conversation.
      *
-     * @param {number} [messageOffset=0] Offset for messages list.
-     * @param {number} [messageLimit=1] Limit of messages. Defaults to 1 (last message).
-     *                                  We recommend getConversationMessages to get them.
-     * @param {boolean} [newestFirst=true] Whether to order messages by newest first.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @param {string} [userId] User ID to get the self conversation for. If not defined, current user in the site.
-     * @return {Promise<any>} Promise resolved with the response.
+     * @param messageOffset Offset for messages list.
+     * @param messageLimit Limit of messages. Defaults to 1 (last message).
+     *                     We recommend getConversationMessages to get them.
+     * @param newestFirst Whether to order messages by newest first.
+     * @param siteId Site ID. If not defined, use current site.
+     * @param userId User ID to get the self conversation for. If not defined, current user in the site.
+     * @return Promise resolved with the response.
      * @since 3.7
      */
     getSelfConversation(messageOffset: number = 0, messageLimit: number = 1, newestFirst: boolean = true, siteId?: string,
@@ -1453,8 +1451,8 @@ export class AddonMessagesProvider {
     /**
      * Get unread conversation counts by type.
      *
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Resolved with the unread favourite, individual and group conversation counts.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Resolved with the unread favourite, individual and group conversation counts.
      */
     getUnreadConversationCounts(siteId?: string):
             Promise<{favourites: number, individual: number, group: number, self: number, orMore?: boolean}> {
@@ -1531,11 +1529,11 @@ export class AddonMessagesProvider {
     /**
      * Get the latest unread received messages.
      *
-     * @param  {boolean} [toDisplay=true] True if messages will be displayed to the user, either in view or in a notification.
-     * @param  {boolean} [forceCache]     True if it should return cached data. Has priority over ignoreCache.
-     * @param  {boolean} [ignoreCache]    True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {string} [siteId]          Site ID. If not defined, use current site.
-     * @return {Promise<any>}                  Promise resolved with the message unread count.
+     * @param toDisplay True if messages will be displayed to the user, either in view or in a notification.
+     * @param forceCache True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with the message unread count.
      */
     getUnreadReceivedMessages(toDisplay: boolean = true, forceCache: boolean = false, ignoreCache: boolean = false,
             siteId?: string): Promise<any> {
@@ -1563,9 +1561,9 @@ export class AddonMessagesProvider {
     /**
      * Invalidate all contacts cache.
      *
-     * @param {number} userId    The user ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Resolved when done.
+     * @param userId The user ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when done.
      */
     invalidateAllContactsCache(userId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -1578,9 +1576,8 @@ export class AddonMessagesProvider {
     /**
      * Invalidate blocked contacts cache.
      *
-     * @param {number} userId    The user ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}
+     * @param userId The user ID.
+     * @param siteId Site ID. If not defined, current site.
      */
     invalidateBlockedContactsCache(userId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1591,8 +1588,8 @@ export class AddonMessagesProvider {
     /**
      * Invalidate contacts cache.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Resolved when done.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when done.
      */
     invalidateContactsCache(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1603,8 +1600,8 @@ export class AddonMessagesProvider {
     /**
      * Invalidate user contacts cache.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Resolved when done.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when done.
      */
     invalidateUserContacts(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1615,8 +1612,8 @@ export class AddonMessagesProvider {
     /**
      * Invalidate contact requests cache.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Resolved when done.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when done.
      */
     invalidateContactRequestsCache(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1627,8 +1624,8 @@ export class AddonMessagesProvider {
     /**
      * Invalidate contact requests count cache.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Resolved when done.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when done.
      */
     invalidateContactRequestsCountCache(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1639,10 +1636,10 @@ export class AddonMessagesProvider {
     /**
      * Invalidate conversation.
      *
-     * @param {number} conversationId Conversation ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @return {Promise<any>} Resolved when done.
+     * @param conversationId Conversation ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined, current user in the site.
+     * @return Resolved when done.
      */
     invalidateConversation(conversationId: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1655,10 +1652,10 @@ export class AddonMessagesProvider {
     /**
      * Invalidate conversation between users.
      *
-     * @param {number} otherUserId Other user ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @return {Promise<any>} Resolved when done.
+     * @param otherUserId Other user ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined, current user in the site.
+     * @return Resolved when done.
      */
     invalidateConversationBetweenUsers(otherUserId: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1671,10 +1668,10 @@ export class AddonMessagesProvider {
     /**
      * Invalidate conversation members cache.
      *
-     * @param {number} conversationId Conversation ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @return {Promise<any>} Resolved when done.
+     * @param conversationId Conversation ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined, current user in the site.
+     * @return Resolved when done.
      */
     invalidateConversationMembers(conversationId: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1687,10 +1684,10 @@ export class AddonMessagesProvider {
     /**
      * Invalidate conversation messages cache.
      *
-     * @param {number} conversationId Conversation ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @return {Promise<any>} Resolved when done.
+     * @param conversationId Conversation ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined, current user in the site.
+     * @return Resolved when done.
      */
     invalidateConversationMessages(conversationId: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1703,9 +1700,9 @@ export class AddonMessagesProvider {
     /**
      * Invalidate conversations cache.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @return {Promise<any>} Resolved when done.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined, current user in the site.
+     * @return Resolved when done.
      */
     invalidateConversations(siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1718,8 +1715,8 @@ export class AddonMessagesProvider {
     /**
      * Invalidate conversation counts cache.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Resolved when done.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when done.
      */
     invalidateConversationCounts(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1730,9 +1727,9 @@ export class AddonMessagesProvider {
     /**
      * Invalidate discussion cache.
      *
-     * @param {number} userId    The user ID with whom the current user is having the discussion.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Resolved when done.
+     * @param userId The user ID with whom the current user is having the discussion.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when done.
      */
     invalidateDiscussionCache(userId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1745,8 +1742,8 @@ export class AddonMessagesProvider {
      *
      * Note that {@link this.getDiscussions} uses the contacts, so we need to invalidate contacts too.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Resolved when done.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when done.
      */
     invalidateDiscussionsCache(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1761,10 +1758,10 @@ export class AddonMessagesProvider {
     /**
      * Invalidate member info cache.
      *
-     * @param {number} otherUserId The other user ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @return {Promise<any>} Resolved when done.
+     * @param otherUserId The other user ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined, current user in the site.
+     * @return Resolved when done.
      */
     invalidateMemberInfo(otherUserId: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1777,8 +1774,8 @@ export class AddonMessagesProvider {
     /**
      * Invalidate get message preferences.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved when data is invalidated.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when data is invalidated.
      */
     invalidateMessagePreferences(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1789,9 +1786,9 @@ export class AddonMessagesProvider {
     /**
      * Invalidate all cache entries with member info.
      *
-     * @param {number} userId Id of the user to invalidate.
-     * @param {CoreSite} site Site object.
-     * @return {Promie<any>} Promise resolved when done.
+     * @param userId Id of the user to invalidate.
+     * @param site Site object.
+     * @return Promise resolved when done.
      */
     protected invalidateAllMemberInfo(userId: number, site: CoreSite): Promise<any> {
         return this.utils.allPromises([
@@ -1814,9 +1811,9 @@ export class AddonMessagesProvider {
     /**
      * Invalidate a self conversation.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @return {Promise<any>} Resolved when done.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined, current user in the site.
+     * @return Resolved when done.
      */
     invalidateSelfConversation(siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1829,8 +1826,8 @@ export class AddonMessagesProvider {
     /**
      * Invalidate unread conversation counts cache.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Resolved when done.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when done.
      */
     invalidateUnreadConversationCounts(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1848,9 +1845,9 @@ export class AddonMessagesProvider {
     /**
      * Checks if the a user is blocked by the current user.
      *
-     * @param {number} userId The user ID to check against.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<boolean>} Resolved with boolean, rejected when we do not know.
+     * @param userId The user ID to check against.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Resolved with boolean, rejected when we do not know.
      */
     isBlocked(userId: number, siteId?: string): Promise<boolean> {
         if (this.isGroupMessagingEnabled()) {
@@ -1873,9 +1870,9 @@ export class AddonMessagesProvider {
     /**
      * Checks if the a user is a contact of the current user.
      *
-     * @param {number} userId The user ID to check against.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<boolean>} Resolved with boolean, rejected when we do not know.
+     * @param userId The user ID to check against.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Resolved with boolean, rejected when we do not know.
      */
     isContact(userId: number, siteId?: string): Promise<boolean> {
         if (this.isGroupMessagingEnabled()) {
@@ -1900,7 +1897,7 @@ export class AddonMessagesProvider {
     /**
      * Returns whether or not group messaging is supported.
      *
-     * @return {boolean} If related WS is available on current site.
+     * @return If related WS is available on current site.
      * @since 3.6
      */
     isGroupMessagingEnabled(): boolean {
@@ -1910,8 +1907,8 @@ export class AddonMessagesProvider {
     /**
      * Returns whether or not group messaging is supported in a certain site.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether related WS is available on a certain site.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether related WS is available on a certain site.
      * @since 3.6
      */
     isGroupMessagingEnabledInSite(siteId?: string): Promise<boolean> {
@@ -1925,7 +1922,7 @@ export class AddonMessagesProvider {
     /**
      * Returns whether or not we can mark all messages as read.
      *
-     * @return {boolean} If related WS is available on current site.
+     * @return If related WS is available on current site.
      * @since  3.2
      */
     isMarkAllMessagesReadEnabled(): boolean {
@@ -1935,7 +1932,7 @@ export class AddonMessagesProvider {
     /**
      * Returns whether or not we can count unread messages.
      *
-     * @return {boolean} True if enabled, false otherwise.
+     * @return True if enabled, false otherwise.
      * @since  3.2
      */
     isMessageCountEnabled(): boolean {
@@ -1945,7 +1942,7 @@ export class AddonMessagesProvider {
     /**
      * Returns whether or not the message preferences are enabled for the current site.
      *
-     * @return {boolean} True if enabled, false otherwise.
+     * @return True if enabled, false otherwise.
      * @since  3.2
      */
     isMessagePreferencesEnabled(): boolean {
@@ -1957,8 +1954,8 @@ export class AddonMessagesProvider {
      *
      * This could call a WS so do not abuse this method.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}   Resolved when enabled, otherwise rejected.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when enabled, otherwise rejected.
      */
     isMessagingEnabledForSite(siteId?: string): Promise<any> {
         return this.isPluginEnabled(siteId).then((enabled) => {
@@ -1971,8 +1968,8 @@ export class AddonMessagesProvider {
     /**
      * Returns whether or not a site supports muting or unmuting a conversation.
      *
-     * @param {CoreSite} [site] The site to check, undefined for current site.
-     * @return {boolean} If related WS is available on current site.
+     * @param site The site to check, undefined for current site.
+     * @return If related WS is available on current site.
      * @since 3.7
      */
     isMuteConversationEnabled(site?: CoreSite): boolean {
@@ -1984,8 +1981,8 @@ export class AddonMessagesProvider {
     /**
      * Returns whether or not a site supports muting or unmuting a conversation.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether related WS is available on a certain site.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether related WS is available on a certain site.
      * @since 3.7
      */
     isMuteConversationEnabledInSite(siteId?: string): Promise<boolean> {
@@ -1999,8 +1996,8 @@ export class AddonMessagesProvider {
     /**
      * Returns whether or not the plugin is enabled in a certain site.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved with true if enabled, rejected or resolved with false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if enabled, rejected or resolved with false otherwise.
      */
     isPluginEnabled(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2011,7 +2008,6 @@ export class AddonMessagesProvider {
     /**
      * Returns whether or not we can search messages.
      *
-     * @return {boolean}
      * @since  3.2
      */
     isSearchMessagesEnabled(): boolean {
@@ -2021,8 +2017,8 @@ export class AddonMessagesProvider {
     /**
      * Returns whether or not self conversation is supported in a certain site.
      *
-     * @param {CoreSite} [site] Site. If not defined, current site.
-     * @return {boolean} If related WS is available on the site.
+     * @param site Site. If not defined, current site.
+     * @return If related WS is available on the site.
      * @since 3.7
      */
     isSelfConversationEnabled(site?: CoreSite): boolean {
@@ -2034,8 +2030,8 @@ export class AddonMessagesProvider {
     /**
      * Returns whether or not self conversation is supported in a certain site.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether related WS is available on a certain site.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether related WS is available on a certain site.
      * @since 3.7
      */
     isSelfConversationEnabledInSite(siteId?: string): Promise<boolean> {
@@ -2049,9 +2045,9 @@ export class AddonMessagesProvider {
     /**
      * Mark message as read.
      *
-     * @param {number} messageId ID of message to mark as read
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @returns {Promise<any>} Promise resolved with boolean marking success or not.
+     * @param messageId ID of message to mark as read
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean marking success or not.
      */
     markMessageRead(messageId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2067,8 +2063,8 @@ export class AddonMessagesProvider {
     /**
      * Mark all messages of a conversation as read.
      *
-     * @param {number} conversationId Conversation ID.
-     * @returns {Promise<any>} Promise resolved if success.
+     * @param conversationId Conversation ID.
+     * @return Promise resolved if success.
      * @since 3.6
      */
     markAllConversationMessagesRead(conversationId?: number): Promise<any> {
@@ -2086,8 +2082,8 @@ export class AddonMessagesProvider {
     /**
      * Mark all messages of a discussion as read.
      *
-     * @param   {number}  userIdFrom  User Id for the sender.
-     * @returns {Promise<any>} Promise resolved with boolean marking success or not.
+     * @param userIdFrom User Id for the sender.
+     * @return Promise resolved with boolean marking success or not.
      */
     markAllMessagesRead(userIdFrom?: number): Promise<any> {
         const params = {
@@ -2104,11 +2100,11 @@ export class AddonMessagesProvider {
     /**
      * Mute or unmute a conversation.
      *
-     * @param {number} conversationId Conversation ID.
-     * @param {boolean} set Whether to mute or unmute.
-     * @param {string} [siteId]  Site ID. If not defined, use current site.
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @return {Promise<any>}  Resolved when done.
+     * @param conversationId Conversation ID.
+     * @param set Whether to mute or unmute.
+     * @param siteId Site ID. If not defined, use current site.
+     * @param userId User ID. If not defined, current user in the site.
+     * @return Resolved when done.
      */
     muteConversation(conversationId: number, set: boolean, siteId?: string, userId?: number): Promise<any> {
         return this.muteConversations([conversationId], set, siteId, userId);
@@ -2117,11 +2113,11 @@ export class AddonMessagesProvider {
     /**
      * Mute or unmute some conversations.
      *
-     * @param {number[]} conversations Conversation IDs.
-     * @param {boolean} set Whether to mute or unmute.
-     * @param {string} [siteId]  Site ID. If not defined, use current site.
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @return {Promise<any>}  Resolved when done.
+     * @param conversations Conversation IDs.
+     * @param set Whether to mute or unmute.
+     * @param siteId Site ID. If not defined, use current site.
+     * @param userId User ID. If not defined, current user in the site.
+     * @return Resolved when done.
      */
     muteConversations(conversations: number[], set: boolean, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2151,8 +2147,8 @@ export class AddonMessagesProvider {
     /**
      * Refresh the number of contact requests sent to the current user.
      *
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<number>} Resolved with the number of contact requests.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Resolved with the number of contact requests.
      * @since 3.6
      */
     refreshContactRequestsCount(siteId?: string): Promise<number> {
@@ -2166,8 +2162,8 @@ export class AddonMessagesProvider {
     /**
      * Refresh unread conversation counts and trigger event.
      *
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Resolved with the unread favourite, individual and group conversation counts.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Resolved with the unread favourite, individual and group conversation counts.
      */
     refreshUnreadConversationCounts(siteId?: string):
             Promise<{favourites: number, individual: number, group: number, orMore?: boolean}> {
@@ -2182,9 +2178,9 @@ export class AddonMessagesProvider {
     /**
      * Remove a contact.
      *
-     * @param {number} userId User ID of the person to remove.
-     * @param {string} [siteId]  Site ID. If not defined, use current site.
-     * @return {Promise<any>}  Resolved when done.
+     * @param userId User ID of the person to remove.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Resolved when done.
      */
     removeContact(userId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2218,10 +2214,9 @@ export class AddonMessagesProvider {
      * of results which would take a while to process. The limit here is just a convenience to
      * prevent viewed to crash because too many DOM elements are created.
      *
-     * @param {string} query The query string.
-     * @param {number} [limit=100] The number of results to return, 0 for none.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}
+     * @param query The query string.
+     * @param limit The number of results to return, 0 for none.
+     * @param siteId Site ID. If not defined, current site.
      */
     searchContacts(query: string, limit: number = 100, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2247,12 +2242,12 @@ export class AddonMessagesProvider {
     /**
      * Search for all the messges with a specific text.
      *
-     * @param {string} query The query string.
-     * @param {number} [userId] The user ID. If not defined, current user.
-     * @param {number} [limitFrom=0] Position of the first result to get. Defaults to 0.
-     * @param {number} [limitNum] Number of results to get. Defaults to AddonMessagesProvider.LIMIT_SEARCH.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the results.
+     * @param query The query string.
+     * @param userId The user ID. If not defined, current user.
+     * @param limitFrom Position of the first result to get. Defaults to 0.
+     * @param limitNum Number of results to get. Defaults to AddonMessagesProvider.LIMIT_SEARCH.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the results.
      */
     searchMessages(query: string, userId?: number, limitFrom: number = 0, limitNum: number = AddonMessagesProvider.LIMIT_SEARCH,
             siteId?: string): Promise<{messages: any[], canLoadMore: boolean}> {
@@ -2294,11 +2289,11 @@ export class AddonMessagesProvider {
     /**
      * Search for users.
      *
-     * @param {string} query Text to search for.
-     * @param {number} [limitFrom=0] Position of the first found user to fetch.
-     * @param {number} [limitNum] Number of found users to fetch. Defaults to AddonMessagesProvider.LIMIT_SEARCH.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Resolved with two lists of found users: contacts and non-contacts.
+     * @param query Text to search for.
+     * @param limitFrom Position of the first found user to fetch.
+     * @param limitNum Number of found users to fetch. Defaults to AddonMessagesProvider.LIMIT_SEARCH.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Resolved with two lists of found users: contacts and non-contacts.
      * @since 3.6
      */
     searchUsers(query: string, limitFrom: number = 0, limitNum: number = AddonMessagesProvider.LIMIT_SEARCH, siteId?: string):
@@ -2339,12 +2334,12 @@ export class AddonMessagesProvider {
     /**
      * Send a message to someone.
      *
-     * @param {number} userIdTo  User ID to send the message to.
-     * @param {string} message   The message to send
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}       Promise resolved with:
-     *                                 - sent (Boolean) True if message was sent to server, false if stored in device.
-     *                                 - message (Object) If sent=false, contains the stored message.
+     * @param userIdTo User ID to send the message to.
+     * @param message The message to send
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with:
+     *         - sent (Boolean) True if message was sent to server, false if stored in device.
+     *         - message (Object) If sent=false, contains the stored message.
      */
     sendMessage(toUserId: number, message: string, siteId?: string): Promise<any> {
         // Convenience function to store a message to be synchronized later.
@@ -2395,10 +2390,10 @@ export class AddonMessagesProvider {
     /**
      * Send a message to someone. It will fail if offline or cannot connect.
      *
-     * @param {number} toUserId  User ID to send the message to.
-     * @param {string} message   The message to send
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved if success, rejected if failure.
+     * @param toUserId User ID to send the message to.
+     * @param message The message to send
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success, rejected if failure.
      */
     sendMessageOnline(toUserId: number, message: string, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -2430,10 +2425,10 @@ export class AddonMessagesProvider {
      * IMPORTANT: Sending several messages at once for the same discussions can cause problems with display order,
      * since messages with same timecreated aren't ordered by ID.
      *
-     * @param  {any} messages Messages to send. Each message must contain touserid, text and textformat.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved if success, rejected if failure. Promise resolved doesn't mean that messages
-     *                           have been sent, the resolve param can contain errors for messages not sent.
+     * @param messages Messages to send. Each message must contain touserid, text and textformat.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success, rejected if failure. Promise resolved doesn't mean that messages
+     *         have been sent, the resolve param can contain errors for messages not sent.
      */
     sendMessagesOnline(messages: any, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2448,12 +2443,12 @@ export class AddonMessagesProvider {
     /**
      * Send a message to a conversation.
      *
-     * @param {any} conversation Conversation.
-     * @param {string} message The message to send.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with:
-     *                                - sent (boolean) True if message was sent to server, false if stored in device.
-     *                                - message (any) If sent=false, contains the stored message.
+     * @param conversation Conversation.
+     * @param message The message to send.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with:
+     *         - sent (boolean) True if message was sent to server, false if stored in device.
+     *         - message (any) If sent=false, contains the stored message.
      * @since 3.6
      */
     sendMessageToConversation(conversation: any, message: string, siteId?: string): Promise<any> {
@@ -2505,10 +2500,10 @@ export class AddonMessagesProvider {
     /**
      * Send a message to a conversation. It will fail if offline or cannot connect.
      *
-     * @param {number} conversationId Conversation ID.
-     * @param {string} message The message to send
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if success, rejected if failure.
+     * @param conversationId Conversation ID.
+     * @param message The message to send
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success, rejected if failure.
      * @since 3.6
      */
     sendMessageToConversationOnline(conversationId: number, message: string, siteId?: string): Promise<any> {
@@ -2533,10 +2528,10 @@ export class AddonMessagesProvider {
     /**
      * Send some messages to a conversation. It will fail if offline or cannot connect.
      *
-     * @param {number} conversationId Conversation ID.
-     * @param {any} messages Messages to send. Each message must contain text and, optionally, textformat.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if success, rejected if failure.
+     * @param conversationId Conversation ID.
+     * @param messages Messages to send. Each message must contain text and, optionally, textformat.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success, rejected if failure.
      * @since 3.6
      */
     sendMessagesToConversationOnline(conversationId: number, messages: any, siteId?: string): Promise<any> {
@@ -2558,11 +2553,11 @@ export class AddonMessagesProvider {
     /**
      * Set or unset a conversation as favourite.
      *
-     * @param {number} conversationId Conversation ID.
-     * @param {boolean} set Whether to set or unset it as favourite.
-     * @param {string} [siteId]  Site ID. If not defined, use current site.
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @return {Promise<any>}  Resolved when done.
+     * @param conversationId Conversation ID.
+     * @param set Whether to set or unset it as favourite.
+     * @param siteId Site ID. If not defined, use current site.
+     * @param userId User ID. If not defined, current user in the site.
+     * @return Resolved when done.
      */
     setFavouriteConversation(conversationId: number, set: boolean, siteId?: string, userId?: number): Promise<any> {
         return this.setFavouriteConversations([conversationId], set, siteId, userId);
@@ -2571,11 +2566,11 @@ export class AddonMessagesProvider {
     /**
      * Set or unset some conversations as favourites.
      *
-     * @param {number[]} conversations Conversation IDs.
-     * @param {boolean} set Whether to set or unset them as favourites.
-     * @param {string} [siteId]  Site ID. If not defined, use current site.
-     * @param {number} [userId] User ID. If not defined, current user in the site.
-     * @return {Promise<any>}  Resolved when done.
+     * @param conversations Conversation IDs.
+     * @param set Whether to set or unset them as favourites.
+     * @param siteId Site ID. If not defined, use current site.
+     * @param userId User ID. If not defined, current user in the site.
+     * @return Resolved when done.
      */
     setFavouriteConversations(conversations: number[], set: boolean, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2605,8 +2600,8 @@ export class AddonMessagesProvider {
     /**
      * Helper method to sort conversations by last message time.
      *
-     * @param {any[]} conversations Array of conversations.
-     * @return {any[]} Conversations sorted with most recent last.
+     * @param conversations Array of conversations.
+     * @return Conversations sorted with most recent last.
      */
     sortConversations(conversations: any[]): any[] {
         return conversations.sort((a, b) => {
@@ -2625,8 +2620,8 @@ export class AddonMessagesProvider {
     /**
      * Helper method to sort messages by time.
      *
-     * @param {any[]} messages Array of messages containing the key 'timecreated'.
-     * @return {any[]} Messages sorted with most recent last.
+     * @param messages Array of messages containing the key 'timecreated'.
+     * @return Messages sorted with most recent last.
      */
     sortMessages(messages: any[]): any[] {
         return messages.sort((a, b) => {
@@ -2651,10 +2646,10 @@ export class AddonMessagesProvider {
     /**
      * Store the last received message if it's newer than the last stored.
      *
-     * @param  {number} convIdOrUserIdFrom Conversation ID (3.6+) or ID of the useridfrom retrieved (3.5-), 0 for all users.
-     * @param  {any} message       Last message received.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved when done.
+     * @param convIdOrUserIdFrom Conversation ID (3.6+) or ID of the useridfrom retrieved (3.5-), 0 for all users.
+     * @param message Last message received.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     protected storeLastReceivedMessageIfNeeded(convIdOrUserIdFrom: number, message: any, siteId?: string): Promise<any> {
         const component = AddonMessagesProvider.PUSH_SIMULATION_COMPONENT;
@@ -2678,7 +2673,7 @@ export class AddonMessagesProvider {
     /**
      * Store user data from contacts in local DB.
      *
-     * @param {any} contactTypes List of contacts grouped in types.
+     * @param contactTypes List of contacts grouped in types.
      */
     protected storeUsersFromAllContacts(contactTypes: any): void {
         for (const x in contactTypes) {
@@ -2689,8 +2684,8 @@ export class AddonMessagesProvider {
     /**
      * Store user data from discussions in local DB.
      *
-     * @param {any} discussions List of discussions.
-     * @param {string} [siteId] Site ID. If not defined, current site.
+     * @param discussions List of discussions.
+     * @param siteId Site ID. If not defined, current site.
      */
     protected storeUsersFromDiscussions(discussions: any, siteId?: string): void {
         const users = [];
@@ -2707,9 +2702,9 @@ export class AddonMessagesProvider {
     /**
      * Unblock a user.
      *
-     * @param {number} userId User ID of the person to unblock.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Resolved when done.
+     * @param userId User ID of the person to unblock.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Resolved when done.
      */
     unblockContact(userId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/addon/messages/providers/push-click-handler.ts b/src/addon/messages/providers/push-click-handler.ts
index f6fcf3c0e..7e1fcad43 100644
--- a/src/addon/messages/providers/push-click-handler.ts
+++ b/src/addon/messages/providers/push-click-handler.ts
@@ -33,8 +33,8 @@ export class AddonMessagesPushClickHandler implements CorePushNotificationsClick
     /**
      * Check if a notification click is handled by this handler.
      *
-     * @param {any} notification The notification to check.
-     * @return {boolean} Whether the notification click is handled by this handler
+     * @param notification The notification to check.
+     * @return Whether the notification click is handled by this handler
      */
     handles(notification: any): boolean | Promise<boolean> {
         if (this.utils.isTrueOrOne(notification.notif) && notification.name != 'messagecontactrequests') {
@@ -48,8 +48,8 @@ export class AddonMessagesPushClickHandler implements CorePushNotificationsClick
     /**
      * Handle the notification click.
      *
-     * @param {any} notification The notification to check.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param notification The notification to check.
+     * @return Promise resolved when done.
      */
     handleClick(notification: any): Promise<any> {
         return this.messagesProvider.invalidateDiscussionsCache(notification.site).catch(() => {
diff --git a/src/addon/messages/providers/settings-handler.ts b/src/addon/messages/providers/settings-handler.ts
index 06a8cdbc3..870df829b 100644
--- a/src/addon/messages/providers/settings-handler.ts
+++ b/src/addon/messages/providers/settings-handler.ts
@@ -30,7 +30,7 @@ export class AddonMessagesSettingsHandler implements CoreSettingsHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean | Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.messagesProvider.isMessagePreferencesEnabled();
@@ -39,7 +39,7 @@ export class AddonMessagesSettingsHandler implements CoreSettingsHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreSettingsHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(): CoreSettingsHandlerData {
         return {
diff --git a/src/addon/messages/providers/sync-cron-handler.ts b/src/addon/messages/providers/sync-cron-handler.ts
index 466a593c3..585414b39 100644
--- a/src/addon/messages/providers/sync-cron-handler.ts
+++ b/src/addon/messages/providers/sync-cron-handler.ts
@@ -29,9 +29,9 @@ export class AddonMessagesSyncCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         return this.messagesSync.syncAllDiscussions(siteId);
@@ -40,7 +40,7 @@ export class AddonMessagesSyncCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return 300000; // 5 minutes.
diff --git a/src/addon/messages/providers/sync.ts b/src/addon/messages/providers/sync.ts
index d8e46f6e8..6c7d33886 100644
--- a/src/addon/messages/providers/sync.ts
+++ b/src/addon/messages/providers/sync.ts
@@ -46,9 +46,9 @@ export class AddonMessagesSyncProvider extends CoreSyncBaseProvider {
     /**
      * Get the ID of a discussion sync.
      *
-     * @param {number} conversationId Conversation ID.
-     * @param {number} userId User ID talking to (if no conversation ID).
-     * @return {string} Sync ID.
+     * @param conversationId Conversation ID.
+     * @param userId User ID talking to (if no conversation ID).
+     * @return Sync ID.
      */
     protected getSyncId(conversationId: number, userId: number): string {
         if (conversationId) {
@@ -61,10 +61,10 @@ export class AddonMessagesSyncProvider extends CoreSyncBaseProvider {
     /**
      * Try to synchronize all the discussions in a certain site or in all sites.
      *
-     * @param  {string} [siteId]                   Site ID to sync. If not defined, sync all sites.
-     * @param  {boolean} [onlyDeviceOffline=false] True to only sync discussions that failed because device was offline,
-     *                                             false to sync all.
-     * @return {Promise<any>}                      Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param onlyDeviceOffline True to only sync discussions that failed because device was offline,
+     *                          false to sync all.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     syncAllDiscussions(siteId?: string, onlyDeviceOffline: boolean = false): Promise<any> {
         const syncFunctionLog = 'all discussions' + (onlyDeviceOffline ? ' (Only offline)' : '');
@@ -75,9 +75,9 @@ export class AddonMessagesSyncProvider extends CoreSyncBaseProvider {
     /**
      * Get all messages pending to be sent in the site.
      *
-     * @param {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} [onlyDeviceOffline=false] True to only sync discussions that failed because device was offline.
-     * @param {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param onlyDeviceOffline True to only sync discussions that failed because device was offline.
+     * @param Promise resolved if sync is successful, rejected if sync fails.
      */
     protected syncAllDiscussionsFunc(siteId?: string, onlyDeviceOffline: boolean = false): Promise<any> {
         const promise = onlyDeviceOffline ?
@@ -132,9 +132,9 @@ export class AddonMessagesSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize a discussion.
      *
-     * @param {number} conversationId Conversation ID.
-     * @param {number} userId User ID talking to (if no conversation ID).
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected otherwise.
+     * @param conversationId Conversation ID.
+     * @param userId User ID talking to (if no conversation ID).
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     syncDiscussion(conversationId: number, userId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -245,11 +245,11 @@ export class AddonMessagesSyncProvider extends CoreSyncBaseProvider {
     /**
      * Handle sync errors.
      *
-     * @param {number} conversationId Conversation ID.
-     * @param {number} userId User ID talking to (if no conversation ID).
-     * @param {any[]} errors List of errors.
-     * @param {any[]} warnings Array where to place the warnings.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param conversationId Conversation ID.
+     * @param userId User ID talking to (if no conversation ID).
+     * @param errors List of errors.
+     * @param warnings Array where to place the warnings.
+     * @return Promise resolved when done.
      */
     protected handleSyncErrors(conversationId: number, userId: number, errors: any[], warnings: any[]): Promise<any> {
         if (errors && errors.length) {
@@ -289,10 +289,10 @@ export class AddonMessagesSyncProvider extends CoreSyncBaseProvider {
      * If there's an ongoing sync for a certain conversation, wait for it to end.
      * If there's no sync ongoing the promise will be resolved right away.
      *
-     * @param {number} conversationId Conversation ID.
-     * @param {number} userId User ID talking to (if no conversation ID).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when there's no sync going on for the identifier.
+     * @param conversationId Conversation ID.
+     * @param userId User ID talking to (if no conversation ID).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when there's no sync going on for the identifier.
      */
     waitForSyncConversation(conversationId: number, userId: number, siteId?: string): Promise<any> {
         const syncId = this.getSyncId(conversationId, userId);
diff --git a/src/addon/messages/providers/user-add-contact-handler.ts b/src/addon/messages/providers/user-add-contact-handler.ts
index 903d2b2e2..913695dd9 100644
--- a/src/addon/messages/providers/user-add-contact-handler.ts
+++ b/src/addon/messages/providers/user-add-contact-handler.ts
@@ -28,7 +28,6 @@ import { TranslateService } from '@ngx-translate/core';
 export class AddonMessagesAddContactUserHandler implements CoreUserProfileHandler, OnDestroy {
     /**
      * Update handler information event.
-     * @type {string}
      */
     static UPDATED_EVENT = 'AddonMessagesAddContactUserHandler_updated_event';
 
@@ -51,7 +50,7 @@ export class AddonMessagesAddContactUserHandler implements CoreUserProfileHandle
     /**
      * Check if handler is enabled.
      *
-     * @return {Promise<boolean>} Promise resolved with true if enabled, rejected or resolved with false otherwise.
+     * @return Promise resolved with true if enabled, rejected or resolved with false otherwise.
      */
     isEnabled(): Promise<boolean> {
         return this.messagesProvider.isPluginEnabled();
@@ -60,11 +59,11 @@ export class AddonMessagesAddContactUserHandler implements CoreUserProfileHandle
     /**
      * Check if handler is enabled for this user in this context.
      *
-     * @param {any} user          User to check.
-     * @param {number} courseId   Course ID.
-     * @param  {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param  {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return  {boolean|Promise<boolean>}   Promise resolved with true if enabled, resolved with false otherwise.
+     * @param user User to check.
+     * @param courseId Course ID.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved with true if enabled, resolved with false otherwise.
      */
     isEnabledForUser(user: any, courseId: number, navOptions?: any, admOptions?: any): boolean | Promise<boolean> {
         return user.id != this.sitesProvider.getCurrentSiteUserId();
@@ -73,7 +72,7 @@ export class AddonMessagesAddContactUserHandler implements CoreUserProfileHandle
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreUserProfileHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(user: any, courseId: number): CoreUserProfileHandlerData {
         this.checkButton(user.id);
@@ -119,8 +118,8 @@ export class AddonMessagesAddContactUserHandler implements CoreUserProfileHandle
 
     /**
      * Update Button with avalaible data.
-     * @param {number} userId User Id to update.
-     * @return {Promise<void>}   Promise resolved when done.
+     * @param userId User Id to update.
+     * @return Promise resolved when done.
      */
     protected checkButton(userId: number): Promise<void> {
         this.updateButton(userId, {spinner: true});
@@ -154,8 +153,8 @@ export class AddonMessagesAddContactUserHandler implements CoreUserProfileHandle
     /**
      * Triggers the event to update the handler information.
      *
-     * @param {number} userId The user ID the handler belongs to.
-     * @param {any} data Data that should be updated.
+     * @param userId The user ID the handler belongs to.
+     * @param data Data that should be updated.
      */
     protected updateButton(userId: number, data: any): void {
         // This fails for some reason, let's just hide the button.
@@ -165,8 +164,8 @@ export class AddonMessagesAddContactUserHandler implements CoreUserProfileHandle
     /**
      * Add a contact or send a contact request if group messaging is enabled.
      *
-     * @param {any} user User to add as contact.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param user User to add as contact.
+     * @return Promise resolved when done.
      */
     protected addContact(user: any): Promise<any> {
         if (!this.messagesProvider.isGroupMessagingEnabled()) {
diff --git a/src/addon/messages/providers/user-block-contact-handler.ts b/src/addon/messages/providers/user-block-contact-handler.ts
index 0b325420c..d3c36e730 100644
--- a/src/addon/messages/providers/user-block-contact-handler.ts
+++ b/src/addon/messages/providers/user-block-contact-handler.ts
@@ -28,7 +28,6 @@ import { TranslateService } from '@ngx-translate/core';
 export class AddonMessagesBlockContactUserHandler implements CoreUserProfileHandler, OnDestroy {
     /**
      * Update handler information event.
-     * @type {string}
      */
     static UPDATED_EVENT = 'AddonMessagesBlockContactUserHandler_updated_event';
 
@@ -51,7 +50,7 @@ export class AddonMessagesBlockContactUserHandler implements CoreUserProfileHand
     /**
      * Check if handler is enabled.
      *
-     * @return {Promise<boolean>} Promise resolved with true if enabled, rejected or resolved with false otherwise.
+     * @return Promise resolved with true if enabled, rejected or resolved with false otherwise.
      */
     isEnabled(): Promise<boolean> {
         return this.messagesProvider.isPluginEnabled();
@@ -60,11 +59,11 @@ export class AddonMessagesBlockContactUserHandler implements CoreUserProfileHand
     /**
      * Check if handler is enabled for this user in this context.
      *
-     * @param {any} user          User to check.
-     * @param {number} courseId   Course ID.
-     * @param  {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param  {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return  {boolean|Promise<boolean>}   Promise resolved with true if enabled, resolved with false otherwise.
+     * @param user User to check.
+     * @param courseId Course ID.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved with true if enabled, resolved with false otherwise.
      */
     isEnabledForUser(user: any, courseId: number, navOptions?: any, admOptions?: any): boolean | Promise<boolean> {
         return user.id != this.sitesProvider.getCurrentSiteUserId();
@@ -73,7 +72,7 @@ export class AddonMessagesBlockContactUserHandler implements CoreUserProfileHand
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreUserProfileHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(user: any, courseId: number): CoreUserProfileHandlerData {
 
@@ -125,8 +124,8 @@ export class AddonMessagesBlockContactUserHandler implements CoreUserProfileHand
 
     /**
      * Update Button with avalaible data.
-     * @param {number} userId User Id to update.
-     * @return {Promise<void>}   Promise resolved when done.
+     * @param userId User Id to update.
+     * @return Promise resolved when done.
      */
     protected checkButton(userId: number): Promise<void> {
         this.updateButton(userId, {spinner: true});
@@ -158,8 +157,8 @@ export class AddonMessagesBlockContactUserHandler implements CoreUserProfileHand
     /**
      * Triggers the event to update the handler information.
      *
-     * @param {number} userId The user ID the handler belongs to.
-     * @param {any} data Data that should be updated.
+     * @param userId The user ID the handler belongs to.
+     * @param data Data that should be updated.
      */
     protected updateButton(userId: number, data: any): void {
         // This fails for some reason, let's just hide the button.
diff --git a/src/addon/messages/providers/user-send-message-handler.ts b/src/addon/messages/providers/user-send-message-handler.ts
index 8fd8982d9..86759fb60 100644
--- a/src/addon/messages/providers/user-send-message-handler.ts
+++ b/src/addon/messages/providers/user-send-message-handler.ts
@@ -33,7 +33,7 @@ export class AddonMessagesSendMessageUserHandler implements CoreUserProfileHandl
     /**
      * Check if handler is enabled.
      *
-     * @return {Promise<any>} Promise resolved with true if enabled, rejected or resolved with false otherwise.
+     * @return Promise resolved with true if enabled, rejected or resolved with false otherwise.
      */
     isEnabled(): Promise<any> {
         return this.messagesProvider.isPluginEnabled();
@@ -42,11 +42,11 @@ export class AddonMessagesSendMessageUserHandler implements CoreUserProfileHandl
     /**
      * Check if handler is enabled for this user in this context.
      *
-     * @param {any} user          User to check.
-     * @param {number} courseId   Course ID.
-     * @param  {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param  {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return  {boolean|Promise<boolean>}   Promise resolved with true if enabled, resolved with false otherwise.
+     * @param user User to check.
+     * @param courseId Course ID.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved with true if enabled, resolved with false otherwise.
      */
     isEnabledForUser(user: any, courseId: number, navOptions?: any, admOptions?: any): boolean | Promise<boolean> {
         const currentSite = this.sitesProvider.getCurrentSite();
@@ -62,7 +62,7 @@ export class AddonMessagesSendMessageUserHandler implements CoreUserProfileHandl
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreUserProfileHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(user: any, courseId: number): CoreUserProfileHandlerData {
         return {
diff --git a/src/addon/mod/assign/classes/base-feedback-handler.ts b/src/addon/mod/assign/classes/base-feedback-handler.ts
index 61b9addbc..33e08c2d4 100644
--- a/src/addon/mod/assign/classes/base-feedback-handler.ts
+++ b/src/addon/mod/assign/classes/base-feedback-handler.ts
@@ -31,10 +31,10 @@ export class AddonModAssignBaseFeedbackHandler implements AddonModAssignFeedback
     /**
      * Discard the draft data of the feedback plugin.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     discardDraft(assignId: number, userId: number, siteId?: string): void | Promise<any> {
         // Nothing to do.
@@ -44,9 +44,9 @@ export class AddonModAssignBaseFeedbackHandler implements AddonModAssignFeedback
      * Return the Component to use to display the plugin data.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} plugin The plugin object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param plugin The plugin object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any): any | Promise<any> {
         // Nothing to do.
@@ -55,10 +55,10 @@ export class AddonModAssignBaseFeedbackHandler implements AddonModAssignFeedback
     /**
      * Return the draft saved data of the feedback plugin.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {any|Promise<any>} Data (or promise resolved with the data).
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Data (or promise resolved with the data).
      */
     getDraft(assignId: number, userId: number, siteId?: string): any | Promise<any> {
         // Nothing to do.
@@ -68,11 +68,11 @@ export class AddonModAssignBaseFeedbackHandler implements AddonModAssignFeedback
      * Get files used by this plugin.
      * The files returned by this function will be prefetched when the user prefetches the assign.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {any[]|Promise<any[]>} The files (or promise resolved with the files).
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return The files (or promise resolved with the files).
      */
     getPluginFiles(assign: any, submission: any, plugin: any, siteId?: string): any[] | Promise<any[]> {
         return [];
@@ -81,8 +81,8 @@ export class AddonModAssignBaseFeedbackHandler implements AddonModAssignFeedback
     /**
      * Get a readable name to use for the plugin.
      *
-     * @param {any} plugin The plugin object.
-     * @return {string} The plugin name.
+     * @param plugin The plugin object.
+     * @return The plugin name.
      */
     getPluginName(plugin: any): string {
         // Check if there's a translated string for the plugin.
@@ -103,11 +103,11 @@ export class AddonModAssignBaseFeedbackHandler implements AddonModAssignFeedback
     /**
      * Check if the feedback data has changed for this plugin.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the feedback.
-     * @return {boolean|Promise<boolean>} Boolean (or promise resolved with boolean): whether the data has changed.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the feedback.
+     * @return Boolean (or promise resolved with boolean): whether the data has changed.
      */
     hasDataChanged(assign: any, submission: any, plugin: any, inputData: any): boolean | Promise<boolean> {
         return false;
@@ -116,10 +116,10 @@ export class AddonModAssignBaseFeedbackHandler implements AddonModAssignFeedback
     /**
      * Check whether the plugin has draft data stored.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean|Promise<boolean>} Boolean or promise resolved with boolean: whether the plugin has draft data.
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Boolean or promise resolved with boolean: whether the plugin has draft data.
      */
     hasDraftData(assignId: number, userId: number, siteId?: string): boolean | Promise<boolean> {
         return false;
@@ -128,7 +128,7 @@ export class AddonModAssignBaseFeedbackHandler implements AddonModAssignFeedback
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -138,11 +138,11 @@ export class AddonModAssignBaseFeedbackHandler implements AddonModAssignFeedback
      * Prefetch any required data for the plugin.
      * This should NOT prefetch files. Files to be prefetched should be returned by the getPluginFiles function.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     prefetch(assign: any, submission: any, plugin: any, siteId?: string): Promise<any> {
         return Promise.resolve();
@@ -151,12 +151,12 @@ export class AddonModAssignBaseFeedbackHandler implements AddonModAssignFeedback
     /**
      * Prepare and add to pluginData the data to send to the server based on the draft data saved.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {any} plugin The plugin object.
-     * @param {any} pluginData Object where to store the data to send.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param plugin The plugin object.
+     * @param pluginData Object where to store the data to send.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     prepareFeedbackData(assignId: number, userId: number, plugin: any, pluginData: any, siteId?: string): void | Promise<any> {
         // Nothing to do.
@@ -165,12 +165,12 @@ export class AddonModAssignBaseFeedbackHandler implements AddonModAssignFeedback
     /**
      * Save draft data of the feedback plugin.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {any} plugin The plugin object.
-     * @param {any} data The data to save.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param plugin The plugin object.
+     * @param data The data to save.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     saveDraft(assignId: number, userId: number, plugin: any, data: any, siteId?: string): void | Promise<any> {
         // Nothing to do.
diff --git a/src/addon/mod/assign/classes/base-submission-handler.ts b/src/addon/mod/assign/classes/base-submission-handler.ts
index 7f3d52bdf..e0e6bb34e 100644
--- a/src/addon/mod/assign/classes/base-submission-handler.ts
+++ b/src/addon/mod/assign/classes/base-submission-handler.ts
@@ -33,10 +33,10 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
      * plugin uses Moodle filters. The reason is that the app only prefetches filtered data, and the user should edit
      * unfiltered data.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @return {boolean|Promise<boolean>} Boolean or promise resolved with boolean: whether it can be edited in offline.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @return Boolean or promise resolved with boolean: whether it can be edited in offline.
      */
     canEditOffline(assign: any, submission: any, plugin: any): boolean | Promise<boolean> {
         return false;
@@ -45,10 +45,10 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
     /**
      * Should clear temporary data for a cancelled submission.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the submission.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the submission.
      */
     clearTmpData(assign: any, submission: any, plugin: any, inputData: any): void {
         // Nothing to do.
@@ -58,12 +58,12 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
      * This function will be called when the user wants to create a new submission based on the previous one.
      * It should add to pluginData the data to send to server based in the data in plugin (previous attempt).
      *
-     * @param {any} assign The assignment.
-     * @param {any} plugin The plugin object.
-     * @param {any} pluginData Object where to store the data to send.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assign The assignment.
+     * @param plugin The plugin object.
+     * @param pluginData Object where to store the data to send.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     copySubmissionData(assign: any, plugin: any, pluginData: any, userId?: number, siteId?: string): void | Promise<any> {
         // Nothing to do.
@@ -72,12 +72,12 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
     /**
      * Delete any stored data for the plugin and submission.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} offlineData Offline data stored.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param offlineData Offline data stored.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     deleteOfflineData(assign: any, submission: any, plugin: any, offlineData: any, siteId?: string): void | Promise<any> {
         // Nothing to do.
@@ -87,10 +87,10 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
      * Return the Component to use to display the plugin data, either in read or in edit mode.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} plugin The plugin object.
-     * @param {boolean} [edit] Whether the user is editing.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param plugin The plugin object.
+     * @param edit Whether the user is editing.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any, edit?: boolean): any | Promise<any> {
         // Nothing to do.
@@ -100,11 +100,11 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
      * Get files used by this plugin.
      * The files returned by this function will be prefetched when the user prefetches the assign.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {any[]|Promise<any[]>} The files (or promise resolved with the files).
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return The files (or promise resolved with the files).
      */
     getPluginFiles(assign: any, submission: any, plugin: any, siteId?: string): any[] | Promise<any[]> {
         return [];
@@ -113,8 +113,8 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
     /**
      * Get a readable name to use for the plugin.
      *
-     * @param {any} plugin The plugin object.
-     * @return {string} The plugin name.
+     * @param plugin The plugin object.
+     * @return The plugin name.
      */
     getPluginName(plugin: any): string {
         // Check if there's a translated string for the plugin.
@@ -135,9 +135,9 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
     /**
      * Get the size of data (in bytes) this plugin will send to copy a previous submission.
      *
-     * @param {any} assign The assignment.
-     * @param {any} plugin The plugin object.
-     * @return {number|Promise<number>} The size (or promise resolved with size).
+     * @param assign The assignment.
+     * @param plugin The plugin object.
+     * @return The size (or promise resolved with size).
      */
     getSizeForCopy(assign: any, plugin: any): number | Promise<number> {
         return 0;
@@ -146,9 +146,9 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
     /**
      * Get the size of data (in bytes) this plugin will send to add or edit a submission.
      *
-     * @param {any} assign The assignment.
-     * @param {any} plugin The plugin object.
-     * @return {number|Promise<number>} The size (or promise resolved with size).
+     * @param assign The assignment.
+     * @param plugin The plugin object.
+     * @return The size (or promise resolved with size).
      */
     getSizeForEdit(assign: any, plugin: any): number | Promise<number> {
         return 0;
@@ -157,11 +157,11 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
     /**
      * Check if the submission data has changed for this plugin.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the submission.
-     * @return {boolean|Promise<boolean>} Boolean (or promise resolved with boolean): whether the data has changed.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the submission.
+     * @return Boolean (or promise resolved with boolean): whether the data has changed.
      */
     hasDataChanged(assign: any, submission: any, plugin: any, inputData: any): boolean | Promise<boolean> {
         return false;
@@ -170,7 +170,7 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -178,7 +178,7 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
 
     /**
      * Whether or not the handler is enabled for edit on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled for edit on a site level.
+     * @return Whether or not the handler is enabled for edit on a site level.
      */
     isEnabledForEdit(): boolean | Promise<boolean> {
         return false;
@@ -188,11 +188,11 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
      * Prefetch any required data for the plugin.
      * This should NOT prefetch files. Files to be prefetched should be returned by the getPluginFiles function.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     prefetch(assign: any, submission: any, plugin: any, siteId?: string): Promise<any> {
         return Promise.resolve();
@@ -201,15 +201,15 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
     /**
      * Prepare and add to pluginData the data to send to the server based on the input data.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the submission.
-     * @param {any} pluginData Object where to store the data to send.
-     * @param {boolean} [offline] Whether the user is editing in offline.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the submission.
+     * @param pluginData Object where to store the data to send.
+     * @param offline Whether the user is editing in offline.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     prepareSubmissionData?(assign: any, submission: any, plugin: any, inputData: any, pluginData: any, offline?: boolean,
             userId?: number, siteId?: string): void | Promise<any> {
@@ -220,13 +220,13 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
      * Prepare and add to pluginData the data to send to the server based on the offline data stored.
      * This will be used when performing a synchronization.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} offlineData Offline data stored.
-     * @param {any} pluginData Object where to store the data to send.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param offlineData Offline data stored.
+     * @param pluginData Object where to store the data to send.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     prepareSyncData?(assign: any, submission: any, plugin: any, offlineData: any, pluginData: any, siteId?: string)
             : void | Promise<any> {
diff --git a/src/addon/mod/assign/classes/feedback-plugin-component.ts b/src/addon/mod/assign/classes/feedback-plugin-component.ts
index dfb9250cd..d315d1b7f 100644
--- a/src/addon/mod/assign/classes/feedback-plugin-component.ts
+++ b/src/addon/mod/assign/classes/feedback-plugin-component.ts
@@ -32,7 +32,7 @@ export class AddonModAssignFeedbackPluginComponentBase {
     /**
      * Open a modal to edit the feedback plugin.
      *
-     * @return {Promise<any>} Promise resolved with the input data, rejected if cancelled.
+     * @return Promise resolved with the input data, rejected if cancelled.
      */
     editFeedback(): Promise<any> {
         if (this.canEdit) {
@@ -62,7 +62,7 @@ export class AddonModAssignFeedbackPluginComponentBase {
     /**
      * Invalidate the data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     invalidate(): Promise<any> {
         return Promise.resolve();
diff --git a/src/addon/mod/assign/classes/submission-plugin-component.ts b/src/addon/mod/assign/classes/submission-plugin-component.ts
index 35e750585..39e8cdd2b 100644
--- a/src/addon/mod/assign/classes/submission-plugin-component.ts
+++ b/src/addon/mod/assign/classes/submission-plugin-component.ts
@@ -32,7 +32,7 @@ export class AddonModAssignSubmissionPluginComponent {
     /**
      * Invalidate the data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     invalidate(): Promise<any> {
         return Promise.resolve();
diff --git a/src/addon/mod/assign/components/feedback-plugin/feedback-plugin.ts b/src/addon/mod/assign/components/feedback-plugin/feedback-plugin.ts
index 82b9511bb..94b847fda 100644
--- a/src/addon/mod/assign/components/feedback-plugin/feedback-plugin.ts
+++ b/src/addon/mod/assign/components/feedback-plugin/feedback-plugin.ts
@@ -96,7 +96,7 @@ export class AddonModAssignFeedbackPluginComponent implements OnInit {
     /**
      * Invalidate the plugin data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     invalidate(): Promise<any> {
         return Promise.resolve(this.dynamicComponent && this.dynamicComponent.callComponentFunction('invalidate', []));
diff --git a/src/addon/mod/assign/components/index/index.ts b/src/addon/mod/assign/components/index/index.ts
index 26d57888e..2697f6c36 100644
--- a/src/addon/mod/assign/components/index/index.ts
+++ b/src/addon/mod/assign/components/index/index.ts
@@ -141,10 +141,10 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Get assignment data.
      *
-     * @param {boolean} [refresh=false] If it's refreshing content.
-     * @param {boolean} [sync=false] If it should try to sync.
-     * @param {boolean} [showErrors=false] If show errors to the user of hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh If it's refreshing content.
+     * @param sync If it should try to sync.
+     * @param showErrors If show errors to the user of hide them.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<any> {
 
@@ -228,8 +228,8 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Set group to see the summary.
      *
-     * @param  {number}       groupId Group ID.
-     * @return {Promise<any>}         Resolved when done.
+     * @param groupId Group ID.
+     * @return Resolved when done.
      */
     setGroup(groupId: number): Promise<any> {
         this.group = groupId;
@@ -245,8 +245,8 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Go to view a list of submissions.
      *
-     * @param {string} status Status to see.
-     * @param {number} count Number of submissions with the status.
+     * @param status Status to see.
+     * @param count Number of submissions with the status.
      */
     goToSubmissionList(status: string, count: number): void {
         if (typeof status == 'undefined') {
@@ -270,8 +270,8 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Checks if sync has succeed from result sync data.
      *
-     * @param {any} result Data returned by the sync function.
-     * @return {boolean} If succeed or not.
+     * @param result Data returned by the sync function.
+     * @return If succeed or not.
      */
     protected hasSyncSucceed(result: any): boolean {
         if (result.updated) {
@@ -284,7 +284,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         const promises = [];
@@ -325,8 +325,8 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Compares sync event data with current data to check if refresh content is needed.
      *
-     * @param {any} syncEventData Data receiven on sync observer.
-     * @return {boolean}          True if refresh is needed, false otherwise.
+     * @param syncEventData Data receiven on sync observer.
+     * @return True if refresh is needed, false otherwise.
      */
     protected isRefreshSyncNeeded(syncEventData: any): boolean {
         if (this.assign && syncEventData.assignId == this.assign.id) {
@@ -344,7 +344,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Performs the sync of the activity.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected sync(): Promise<any> {
         return this.syncProvider.syncAssign(this.assign.id);
diff --git a/src/addon/mod/assign/components/submission-plugin/submission-plugin.ts b/src/addon/mod/assign/components/submission-plugin/submission-plugin.ts
index 3d4d0dba5..f8ba6d005 100644
--- a/src/addon/mod/assign/components/submission-plugin/submission-plugin.ts
+++ b/src/addon/mod/assign/components/submission-plugin/submission-plugin.ts
@@ -90,7 +90,7 @@ export class AddonModAssignSubmissionPluginComponent implements OnInit {
     /**
      * Invalidate the plugin data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     invalidate(): Promise<any> {
         return Promise.resolve(this.dynamicComponent && this.dynamicComponent.callComponentFunction('invalidate', []));
diff --git a/src/addon/mod/assign/components/submission/submission.ts b/src/addon/mod/assign/components/submission/submission.ts
index 49489a9a5..762270fb6 100644
--- a/src/addon/mod/assign/components/submission/submission.ts
+++ b/src/addon/mod/assign/components/submission/submission.ts
@@ -131,7 +131,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
     /**
      * Calculate the time remaining message and class.
      *
-     * @param {any} response Response of get submission status.
+     * @param response Response of get submission status.
      */
     protected calculateTimeRemaining(response: any): void {
         if (this.assign.duedate > 0) {
@@ -178,7 +178,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
     /**
      * Check if the user can leave the view. If there are changes to be saved, it will ask for confirm.
      *
-     * @return {Promise<void>} Promise resolved if can leave the view, rejected otherwise.
+     * @return Promise resolved if can leave the view, rejected otherwise.
      */
     canLeave(): Promise<void> {
         // Check if there is data to save.
@@ -252,7 +252,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
     /**
      * Discard feedback drafts.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected discardDrafts(): Promise<any> {
         if (this.feedback && this.feedback.plugins) {
@@ -277,7 +277,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
     /**
      * Check if there's data to save (grade).
      *
-     * @return {Promise<boolean>} Promise resolved with boolean: whether there's data to save.
+     * @return Promise resolved with boolean: whether there's data to save.
      */
     protected hasDataToSave(): Promise<boolean> {
         if (!this.canSaveGrades || !this.loaded) {
@@ -329,7 +329,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
     /**
      * Invalidate and refresh data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     invalidateAndRefresh(): Promise<any> {
         this.loaded = false;
@@ -363,7 +363,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
     /**
      * Load the data to render the submission.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected loadData(): Promise<any> {
         let isBlind = !!this.blindId;
@@ -458,8 +458,8 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
     /**
      * Load the data to render the feedback and grade.
      *
-     * @param {any} feedback The feedback data from the submission status.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param feedback The feedback data from the submission status.
+     * @return Promise resolved when done.
      */
     protected loadFeedback(feedback: any): Promise<any> {
         this.grade = {
@@ -623,7 +623,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
     /**
      * Set the submission status name and class.
      *
-     * @param {any} status Submission status.
+     * @param status Submission status.
      */
     protected setStatusNameAndClass(status: any): void {
         if (this.hasOffline || this.submittedOffline) {
@@ -679,7 +679,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
     /**
      * Submit for grading.
      *
-     * @param {boolean} acceptStatement Whether the statement has been accepted.
+     * @param acceptStatement Whether the statement has been accepted.
      */
     submitForGrading(acceptStatement: boolean): void {
         if (this.assign.requiresubmissionstatement && !acceptStatement) {
@@ -712,7 +712,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
     /**
      * Submit a grade and feedback.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     submitGrade(): Promise<any> {
         // Check if there's something to be saved.
@@ -774,7 +774,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
     /**
      * Treat the grade info.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected treatGradeInfo(): Promise<any> {
         // Check if grading method is simple or not.
@@ -857,8 +857,8 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
     /**
      * Treat the last attempt.
      *
-     * @param {any} response Response of get submission status.
-     * @param {any[]} promises List where to add the promises.
+     * @param response Response of get submission status.
+     * @param promises List where to add the promises.
      */
     protected treatLastAttempt(response: any, promises: any[]): void {
         if (!response.lastattempt) {
diff --git a/src/addon/mod/assign/feedback/comments/component/comments.ts b/src/addon/mod/assign/feedback/comments/component/comments.ts
index 910eec587..4a0edfac3 100644
--- a/src/addon/mod/assign/feedback/comments/component/comments.ts
+++ b/src/addon/mod/assign/feedback/comments/component/comments.ts
@@ -98,7 +98,7 @@ export class AddonModAssignFeedbackCommentsComponent extends AddonModAssignFeedb
     /**
      * Get the text for the plugin.
      *
-     * @return {Promise<string>} Promise resolved with the text.
+     * @return Promise resolved with the text.
      */
     protected getText(): Promise<string> {
         // Check if the user already modified the comment.
@@ -133,8 +133,8 @@ export class AddonModAssignFeedbackCommentsComponent extends AddonModAssignFeedb
     /**
      * Replace @@PLUGINFILE@@ wildcards with the real URL of embedded files.
      *
-     * @param {string} Text to treat.
-     * @return {string} Treated text.
+     * @param Text to treat.
+     * @return Treated text.
      */
     replacePluginfileUrls(text: string): string {
         const files = this.plugin.fileareas && this.plugin.fileareas[0] && this.plugin.fileareas[0].files;
diff --git a/src/addon/mod/assign/feedback/comments/providers/handler.ts b/src/addon/mod/assign/feedback/comments/providers/handler.ts
index 55c003d9a..ef4e1655b 100644
--- a/src/addon/mod/assign/feedback/comments/providers/handler.ts
+++ b/src/addon/mod/assign/feedback/comments/providers/handler.ts
@@ -37,10 +37,10 @@ export class AddonModAssignFeedbackCommentsHandler implements AddonModAssignFeed
     /**
      * Discard the draft data of the feedback plugin.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     discardDraft(assignId: number, userId: number, siteId?: string): void | Promise<any> {
         const id = this.getDraftId(assignId, userId, siteId);
@@ -53,9 +53,9 @@ export class AddonModAssignFeedbackCommentsHandler implements AddonModAssignFeed
      * Return the Component to use to display the plugin data, either in read or in edit mode.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} plugin The plugin object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param plugin The plugin object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any): any | Promise<any> {
         return AddonModAssignFeedbackCommentsComponent;
@@ -64,10 +64,10 @@ export class AddonModAssignFeedbackCommentsHandler implements AddonModAssignFeed
     /**
      * Return the draft saved data of the feedback plugin.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {any|Promise<any>} Data (or promise resolved with the data).
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Data (or promise resolved with the data).
      */
     getDraft(assignId: number, userId: number, siteId?: string): any | Promise<any> {
         const id = this.getDraftId(assignId, userId, siteId);
@@ -80,10 +80,10 @@ export class AddonModAssignFeedbackCommentsHandler implements AddonModAssignFeed
     /**
      * Get a draft ID.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {string} Draft ID.
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Draft ID.
      */
     protected getDraftId(assignId: number, userId: number, siteId?: string): string {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -95,11 +95,11 @@ export class AddonModAssignFeedbackCommentsHandler implements AddonModAssignFeed
      * Get files used by this plugin.
      * The files returned by this function will be prefetched when the user prefetches the assign.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {any[]|Promise<any[]>} The files (or promise resolved with the files).
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return The files (or promise resolved with the files).
      */
     getPluginFiles(assign: any, submission: any, plugin: any, siteId?: string): any[] | Promise<any[]> {
         return this.assignProvider.getSubmissionPluginAttachments(plugin);
@@ -108,10 +108,10 @@ export class AddonModAssignFeedbackCommentsHandler implements AddonModAssignFeed
     /**
      * Get the text to submit.
      *
-     * @param {CoreTextUtilsProvider} textUtils Text utils instance.
-     * @param {any} plugin Plugin.
-     * @param {any} inputData Data entered in the feedback edit form.
-     * @return {string} Text to submit.
+     * @param textUtils Text utils instance.
+     * @param plugin Plugin.
+     * @param inputData Data entered in the feedback edit form.
+     * @return Text to submit.
      */
     static getTextFromInputData(textUtils: CoreTextUtilsProvider, plugin: any, inputData: any): string {
         const files = plugin.fileareas && plugin.fileareas[0] ? plugin.fileareas[0].files : [];
@@ -128,12 +128,12 @@ export class AddonModAssignFeedbackCommentsHandler implements AddonModAssignFeed
     /**
      * Check if the feedback data has changed for this plugin.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the feedback.
-     * @param {number} userId User ID of the submission.
-     * @return {boolean|Promise<boolean>} Boolean (or promise resolved with boolean): whether the data has changed.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the feedback.
+     * @param userId User ID of the submission.
+     * @return Boolean (or promise resolved with boolean): whether the data has changed.
      */
     hasDataChanged(assign: any, submission: any, plugin: any, inputData: any, userId: number): boolean | Promise<boolean> {
         // Get it from plugin or offline.
@@ -161,10 +161,10 @@ export class AddonModAssignFeedbackCommentsHandler implements AddonModAssignFeed
     /**
      * Check whether the plugin has draft data stored.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean|Promise<boolean>} Boolean or promise resolved with boolean: whether the plugin has draft data.
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Boolean or promise resolved with boolean: whether the plugin has draft data.
      */
     hasDraftData(assignId: number, userId: number, siteId?: string): boolean | Promise<boolean> {
         const draft = this.getDraft(assignId, userId, siteId);
@@ -175,7 +175,7 @@ export class AddonModAssignFeedbackCommentsHandler implements AddonModAssignFeed
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -184,12 +184,12 @@ export class AddonModAssignFeedbackCommentsHandler implements AddonModAssignFeed
     /**
      * Prepare and add to pluginData the data to send to the server based on the draft data saved.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {any} plugin The plugin object.
-     * @param {any} pluginData Object where to store the data to send.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param plugin The plugin object.
+     * @param pluginData Object where to store the data to send.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     prepareFeedbackData(assignId: number, userId: number, plugin: any, pluginData: any, siteId?: string): void | Promise<any> {
         const draft = this.getDraft(assignId, userId, siteId);
@@ -205,12 +205,12 @@ export class AddonModAssignFeedbackCommentsHandler implements AddonModAssignFeed
     /**
      * Save draft data of the feedback plugin.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {any} plugin The plugin object.
-     * @param {any} data The data to save.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param plugin The plugin object.
+     * @param data The data to save.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     saveDraft(assignId: number, userId: number, plugin: any, data: any, siteId?: string): void | Promise<any> {
         if (data) {
diff --git a/src/addon/mod/assign/feedback/editpdf/providers/handler.ts b/src/addon/mod/assign/feedback/editpdf/providers/handler.ts
index 1758fb8fe..45276e932 100644
--- a/src/addon/mod/assign/feedback/editpdf/providers/handler.ts
+++ b/src/addon/mod/assign/feedback/editpdf/providers/handler.ts
@@ -32,9 +32,9 @@ export class AddonModAssignFeedbackEditPdfHandler implements AddonModAssignFeedb
      * Return the Component to use to display the plugin data, either in read or in edit mode.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} plugin The plugin object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param plugin The plugin object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any): any | Promise<any> {
         return AddonModAssignFeedbackEditPdfComponent;
@@ -44,11 +44,11 @@ export class AddonModAssignFeedbackEditPdfHandler implements AddonModAssignFeedb
      * Get files used by this plugin.
      * The files returned by this function will be prefetched when the user prefetches the assign.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {any[]|Promise<any[]>} The files (or promise resolved with the files).
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return The files (or promise resolved with the files).
      */
     getPluginFiles(assign: any, submission: any, plugin: any, siteId?: string): any[] | Promise<any[]> {
         return this.assignProvider.getSubmissionPluginAttachments(plugin);
@@ -57,7 +57,7 @@ export class AddonModAssignFeedbackEditPdfHandler implements AddonModAssignFeedb
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/mod/assign/feedback/file/providers/handler.ts b/src/addon/mod/assign/feedback/file/providers/handler.ts
index fb3936a26..2d55cc35d 100644
--- a/src/addon/mod/assign/feedback/file/providers/handler.ts
+++ b/src/addon/mod/assign/feedback/file/providers/handler.ts
@@ -32,9 +32,9 @@ export class AddonModAssignFeedbackFileHandler implements AddonModAssignFeedback
      * Return the Component to use to display the plugin data, either in read or in edit mode.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} plugin The plugin object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param plugin The plugin object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any): any | Promise<any> {
         return AddonModAssignFeedbackFileComponent;
@@ -44,11 +44,11 @@ export class AddonModAssignFeedbackFileHandler implements AddonModAssignFeedback
      * Get files used by this plugin.
      * The files returned by this function will be prefetched when the user prefetches the assign.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {any[]|Promise<any[]>} The files (or promise resolved with the files).
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return The files (or promise resolved with the files).
      */
     getPluginFiles(assign: any, submission: any, plugin: any, siteId?: string): any[] | Promise<any[]> {
         return this.assignProvider.getSubmissionPluginAttachments(plugin);
@@ -57,7 +57,7 @@ export class AddonModAssignFeedbackFileHandler implements AddonModAssignFeedback
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.ts b/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.ts
index 08f2369bb..3c60de76e 100644
--- a/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.ts
+++ b/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.ts
@@ -47,7 +47,7 @@ export class AddonModAssignEditFeedbackModalPage {
     /**
      * Check if we can leave the page or not.
      *
-     * @return {boolean|Promise<void>} Resolved if we can leave it, rejected if not.
+     * @return Resolved if we can leave it, rejected if not.
      */
     ionViewCanLeave(): boolean | Promise<void> {
         if (this.forceLeave) {
@@ -64,7 +64,7 @@ export class AddonModAssignEditFeedbackModalPage {
     /**
      * Close modal.
      *
-     * @param {any} data Data to return to the page.
+     * @param data Data to return to the page.
      */
     closeModal(data: any): void {
         this.viewCtrl.dismiss(data);
@@ -73,7 +73,7 @@ export class AddonModAssignEditFeedbackModalPage {
     /**
      * Done editing.
      *
-     * @param {Event} e Click event.
+     * @param e Click event.
      */
     done(e: Event): void {
         e.preventDefault();
@@ -87,7 +87,7 @@ export class AddonModAssignEditFeedbackModalPage {
     /**
      * Get the input data.
      *
-     * @return {any} Object with the data.
+     * @return Object with the data.
      */
     protected getInputData(): any {
         return this.domUtils.getDataFromForm(document.forms['addon-mod_assign-edit-feedback-form']);
@@ -96,7 +96,7 @@ export class AddonModAssignEditFeedbackModalPage {
     /**
      * Check if data has changed.
      *
-     * @return {Promise<boolean>} Promise resolved with boolean: whether the data has changed.
+     * @return Promise resolved with boolean: whether the data has changed.
      */
     protected hasDataChanged(): Promise<boolean> {
         return this.feedbackDelegate.hasPluginDataChanged(this.assign, this.userId, this.plugin, this.getInputData(), this.userId)
diff --git a/src/addon/mod/assign/pages/edit/edit.ts b/src/addon/mod/assign/pages/edit/edit.ts
index f6072f48f..51f72b0a6 100644
--- a/src/addon/mod/assign/pages/edit/edit.ts
+++ b/src/addon/mod/assign/pages/edit/edit.ts
@@ -80,7 +80,7 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy {
     /**
      * Check if we can leave the page or not.
      *
-     * @return {boolean|Promise<void>} Resolved if we can leave it, rejected if not.
+     * @return Resolved if we can leave it, rejected if not.
      */
     ionViewCanLeave(): boolean | Promise<void> {
         if (this.forceLeave) {
@@ -101,7 +101,7 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy {
     /**
      * Fetch assignment data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchAssignment(): Promise<any> {
         const currentUserId = this.sitesProvider.getCurrentSiteUserId();
@@ -175,7 +175,7 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy {
     /**
      * Get the input data.
      *
-     * @return {any} Input data.
+     * @return Input data.
      */
     protected getInputData(): any {
         return this.domUtils.getDataFromForm(document.forms['addon-mod_assign-edit-form']);
@@ -184,7 +184,7 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy {
     /**
      * Check if data has changed.
      *
-     * @return {Promise<boolean>} Promise resolved with boolean: whether data has changed.
+     * @return Promise resolved with boolean: whether data has changed.
      */
     protected hasDataChanged(): Promise<boolean> {
         // Usually the hasSubmissionDataChanged call will be resolved inmediately, causing the modal to be shown just an instant.
@@ -220,8 +220,8 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy {
     /**
      * Get data to submit based on the input data.
      *
-     * @param {any} inputData The input data.
-     * @return {Promise<any>} Promise resolved with the data to submit.
+     * @param inputData The input data.
+     * @return Promise resolved with the data to submit.
      */
     protected prepareSubmissionData(inputData: any): Promise<any> {
         // If there's offline data, always save it in offline.
@@ -263,7 +263,7 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy {
     /**
      * Save the submission.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected saveSubmission(): Promise<any> {
         const inputData = this.getInputData();
diff --git a/src/addon/mod/assign/pages/index/index.ts b/src/addon/mod/assign/pages/index/index.ts
index f9b960f67..3dedd405a 100644
--- a/src/addon/mod/assign/pages/index/index.ts
+++ b/src/addon/mod/assign/pages/index/index.ts
@@ -40,7 +40,7 @@ export class AddonModAssignIndexPage {
     /**
      * Update some data based on the assign instance.
      *
-     * @param {any} assign Assign instance.
+     * @param assign Assign instance.
      */
     updateData(assign: any): void {
         this.title = assign.name || this.title;
diff --git a/src/addon/mod/assign/pages/submission-list/submission-list.ts b/src/addon/mod/assign/pages/submission-list/submission-list.ts
index a8bcf8c6d..9cc87c045 100644
--- a/src/addon/mod/assign/pages/submission-list/submission-list.ts
+++ b/src/addon/mod/assign/pages/submission-list/submission-list.ts
@@ -105,7 +105,7 @@ export class AddonModAssignSubmissionListPage implements OnInit, OnDestroy {
     /**
      * Fetch assignment data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchAssignment(): Promise<any> {
 
@@ -138,8 +138,8 @@ export class AddonModAssignSubmissionListPage implements OnInit, OnDestroy {
     /**
      * Set group to see the summary.
      *
-     * @param  {number}       groupId Group ID.
-     * @return {Promise<any>}         Resolved when done.
+     * @param groupId Group ID.
+     * @return Resolved when done.
      */
     setGroup(groupId: number): Promise<any> {
         this.groupId = groupId;
@@ -242,7 +242,7 @@ export class AddonModAssignSubmissionListPage implements OnInit, OnDestroy {
     /**
      * Load a certain submission.
      *
-     * @param {any} submission The submission to load.
+     * @param submission The submission to load.
      */
     loadSubmission(submission: any): void {
         if (this.selectedSubmissionId === submission.submitid && this.splitviewCtrl.isOn()) {
@@ -263,7 +263,7 @@ export class AddonModAssignSubmissionListPage implements OnInit, OnDestroy {
     /**
      * Refresh all the data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected refreshAllData(): Promise<any> {
         const promises = [];
@@ -284,7 +284,7 @@ export class AddonModAssignSubmissionListPage implements OnInit, OnDestroy {
     /**
      * Refresh the list.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshList(refresher: any): void {
         this.refreshAllData().finally(() => {
diff --git a/src/addon/mod/assign/pages/submission-review/submission-review.ts b/src/addon/mod/assign/pages/submission-review/submission-review.ts
index 44b0ca4a9..a3652667d 100644
--- a/src/addon/mod/assign/pages/submission-review/submission-review.ts
+++ b/src/addon/mod/assign/pages/submission-review/submission-review.ts
@@ -67,7 +67,7 @@ export class AddonModAssignSubmissionReviewPage implements OnInit {
     /**
      * Check if we can leave the page or not.
      *
-     * @return {boolean|Promise<void>} Resolved if we can leave it, rejected if not.
+     * @return Resolved if we can leave it, rejected if not.
      */
     ionViewCanLeave(): boolean | Promise<void> {
         if (!this.submissionComponent || this.forceLeave) {
@@ -95,7 +95,7 @@ export class AddonModAssignSubmissionReviewPage implements OnInit {
     /**
      * Get the submission.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchSubmission(): Promise<any> {
         return this.assignProvider.getAssignment(this.courseId, this.moduleId).then((assignment) => {
@@ -123,7 +123,7 @@ export class AddonModAssignSubmissionReviewPage implements OnInit {
     /**
      * Refresh all the data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected refreshAllData(): Promise<any> {
         const promises = [];
@@ -146,7 +146,7 @@ export class AddonModAssignSubmissionReviewPage implements OnInit {
     /**
      * Refresh the data.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshSubmission(refresher: any): void {
         this.refreshAllData().finally(() => {
diff --git a/src/addon/mod/assign/providers/assign-offline.ts b/src/addon/mod/assign/providers/assign-offline.ts
index 87d630837..f870bae6d 100644
--- a/src/addon/mod/assign/providers/assign-offline.ts
+++ b/src/addon/mod/assign/providers/assign-offline.ts
@@ -138,10 +138,10 @@ export class AddonModAssignOfflineProvider {
     /**
      * Delete a submission.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if deleted, rejected if failure.
+     * @param assignId Assignment ID.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if deleted, rejected if failure.
      */
     deleteSubmission(assignId: number, userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -155,10 +155,10 @@ export class AddonModAssignOfflineProvider {
     /**
      * Delete a submission grade.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if deleted, rejected if failure.
+     * @param assignId Assignment ID.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if deleted, rejected if failure.
      */
     deleteSubmissionGrade(assignId: number, userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -172,8 +172,8 @@ export class AddonModAssignOfflineProvider {
     /**
      * Get all the assignments ids that have something to be synced.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number[]>} Promise resolved with assignments id that have something to be synced.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with assignments id that have something to be synced.
      */
     getAllAssigns(siteId?: string): Promise<number[]> {
         const promises = [];
@@ -202,8 +202,8 @@ export class AddonModAssignOfflineProvider {
     /**
      * Get all the stored submissions from all the assignments.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]} Promise resolved with submissions.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with submissions.
      */
     protected getAllSubmissions(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
@@ -222,8 +222,8 @@ export class AddonModAssignOfflineProvider {
     /**
      * Get all the stored submissions grades from all the assignments.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with submissions grades.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with submissions grades.
      */
     protected getAllSubmissionsGrade(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
@@ -243,9 +243,9 @@ export class AddonModAssignOfflineProvider {
     /**
      * Get all the stored submissions for a certain assignment.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with submissions.
+     * @param assignId Assignment ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with submissions.
      */
     getAssignSubmissions(assignId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
@@ -264,9 +264,9 @@ export class AddonModAssignOfflineProvider {
     /**
      * Get all the stored submissions grades for a certain assignment.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with submissions grades.
+     * @param assignId Assignment ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with submissions grades.
      */
     getAssignSubmissionsGrade(assignId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
@@ -286,10 +286,10 @@ export class AddonModAssignOfflineProvider {
     /**
      * Get a stored submission.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with submission.
+     * @param assignId Assignment ID.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with submission.
      */
     getSubmission(assignId: number, userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -308,10 +308,10 @@ export class AddonModAssignOfflineProvider {
     /**
      * Get the path to the folder where to store files for an offline submission.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<string>} Promise resolved with the path.
+     * @param assignId Assignment ID.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the path.
      */
     getSubmissionFolder(assignId: number, userId?: number, siteId?: string): Promise<string> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -328,10 +328,10 @@ export class AddonModAssignOfflineProvider {
      * Get a stored submission grade.
      * Submission grades are not identified using attempt number so it can retrieve the feedback for a previous attempt.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with submission grade.
+     * @param assignId Assignment ID.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with submission grade.
      */
     getSubmissionGrade(assignId: number, userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -352,11 +352,11 @@ export class AddonModAssignOfflineProvider {
     /**
      * Get the path to the folder where to store files for a certain plugin in an offline submission.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {string} pluginName Name of the plugin. Must be unique (both in submission and feedback plugins).
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<string>} Promise resolved with the path.
+     * @param assignId Assignment ID.
+     * @param pluginName Name of the plugin. Must be unique (both in submission and feedback plugins).
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the path.
      */
     getSubmissionPluginFolder(assignId: number, pluginName: string, userId?: number, siteId?: string): Promise<string> {
         return this.getSubmissionFolder(assignId, userId, siteId).then((folderPath) => {
@@ -367,9 +367,9 @@ export class AddonModAssignOfflineProvider {
     /**
      * Check if the assignment has something to be synced.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether the assignment has something to be synced.
+     * @param assignId Assignment ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether the assignment has something to be synced.
      */
     hasAssignOfflineData(assignId: number, siteId?: string): Promise<boolean> {
         const promises = [];
@@ -396,14 +396,14 @@ export class AddonModAssignOfflineProvider {
     /**
      * Mark/Unmark a submission as being submitted.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {number} courseId Course ID the assign belongs to.
-     * @param {boolean} submitted True to mark as submitted, false to mark as not submitted.
-     * @param {boolean} acceptStatement True to accept the submission statement, false otherwise.
-     * @param {number} timemodified The time the submission was last modified in online.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if marked, rejected if failure.
+     * @param assignId Assignment ID.
+     * @param courseId Course ID the assign belongs to.
+     * @param submitted True to mark as submitted, false to mark as not submitted.
+     * @param acceptStatement True to accept the submission statement, false otherwise.
+     * @param timemodified The time the submission was last modified in online.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if marked, rejected if failure.
      */
     markSubmitted(assignId: number, courseId: number, submitted: boolean, acceptStatement: boolean, timemodified: number,
             userId?: number, siteId?: string): Promise<any> {
@@ -438,14 +438,14 @@ export class AddonModAssignOfflineProvider {
     /**
      * Save a submission to be sent later.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {number} courseId Course ID the assign belongs to.
-     * @param {any} pluginData Data to save.
-     * @param {number} timemodified The time the submission was last modified in online.
-     * @param {boolean} submitted True if submission has been submitted, false otherwise.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if stored, rejected if failure.
+     * @param assignId Assignment ID.
+     * @param courseId Course ID the assign belongs to.
+     * @param pluginData Data to save.
+     * @param timemodified The time the submission was last modified in online.
+     * @param submitted True if submission has been submitted, false otherwise.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     saveSubmission(assignId: number, courseId: number, pluginData: any, timemodified: number, submitted: boolean, userId?: number,
             siteId?: string): Promise<any> {
@@ -472,18 +472,18 @@ export class AddonModAssignOfflineProvider {
     /**
      * Save a grading to be sent later.
      *
-     * @param {number} assignId Assign ID.
-     * @param {number} userId User ID.
-     * @param {number} courseId Course ID the assign belongs to.
-     * @param {number} grade Grade to submit.
-     * @param {number} attemptNumber Number of the attempt being graded.
-     * @param {boolean} addAttempt Admit the user to attempt again.
-     * @param {string} workflowState Next workflow State.
-     * @param {boolean} applyToAll If it's a team submission, whether the grade applies to all group members.
-     * @param {any} outcomes Object including all outcomes values. If empty, any of them will be sent.
-     * @param {any} pluginData Plugin data to save.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if stored, rejected if failure.
+     * @param assignId Assign ID.
+     * @param userId User ID.
+     * @param courseId Course ID the assign belongs to.
+     * @param grade Grade to submit.
+     * @param attemptNumber Number of the attempt being graded.
+     * @param addAttempt Admit the user to attempt again.
+     * @param workflowState Next workflow State.
+     * @param applyToAll If it's a team submission, whether the grade applies to all group members.
+     * @param outcomes Object including all outcomes values. If empty, any of them will be sent.
+     * @param pluginData Plugin data to save.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     submitGradingForm(assignId: number, userId: number, courseId: number, grade: number, attemptNumber: number, addAttempt: boolean,
             workflowState: string, applyToAll: boolean, outcomes: any, pluginData: any, siteId?: string): Promise<any> {
diff --git a/src/addon/mod/assign/providers/assign-sync.ts b/src/addon/mod/assign/providers/assign-sync.ts
index 049b44ba3..60967dc07 100644
--- a/src/addon/mod/assign/providers/assign-sync.ts
+++ b/src/addon/mod/assign/providers/assign-sync.ts
@@ -36,13 +36,11 @@ import { AddonModAssignSubmissionDelegate } from './submission-delegate';
 export interface AddonModAssignSyncResult {
     /**
      * List of warnings.
-     * @type {string[]}
      */
     warnings: string[];
 
     /**
      * Whether data was updated in the site.
-     * @type {boolean}
      */
     updated: boolean;
 }
@@ -74,9 +72,9 @@ export class AddonModAssignSyncProvider extends CoreSyncBaseProvider {
     /**
      * Convenience function to get scale selected option.
      *
-     * @param {string} options Possible options.
-     * @param {number} selected Selected option to search.
-     * @return {number} Index of the selected option.
+     * @param options Possible options.
+     * @param selected Selected option to search.
+     * @return Index of the selected option.
      */
     protected getSelectedScaleId(options: string, selected: string): number {
         let optionsList = options.split(',');
@@ -98,9 +96,9 @@ export class AddonModAssignSyncProvider extends CoreSyncBaseProvider {
     /**
      * Check if an assignment has data to synchronize.
      *
-     * @param {number} assignId Assign ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether it has data to sync.
+     * @param assignId Assign ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether it has data to sync.
      */
     hasDataToSync(assignId: number, siteId?: string): Promise<boolean> {
         return this.assignOfflineProvider.hasAssignOfflineData(assignId, siteId);
@@ -109,9 +107,9 @@ export class AddonModAssignSyncProvider extends CoreSyncBaseProvider {
     /**
      * Try to synchronize all the assignments in a certain site or in all sites.
      *
-     * @param {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} force Wether to force sync not depending on last execution.
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     syncAllAssignments(siteId?: string, force?: boolean): Promise<any> {
         return this.syncOnSites('all assignments', this.syncAllAssignmentsFunc.bind(this), [force], siteId);
@@ -120,9 +118,9 @@ export class AddonModAssignSyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync all assignments on a site.
      *
-     * @param {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @param {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether to force sync not depending on last execution.
+     * @param Promise resolved if sync is successful, rejected if sync fails.
      */
     protected syncAllAssignmentsFunc(siteId?: string, force?: boolean): Promise<any> {
         // Get all assignments that have offline data.
@@ -149,9 +147,9 @@ export class AddonModAssignSyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync an assignment only if a certain time has passed since the last time.
      *
-     * @param {number} assignId Assign ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<void|AddonModAssignSyncResult>} Promise resolved when the assign is synced or it doesn't need to be synced.
+     * @param assignId Assign ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the assign is synced or it doesn't need to be synced.
      */
     syncAssignIfNeeded(assignId: number, siteId?: string): Promise<void | AddonModAssignSyncResult> {
         return this.isSyncNeeded(assignId, siteId).then((needed) => {
@@ -164,9 +162,9 @@ export class AddonModAssignSyncProvider extends CoreSyncBaseProvider {
     /**
      * Try to synchronize an assign.
      *
-     * @param {number} assignId Assign ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<AddonModAssignSyncResult>} Promise resolved in success.
+     * @param assignId Assign ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved in success.
      */
     syncAssign(assignId: number, siteId?: string): Promise<AddonModAssignSyncResult> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -265,11 +263,11 @@ export class AddonModAssignSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize a submission.
      *
-     * @param {any} assign Assignment.
-     * @param {any} offlineData Submission offline data.
-     * @param {string[]} warnings List of warnings.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if success, rejected otherwise.
+     * @param assign Assignment.
+     * @param offlineData Submission offline data.
+     * @param warnings List of warnings.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success, rejected otherwise.
      */
     protected syncSubmission(assign: any, offlineData: any, warnings: string[], siteId?: string): Promise<any> {
         const userId = offlineData.userid,
@@ -353,12 +351,12 @@ export class AddonModAssignSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize a submission grade.
      *
-     * @param {any} assign Assignment.
-     * @param {any} offlineData Submission grade offline data.
-     * @param {string[]} warnings List of warnings.
-     * @param {number} courseId Course Id.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if success, rejected otherwise.
+     * @param assign Assignment.
+     * @param offlineData Submission grade offline data.
+     * @param warnings List of warnings.
+     * @param courseId Course Id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success, rejected otherwise.
      */
     protected syncSubmissionGrade(assign: any, offlineData: any, warnings: string[], courseId: number, siteId?: string)
             : Promise<any> {
diff --git a/src/addon/mod/assign/providers/assign.ts b/src/addon/mod/assign/providers/assign.ts
index 26c6ecf41..e819751a6 100644
--- a/src/addon/mod/assign/providers/assign.ts
+++ b/src/addon/mod/assign/providers/assign.ts
@@ -78,9 +78,9 @@ export class AddonModAssignProvider {
      * be used (offline usage).
      * This function doesn't check if the submission is empty, it should be checked before calling this function.
      *
-     * @param {any} assign  Assignment instance.
-     * @param {any} submissionStatus Submission status returned by getSubmissionStatus.
-     * @return {boolean} Whether it can submit.
+     * @param assign Assignment instance.
+     * @param submissionStatus Submission status returned by getSubmissionStatus.
+     * @return Whether it can submit.
      */
     canSubmitOffline(assign: any, submissionStatus: any): boolean {
         if (!this.isSubmissionOpen(assign, submissionStatus)) {
@@ -117,11 +117,11 @@ export class AddonModAssignProvider {
     /**
      * Get an assignment by course module ID.
      *
-     * @param {number} courseId Course ID the assignment belongs to.
-     * @param {number} cmId Assignment module ID.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the assignment.
+     * @param courseId Course ID the assignment belongs to.
+     * @param cmId Assignment module ID.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the assignment.
      */
     getAssignment(courseId: number, cmId: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.getAssignmentByField(courseId, 'cmid', cmId, ignoreCache, siteId);
@@ -130,12 +130,12 @@ export class AddonModAssignProvider {
     /**
      * Get an assigment with key=value. If more than one is found, only the first will be returned.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} key Name of the property to check.
-     * @param {any} value Value to search.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the assignment is retrieved.
+     * @param courseId Course ID.
+     * @param key Name of the property to check.
+     * @param value Value to search.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the assignment is retrieved.
      */
     protected getAssignmentByField(courseId: number, key: string, value: any, ignoreCache?: boolean, siteId?: string)
             : Promise<any> {
@@ -181,11 +181,11 @@ export class AddonModAssignProvider {
     /**
      * Get an assignment by instance ID.
      *
-     * @param {number} courseId Course ID the assignment belongs to.
-     * @param {number} cmId Assignment instance ID.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved with the assignment.
+     * @param courseId Course ID the assignment belongs to.
+     * @param cmId Assignment instance ID.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the assignment.
      */
     getAssignmentById(courseId: number, id: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.getAssignmentByField(courseId, 'id', id, ignoreCache, siteId);
@@ -194,8 +194,8 @@ export class AddonModAssignProvider {
     /**
      * Get cache key for assignment data WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getAssignmentCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'assignment:' + courseId;
@@ -204,11 +204,11 @@ export class AddonModAssignProvider {
     /**
      * Get an assignment user mapping for blind marking.
      *
-     * @param {number} assignId Assignment Id.
-     * @param {number} userId User Id to be blinded.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number>} Promise resolved with the user blind id.
+     * @param assignId Assignment Id.
+     * @param userId User Id to be blinded.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the user blind id.
      */
     getAssignmentUserMappings(assignId: number, userId: number, ignoreCache?: boolean, siteId?: string): Promise<number> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -256,8 +256,8 @@ export class AddonModAssignProvider {
     /**
      * Get cache key for assignment user mappings data WS calls.
      *
-     * @param {number} assignId Assignment ID.
-     * @return {string} Cache key.
+     * @param assignId Assignment ID.
+     * @return Cache key.
      */
     protected getAssignmentUserMappingsCacheKey(assignId: number): string {
         return this.ROOT_CACHE_KEY + 'usermappings:' + assignId;
@@ -266,10 +266,10 @@ export class AddonModAssignProvider {
     /**
      * Returns grade information from assign_grades for the requested assignment id
      *
-     * @param {number} assignId Assignment Id.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}   Resolved with requested info when done.
+     * @param assignId Assignment Id.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved with requested info when done.
      */
     getAssignmentGrades(assignId: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -310,8 +310,8 @@ export class AddonModAssignProvider {
     /**
      * Get cache key for assignment grades data WS calls.
      *
-     * @param {number} assignId Assignment ID.
-     * @return {string} Cache key.
+     * @param assignId Assignment ID.
+     * @return Cache key.
      */
     protected getAssignmentGradesCacheKey(assignId: number): string {
         return this.ROOT_CACHE_KEY + 'assigngrades:' + assignId;
@@ -320,8 +320,8 @@ export class AddonModAssignProvider {
     /**
      * Returns the color name for a given grading status name.
      *
-     * @param {string} status Grading status name
-     * @return {string} The color name.
+     * @param status Grading status name
+     * @return The color name.
      */
     getSubmissionGradingStatusColor(status: string): string {
         if (!status) {
@@ -339,8 +339,8 @@ export class AddonModAssignProvider {
     /**
      * Returns the translation id for a given grading status name.
      *
-     * @param {string} status Grading Status name
-     * @return {string} The status translation identifier.
+     * @param status Grading Status name
+     * @return The status translation identifier.
      */
     getSubmissionGradingStatusTranslationId(status: string): string {
         if (!status) {
@@ -358,9 +358,9 @@ export class AddonModAssignProvider {
     /**
      * Get the submission object from an attempt.
      *
-     * @param {any} assign Assign.
-     * @param {any} attempt Attempt.
-     * @return {any} Submission object or null.
+     * @param assign Assign.
+     * @param attempt Attempt.
+     * @return Submission object or null.
      */
     getSubmissionObjectFromAttempt(assign: any, attempt: any): any {
         if (!attempt) {
@@ -373,8 +373,8 @@ export class AddonModAssignProvider {
     /**
      * Get attachments of a submission plugin.
      *
-     * @param {any} submissionPlugin Submission plugin.
-     * @return {any[]} Submission plugin attachments.
+     * @param submissionPlugin Submission plugin.
+     * @return Submission plugin attachments.
      */
     getSubmissionPluginAttachments(submissionPlugin: any): any[] {
         const files = [];
@@ -403,9 +403,9 @@ export class AddonModAssignProvider {
     /**
      * Get text of a submission plugin.
      *
-     * @param {any} submissionPlugin Submission plugin.
-     * @param {boolean} [keepUrls] True if it should keep original URLs, false if they should be replaced.
-     * @return {string} Submission text.
+     * @param submissionPlugin Submission plugin.
+     * @param keepUrls True if it should keep original URLs, false if they should be replaced.
+     * @return Submission text.
      */
     getSubmissionPluginText(submissionPlugin: any, keepUrls?: boolean): string {
         let text = '';
@@ -426,10 +426,10 @@ export class AddonModAssignProvider {
     /**
      * Get an assignment submissions.
      *
-     * @param {number} assignId Assignment id.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<{canviewsubmissions: boolean, submissions?: any[]}>} Promise resolved when done.
+     * @param assignId Assignment id.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     getSubmissions(assignId: number, ignoreCache?: boolean, siteId?: string)
             : Promise<{canviewsubmissions: boolean, submissions?: any[]}> {
@@ -469,8 +469,8 @@ export class AddonModAssignProvider {
     /**
      * Get cache key for assignment submissions data WS calls.
      *
-     * @param {number} assignId Assignment id.
-     * @return {string} Cache key.
+     * @param assignId Assignment id.
+     * @return Cache key.
      */
     protected getSubmissionsCacheKey(assignId: number): string {
         return this.ROOT_CACHE_KEY + 'submissions:' + assignId;
@@ -479,14 +479,14 @@ export class AddonModAssignProvider {
     /**
      * Get information about an assignment submission status for a given user.
      *
-     * @param {number} assignId Assignment instance id.
-     * @param {number} [userId] User Id (empty for current user).
-     * @param {number} [groupId] Group Id (empty for all participants).
-     * @param {boolean} [isBlind] If blind marking is enabled or not.
-     * @param {number} [filter=true] True to filter WS response and rewrite URLs, false otherwise.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site id (empty for current site).
-     * @return {Promise<any>} Promise always resolved with the user submission status.
+     * @param assignId Assignment instance id.
+     * @param userId User Id (empty for current user).
+     * @param groupId Group Id (empty for all participants).
+     * @param isBlind If blind marking is enabled or not.
+     * @param filter True to filter WS response and rewrite URLs, false otherwise.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site id (empty for current site).
+     * @return Promise always resolved with the user submission status.
      */
     getSubmissionStatus(assignId: number, userId?: number, groupId?: number, isBlind?: boolean, filter: boolean = true,
             ignoreCache?: boolean, siteId?: string): Promise<any> {
@@ -530,14 +530,14 @@ export class AddonModAssignProvider {
      * Get information about an assignment submission status for a given user.
      * If the data doesn't include the user submission, retry ignoring cache.
      *
-     * @param {any} assign Assignment.
-     * @param {number} [userId] User id (empty for current user).
-     * @param {number} [groupId] Group Id (empty for all participants).
-     * @param {boolean} [isBlind] If blind marking is enabled or not.
-     * @param {number} [filter=true] True to filter WS response and rewrite URLs, false otherwise.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site id (empty for current site).
-     * @return {Promise<any>} Promise always resolved with the user submission status.
+     * @param assign Assignment.
+     * @param userId User id (empty for current user).
+     * @param groupId Group Id (empty for all participants).
+     * @param isBlind If blind marking is enabled or not.
+     * @param filter True to filter WS response and rewrite URLs, false otherwise.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site id (empty for current site).
+     * @return Promise always resolved with the user submission status.
      */
     getSubmissionStatusWithRetry(assign: any, userId?: number, groupId?: number, isBlind?: boolean, filter: boolean = true,
             ignoreCache?: boolean, siteId?: string): Promise<any> {
@@ -560,11 +560,11 @@ export class AddonModAssignProvider {
     /**
      * Get cache key for get submission status data WS calls.
      *
-     * @param {number} assignId Assignment instance id.
-     * @param {number} [userId] User id (empty for current user).
-     * @param {number} [groupId] Group Id (empty for all participants).
-     * @param {number} [isBlind] If blind marking is enabled or not.
-     * @return {string} Cache key.
+     * @param assignId Assignment instance id.
+     * @param userId User id (empty for current user).
+     * @param groupId Group Id (empty for all participants).
+     * @param isBlind If blind marking is enabled or not.
+     * @return Cache key.
      */
     protected getSubmissionStatusCacheKey(assignId: number, userId: number, groupId?: number, isBlind?: boolean): string {
         if (!userId) {
@@ -578,8 +578,8 @@ export class AddonModAssignProvider {
     /**
      * Returns the color name for a given status name.
      *
-     * @param {string} status Status name
-     * @return {string} The color name.
+     * @param status Status name
+     * @return The color name.
      */
     getSubmissionStatusColor(status: string): string {
         switch (status) {
@@ -601,8 +601,8 @@ export class AddonModAssignProvider {
     /**
      * Given a list of plugins, returns the plugin names that aren't supported for editing.
      *
-     * @param {any[]} plugins Plugins to check.
-     * @return {Promise<string[]>} Promise resolved with unsupported plugin names.
+     * @param plugins Plugins to check.
+     * @return Promise resolved with unsupported plugin names.
      */
     getUnsupportedEditPlugins(plugins: any[]): Promise<string[]> {
         const notSupported = [],
@@ -624,11 +624,11 @@ export class AddonModAssignProvider {
     /**
      * List the participants for a single assignment, with some summary info about their submissions.
      *
-     * @param {number} assignId Assignment id.
-     * @param {number} [groupId] Group id. If not defined, 0.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the list of participants and summary of submissions.
+     * @param assignId Assignment id.
+     * @param groupId Group id. If not defined, 0.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of participants and summary of submissions.
      */
     listParticipants(assignId: number, groupId?: number, ignoreCache?: boolean, siteId?: string): Promise<any[]> {
         groupId = groupId || 0;
@@ -661,9 +661,9 @@ export class AddonModAssignProvider {
     /**
      * Get cache key for assignment list participants data WS calls.
      *
-     * @param {number} assignId Assignment id.
-     * @param {number} groupId Group id.
-     * @return {string} Cache key.
+     * @param assignId Assignment id.
+     * @param groupId Group id.
+     * @return Cache key.
      */
     protected listParticipantsCacheKey(assignId: number, groupId: number): string {
         return this.listParticipantsPrefixCacheKey(assignId) + ':' + groupId;
@@ -672,8 +672,8 @@ export class AddonModAssignProvider {
     /**
      * Get prefix cache key for assignment list participants data WS calls.
      *
-     * @param {number} assignId Assignment id.
-     * @return {string} Cache key.
+     * @param assignId Assignment id.
+     * @return Cache key.
      */
     protected listParticipantsPrefixCacheKey(assignId: number): string {
         return this.ROOT_CACHE_KEY + 'participants:' + assignId;
@@ -682,9 +682,9 @@ export class AddonModAssignProvider {
     /**
      * Invalidates all submission status data.
      *
-     * @param {number} assignId Assignment instance id.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param assignId Assignment instance id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAllSubmissionData(assignId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -695,9 +695,9 @@ export class AddonModAssignProvider {
     /**
      * Invalidates assignment data WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAssignmentData(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -708,9 +708,9 @@ export class AddonModAssignProvider {
     /**
      * Invalidates assignment user mappings data WS calls.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param assignId Assignment ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAssignmentUserMappingsData(assignId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -721,9 +721,9 @@ export class AddonModAssignProvider {
     /**
      * Invalidates assignment grades data WS calls.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param assignId Assignment ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAssignmentGradesData(assignId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -735,10 +735,10 @@ export class AddonModAssignProvider {
      * Invalidate the prefetched content except files.
      * To invalidate files, use AddonModAssignProvider.invalidateFiles.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -762,8 +762,8 @@ export class AddonModAssignProvider {
     /**
      * Invalidate the prefetched files.
      *
-     * @param {number} moduleId The module ID.
-     * @return {Promise<any>} Promise resolved when the files are invalidated.
+     * @param moduleId The module ID.
+     * @return Promise resolved when the files are invalidated.
      */
      invalidateFiles(moduleId: number): Promise<any> {
          return this.filepoolProvider.invalidateFilesByComponent(this.sitesProvider.getCurrentSiteId(),
@@ -773,9 +773,9 @@ export class AddonModAssignProvider {
     /**
      * Invalidates assignment submissions data WS calls.
      *
-     * @param {number} assignId Assignment instance id.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param assignId Assignment instance id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateSubmissionData(assignId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -786,12 +786,12 @@ export class AddonModAssignProvider {
     /**
      * Invalidates submission status data.
      *
-     * @param {number} assignId Assignment instance id.
-     * @param {number} [userId] User id (empty for current user).
-     * @param {number} [groupId] Group Id (empty for all participants).
-     * @param {boolean} [isBlind] Whether blind marking is enabled or not.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param assignId Assignment instance id.
+     * @param userId User id (empty for current user).
+     * @param groupId Group Id (empty for all participants).
+     * @param isBlind Whether blind marking is enabled or not.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateSubmissionStatusData(assignId: number, userId?: number, groupId?: number, isBlind?: boolean, siteId?: string):
             Promise<any> {
@@ -803,9 +803,9 @@ export class AddonModAssignProvider {
     /**
      * Invalidates assignment participants data.
      *
-     * @param {number} assignId Assignment instance id.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param assignId Assignment instance id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateListParticipantsData(assignId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -816,8 +816,8 @@ export class AddonModAssignProvider {
     /**
      * Convenience function to check if grading offline is enabled.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether grading offline is enabled.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether grading offline is enabled.
      */
     protected isGradingOfflineEnabled(siteId?: string): Promise<boolean> {
         if (typeof this.gradingOfflineEnabled[siteId] != 'undefined') {
@@ -834,8 +834,8 @@ export class AddonModAssignProvider {
     /**
      * Outcomes only can be edited if mod_assign_submit_grading_form is avalaible.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if outcomes edit is enabled, rejected or resolved with false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if outcomes edit is enabled, rejected or resolved with false otherwise.
      * @since 3.2
      */
     isOutcomesEditEnabled(siteId?: string): Promise<boolean> {
@@ -847,8 +847,8 @@ export class AddonModAssignProvider {
     /**
      * Check if assignments plugin is enabled in a certain site.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean} Whether the plugin is enabled.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Whether the plugin is enabled.
      */
     isPluginEnabled(siteId?: string): boolean {
         return true;
@@ -857,9 +857,9 @@ export class AddonModAssignProvider {
     /**
      * Check if a submission is open. This function is based on Moodle's submissions_open.
      *
-     * @param {any} assign Assignment instance.
-     * @param {any} submissionStatus Submission status returned by getSubmissionStatus.
-     * @return {boolean} Whether submission is open.
+     * @param assign Assignment instance.
+     * @param submissionStatus Submission status returned by getSubmissionStatus.
+     * @return Whether submission is open.
      */
     isSubmissionOpen(assign: any, submissionStatus: any): boolean {
         if (!assign || !submissionStatus) {
@@ -914,10 +914,10 @@ export class AddonModAssignProvider {
     /**
      * Report an assignment submission as being viewed.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {string} [name] Name of the assign.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the WS call is successful.
+     * @param assignId Assignment ID.
+     * @param name Name of the assign.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logSubmissionView(assignId: number, name?: string, siteId?: string): Promise<any> {
 
@@ -934,10 +934,10 @@ export class AddonModAssignProvider {
     /**
      * Report an assignment grading table is being viewed.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {string} [name] Name of the assign.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the WS call is successful.
+     * @param assignId Assignment ID.
+     * @param name Name of the assign.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logGradingView(assignId: number, name?: string, siteId?: string): Promise<any> {
         const params = {
@@ -951,10 +951,10 @@ export class AddonModAssignProvider {
     /**
      * Report an assign as being viewed.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {string} [name] Name of the assign.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the WS call is successful.
+     * @param assignId Assignment ID.
+     * @param name Name of the assign.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(assignId: number, name?: string, siteId?: string): Promise<any> {
         const params = {
@@ -968,9 +968,9 @@ export class AddonModAssignProvider {
     /**
      * Returns if a submissions needs to be graded.
      *
-     * @param {any} submission Submission.
-     * @param {number} assignId Assignment ID.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether it needs to be graded or not.
+     * @param submission Submission.
+     * @param assignId Assignment ID.
+     * @return Promise resolved with boolean: whether it needs to be graded or not.
      */
     needsSubmissionToBeGraded(submission: any, assignId: number): Promise<boolean> {
         if (!submission.gradingstatus) {
@@ -999,15 +999,15 @@ export class AddonModAssignProvider {
     /**
      * Save current user submission for a certain assignment.
      *
-     * @param {number} assignId Assign ID.
-     * @param {number} courseId Course ID the assign belongs to.
-     * @param {any} pluginData Data to save.
-     * @param {boolean} allowOffline Whether to allow offline usage.
-     * @param {number} timemodified The time the submission was last modified in online.
-     * @param {boolean} [allowsDrafts] Whether the assignment allows submission drafts.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if sent to server, resolved with false if stored in offline.
+     * @param assignId Assign ID.
+     * @param courseId Course ID the assign belongs to.
+     * @param pluginData Data to save.
+     * @param allowOffline Whether to allow offline usage.
+     * @param timemodified The time the submission was last modified in online.
+     * @param allowsDrafts Whether the assignment allows submission drafts.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if sent to server, resolved with false if stored in offline.
      */
     saveSubmission(assignId: number, courseId: number, pluginData: any, allowOffline: boolean, timemodified: number,
             allowsDrafts?: boolean, userId?: number, siteId?: string): Promise<boolean> {
@@ -1046,10 +1046,10 @@ export class AddonModAssignProvider {
     /**
      * Save current user submission for a certain assignment. It will fail if offline or cannot connect.
      *
-     * @param {number} assignId Assign ID.
-     * @param {any} pluginData Data to save.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when saved, rejected otherwise.
+     * @param assignId Assign ID.
+     * @param pluginData Data to save.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when saved, rejected otherwise.
      */
     saveSubmissionOnline(assignId: number, pluginData: any, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1070,13 +1070,13 @@ export class AddonModAssignProvider {
     /**
      * Submit the current user assignment for grading.
      *
-     * @param {number} assignId Assign ID.
-     * @param {number} courseId Course ID the assign belongs to.
-     * @param {boolean} acceptStatement True if submission statement is accepted, false otherwise.
-     * @param {number} timemodified The time the submission was last modified in online.
-     * @param {boolean} [forceOffline] True to always mark it in offline.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if sent to server, resolved with false if stored in offline.
+     * @param assignId Assign ID.
+     * @param courseId Course ID the assign belongs to.
+     * @param acceptStatement True if submission statement is accepted, false otherwise.
+     * @param timemodified The time the submission was last modified in online.
+     * @param forceOffline True to always mark it in offline.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if sent to server, resolved with false if stored in offline.
      */
     submitForGrading(assignId: number, courseId: number, acceptStatement: boolean, timemodified: number, forceOffline?: boolean,
             siteId?: string): Promise<boolean> {
@@ -1115,10 +1115,10 @@ export class AddonModAssignProvider {
     /**
      * Submit the current user assignment for grading. It will fail if offline or cannot connect.
      *
-     * @param {number} assignId Assign ID.
-     * @param {boolean} acceptStatement True if submission statement is accepted, false otherwise.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when submitted, rejected otherwise.
+     * @param assignId Assign ID.
+     * @param acceptStatement True if submission statement is accepted, false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when submitted, rejected otherwise.
      */
     submitForGradingOnline(assignId: number, acceptStatement: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1139,18 +1139,18 @@ export class AddonModAssignProvider {
     /**
      * Submit the grading for the current user and assignment. It will use old or new WS depending on availability.
      *
-     * @param {number} assignId Assign ID.
-     * @param {number} userId User ID.
-     * @param {number} courseId Course ID the assign belongs to.
-     * @param {number} grade Grade to submit.
-     * @param {number} attemptNumber Number of the attempt being graded.
-     * @param {boolean} addAttempt Admit the user to attempt again.
-     * @param {string} workflowState Next workflow State.
-     * @param {boolean} applyToAll If it's a team submission, whether the grade applies to all group members.
-     * @param {any} outcomes Object including all outcomes values. If empty, any of them will be sent.
-     * @param {any} pluginData Feedback plugin data to save.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if sent to server, resolved with false if stored offline.
+     * @param assignId Assign ID.
+     * @param userId User ID.
+     * @param courseId Course ID the assign belongs to.
+     * @param grade Grade to submit.
+     * @param attemptNumber Number of the attempt being graded.
+     * @param addAttempt Admit the user to attempt again.
+     * @param workflowState Next workflow State.
+     * @param applyToAll If it's a team submission, whether the grade applies to all group members.
+     * @param outcomes Object including all outcomes values. If empty, any of them will be sent.
+     * @param pluginData Feedback plugin data to save.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if sent to server, resolved with false if stored offline.
      */
     submitGradingForm(assignId: number, userId: number, courseId: number, grade: number, attemptNumber: number, addAttempt: boolean,
             workflowState: string, applyToAll: boolean, outcomes: any, pluginData: any, siteId?: string): Promise<boolean> {
@@ -1199,17 +1199,17 @@ export class AddonModAssignProvider {
      * Submit the grading for the current user and assignment. It will use old or new WS depending on availability.
      * It will fail if offline or cannot connect.
      *
-     * @param {number} assignId Assign ID.
-     * @param {number} userId User ID.
-     * @param {number} grade Grade to submit.
-     * @param {number} attemptNumber Number of the attempt being graded.
-     * @param {number} addAttempt Allow the user to attempt again.
-     * @param {string} workflowState Next workflow State.
-     * @param {boolean} applyToAll If it's a team submission, if the grade applies to all group members.
-     * @param {any} outcomes Object including all outcomes values. If empty, any of them will be sent.
-     * @param {any} pluginData Feedback plugin data to save.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when submitted, rejected otherwise.
+     * @param assignId Assign ID.
+     * @param userId User ID.
+     * @param grade Grade to submit.
+     * @param attemptNumber Number of the attempt being graded.
+     * @param addAttempt Allow the user to attempt again.
+     * @param workflowState Next workflow State.
+     * @param applyToAll If it's a team submission, if the grade applies to all group members.
+     * @param outcomes Object including all outcomes values. If empty, any of them will be sent.
+     * @param pluginData Feedback plugin data to save.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when submitted, rejected otherwise.
      */
     submitGradingFormOnline(assignId: number, userId: number, grade: number, attemptNumber: number, addAttempt: boolean,
             workflowState: string, applyToAll: boolean, outcomes: any, pluginData: any, siteId?: string): Promise<any> {
diff --git a/src/addon/mod/assign/providers/feedback-delegate.ts b/src/addon/mod/assign/providers/feedback-delegate.ts
index 6598bf4e9..c72dda969 100644
--- a/src/addon/mod/assign/providers/feedback-delegate.ts
+++ b/src/addon/mod/assign/providers/feedback-delegate.ts
@@ -26,17 +26,16 @@ export interface AddonModAssignFeedbackHandler extends CoreDelegateHandler {
 
     /**
      * Name of the type of feedback the handler supports. E.g. 'file'.
-     * @type {string}
      */
     type: string;
 
     /**
      * Discard the draft data of the feedback plugin.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     discardDraft?(assignId: number, userId: number, siteId?: string): void | Promise<any>;
 
@@ -44,19 +43,19 @@ export interface AddonModAssignFeedbackHandler extends CoreDelegateHandler {
      * Return the Component to use to display the plugin data.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} plugin The plugin object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param plugin The plugin object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent?(injector: Injector, plugin: any): any | Promise<any>;
 
     /**
      * Return the draft saved data of the feedback plugin.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {any|Promise<any>} Data (or promise resolved with the data).
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Data (or promise resolved with the data).
      */
     getDraft?(assignId: number, userId: number, siteId?: string): any | Promise<any>;
 
@@ -64,41 +63,41 @@ export interface AddonModAssignFeedbackHandler extends CoreDelegateHandler {
      * Get files used by this plugin.
      * The files returned by this function will be prefetched when the user prefetches the assign.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {any[]|Promise<any[]>} The files (or promise resolved with the files).
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return The files (or promise resolved with the files).
      */
     getPluginFiles?(assign: any, submission: any, plugin: any, siteId?: string): any[] | Promise<any[]>;
 
     /**
      * Get a readable name to use for the plugin.
      *
-     * @param {any} plugin The plugin object.
-     * @return {string} The plugin name.
+     * @param plugin The plugin object.
+     * @return The plugin name.
      */
     getPluginName?(plugin: any): string;
 
     /**
      * Check if the feedback data has changed for this plugin.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the feedback.
-     * @param {number} userId User ID of the submission.
-     * @return {boolean|Promise<boolean>} Boolean (or promise resolved with boolean): whether the data has changed.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the feedback.
+     * @param userId User ID of the submission.
+     * @return Boolean (or promise resolved with boolean): whether the data has changed.
      */
     hasDataChanged?(assign: any, submission: any, plugin: any, inputData: any, userId: number): boolean | Promise<boolean>;
 
     /**
      * Check whether the plugin has draft data stored.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean|Promise<boolean>} Boolean or promise resolved with boolean: whether the plugin has draft data.
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Boolean or promise resolved with boolean: whether the plugin has draft data.
      */
     hasDraftData?(assignId: number, userId: number, siteId?: string): boolean | Promise<boolean>;
 
@@ -106,35 +105,35 @@ export interface AddonModAssignFeedbackHandler extends CoreDelegateHandler {
      * Prefetch any required data for the plugin.
      * This should NOT prefetch files. Files to be prefetched should be returned by the getPluginFiles function.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     prefetch?(assign: any, submission: any, plugin: any, siteId?: string): Promise<any>;
 
     /**
      * Prepare and add to pluginData the data to send to the server based on the draft data saved.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {any} plugin The plugin object.
-     * @param {any} pluginData Object where to store the data to send.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param plugin The plugin object.
+     * @param pluginData Object where to store the data to send.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     prepareFeedbackData?(assignId: number, userId: number, plugin: any, pluginData: any, siteId?: string): void | Promise<any>;
 
     /**
      * Save draft data of the feedback plugin.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {any} plugin The plugin object.
-     * @param {any} data The data to save.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param plugin The plugin object.
+     * @param data The data to save.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     saveDraft?(assignId: number, userId: number, plugin: any, data: any, siteId?: string): void | Promise<any>;
 }
@@ -155,11 +154,11 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
     /**
      * Discard the draft data of the feedback plugin.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     discardPluginFeedbackData(assignId: number, userId: number, plugin: any, siteId?: string): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'discardDraft', [assignId, userId, siteId]));
@@ -168,9 +167,9 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
     /**
      * Get the component to use for a certain feedback plugin.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} plugin The plugin object.
-     * @return {Promise<any>} Promise resolved with the component to use, undefined if not found.
+     * @param injector Injector.
+     * @param plugin The plugin object.
+     * @return Promise resolved with the component to use, undefined if not found.
      */
     getComponentForPlugin(injector: Injector, plugin: any): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'getComponent', [injector, plugin]));
@@ -179,11 +178,11 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
     /**
      * Return the draft saved data of the feedback plugin.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the draft data.
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the draft data.
      */
     getPluginDraftData(assignId: number, userId: number, plugin: any, siteId?: string): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'getDraft', [assignId, userId, siteId]));
@@ -193,11 +192,11 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
      * Get files used by this plugin.
      * The files returned by this function will be prefetched when the user prefetches the assign.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the files.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the files.
      */
     getPluginFiles(assign: any, submission: any, plugin: any, siteId?: string): Promise<any[]> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'getPluginFiles', [assign, submission, plugin, siteId]));
@@ -206,8 +205,8 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
     /**
      * Get a readable name to use for a certain feedback plugin.
      *
-     * @param {any} plugin Plugin to get the name for.
-     * @return {string} Human readable name.
+     * @param plugin Plugin to get the name for.
+     * @return Human readable name.
      */
     getPluginName(plugin: any): string {
         return this.executeFunctionOnEnabled(plugin.type, 'getPluginName', [plugin]);
@@ -216,12 +215,12 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
     /**
      * Check if the feedback data has changed for a certain plugin.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the feedback.
-     * @param {number} userId User ID of the submission.
-     * @return {Promise<boolean>} Promise resolved with true if data has changed, resolved with false otherwise.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the feedback.
+     * @param userId User ID of the submission.
+     * @return Promise resolved with true if data has changed, resolved with false otherwise.
      */
     hasPluginDataChanged(assign: any, submission: any, plugin: any, inputData: any, userId: number): Promise<boolean> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'hasDataChanged',
@@ -231,11 +230,11 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
     /**
      * Check whether the plugin has draft data stored.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if it has draft data.
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if it has draft data.
      */
     hasPluginDraftData(assignId: number, userId: number, plugin: any, siteId?: string): Promise<boolean> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'hasDraftData', [assignId, userId, siteId]));
@@ -244,8 +243,8 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
     /**
      * Check if a feedback plugin is supported.
      *
-     * @param {string} pluginType Type of the plugin.
-     * @return {boolean} Whether it's supported.
+     * @param pluginType Type of the plugin.
+     * @return Whether it's supported.
      */
     isPluginSupported(pluginType: string): boolean {
         return this.hasHandler(pluginType, true);
@@ -254,11 +253,11 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
     /**
      * Prefetch any required data for a feedback plugin.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     prefetch(assign: any, submission: any, plugin: any, siteId?: string): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'prefetch', [assign, submission, plugin, siteId]));
@@ -267,12 +266,12 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
     /**
      * Prepare and add to pluginData the data to submit for a certain feedback plugin.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {any} plugin The plugin object.
-     * @param {any} pluginData Object where to store the data to send.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when data has been gathered.
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param plugin The plugin object.
+     * @param pluginData Object where to store the data to send.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when data has been gathered.
      */
     preparePluginFeedbackData(assignId: number, userId: number, plugin: any, pluginData: any, siteId?: string): Promise<any> {
 
@@ -283,12 +282,12 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
     /**
      * Save draft data of the feedback plugin.
      *
-     * @param {number} assignId The assignment ID.
-     * @param {number} userId User ID.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data to save.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when data has been saved.
+     * @param assignId The assignment ID.
+     * @param userId User ID.
+     * @param plugin The plugin object.
+     * @param inputData Data to save.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when data has been saved.
      */
     saveFeedbackDraft(assignId: number, userId: number, plugin: any, inputData: any, siteId?: string): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'saveDraft',
diff --git a/src/addon/mod/assign/providers/helper.ts b/src/addon/mod/assign/providers/helper.ts
index 5f8f5df21..a634e520c 100644
--- a/src/addon/mod/assign/providers/helper.ts
+++ b/src/addon/mod/assign/providers/helper.ts
@@ -42,9 +42,9 @@ export class AddonModAssignHelperProvider {
     /**
      * Check if a submission can be edited in offline.
      *
-     * @param {any} assign Assignment.
-     * @param {any} submission Submission.
-     * @return {boolean} Whether it can be edited offline.
+     * @param assign Assignment.
+     * @param submission Submission.
+     * @return Whether it can be edited offline.
      */
     canEditSubmissionOffline(assign: any, submission: any): Promise<boolean> {
         if (!submission) {
@@ -77,9 +77,9 @@ export class AddonModAssignHelperProvider {
     /**
      * Clear plugins temporary data because a submission was cancelled.
      *
-     * @param {any} assign Assignment.
-     * @param {any} submission Submission to clear the data for.
-     * @param {any} inputData Data entered in the submission form.
+     * @param assign Assignment.
+     * @param submission Submission to clear the data for.
+     * @param inputData Data entered in the submission form.
      */
     clearSubmissionPluginTmpData(assign: any, submission: any, inputData: any): void {
         submission.plugins.forEach((plugin) => {
@@ -91,9 +91,9 @@ export class AddonModAssignHelperProvider {
      * Copy the data from last submitted attempt to the current submission.
      * Since we don't have any WS for that we'll have to re-submit everything manually.
      *
-     * @param {any} assign Assignment.
-     * @param {any} previousSubmission Submission to copy.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param assign Assignment.
+     * @param previousSubmission Submission to copy.
+     * @return Promise resolved when done.
      */
     copyPreviousAttempt(assign: any, previousSubmission: any): Promise<any> {
         const pluginData = {},
@@ -115,11 +115,11 @@ export class AddonModAssignHelperProvider {
     /**
      * Delete stored submission files for a plugin. See storeSubmissionFiles.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {string} folderName Name of the plugin folder. Must be unique (both in submission and feedback plugins).
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param assignId Assignment ID.
+     * @param folderName Name of the plugin folder. Must be unique (both in submission and feedback plugins).
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     deleteStoredSubmissionFiles(assignId: number, folderName: string, userId?: number, siteId?: string): Promise<any> {
         return this.assignOffline.getSubmissionPluginFolder(assignId, folderName, userId, siteId).then((folderPath) => {
@@ -130,11 +130,11 @@ export class AddonModAssignHelperProvider {
     /**
      * Delete all drafts of the feedback plugin data.
      *
-     * @param {number} assignId Assignment Id.
-     * @param {number} userId User Id.
-     * @param {any} feedback  Feedback data.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param assignId Assignment Id.
+     * @param userId User Id.
+     * @param feedback Feedback data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     discardFeedbackPluginData(assignId: number, userId: number, feedback: any, siteId?: string): Promise<any> {
         const promises = [];
@@ -149,11 +149,11 @@ export class AddonModAssignHelperProvider {
     /**
      * List the participants for a single assignment, with some summary info about their submissions.
      *
-     * @param {any} assign Assignment object.
-     * @param {number} [groupId] Group Id.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the list of participants and summary of submissions.
+     * @param assign Assignment object.
+     * @param groupId Group Id.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of participants and summary of submissions.
      */
     getParticipants(assign: any, groupId?: number, ignoreCache?: boolean, siteId?: string): Promise<any[]> {
         groupId = groupId || 0;
@@ -189,10 +189,10 @@ export class AddonModAssignHelperProvider {
     /**
      * Get plugin config from assignment config.
      *
-     * @param {any} assign Assignment object including all config.
-     * @param {string} subtype Subtype name (assignsubmission or assignfeedback)
-     * @param {string} type Name of the subplugin.
-     * @return {any} Object containing all configurations of the subplugin selected.
+     * @param assign Assignment object including all config.
+     * @param subtype Subtype name (assignsubmission or assignfeedback)
+     * @param type Name of the subplugin.
+     * @return Object containing all configurations of the subplugin selected.
      */
     getPluginConfig(assign: any, subtype: string, type: string): any {
         const configs = {};
@@ -209,9 +209,9 @@ export class AddonModAssignHelperProvider {
     /**
      * Get enabled subplugins.
      *
-     * @param {any} assign Assignment object including all config.
-     * @param {string} subtype  Subtype name (assignsubmission or assignfeedback)
-     * @return {any} List of enabled plugins for the assign.
+     * @param assign Assignment object including all config.
+     * @param subtype Subtype name (assignsubmission or assignfeedback)
+     * @return List of enabled plugins for the assign.
      */
     getPluginsEnabled(assign: any, subtype: string): any[] {
         const enabled = [];
@@ -231,11 +231,11 @@ export class AddonModAssignHelperProvider {
     /**
      * Get a list of stored submission files. See storeSubmissionFiles.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {string} folderName Name of the plugin folder. Must be unique (both in submission and feedback plugins).
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the files.
+     * @param assignId Assignment ID.
+     * @param folderName Name of the plugin folder. Must be unique (both in submission and feedback plugins).
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the files.
      */
     getStoredSubmissionFiles(assignId: number, folderName: string, userId?: number, siteId?: string): Promise<any[]> {
         return this.assignOffline.getSubmissionPluginFolder(assignId, folderName, userId, siteId).then((folderPath) => {
@@ -246,9 +246,9 @@ export class AddonModAssignHelperProvider {
     /**
      * Get the size that will be uploaded to perform an attempt copy.
      *
-     * @param {any} assign Assignment.
-     * @param {any} previousSubmission Submission to copy.
-     * @return {Promise<number>} Promise resolved with the size.
+     * @param assign Assignment.
+     * @param previousSubmission Submission to copy.
+     * @return Promise resolved with the size.
      */
     getSubmissionSizeForCopy(assign: any, previousSubmission: any): Promise<number> {
         const promises = [];
@@ -268,10 +268,10 @@ export class AddonModAssignHelperProvider {
     /**
      * Get the size that will be uploaded to save a submission.
      *
-     * @param {any} assign Assignment.
-     * @param {any} submission Submission to check data.
-     * @param {any} inputData Data entered in the submission form.
-     * @return {Promise<number>} Promise resolved with the size.
+     * @param assign Assignment.
+     * @param submission Submission to check data.
+     * @param inputData Data entered in the submission form.
+     * @return Promise resolved with the size.
      */
     getSubmissionSizeForEdit(assign: any, submission: any, inputData: any): Promise<number> {
         const promises = [];
@@ -291,12 +291,12 @@ export class AddonModAssignHelperProvider {
     /**
      * Get user data for submissions since they only have userid.
      *
-     * @param {any} assign Assignment object.
-     * @param {any[]} submissions Submissions to get the data for.
-     * @param {number} [groupId] Group Id.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site id (empty for current site).
-     * @return {Promise<any[]>} Promise always resolved. Resolve param is the formatted submissions.
+     * @param assign Assignment object.
+     * @param submissions Submissions to get the data for.
+     * @param groupId Group Id.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site id (empty for current site).
+     * @return Promise always resolved. Resolve param is the formatted submissions.
      */
     getSubmissionsUserData(assign: any, submissions: any[], groupId?: number, ignoreCache?: boolean, siteId?: string):
             Promise<any[]> {
@@ -389,10 +389,10 @@ export class AddonModAssignHelperProvider {
     /**
      * Check if the feedback data has changed for a certain submission and assign.
      *
-     * @param {any} assign Assignment.
-     * @param {number} userId User Id.
-     * @param {any} feedback Feedback data.
-     * @return {Promise<boolean>} Promise resolved with true if data has changed, resolved with false otherwise.
+     * @param assign Assignment.
+     * @param userId User Id.
+     * @param feedback Feedback data.
+     * @return Promise resolved with true if data has changed, resolved with false otherwise.
      */
     hasFeedbackDataChanged(assign: any, userId: number, feedback: any): Promise<boolean> {
         const promises = [];
@@ -418,10 +418,10 @@ export class AddonModAssignHelperProvider {
     /**
      * Check if the submission data has changed for a certain submission and assign.
      *
-     * @param {any} assign Assignment.
-     * @param {any} submission Submission to check data.
-     * @param {any} inputData Data entered in the submission form.
-     * @return {Promise<boolean>} Promise resolved with true if data has changed, resolved with false otherwise.
+     * @param assign Assignment.
+     * @param submission Submission to check data.
+     * @param inputData Data entered in the submission form.
+     * @return Promise resolved with true if data has changed, resolved with false otherwise.
      */
     hasSubmissionDataChanged(assign: any, submission: any, inputData: any): Promise<boolean> {
         const promises = [];
@@ -445,11 +445,11 @@ export class AddonModAssignHelperProvider {
     /**
      * Prepare and return the plugin data to send for a certain feedback and assign.
      *
-     * @param {number} assignId Assignment Id.
-     * @param {number} userId User Id.
-     * @param {any} feedback Feedback data.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with plugin data to send to server.
+     * @param assignId Assignment Id.
+     * @param userId User Id.
+     * @param feedback Feedback data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with plugin data to send to server.
      */
     prepareFeedbackPluginData(assignId: number, userId: number, feedback: any, siteId?: string): Promise<any> {
         const pluginData = {},
@@ -467,11 +467,11 @@ export class AddonModAssignHelperProvider {
     /**
      * Prepare and return the plugin data to send for a certain submission and assign.
      *
-     * @param {any} assign Assignment.
-     * @param {any} submission Submission to check data.
-     * @param {any} inputData  Data entered in the submission form.
-     * @param {boolean} [offline] True to prepare the data for an offline submission, false otherwise.
-     * @return {Promise<any>} Promise resolved with plugin data to send to server.
+     * @param assign Assignment.
+     * @param submission Submission to check data.
+     * @param inputData Data entered in the submission form.
+     * @param offline True to prepare the data for an offline submission, false otherwise.
+     * @return Promise resolved with plugin data to send to server.
      */
     prepareSubmissionPluginData(assign: any, submission: any, inputData: any, offline?: boolean): Promise<any> {
         const pluginData = {},
@@ -491,12 +491,12 @@ export class AddonModAssignHelperProvider {
      * Given a list of files (either online files or local files), store the local files in a local folder
      * to be submitted later.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {string} folderName Name of the plugin folder. Must be unique (both in submission and feedback plugins).
-     * @param {any[]} files List of files.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if success, rejected otherwise.
+     * @param assignId Assignment ID.
+     * @param folderName Name of the plugin folder. Must be unique (both in submission and feedback plugins).
+     * @param files List of files.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success, rejected otherwise.
      */
     storeSubmissionFiles(assignId: number, folderName: string, files: any[], userId?: number, siteId?: string): Promise<any> {
         // Get the folder where to store the files.
@@ -508,11 +508,11 @@ export class AddonModAssignHelperProvider {
     /**
      * Upload a file to a draft area. If the file is an online file it will be downloaded and then re-uploaded.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {any} file Online file or local FileEntry.
-     * @param {number} [itemId] Draft ID to use. Undefined or 0 to create a new draft ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number>} Promise resolved with the itemId.
+     * @param assignId Assignment ID.
+     * @param file Online file or local FileEntry.
+     * @param itemId Draft ID to use. Undefined or 0 to create a new draft ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the itemId.
      */
     uploadFile(assignId: number, file: any, itemId?: number, siteId?: string): Promise<number> {
         return this.fileUploaderProvider.uploadOrReuploadFile(file, itemId, AddonModAssignProvider.COMPONENT, assignId, siteId);
@@ -523,10 +523,10 @@ export class AddonModAssignHelperProvider {
      * Online files will be downloaded and then re-uploaded.
      * If there are no files to upload it will return a fake draft ID (1).
      *
-     * @param {number} assignId Assignment ID.
-     * @param {any[]} files List of files.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number>} Promise resolved with the itemId.
+     * @param assignId Assignment ID.
+     * @param files List of files.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the itemId.
      */
     uploadFiles(assignId: number, files: any[], siteId?: string): Promise<number> {
         return this.fileUploaderProvider.uploadOrReuploadFiles(files, AddonModAssignProvider.COMPONENT, assignId, siteId);
@@ -535,13 +535,13 @@ export class AddonModAssignHelperProvider {
     /**
      * Upload or store some files, depending if the user is offline or not.
      *
-     * @param {number} assignId Assignment ID.
-     * @param {string} folderName Name of the plugin folder. Must be unique (both in submission and feedback plugins).
-     * @param {any[]} files List of files.
-     * @param {boolean} offline True if files sould be stored for offline, false to upload them.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param assignId Assignment ID.
+     * @param folderName Name of the plugin folder. Must be unique (both in submission and feedback plugins).
+     * @param files List of files.
+     * @param offline True if files sould be stored for offline, false to upload them.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     uploadOrStoreFiles(assignId: number, folderName: string, files: any[], offline?: boolean, userId?: number, siteId?: string)
             : Promise<any> {
diff --git a/src/addon/mod/assign/providers/list-link-handler.ts b/src/addon/mod/assign/providers/list-link-handler.ts
index 9e5315d04..2e2b2de0d 100644
--- a/src/addon/mod/assign/providers/list-link-handler.ts
+++ b/src/addon/mod/assign/providers/list-link-handler.ts
@@ -33,7 +33,7 @@ export class AddonModAssignListLinkHandler extends CoreContentLinksModuleListHan
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean {
         return this.assignProvider.isPluginEnabled();
diff --git a/src/addon/mod/assign/providers/module-handler.ts b/src/addon/mod/assign/providers/module-handler.ts
index 1aa0cda0d..baa09705f 100644
--- a/src/addon/mod/assign/providers/module-handler.ts
+++ b/src/addon/mod/assign/providers/module-handler.ts
@@ -48,7 +48,7 @@ export class AddonModAssignModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean {
         return this.assignProvider.isPluginEnabled();
@@ -57,10 +57,10 @@ export class AddonModAssignModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         return {
@@ -82,9 +82,9 @@ export class AddonModAssignModuleHandler implements CoreCourseModuleHandler {
      * Get the component to render the module. This is needed to support singleactivity course format.
      * The component returned must implement CoreCourseModuleMainComponent.
      *
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any} The component to use, undefined if not found.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component to use, undefined if not found.
      */
     getMainComponent(course: any, module: any): any {
         return AddonModAssignIndexComponent;
diff --git a/src/addon/mod/assign/providers/prefetch-handler.ts b/src/addon/mod/assign/providers/prefetch-handler.ts
index 9c76f2ec8..284d558ab 100644
--- a/src/addon/mod/assign/providers/prefetch-handler.ts
+++ b/src/addon/mod/assign/providers/prefetch-handler.ts
@@ -59,9 +59,9 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
      * If not defined, it will assume all modules can be checked.
      * The modules that return false will always be shown as outdated when they're downloaded.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {boolean|Promise<boolean>} Whether the module can use check_updates. The promise should never be rejected.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Whether the module can use check_updates. The promise should never be rejected.
      */
     canUseCheckUpdates(module: any, courseId: number): boolean | Promise<boolean> {
         // Teachers cannot use the WS because it doesn't check student submissions.
@@ -84,11 +84,11 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Get list of files. If not defined, we'll assume they're in module.contents.
      *
-     * @param {any} module Module.
-     * @param {Number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the list of files.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of files.
      */
     getFiles(module: any, courseId: number, single?: boolean, siteId?: string): Promise<any[]> {
 
@@ -149,11 +149,11 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Get submission files.
      *
-     * @param {any} assign Assign.
-     * @param {number} submitId User ID of the submission to get.
-     * @param {boolean} blindMarking True if blind marking, false otherwise.
-     * @param {string} siteId Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with array of files.
+     * @param assign Assign.
+     * @param submitId User ID of the submission to get.
+     * @param blindMarking True if blind marking, false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with array of files.
      */
     protected getSubmissionFiles(assign: any, submitId: number, blindMarking: boolean, siteId?: string)
             : Promise<any[]> {
@@ -195,9 +195,9 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId The course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId The course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         return this.assignProvider.invalidateContent(moduleId, courseId);
@@ -206,9 +206,9 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Invalidate WS calls needed to determine module status.
      *
-     * @param  {any}    module   Module.
-     * @param  {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when invalidated.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when invalidated.
      */
     invalidateModule(module: any, courseId: number): Promise<any> {
         return this.assignProvider.invalidateAssignmentData(courseId);
@@ -217,7 +217,7 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
+     * @return A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.assignProvider.isPluginEnabled();
@@ -226,11 +226,11 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Prefetch a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
      */
     prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string): Promise<any> {
         return this.prefetchPackage(module, courseId, single, this.prefetchAssign.bind(this));
@@ -239,11 +239,11 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Prefetch an assignment.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} single True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {String} siteId Site ID.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
      */
     protected prefetchAssign(module: any, courseId: number, single: boolean, siteId: string): Promise<any> {
         const userId = this.sitesProvider.getCurrentSiteUserId(),
@@ -281,12 +281,12 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Prefetch assign submissions.
      *
-     * @param {any} assign Assign.
-     * @param {number} courseId Course ID.
-     * @param {number} moduleId Module ID.
-     * @param {number} userId User ID. If not defined, site's current user.
-     * @param {string} siteId Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when prefetched, rejected otherwise.
+     * @param assign Assign.
+     * @param courseId Course ID.
+     * @param moduleId Module ID.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when prefetched, rejected otherwise.
      */
     protected prefetchSubmissions(assign: any, courseId: number, moduleId: number, userId: number, siteId: string): Promise<any> {
         // Get submissions.
@@ -377,13 +377,13 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Prefetch a submission.
      *
-     * @param {any} assign Assign.
-     * @param {number} courseId Course ID.
-     * @param {number} moduleId Module ID.
-     * @param {any} submission Data returned by AddonModAssignProvider.getSubmissionStatus.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when prefetched, rejected otherwise.
+     * @param assign Assign.
+     * @param courseId Course ID.
+     * @param moduleId Module ID.
+     * @param submission Data returned by AddonModAssignProvider.getSubmissionStatus.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when prefetched, rejected otherwise.
      */
     protected prefetchSubmission(assign: any, courseId: number, moduleId: number, submission: any, userId?: number,
             siteId?: string): Promise<any> {
@@ -461,10 +461,10 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Sync a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     sync(module: any, courseId: number, siteId?: any): Promise<any> {
         return this.syncProvider.syncAssign(module.instance, siteId);
diff --git a/src/addon/mod/assign/providers/push-click-handler.ts b/src/addon/mod/assign/providers/push-click-handler.ts
index abe6fa608..dd698cbd1 100644
--- a/src/addon/mod/assign/providers/push-click-handler.ts
+++ b/src/addon/mod/assign/providers/push-click-handler.ts
@@ -34,8 +34,8 @@ export class AddonModAssignPushClickHandler implements CorePushNotificationsClic
     /**
      * Check if a notification click is handled by this handler.
      *
-     * @param {any} notification The notification to check.
-     * @return {boolean} Whether the notification click is handled by this handler
+     * @param notification The notification to check.
+     * @return Whether the notification click is handled by this handler
      */
     handles(notification: any): boolean | Promise<boolean> {
         return this.utils.isTrueOrOne(notification.notif) && notification.moodlecomponent == 'mod_assign' &&
@@ -45,8 +45,8 @@ export class AddonModAssignPushClickHandler implements CorePushNotificationsClic
     /**
      * Handle the notification click.
      *
-     * @param {any} notification The notification to check.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param notification The notification to check.
+     * @return Promise resolved when done.
      */
     handleClick(notification: any): Promise<any> {
         const contextUrlParams = this.urlUtils.extractUrlParams(notification.contexturl),
diff --git a/src/addon/mod/assign/providers/submission-delegate.ts b/src/addon/mod/assign/providers/submission-delegate.ts
index 26d5da2f4..70c8e9752 100644
--- a/src/addon/mod/assign/providers/submission-delegate.ts
+++ b/src/addon/mod/assign/providers/submission-delegate.ts
@@ -26,7 +26,6 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
 
     /**
      * Name of the type of submission the handler supports. E.g. 'file'.
-     * @type {string}
      */
     type: string;
 
@@ -35,20 +34,20 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
      * plugin uses Moodle filters. The reason is that the app only prefetches filtered data, and the user should edit
      * unfiltered data.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @return {boolean|Promise<boolean>} Boolean or promise resolved with boolean: whether it can be edited in offline.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @return Boolean or promise resolved with boolean: whether it can be edited in offline.
      */
     canEditOffline?(assign: any, submission: any, plugin: any): boolean | Promise<boolean>;
 
     /**
      * Should clear temporary data for a cancelled submission.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the submission.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the submission.
      */
     clearTmpData?(assign: any, submission: any, plugin: any, inputData: any): void;
 
@@ -56,24 +55,24 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
      * This function will be called when the user wants to create a new submission based on the previous one.
      * It should add to pluginData the data to send to server based in the data in plugin (previous attempt).
      *
-     * @param {any} assign The assignment.
-     * @param {any} plugin The plugin object.
-     * @param {any} pluginData Object where to store the data to send.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assign The assignment.
+     * @param plugin The plugin object.
+     * @param pluginData Object where to store the data to send.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     copySubmissionData?(assign: any, plugin: any, pluginData: any, userId?: number, siteId?: string): void | Promise<any>;
 
     /**
      * Delete any stored data for the plugin and submission.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} offlineData Offline data stored.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param offlineData Offline data stored.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     deleteOfflineData?(assign: any, submission: any, plugin: any, offlineData: any, siteId?: string): void | Promise<any>;
 
@@ -81,10 +80,10 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
      * Return the Component to use to display the plugin data, either in read or in edit mode.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} plugin The plugin object.
-     * @param {boolean} [edit] Whether the user is editing.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param plugin The plugin object.
+     * @param edit Whether the user is editing.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent?(injector: Injector, plugin: any, edit?: boolean): any | Promise<any>;
 
@@ -92,57 +91,57 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
      * Get files used by this plugin.
      * The files returned by this function will be prefetched when the user prefetches the assign.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {any[]|Promise<any[]>} The files (or promise resolved with the files).
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return The files (or promise resolved with the files).
      */
     getPluginFiles?(assign: any, submission: any, plugin: any, siteId?: string): any[] | Promise<any[]>;
 
     /**
      * Get a readable name to use for the plugin.
      *
-     * @param {any} plugin The plugin object.
-     * @return {string} The plugin name.
+     * @param plugin The plugin object.
+     * @return The plugin name.
      */
     getPluginName?(plugin: any): string;
 
     /**
      * Get the size of data (in bytes) this plugin will send to copy a previous submission.
      *
-     * @param {any} assign The assignment.
-     * @param {any} plugin The plugin object.
-     * @return {number|Promise<number>} The size (or promise resolved with size).
+     * @param assign The assignment.
+     * @param plugin The plugin object.
+     * @return The size (or promise resolved with size).
      */
     getSizeForCopy?(assign: any, plugin: any): number | Promise<number>;
 
     /**
      * Get the size of data (in bytes) this plugin will send to add or edit a submission.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the submission.
-     * @return {number|Promise<number>} The size (or promise resolved with size).
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the submission.
+     * @return The size (or promise resolved with size).
      */
     getSizeForEdit?(assign: any, submission: any, plugin: any, inputData: any): number | Promise<number>;
 
     /**
      * Check if the submission data has changed for this plugin.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the submission.
-     * @return {boolean|Promise<boolean>} Boolean (or promise resolved with boolean): whether the data has changed.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the submission.
+     * @return Boolean (or promise resolved with boolean): whether the data has changed.
      */
     hasDataChanged?(assign: any, submission: any, plugin: any, inputData: any): boolean | Promise<boolean>;
 
     /**
      * Whether or not the handler is enabled for edit on a site level.
      *
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled for edit on a site level.
+     * @return Whether or not the handler is enabled for edit on a site level.
      */
     isEnabledForEdit?(): boolean | Promise<boolean>;
 
@@ -150,26 +149,26 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
      * Prefetch any required data for the plugin.
      * This should NOT prefetch files. Files to be prefetched should be returned by the getPluginFiles function.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     prefetch?(assign: any, submission: any, plugin: any, siteId?: string): Promise<any>;
 
     /**
      * Prepare and add to pluginData the data to send to the server based on the input data.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the submission.
-     * @param {any} pluginData Object where to store the data to send.
-     * @param {boolean} [offline] Whether the user is editing in offline.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the submission.
+     * @param pluginData Object where to store the data to send.
+     * @param offline Whether the user is editing in offline.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     prepareSubmissionData?(assign: any, submission: any, plugin: any, inputData: any, pluginData: any, offline?: boolean,
         userId?: number, siteId?: string): void | Promise<any>;
@@ -178,13 +177,13 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
      * Prepare and add to pluginData the data to send to the server based on the offline data stored.
      * This will be used when performing a synchronization.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} offlineData Offline data stored.
-     * @param {any} pluginData Object where to store the data to send.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param offlineData Offline data stored.
+     * @param pluginData Object where to store the data to send.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     prepareSyncData?(assign: any, submission: any, plugin: any, offlineData: any, pluginData: any, siteId?: string)
         : void | Promise<any>;
@@ -206,10 +205,10 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
     /**
      * Whether the plugin can be edited in offline for existing submissions.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @return {boolean|Promise<boolean>} Promise resolved with boolean: whether it can be edited in offline.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @return Promise resolved with boolean: whether it can be edited in offline.
      */
     canPluginEditOffline(assign: any, submission: any, plugin: any): Promise<boolean> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'canEditOffline', [assign, submission, plugin]));
@@ -218,10 +217,10 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
     /**
      * Clear some temporary data for a certain plugin because a submission was cancelled.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the submission.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the submission.
      */
     clearTmpData(assign: any, submission: any, plugin: any, inputData: any): void {
         return this.executeFunctionOnEnabled(plugin.type, 'clearTmpData', [assign, submission, plugin, inputData]);
@@ -230,12 +229,12 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
     /**
      * Copy the data from last submitted attempt to the current submission for a certain plugin.
      *
-     * @param {any} assign The assignment.
-     * @param {any} plugin The plugin object.
-     * @param {any} pluginData Object where to store the data to send.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data has been copied.
+     * @param assign The assignment.
+     * @param plugin The plugin object.
+     * @param pluginData Object where to store the data to send.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data has been copied.
      */
     copyPluginSubmissionData(assign: any, plugin: any, pluginData: any, userId?: number, siteId?: string): void | Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'copySubmissionData',
@@ -245,12 +244,12 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
     /**
      * Delete offline data stored for a certain submission and plugin.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} offlineData Offline data stored.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param offlineData Offline data stored.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     deletePluginOfflineData(assign: any, submission: any, plugin: any, offlineData: any, siteId?: string): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'deleteOfflineData',
@@ -260,10 +259,10 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
     /**
      * Get the component to use for a certain submission plugin.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} plugin The plugin object.
-     * @param {boolean} [edit] Whether the user is editing.
-     * @return {Promise<any>} Promise resolved with the component to use, undefined if not found.
+     * @param injector Injector.
+     * @param plugin The plugin object.
+     * @param edit Whether the user is editing.
+     * @return Promise resolved with the component to use, undefined if not found.
      */
     getComponentForPlugin(injector: Injector, plugin: any, edit?: boolean): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'getComponent', [injector, plugin, edit]));
@@ -273,11 +272,11 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
      * Get files used by this plugin.
      * The files returned by this function will be prefetched when the user prefetches the assign.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the files.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the files.
      */
     getPluginFiles(assign: any, submission: any, plugin: any, siteId?: string): Promise<any[]> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'getPluginFiles', [assign, submission, plugin, siteId]));
@@ -286,8 +285,8 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
     /**
      * Get a readable name to use for a certain submission plugin.
      *
-     * @param {any} plugin Plugin to get the name for.
-     * @return {string} Human readable name.
+     * @param plugin Plugin to get the name for.
+     * @return Human readable name.
      */
     getPluginName(plugin: any): string {
         return this.executeFunctionOnEnabled(plugin.type, 'getPluginName', [plugin]);
@@ -296,9 +295,9 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
     /**
      * Get the size of data (in bytes) this plugin will send to copy a previous submission.
      *
-     * @param {any} assign The assignment.
-     * @param {any} plugin The plugin object.
-     * @return {Promise<number>} Promise resolved with size.
+     * @param assign The assignment.
+     * @param plugin The plugin object.
+     * @return Promise resolved with size.
      */
     getPluginSizeForCopy(assign: any, plugin: any): Promise<number> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'getSizeForCopy', [assign, plugin]));
@@ -307,11 +306,11 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
     /**
      * Get the size of data (in bytes) this plugin will send to add or edit a submission.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the submission.
-     * @return {Promise<number>} Promise resolved with size.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the submission.
+     * @return Promise resolved with size.
      */
     getPluginSizeForEdit(assign: any, submission: any, plugin: any, inputData: any): Promise<number> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'getSizeForEdit',
@@ -321,11 +320,11 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
     /**
      * Check if the submission data has changed for a certain plugin.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the submission.
-     * @return {Promise<boolean>} Promise resolved with true if data has changed, resolved with false otherwise.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the submission.
+     * @return Promise resolved with true if data has changed, resolved with false otherwise.
      */
     hasPluginDataChanged(assign: any, submission: any, plugin: any, inputData: any): Promise<boolean> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'hasDataChanged',
@@ -335,8 +334,8 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
     /**
      * Check if a submission plugin is supported.
      *
-     * @param {string} pluginType Type of the plugin.
-     * @return {boolean} Whether it's supported.
+     * @param pluginType Type of the plugin.
+     * @return Whether it's supported.
      */
     isPluginSupported(pluginType: string): boolean {
         return this.hasHandler(pluginType, true);
@@ -345,8 +344,8 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
     /**
      * Check if a submission plugin is supported for edit.
      *
-     * @param {string} pluginType Type of the plugin.
-     * @return {Promise<boolean>} Whether it's supported for edit.
+     * @param pluginType Type of the plugin.
+     * @return Whether it's supported for edit.
      */
     isPluginSupportedForEdit(pluginType: string): Promise<boolean> {
         return Promise.resolve(this.executeFunctionOnEnabled(pluginType, 'isEnabledForEdit'));
@@ -355,11 +354,11 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
     /**
      * Prefetch any required data for a submission plugin.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     prefetch(assign: any, submission: any, plugin: any, siteId?: string): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'prefetch', [assign, submission, plugin, siteId]));
@@ -368,15 +367,15 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
     /**
      * Prepare and add to pluginData the data to submit for a certain submission plugin.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the submission.
-     * @param {any} pluginData Object where to store the data to send.
-     * @param {boolean} [offline] Whether the user is editing in offline.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when data has been gathered.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the submission.
+     * @param pluginData Object where to store the data to send.
+     * @param offline Whether the user is editing in offline.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when data has been gathered.
      */
     preparePluginSubmissionData(assign: any, submission: any, plugin: any, inputData: any, pluginData: any, offline?: boolean,
             userId?: number, siteId?: string): Promise<any> {
@@ -388,13 +387,13 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
     /**
      * Prepare and add to pluginData the data to send to server to synchronize an offline submission.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} offlineData Offline data stored.
-     * @param {any} pluginData Object where to store the data to send.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when data has been gathered.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param offlineData Offline data stored.
+     * @param pluginData Object where to store the data to send.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when data has been gathered.
      */
     preparePluginSyncData(assign: any, submission: any, plugin: any, offlineData: any, pluginData: any, siteId?: string)
             : Promise<any> {
diff --git a/src/addon/mod/assign/providers/sync-cron-handler.ts b/src/addon/mod/assign/providers/sync-cron-handler.ts
index fbfb6600c..e610567ac 100644
--- a/src/addon/mod/assign/providers/sync-cron-handler.ts
+++ b/src/addon/mod/assign/providers/sync-cron-handler.ts
@@ -29,9 +29,9 @@ export class AddonModAssignSyncCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         return this.assignSync.syncAllAssignments(siteId, force);
@@ -40,7 +40,7 @@ export class AddonModAssignSyncCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return this.assignSync.syncInterval;
diff --git a/src/addon/mod/assign/submission/comments/component/comments.ts b/src/addon/mod/assign/submission/comments/component/comments.ts
index bd6bb57c2..a9d6c4784 100644
--- a/src/addon/mod/assign/submission/comments/component/comments.ts
+++ b/src/addon/mod/assign/submission/comments/component/comments.ts
@@ -38,7 +38,7 @@ export class AddonModAssignSubmissionCommentsComponent extends AddonModAssignSub
     /**
      * Invalidate the data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     invalidate(): Promise<any> {
         return this.commentsProvider.invalidateCommentsData('module', this.assign.cmid, 'assignsubmission_comments',
diff --git a/src/addon/mod/assign/submission/comments/providers/handler.ts b/src/addon/mod/assign/submission/comments/providers/handler.ts
index fa4f7af2b..54f450df5 100644
--- a/src/addon/mod/assign/submission/comments/providers/handler.ts
+++ b/src/addon/mod/assign/submission/comments/providers/handler.ts
@@ -33,10 +33,10 @@ export class AddonModAssignSubmissionCommentsHandler implements AddonModAssignSu
      * plugin uses Moodle filters. The reason is that the app only prefetches filtered data, and the user should edit
      * unfiltered data.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @return {boolean|Promise<boolean>} Boolean or promise resolved with boolean: whether it can be edited in offline.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @return Boolean or promise resolved with boolean: whether it can be edited in offline.
      */
     canEditOffline(assign: any, submission: any, plugin: any): boolean | Promise<boolean> {
         // This plugin is read only, but return true to prevent blocking the edition.
@@ -47,10 +47,10 @@ export class AddonModAssignSubmissionCommentsHandler implements AddonModAssignSu
      * Return the Component to use to display the plugin data, either in read or in edit mode.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} plugin The plugin object.
-     * @param {boolean} [edit] Whether the user is editing.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param plugin The plugin object.
+     * @param edit Whether the user is editing.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any, edit?: boolean): any | Promise<any> {
         return edit ? undefined : AddonModAssignSubmissionCommentsComponent;
@@ -59,7 +59,7 @@ export class AddonModAssignSubmissionCommentsHandler implements AddonModAssignSu
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -68,7 +68,7 @@ export class AddonModAssignSubmissionCommentsHandler implements AddonModAssignSu
     /**
      * Whether or not the handler is enabled for edit on a site level.
      *
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled for edit on a site level.
+     * @return Whether or not the handler is enabled for edit on a site level.
      */
     isEnabledForEdit(): boolean | Promise<boolean> {
         return true;
@@ -78,11 +78,11 @@ export class AddonModAssignSubmissionCommentsHandler implements AddonModAssignSu
      * Prefetch any required data for the plugin.
      * This should NOT prefetch files. Files to be prefetched should be returned by the getPluginFiles function.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     prefetch(assign: any, submission: any, plugin: any, siteId?: string): Promise<any> {
         return this.commentsProvider.getComments('module', assign.cmid, 'assignsubmission_comments', submission.id,
diff --git a/src/addon/mod/assign/submission/file/providers/handler.ts b/src/addon/mod/assign/submission/file/providers/handler.ts
index 1e013db7a..57a4a70bf 100644
--- a/src/addon/mod/assign/submission/file/providers/handler.ts
+++ b/src/addon/mod/assign/submission/file/providers/handler.ts
@@ -48,10 +48,10 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
      * plugin uses Moodle filters. The reason is that the app only prefetches filtered data, and the user should edit
      * unfiltered data.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @return {boolean|Promise<boolean>} Boolean or promise resolved with boolean: whether it can be edited in offline.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @return Boolean or promise resolved with boolean: whether it can be edited in offline.
      */
     canEditOffline(assign: any, submission: any, plugin: any): boolean | Promise<boolean> {
         // This plugin doesn't use Moodle filters, it can be edited in offline.
@@ -61,10 +61,10 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
     /**
      * Should clear temporary data for a cancelled submission.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the submission.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the submission.
      */
     clearTmpData(assign: any, submission: any, plugin: any, inputData: any): void {
         const files = this.fileSessionProvider.getFiles(AddonModAssignProvider.COMPONENT, assign.id);
@@ -80,12 +80,12 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
      * This function will be called when the user wants to create a new submission based on the previous one.
      * It should add to pluginData the data to send to server based in the data in plugin (previous attempt).
      *
-     * @param {any} assign The assignment.
-     * @param {any} plugin The plugin object.
-     * @param {any} pluginData Object where to store the data to send.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assign The assignment.
+     * @param plugin The plugin object.
+     * @param pluginData Object where to store the data to send.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     copySubmissionData(assign: any, plugin: any, pluginData: any, userId?: number, siteId?: string): void | Promise<any> {
         // We need to re-upload all the existing files.
@@ -100,10 +100,10 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
      * Return the Component to use to display the plugin data, either in read or in edit mode.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} plugin The plugin object.
-     * @param {boolean} [edit] Whether the user is editing.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param plugin The plugin object.
+     * @param edit Whether the user is editing.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any, edit?: boolean): any | Promise<any> {
         return AddonModAssignSubmissionFileComponent;
@@ -112,12 +112,12 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
     /**
      * Delete any stored data for the plugin and submission.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} offlineData Offline data stored.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param offlineData Offline data stored.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     deleteOfflineData(assign: any, submission: any, plugin: any, offlineData: any, siteId?: string): void | Promise<any> {
         return this.assignHelper.deleteStoredSubmissionFiles(assign.id, AddonModAssignSubmissionFileHandler.FOLDER_NAME,
@@ -130,11 +130,11 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
      * Get files used by this plugin.
      * The files returned by this function will be prefetched when the user prefetches the assign.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {any[]|Promise<any[]>} The files (or promise resolved with the files).
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return The files (or promise resolved with the files).
      */
     getPluginFiles(assign: any, submission: any, plugin: any, siteId?: string): any[] | Promise<any[]> {
         return this.assignProvider.getSubmissionPluginAttachments(plugin);
@@ -143,9 +143,9 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
     /**
      * Get the size of data (in bytes) this plugin will send to copy a previous submission.
      *
-     * @param {any} assign The assignment.
-     * @param {any} plugin The plugin object.
-     * @return {number|Promise<number>} The size (or promise resolved with size).
+     * @param assign The assignment.
+     * @param plugin The plugin object.
+     * @return The size (or promise resolved with size).
      */
     getSizeForCopy(assign: any, plugin: any): number | Promise<number> {
         const files = this.assignProvider.getSubmissionPluginAttachments(plugin),
@@ -171,11 +171,11 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
     /**
      * Get the size of data (in bytes) this plugin will send to add or edit a submission.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the submission.
-     * @return {number|Promise<number>} The size (or promise resolved with size).
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the submission.
+     * @return The size (or promise resolved with size).
      */
     getSizeForEdit(assign: any, submission: any, plugin: any, inputData: any): number | Promise<number> {
         const siteId = this.sitesProvider.getCurrentSiteId();
@@ -226,11 +226,11 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
     /**
      * Check if the submission data has changed for this plugin.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the submission.
-     * @return {boolean|Promise<boolean>} Boolean (or promise resolved with boolean): whether the data has changed.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the submission.
+     * @return Boolean (or promise resolved with boolean): whether the data has changed.
      */
     hasDataChanged(assign: any, submission: any, plugin: any, inputData: any): boolean | Promise<boolean> {
         // Check if there's any offline data.
@@ -271,7 +271,7 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -280,7 +280,7 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
     /**
      * Whether or not the handler is enabled for edit on a site level.
      *
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled for edit on a site level.
+     * @return Whether or not the handler is enabled for edit on a site level.
      */
     isEnabledForEdit(): boolean | Promise<boolean> {
         return true;
@@ -289,15 +289,15 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
     /**
      * Prepare and add to pluginData the data to send to the server based on the input data.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the submission.
-     * @param {any} pluginData Object where to store the data to send.
-     * @param {boolean} [offline] Whether the user is editing in offline.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the submission.
+     * @param pluginData Object where to store the data to send.
+     * @param offline Whether the user is editing in offline.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     prepareSubmissionData(assign: any, submission: any, plugin: any, inputData: any, pluginData: any, offline?: boolean,
             userId?: number, siteId?: string): void | Promise<any> {
@@ -322,13 +322,13 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
      * Prepare and add to pluginData the data to send to the server based on the offline data stored.
      * This will be used when performing a synchronization.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} offlineData Offline data stored.
-     * @param {any} pluginData Object where to store the data to send.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param offlineData Offline data stored.
+     * @param pluginData Object where to store the data to send.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     prepareSyncData(assign: any, submission: any, plugin: any, offlineData: any, pluginData: any, siteId?: string)
             : void | Promise<any> {
diff --git a/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts b/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts
index 11ab6f2d0..25b0cd5e6 100644
--- a/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts
+++ b/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts
@@ -96,7 +96,7 @@ export class AddonModAssignSubmissionOnlineTextComponent extends AddonModAssignS
     /**
      * Text changed.
      *
-     * @param {string} text The new text.
+     * @param text The new text.
      */
     onChange(text: string): void {
         // Count words if needed.
diff --git a/src/addon/mod/assign/submission/onlinetext/providers/handler.ts b/src/addon/mod/assign/submission/onlinetext/providers/handler.ts
index 80745907b..dd4b847a4 100644
--- a/src/addon/mod/assign/submission/onlinetext/providers/handler.ts
+++ b/src/addon/mod/assign/submission/onlinetext/providers/handler.ts
@@ -41,10 +41,10 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
      * plugin uses Moodle filters. The reason is that the app only prefetches filtered data, and the user should edit
      * unfiltered data.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @return {boolean|Promise<boolean>} Boolean or promise resolved with boolean: whether it can be edited in offline.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @return Boolean or promise resolved with boolean: whether it can be edited in offline.
      */
     canEditOffline(assign: any, submission: any, plugin: any): boolean | Promise<boolean> {
         // This plugin uses Moodle filters, it cannot be edited in offline.
@@ -55,12 +55,12 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
      * This function will be called when the user wants to create a new submission based on the previous one.
      * It should add to pluginData the data to send to server based in the data in plugin (previous attempt).
      *
-     * @param {any} assign The assignment.
-     * @param {any} plugin The plugin object.
-     * @param {any} pluginData Object where to store the data to send.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assign The assignment.
+     * @param plugin The plugin object.
+     * @param pluginData Object where to store the data to send.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     copySubmissionData(assign: any, plugin: any, pluginData: any, userId?: number, siteId?: string): void | Promise<any> {
         const text = this.assignProvider.getSubmissionPluginText(plugin, true),
@@ -88,10 +88,10 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
      * Return the Component to use to display the plugin data, either in read or in edit mode.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} plugin The plugin object.
-     * @param {boolean} [edit] Whether the user is editing.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param plugin The plugin object.
+     * @param edit Whether the user is editing.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any, edit?: boolean): any | Promise<any> {
         return AddonModAssignSubmissionOnlineTextComponent;
@@ -101,11 +101,11 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
      * Get files used by this plugin.
      * The files returned by this function will be prefetched when the user prefetches the assign.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {any[]|Promise<any[]>} The files (or promise resolved with the files).
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return The files (or promise resolved with the files).
      */
     getPluginFiles(assign: any, submission: any, plugin: any, siteId?: string): any[] | Promise<any[]> {
         return this.assignProvider.getSubmissionPluginAttachments(plugin);
@@ -114,9 +114,9 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
     /**
      * Get the size of data (in bytes) this plugin will send to copy a previous submission.
      *
-     * @param {any} assign The assignment.
-     * @param {any} plugin The plugin object.
-     * @return {number|Promise<number>} The size (or promise resolved with size).
+     * @param assign The assignment.
+     * @param plugin The plugin object.
+     * @return The size (or promise resolved with size).
      */
     getSizeForCopy(assign: any, plugin: any): number | Promise<number> {
         const text = this.assignProvider.getSubmissionPluginText(plugin, true),
@@ -147,11 +147,11 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
     /**
      * Get the size of data (in bytes) this plugin will send to add or edit a submission.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the submission.
-     * @return {number|Promise<number>} The size (or promise resolved with size).
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the submission.
+     * @return The size (or promise resolved with size).
      */
     getSizeForEdit(assign: any, submission: any, plugin: any, inputData: any): number | Promise<number> {
         const text = this.assignProvider.getSubmissionPluginText(plugin, true);
@@ -162,9 +162,9 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
     /**
      * Get the text to submit.
      *
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the submission.
-     * @return {string} Text to submit.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the submission.
+     * @return Text to submit.
      */
     protected getTextToSubmit(plugin: any, inputData: any): string {
         const text = inputData.onlinetext_editor_text,
@@ -176,11 +176,11 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
     /**
      * Check if the submission data has changed for this plugin.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the submission.
-     * @return {boolean|Promise<boolean>} Boolean (or promise resolved with boolean): whether the data has changed.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the submission.
+     * @return Boolean (or promise resolved with boolean): whether the data has changed.
      */
     hasDataChanged(assign: any, submission: any, plugin: any, inputData: any): boolean | Promise<boolean> {
         // Get the original text from plugin or offline.
@@ -202,7 +202,7 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -211,7 +211,7 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
     /**
      * Whether or not the handler is enabled for edit on a site level.
      *
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled for edit on a site level.
+     * @return Whether or not the handler is enabled for edit on a site level.
      */
     isEnabledForEdit(): boolean | Promise<boolean> {
         // There's a bug in Moodle 3.1.0 that doesn't allow submitting HTML, so we'll disable this plugin in that case.
@@ -224,15 +224,15 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
     /**
      * Prepare and add to pluginData the data to send to the server based on the input data.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} inputData Data entered by the user for the submission.
-     * @param {any} pluginData Object where to store the data to send.
-     * @param {boolean} [offline] Whether the user is editing in offline.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param inputData Data entered by the user for the submission.
+     * @param pluginData Object where to store the data to send.
+     * @param offline Whether the user is editing in offline.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     prepareSubmissionData(assign: any, submission: any, plugin: any, inputData: any, pluginData: any, offline?: boolean,
             userId?: number, siteId?: string): void | Promise<any> {
@@ -266,13 +266,13 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
      * Prepare and add to pluginData the data to send to the server based on the offline data stored.
      * This will be used when performing a synchronization.
      *
-     * @param {any} assign The assignment.
-     * @param {any} submission The submission.
-     * @param {any} plugin The plugin object.
-     * @param {any} offlineData Offline data stored.
-     * @param {any} pluginData Object where to store the data to send.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} If the function is async, it should return a Promise resolved when done.
+     * @param assign The assignment.
+     * @param submission The submission.
+     * @param plugin The plugin object.
+     * @param offlineData Offline data stored.
+     * @param pluginData Object where to store the data to send.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If the function is async, it should return a Promise resolved when done.
      */
     prepareSyncData(assign: any, submission: any, plugin: any, offlineData: any, pluginData: any, siteId?: string)
             : void | Promise<any> {
diff --git a/src/addon/mod/book/components/index/index.ts b/src/addon/mod/book/components/index/index.ts
index 569060aa3..794d4970c 100644
--- a/src/addon/mod/book/components/index/index.ts
+++ b/src/addon/mod/book/components/index/index.ts
@@ -61,7 +61,7 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
     /**
      * Show the TOC.
      *
-     * @param {MouseEvent} event Event.
+     * @param event Event.
      */
     showToc(event: MouseEvent): void {
         // Create the toc modal.
@@ -88,8 +88,8 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
     /**
      * Change the current chapter.
      *
-     * @param {string} chapterId Chapter to load.
-     * @return {Promise<void>} Promise resolved when done.
+     * @param chapterId Chapter to load.
+     * @return Promise resolved when done.
      */
     changeChapter(chapterId: string): void {
         if (chapterId && chapterId != this.currentChapter) {
@@ -102,7 +102,7 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         return this.bookProvider.invalidateContent(this.module.id, this.courseId);
@@ -111,8 +111,8 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
     /**
      * Download book contents and load the current chapter.
      *
-     * @param {boolean} [refresh] Whether we're refreshing data.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Whether we're refreshing data.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh?: boolean): Promise<any> {
         const promises = [];
@@ -175,8 +175,8 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
     /**
      * Load a book chapter.
      *
-     * @param {string} chapterId Chapter to load.
-     * @return {Promise<void>} Promise resolved when done.
+     * @param chapterId Chapter to load.
+     * @return Promise resolved when done.
      */
     protected loadChapter(chapterId: string): Promise<void> {
         this.currentChapter = chapterId;
diff --git a/src/addon/mod/book/pages/index/index.ts b/src/addon/mod/book/pages/index/index.ts
index 7bb9e1f0f..fc95e6b4a 100644
--- a/src/addon/mod/book/pages/index/index.ts
+++ b/src/addon/mod/book/pages/index/index.ts
@@ -42,7 +42,7 @@ export class AddonModBookIndexPage {
     /**
      * Update some data based on the book instance.
      *
-     * @param {any} book Book instance.
+     * @param book Book instance.
      */
     updateData(book: any): void {
         this.title = book.name || this.title;
diff --git a/src/addon/mod/book/pages/toc/toc.ts b/src/addon/mod/book/pages/toc/toc.ts
index 8048eacb8..0478faf2c 100644
--- a/src/addon/mod/book/pages/toc/toc.ts
+++ b/src/addon/mod/book/pages/toc/toc.ts
@@ -36,7 +36,7 @@ export class AddonModBookTocPage {
     /**
      * Function called when a course is clicked.
      *
-     * @param {string} id ID of the clicked chapter.
+     * @param id ID of the clicked chapter.
      */
     loadChapter(id: string): void {
         this.viewCtrl.dismiss(id);
diff --git a/src/addon/mod/book/providers/book.ts b/src/addon/mod/book/providers/book.ts
index 74fd32706..1e97a6749 100644
--- a/src/addon/mod/book/providers/book.ts
+++ b/src/addon/mod/book/providers/book.ts
@@ -32,19 +32,16 @@ import { CoreTagItem } from '@core/tag/providers/tag';
 export interface AddonModBookTocChapter {
     /**
      * ID to identify the chapter.
-     * @type {string}
      */
     id: string;
 
     /**
      * Chapter's title.
-     * @type {string}
      */
     title: string;
 
     /**
      * The chapter's level.
-     * @type {number}
      */
     level: number;
 }
@@ -81,10 +78,10 @@ export class AddonModBookProvider {
     /**
      * Get a book by course module ID.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} cmId Course module ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the book is retrieved.
+     * @param courseId Course ID.
+     * @param cmId Course module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the book is retrieved.
      */
     getBook(courseId: number, cmId: number, siteId?: string): Promise<any> {
         return this.getBookByField(courseId, 'coursemodule', cmId, siteId);
@@ -93,11 +90,11 @@ export class AddonModBookProvider {
     /**
      * Get a book with key=value. If more than one is found, only the first will be returned.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} key Name of the property to check.
-     * @param {any} value Value to search.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the book is retrieved.
+     * @param courseId Course ID.
+     * @param key Name of the property to check.
+     * @param value Value to search.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the book is retrieved.
      */
     protected getBookByField(courseId: number, key: string, value: any, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -128,8 +125,8 @@ export class AddonModBookProvider {
     /**
      * Get cache key for get book data WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getBookDataCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'book:' + courseId;
@@ -138,10 +135,10 @@ export class AddonModBookProvider {
     /**
      * Gets a chapter contents.
      *
-     * @param {AddonModBookContentsMap} contentsMap Contents map returned by getContentsMap.
-     * @param {string} chapterId Chapter to retrieve.
-     * @param {number} moduleId The module ID.
-     * @return {Promise<string>} Promise resolved with the contents.
+     * @param contentsMap Contents map returned by getContentsMap.
+     * @param chapterId Chapter to retrieve.
+     * @param moduleId The module ID.
+     * @return Promise resolved with the contents.
      */
     getChapterContent(contentsMap: AddonModBookContentsMap, chapterId: string, moduleId: number): Promise<string> {
         const indexUrl = contentsMap[chapterId] ? contentsMap[chapterId].indexUrl : undefined,
@@ -182,8 +179,8 @@ export class AddonModBookProvider {
      * Convert an array of book contents into an object where contents are organized in chapters.
      * Each chapter has an indexUrl and the list of contents in that chapter.
      *
-     * @param {any[]} contents The module contents.
-     * @return {AddonModBookContentsMap} Contents map.
+     * @param contents The module contents.
+     * @return Contents map.
      */
     getContentsMap(contents: any[]): AddonModBookContentsMap {
         const map: AddonModBookContentsMap = {};
@@ -236,8 +233,8 @@ export class AddonModBookProvider {
     /**
      * Get the first chapter of a book.
      *
-     * @param {AddonModBookTocChapter[]} chapters The chapters list.
-     * @return {string} The chapter id.
+     * @param chapters The chapters list.
+     * @return The chapter id.
      */
     getFirstChapter(chapters: AddonModBookTocChapter[]): string {
         if (!chapters || !chapters.length) {
@@ -250,9 +247,9 @@ export class AddonModBookProvider {
     /**
      * Get the next chapter to the given one.
      *
-     * @param {AddonModBookTocChapter[]} chapters The chapters list.
-     * @param {string} chapterId The current chapter.
-     * @return {string} The next chapter id.
+     * @param chapters The chapters list.
+     * @param chapterId The current chapter.
+     * @return The next chapter id.
      */
     getNextChapter(chapters: AddonModBookTocChapter[], chapterId: string): string {
         let next = '0';
@@ -272,9 +269,9 @@ export class AddonModBookProvider {
     /**
      * Get the previous chapter to the given one.
      *
-     * @param {AddonModBookTocChapter[]} chapters The chapters list.
-     * @param {string} chapterId The current chapter.
-     * @return {string} The next chapter id.
+     * @param chapters The chapters list.
+     * @param chapterId The current chapter.
+     * @return The next chapter id.
      */
     getPreviousChapter(chapters: AddonModBookTocChapter[], chapterId: string): string {
         let previous = '0';
@@ -292,8 +289,8 @@ export class AddonModBookProvider {
     /**
      * Get the book toc as an array.
      *
-     * @param {any[]} contents The module contents.
-     * @return {any[]} The toc.
+     * @param contents The module contents.
+     * @return The toc.
      */
     getToc(contents: any[]): any[] {
         if (!contents || !contents.length) {
@@ -306,8 +303,8 @@ export class AddonModBookProvider {
     /**
      * Get the book toc as an array of chapters (not nested).
      *
-     * @param {any[]} contents The module contents.
-     * @return {AddonModBookTocChapter[]} The toc as a list.
+     * @param contents The module contents.
+     * @return The toc as a list.
      */
     getTocList(contents: any[]): AddonModBookTocChapter[] {
         const chapters = [],
@@ -333,9 +330,9 @@ export class AddonModBookProvider {
     /**
      * Invalidates book data.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateBookData(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -346,10 +343,10 @@ export class AddonModBookProvider {
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId Course ID of the module.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID of the module.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -366,8 +363,8 @@ export class AddonModBookProvider {
     /**
      * Check if a file is downloadable. The file param must have a 'type' attribute like in core_course_get_contents response.
      *
-     * @param {any} file File to check.
-     * @return {boolean} Whether it's downloadable.
+     * @param file File to check.
+     * @return Whether it's downloadable.
      */
     isFileDownloadable(file: any): boolean {
         return file.type === 'file';
@@ -376,8 +373,8 @@ export class AddonModBookProvider {
     /**
      * Return whether or not the plugin is enabled.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
      */
     isPluginEnabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -388,11 +385,11 @@ export class AddonModBookProvider {
     /**
      * Report a book as being viewed.
      *
-     * @param {number} id Module ID.
-     * @param {string} chapterId Chapter ID.
-     * @param {string} [name] Name of the book.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the WS call is successful.
+     * @param id Module ID.
+     * @param chapterId Chapter ID.
+     * @param name Name of the book.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(id: number, chapterId: string, name?: string, siteId?: string): Promise<any> {
         const params = {
diff --git a/src/addon/mod/book/providers/link-handler.ts b/src/addon/mod/book/providers/link-handler.ts
index 631885cbe..bba613b19 100644
--- a/src/addon/mod/book/providers/link-handler.ts
+++ b/src/addon/mod/book/providers/link-handler.ts
@@ -31,11 +31,11 @@ export class AddonModBookLinkHandler extends CoreContentLinksModuleIndexHandler
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
diff --git a/src/addon/mod/book/providers/list-link-handler.ts b/src/addon/mod/book/providers/list-link-handler.ts
index 5351a9ae4..4b3f403d0 100644
--- a/src/addon/mod/book/providers/list-link-handler.ts
+++ b/src/addon/mod/book/providers/list-link-handler.ts
@@ -34,11 +34,11 @@ export class AddonModBookListLinkHandler extends CoreContentLinksModuleListHandl
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return this.bookProvider.isPluginEnabled();
diff --git a/src/addon/mod/book/providers/module-handler.ts b/src/addon/mod/book/providers/module-handler.ts
index 6f92d6f32..565b5a36c 100644
--- a/src/addon/mod/book/providers/module-handler.ts
+++ b/src/addon/mod/book/providers/module-handler.ts
@@ -45,7 +45,7 @@ export class AddonModBookModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.bookProvider.isPluginEnabled();
@@ -54,10 +54,10 @@ export class AddonModBookModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         return {
@@ -80,10 +80,10 @@ export class AddonModBookModuleHandler implements CoreCourseModuleHandler {
      * The component returned must implement CoreCourseModuleMainComponent.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getMainComponent(injector: Injector, course: any, module: any): any | Promise<any> {
         return AddonModBookIndexComponent;
diff --git a/src/addon/mod/book/providers/prefetch-handler.ts b/src/addon/mod/book/providers/prefetch-handler.ts
index 0289370cd..d1055bbec 100644
--- a/src/addon/mod/book/providers/prefetch-handler.ts
+++ b/src/addon/mod/book/providers/prefetch-handler.ts
@@ -43,13 +43,13 @@ export class AddonModBookPrefetchHandler extends CoreCourseResourcePrefetchHandl
     /**
      * Download or prefetch the content.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @param {boolean} [prefetch] True to prefetch, false to download right away.
-     * @param {string} [dirPath] Path of the directory where to store all the content files. This is to keep the files
-     *                           relative paths and make the package work in an iframe. Undefined to download the files
-     *                           in the filepool root folder.
-     * @return {Promise<any>} Promise resolved when all content is downloaded. Data returned is not reliable.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @param prefetch True to prefetch, false to download right away.
+     * @param dirPath Path of the directory where to store all the content files. This is to keep the files
+     *                relative paths and make the package work in an iframe. Undefined to download the files
+     *                in the filepool root folder.
+     * @return Promise resolved when all content is downloaded. Data returned is not reliable.
      */
     downloadOrPrefetch(module: any, courseId: number, prefetch?: boolean, dirPath?: string): Promise<any> {
         const promises = [];
@@ -65,9 +65,9 @@ export class AddonModBookPrefetchHandler extends CoreCourseResourcePrefetchHandl
     /**
      * Returns module intro files.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @return {Promise<any[]>} Promise resolved with list of intro files.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @return Promise resolved with list of intro files.
      */
     getIntroFiles(module: any, courseId: number): Promise<any[]> {
         return this.bookProvider.getBook(courseId, module.id).catch(() => {
@@ -80,9 +80,9 @@ export class AddonModBookPrefetchHandler extends CoreCourseResourcePrefetchHandl
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         return this.bookProvider.invalidateContent(moduleId, courseId);
@@ -91,7 +91,7 @@ export class AddonModBookPrefetchHandler extends CoreCourseResourcePrefetchHandl
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
+     * @return A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.bookProvider.isPluginEnabled();
diff --git a/src/addon/mod/book/providers/tag-area-handler.ts b/src/addon/mod/book/providers/tag-area-handler.ts
index 47c456cb6..afa55b00b 100644
--- a/src/addon/mod/book/providers/tag-area-handler.ts
+++ b/src/addon/mod/book/providers/tag-area-handler.ts
@@ -33,7 +33,7 @@ export class AddonModBookTagAreaHandler implements CoreTagAreaHandler {
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.bookProvider.isPluginEnabled();
@@ -42,8 +42,8 @@ export class AddonModBookTagAreaHandler implements CoreTagAreaHandler {
     /**
      * Parses the rendered content of a tag index and returns the items.
      *
-     * @param {string} content Rendered content.
-     * @return {any[]|Promise<any[]>} Area items (or promise resolved with the items).
+     * @param content Rendered content.
+     * @return Area items (or promise resolved with the items).
      */
     parseContent(content: string): any[] | Promise<any[]> {
         const items = this.tagHelper.parseFeedContent(content);
@@ -66,8 +66,8 @@ export class AddonModBookTagAreaHandler implements CoreTagAreaHandler {
     /**
      * Get the component to use to display items.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return CoreTagFeedComponent;
diff --git a/src/addon/mod/chat/components/index/index.ts b/src/addon/mod/chat/components/index/index.ts
index 585c6f4e8..71e646d53 100644
--- a/src/addon/mod/chat/components/index/index.ts
+++ b/src/addon/mod/chat/components/index/index.ts
@@ -58,10 +58,10 @@ export class AddonModChatIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Download chat.
      *
-     * @param  {boolean}      [refresh=false]    If it's refreshing content.
-     * @param  {boolean}      [sync=false]       If it should try to sync.
-     * @param  {boolean}      [showErrors=false] If show errors to the user of hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh If it's refreshing content.
+     * @param sync If it should try to sync.
+     * @param showErrors If show errors to the user of hide them.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<any> {
         return this.chatProvider.getChat(this.courseId, this.module.id).then((chat) => {
diff --git a/src/addon/mod/chat/pages/chat/chat.ts b/src/addon/mod/chat/pages/chat/chat.ts
index 41bd0e1ca..e4951d6e3 100644
--- a/src/addon/mod/chat/pages/chat/chat.ts
+++ b/src/addon/mod/chat/pages/chat/chat.ts
@@ -131,7 +131,7 @@ export class AddonModChatChatPage {
     /**
      * Convenience function to login the user.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected loginUser(): Promise<any> {
         return this.chatProvider.loginUser(this.chatId).then((sessionId) => {
@@ -142,7 +142,7 @@ export class AddonModChatChatPage {
     /**
      * Convenience function to fetch chat messages.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchMessages(): Promise<any> {
         return this.chatProvider.getLatestMessages(this.sessionId, this.lastTime).then((messagesInfo) => {
@@ -188,7 +188,7 @@ export class AddonModChatChatPage {
     /**
      * Convenience function to be called every certain time to fetch chat messages.
      *
-     * @return {Promise<any>} Promised resolved when done.
+     * @return Promised resolved when done.
      */
     protected fetchMessagesInterval(): Promise<any> {
         this.logger.debug('Polling for messages');
@@ -221,9 +221,9 @@ export class AddonModChatChatPage {
     /**
      * Check if the date should be displayed between messages (when the day changes at midnight for example).
      *
-     * @param  {any} message     New message object.
-     * @param  {any} prevMessage Previous message object.
-     * @return {boolean} True if messages are from diferent days, false othetwise.
+     * @param message New message object.
+     * @param prevMessage Previous message object.
+     * @return True if messages are from diferent days, false othetwise.
      */
     showDate(message: any, prevMessage: any): boolean {
         if (!prevMessage) {
@@ -237,8 +237,8 @@ export class AddonModChatChatPage {
     /**
      * Send a message to the chat.
      *
-     * @param {string} text     Text of the nessage.
-     * @param {number} [beep=0] ID of the user to beep.
+     * @param text Text of the nessage.
+     * @param beep ID of the user to beep.
      */
     sendMessage(text: string, beep: number = 0): void {
         if (!this.isOnline) {
diff --git a/src/addon/mod/chat/pages/index/index.ts b/src/addon/mod/chat/pages/index/index.ts
index 391b654fc..7eb57a4b9 100644
--- a/src/addon/mod/chat/pages/index/index.ts
+++ b/src/addon/mod/chat/pages/index/index.ts
@@ -40,7 +40,7 @@ export class AddonModChatIndexPage {
     /**
      * Update some data based on the chat instance.
      *
-     * @param {any} chat Chat instance.
+     * @param chat Chat instance.
      */
     updateData(chat: any): void {
         this.title = chat.name || this.title;
diff --git a/src/addon/mod/chat/pages/session-messages/session-messages.ts b/src/addon/mod/chat/pages/session-messages/session-messages.ts
index 91fe8874b..b96ed597a 100644
--- a/src/addon/mod/chat/pages/session-messages/session-messages.ts
+++ b/src/addon/mod/chat/pages/session-messages/session-messages.ts
@@ -49,7 +49,7 @@ export class AddonModChatSessionMessagesPage {
     /**
      * Fetch session messages.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchMessages(): Promise<any> {
         return this.chatProvider.getSessionMessages(this.chatId, this.sessionStart, this.sessionEnd, this.groupId)
@@ -67,7 +67,7 @@ export class AddonModChatSessionMessagesPage {
     /**
      * Refresh session messages.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshMessages(refresher: any): void {
         this.chatProvider.invalidateSessionMessages(this.chatId, this.sessionStart, this.groupId).finally(() => {
@@ -80,9 +80,9 @@ export class AddonModChatSessionMessagesPage {
    /**
     * Check if the date should be displayed between messages (when the day changes at midnight for example).
     *
-    * @param  {any} message     New message object.
-    * @param  {any} prevMessage Previous message object.
-    * @return {boolean} True if messages are from diferent days, false othetwise.
+    * @param message New message object.
+    * @param prevMessage Previous message object.
+    * @return True if messages are from diferent days, false othetwise.
     */
    showDate(message: any, prevMessage: any): boolean {
        if (!prevMessage) {
diff --git a/src/addon/mod/chat/pages/sessions/sessions.ts b/src/addon/mod/chat/pages/sessions/sessions.ts
index 373a38dce..6043f3f3b 100644
--- a/src/addon/mod/chat/pages/sessions/sessions.ts
+++ b/src/addon/mod/chat/pages/sessions/sessions.ts
@@ -62,8 +62,8 @@ export class AddonModChatSessionsPage {
     /**
      * Fetch chat sessions.
      *
-     * @param {number} [showLoading] Display a loading modal.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param showLoading Display a loading modal.
+     * @return Promise resolved when done.
      */
     fetchSessions(showLoading?: boolean): Promise<any> {
         const modal = showLoading ? this.domUtils.showModalLoading() : null;
@@ -112,7 +112,7 @@ export class AddonModChatSessionsPage {
     /**
      * Refresh chat sessions.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshSessions(refresher: any): void {
         const promises = [
@@ -130,7 +130,7 @@ export class AddonModChatSessionsPage {
     /**
      * Navigate to a session.
      *
-     * @param {any} session Chat session.
+     * @param session Chat session.
      */
     openSession(session: any): void {
         this.selectedSessionStart = session.sessionstart;
@@ -148,8 +148,8 @@ export class AddonModChatSessionsPage {
     /**
      * Show more session users.
      *
-     * @param {any} session Chat session.
-     * @param {Event} $event The event.
+     * @param session Chat session.
+     * @param $event The event.
      */
     showMoreUsers(session: any, $event: Event): void {
         session.sessionusers = session.allsessionusers;
diff --git a/src/addon/mod/chat/pages/users/users.ts b/src/addon/mod/chat/pages/users/users.ts
index 90e59df6d..4cd59049d 100644
--- a/src/addon/mod/chat/pages/users/users.ts
+++ b/src/addon/mod/chat/pages/users/users.ts
@@ -75,7 +75,7 @@ export class AddonModChatUsersPage {
     /**
      * Add "To user:".
      *
-     * @param {any} user User object.
+     * @param user User object.
      */
      talkTo(user: any): void {
         this.viewCtrl.dismiss({talkTo: user.fullname});
@@ -84,7 +84,7 @@ export class AddonModChatUsersPage {
     /**
      * Beep a user.
      *
-     * @param {any} user User object.
+     * @param user User object.
      */
     beepTo(user: any): void {
         this.viewCtrl.dismiss({beepTo: user.id});
diff --git a/src/addon/mod/chat/providers/chat.ts b/src/addon/mod/chat/providers/chat.ts
index 4e6b6df9b..9b9a02e39 100644
--- a/src/addon/mod/chat/providers/chat.ts
+++ b/src/addon/mod/chat/providers/chat.ts
@@ -36,10 +36,10 @@ export class AddonModChatProvider {
     /**
      * Get a chat.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} cmId Course module ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the chat is retrieved.
+     * @param courseId Course ID.
+     * @param cmId Course module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the chat is retrieved.
      */
     getChat(courseId: number, cmId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -67,8 +67,8 @@ export class AddonModChatProvider {
     /**
      * Log the user into a chat room.
      *
-     * @param  {number} chatId Chat instance ID.
-     * @return {Promise<any>} Promise resolved when the WS is executed.
+     * @param chatId Chat instance ID.
+     * @return Promise resolved when the WS is executed.
      */
     loginUser(chatId: number): Promise<any> {
         const params = {
@@ -87,10 +87,10 @@ export class AddonModChatProvider {
     /**
      * Report a chat as being viewed.
      *
-     * @param  {number} id Chat instance ID.
-     * @param {string} [name] Name of the chat.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the WS call is successful.
+     * @param id Chat instance ID.
+     * @param name Name of the chat.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(id: number, name?: string, siteId?: string): Promise<any> {
         const params = {
@@ -103,10 +103,10 @@ export class AddonModChatProvider {
     /**
      * Send a message to a chat.
      *
-     * @param  {number} sessionId  Chat sessiond ID.
-     * @param  {string} message    Message text.
-     * @param  {number} beepUserId Beep user ID.
-     * @return {Promise<any>} Promise resolved when the WS is executed.
+     * @param sessionId Chat sessiond ID.
+     * @param message Message text.
+     * @param beepUserId Beep user ID.
+     * @return Promise resolved when the WS is executed.
      */
     sendMessage(sessionId: number, message: string, beepUserId: number): Promise<any> {
         const params = {
@@ -127,9 +127,9 @@ export class AddonModChatProvider {
     /**
      * Get the latest messages from a chat session.
      *
-     * @param  {number} sessionId Chat sessiond ID.
-     * @param  {number} lastTime  Last time when messages were retrieved.
-     * @return {Promise<any>} Promise resolved when the WS is executed.
+     * @param sessionId Chat sessiond ID.
+     * @param lastTime Last time when messages were retrieved.
+     * @return Promise resolved when the WS is executed.
      */
     getLatestMessages(sessionId: number, lastTime: number): Promise<any> {
         const params = {
@@ -145,9 +145,9 @@ export class AddonModChatProvider {
     /**
      * Get user data for messages since they only have userid.
      *
-     * @param  {any[]}  messages Messages to get the user data for.
-     * @param  {number} courseId ID of the course the messages belong to.
-     * @return {Promise<any>} Promise always resolved with the formatted messages.
+     * @param messages Messages to get the user data for.
+     * @param courseId ID of the course the messages belong to.
+     * @return Promise always resolved with the formatted messages.
      */
     getMessagesUserData(messages: any[], courseId: number): Promise<any> {
         const promises = messages.map((message) => {
@@ -168,8 +168,8 @@ export class AddonModChatProvider {
     /**
      * Get the actives users of a current chat.
      *
-     * @param  {number} sessionId Chat sessiond ID.
-     * @return {Promise<any>} Promise resolved when the WS is executed.
+     * @param sessionId Chat sessiond ID.
+     * @return Promise resolved when the WS is executed.
      */
     getChatUsers(sessionId: number): Promise<any> {
         const params = {
@@ -185,8 +185,8 @@ export class AddonModChatProvider {
     /**
      * Return whether WS for passed sessions are available.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with a boolean.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with a boolean.
      */
     areSessionsAvailable(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -197,12 +197,12 @@ export class AddonModChatProvider {
     /**
      * Get chat sessions.
      *
-     * @param {number} chatId Chat ID.
-     * @param {number} [groupId=0] Group ID, 0 means that the function will determine the user group.
-     * @param {boolean} [showAll=false] Whether to include incomplete sessions or not.
-     * @param {boolean} [ignoreCache=false] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the list of sessions.
+     * @param chatId Chat ID.
+     * @param groupId Group ID, 0 means that the function will determine the user group.
+     * @param showAll Whether to include incomplete sessions or not.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of sessions.
      * @since 3.5
      */
     getSessions(chatId: number, groupId: number = 0, showAll: boolean = false, ignoreCache: boolean = false, siteId?: string):
@@ -235,13 +235,13 @@ export class AddonModChatProvider {
     /**
      * Get chat session messages.
      *
-     * @param {number} chatId Chat ID.
-     * @param {number} sessionStart Session start time.
-     * @param {number} sessionEnd Session end time.
-     * @param {number} [groupId=0] Group ID, 0 means that the function will determine the user group.
-     * @param {boolean} [ignoreCache=false] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the list of messages.
+     * @param chatId Chat ID.
+     * @param sessionStart Session start time.
+     * @param sessionEnd Session end time.
+     * @param groupId Group ID, 0 means that the function will determine the user group.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of messages.
      * @since 3.5
      */
     getSessionMessages(chatId: number, sessionStart: number, sessionEnd: number, groupId: number = 0, ignoreCache: boolean = false,
@@ -275,8 +275,8 @@ export class AddonModChatProvider {
     /**
      * Invalidate chats.
      *
-     * @param {number} courseId Course ID.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateChats(courseId: number): Promise<any> {
         const site = this.sitesProvider.getCurrentSite();
@@ -287,10 +287,10 @@ export class AddonModChatProvider {
     /**
      * Invalidate chat sessions.
      *
-     * @param {number} chatId Chat ID.
-     * @param {number} [groupId=0] Group ID, 0 means that the function will determine the user group.
-     * @param {boolean} [showAll=false] Whether to include incomplete sessions or not.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param chatId Chat ID.
+     * @param groupId Group ID, 0 means that the function will determine the user group.
+     * @param showAll Whether to include incomplete sessions or not.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateSessions(chatId: number, groupId: number = 0, showAll: boolean = false): Promise<any> {
         const site = this.sitesProvider.getCurrentSite();
@@ -301,8 +301,8 @@ export class AddonModChatProvider {
     /**
      * Invalidate all chat sessions.
      *
-     * @param {number} chatId Chat ID.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param chatId Chat ID.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAllSessions(chatId: number): Promise<any> {
         const site = this.sitesProvider.getCurrentSite();
@@ -313,10 +313,10 @@ export class AddonModChatProvider {
     /**
      * Invalidate chat session messages.
      *
-     * @param {number} chatId Chat ID.
-     * @param {number} sessionStart Session start time.
-     * @param {number} [groupId=0] Group ID, 0 means that the function will determine the user group.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param chatId Chat ID.
+     * @param sessionStart Session start time.
+     * @param groupId Group ID, 0 means that the function will determine the user group.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateSessionMessages(chatId: number, sessionStart: number, groupId: number = 0): Promise<any> {
         const site = this.sitesProvider.getCurrentSite();
@@ -327,8 +327,8 @@ export class AddonModChatProvider {
     /**
      * Invalidate all chat session messages.
      *
-     * @param {number} chatId Chat ID.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param chatId Chat ID.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAllSessionMessages(chatId: number): Promise<any> {
         const site = this.sitesProvider.getCurrentSite();
@@ -339,8 +339,8 @@ export class AddonModChatProvider {
     /**
      * Get cache key for chats WS call.
      *
-     * @param {number} courseId Course ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getChatsCacheKey(courseId: number): string {
         return  this.ROOT_CACHE_KEY + 'chats:' + courseId;
@@ -349,10 +349,10 @@ export class AddonModChatProvider {
     /**
      * Get cache key for sessions WS call.
      *
-     * @param {number} chatId Chat ID.
-     * @param {number} groupId Goup ID, 0 means that the function will determine the user group.
-     * @param {boolean} showAll Whether to include incomplete sessions or not.
-     * @return {string} Cache key.
+     * @param chatId Chat ID.
+     * @param groupId Goup ID, 0 means that the function will determine the user group.
+     * @param showAll Whether to include incomplete sessions or not.
+     * @return Cache key.
      */
     protected getSessionsCacheKey(chatId: number, groupId: number, showAll: boolean): string {
         return  this.getSessionsCacheKeyPrefix(chatId) + groupId + ':' + (showAll ? 1 : 0);
@@ -361,8 +361,8 @@ export class AddonModChatProvider {
     /**
      * Get cache key prefix for sessions WS call.
      *
-     * @param {number} chatId Chat ID.
-     * @return {string} Cache key prefix.
+     * @param chatId Chat ID.
+     * @return Cache key prefix.
      */
     protected getSessionsCacheKeyPrefix(chatId: number): string {
         return  this.ROOT_CACHE_KEY + 'sessions:' + chatId + ':';
@@ -371,10 +371,10 @@ export class AddonModChatProvider {
     /**
      * Get cache key for session messages WS call.
      *
-     * @param {number} chatId Chat ID.
-     * @param {number} sessionStart Session start time.
-     * @param {number} groupId Group ID, 0 means that the function will determine the user group.
-     * @return {string} Cache key.
+     * @param chatId Chat ID.
+     * @param sessionStart Session start time.
+     * @param groupId Group ID, 0 means that the function will determine the user group.
+     * @return Cache key.
      */
     protected getSessionMessagesCacheKey(chatId: number, sessionStart: number, groupId: number): string {
         return this.getSessionMessagesCacheKeyPrefix(chatId) + sessionStart + ':' + groupId;
@@ -383,8 +383,8 @@ export class AddonModChatProvider {
     /**
      * Get cache key prefix for session messages WS call.
      *
-     * @param {number} chatId Chat ID.
-     * @return {string} Cache key prefix.
+     * @param chatId Chat ID.
+     * @return Cache key prefix.
      */
     protected getSessionMessagesCacheKeyPrefix(chatId: number): string {
         return this.ROOT_CACHE_KEY + 'sessionsMessages:' + chatId + ':';
diff --git a/src/addon/mod/chat/providers/module-handler.ts b/src/addon/mod/chat/providers/module-handler.ts
index f85c2be5e..1a459766d 100644
--- a/src/addon/mod/chat/providers/module-handler.ts
+++ b/src/addon/mod/chat/providers/module-handler.ts
@@ -44,7 +44,7 @@ export class AddonModChatModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean {
         return true;
@@ -53,10 +53,10 @@ export class AddonModChatModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param  {any}    module    The module object.
-     * @param  {number} courseId  The course ID.
-     * @param  {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         const data: CoreCourseModuleHandlerData = {
@@ -83,9 +83,9 @@ export class AddonModChatModuleHandler implements CoreCourseModuleHandler {
      * Get the component to render the module. This is needed to support singleactivity course format.
      * The component returned must implement CoreCourseModuleMainComponent.
      *
-     * @param  {any} course The course object.
-     * @param  {any} module The module object.
-     * @return {any} The component to use, undefined if not found.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component to use, undefined if not found.
      */
     getMainComponent(course: any, module: any): any {
         return AddonModChatIndexComponent;
diff --git a/src/addon/mod/chat/providers/prefetch-handler.ts b/src/addon/mod/chat/providers/prefetch-handler.ts
index c9f54a62a..ca146b06d 100644
--- a/src/addon/mod/chat/providers/prefetch-handler.ts
+++ b/src/addon/mod/chat/providers/prefetch-handler.ts
@@ -51,7 +51,7 @@ export class AddonModChatPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
+     * @return A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.chatProvider.areSessionsAvailable();
@@ -60,9 +60,9 @@ export class AddonModChatPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId The course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId The course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         return this.chatProvider.getChat(courseId, moduleId).then((chat) => {
@@ -79,9 +79,9 @@ export class AddonModChatPrefetchHandler extends CoreCourseActivityPrefetchHandl
      * Invalidate WS calls needed to determine module status (usually, to check if module is downloadable).
      * It doesn't need to invalidate check updates. It should NOT invalidate files nor all the prefetched data.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when invalidated.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when invalidated.
      */
     invalidateModule(module: any, courseId: number): Promise<any> {
         const promises = [
@@ -95,11 +95,11 @@ export class AddonModChatPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Prefetch a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
      */
     prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string): Promise<any> {
         return this.prefetchPackage(module, courseId, single, this.prefetchChat.bind(this));
@@ -108,11 +108,11 @@ export class AddonModChatPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Prefetch a chat.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} single True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} siteId Site ID.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
      */
     protected prefetchChat(module: any, courseId: number, single: boolean, siteId: string): Promise<any> {
         // Prefetch chat and group info.
@@ -158,12 +158,12 @@ export class AddonModChatPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Prefetch chat session messages and user profiles.
      *
-     * @param {number} chatId Chat ID.
-     * @param {any} session Session object.
-     * @param {number} groupId Group ID.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {string} siteId Site ID.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param chatId Chat ID.
+     * @param session Session object.
+     * @param groupId Group ID.
+     * @param courseId Course ID the module belongs to.
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
      */
     protected prefetchSession(chatId: number, session: any, groupId: number, courseId: number, siteId: string): Promise<any> {
         return this.chatProvider.getSessionMessages(chatId, session.sessionstart, session.sessionend, groupId, true, siteId)
diff --git a/src/addon/mod/choice/components/index/index.ts b/src/addon/mod/choice/components/index/index.ts
index b543e4013..c5bcdc852 100644
--- a/src/addon/mod/choice/components/index/index.ts
+++ b/src/addon/mod/choice/components/index/index.ts
@@ -78,7 +78,7 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         const promises = [];
@@ -96,8 +96,8 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Compares sync event data with current data to check if refresh content is needed.
      *
-     * @param {any} syncEventData Data receiven on sync observer.
-     * @return {boolean}          True if refresh is needed, false otherwise.
+     * @param syncEventData Data receiven on sync observer.
+     * @return True if refresh is needed, false otherwise.
      */
     protected isRefreshSyncNeeded(syncEventData: any): boolean {
         if (this.choice && syncEventData.choiceId == this.choice.id && syncEventData.userId == this.userId) {
@@ -112,10 +112,10 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Download choice contents.
      *
-     * @param  {boolean}      [refresh=false]    If it's refreshing content.
-     * @param  {boolean}      [sync=false]       If it should try to sync.
-     * @param  {boolean}      [showErrors=false] If show errors to the user of hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh If it's refreshing content.
+     * @param sync If it should try to sync.
+     * @param showErrors If show errors to the user of hide them.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<any> {
         this.now = new Date().getTime();
@@ -163,8 +163,8 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Convenience function to get choice options.
      *
-     * @param {boolean} hasOffline True if there are responses stored offline.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param hasOffline True if there are responses stored offline.
+     * @return Promise resolved when done.
      */
     protected fetchOptions(hasOffline: boolean): Promise<any> {
         return this.choiceProvider.getOptions(this.choice.id).then((options) => {
@@ -277,7 +277,7 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Convenience function to get choice results.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected fetchResults(): Promise<any> {
         if (this.choiceNotOpenYet) {
@@ -307,7 +307,7 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Check if a choice is open.
      *
-     * @return {boolean} True if choice is open, false otherwise.
+     * @return True if choice is open, false otherwise.
      */
     protected isChoiceOpen(): boolean {
         return (this.choice.timeopen === 0 || this.choice.timeopen <= this.now) &&
@@ -317,7 +317,7 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Return true if the user has selected at least one option.
      *
-     * @return {boolean} True if the user has responded.
+     * @return True if the user has responded.
      */
     canSave(): boolean {
         if (this.choice.allowmultiple) {
@@ -391,8 +391,8 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Function to call when some data has changed. It will refresh/prefetch data.
      *
-     * @param {boolean} online Whether the data was sent to server or stored in offline.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param online Whether the data was sent to server or stored in offline.
+     * @return Promise resolved when done.
      */
     protected dataUpdated(online: boolean): Promise<any> {
         if (online && this.isPrefetched()) {
@@ -413,7 +413,7 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Performs the sync of the activity.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected sync(): Promise<any> {
         return this.choiceSync.syncChoice(this.choice.id, this.userId);
@@ -422,8 +422,8 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Checks if sync has succeed from result sync data.
      *
-     * @param  {any} result Data returned on the sync function.
-     * @return {boolean} Whether it succeed or not.
+     * @param result Data returned on the sync function.
+     * @return Whether it succeed or not.
      */
     protected hasSyncSucceed(result: any): boolean {
         return result.updated;
diff --git a/src/addon/mod/choice/pages/index/index.ts b/src/addon/mod/choice/pages/index/index.ts
index 1fb470cd4..432dba56c 100644
--- a/src/addon/mod/choice/pages/index/index.ts
+++ b/src/addon/mod/choice/pages/index/index.ts
@@ -40,7 +40,7 @@ export class AddonModChoiceIndexPage {
     /**
      * Update some data based on the choice instance.
      *
-     * @param {any} choice Choice instance.
+     * @param choice Choice instance.
      */
     updateData(choice: any): void {
         this.title = choice.name || this.title;
diff --git a/src/addon/mod/choice/providers/choice.ts b/src/addon/mod/choice/providers/choice.ts
index 770afa6c0..b16119516 100644
--- a/src/addon/mod/choice/providers/choice.ts
+++ b/src/addon/mod/choice/providers/choice.ts
@@ -48,9 +48,9 @@ export class AddonModChoiceProvider {
      *     - they're published after the choice is closed and it's closed, OR
      *     - they're published after answering and the user has answered.
      *
-     * @param  {any}     choice      Choice to check.
-     * @param  {boolean} hasAnswered True if user has answered the choice, false otherwise.
-     * @return {boolean} True if the students can see the results.
+     * @param choice Choice to check.
+     * @param hasAnswered True if user has answered the choice, false otherwise.
+     * @return True if the students can see the results.
      */
     canStudentSeeResults(choice: any, hasAnswered: boolean): boolean {
         const now = new Date().getTime();
@@ -64,12 +64,12 @@ export class AddonModChoiceProvider {
     /**
      * Delete responses from a choice.
      *
-     * @param  {number}   choiceId    Choice ID.
-     * @param  {string}   name        Choice name.
-     * @param  {number}   courseId    Course ID the choice belongs to.
-     * @param  {number[]} [responses] IDs of the answers. If not defined, delete all the answers of the current user.
-     * @param  {string}   [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: true if response was sent to server, false if stored in device.
+     * @param choiceId Choice ID.
+     * @param name Choice name.
+     * @param courseId Course ID the choice belongs to.
+     * @param responses IDs of the answers. If not defined, delete all the answers of the current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: true if response was sent to server, false if stored in device.
      */
     deleteResponses(choiceId: number, name: string, courseId: number, responses?: number[], siteId?: string): Promise<boolean> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -106,10 +106,10 @@ export class AddonModChoiceProvider {
     /**
      * Delete responses from a choice. It will fail if offline or cannot connect.
      *
-     * @param  {number}   choiceId    Choice ID.
-     * @param  {number[]} [responses] IDs of the answers. If not defined, delete all the answers of the current user.
-     * @param  {string}   [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when responses are successfully deleted.
+     * @param choiceId Choice ID.
+     * @param responses IDs of the answers. If not defined, delete all the answers of the current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when responses are successfully deleted.
      */
     deleteResponsesOnline(choiceId: number, responses?: number[], siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -140,8 +140,8 @@ export class AddonModChoiceProvider {
     /**
      * Get cache key for choice data WS calls.
      *
-     * @param  {number} courseId Course ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getChoiceDataCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'choice:' + courseId;
@@ -150,8 +150,8 @@ export class AddonModChoiceProvider {
     /**
      * Get cache key for choice options WS calls.
      *
-     * @param  {number} choiceId Choice ID.
-     * @return {string} Cache key.
+     * @param choiceId Choice ID.
+     * @return Cache key.
      */
     protected getChoiceOptionsCacheKey(choiceId: number): string {
         return this.ROOT_CACHE_KEY + 'options:' + choiceId;
@@ -160,8 +160,8 @@ export class AddonModChoiceProvider {
     /**
      * Get cache key for choice results WS calls.
      *
-     * @param  {number} choiceId Choice ID.
-     * @return {string} Cache key.
+     * @param choiceId Choice ID.
+     * @return Cache key.
      */
     protected getChoiceResultsCacheKey(choiceId: number): string {
         return this.ROOT_CACHE_KEY + 'results:' + choiceId;
@@ -170,13 +170,13 @@ export class AddonModChoiceProvider {
     /**
      * Get a choice with key=value. If more than one is found, only the first will be returned.
      *
-     * @param  {string}  siteId             Site ID.
-     * @param  {number}  courseId           Course ID.
-     * @param  {string}  key                Name of the property to check.
-     * @param  {any}     value              Value to search.
-     * @param  {boolean} [forceCache] True to always get the value from cache, false otherwise. Default false.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<any>} Promise resolved when the choice is retrieved.
+     * @param siteId Site ID.
+     * @param courseId Course ID.
+     * @param key Name of the property to check.
+     * @param value Value to search.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise resolved when the choice is retrieved.
      */
     protected getChoiceByDataKey(siteId: string, courseId: number, key: string, value: any, forceCache?: boolean,
             ignoreCache?: boolean): Promise<any> {
@@ -214,12 +214,12 @@ export class AddonModChoiceProvider {
     /**
      * Get a choice by course module ID.
      *
-     * @param  {number}  courseId           Course ID.
-     * @param  {number}  cmId               Course module ID.
-     * @param  {string}  [siteId]           Site ID. If not defined, current site.
-     * @param  {boolean} [forceCache] True to always get the value from cache, false otherwise. Default false.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<any>} Promise resolved when the choice is retrieved.
+     * @param courseId Course ID.
+     * @param cmId Course module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise resolved when the choice is retrieved.
      */
     getChoice(courseId: number, cmId: number, siteId?: string, forceCache?: boolean, ignoreCache?: boolean): Promise<any> {
         return this.getChoiceByDataKey(siteId, courseId, 'coursemodule', cmId, forceCache, ignoreCache);
@@ -228,12 +228,12 @@ export class AddonModChoiceProvider {
     /**
      * Get a choice by ID.
      *
-     * @param  {number}  courseId           Course ID.
-     * @param  {number}  choiceId           Choice ID.
-     * @param  {string}  [siteId]           Site ID. If not defined, current site.
-     * @param  {boolean} [forceCache] True to always get the value from cache, false otherwise. Default false.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<any>} Promise resolved when the choice is retrieved.
+     * @param courseId Course ID.
+     * @param choiceId Choice ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise resolved when the choice is retrieved.
      */
     getChoiceById(courseId: number, choiceId: number, siteId?: string, forceCache?: boolean, ignoreCache?: boolean): Promise<any> {
         return this.getChoiceByDataKey(siteId, courseId, 'id', choiceId, forceCache, ignoreCache);
@@ -242,10 +242,10 @@ export class AddonModChoiceProvider {
     /**
      * Get choice options.
      *
-     * @param {number} choiceId Choice ID.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with choice options.
+     * @param choiceId Choice ID.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with choice options.
      */
     getOptions(choiceId: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -275,10 +275,10 @@ export class AddonModChoiceProvider {
     /**
      * Get choice results.
      *
-     * @param {number} choiceId Choice ID.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with choice results.
+     * @param choiceId Choice ID.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with choice results.
      */
     getResults(choiceId: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -307,9 +307,9 @@ export class AddonModChoiceProvider {
     /**
      * Invalidate choice data.
      *
-     * @param  {number} courseId Course ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateChoiceData(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(null).then((site) => {
@@ -320,10 +320,10 @@ export class AddonModChoiceProvider {
     /**
      * Invalidate the prefetched content.
      *
-     * @param  {number} moduleId The module ID.
-     * @param  {number} courseId Course ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -346,9 +346,9 @@ export class AddonModChoiceProvider {
     /**
      * Invalidate choice options.
      *
-     * @param  {number} choiceId Choice ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param choiceId Choice ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateOptions(choiceId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -359,9 +359,9 @@ export class AddonModChoiceProvider {
    /**
     * Invalidate choice results.
     *
-    * @param  {number} choiceId Choice ID.
-    * @param  {string} [siteId] Site ID. If not defined, current site.
-    * @return {Promise<any>} Promise resolved when the data is invalidated.
+    * @param choiceId Choice ID.
+    * @param siteId Site ID. If not defined, current site.
+    * @return Promise resolved when the data is invalidated.
     */
    invalidateResults(choiceId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -372,10 +372,10 @@ export class AddonModChoiceProvider {
     /**
      * Report the choice as being viewed.
      *
-     * @param  {string} id Choice ID.
-     * @param {string} [name] Name of the choice.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the WS call is successful.
+     * @param id Choice ID.
+     * @param name Name of the choice.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(id: number, name?: string, siteId?: string): Promise<any> {
         const params = {
@@ -389,12 +389,12 @@ export class AddonModChoiceProvider {
     /**
      * Send a response to a choice to Moodle.
      *
-     * @param  {number}   choiceId  Choice ID.
-     * @param  {string}   name      Choice name.
-     * @param  {number}   courseId  Course ID the choice belongs to.
-     * @param  {number[]} responses IDs of selected options.
-     * @param  {string}   [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: true if response was sent to server, false if stored in device.
+     * @param choiceId Choice ID.
+     * @param name Choice name.
+     * @param courseId Course ID the choice belongs to.
+     * @param responses IDs of selected options.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: true if response was sent to server, false if stored in device.
      */
     submitResponse(choiceId: number, name: string, courseId: number, responses: number[], siteId?: string): Promise<boolean> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -430,10 +430,10 @@ export class AddonModChoiceProvider {
     /**
      * Send a response to a choice to Moodle. It will fail if offline or cannot connect.
      *
-     * @param  {number}   choiceId  Choice ID.
-     * @param  {number[]} responses IDs of selected options.
-     * @param  {string}   [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when responses are successfully submitted.
+     * @param choiceId Choice ID.
+     * @param responses IDs of selected options.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when responses are successfully submitted.
      */
     submitResponseOnline(choiceId: number, responses: number[], siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/addon/mod/choice/providers/module-handler.ts b/src/addon/mod/choice/providers/module-handler.ts
index cc2448da9..789e59508 100644
--- a/src/addon/mod/choice/providers/module-handler.ts
+++ b/src/addon/mod/choice/providers/module-handler.ts
@@ -44,7 +44,7 @@ export class AddonModChoiceModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean {
         return true;
@@ -53,10 +53,10 @@ export class AddonModChoiceModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param  {any}    module    The module object.
-     * @param  {number} courseId  The course ID.
-     * @param  {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         return {
@@ -78,9 +78,9 @@ export class AddonModChoiceModuleHandler implements CoreCourseModuleHandler {
      * Get the component to render the module. This is needed to support singleactivity course format.
      * The component returned must implement CoreCourseModuleMainComponent.
      *
-     * @param  {any} course The course object.
-     * @param  {any} module The module object.
-     * @return {any} The component to use, undefined if not found.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component to use, undefined if not found.
      */
     getMainComponent(course: any, module: any): any {
         return AddonModChoiceIndexComponent;
diff --git a/src/addon/mod/choice/providers/offline.ts b/src/addon/mod/choice/providers/offline.ts
index b4193f380..0b8e4294e 100644
--- a/src/addon/mod/choice/providers/offline.ts
+++ b/src/addon/mod/choice/providers/offline.ts
@@ -72,10 +72,10 @@ export class AddonModChoiceOfflineProvider {
     /**
      * Delete a response.
      *
-     * @param  {number} choiceId Choice ID to remove.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @param  {number} [userId] User the responses belong to. If not defined, current user in site.
-     * @return {Promise<any>} Promise resolved if stored, rejected if failure.
+     * @param choiceId Choice ID to remove.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the responses belong to. If not defined, current user in site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     deleteResponse(choiceId: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -88,8 +88,8 @@ export class AddonModChoiceOfflineProvider {
     /**
      * Get all offline responses.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promi[se resolved with responses.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promi[se resolved with responses.
      */
     getResponses(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -106,10 +106,10 @@ export class AddonModChoiceOfflineProvider {
     /**
      * Check if there are offline responses to send.
      *
-     * @param  {number} choiceId Choice ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @param  {number} [userId] User the responses belong to. If not defined, current user in site.
-     * @return {Promise<boolean>} Promise resolved with boolean: true if has offline answers, false otherwise.
+     * @param choiceId Choice ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the responses belong to. If not defined, current user in site.
+     * @return Promise resolved with boolean: true if has offline answers, false otherwise.
      */
     hasResponse(choiceId: number, siteId?: string, userId?: number): Promise<boolean> {
         return this.getResponse(choiceId, siteId, userId).then((response) => {
@@ -123,10 +123,10 @@ export class AddonModChoiceOfflineProvider {
     /**
      * Get response to be synced.
      *
-     * @param  {number} choiceId Choice ID to get.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @param  {number} [userId] User the responses belong to. If not defined, current user in site.
-     * @return {Promise<any>} Promise resolved with the object to be synced.
+     * @param choiceId Choice ID to get.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the responses belong to. If not defined, current user in site.
+     * @return Promise resolved with the object to be synced.
      */
     getResponse(choiceId: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -144,14 +144,14 @@ export class AddonModChoiceOfflineProvider {
     /**
      * Offline version for sending a response to a choice to Moodle.
      *
-     * @param  {number}   choiceId  Choice ID.
-     * @param  {string}   name      Choice name.
-     * @param  {number}   courseId  Course ID the choice belongs to.
-     * @param  {number[]} responses IDs of selected options.
-     * @param  {boolean}  deleting  If true, the user is deleting responses, if false, submitting.
-     * @param  {string}   [siteId]  Site ID. If not defined, current site.
-     * @param  {number}   [userId]  User the responses belong to. If not defined, current user in site.
-     * @return {Promise<any>} Promise resolved when results are successfully submitted.
+     * @param choiceId Choice ID.
+     * @param name Choice name.
+     * @param courseId Course ID the choice belongs to.
+     * @param responses IDs of selected options.
+     * @param deleting If true, the user is deleting responses, if false, submitting.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the responses belong to. If not defined, current user in site.
+     * @return Promise resolved when results are successfully submitted.
      */
     saveResponse(choiceId: number, name: string, courseId: number, responses: number[], deleting: boolean,
             siteId?: string, userId?: number): Promise<any> {
diff --git a/src/addon/mod/choice/providers/prefetch-handler.ts b/src/addon/mod/choice/providers/prefetch-handler.ts
index eb8a72d4b..053304bfe 100644
--- a/src/addon/mod/choice/providers/prefetch-handler.ts
+++ b/src/addon/mod/choice/providers/prefetch-handler.ts
@@ -48,11 +48,11 @@ export class AddonModChoicePrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Prefetch a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
      */
     prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string): Promise<any> {
         return this.prefetchPackage(module, courseId, single, this.prefetchChoice.bind(this));
@@ -61,11 +61,11 @@ export class AddonModChoicePrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Prefetch a choice.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} single True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {String} siteId Site ID.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
      */
     protected prefetchChoice(module: any, courseId: number, single: boolean, siteId: string): Promise<any> {
         return this.choiceProvider.getChoice(courseId, module.id, siteId, false, true).then((choice) => {
@@ -103,9 +103,9 @@ export class AddonModChoicePrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Returns choice intro files.
      *
-     * @param  {any}    module   The module object returned by WS.
-     * @param  {number} courseId Course ID.
-     * @return {Promise<any[]>} Promise resolved with list of intro files.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @return Promise resolved with list of intro files.
      */
     getIntroFiles(module: any, courseId: number): Promise<any[]> {
         return this.choiceProvider.getChoice(courseId, module.id).catch(() => {
@@ -118,9 +118,9 @@ export class AddonModChoicePrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Invalidate the prefetched content.
      *
-     * @param  {number} moduleId The module ID.
-     * @param  {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         return this.choiceProvider.invalidateContent(moduleId, courseId);
@@ -129,9 +129,9 @@ export class AddonModChoicePrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Invalidate WS calls needed to determine module status.
      *
-     * @param  {any}    module   Module.
-     * @param  {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when invalidated.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when invalidated.
      */
     invalidateModule(module: any, courseId: number): Promise<any> {
         return this.choiceProvider.invalidateChoiceData(courseId);
@@ -140,10 +140,10 @@ export class AddonModChoicePrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Sync a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     sync(module: any, courseId: number, siteId?: any): Promise<any> {
         if (!this.syncProvider) {
diff --git a/src/addon/mod/choice/providers/sync-cron-handler.ts b/src/addon/mod/choice/providers/sync-cron-handler.ts
index 92d88b52b..92c2317a7 100644
--- a/src/addon/mod/choice/providers/sync-cron-handler.ts
+++ b/src/addon/mod/choice/providers/sync-cron-handler.ts
@@ -29,9 +29,9 @@ export class AddonModChoiceSyncCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         return this.choiceSync.syncAllChoices(siteId, force);
@@ -40,7 +40,7 @@ export class AddonModChoiceSyncCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return this.choiceSync.syncInterval;
diff --git a/src/addon/mod/choice/providers/sync.ts b/src/addon/mod/choice/providers/sync.ts
index 965a1b06d..7d381308e 100644
--- a/src/addon/mod/choice/providers/sync.ts
+++ b/src/addon/mod/choice/providers/sync.ts
@@ -56,9 +56,9 @@ export class AddonModChoiceSyncProvider extends CoreCourseActivitySyncBaseProvid
     /**
      * Get the ID of a choice sync.
      *
-     * @param  {number} choiceId Choice ID.
-     * @param  {number} userId   User the responses belong to.
-     * @return {string} Sync ID.
+     * @param choiceId Choice ID.
+     * @param userId User the responses belong to.
+     * @return Sync ID.
      */
     protected getSyncId(choiceId: number, userId: number): string {
         return choiceId + '#' + userId;
@@ -67,9 +67,9 @@ export class AddonModChoiceSyncProvider extends CoreCourseActivitySyncBaseProvid
     /**
      * Try to synchronize all the choices in a certain site or in all sites.
      *
-     * @param  {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} force Wether to force sync not depending on last execution.
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     syncAllChoices(siteId?: string, force?: boolean): Promise<any> {
         return this.syncOnSites('choices', this.syncAllChoicesFunc.bind(this), [force], siteId);
@@ -78,9 +78,9 @@ export class AddonModChoiceSyncProvider extends CoreCourseActivitySyncBaseProvid
     /**
      * Sync all pending choices on a site.
      *
-     * @param {string}  [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} force    Wether to force sync not depending on last execution.
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     protected syncAllChoicesFunc(siteId?: string, force?: boolean): Promise<any> {
         return this.choiceOffline.getResponses(siteId).then((responses) => {
@@ -108,10 +108,10 @@ export class AddonModChoiceSyncProvider extends CoreCourseActivitySyncBaseProvid
     /**
      * Sync an choice only if a certain time has passed since the last time.
      *
-     * @param  {number} choiceId Choice ID to be synced.
-     * @param  {number} userId   User the answers belong to.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the choice is synced or it doesn't need to be synced.
+     * @param choiceId Choice ID to be synced.
+     * @param userId User the answers belong to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the choice is synced or it doesn't need to be synced.
      */
     syncChoiceIfNeeded(choiceId: number, userId: number, siteId?: string): Promise<any> {
         const syncId = this.getSyncId(choiceId, userId);
@@ -126,10 +126,10 @@ export class AddonModChoiceSyncProvider extends CoreCourseActivitySyncBaseProvid
     /**
      * Synchronize a choice.
      *
-     * @param  {number} choiceId Choice ID to be synced.
-     * @param  {number} [userId] User the answers belong to.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected otherwise.
+     * @param choiceId Choice ID to be synced.
+     * @param userId User the answers belong to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     syncChoice(choiceId: number, userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/addon/mod/data/classes/field-plugin-component.ts b/src/addon/mod/data/classes/field-plugin-component.ts
index 9265a9ff6..62c12f13e 100644
--- a/src/addon/mod/data/classes/field-plugin-component.ts
+++ b/src/addon/mod/data/classes/field-plugin-component.ts
@@ -34,8 +34,8 @@ export class AddonModDataFieldPluginComponent implements OnInit, OnChanges {
     /**
      * Add the form control for the search mode.
      *
-     * @param {string} fieldName Control field name.
-     * @param {any}    value     Initial set value.
+     * @param fieldName Control field name.
+     * @param value Initial set value.
      */
     protected addControl(fieldName: string, value?: any): void {
         if (!this.form) {
@@ -68,7 +68,7 @@ export class AddonModDataFieldPluginComponent implements OnInit, OnChanges {
     /**
      * Return if is shown or list mode.
      *
-     * @return {boolean} True if mode is show or list.
+     * @return True if mode is show or list.
      */
     isShowOrListMode(): boolean {
         return this.mode == 'list' || this.mode == 'show';
diff --git a/src/addon/mod/data/components/action/action.ts b/src/addon/mod/data/components/action/action.ts
index b96dc078d..b7bca0b40 100644
--- a/src/addon/mod/data/components/action/action.ts
+++ b/src/addon/mod/data/components/action/action.ts
@@ -117,7 +117,7 @@ export class AddonModDataActionComponent implements OnInit {
     /**
      * Undo delete action.
      *
-     * @return {Promise<any>} Solved when done.
+     * @return Solved when done.
      */
     undoDelete(): Promise<any> {
         const dataId = this.database.id,
diff --git a/src/addon/mod/data/components/index/index.ts b/src/addon/mod/data/components/index/index.ts
index bc3463842..ab8998c2d 100644
--- a/src/addon/mod/data/components/index/index.ts
+++ b/src/addon/mod/data/components/index/index.ts
@@ -141,7 +141,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         const promises = [];
@@ -166,8 +166,8 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Compares sync event data with current data to check if refresh content is needed.
      *
-     * @param {any} syncEventData Data receiven on sync observer.
-     * @return {boolean}          True if refresh is needed, false otherwise.
+     * @param syncEventData Data receiven on sync observer.
+     * @return True if refresh is needed, false otherwise.
      */
     protected isRefreshSyncNeeded(syncEventData: any): boolean {
         if (this.data && syncEventData.dataId == this.data.id && typeof syncEventData.entryId == 'undefined') {
@@ -184,10 +184,10 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Download data contents.
      *
-     * @param  {boolean}      [refresh=false]    If it's refreshing content.
-     * @param  {boolean}      [sync=false]       If it should try to sync.
-     * @param  {boolean}      [showErrors=false] If show errors to the user of hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh If it's refreshing content.
+     * @param sync If it should try to sync.
+     * @param showErrors If show errors to the user of hide them.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<any> {
         let canAdd = false,
@@ -259,7 +259,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Fetch current database entries.
      *
-     * @return {Promise<any>} Resolved then done.
+     * @return Resolved then done.
      */
     protected fetchEntriesData(): Promise<any> {
 
@@ -356,8 +356,8 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Performs the search and closes the modal.
      *
-     * @param  {number}       page Page number.
-     * @return {Promise<any>}      Resolved when done.
+     * @param page Page number.
+     * @return Resolved when done.
      */
     searchEntries(page: number): Promise<any> {
         this.loaded = false;
@@ -386,8 +386,8 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Set group to see the database.
      *
-     * @param  {number}       groupId Group ID.
-     * @return {Promise<any>}         Resolved when new group is selected or rejected if not.
+     * @param groupId Group ID.
+     * @return Resolved when new group is selected or rejected if not.
      */
     setGroup(groupId: number): Promise<any> {
         this.selectedGroup = groupId;
@@ -416,7 +416,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Goto the selected entry.
      *
-     * @param {number} entryId Entry ID.
+     * @param entryId Entry ID.
      */
     gotoEntry(entryId: number): void {
         const params = {
@@ -439,7 +439,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Performs the sync of the activity.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected sync(): Promise<any> {
         return this.prefetchHandler.sync(this.module, this.courseId);
@@ -448,8 +448,8 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Checks if sync has succeed from result sync data.
      *
-     * @param  {any}     result Data returned on the sync function.
-     * @return {boolean}        If suceed or not.
+     * @param result Data returned on the sync function.
+     * @return If suceed or not.
      */
     protected hasSyncSucceed(result: any): boolean {
         return result.updated;
diff --git a/src/addon/mod/data/fields/checkbox/component/checkbox.ts b/src/addon/mod/data/fields/checkbox/component/checkbox.ts
index 2db02302a..88a7d38c2 100644
--- a/src/addon/mod/data/fields/checkbox/component/checkbox.ts
+++ b/src/addon/mod/data/fields/checkbox/component/checkbox.ts
@@ -64,7 +64,7 @@ export class AddonModDataFieldCheckboxComponent extends AddonModDataFieldPluginC
     /**
      * Update value being shown.
      *
-     * @param {any} value New value to be set.
+     * @param value New value to be set.
      */
     protected updateValue(value: any): void {
         this.value = value || {};
diff --git a/src/addon/mod/data/fields/checkbox/providers/handler.ts b/src/addon/mod/data/fields/checkbox/providers/handler.ts
index 3c3009394..e0b5aceb5 100644
--- a/src/addon/mod/data/fields/checkbox/providers/handler.ts
+++ b/src/addon/mod/data/fields/checkbox/providers/handler.ts
@@ -30,9 +30,9 @@ export class AddonModDataFieldCheckboxHandler implements AddonModDataFieldHandle
      * Return the Component to use to display the plugin data.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} field         The field object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param field The field object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any): any | Promise<any> {
         return AddonModDataFieldCheckboxComponent;
@@ -41,9 +41,9 @@ export class AddonModDataFieldCheckboxHandler implements AddonModDataFieldHandle
     /**
      * Get field search data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the search form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the search form.
+     * @return With name and value of the data to be sent.
      */
     getFieldSearchData(field: any, inputData: any): any {
         const fieldName = 'f_' + field.id,
@@ -73,9 +73,9 @@ export class AddonModDataFieldCheckboxHandler implements AddonModDataFieldHandle
     /**
      * Get field edit data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the edit form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return With name and value of the data to be sent.
      */
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
         const fieldName = 'f_' + field.id;
@@ -89,10 +89,10 @@ export class AddonModDataFieldCheckboxHandler implements AddonModDataFieldHandle
     /**
      * Get field data in changed.
      *
-     * @param  {any} field                  Defines the field to be rendered.
-     * @param  {any} inputData              Data entered in the edit form.
-     * @param  {any} originalFieldData      Original field entered data.
-     * @return {Promise<boolean> | boolean} If the field has changes.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @param originalFieldData Original field entered data.
+     * @return If the field has changes.
      */
     hasFieldDataChanged(field: any, inputData: any, originalFieldData: any): Promise<boolean> | boolean {
         const fieldName = 'f_' + field.id;
@@ -105,9 +105,9 @@ export class AddonModDataFieldCheckboxHandler implements AddonModDataFieldHandle
     /**
      * Check and get field requeriments.
      *
-     * @param  {any} field               Defines the field to be rendered.
-     * @param  {any} inputData           Data entered in the edit form.
-     * @return {string | false}                  String with the notification or false.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return String with the notification or false.
      */
     getFieldsNotifications(field: any, inputData: any): string | false {
         if (field.required && (!inputData || !inputData.length || !inputData[0].value)) {
@@ -120,10 +120,10 @@ export class AddonModDataFieldCheckboxHandler implements AddonModDataFieldHandle
     /**
      * Override field content data with offline submission.
      *
-     * @param  {any}  originalContent    Original data to be overriden.
-     * @param  {any}  offlineContent     Array with all the offline data to override.
-     * @param  {any}  [offlineFiles]     Array with all the offline files in the field.
-     * @return {any}                     Data overriden
+     * @param originalContent Original data to be overriden.
+     * @param offlineContent Array with all the offline data to override.
+     * @param offlineFiles Array with all the offline files in the field.
+     * @return Data overriden
      */
     overrideData(originalContent: any, offlineContent: any, offlineFiles?: any): any {
         originalContent.content = (offlineContent[''] && offlineContent[''].join('##')) || '';
@@ -134,7 +134,7 @@ export class AddonModDataFieldCheckboxHandler implements AddonModDataFieldHandle
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/mod/data/fields/date/providers/handler.ts b/src/addon/mod/data/fields/date/providers/handler.ts
index bf9d65079..8c4988971 100644
--- a/src/addon/mod/data/fields/date/providers/handler.ts
+++ b/src/addon/mod/data/fields/date/providers/handler.ts
@@ -31,9 +31,9 @@ export class AddonModDataFieldDateHandler implements AddonModDataFieldHandler {
      * Return the Component to use to display the plugin data.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} field         The field object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param field The field object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any): any | Promise<any> {
         return AddonModDataFieldDateComponent;
@@ -42,9 +42,9 @@ export class AddonModDataFieldDateHandler implements AddonModDataFieldHandler {
     /**
      * Get field search data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the search form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the search form.
+     * @return With name and value of the data to be sent.
      */
     getFieldSearchData(field: any, inputData: any): any {
         const fieldName = 'f_' + field.id,
@@ -82,9 +82,9 @@ export class AddonModDataFieldDateHandler implements AddonModDataFieldHandler {
     /**
      * Get field edit data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the edit form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return With name and value of the data to be sent.
      */
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
         const fieldName = 'f_' + field.id;
@@ -120,10 +120,10 @@ export class AddonModDataFieldDateHandler implements AddonModDataFieldHandler {
     /**
      * Get field data in changed.
      *
-     * @param  {any} field                  Defines the field to be rendered.
-     * @param  {any} inputData              Data entered in the edit form.
-     * @param  {any} originalFieldData      Original field entered data.
-     * @return {Promise<boolean> | boolean} If the field has changes.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @param originalFieldData Original field entered data.
+     * @return If the field has changes.
      */
     hasFieldDataChanged(field: any, inputData: any, originalFieldData: any): Promise<boolean> | boolean {
         const fieldName = 'f_' + field.id,
@@ -138,9 +138,9 @@ export class AddonModDataFieldDateHandler implements AddonModDataFieldHandler {
     /**
      * Check and get field requeriments.
      *
-     * @param  {any} field               Defines the field to be rendered.
-     * @param  {any} inputData           Data entered in the edit form.
-     * @return {string | false}                  String with the notification or false.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return String with the notification or false.
      */
     getFieldsNotifications(field: any, inputData: any): string | false {
         if (field.required &&
@@ -155,10 +155,10 @@ export class AddonModDataFieldDateHandler implements AddonModDataFieldHandler {
     /**
      * Override field content data with offline submission.
      *
-     * @param  {any}  originalContent    Original data to be overriden.
-     * @param  {any}  offlineContent     Array with all the offline data to override.
-     * @param  {any}  [offlineFiles]     Array with all the offline files in the field.
-     * @return {any}                     Data overriden
+     * @param originalContent Original data to be overriden.
+     * @param offlineContent Array with all the offline data to override.
+     * @param offlineFiles Array with all the offline files in the field.
+     * @return Data overriden
      */
     overrideData(originalContent: any, offlineContent: any, offlineFiles?: any): any {
         let date = Date.UTC(offlineContent['year'] || '', offlineContent['month'] ? offlineContent['month'] - 1 : null,
@@ -173,7 +173,7 @@ export class AddonModDataFieldDateHandler implements AddonModDataFieldHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/mod/data/fields/file/component/file.ts b/src/addon/mod/data/fields/file/component/file.ts
index 3522076fc..b5341afca 100644
--- a/src/addon/mod/data/fields/file/component/file.ts
+++ b/src/addon/mod/data/fields/file/component/file.ts
@@ -38,8 +38,8 @@ export class AddonModDataFieldFileComponent extends AddonModDataFieldPluginCompo
     /**
      * Get the files from the input value.
      *
-     * @param  {any} value Input value.
-     * @return {any}     List of files.
+     * @param value Input value.
+     * @return List of files.
      */
     protected getFiles(value: any): any {
         let files = (value && value.files) || [];
@@ -74,7 +74,7 @@ export class AddonModDataFieldFileComponent extends AddonModDataFieldPluginCompo
     /**
      * Update value being shown.
      *
-     * @param {any} value New value to be set.
+     * @param value New value to be set.
      */
     protected updateValue(value: any): void {
         this.value = value;
diff --git a/src/addon/mod/data/fields/file/providers/handler.ts b/src/addon/mod/data/fields/file/providers/handler.ts
index d6e10b4b1..db6706a14 100644
--- a/src/addon/mod/data/fields/file/providers/handler.ts
+++ b/src/addon/mod/data/fields/file/providers/handler.ts
@@ -34,9 +34,9 @@ export class AddonModDataFieldFileHandler implements AddonModDataFieldHandler {
      * Return the Component to use to display the plugin data.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} field         The field object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param field The field object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any): any | Promise<any> {
         return AddonModDataFieldFileComponent;
@@ -45,9 +45,9 @@ export class AddonModDataFieldFileHandler implements AddonModDataFieldHandler {
     /**
      * Get field search data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the search form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the search form.
+     * @return With name and value of the data to be sent.
      */
     getFieldSearchData(field: any, inputData: any): any {
         const fieldName = 'f_' + field.id;
@@ -65,9 +65,9 @@ export class AddonModDataFieldFileHandler implements AddonModDataFieldHandler {
     /**
      * Get field edit data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the edit form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return With name and value of the data to be sent.
      */
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
         const files = this.getFieldEditFiles(field);
@@ -82,8 +82,8 @@ export class AddonModDataFieldFileHandler implements AddonModDataFieldHandler {
     /**
      * Get field edit files in the input data.
      *
-     * @param  {any} field        Defines the field..
-     * @return {any}             With name and value of the data to be sent.
+     * @param field Defines the field..
+     * @return With name and value of the data to be sent.
      */
     getFieldEditFiles(field: any): any {
         return this.fileSessionprovider.getFiles(AddonModDataProvider.COMPONENT,  field.dataid + '_' + field.id);
@@ -92,10 +92,10 @@ export class AddonModDataFieldFileHandler implements AddonModDataFieldHandler {
     /**
      * Get field data in changed.
      *
-     * @param  {any} field                  Defines the field to be rendered.
-     * @param  {any} inputData              Data entered in the edit form.
-     * @param  {any} originalFieldData      Original field entered data.
-     * @return {Promise<boolean> | boolean} If the field has changes.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @param originalFieldData Original field entered data.
+     * @return If the field has changes.
      */
     hasFieldDataChanged(field: any, inputData: any, originalFieldData: any): Promise<boolean> | boolean {
         const files = this.fileSessionprovider.getFiles(AddonModDataProvider.COMPONENT,  field.dataid + '_' + field.id) || [];
@@ -111,9 +111,9 @@ export class AddonModDataFieldFileHandler implements AddonModDataFieldHandler {
     /**
      * Check and get field requeriments.
      *
-     * @param  {any} field               Defines the field to be rendered.
-     * @param  {any} inputData           Data entered in the edit form.
-     * @return {string | false}                  String with the notification or false.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return String with the notification or false.
      */
     getFieldsNotifications(field: any, inputData: any): string | false {
         if (field.required && (!inputData || !inputData.length || !inputData[0].value)) {
@@ -126,10 +126,10 @@ export class AddonModDataFieldFileHandler implements AddonModDataFieldHandler {
     /**
      * Override field content data with offline submission.
      *
-     * @param  {any}  originalContent    Original data to be overriden.
-     * @param  {any}  offlineContent     Array with all the offline data to override.
-     * @param  {any}  [offlineFiles]     Array with all the offline files in the field.
-     * @return {any}                     Data overriden
+     * @param originalContent Original data to be overriden.
+     * @param offlineContent Array with all the offline data to override.
+     * @param offlineFiles Array with all the offline files in the field.
+     * @return Data overriden
      */
     overrideData(originalContent: any, offlineContent: any, offlineFiles?: any): any {
         if (offlineContent && offlineContent.file && offlineContent.file.offline > 0 && offlineFiles && offlineFiles.length > 0) {
@@ -146,7 +146,7 @@ export class AddonModDataFieldFileHandler implements AddonModDataFieldHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/mod/data/fields/latlong/component/latlong.ts b/src/addon/mod/data/fields/latlong/component/latlong.ts
index bef58067f..03f912cc3 100644
--- a/src/addon/mod/data/fields/latlong/component/latlong.ts
+++ b/src/addon/mod/data/fields/latlong/component/latlong.ts
@@ -35,9 +35,9 @@ export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginCo
     /**
      * Format latitude and longitude in a simple text.
      *
-     * @param  {number} north Degrees north.
-     * @param  {number} east  Degrees East.
-     * @return {string}       Readable Latitude and logitude.
+     * @param north Degrees north.
+     * @param east Degrees East.
+     * @return Readable Latitude and logitude.
      */
     formatLatLong(north: number, east: number): string {
         if (north !== null || east !== null) {
@@ -51,9 +51,9 @@ export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginCo
     /**
      * Get link to maps from latitude and longitude.
      *
-     * @param  {number} north Degrees north.
-     * @param  {number} east  Degrees East.
-     * @return {string}       Link to maps depending on platform.
+     * @param north Degrees north.
+     * @param east Degrees East.
+     * @return Link to maps depending on platform.
      */
     getLatLongLink(north: number, east: number): string {
         if (north !== null || east !== null) {
@@ -87,7 +87,7 @@ export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginCo
     /**
      * Update value being shown.
      *
-     * @param {any} value New value to be set.
+     * @param value New value to be set.
      */
     protected updateValue(value: any): void {
         this.value = value;
diff --git a/src/addon/mod/data/fields/latlong/providers/handler.ts b/src/addon/mod/data/fields/latlong/providers/handler.ts
index 606db2878..941466e83 100644
--- a/src/addon/mod/data/fields/latlong/providers/handler.ts
+++ b/src/addon/mod/data/fields/latlong/providers/handler.ts
@@ -30,9 +30,9 @@ export class AddonModDataFieldLatlongHandler implements AddonModDataFieldHandler
      * Return the Component to use to display the plugin data.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} field         The field object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param field The field object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any): any | Promise<any> {
         return AddonModDataFieldLatlongComponent;
@@ -41,9 +41,9 @@ export class AddonModDataFieldLatlongHandler implements AddonModDataFieldHandler
     /**
      * Get field search data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the search form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the search form.
+     * @return With name and value of the data to be sent.
      */
     getFieldSearchData(field: any, inputData: any): any {
         const fieldName = 'f_' + field.id;
@@ -61,9 +61,9 @@ export class AddonModDataFieldLatlongHandler implements AddonModDataFieldHandler
     /**
      * Get field edit data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the edit form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return With name and value of the data to be sent.
      */
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
         const fieldName = 'f_' + field.id;
@@ -85,10 +85,10 @@ export class AddonModDataFieldLatlongHandler implements AddonModDataFieldHandler
     /**
      * Get field data in changed.
      *
-     * @param  {any} field                  Defines the field to be rendered.
-     * @param  {any} inputData              Data entered in the edit form.
-     * @param  {any} originalFieldData      Original field entered data.
-     * @return {Promise<boolean> | boolean} If the field has changes.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @param originalFieldData Original field entered data.
+     * @return If the field has changes.
      */
     hasFieldDataChanged(field: any, inputData: any, originalFieldData: any): Promise<boolean> | boolean {
         const fieldName = 'f_' + field.id,
@@ -103,9 +103,9 @@ export class AddonModDataFieldLatlongHandler implements AddonModDataFieldHandler
     /**
      * Check and get field requeriments.
      *
-     * @param  {any} field               Defines the field to be rendered.
-     * @param  {any} inputData           Data entered in the edit form.
-     * @return {string | false}                  String with the notification or false.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return String with the notification or false.
      */
     getFieldsNotifications(field: any, inputData: any): string | false {
         let valueCount = 0;
@@ -130,10 +130,10 @@ export class AddonModDataFieldLatlongHandler implements AddonModDataFieldHandler
     /**
      * Override field content data with offline submission.
      *
-     * @param  {any}  originalContent    Original data to be overriden.
-     * @param  {any}  offlineContent     Array with all the offline data to override.
-     * @param  {any}  [offlineFiles]     Array with all the offline files in the field.
-     * @return {any}                     Data overriden
+     * @param originalContent Original data to be overriden.
+     * @param offlineContent Array with all the offline data to override.
+     * @param offlineFiles Array with all the offline files in the field.
+     * @return Data overriden
      */
     overrideData(originalContent: any, offlineContent: any, offlineFiles?: any): any {
         originalContent.content = offlineContent[0] || '';
@@ -145,7 +145,7 @@ export class AddonModDataFieldLatlongHandler implements AddonModDataFieldHandler
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/mod/data/fields/menu/providers/handler.ts b/src/addon/mod/data/fields/menu/providers/handler.ts
index e8427cc66..6a928f5a5 100644
--- a/src/addon/mod/data/fields/menu/providers/handler.ts
+++ b/src/addon/mod/data/fields/menu/providers/handler.ts
@@ -30,9 +30,9 @@ export class AddonModDataFieldMenuHandler implements AddonModDataFieldHandler {
      * Return the Component to use to display the plugin data.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} field         The field object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param field The field object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any): any | Promise<any> {
         return AddonModDataFieldMenuComponent;
@@ -41,9 +41,9 @@ export class AddonModDataFieldMenuHandler implements AddonModDataFieldHandler {
     /**
      * Get field search data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the search form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the search form.
+     * @return With name and value of the data to be sent.
      */
     getFieldSearchData(field: any, inputData: any): any {
         const fieldName = 'f_' + field.id;
@@ -60,9 +60,9 @@ export class AddonModDataFieldMenuHandler implements AddonModDataFieldHandler {
     /**
      * Get field edit data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the edit form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return With name and value of the data to be sent.
      */
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
         const fieldName = 'f_' + field.id;
@@ -80,10 +80,10 @@ export class AddonModDataFieldMenuHandler implements AddonModDataFieldHandler {
     /**
      * Get field data in changed.
      *
-     * @param  {any} field                  Defines the field to be rendered.
-     * @param  {any} inputData              Data entered in the edit form.
-     * @param  {any} originalFieldData      Original field entered data.
-     * @return {Promise<boolean> | boolean} If the field has changes.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @param originalFieldData Original field entered data.
+     * @return If the field has changes.
      */
     hasFieldDataChanged(field: any, inputData: any, originalFieldData: any): Promise<boolean> | boolean {
         const fieldName = 'f_' + field.id,
@@ -96,9 +96,9 @@ export class AddonModDataFieldMenuHandler implements AddonModDataFieldHandler {
     /**
      * Check and get field requeriments.
      *
-     * @param  {any} field               Defines the field to be rendered.
-     * @param  {any} inputData           Data entered in the edit form.
-     * @return {string | false}                  String with the notification or false.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return String with the notification or false.
      */
     getFieldsNotifications(field: any, inputData: any): string | false {
         if (field.required && (!inputData || !inputData.length || !inputData[0].value)) {
@@ -111,10 +111,10 @@ export class AddonModDataFieldMenuHandler implements AddonModDataFieldHandler {
     /**
      * Override field content data with offline submission.
      *
-     * @param  {any}  originalContent    Original data to be overriden.
-     * @param  {any}  offlineContent     Array with all the offline data to override.
-     * @param  {any}  [offlineFiles]     Array with all the offline files in the field.
-     * @return {any}                     Data overriden
+     * @param originalContent Original data to be overriden.
+     * @param offlineContent Array with all the offline data to override.
+     * @param offlineFiles Array with all the offline files in the field.
+     * @return Data overriden
      */
     overrideData(originalContent: any, offlineContent: any, offlineFiles?: any): any {
         originalContent.content = offlineContent[''] || '';
@@ -125,7 +125,7 @@ export class AddonModDataFieldMenuHandler implements AddonModDataFieldHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/mod/data/fields/multimenu/component/multimenu.ts b/src/addon/mod/data/fields/multimenu/component/multimenu.ts
index b31800229..933687535 100644
--- a/src/addon/mod/data/fields/multimenu/component/multimenu.ts
+++ b/src/addon/mod/data/fields/multimenu/component/multimenu.ts
@@ -64,7 +64,7 @@ export class AddonModDataFieldMultimenuComponent extends AddonModDataFieldPlugin
     /**
      * Update value being shown.
      *
-     * @param {any} value New value to be set.
+     * @param value New value to be set.
      */
     protected updateValue(value: any): void {
         this.value = value || {};
diff --git a/src/addon/mod/data/fields/multimenu/providers/handler.ts b/src/addon/mod/data/fields/multimenu/providers/handler.ts
index 0522bc304..060583426 100644
--- a/src/addon/mod/data/fields/multimenu/providers/handler.ts
+++ b/src/addon/mod/data/fields/multimenu/providers/handler.ts
@@ -30,9 +30,9 @@ export class AddonModDataFieldMultimenuHandler implements AddonModDataFieldHandl
      * Return the Component to use to display the plugin data.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} field         The field object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param field The field object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any): any | Promise<any> {
         return AddonModDataFieldMultimenuComponent;
@@ -41,9 +41,9 @@ export class AddonModDataFieldMultimenuHandler implements AddonModDataFieldHandl
     /**
      * Get field search data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the search form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the search form.
+     * @return With name and value of the data to be sent.
      */
     getFieldSearchData(field: any, inputData: any): any {
         const fieldName = 'f_' + field.id,
@@ -73,9 +73,9 @@ export class AddonModDataFieldMultimenuHandler implements AddonModDataFieldHandl
     /**
      * Get field edit data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the edit form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return With name and value of the data to be sent.
      */
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
         const fieldName = 'f_' + field.id;
@@ -89,10 +89,10 @@ export class AddonModDataFieldMultimenuHandler implements AddonModDataFieldHandl
     /**
      * Get field data in changed.
      *
-     * @param  {any} field                  Defines the field to be rendered.
-     * @param  {any} inputData              Data entered in the edit form.
-     * @param  {any} originalFieldData      Original field entered data.
-     * @return {Promise<boolean> | boolean} If the field has changes.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @param originalFieldData Original field entered data.
+     * @return If the field has changes.
      */
     hasFieldDataChanged(field: any, inputData: any, originalFieldData: any): Promise<boolean> | boolean {
         const fieldName = 'f_' + field.id;
@@ -105,9 +105,9 @@ export class AddonModDataFieldMultimenuHandler implements AddonModDataFieldHandl
     /**
      * Check and get field requeriments.
      *
-     * @param  {any} field               Defines the field to be rendered.
-     * @param  {any} inputData           Data entered in the edit form.
-     * @return {string | false}                  String with the notification or false.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return String with the notification or false.
      */
     getFieldsNotifications(field: any, inputData: any): string | false {
         if (field.required && (!inputData || !inputData.length || !inputData[0].value)) {
@@ -120,10 +120,10 @@ export class AddonModDataFieldMultimenuHandler implements AddonModDataFieldHandl
     /**
      * Override field content data with offline submission.
      *
-     * @param  {any}  originalContent    Original data to be overriden.
-     * @param  {any}  offlineContent     Array with all the offline data to override.
-     * @param  {any}  [offlineFiles]     Array with all the offline files in the field.
-     * @return {any}                     Data overriden
+     * @param originalContent Original data to be overriden.
+     * @param offlineContent Array with all the offline data to override.
+     * @param offlineFiles Array with all the offline files in the field.
+     * @return Data overriden
      */
     overrideData(originalContent: any, offlineContent: any, offlineFiles?: any): any {
         originalContent.content = (offlineContent[''] && offlineContent[''].join('##')) || '';
@@ -134,7 +134,7 @@ export class AddonModDataFieldMultimenuHandler implements AddonModDataFieldHandl
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/mod/data/fields/number/providers/handler.ts b/src/addon/mod/data/fields/number/providers/handler.ts
index 62308e6b5..e40100258 100644
--- a/src/addon/mod/data/fields/number/providers/handler.ts
+++ b/src/addon/mod/data/fields/number/providers/handler.ts
@@ -32,9 +32,9 @@ export class AddonModDataFieldNumberHandler extends AddonModDataFieldTextHandler
      * Return the Component to use to display the plugin data.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} field         The field object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param field The field object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any): any | Promise<any> {
         return AddonModDataFieldNumberComponent;
@@ -43,10 +43,10 @@ export class AddonModDataFieldNumberHandler extends AddonModDataFieldTextHandler
     /**
      * Get field data in changed.
      *
-     * @param  {any} field                  Defines the field to be rendered.
-     * @param  {any} inputData              Data entered in the edit form.
-     * @param  {any} originalFieldData      Original field entered data.
-     * @return {Promise<boolean> | boolean} If the field has changes.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @param originalFieldData Original field entered data.
+     * @return If the field has changes.
      */
     hasFieldDataChanged(field: any, inputData: any, originalFieldData: any): Promise<boolean> | boolean {
         const fieldName = 'f_' + field.id;
@@ -59,9 +59,9 @@ export class AddonModDataFieldNumberHandler extends AddonModDataFieldTextHandler
     /**
      * Check and get field requeriments.
      *
-     * @param  {any} field               Defines the field to be rendered.
-     * @param  {any} inputData           Data entered in the edit form.
-     * @return {string | false}                  String with the notification or false.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return String with the notification or false.
      */
     getFieldsNotifications(field: any, inputData: any): string | false {
         if (field.required && (!inputData || !inputData.length || inputData[0].value == '')) {
diff --git a/src/addon/mod/data/fields/picture/component/picture.ts b/src/addon/mod/data/fields/picture/component/picture.ts
index 0c5836efa..ab639cf6d 100644
--- a/src/addon/mod/data/fields/picture/component/picture.ts
+++ b/src/addon/mod/data/fields/picture/component/picture.ts
@@ -47,8 +47,8 @@ export class AddonModDataFieldPictureComponent extends AddonModDataFieldPluginCo
     /**
      * Get the files from the input value.
      *
-     * @param  {any} value Input value.
-     * @return {any}     List of files.
+     * @param value Input value.
+     * @return List of files.
      */
     protected getFiles(value: any): any {
         let files = (value && value.files) || [];
@@ -64,9 +64,9 @@ export class AddonModDataFieldPictureComponent extends AddonModDataFieldPluginCo
     /**
      * Find file in a list.
      *
-     * @param {any[]} files         File list where to search.
-     * @param {string} filenameSeek Filename to search.
-     * @return {any} File found or false.
+     * @param files File list where to search.
+     * @param filenameSeek Filename to search.
+     * @return File found or false.
      */
     protected findFile(files: any[], filenameSeek: string): any {
         return files.find((file) => file.filename == filenameSeek) || false;
@@ -97,7 +97,7 @@ export class AddonModDataFieldPictureComponent extends AddonModDataFieldPluginCo
     /**
      * Update value being shown.
      *
-     * @param {any} value New value to be set.
+     * @param value New value to be set.
      */
     protected updateValue(value: any): void {
         this.value = value;
diff --git a/src/addon/mod/data/fields/picture/providers/handler.ts b/src/addon/mod/data/fields/picture/providers/handler.ts
index 89abf7009..bd343ecd0 100644
--- a/src/addon/mod/data/fields/picture/providers/handler.ts
+++ b/src/addon/mod/data/fields/picture/providers/handler.ts
@@ -34,9 +34,9 @@ export class AddonModDataFieldPictureHandler implements AddonModDataFieldHandler
      * Return the Component to use to display the plugin data.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} field         The field object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param field The field object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any): any | Promise<any> {
         return AddonModDataFieldPictureComponent;
@@ -45,9 +45,9 @@ export class AddonModDataFieldPictureHandler implements AddonModDataFieldHandler
     /**
      * Get field search data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the search form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the search form.
+     * @return With name and value of the data to be sent.
      */
     getFieldSearchData(field: any, inputData: any): any {
         const fieldName = 'f_' + field.id;
@@ -65,9 +65,9 @@ export class AddonModDataFieldPictureHandler implements AddonModDataFieldHandler
     /**
      * Get field edit data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the edit form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return With name and value of the data to be sent.
      */
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
         const files = this.getFieldEditFiles(field);
@@ -90,8 +90,8 @@ export class AddonModDataFieldPictureHandler implements AddonModDataFieldHandler
     /**
      * Get field edit files in the input data.
      *
-     * @param  {any} field        Defines the field..
-     * @return {any}             With name and value of the data to be sent.
+     * @param field Defines the field..
+     * @return With name and value of the data to be sent.
      */
     getFieldEditFiles(field: any): any {
         return this.fileSessionprovider.getFiles(AddonModDataProvider.COMPONENT,  field.dataid + '_' + field.id);
@@ -100,10 +100,10 @@ export class AddonModDataFieldPictureHandler implements AddonModDataFieldHandler
     /**
      * Get field data in changed.
      *
-     * @param  {any} field                  Defines the field to be rendered.
-     * @param  {any} inputData              Data entered in the edit form.
-     * @param  {any} originalFieldData      Original field entered data.
-     * @return {Promise<boolean> | boolean} If the field has changes.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @param originalFieldData Original field entered data.
+     * @return If the field has changes.
      */
     hasFieldDataChanged(field: any, inputData: any, originalFieldData: any): Promise<boolean> | boolean {
         const fieldName = 'f_' + field.id + '_alttext',
@@ -129,9 +129,9 @@ export class AddonModDataFieldPictureHandler implements AddonModDataFieldHandler
     /**
      * Check and get field requeriments.
      *
-     * @param  {any} field               Defines the field to be rendered.
-     * @param  {any} inputData           Data entered in the edit form.
-     * @return {string | false}                  String with the notification or false.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return String with the notification or false.
      */
     getFieldsNotifications(field: any, inputData: any): string | false {
         if (field.required) {
@@ -158,10 +158,10 @@ export class AddonModDataFieldPictureHandler implements AddonModDataFieldHandler
     /**
      * Override field content data with offline submission.
      *
-     * @param  {any}  originalContent    Original data to be overriden.
-     * @param  {any}  offlineContent     Array with all the offline data to override.
-     * @param  {any}  [offlineFiles]     Array with all the offline files in the field.
-     * @return {any}                     Data overriden
+     * @param originalContent Original data to be overriden.
+     * @param offlineContent Array with all the offline data to override.
+     * @param offlineFiles Array with all the offline files in the field.
+     * @return Data overriden
      */
     overrideData(originalContent: any, offlineContent: any, offlineFiles?: any): any {
         if (offlineContent && offlineContent.file && offlineContent.file.offline > 0 && offlineFiles && offlineFiles.length > 0) {
@@ -180,7 +180,7 @@ export class AddonModDataFieldPictureHandler implements AddonModDataFieldHandler
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/mod/data/fields/radiobutton/providers/handler.ts b/src/addon/mod/data/fields/radiobutton/providers/handler.ts
index a58b407bf..7025136e6 100644
--- a/src/addon/mod/data/fields/radiobutton/providers/handler.ts
+++ b/src/addon/mod/data/fields/radiobutton/providers/handler.ts
@@ -30,9 +30,9 @@ export class AddonModDataFieldRadiobuttonHandler implements AddonModDataFieldHan
      * Return the Component to use to display the plugin data.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} field         The field object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param field The field object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any): any | Promise<any> {
         return AddonModDataFieldRadiobuttonComponent;
@@ -41,9 +41,9 @@ export class AddonModDataFieldRadiobuttonHandler implements AddonModDataFieldHan
     /**
      * Get field search data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the search form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the search form.
+     * @return With name and value of the data to be sent.
      */
     getFieldSearchData(field: any, inputData: any): any {
         const fieldName = 'f_' + field.id;
@@ -60,9 +60,9 @@ export class AddonModDataFieldRadiobuttonHandler implements AddonModDataFieldHan
     /**
      * Get field edit data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the edit form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return With name and value of the data to be sent.
      */
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
         const fieldName = 'f_' + field.id;
@@ -76,10 +76,10 @@ export class AddonModDataFieldRadiobuttonHandler implements AddonModDataFieldHan
     /**
      * Get field data in changed.
      *
-     * @param  {any} field                  Defines the field to be rendered.
-     * @param  {any} inputData              Data entered in the edit form.
-     * @param  {any} originalFieldData      Original field entered data.
-     * @return {Promise<boolean> | boolean} If the field has changes.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @param originalFieldData Original field entered data.
+     * @return If the field has changes.
      */
     hasFieldDataChanged(field: any, inputData: any, originalFieldData: any): Promise<boolean> | boolean {
         const fieldName = 'f_' + field.id,
@@ -92,9 +92,9 @@ export class AddonModDataFieldRadiobuttonHandler implements AddonModDataFieldHan
     /**
      * Check and get field requeriments.
      *
-     * @param  {any} field               Defines the field to be rendered.
-     * @param  {any} inputData           Data entered in the edit form.
-     * @return {string | false}                  String with the notification or false.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return String with the notification or false.
      */
     getFieldsNotifications(field: any, inputData: any): string | false {
         if (field.required && (!inputData || !inputData.length || !inputData[0].value)) {
@@ -107,10 +107,10 @@ export class AddonModDataFieldRadiobuttonHandler implements AddonModDataFieldHan
     /**
      * Override field content data with offline submission.
      *
-     * @param  {any}  originalContent    Original data to be overriden.
-     * @param  {any}  offlineContent     Array with all the offline data to override.
-     * @param  {any}  [offlineFiles]     Array with all the offline files in the field.
-     * @return {any}                     Data overriden
+     * @param originalContent Original data to be overriden.
+     * @param offlineContent Array with all the offline data to override.
+     * @param offlineFiles Array with all the offline files in the field.
+     * @return Data overriden
      */
     overrideData(originalContent: any, offlineContent: any, offlineFiles?: any): any {
         originalContent.content = offlineContent[''] || '';
@@ -121,7 +121,7 @@ export class AddonModDataFieldRadiobuttonHandler implements AddonModDataFieldHan
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/mod/data/fields/text/providers/handler.ts b/src/addon/mod/data/fields/text/providers/handler.ts
index 1a4fa8c26..7ede2628e 100644
--- a/src/addon/mod/data/fields/text/providers/handler.ts
+++ b/src/addon/mod/data/fields/text/providers/handler.ts
@@ -30,9 +30,9 @@ export class AddonModDataFieldTextHandler implements AddonModDataFieldHandler {
      * Return the Component to use to display the plugin data.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} field         The field object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param field The field object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any): any | Promise<any> {
         return AddonModDataFieldTextComponent;
@@ -41,9 +41,9 @@ export class AddonModDataFieldTextHandler implements AddonModDataFieldHandler {
     /**
      * Get field search data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the search form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the search form.
+     * @return With name and value of the data to be sent.
      */
     getFieldSearchData(field: any, inputData: any): any {
         const fieldName = 'f_' + field.id;
@@ -61,9 +61,9 @@ export class AddonModDataFieldTextHandler implements AddonModDataFieldHandler {
     /**
      * Get field edit data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the edit form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return With name and value of the data to be sent.
      */
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
         const fieldName = 'f_' + field.id;
@@ -77,10 +77,10 @@ export class AddonModDataFieldTextHandler implements AddonModDataFieldHandler {
     /**
      * Get field data in changed.
      *
-     * @param  {any} field                  Defines the field to be rendered.
-     * @param  {any} inputData              Data entered in the edit form.
-     * @param  {any} originalFieldData      Original field entered data.
-     * @return {Promise<boolean> | boolean} If the field has changes.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @param originalFieldData Original field entered data.
+     * @return If the field has changes.
      */
     hasFieldDataChanged(field: any, inputData: any, originalFieldData: any): Promise<boolean> | boolean {
         const fieldName = 'f_' + field.id,
@@ -93,9 +93,9 @@ export class AddonModDataFieldTextHandler implements AddonModDataFieldHandler {
     /**
      * Check and get field requeriments.
      *
-     * @param  {any} field               Defines the field to be rendered.
-     * @param  {any} inputData           Data entered in the edit form.
-     * @return {string | false}                  String with the notification or false.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return String with the notification or false.
      */
     getFieldsNotifications(field: any, inputData: any): string | false {
         if (field.required && (!inputData || !inputData.length || !inputData[0].value)) {
@@ -108,10 +108,10 @@ export class AddonModDataFieldTextHandler implements AddonModDataFieldHandler {
     /**
      * Override field content data with offline submission.
      *
-     * @param  {any}  originalContent    Original data to be overriden.
-     * @param  {any}  offlineContent     Array with all the offline data to override.
-     * @param  {any}  [offlineFiles]     Array with all the offline files in the field.
-     * @return {any}                     Data overriden
+     * @param originalContent Original data to be overriden.
+     * @param offlineContent Array with all the offline data to override.
+     * @param offlineFiles Array with all the offline files in the field.
+     * @return Data overriden
      */
     overrideData(originalContent: any, offlineContent: any, offlineFiles?: any): any {
         originalContent.content = offlineContent[''] || '';
@@ -122,7 +122,7 @@ export class AddonModDataFieldTextHandler implements AddonModDataFieldHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/mod/data/fields/textarea/component/textarea.ts b/src/addon/mod/data/fields/textarea/component/textarea.ts
index a988de521..176601718 100644
--- a/src/addon/mod/data/fields/textarea/component/textarea.ts
+++ b/src/addon/mod/data/fields/textarea/component/textarea.ts
@@ -36,8 +36,8 @@ export class AddonModDataFieldTextareaComponent extends AddonModDataFieldPluginC
     /**
      * Format value to be shown. Replacing plugin file Urls.
      *
-     * @param  {any}    value Value to replace.
-     * @return {string}       Replaced string to be rendered.
+     * @param value Value to replace.
+     * @return Replaced string to be rendered.
      */
     format(value: any): string {
         const files = (value && value.files) || [];
diff --git a/src/addon/mod/data/fields/textarea/providers/handler.ts b/src/addon/mod/data/fields/textarea/providers/handler.ts
index 28ad00b9a..4e41f69a3 100644
--- a/src/addon/mod/data/fields/textarea/providers/handler.ts
+++ b/src/addon/mod/data/fields/textarea/providers/handler.ts
@@ -33,9 +33,9 @@ export class AddonModDataFieldTextareaHandler extends AddonModDataFieldTextHandl
      * Return the Component to use to display the plugin data.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} field         The field object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param field The field object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any): any | Promise<any> {
         return AddonModDataFieldTextareaComponent;
@@ -44,9 +44,9 @@ export class AddonModDataFieldTextareaHandler extends AddonModDataFieldTextHandl
     /**
      * Get field edit data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the edit form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return With name and value of the data to be sent.
      */
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
         const fieldName = 'f_' + field.id;
@@ -81,10 +81,10 @@ export class AddonModDataFieldTextareaHandler extends AddonModDataFieldTextHandl
     /**
      * Get field edit files in the input data.
      *
-     * @param  {any} field               Defines the field..
-     * @param  {any} inputData           Data entered in the edit form.
-     * @param  {any} originalFieldData   Original field entered data.
-     * @return {any}                     With name and value of the data to be sent.
+     * @param field Defines the field..
+     * @param inputData Data entered in the edit form.
+     * @param originalFieldData Original field entered data.
+     * @return With name and value of the data to be sent.
      */
     getFieldEditFiles(field: any, inputData: any, originalFieldData: any): any {
         return (originalFieldData && originalFieldData.files) || [];
@@ -93,9 +93,9 @@ export class AddonModDataFieldTextareaHandler extends AddonModDataFieldTextHandl
     /**
      * Check and get field requeriments.
      *
-     * @param  {any} field               Defines the field to be rendered.
-     * @param  {any} inputData           Data entered in the edit form.
-     * @return {string | false}                  String with the notification or false.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return String with the notification or false.
      */
     getFieldsNotifications(field: any, inputData: any): string | false {
         if (field.required) {
@@ -116,10 +116,10 @@ export class AddonModDataFieldTextareaHandler extends AddonModDataFieldTextHandl
     /**
      * Override field content data with offline submission.
      *
-     * @param  {any}  originalContent    Original data to be overriden.
-     * @param  {any}  offlineContent     Array with all the offline data to override.
-     * @param  {any}  [offlineFiles]     Array with all the offline files in the field.
-     * @return {any}                     Data overriden
+     * @param originalContent Original data to be overriden.
+     * @param offlineContent Array with all the offline data to override.
+     * @param offlineFiles Array with all the offline files in the field.
+     * @return Data overriden
      */
     overrideData(originalContent: any, offlineContent: any, offlineFiles?: any): any {
         originalContent.content = offlineContent[''] || '';
diff --git a/src/addon/mod/data/fields/url/providers/handler.ts b/src/addon/mod/data/fields/url/providers/handler.ts
index 1854df829..f3774f547 100644
--- a/src/addon/mod/data/fields/url/providers/handler.ts
+++ b/src/addon/mod/data/fields/url/providers/handler.ts
@@ -32,9 +32,9 @@ export class AddonModDataFieldUrlHandler extends AddonModDataFieldTextHandler {
      * Return the Component to use to display the plugin data.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} field         The field object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param field The field object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any): any | Promise<any> {
         return AddonModDataFieldUrlComponent;
@@ -43,9 +43,9 @@ export class AddonModDataFieldUrlHandler extends AddonModDataFieldTextHandler {
     /**
      * Get field edit data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the edit form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return With name and value of the data to be sent.
      */
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
         const fieldName = 'f_' + field.id;
@@ -62,9 +62,9 @@ export class AddonModDataFieldUrlHandler extends AddonModDataFieldTextHandler {
     /**
      * Check and get field requeriments.
      *
-     * @param  {any} field               Defines the field to be rendered.
-     * @param  {any} inputData           Data entered in the edit form.
-     * @return {string | false}                  String with the notification or false.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return String with the notification or false.
      */
     getFieldsNotifications(field: any, inputData: any): string | false {
         if (field.required && (!inputData || !inputData.length || !inputData[0].value)) {
diff --git a/src/addon/mod/data/pages/edit/edit.ts b/src/addon/mod/data/pages/edit/edit.ts
index babfa1279..2d82e9f43 100644
--- a/src/addon/mod/data/pages/edit/edit.ts
+++ b/src/addon/mod/data/pages/edit/edit.ts
@@ -93,7 +93,7 @@ export class AddonModDataEditPage {
     /**
      * Check if we can leave the page or not and ask to confirm the lost of data.
      *
-     * @return {boolean | Promise<void>} Resolved if we can leave it, rejected if not.
+     * @return Resolved if we can leave it, rejected if not.
      */
     ionViewCanLeave(): boolean | Promise<void> {
         if (this.forceLeave || !this.entry) {
@@ -122,7 +122,7 @@ export class AddonModDataEditPage {
     /**
      * Fetch the entry data.
      *
-     * @return {Promise<any>}         Resolved when done.
+     * @return Resolved when done.
      */
     protected fetchEntryData(): Promise<any> {
         return this.dataProvider.getDatabase(this.courseId, this.module.id).then((data) => {
@@ -159,8 +159,8 @@ export class AddonModDataEditPage {
     /**
      * Saves data.
      *
-     * @param {Event} e Event.
-     * @return {Promise<any>} Resolved when done.
+     * @param e Event.
+     * @return Resolved when done.
      */
     save(e: Event): Promise<any> {
         e.preventDefault();
@@ -256,8 +256,8 @@ export class AddonModDataEditPage {
     /**
      * Set group to see the database.
      *
-     * @param  {number}       groupId Group identifier to set.
-     * @return {Promise<any>}         Resolved when done.
+     * @param groupId Group identifier to set.
+     * @return Resolved when done.
      */
     setGroup(groupId: number): Promise<any> {
         this.selectedGroup = groupId;
@@ -269,7 +269,7 @@ export class AddonModDataEditPage {
     /**
      * Displays Edit Search Fields.
      *
-     * @return {string}  Generated HTML.
+     * @return Generated HTML.
      */
     protected displayEditFields(): string {
         this.jsData = {
@@ -315,7 +315,7 @@ export class AddonModDataEditPage {
     /**
      * Return to the entry list (previous page) discarding temp data.
      *
-     * @return {Promise<any>}  Resolved when done.
+     * @return Resolved when done.
      */
     protected returnToEntryList(): Promise<any> {
         const inputData = this.editForm.value;
diff --git a/src/addon/mod/data/pages/entry/entry.ts b/src/addon/mod/data/pages/entry/entry.ts
index 95f96d8fc..eec7f7367 100644
--- a/src/addon/mod/data/pages/entry/entry.ts
+++ b/src/addon/mod/data/pages/entry/entry.ts
@@ -129,9 +129,9 @@ export class AddonModDataEntryPage implements OnDestroy {
     /**
      * Fetch the entry data.
      *
-     * @param  {boolean} [refresh] Whether to refresh the current data or not.
-     * @param  {boolean} [isPtr] Whether is a pull to refresh action.
-     * @return {Promise<any>} Resolved when done.
+     * @param refresh Whether to refresh the current data or not.
+     * @param isPtr Whether is a pull to refresh action.
+     * @return Resolved when done.
      */
     protected fetchEntryData(refresh?: boolean, isPtr?: boolean): Promise<any> {
         this.isPullingToRefresh = isPtr;
@@ -190,8 +190,8 @@ export class AddonModDataEntryPage implements OnDestroy {
     /**
      * Go to selected entry without changing state.
      *
-     * @param  {number} offset Entry offset.
-     * @return {Promise<any>} Resolved when done.
+     * @param offset Entry offset.
+     * @return Resolved when done.
      */
     gotoEntry(offset: number): Promise<any> {
         this.offset = offset;
@@ -205,8 +205,8 @@ export class AddonModDataEntryPage implements OnDestroy {
     /**
      * Refresh all the data.
      *
-     * @param  {boolean} [isPtr] Whether is a pull to refresh action.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param isPtr Whether is a pull to refresh action.
+     * @return Promise resolved when done.
      */
     protected refreshAllData(isPtr?: boolean): Promise<any> {
         const promises = [];
@@ -233,8 +233,8 @@ export class AddonModDataEntryPage implements OnDestroy {
     /**
      * Refresh the data.
      *
-     * @param {any} [refresher] Refresher.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @return Promise resolved when done.
      */
     refreshDatabase(refresher?: any): Promise<any> {
         if (this.entryLoaded) {
@@ -247,8 +247,8 @@ export class AddonModDataEntryPage implements OnDestroy {
     /**
      * Set group to see the database.
      *
-     * @param  {number}       groupId Group identifier to set.
-     * @return {Promise<any>}         Resolved when done.
+     * @param groupId Group identifier to set.
+     * @return Resolved when done.
      */
     setGroup(groupId: number): Promise<any> {
         this.selectedGroup = groupId;
@@ -263,7 +263,7 @@ export class AddonModDataEntryPage implements OnDestroy {
     /**
      * Convenience function to fetch the entry and set next/previous entries.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected setEntryFromOffset(): Promise<any> {
         const emptyOffset = typeof this.offset != 'number';
diff --git a/src/addon/mod/data/pages/index/index.ts b/src/addon/mod/data/pages/index/index.ts
index f415352a4..4ddf93488 100644
--- a/src/addon/mod/data/pages/index/index.ts
+++ b/src/addon/mod/data/pages/index/index.ts
@@ -42,7 +42,7 @@ export class AddonModDataIndexPage {
     /**
      * Update some data based on the data instance.
      *
-     * @param {any} data Data instance.
+     * @param data Data instance.
      */
     updateData(data: any): void {
         this.title = data.name || this.title;
diff --git a/src/addon/mod/data/pages/search/search.ts b/src/addon/mod/data/pages/search/search.ts
index e61153d3c..bad3b39c5 100644
--- a/src/addon/mod/data/pages/search/search.ts
+++ b/src/addon/mod/data/pages/search/search.ts
@@ -82,7 +82,7 @@ export class AddonModDataSearchPage {
     /**
      * Displays Advanced Search Fields.
      *
-     * @return {string}         Generated HTML.
+     * @return Generated HTML.
      */
     protected renderAdvancedSearchFields(): string {
         this.jsData = {
@@ -130,8 +130,8 @@ export class AddonModDataSearchPage {
     /**
      * Retrieve the entered data in search in a form.
      *
-     * @param {any} searchedData Array with the entered form values.
-     * @return {any[]}          Array with the answers.
+     * @param searchedData Array with the entered form values.
+     * @return Array with the answers.
      */
     getSearchDataFromForm(searchedData: any): any[] {
         const advancedSearch = [];
@@ -172,7 +172,7 @@ export class AddonModDataSearchPage {
     /**
      * Close modal.
      *
-     * @param {any} [data] Data to return to the page.
+     * @param data Data to return to the page.
      */
     closeModal(data?: any): void {
         this.viewCtrl.dismiss(data);
@@ -181,7 +181,7 @@ export class AddonModDataSearchPage {
     /**
      * Toggles between advanced to normal search.
      *
-     * @param {boolean} advanced True for advanced, false for basic.
+     * @param advanced True for advanced, false for basic.
      */
     changeAdvanced(advanced: boolean): void {
         this.search.searchingAdvanced = advanced;
@@ -190,7 +190,7 @@ export class AddonModDataSearchPage {
     /**
      * Done editing.
      *
-     * @param {Event} e Event.
+     * @param e Event.
      */
     searchEntries(e: Event): void {
         e.preventDefault();
diff --git a/src/addon/mod/data/providers/approve-link-handler.ts b/src/addon/mod/data/providers/approve-link-handler.ts
index 5084b8fb3..bf4545516 100644
--- a/src/addon/mod/data/providers/approve-link-handler.ts
+++ b/src/addon/mod/data/providers/approve-link-handler.ts
@@ -35,11 +35,11 @@ export class AddonModDataApproveLinkHandler extends CoreContentLinksHandlerBase
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -58,11 +58,11 @@ export class AddonModDataApproveLinkHandler extends CoreContentLinksHandlerBase
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         if (typeof params.d == 'undefined' || (typeof params.approve == 'undefined' && typeof params.disapprove == 'undefined')) {
diff --git a/src/addon/mod/data/providers/data.ts b/src/addon/mod/data/providers/data.ts
index 63e53e364..98de9d3ae 100644
--- a/src/addon/mod/data/providers/data.ts
+++ b/src/addon/mod/data/providers/data.ts
@@ -106,15 +106,15 @@ export class AddonModDataProvider {
     /**
      * Adds a new entry to a database.
      *
-     * @param   {number}  dataId          Data instance ID.
-     * @param   {number}  entryId         EntryId or provisional entry ID when offline.
-     * @param   {number}  courseId        Course ID.
-     * @param   {any}     contents        The fields data to be created.
-     * @param   {number}  [groupId]       Group id, 0 means that the function will determine the user group.
-     * @param   {any[]}   fields          The fields that define the contents.
-     * @param   {string}  [siteId]        Site ID. If not defined, current site.
-     * @param   {boolean} [forceOffline]  Force editing entry in offline.
-     * @return  {Promise<any>}            Promise resolved when the action is done.
+     * @param dataId Data instance ID.
+     * @param entryId EntryId or provisional entry ID when offline.
+     * @param courseId Course ID.
+     * @param contents The fields data to be created.
+     * @param groupId Group id, 0 means that the function will determine the user group.
+     * @param fields The fields that define the contents.
+     * @param siteId Site ID. If not defined, current site.
+     * @param forceOffline Force editing entry in offline.
+     * @return Promise resolved when the action is done.
      */
     addEntry(dataId: number, entryId: number, courseId: number, contents: AddonModDataSubfieldData[], groupId: number = 0,
             fields: any, siteId?: string, forceOffline: boolean = false): Promise<any> {
@@ -156,11 +156,11 @@ export class AddonModDataProvider {
     /**
      * Adds a new entry to a database. It does not cache calls. It will fail if offline or cannot connect.
      *
-     * @param   {number} dataId     Database ID.
-     * @param   {any[]}  data       The fields data to be created.
-     * @param   {number} [groupId]  Group id, 0 means that the function will determine the user group.
-     * @param   {string} [siteId]   Site ID. If not defined, current site.
-     * @return  {Promise<any>}      Promise resolved when the action is done.
+     * @param dataId Database ID.
+     * @param data The fields data to be created.
+     * @param groupId Group id, 0 means that the function will determine the user group.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the action is done.
      */
     addEntryOnline(dataId: number, data: AddonModDataSubfieldData[], groupId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -180,12 +180,12 @@ export class AddonModDataProvider {
     /**
      * Approves or unapproves an entry.
      *
-     * @param   {number}    dataId      Database ID.
-     * @param   {number}    entryId     Entry ID.
-     * @param   {boolean}   approve     Whether to approve (true) or unapprove the entry.
-     * @param   {number}    courseId    Course ID.
-     * @param   {string}    [siteId]    Site ID. If not defined, current site.
-     * @return  {Promise<any>}          Promise resolved when the action is done.
+     * @param dataId Database ID.
+     * @param entryId Entry ID.
+     * @param approve Whether to approve (true) or unapprove the entry.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the action is done.
      */
     approveEntry(dataId: number, entryId: number, approve: boolean, courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -225,10 +225,10 @@ export class AddonModDataProvider {
     /**
      * Approves or unapproves an entry. It does not cache calls. It will fail if offline or cannot connect.
      *
-     * @param   {number}    entryId  Entry ID.
-     * @param   {boolean}   approve  Whether to approve (true) or unapprove the entry.
-     * @param   {string}    [siteId] Site ID. If not defined, current site.
-     * @return  {Promise<any>}       Promise resolved when the action is done.
+     * @param entryId Entry ID.
+     * @param approve Whether to approve (true) or unapprove the entry.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the action is done.
      */
     approveEntryOnline(entryId: number, approve: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -244,9 +244,9 @@ export class AddonModDataProvider {
     /**
      * Convenience function to check fields requeriments here named "notifications".
      *
-     * @param   {any}    fields    The fields that define the contents.
-     * @param   {any}    contents  The contents data of the fields.
-     * @return  {any}            Array of notifications if any or false.
+     * @param fields The fields that define the contents.
+     * @param contents The contents data of the fields.
+     * @return Array of notifications if any or false.
      */
     protected checkFields(fields: any, contents: AddonModDataSubfieldData[]): any[] | false {
         const notifications = [],
@@ -277,11 +277,11 @@ export class AddonModDataProvider {
     /**
      * Deletes an entry.
      *
-     * @param   {number}    dataId     Database ID.
-     * @param   {number}    entryId    Entry ID.
-     * @param   {number}    courseId   Course ID.
-     * @param   {string}    [siteId]   Site ID. If not defined, current site.
-     * @return  {Promise<any>}         Promise resolved when the action is done.
+     * @param dataId Database ID.
+     * @param entryId Entry ID.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the action is done.
      */
     deleteEntry(dataId: number, entryId: number, courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -333,9 +333,9 @@ export class AddonModDataProvider {
     /**
      * Deletes an entry. It does not cache calls. It will fail if offline or cannot connect.
      *
-     * @param   {number}  entryId  Entry ID.
-     * @param   {string}  [siteId] Site ID. If not defined, current site.
-     * @return  {Promise<any>}     Promise resolved when the action is done.
+     * @param entryId Entry ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the action is done.
      */
     deleteEntryOnline(entryId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -350,14 +350,14 @@ export class AddonModDataProvider {
     /**
      * Updates an existing entry.
      *
-     * @param   {number}  dataId          Database ID.
-     * @param   {number}  entryId         Entry ID.
-     * @param   {number}  courseId        Course ID.
-     * @param   {any[]}   contents        The contents data to be updated.
-     * @param   {any}     fields          The fields that define the contents.
-     * @param   {string}  [siteId]        Site ID. If not defined, current site.
-     * @param   {boolean} forceOffline    Force editing entry in offline.
-     * @return  {Promise<any>}            Promise resolved when the action is done.
+     * @param dataId Database ID.
+     * @param entryId Entry ID.
+     * @param courseId Course ID.
+     * @param contents The contents data to be updated.
+     * @param fields The fields that define the contents.
+     * @param siteId Site ID. If not defined, current site.
+     * @param forceOffline Force editing entry in offline.
+     * @return Promise resolved when the action is done.
      */
     editEntry(dataId: number, entryId: number, courseId: number, contents: AddonModDataSubfieldData[], fields: any, siteId?: string,
             forceOffline: boolean = false): Promise<any> {
@@ -433,10 +433,10 @@ export class AddonModDataProvider {
     /**
      * Updates an existing entry. It does not cache calls. It will fail if offline or cannot connect.
      *
-     * @param   {number}  entryId  Entry ID.
-     * @param   {any[]}   data     The fields data to be updated.
-     * @param   {string}  [siteId] Site ID. If not defined, current site.
-     * @return  {Promise<any>}     Promise resolved when the action is done.
+     * @param entryId Entry ID.
+     * @param data The fields data to be updated.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the action is done.
      */
     editEntryOnline(entryId: number, data: AddonModDataSubfieldData[], siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -452,16 +452,16 @@ export class AddonModDataProvider {
     /**
      * Performs the whole fetch of the entries in the database.
      *
-     * @param  {number}    dataId          Data ID.
-     * @param  {number}    [groupId]       Group ID.
-     * @param  {string}    [sort]          Sort the records by this field id. See AddonModDataProvider#getEntries for more info.
-     * @param  {string}    [order]         The direction of the sorting.  See AddonModDataProvider#getEntries for more info.
-     * @param  {number}    [perPage]       Records per page to fetch. It has to match with the prefetch.
-     *                                     Default on AddonModDataProvider.PER_PAGE.
-     * @param  {boolean}   [forceCache]    True to always get the value from cache, false otherwise. Default false.
-     * @param  {boolean}   [ignoreCache]   True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {string}    [siteId]        Site ID. If not defined, current site.
-     * @return {Promise<AddonModDataEntry[]>} Promise resolved when done.
+     * @param dataId Data ID.
+     * @param groupId Group ID.
+     * @param sort Sort the records by this field id. See AddonModDataProvider#getEntries for more info.
+     * @param order The direction of the sorting.  See AddonModDataProvider#getEntries for more info.
+     * @param perPage Records per page to fetch. It has to match with the prefetch.
+     *                Default on AddonModDataProvider.PER_PAGE.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     fetchAllEntries(dataId: number, groupId: number = 0, sort: string = '0', order: string = 'DESC',
             perPage: number = AddonModDataProvider.PER_PAGE, forceCache: boolean = false, ignoreCache: boolean = false,
@@ -474,17 +474,17 @@ export class AddonModDataProvider {
     /**
      * Recursive call on fetch all entries.
      *
-     * @param  {number}    dataId          Data ID.
-     * @param  {number}    groupId         Group ID.
-     * @param  {string}    sort            Sort the records by this field id. See AddonModDataProvider#getEntries for more info.
-     * @param  {string}    order           The direction of the sorting.  See AddonModDataProvider#getEntries for more info.
-     * @param  {number}    perPage         Records per page to fetch. It has to match with the prefetch.
-     * @param  {boolean}   forceCache      True to always get the value from cache, false otherwise. Default false.
-     * @param  {boolean}   ignoreCache     True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {any}       entries         Entries already fetch (just to concatenate them).
-     * @param  {number}    page            Page of records to return.
-     * @param  {string}    siteId          Site ID.
-     * @return {Promise<AddonModDataEntry[]>} Promise resolved when done.
+     * @param dataId Data ID.
+     * @param groupId Group ID.
+     * @param sort Sort the records by this field id. See AddonModDataProvider#getEntries for more info.
+     * @param order The direction of the sorting.  See AddonModDataProvider#getEntries for more info.
+     * @param perPage Records per page to fetch. It has to match with the prefetch.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param entries Entries already fetch (just to concatenate them).
+     * @param page Page of records to return.
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
      */
     protected fetchEntriesRecursive(dataId: number, groupId: number, sort: string, order: string, perPage: number,
             forceCache: boolean, ignoreCache: boolean, entries: any, page: number, siteId: string): Promise<AddonModDataEntry[]> {
@@ -505,8 +505,8 @@ export class AddonModDataProvider {
     /**
      * Get cache key for data data WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @return {string}         Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getDatabaseDataCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'data:' + courseId;
@@ -515,8 +515,8 @@ export class AddonModDataProvider {
     /**
      * Get prefix cache key for all database activity data WS calls.
      *
-     * @param {number} dataId   Data ID.
-     * @return {string}         Cache key.
+     * @param dataId Data ID.
+     * @return Cache key.
      */
     protected getDatabaseDataPrefixCacheKey(dataId: number): string {
         return this.ROOT_CACHE_KEY + dataId;
@@ -525,12 +525,12 @@ export class AddonModDataProvider {
     /**
      * Get a database data. If more than one is found, only the first will be returned.
      *
-     * @param {number}   courseId           Course ID.
-     * @param {string}   key                Name of the property to check.
-     * @param {any}      value              Value to search.
-     * @param {string}   [siteId]           Site ID. If not defined, current site.
-     * @param {boolean}  [forceCache=false] True to always get the value from cache, false otherwise. Default false.
-     * @return {Promise<any>}  Promise resolved when the data is retrieved.
+     * @param courseId Course ID.
+     * @param key Name of the property to check.
+     * @param value Value to search.
+     * @param siteId Site ID. If not defined, current site.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @return Promise resolved when the data is retrieved.
      */
     protected getDatabaseByKey(courseId: number, key: string, value: any, siteId?: string, forceCache: boolean = false):
             Promise<any> {
@@ -562,11 +562,11 @@ export class AddonModDataProvider {
     /**
      * Get a data by course module ID.
      *
-     * @param {number}   courseId           Course ID.
-     * @param {number}   cmId               Course module ID.
-     * @param {string}   [siteId]           Site ID. If not defined, current site.
-     * @param {boolean}  [forceCache=false] True to always get the value from cache, false otherwise. Default false.
-     * @return {Promise<any>} Promise resolved when the data is retrieved.
+     * @param courseId Course ID.
+     * @param cmId Course module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @return Promise resolved when the data is retrieved.
      */
     getDatabase(courseId: number, cmId: number, siteId?: string, forceCache: boolean = false): Promise<any> {
         return this.getDatabaseByKey(courseId, 'coursemodule', cmId, siteId, forceCache);
@@ -575,11 +575,11 @@ export class AddonModDataProvider {
     /**
      * Get a data by ID.
      *
-     * @param {number}   courseId           Course ID.
-     * @param {number}   id                 Data ID.
-     * @param {string}   [siteId]           Site ID. If not defined, current site.
-     * @param {boolean}  [forceCache=false] True to always get the value from cache, false otherwise. Default false.
-     * @return {Promise<any>}         Promise resolved when the data is retrieved.
+     * @param courseId Course ID.
+     * @param id Data ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @return Promise resolved when the data is retrieved.
      */
     getDatabaseById(courseId: number, id: number, siteId?: string, forceCache: boolean = false): Promise<any> {
         return this.getDatabaseByKey(courseId, 'id', id, siteId, forceCache);
@@ -588,8 +588,8 @@ export class AddonModDataProvider {
     /**
      * Get prefix cache key for all database access information data WS calls.
      *
-     * @param {number} dataId   Data ID.
-     * @return {string}         Cache key.
+     * @param dataId Data ID.
+     * @return Cache key.
      */
     protected getDatabaseAccessInformationDataPrefixCacheKey(dataId: number): string {
         return this.getDatabaseDataPrefixCacheKey(dataId) + ':access:';
@@ -598,9 +598,9 @@ export class AddonModDataProvider {
     /**
      * Get cache key for database access information data WS calls.
      *
-     * @param {number} dataId       Data ID.
-     * @param {number} [groupId=0]  Group ID.
-     * @return {string}             Cache key.
+     * @param dataId Data ID.
+     * @param groupId Group ID.
+     * @return Cache key.
      */
     protected getDatabaseAccessInformationDataCacheKey(dataId: number, groupId: number = 0): string {
         return this.getDatabaseAccessInformationDataPrefixCacheKey(dataId) + groupId;
@@ -609,12 +609,12 @@ export class AddonModDataProvider {
     /**
      * Get  access information for a given database.
      *
-     * @param   {number}    dataId              Data ID.
-     * @param   {number}    [groupId]           Group ID.
-     * @param   {boolean}   [offline=false]     True if it should return cached data. Has priority over ignoreCache.
-     * @param   {boolean}   [ignoreCache=false] True if it should ignore cached data (it'll always fail in offline or server down).
-     * @param   {string}    [siteId]            Site ID. If not defined, current site.
-     * @return  {Promise<any>}                  Promise resolved when the database is retrieved.
+     * @param dataId Data ID.
+     * @param groupId Group ID.
+     * @param offline True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it'll always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the database is retrieved.
      */
     getDatabaseAccessInformation(dataId: number, groupId?: number, offline: boolean = false, ignoreCache: boolean = false,
             siteId?: string): Promise<any> {
@@ -644,23 +644,23 @@ export class AddonModDataProvider {
     /**
      * Get entries for a specific database and group.
      *
-     * @param   {number}    dataId             Data ID.
-     * @param   {number}    [groupId=0]        Group ID.
-     * @param   {string}    [sort=0]           Sort the records by this field id, reserved ids are:
-     *                                            0: timeadded
-     *                                           -1: firstname
-     *                                           -2: lastname
-     *                                           -3: approved
-     *                                           -4: timemodified.
-     *                                          Empty for using the default database setting.
-     * @param   {string}    [order=DESC]        The direction of the sorting: 'ASC' or 'DESC'.
-     *                                          Empty for using the default database setting.
-     * @param   {number}    [page=0]            Page of records to return.
-     * @param   {number}    [perPage=PER_PAGE]  Records per page to return. Default on PER_PAGE.
-     * @param   {boolean}   [forceCache=false]  True to always get the value from cache, false otherwise. Default false.
-     * @param   {boolean}   [ignoreCache=false] True if it should ignore cached data (it'll always fail in offline or server down).
-     * @param   {string}    [siteId]            Site ID. If not defined, current site.
-     * @return  {Promise<AddonModDataEntries>} Promise resolved when the database is retrieved.
+     * @param dataId Data ID.
+     * @param groupId Group ID.
+     * @param sort Sort the records by this field id, reserved ids are:
+     *             0: timeadded
+     *             -1: firstname
+     *             -2: lastname
+     *             -3: approved
+     *             -4: timemodified.
+     *             Empty for using the default database setting.
+     * @param order The direction of the sorting: 'ASC' or 'DESC'.
+     *              Empty for using the default database setting.
+     * @param page Page of records to return.
+     * @param perPage Records per page to return. Default on PER_PAGE.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @param ignoreCache True if it should ignore cached data (it'll always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the database is retrieved.
      */
     getEntries(dataId: number, groupId: number = 0, sort: string = '0', order: string = 'DESC', page: number = 0,
             perPage: number = AddonModDataProvider.PER_PAGE, forceCache: boolean = false, ignoreCache: boolean = false,
@@ -701,9 +701,9 @@ export class AddonModDataProvider {
     /**
      * Get cache key for database entries data WS calls.
      *
-     * @param {number} dataId       Data ID.
-     * @param {number} [groupId=0]  Group ID.
-     * @return {string}             Cache key.
+     * @param dataId Data ID.
+     * @param groupId Group ID.
+     * @return Cache key.
      */
     protected getEntriesCacheKey(dataId: number, groupId: number = 0): string {
         return this.getEntriesPrefixCacheKey(dataId) + groupId;
@@ -712,8 +712,8 @@ export class AddonModDataProvider {
     /**
      * Get prefix cache key for database all entries data WS calls.
      *
-     * @param {number} dataId     Data ID.
-     * @return {string}           Cache key.
+     * @param dataId Data ID.
+     * @return Cache key.
      */
     protected getEntriesPrefixCacheKey(dataId: number): string {
         return this.getDatabaseDataPrefixCacheKey(dataId) + ':entries:';
@@ -722,11 +722,11 @@ export class AddonModDataProvider {
     /**
      * Get an entry of the database activity.
      *
-     * @param   {number}    dataId    Data ID for caching purposes.
-     * @param   {number}    entryId   Entry ID.
-     * @param   {boolean}   [ignoreCache=false] True if it should ignore cached data (it'll always fail in offline or server down).
-     * @param   {string}    [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<{entry: AddonModDataEntry, ratinginfo: CoreRatingInfo}>} Promise resolved when the entry is retrieved.
+     * @param dataId Data ID for caching purposes.
+     * @param entryId Entry ID.
+     * @param ignoreCache True if it should ignore cached data (it'll always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the entry is retrieved.
      */
     getEntry(dataId: number, entryId: number, ignoreCache: boolean = false, siteId?: string):
              Promise<{entry: AddonModDataEntry, ratinginfo: CoreRatingInfo}> {
@@ -756,9 +756,9 @@ export class AddonModDataProvider {
     /**
      * Get cache key for database entry data WS calls.
      *
-     * @param {number} dataId     Data ID for caching purposes.
-     * @param {number} entryId    Entry ID.
-     * @return {string}           Cache key.
+     * @param dataId Data ID for caching purposes.
+     * @param entryId Entry ID.
+     * @return Cache key.
      */
     protected getEntryCacheKey(dataId: number, entryId: number): string {
         return this.getDatabaseDataPrefixCacheKey(dataId) + ':entry:' + entryId;
@@ -767,11 +767,11 @@ export class AddonModDataProvider {
     /**
      * Get the list of configured fields for the given database.
      *
-     * @param  {number} dataId               Data ID.
-     * @param  {boolean} [forceCache=false]  True to always get the value from cache, false otherwise. Default false.
-     * @param  {boolean} [ignoreCache=false] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {string} [siteId]             Site ID. If not defined, current site.
-     * @return {Promise<any>}                Promise resolved when the fields are retrieved.
+     * @param dataId Data ID.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the fields are retrieved.
      */
     getFields(dataId: number, forceCache: boolean = false, ignoreCache: boolean = false, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -803,8 +803,8 @@ export class AddonModDataProvider {
     /**
      * Get cache key for database fields data WS calls.
      *
-     * @param {number} dataId     Data ID.
-     * @return {string}           Cache key.
+     * @param dataId Data ID.
+     * @return Cache key.
      */
     protected getFieldsCacheKey(dataId: number): string {
         return this.getDatabaseDataPrefixCacheKey(dataId) + ':fields';
@@ -814,10 +814,10 @@ export class AddonModDataProvider {
      * Invalidate the prefetched content.
      * To invalidate files, use AddonModDataProvider#invalidateFiles.
      *
-     * @param  {number} moduleId The module ID.
-     * @param  {number} courseId Course ID of the module.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID of the module.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -842,9 +842,9 @@ export class AddonModDataProvider {
     /**
      * Invalidates database access information data.
      *
-     * @param {number} dataId     Data ID.
-     * @param  {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<any>}     Promise resolved when the data is invalidated.
+     * @param dataId Data ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateDatabaseAccessInformationData(dataId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -855,9 +855,9 @@ export class AddonModDataProvider {
     /**
      * Invalidates database entries data.
      *
-     * @param {number} dataId       Data ID.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the data is invalidated.
+     * @param dataId Data ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateEntriesData(dataId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -868,9 +868,9 @@ export class AddonModDataProvider {
     /**
      * Invalidate the prefetched files.
      *
-     * @param {number} moduleId  The module ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved when the files are invalidated.
+     * @param moduleId The module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the files are invalidated.
      */
     invalidateFiles(moduleId: number, siteId?: string): Promise<any> {
         return this.filepoolProvider.invalidateFilesByComponent(siteId, AddonModDataProvider.COMPONENT, moduleId);
@@ -879,9 +879,9 @@ export class AddonModDataProvider {
     /**
      * Invalidates database data.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}   Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateDatabaseData(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -892,9 +892,9 @@ export class AddonModDataProvider {
     /**
      * Invalidates database data except files and module info.
      *
-     * @param  {number} databaseId   Data ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the data is invalidated.
+     * @param databaseId Data ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateDatabaseWSData(databaseId: number, siteId: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -905,10 +905,10 @@ export class AddonModDataProvider {
     /**
      * Invalidates database entry data.
      *
-     * @param  {number}  dataId     Data ID for caching purposes.
-     * @param  {number}  entryId    Entry ID.
-     * @param  {string}  [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}            Promise resolved when the data is invalidated.
+     * @param dataId Data ID for caching purposes.
+     * @param entryId Entry ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateEntryData(dataId: number, entryId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -919,8 +919,8 @@ export class AddonModDataProvider {
     /**
      * Return whether or not the plugin is enabled in a certain site. Plugin is enabled if the database WS are available.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>}  Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
      * @since 3.3
      */
     isPluginEnabled(siteId?: string): Promise<boolean> {
@@ -932,10 +932,10 @@ export class AddonModDataProvider {
     /**
      * Report the database as being viewed.
      *
-     * @param {number} id      Module ID.
-     * @param {string} [name] Name of the data.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the WS call is successful.
+     * @param id Module ID.
+     * @param name Name of the data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(id: number, name?: string, siteId?: string): Promise<any> {
         const params = {
@@ -949,16 +949,16 @@ export class AddonModDataProvider {
     /**
      * Performs search over a database.
      *
-     * @param {number} dataId             The data instance id.
-     * @param {number} [groupId=0]        Group id, 0 means that the function will determine the user group.
-     * @param {string} [search]           Search text. It will be used if advSearch is not defined.
-     * @param {any[]}  [advSearch]        Advanced search data.
-     * @param {string} [sort]             Sort by this field.
-     * @param {string} [order]            The direction of the sorting.
-     * @param {number} [page=0]           Page of records to return.
-     * @param {number} [perPage=PER_PAGE] Records per page to return. Default on AddonModDataProvider.PER_PAGE.
-     * @param {string} [siteId]           Site ID. If not defined, current site.
-     * @return {Promise<AddonModDataEntries>} Promise resolved when the action is done.
+     * @param dataId The data instance id.
+     * @param groupId Group id, 0 means that the function will determine the user group.
+     * @param search Search text. It will be used if advSearch is not defined.
+     * @param advSearch Advanced search data.
+     * @param sort Sort by this field.
+     * @param order The direction of the sorting.
+     * @param page Page of records to return.
+     * @param perPage Records per page to return. Default on AddonModDataProvider.PER_PAGE.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the action is done.
      */
     searchEntries(dataId: number, groupId: number = 0, search?: string, advSearch?: any, sort?: string, order?: string,
             page: number = 0, perPage: number = AddonModDataProvider.PER_PAGE, siteId?: string): Promise<AddonModDataEntries> {
diff --git a/src/addon/mod/data/providers/default-field-handler.ts b/src/addon/mod/data/providers/default-field-handler.ts
index 2160d8a9e..d28bba2c8 100644
--- a/src/addon/mod/data/providers/default-field-handler.ts
+++ b/src/addon/mod/data/providers/default-field-handler.ts
@@ -25,9 +25,9 @@ export class AddonModDataDefaultFieldHandler implements AddonModDataFieldHandler
     /**
      * Get field search data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the search form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the search form.
+     * @return With name and value of the data to be sent.
      */
     getFieldSearchData(field: any, inputData: any): any {
         return false;
@@ -36,9 +36,9 @@ export class AddonModDataDefaultFieldHandler implements AddonModDataFieldHandler
     /**
      * Get field edit data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the edit form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return With name and value of the data to be sent.
      */
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
         return false;
@@ -47,10 +47,10 @@ export class AddonModDataDefaultFieldHandler implements AddonModDataFieldHandler
     /**
      * Get field data in changed.
      *
-     * @param  {any} field                  Defines the field to be rendered.
-     * @param  {any} inputData              Data entered in the edit form.
-     * @param  {any} originalFieldData      Original field entered data.
-     * @return {Promise<boolean> | boolean} If the field has changes.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @param originalFieldData Original field entered data.
+     * @return If the field has changes.
      */
     hasFieldDataChanged(field: any, inputData: any, originalFieldData: any): Promise<boolean> | boolean {
         return false;
@@ -59,8 +59,8 @@ export class AddonModDataDefaultFieldHandler implements AddonModDataFieldHandler
     /**
      * Get field edit files in the input data.
      *
-     * @param  {any} field Defines the field..
-     * @return {any}       With name and value of the data to be sent.
+     * @param field Defines the field..
+     * @return With name and value of the data to be sent.
      */
     getFieldEditFiles(field: any, inputData: any, originalFieldData: any): any {
         return [];
@@ -69,9 +69,9 @@ export class AddonModDataDefaultFieldHandler implements AddonModDataFieldHandler
     /**
      * Check and get field requeriments.
      *
-     * @param  {any} field               Defines the field to be rendered.
-     * @param  {any} inputData           Data entered in the edit form.
-     * @return {string | false}                  String with the notification or false.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return String with the notification or false.
      */
     getFieldsNotifications(field: any, inputData: any): string | false {
         return false;
@@ -80,10 +80,10 @@ export class AddonModDataDefaultFieldHandler implements AddonModDataFieldHandler
     /**
      * Override field content data with offline submission.
      *
-     * @param  {any}  originalContent    Original data to be overriden.
-     * @param  {any}  offlineContent     Array with all the offline data to override.
-     * @param  {any}  [offlineFiles]     Array with all the offline files in the field.
-     * @return {any}                     Data overriden
+     * @param originalContent Original data to be overriden.
+     * @param offlineContent Array with all the offline data to override.
+     * @param offlineFiles Array with all the offline files in the field.
+     * @return Data overriden
      */
     overrideData(originalContent: any, offlineContent: any, offlineFiles?: any): any {
         return originalContent;
@@ -92,7 +92,7 @@ export class AddonModDataDefaultFieldHandler implements AddonModDataFieldHandler
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/mod/data/providers/delete-link-handler.ts b/src/addon/mod/data/providers/delete-link-handler.ts
index 8da37ba6b..64a585026 100644
--- a/src/addon/mod/data/providers/delete-link-handler.ts
+++ b/src/addon/mod/data/providers/delete-link-handler.ts
@@ -35,11 +35,11 @@ export class AddonModDataDeleteLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -57,11 +57,11 @@ export class AddonModDataDeleteLinkHandler extends CoreContentLinksHandlerBase {
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         if (typeof params.d == 'undefined' || typeof params.delete == 'undefined') {
diff --git a/src/addon/mod/data/providers/edit-link-handler.ts b/src/addon/mod/data/providers/edit-link-handler.ts
index b6857f3ab..8d724b864 100644
--- a/src/addon/mod/data/providers/edit-link-handler.ts
+++ b/src/addon/mod/data/providers/edit-link-handler.ts
@@ -38,11 +38,11 @@ export class AddonModDataEditLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -75,11 +75,11 @@ export class AddonModDataEditLinkHandler extends CoreContentLinksHandlerBase {
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         if (typeof params.d == 'undefined') {
diff --git a/src/addon/mod/data/providers/fields-delegate.ts b/src/addon/mod/data/providers/fields-delegate.ts
index 544d9f349..0c935d7e9 100644
--- a/src/addon/mod/data/providers/fields-delegate.ts
+++ b/src/addon/mod/data/providers/fields-delegate.ts
@@ -27,7 +27,6 @@ export interface AddonModDataFieldHandler extends CoreDelegateHandler {
 
     /**
      * Name of the type of data field the handler supports. E.g. 'checkbox'.
-     * @type {string}
      */
     type: string;
 
@@ -35,64 +34,64 @@ export interface AddonModDataFieldHandler extends CoreDelegateHandler {
      * Return the Component to use to display the plugin data.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} field         The field object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param field The field object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent?(injector: Injector, plugin: any): any | Promise<any>;
 
     /**
      * Get field search data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the search form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the search form.
+     * @return With name and value of the data to be sent.
      */
     getFieldSearchData?(field: any, inputData: any): any;
 
     /**
      * Get field edit data in the input data.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the edit form.
-     * @return {any}            With name and value of the data to be sent.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return With name and value of the data to be sent.
      */
     getFieldEditData?(field: any, inputData: any, originalFieldData: any): any;
 
     /**
      * Get field data in changed.
      *
-     * @param  {any} field                  Defines the field to be rendered.
-     * @param  {any} inputData              Data entered in the edit form.
-     * @param  {any} originalFieldData      Original field entered data.
-     * @return {Promise<boolean> | boolean} If the field has changes.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @param originalFieldData Original field entered data.
+     * @return If the field has changes.
      */
     hasFieldDataChanged?(field: any, inputData: any, originalFieldData: any): Promise<boolean> | boolean;
 
     /**
      * Get field edit files in the input data.
      *
-     * @param  {any} field  Defines the field..
-     * @return {any}        With name and value of the data to be sent.
+     * @param field Defines the field..
+     * @return With name and value of the data to be sent.
      */
     getFieldEditFiles?(field: any, inputData: any, originalFieldData: any): any;
 
     /**
      * Check and get field requeriments.
      *
-     * @param  {any} field               Defines the field to be rendered.
-     * @param  {any} inputData           Data entered in the edit form.
-     * @return {string | false}                  String with the notification or false.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return String with the notification or false.
      */
     getFieldsNotifications?(field: any, inputData: any): string | false;
 
     /**
      * Override field content data with offline submission.
      *
-     * @param  {any}  originalContent    Original data to be overriden.
-     * @param  {any}  offlineContent     Array with all the offline data to override.
-     * @param  {any}  [offlineFiles]     Array with all the offline files in the field.
-     * @return {any}                     Data overriden
+     * @param originalContent Original data to be overriden.
+     * @param offlineContent Array with all the offline data to override.
+     * @param offlineFiles Array with all the offline files in the field.
+     * @return Data overriden
      */
     overrideData?(originalContent: any, offlineContent: any, offlineFiles?: any): any;
 }
@@ -113,9 +112,9 @@ export class AddonModDataFieldsDelegate extends CoreDelegate {
     /**
      * Get the component to use for a certain field field.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} field         The field object.
-     * @return {Promise<any>}     Promise resolved with the component to use, undefined if not found.
+     * @param injector Injector.
+     * @param field The field object.
+     * @return Promise resolved with the component to use, undefined if not found.
      */
     getComponentForField(injector: Injector, field: any): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(field.type, 'getComponent', [injector, field]));
@@ -124,9 +123,9 @@ export class AddonModDataFieldsDelegate extends CoreDelegate {
     /**
      * Get database data in the input data to search.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the search form.
-     * @return {any}             Name and data field.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the search form.
+     * @return Name and data field.
      */
     getFieldSearchData(field: any, inputData: any): any {
         return this.executeFunctionOnEnabled(field.type, 'getFieldSearchData', [field, inputData]);
@@ -135,10 +134,10 @@ export class AddonModDataFieldsDelegate extends CoreDelegate {
     /**
      * Get database data in the input data to add or update entry.
      *
-     * @param  {any} field               Defines the field to be rendered.
-     * @param  {any} inputData           Data entered in the search form.
-     * @param  {any} originalFieldData   Original field entered data.
-     * @return {any}                     Name and data field.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the search form.
+     * @param originalFieldData Original field entered data.
+     * @return Name and data field.
      */
     getFieldEditData(field: any, inputData: any, originalFieldData: any): any {
         return this.executeFunctionOnEnabled(field.type, 'getFieldEditData', [field, inputData, originalFieldData]);
@@ -147,10 +146,10 @@ export class AddonModDataFieldsDelegate extends CoreDelegate {
     /**
      * Get database data in the input files to add or update entry.
      *
-     * @param  {any} field               Defines the field to be rendered.
-     * @param  {any} inputData           Data entered in the search form.
-     * @param  {any} originalFieldData   Original field entered data.
-     * @return {any}                     Name and data field.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the search form.
+     * @param originalFieldData Original field entered data.
+     * @return Name and data field.
      */
     getFieldEditFiles(field: any, inputData: any, originalFieldData: any): any {
         return this.executeFunctionOnEnabled(field.type, 'getFieldEditFiles', [field, inputData, originalFieldData]);
@@ -159,9 +158,9 @@ export class AddonModDataFieldsDelegate extends CoreDelegate {
     /**
      * Check and get field requeriments.
      *
-     * @param  {any} field      Defines the field to be rendered.
-     * @param  {any} inputData  Data entered in the edit form.
-     * @return {string}         String with the notification or false.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the edit form.
+     * @return String with the notification or false.
      */
     getFieldsNotifications(field: any, inputData: any): string {
         return this.executeFunctionOnEnabled(field.type, 'getFieldsNotifications', [field, inputData]);
@@ -170,8 +169,8 @@ export class AddonModDataFieldsDelegate extends CoreDelegate {
     /**
      * Check if field type manage files or not.
      *
-     * @param  {any} field  Defines the field to be checked.
-     * @return {boolean}    If the field type manages files.
+     * @param field Defines the field to be checked.
+     * @return If the field type manages files.
      */
     hasFiles(field: any): boolean {
         return this.hasFunction(field.type, 'getFieldEditFiles');
@@ -180,10 +179,10 @@ export class AddonModDataFieldsDelegate extends CoreDelegate {
     /**
      * Check if the data has changed for a certain field.
      *
-     * @param  {any} field               Defines the field to be rendered.
-     * @param  {any} inputData           Data entered in the search form.
-     * @param  {any} originalFieldData   Original field entered data.
-     * @return {Promise<void>}           Promise rejected if has changed, resolved if no changes.
+     * @param field Defines the field to be rendered.
+     * @param inputData Data entered in the search form.
+     * @param originalFieldData Original field entered data.
+     * @return Promise rejected if has changed, resolved if no changes.
      */
     hasFieldDataChanged(field: any, inputData: any, originalFieldData: any): Promise<void> {
         return Promise.resolve(this.executeFunctionOnEnabled(field.type, 'hasFieldDataChanged',
@@ -195,8 +194,8 @@ export class AddonModDataFieldsDelegate extends CoreDelegate {
     /**
      * Check if a field plugin is supported.
      *
-     * @param  {string} pluginType Type of the plugin.
-     * @return {boolean}           True if supported, false otherwise.
+     * @param pluginType Type of the plugin.
+     * @return True if supported, false otherwise.
      */
     isPluginSupported(pluginType: string): boolean {
         return this.hasHandler(pluginType, true);
@@ -205,11 +204,11 @@ export class AddonModDataFieldsDelegate extends CoreDelegate {
     /**
      * Override field content data with offline submission.
      *
-     * @param  {any} field               Defines the field to be rendered.
-     * @param  {any} originalContent     Original data to be overriden.
-     * @param  {any}  offlineContent     Array with all the offline data to override.
-     * @param  {any}  [offlineFiles]     Array with all the offline files in the field.
-     * @return {any}                     Data overriden
+     * @param field Defines the field to be rendered.
+     * @param originalContent Original data to be overriden.
+     * @param offlineContent Array with all the offline data to override.
+     * @param offlineFiles Array with all the offline files in the field.
+     * @return Data overriden
      */
     overrideData(field: any, originalContent: any, offlineContent: any, offlineFiles?: any): any {
         originalContent = originalContent || {};
diff --git a/src/addon/mod/data/providers/helper.ts b/src/addon/mod/data/providers/helper.ts
index 2938c6c72..0bcb81bbe 100644
--- a/src/addon/mod/data/providers/helper.ts
+++ b/src/addon/mod/data/providers/helper.ts
@@ -43,10 +43,10 @@ export class AddonModDataHelperProvider {
     /**
      * Returns the record with the offline actions applied.
      *
-     * @param {AddonModDataEntry} record Entry to modify.
-     * @param {AddonModDataOfflineAction[]} offlineActions Offline data with the actions done.
-     * @param {any[]} fields Entry defined fields indexed by fieldid.
-     * @return {Promise<AddonModDataEntry>} Promise resolved when done.
+     * @param record Entry to modify.
+     * @param offlineActions Offline data with the actions done.
+     * @param fields Entry defined fields indexed by fieldid.
+     * @return Promise resolved when done.
      */
     applyOfflineActions(record: AddonModDataEntry, offlineActions: AddonModDataOfflineAction[], fields: any[]):
             Promise<AddonModDataEntry> {
@@ -113,11 +113,11 @@ export class AddonModDataHelperProvider {
     /**
      * Approve or disapprove a database entry.
      *
-     * @param {number} dataId Database ID.
-     * @param {number} entryId Entry ID.
-     * @param {boolaen} approve True to approve, false to disapprove.
-     * @param {number} [courseId] Course ID. It not defined, it will be fetched.
-     * @param {string} [siteId] Site ID. If not defined, current site.
+     * @param dataId Database ID.
+     * @param entryId Entry ID.
+     * @param approve True to approve, false to disapprove.
+     * @param courseId Course ID. It not defined, it will be fetched.
+     * @param siteId Site ID. If not defined, current site.
      */
     approveOrDisapproveEntry(dataId: number, entryId: number, approve: boolean, courseId?: number, siteId?: string): void {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -153,13 +153,13 @@ export class AddonModDataHelperProvider {
     /**
      * Displays fields for being shown.
      *
-     * @param {string} template Template HMTL.
-     * @param {any[]} fields Fields that defines every content in the entry.
-     * @param {any} entry Entry.
-     * @param {number} offset Entry offset.
-     * @param {string} mode Mode list or show.
-     * @param {{[name: string]: boolean}} actions Actions that can be performed to the record.
-     * @return {string} Generated HTML.
+     * @param template Template HMTL.
+     * @param fields Fields that defines every content in the entry.
+     * @param entry Entry.
+     * @param offset Entry offset.
+     * @param mode Mode list or show.
+     * @param actions Actions that can be performed to the record.
+     * @return Generated HTML.
      */
     displayShowFields(template: string, fields: any[], entry: any, offset: number, mode: string,
             actions: {[name: string]: boolean}): string {
@@ -208,24 +208,24 @@ export class AddonModDataHelperProvider {
     /**
      * Get online and offline entries, or search entries.
      *
-     * @param   {any}       data               Database object.
-     * @param   {any[]}     fields             The fields that define the contents.
-     * @param   {number}    [groupId=0]        Group ID.
-     * @param   {string}    [search]           Search text. It will be used if advSearch is not defined.
-     * @param   {any[]}     [advSearch]        Advanced search data.
-     * @param   {string}    [sort=0]           Sort the records by this field id, reserved ids are:
-     *                                            0: timeadded
-     *                                           -1: firstname
-     *                                           -2: lastname
-     *                                           -3: approved
-     *                                           -4: timemodified.
-     *                                          Empty for using the default database setting.
-     * @param   {string}    [order=DESC]        The direction of the sorting: 'ASC' or 'DESC'.
-     *                                          Empty for using the default database setting.
-     * @param   {number}    [page=0]            Page of records to return.
-     * @param   {number}    [perPage=PER_PAGE]  Records per page to return. Default on PER_PAGE.
-     * @param   {string}    [siteId]            Site ID. If not defined, current site.
-     * @return  {Promise<AddonModDataEntries>}  Promise resolved when the database is retrieved.
+     * @param data Database object.
+     * @param fields The fields that define the contents.
+     * @param groupId Group ID.
+     * @param search Search text. It will be used if advSearch is not defined.
+     * @param advSearch Advanced search data.
+     * @param sort Sort the records by this field id, reserved ids are:
+     *             0: timeadded
+     *             -1: firstname
+     *             -2: lastname
+     *             -3: approved
+     *             -4: timemodified.
+     *             Empty for using the default database setting.
+     * @param order The direction of the sorting: 'ASC' or 'DESC'.
+     *              Empty for using the default database setting.
+     * @param page Page of records to return.
+     * @param perPage Records per page to return. Default on PER_PAGE.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the database is retrieved.
      */
     fetchEntries(data: any, fields: any[], groupId: number = 0, search?: string, advSearch?: any[], sort: string = '0',
             order: string = 'DESC', page: number = 0, perPage: number = AddonModDataProvider.PER_PAGE, siteId?: string):
@@ -310,11 +310,11 @@ export class AddonModDataHelperProvider {
     /**
      * Fetch an online or offline entry.
      *
-     * @param {any} data Database.
-     * @param {any[]} fields List of database fields.
-     * @param {number} entryId Entry ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<{entry: AddonModDataEntry, ratinginfo?: CoreRatingInfo}>} Promise resolved with the entry.
+     * @param data Database.
+     * @param fields List of database fields.
+     * @param entryId Entry ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the entry.
      */
     fetchEntry(data: any, fields: any[], entryId: number, siteId?: string):
             Promise<{entry: AddonModDataEntry, ratinginfo?: CoreRatingInfo}> {
@@ -355,10 +355,10 @@ export class AddonModDataHelperProvider {
     /**
      * Returns an object with all the actions that the user can do over the record.
      *
-     * @param {any}  database     Database activity.
-     * @param {any}  accessInfo   Access info to the activity.
-     * @param {any}  record       Entry or record where the actions will be performed.
-     * @return {{[name: string]: boolean}} Keyed with the action names and boolean to evalute if it can or cannot be done.
+     * @param database Database activity.
+     * @param accessInfo Access info to the activity.
+     * @param record Entry or record where the actions will be performed.
+     * @return Keyed with the action names and boolean to evalute if it can or cannot be done.
      */
     getActions(database: any, accessInfo: any, record: any): {[name: string]: boolean} {
         return {
@@ -387,10 +387,10 @@ export class AddonModDataHelperProvider {
     /**
      * Convenience function to get the course id of the database.
      *
-     * @param {number} dataId Database id.
-     * @param {number} [courseId] Course id, if known.
-     * @param {string} [siteId] Site id, if not set, current site will be used.
-     * @return {Promise<number>} Resolved with course Id when done.
+     * @param dataId Database id.
+     * @param courseId Course id, if known.
+     * @param siteId Site id, if not set, current site will be used.
+     * @return Resolved with course Id when done.
      */
     protected getActivityCourseIdIfNotSet(dataId: number, courseId?: number, siteId?: string): Promise<number> {
         if (courseId) {
@@ -407,9 +407,9 @@ export class AddonModDataHelperProvider {
      *
      * Based on Moodle function data_generate_default_template.
      *
-     * @param {string} type Type of template.
-     * @param {any[]} fields List of database fields.
-     * @return {string} Template HTML.
+     * @param type Type of template.
+     * @param fields List of database fields.
+     * @return Template HTML.
      */
     getDefaultTemplate(type: string, fields: any[]): string {
         if (type == 'listtemplateheader' || type == 'listtemplatefooter') {
@@ -483,14 +483,14 @@ export class AddonModDataHelperProvider {
      * Retrieve the entered data in the edit form.
      * We don't use ng-model because it doesn't detect changes done by JavaScript.
      *
-     * @param {any} inputData Array with the entered form values.
-     * @param {Array} fields Fields that defines every content in the entry.
-     * @param {number} [dataId] Database Id. If set, files will be uploaded and itemId set.
-     * @param {number} entryId Entry Id.
-     * @param {AddonModDataEntryFields} entryContents Original entry contents.
-     * @param {boolean} offline True to prepare the data for an offline uploading, false otherwise.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} That contains object with the answers.
+     * @param inputData Array with the entered form values.
+     * @param fields Fields that defines every content in the entry.
+     * @param dataId Database Id. If set, files will be uploaded and itemId set.
+     * @param entryId Entry Id.
+     * @param entryContents Original entry contents.
+     * @param offline True to prepare the data for an offline uploading, false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return That contains object with the answers.
      */
     getEditDataFromForm(inputData: any, fields: any, dataId: number, entryId: number, entryContents: AddonModDataEntryFields,
             offline: boolean = false, siteId?: string): Promise<any> {
@@ -549,11 +549,11 @@ export class AddonModDataHelperProvider {
     /**
      * Retrieve the temp files to be updated.
      *
-     * @param {any} inputData Array with the entered form values.
-     * @param {any[]} fields Fields that defines every content in the entry.
-     * @param {number} [dataId] Database Id. If set, fils will be uploaded and itemId set.
-     * @param {AddonModDataEntryFields} entryContents Original entry contents indexed by field id.
-     * @return {Promise<any>} That contains object with the files.
+     * @param inputData Array with the entered form values.
+     * @param fields Fields that defines every content in the entry.
+     * @param dataId Database Id. If set, fils will be uploaded and itemId set.
+     * @param entryContents Original entry contents indexed by field id.
+     * @return That contains object with the files.
      */
     getEditTmpFiles(inputData: any, fields: any[], dataId: number, entryContents: AddonModDataEntryFields): Promise<any> {
         if (!inputData) {
@@ -573,11 +573,11 @@ export class AddonModDataHelperProvider {
     /**
      * Get a list of stored attachment files for a new entry. See $mmaModDataHelper#storeFiles.
      *
-     * @param  {number} dataId     Database ID.
-     * @param  {number} entryId    Entry ID or, if creating, timemodified.
-     * @param  {number} fieldId    Field ID.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved with the files.
+     * @param dataId Database ID.
+     * @param entryId Entry ID or, if creating, timemodified.
+     * @param fieldId Field ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the files.
      */
     getStoredFiles(dataId: number, entryId: number, fieldId: number, siteId?: string): Promise<any> {
         return this.dataOffline.getEntryFieldFolder(dataId, entryId, fieldId, siteId).then((folderPath) => {
@@ -591,10 +591,10 @@ export class AddonModDataHelperProvider {
     /**
      * Returns the template of a certain type.
      *
-     * @param {any} data Database object.
-     * @param {string} type Type of template.
-     * @param {any[]} fields List of database fields.
-     * @return {string} Template HTML.
+     * @param data Database object.
+     * @param type Type of template.
+     * @param fields List of database fields.
+     * @return Template HTML.
      */
     getTemplate(data: any, type: string, fields: any[]): string {
         let template = data[type] || this.getDefaultTemplate(type, fields);
@@ -613,11 +613,11 @@ export class AddonModDataHelperProvider {
     /**
      * Check if data has been changed by the user.
      *
-     * @param {any} inputData Object with the entered form values.
-     * @param {any[]} fields Fields that defines every content in the entry.
-     * @param {number} [dataId] Database Id. If set, fils will be uploaded and itemId set.
-     * @param {AddonModDataEntryFields} entryContents Original entry contents indexed by field id.
-     * @return {Promise<boolean>} True if changed, false if not.
+     * @param inputData Object with the entered form values.
+     * @param fields Fields that defines every content in the entry.
+     * @param dataId Database Id. If set, fils will be uploaded and itemId set.
+     * @param entryContents Original entry contents indexed by field id.
+     * @return True if changed, false if not.
      */
     hasEditDataChanged(inputData: any, fields: any[], dataId: number, entryContents: AddonModDataEntryFields): Promise<boolean> {
         const promises = fields.map((field) => {
@@ -637,10 +637,10 @@ export class AddonModDataHelperProvider {
     /**
      * Displays a confirmation modal for deleting an entry.
      *
-     * @param {number} dataId Database ID.
-     * @param {number} entryId Entry ID.
-     * @param {number} [courseId] Course ID. It not defined, it will be fetched.
-     * @param {string} [siteId] Site ID. If not defined, current site.
+     * @param dataId Database ID.
+     * @param entryId Entry ID.
+     * @param courseId Course ID. It not defined, it will be fetched.
+     * @param siteId Site ID. If not defined, current site.
      */
     showDeleteEntryModal(dataId: number, entryId: number, courseId?: number, siteId?: string): void {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -677,12 +677,12 @@ export class AddonModDataHelperProvider {
      * Given a list of files (either online files or local files), store the local files in a local folder
      * to be submitted later.
      *
-     * @param  {number}   dataId   Database ID.
-     * @param  {number}   entryId  Entry ID or, if creating, timemodified.
-     * @param  {number}   fieldId  Field ID.
-     * @param  {any[]}    files    List of files.
-     * @param  {string}   [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved if success, rejected otherwise.
+     * @param dataId Database ID.
+     * @param entryId Entry ID or, if creating, timemodified.
+     * @param fieldId Field ID.
+     * @param files List of files.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success, rejected otherwise.
      */
     storeFiles(dataId: number, entryId: number, fieldId: number, files: any[], siteId?: string): Promise<any> {
         // Get the folder where to store the files.
@@ -694,14 +694,14 @@ export class AddonModDataHelperProvider {
     /**
      * Upload or store some files, depending if the user is offline or not.
      *
-     * @param  {number}   dataId     Database ID.
-     * @param  {number}   [itemId=0] Draft ID to use. Undefined or 0 to create a new draft ID.
-     * @param  {number}   entryId    Entry ID or, if creating, timemodified.
-     * @param  {number}   fieldId    Field ID.
-     * @param  {any[]}    files      List of files.
-     * @param  {boolean}  offline    True if files sould be stored for offline, false to upload them.
-     * @param  {string}   [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved if success.
+     * @param dataId Database ID.
+     * @param itemId Draft ID to use. Undefined or 0 to create a new draft ID.
+     * @param entryId Entry ID or, if creating, timemodified.
+     * @param fieldId Field ID.
+     * @param files List of files.
+     * @param offline True if files sould be stored for offline, false to upload them.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success.
      */
     uploadOrStoreFiles(dataId: number, itemId: number = 0, entryId: number, fieldId: number, files: any[], offline: boolean,
             siteId?: string): Promise<any> {
diff --git a/src/addon/mod/data/providers/list-link-handler.ts b/src/addon/mod/data/providers/list-link-handler.ts
index 6ca26006a..fa2ec5b8c 100644
--- a/src/addon/mod/data/providers/list-link-handler.ts
+++ b/src/addon/mod/data/providers/list-link-handler.ts
@@ -33,7 +33,7 @@ export class AddonModDataListLinkHandler extends CoreContentLinksModuleListHandl
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): Promise<boolean> {
         return this.dataProvider.isPluginEnabled();
diff --git a/src/addon/mod/data/providers/module-handler.ts b/src/addon/mod/data/providers/module-handler.ts
index 162a9923b..4e2297a32 100644
--- a/src/addon/mod/data/providers/module-handler.ts
+++ b/src/addon/mod/data/providers/module-handler.ts
@@ -47,7 +47,7 @@ export class AddonModDataModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): Promise<boolean> {
         return this.dataProvider.isPluginEnabled();
@@ -56,10 +56,10 @@ export class AddonModDataModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         return {
@@ -81,9 +81,9 @@ export class AddonModDataModuleHandler implements CoreCourseModuleHandler {
      * Get the component to render the module. This is needed to support singleactivity course format.
      * The component returned must implement CoreCourseModuleMainComponent.
      *
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any} The component to use, undefined if not found.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component to use, undefined if not found.
      */
     getMainComponent(course: any, module: any): any {
         return AddonModDataIndexComponent;
diff --git a/src/addon/mod/data/providers/offline.ts b/src/addon/mod/data/providers/offline.ts
index 2d6d6ca4a..5eb640c3b 100644
--- a/src/addon/mod/data/providers/offline.ts
+++ b/src/addon/mod/data/providers/offline.ts
@@ -111,10 +111,10 @@ export class AddonModDataOfflineProvider {
     /**
      * Delete all the actions of an entry.
      *
-     * @param  {number} dataId   Database ID.
-     * @param  {number} entryId  Database entry ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved if deleted, rejected if failure.
+     * @param dataId Database ID.
+     * @param entryId Database entry ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if deleted, rejected if failure.
      */
     deleteAllEntryActions(dataId: number, entryId: number, siteId?: string): Promise<any> {
         return this.getEntryActions(dataId, entryId, siteId).then((actions) => {
@@ -131,11 +131,11 @@ export class AddonModDataOfflineProvider {
     /**
      * Delete an stored entry.
      *
-     * @param  {number} dataId       Database ID.
-     * @param  {number} entryId      Database entry Id.
-     * @param  {string} action       Action to be done
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}             Promise resolved if deleted, rejected if failure.
+     * @param dataId Database ID.
+     * @param entryId Database entry Id.
+     * @param action Action to be done
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if deleted, rejected if failure.
      */
     deleteEntry(dataId: number, entryId: number, action: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -149,11 +149,11 @@ export class AddonModDataOfflineProvider {
     /**
      * Delete entry offline files.
      *
-     * @param  {number} dataId Database ID.
-     * @param  {number} entryId Database entry ID.
-     * @param  {string} action Action to be done.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if deleted, rejected if failure.
+     * @param dataId Database ID.
+     * @param entryId Database entry ID.
+     * @param action Action to be done.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if deleted, rejected if failure.
      */
     protected deleteEntryFiles(dataId: number, entryId: number, action: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -191,8 +191,8 @@ export class AddonModDataOfflineProvider {
     /**
      * Get all the stored entry data from all the databases.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<AddonModDataOfflineAction[]>} Promise resolved with entries.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with entries.
      */
     getAllEntries(siteId?: string): Promise<AddonModDataOfflineAction[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -205,9 +205,9 @@ export class AddonModDataOfflineProvider {
     /**
      * Get all the stored entry actions from a certain database, sorted by modification time.
      *
-     * @param  {number} dataId Database ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<AddonModDataOfflineAction[]>} Promise resolved with entries.
+     * @param dataId Database ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with entries.
      */
     getDatabaseEntries(dataId: number, siteId?: string): Promise<AddonModDataOfflineAction[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -220,11 +220,11 @@ export class AddonModDataOfflineProvider {
     /**
      * Get an stored entry data.
      *
-     * @param  {number} dataId      Database ID.
-     * @param  {number} entryId     Database entry Id.
-     * @param  {string} action      Action to be done
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<AddonModDataOfflineAction>} Promise resolved with entry.
+     * @param dataId Database ID.
+     * @param entryId Database entry Id.
+     * @param action Action to be done
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with entry.
      */
     getEntry(dataId: number, entryId: number, action: string, siteId?: string): Promise<AddonModDataOfflineAction> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -238,10 +238,10 @@ export class AddonModDataOfflineProvider {
     /**
      * Get an all stored entry actions data.
      *
-     * @param  {number} dataId      Database ID.
-     * @param  {number} entryId     Database entry Id.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<AddonModDataOfflineAction[]>} Promise resolved with entry actions.
+     * @param dataId Database ID.
+     * @param entryId Database entry Id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with entry actions.
      */
     getEntryActions(dataId: number, entryId: number, siteId?: string): Promise<AddonModDataOfflineAction[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -254,9 +254,9 @@ export class AddonModDataOfflineProvider {
     /**
      * Check if there are offline entries to send.
      *
-     * @param  {number} dataId    Database ID.
-     * @param  {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<any>}          Promise resolved with boolean: true if has offline answers, false otherwise.
+     * @param dataId Database ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: true if has offline answers, false otherwise.
      */
     hasOfflineData(dataId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -269,9 +269,9 @@ export class AddonModDataOfflineProvider {
     /**
      * Get the path to the folder where to store files for offline files in a database.
      *
-     * @param  {number} dataId      Database ID.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<string>}    Promise resolved with the path.
+     * @param dataId Database ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the path.
      */
     protected getDatabaseFolder(dataId: number, siteId?: string): Promise<string> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -286,11 +286,11 @@ export class AddonModDataOfflineProvider {
     /**
      * Get the path to the folder where to store files for a new offline entry.
      *
-     * @param  {number} dataId      Database ID.
-     * @param  {number} entryId     The ID of the entry.
-     * @param  {number} fieldId     Field ID.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<string>}    Promise resolved with the path.
+     * @param dataId Database ID.
+     * @param entryId The ID of the entry.
+     * @param fieldId Field ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the path.
      */
     getEntryFieldFolder(dataId: number, entryId: number, fieldId: number, siteId?: string): Promise<string> {
         return this.getDatabaseFolder(dataId, siteId).then((folderPath) => {
@@ -301,8 +301,8 @@ export class AddonModDataOfflineProvider {
     /**
      * Parse "fields" of an offline record.
      *
-     * @param {any} record Record object
-     * @return {AddonModDataOfflineAction} Record object with columns parsed.
+     * @param record Record object
+     * @return Record object with columns parsed.
      */
     protected parseRecord(record: any): AddonModDataOfflineAction {
         record.fields = this.textUtils.parseJSON(record.fields);
@@ -313,15 +313,15 @@ export class AddonModDataOfflineProvider {
     /**
      * Save an entry data to be sent later.
      *
-     * @param  {number} dataId          Database ID.
-     * @param  {number} entryId         Database entry Id. If action is add entryId should be 0 and -timemodified will be used.
-     * @param  {string} action          Action to be done to the entry: [add, edit, delete, approve, disapprove]
-     * @param  {number} courseId        Course ID of the database.
-     * @param  {number} [groupId]       Group ID. Only provided when adding.
-     * @param  {any[]}  [fields]        Array of field data of the entry if needed.
-     * @param  {number} [timemodified]  The time the entry was modified. If not defined, current time.
-     * @param  {string} [siteId]        Site ID. If not defined, current site.
-     * @return {Promise<any>}           Promise resolved if stored, rejected if failure.
+     * @param dataId Database ID.
+     * @param entryId Database entry Id. If action is add entryId should be 0 and -timemodified will be used.
+     * @param action Action to be done to the entry: [add, edit, delete, approve, disapprove]
+     * @param courseId Course ID of the database.
+     * @param groupId Group ID. Only provided when adding.
+     * @param fields Array of field data of the entry if needed.
+     * @param timemodified The time the entry was modified. If not defined, current time.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     saveEntry(dataId: number, entryId: number, action: string, courseId: number, groupId?: number,
             fields?: AddonModDataSubfieldData[], timemodified?: number, siteId?: string): Promise<any> {
diff --git a/src/addon/mod/data/providers/prefetch-handler.ts b/src/addon/mod/data/providers/prefetch-handler.ts
index eeb51206f..91635ea8b 100644
--- a/src/addon/mod/data/providers/prefetch-handler.ts
+++ b/src/addon/mod/data/providers/prefetch-handler.ts
@@ -51,12 +51,12 @@ export class AddonModDataPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Retrieves all the entries for all the groups and then returns only unique entries.
      *
-     * @param  {number}  dataId         Database Id.
-     * @param  {any[]}   groups         Array of groups in the activity.
-     * @param  {boolean} [forceCache]   True to always get the value from cache, false otherwise. Default false.
-     * @param  {boolean} [ignoreCache]  True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {string}  [siteId]       Site ID.
-     * @return {Promise<AddonModDataEntry[]>} All unique entries.
+     * @param dataId Database Id.
+     * @param groups Array of groups in the activity.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID.
+     * @return All unique entries.
      */
     protected getAllUniqueEntries(dataId: number, groups: any[], forceCache: boolean = false, ignoreCache: boolean = false,
             siteId?: string): Promise<AddonModDataEntry[]> {
@@ -81,13 +81,13 @@ export class AddonModDataPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Helper function to get all database info just once.
      *
-     * @param  {any}     module         Module to get the files.
-     * @param  {number}  courseId       Course ID the module belongs to.
-     * @param  {boolean} [omitFail]     True to always return even if fails. Default false.
-     * @param  {boolean} [forceCache]   True to always get the value from cache, false otherwise. Default false.
-     * @param  {boolean} [ignoreCache]  True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {string}  siteId         Site ID.
-     * @return {Promise<any>}           Promise resolved with the info fetched.
+     * @param module Module to get the files.
+     * @param courseId Course ID the module belongs to.
+     * @param omitFail True to always return even if fails. Default false.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID.
+     * @return Promise resolved with the info fetched.
      */
     protected getDatabaseInfoHelper(module: any, courseId: number, omitFail: boolean = false, forceCache: boolean = false,
             ignoreCache: boolean = false, siteId?: string): Promise<any> {
@@ -138,8 +138,8 @@ export class AddonModDataPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Returns the file contained in the entries.
      *
-     * @param {AddonModDataEntry[]} entries List of entries to get files from.
-     * @return {any[]} List of files.
+     * @param entries List of entries to get files from.
+     * @return List of files.
      */
     protected getEntriesFiles(entries: AddonModDataEntry[]): any[] {
         let files = [];
@@ -156,10 +156,10 @@ export class AddonModDataPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Get the list of downloadable files.
      *
-     * @param  {any} module    Module to get the files.
-     * @param  {number} courseId  Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @return {Promise<any>}     Promise resolved with the list of files.
+     * @param module Module to get the files.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @return Promise resolved with the list of files.
      */
     getFiles(module: any, courseId: number, single?: boolean): Promise<any[]> {
         return this.getDatabaseInfoHelper(module, courseId, true).then((info) => {
@@ -170,9 +170,9 @@ export class AddonModDataPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Returns data intro files.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @return {Promise<any[]>} Promise resolved with list of intro files.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @return Promise resolved with list of intro files.
      */
     getIntroFiles(module: any, courseId: number): Promise<any[]> {
         return this.dataProvider.getDatabase(courseId, module.id).catch(() => {
@@ -185,9 +185,9 @@ export class AddonModDataPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         return this.dataProvider.invalidateContent(moduleId, courseId);
@@ -196,9 +196,9 @@ export class AddonModDataPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Invalidate WS calls needed to determine module status.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when invalidated.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when invalidated.
      */
     invalidateModule(module: any, courseId: number): Promise<any> {
         const promises = [];
@@ -212,9 +212,9 @@ export class AddonModDataPrefetchHandler extends CoreCourseActivityPrefetchHandl
      * Check if a database is downloadable.
      * A database isn't downloadable if it's not open yet.
      *
-     * @param {any} module       Module to check.
-     * @param {number} courseId  Course ID the module belongs to.
-     * @return {Promise<any>}    Promise resolved with true if downloadable, resolved with false otherwise.
+     * @param module Module to check.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved with true if downloadable, resolved with false otherwise.
      */
     isDownloadable(module: any, courseId: number): boolean | Promise<boolean> {
         return this.dataProvider.getDatabase(courseId, module.id, undefined, true).then((database) => {
@@ -240,7 +240,7 @@ export class AddonModDataPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
+     * @return A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.dataProvider.isPluginEnabled();
@@ -249,11 +249,11 @@ export class AddonModDataPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Prefetch a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
      */
     prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string): Promise<any> {
         return this.prefetchPackage(module, courseId, single, this.prefetchDatabase.bind(this));
@@ -262,11 +262,11 @@ export class AddonModDataPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Prefetch a database.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} single True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {String} siteId Site ID.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
      */
     protected prefetchDatabase(module: any, courseId: number, single: boolean, siteId: string): Promise<any> {
 
@@ -302,10 +302,10 @@ export class AddonModDataPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Sync a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     sync(module: any, courseId: number, siteId?: any): Promise<any> {
         const promises = [
diff --git a/src/addon/mod/data/providers/show-link-handler.ts b/src/addon/mod/data/providers/show-link-handler.ts
index 3685df23e..3418245b4 100644
--- a/src/addon/mod/data/providers/show-link-handler.ts
+++ b/src/addon/mod/data/providers/show-link-handler.ts
@@ -38,11 +38,11 @@ export class AddonModDataShowLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -83,11 +83,11 @@ export class AddonModDataShowLinkHandler extends CoreContentLinksHandlerBase {
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         if (typeof params.d == 'undefined') {
diff --git a/src/addon/mod/data/providers/sync-cron-handler.ts b/src/addon/mod/data/providers/sync-cron-handler.ts
index c67e7a102..88fd2441d 100644
--- a/src/addon/mod/data/providers/sync-cron-handler.ts
+++ b/src/addon/mod/data/providers/sync-cron-handler.ts
@@ -29,9 +29,9 @@ export class AddonModDataSyncCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         return this.dataSync.syncAllDatabases(siteId, force);
@@ -40,7 +40,7 @@ export class AddonModDataSyncCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return this.dataSync.syncInterval;
diff --git a/src/addon/mod/data/providers/sync.ts b/src/addon/mod/data/providers/sync.ts
index 0553511c4..defc326f7 100644
--- a/src/addon/mod/data/providers/sync.ts
+++ b/src/addon/mod/data/providers/sync.ts
@@ -55,9 +55,9 @@ export class AddonModDataSyncProvider extends CoreSyncBaseProvider {
     /**
      * Check if a database has data to synchronize.
      *
-     * @param  {number} dataId   Database ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>}         Promise resolved with boolean: true if has data to sync, false otherwise.
+     * @param dataId Database ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: true if has data to sync, false otherwise.
      */
     hasDataToSync(dataId: number, siteId?: string): Promise<boolean> {
         return this.dataOffline.hasOfflineData(dataId, siteId);
@@ -66,9 +66,9 @@ export class AddonModDataSyncProvider extends CoreSyncBaseProvider {
     /**
      * Try to synchronize all the databases in a certain site or in all sites.
      *
-     * @param  {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} force Wether to force sync not depending on last execution.
-     * @return {Promise<any>}    Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     syncAllDatabases(siteId?: string, force?: boolean): Promise<any> {
         return this.syncOnSites('all databases', this.syncAllDatabasesFunc.bind(this), [force], siteId);
@@ -77,9 +77,9 @@ export class AddonModDataSyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync all pending databases on a site.
      *
-     * @param {string}  [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} force    Wether to force sync not depending on last execution.
-     * @param {Promise<any>}     Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether to force sync not depending on last execution.
+     * @param Promise resolved if sync is successful, rejected if sync fails.
      */
     protected syncAllDatabasesFunc(siteId?: string, force?: boolean): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -122,9 +122,9 @@ export class AddonModDataSyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync a database only if a certain time has passed since the last time.
      *
-     * @param {number} dataId      Database ID.
-     * @param {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}            Promise resolved when the data is synced or if it doesn't need to be synced.
+     * @param dataId Database ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is synced or if it doesn't need to be synced.
      */
     syncDatabaseIfNeeded(dataId: number, siteId?: string): Promise<any> {
         return this.isSyncNeeded(dataId, siteId).then((needed) => {
@@ -137,9 +137,9 @@ export class AddonModDataSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize a data.
      *
-     * @param  {number} dataId Data ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved if sync is successful, rejected otherwise.
+     * @param dataId Data ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     syncDatabase(dataId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -226,11 +226,11 @@ export class AddonModDataSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize an entry.
      *
-     * @param {any} data Database.
-     * @param {AddonModDataOfflineAction[]} entryActions  Entry actions.
-     * @param {any} result Object with the result of the sync.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if success, rejected otherwise.
+     * @param data Database.
+     * @param entryActions Entry actions.
+     * @param result Object with the result of the sync.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success, rejected otherwise.
      */
     protected syncEntry(data: any, entryActions: AddonModDataOfflineAction[], result: any, siteId?: string): Promise<any> {
         let discardError,
@@ -388,10 +388,10 @@ export class AddonModDataSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize offline ratings.
      *
-     * @param {number} [cmId] Course module to be synced. If not defined, sync all databases.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected otherwise.
+     * @param cmId Course module to be synced. If not defined, sync all databases.
+     * @param force Wether to force sync not depending on last execution.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     syncRatings(cmId?: number, force?: boolean, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
diff --git a/src/addon/mod/data/providers/tag-area-handler.ts b/src/addon/mod/data/providers/tag-area-handler.ts
index f7fb15098..70e19045f 100644
--- a/src/addon/mod/data/providers/tag-area-handler.ts
+++ b/src/addon/mod/data/providers/tag-area-handler.ts
@@ -30,7 +30,7 @@ export class AddonModDataTagAreaHandler implements CoreTagAreaHandler {
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.dataProvider.isPluginEnabled();
@@ -39,8 +39,8 @@ export class AddonModDataTagAreaHandler implements CoreTagAreaHandler {
     /**
      * Parses the rendered content of a tag index and returns the items.
      *
-     * @param {string} content Rendered content.
-     * @return {any[]|Promise<any[]>} Area items (or promise resolved with the items).
+     * @param content Rendered content.
+     * @return Area items (or promise resolved with the items).
      */
     parseContent(content: string): any[] | Promise<any[]> {
         return this.tagHelper.parseFeedContent(content);
@@ -49,8 +49,8 @@ export class AddonModDataTagAreaHandler implements CoreTagAreaHandler {
     /**
      * Get the component to use to display items.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return CoreTagFeedComponent;
diff --git a/src/addon/mod/feedback/components/index/index.ts b/src/addon/mod/feedback/components/index/index.ts
index eefc27a7e..88e1537d3 100644
--- a/src/addon/mod/feedback/components/index/index.ts
+++ b/src/addon/mod/feedback/components/index/index.ts
@@ -124,7 +124,7 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         const promises = [];
@@ -147,8 +147,8 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Compares sync event data with current data to check if refresh content is needed.
      *
-     * @param {any} syncEventData Data receiven on sync observer.
-     * @return {boolean}          True if refresh is needed, false otherwise.
+     * @param syncEventData Data receiven on sync observer.
+     * @return True if refresh is needed, false otherwise.
      */
     protected isRefreshSyncNeeded(syncEventData: any): boolean {
         if (this.feedback && syncEventData.feedbackId == this.feedback.id) {
@@ -164,10 +164,10 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Download feedback contents.
      *
-     * @param  {boolean}      [refresh=false]    If it's refreshing content.
-     * @param  {boolean}      [sync=false]       If it should try to sync.
-     * @param  {boolean}      [showErrors=false] If show errors to the user of hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh If it's refreshing content.
+     * @param sync If it should try to sync.
+     * @param showErrors If show errors to the user of hide them.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<any> {
         return this.feedbackProvider.getFeedback(this.courseId, this.module.id).then((feedback) => {
@@ -209,8 +209,8 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Convenience function to get feedback overview data.
      *
-     * @param {any} accessData Retrieved access data.
-     * @return {Promise<any>}  Resolved when done.
+     * @param accessData Retrieved access data.
+     * @return Resolved when done.
      */
     protected fetchFeedbackOverviewData(accessData: any): Promise<any> {
         const promises = [];
@@ -240,8 +240,8 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Convenience function to get feedback analysis data.
      *
-     * @param {any} accessData Retrieved access data.
-     * @return {Promise<any>}  Resolved when done.
+     * @param accessData Retrieved access data.
+     * @return Resolved when done.
      */
     protected fetchFeedbackAnalysisData(accessData: any): Promise<any> {
         let promise;
@@ -262,8 +262,8 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Fetch Group info data.
      *
-     * @param  {number}       cmId Course module ID.
-     * @return {Promise<any>}      Resolved when done.
+     * @param cmId Course module ID.
+     * @return Resolved when done.
      */
     protected fetchGroupInfo(cmId: number): Promise<any> {
         return this.groupsProvider.getActivityGroupInfo(cmId).then((groupInfo) => {
@@ -276,8 +276,8 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Parse the analysis info to show the info correctly formatted.
      *
-     * @param  {any} item Item to parse.
-     * @return {any}      Parsed item.
+     * @param item Item to parse.
+     * @return Parsed item.
      */
     protected parseAnalysisInfo(item: any): any {
         switch (item.typ) {
@@ -356,7 +356,7 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Function to go to the questions form.
      *
-     * @param {boolean} preview Preview or edit the form.
+     * @param preview Preview or edit the form.
      */
     gotoAnswerQuestions(preview: boolean = false): void {
         const stateParams = {
@@ -389,7 +389,7 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Function to link implemented features.
      *
-     * @param {string} feature Feature to navigate.
+     * @param feature Feature to navigate.
      */
     openFeature(feature: string): void {
         this.feedbackHelper.openFeature(feature, this.navCtrl, this.module, this.courseId, this.group);
@@ -398,7 +398,7 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Tab changed, fetch content again.
      *
-     * @param {string} tabName New tab name.
+     * @param tabName New tab name.
      */
     tabChanged(tabName: string): void {
         this.tab = tabName;
@@ -411,8 +411,8 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Set group to see the analysis.
      *
-     * @param  {number}       groupId Group ID.
-     * @return {Promise<any>}         Resolved when done.
+     * @param groupId Group ID.
+     * @return Resolved when done.
      */
     setGroup(groupId: number): Promise<any> {
         this.group = groupId;
@@ -452,7 +452,7 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Performs the sync of the activity.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected sync(): Promise<any> {
         return this.feedbackSync.syncFeedback(this.feedback.id);
@@ -461,8 +461,8 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Checks if sync has succeed from result sync data.
      *
-     * @param  {any}     result Data returned on the sync function.
-     * @return {boolean}        If suceed or not.
+     * @param result Data returned on the sync function.
+     * @return If suceed or not.
      */
     protected hasSyncSucceed(result: any): boolean {
         return result.updated;
diff --git a/src/addon/mod/feedback/pages/attempt/attempt.ts b/src/addon/mod/feedback/pages/attempt/attempt.ts
index 3ec17f95e..07d1dad49 100644
--- a/src/addon/mod/feedback/pages/attempt/attempt.ts
+++ b/src/addon/mod/feedback/pages/attempt/attempt.ts
@@ -58,7 +58,7 @@ export class AddonModFeedbackAttemptPage {
     /**
      * Fetch all the data required for the view.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     fetchData(): Promise<any> {
         // Get the feedback to be able to now if questions should be autonumbered.
diff --git a/src/addon/mod/feedback/pages/form/form.ts b/src/addon/mod/feedback/pages/form/form.ts
index f1da26ca8..edfd72c16 100644
--- a/src/addon/mod/feedback/pages/form/form.ts
+++ b/src/addon/mod/feedback/pages/form/form.ts
@@ -113,7 +113,7 @@ export class AddonModFeedbackFormPage implements OnDestroy {
     /**
      * Check if we can leave the page or not.
      *
-     * @return {boolean | Promise<void>} Resolved if we can leave it, rejected if not.
+     * @return Resolved if we can leave it, rejected if not.
      */
     ionViewCanLeave(): boolean | Promise<void> {
         if (this.forceLeave) {
@@ -137,7 +137,7 @@ export class AddonModFeedbackFormPage implements OnDestroy {
     /**
      * Fetch all the data required for the view.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchData(): Promise<any> {
         this.offline = !this.appProvider.isOnline();
@@ -183,7 +183,7 @@ export class AddonModFeedbackFormPage implements OnDestroy {
     /**
      * Fetch access information.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchAccessData(): Promise<any> {
         return this.feedbackProvider.getFeedbackAccessInformation(this.feedback.id, this.offline, true).catch((error) => {
@@ -246,8 +246,8 @@ export class AddonModFeedbackFormPage implements OnDestroy {
     /**
      * Function to allow page navigation through the questions form.
      *
-     * @param  {boolean}       goPrevious If true it will go back to the previous page, if false, it will go forward.
-     * @return {Promise<void>}            Resolved when done.
+     * @param goPrevious If true it will go back to the previous page, if false, it will go forward.
+     * @return Resolved when done.
      */
     gotoPage(goPrevious: boolean): Promise<void> {
         this.domUtils.scrollToTop(this.content);
diff --git a/src/addon/mod/feedback/pages/index/index.ts b/src/addon/mod/feedback/pages/index/index.ts
index a6b937d91..2de96f1b1 100644
--- a/src/addon/mod/feedback/pages/index/index.ts
+++ b/src/addon/mod/feedback/pages/index/index.ts
@@ -44,7 +44,7 @@ export class AddonModFeedbackIndexPage {
     /**
      * Update some data based on the feedback instance.
      *
-     * @param {any} feedback Feedback instance.
+     * @param feedback Feedback instance.
      */
     updateData(feedback: any): void {
         this.title = feedback.name || this.title;
diff --git a/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.ts b/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.ts
index 4f8c210b7..b42fd38f4 100644
--- a/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.ts
+++ b/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.ts
@@ -68,8 +68,8 @@ export class AddonModFeedbackNonRespondentsPage {
     /**
      * Fetch all the data required for the view.
      *
-     * @param {boolean} [refresh] Empty events array first.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Empty events array first.
+     * @return Promise resolved when done.
      */
     fetchData(refresh: boolean = false): Promise<any> {
         this.page = 0;
@@ -96,8 +96,8 @@ export class AddonModFeedbackNonRespondentsPage {
     /**
      * Load Group responses.
      *
-     * @param  {number} [groupId]   If defined it will change group if not, it will load more users for the same group.
-     * @return {Promise<any>}       Resolved with the attempts loaded.
+     * @param groupId If defined it will change group if not, it will load more users for the same group.
+     * @return Resolved with the attempts loaded.
      */
     protected loadGroupUsers(groupId?: number): Promise<any> {
         if (typeof groupId == 'undefined') {
@@ -130,7 +130,7 @@ export class AddonModFeedbackNonRespondentsPage {
     /**
      * Change selected group or load more users.
      *
-     * @param {number} [groupId] Group ID selected. If not defined, it will load more users.
+     * @param groupId Group ID selected. If not defined, it will load more users.
      */
     loadAttempts(groupId?: number): void {
         this.loadGroupUsers(groupId).catch((message) => {
@@ -141,7 +141,7 @@ export class AddonModFeedbackNonRespondentsPage {
     /**
      * Refresh the attempts.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshFeedback(refresher: any): void {
         if (this.feedbackLoaded) {
diff --git a/src/addon/mod/feedback/pages/respondents/respondents.ts b/src/addon/mod/feedback/pages/respondents/respondents.ts
index 4a4a669ea..74e5ea7b4 100644
--- a/src/addon/mod/feedback/pages/respondents/respondents.ts
+++ b/src/addon/mod/feedback/pages/respondents/respondents.ts
@@ -87,8 +87,8 @@ export class AddonModFeedbackRespondentsPage {
     /**
      * Fetch all the data required for the view.
      *
-     * @param {boolean} [refresh] Empty events array first.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Empty events array first.
+     * @return Promise resolved when done.
      */
     fetchData(refresh: boolean = false): Promise<any> {
         this.page = 0;
@@ -117,8 +117,8 @@ export class AddonModFeedbackRespondentsPage {
     /**
      * Load Group attempts.
      *
-     * @param  {number} [groupId]   If defined it will change group if not, it will load more attempts for the same group.
-     * @return {Promise<any>}       Resolved with the attempts loaded.
+     * @param groupId If defined it will change group if not, it will load more attempts for the same group.
+     * @return Resolved with the attempts loaded.
      */
     protected loadGroupAttempts(groupId?: number): Promise<any> {
         if (typeof groupId == 'undefined') {
@@ -158,7 +158,7 @@ export class AddonModFeedbackRespondentsPage {
     /**
      * Navigate to a particular attempt.
      *
-     * @param {any} attempt Attempt object to load.
+     * @param attempt Attempt object to load.
      */
     gotoAttempt(attempt: any): void {
         this.attemptId = attempt.id;
@@ -174,7 +174,7 @@ export class AddonModFeedbackRespondentsPage {
     /**
      * Change selected group or load more attempts.
      *
-     * @param {number} [groupId] Group ID selected. If not defined, it will load more attempts.
+     * @param groupId Group ID selected. If not defined, it will load more attempts.
      */
     loadAttempts(groupId?: number): void {
         this.loadGroupAttempts(groupId).catch((message) => {
@@ -185,7 +185,7 @@ export class AddonModFeedbackRespondentsPage {
     /**
      * Refresh the attempts.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshFeedback(refresher: any): void {
         if (this.feedbackLoaded) {
diff --git a/src/addon/mod/feedback/providers/analysis-link-handler.ts b/src/addon/mod/feedback/providers/analysis-link-handler.ts
index 8f8fa3c39..4f11146e2 100644
--- a/src/addon/mod/feedback/providers/analysis-link-handler.ts
+++ b/src/addon/mod/feedback/providers/analysis-link-handler.ts
@@ -38,11 +38,11 @@ export class AddonModFeedbackAnalysisLinkHandler extends CoreContentLinksHandler
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -70,11 +70,11 @@ export class AddonModFeedbackAnalysisLinkHandler extends CoreContentLinksHandler
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return this.feedbackProvider.isPluginEnabled(siteId).then((enabled) => {
diff --git a/src/addon/mod/feedback/providers/complete-link-handler.ts b/src/addon/mod/feedback/providers/complete-link-handler.ts
index af4b1153a..0a5d0af25 100644
--- a/src/addon/mod/feedback/providers/complete-link-handler.ts
+++ b/src/addon/mod/feedback/providers/complete-link-handler.ts
@@ -38,11 +38,11 @@ export class AddonModFeedbackCompleteLinkHandler extends CoreContentLinksHandler
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -73,11 +73,11 @@ export class AddonModFeedbackCompleteLinkHandler extends CoreContentLinksHandler
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         if (typeof params.id == 'undefined') {
diff --git a/src/addon/mod/feedback/providers/feedback.ts b/src/addon/mod/feedback/providers/feedback.ts
index a9aed0880..10670e5f8 100644
--- a/src/addon/mod/feedback/providers/feedback.ts
+++ b/src/addon/mod/feedback/providers/feedback.ts
@@ -47,9 +47,9 @@ export class AddonModFeedbackProvider {
     /**
      * Check dependency of a question item.
      *
-     * @param   {any[]}  items      All question items to check dependency.
-     * @param   {any}    item       Item to check.
-     * @return  {boolean}           Return true if dependency is acomplished and it can be shown. False, otherwise.
+     * @param items All question items to check dependency.
+     * @param item Item to check.
+     * @return Return true if dependency is acomplished and it can be shown. False, otherwise.
      */
     protected checkDependencyItem(items: any[], item: any): boolean {
         const depend = items.find((itemFind) => {
@@ -77,9 +77,9 @@ export class AddonModFeedbackProvider {
     /**
      * Check dependency item of type Multichoice.
      *
-     * @param  {any}     item        Item to check.
-     * @param  {string}  dependValue Value to compare.
-     * @return {boolean}             Return true if dependency is acomplished and it can be shown. False, otherwise.
+     * @param item Item to check.
+     * @param dependValue Value to compare.
+     * @return Return true if dependency is acomplished and it can be shown. False, otherwise.
      */
     protected compareDependItemMultichoice(item: any, dependValue: string): boolean {
         let values, choices;
@@ -128,12 +128,12 @@ export class AddonModFeedbackProvider {
     /**
      * Fill values of item questions.
      *
-     * @param   {number}   feedbackId   Feedback ID.
-     * @param   {any[]}    items        Item to fill the value.
-     * @param   {boolean}  offline      True if it should return cached data. Has priority over ignoreCache.
-     * @param   {boolean}  ignoreCache  True if it should ignore cached data (it will always fail in offline or server down).
-     * @param   {string}   siteId       Site ID.
-     * @return  {Promise<any>}          Resolved with values when done.
+     * @param feedbackId Feedback ID.
+     * @param items Item to fill the value.
+     * @param offline True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID.
+     * @return Resolved with values when done.
      */
     protected fillValues(feedbackId: number, items: any[], offline: boolean, ignoreCache: boolean, siteId: string): Promise<any> {
         return this.getCurrentValues(feedbackId, offline, ignoreCache, siteId).then((valuesArray) => {
@@ -202,12 +202,12 @@ export class AddonModFeedbackProvider {
     /**
      * Returns all the feedback non respondents users.
      *
-     * @param   {number}    feedbackId      Feedback ID.
-     * @param   {number}    groupId         Group id, 0 means that the function will determine the user group.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param   {string}    [siteId]        Site ID. If not defined, current site.
-     * @param   {any}       [previous]      Only for recurrent use. Object with the previous fetched info.
-     * @return  {Promise<any>}              Promise resolved when the info is retrieved.
+     * @param feedbackId Feedback ID.
+     * @param groupId Group id, 0 means that the function will determine the user group.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @param previous Only for recurrent use. Object with the previous fetched info.
+     * @return Promise resolved when the info is retrieved.
      */
     getAllNonRespondents(feedbackId: number, groupId: number, ignoreCache?: boolean, siteId?: string, previous?: any)
             : Promise<any> {
@@ -240,12 +240,12 @@ export class AddonModFeedbackProvider {
     /**
      * Returns all the feedback user responses.
      *
-     * @param   {number}    feedbackId      Feedback ID.
-     * @param   {number}    groupId         Group id, 0 means that the function will determine the user group.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param   {string}    [siteId]        Site ID. If not defined, current site.
-     * @param   {any}       [previous]      Only for recurrent use. Object with the previous fetched info.
-     * @return  {Promise<any>}              Promise resolved when the info is retrieved.
+     * @param feedbackId Feedback ID.
+     * @param groupId Group id, 0 means that the function will determine the user group.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @param previous Only for recurrent use. Object with the previous fetched info.
+     * @return Promise resolved when the info is retrieved.
      */
     getAllResponsesAnalysis(feedbackId: number, groupId: number, ignoreCache?: boolean, siteId?: string, previous?: any)
             : Promise<any> {
@@ -285,11 +285,11 @@ export class AddonModFeedbackProvider {
     /**
      * Get analysis information for a given feedback.
      *
-     * @param   {number}    feedbackId      Feedback ID.
-     * @param   {number}    [groupId]       Group ID.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param   {string}    [siteId]        Site ID. If not defined, current site.
-     * @return  {Promise<any>}                   Promise resolved when the feedback is retrieved.
+     * @param feedbackId Feedback ID.
+     * @param groupId Group ID.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the feedback is retrieved.
      */
     getAnalysis(feedbackId: number, groupId?: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -316,9 +316,9 @@ export class AddonModFeedbackProvider {
     /**
      * Get cache key for feedback analysis data WS calls.
      *
-     * @param {number} feedbackId Feedback ID.
-     * @param {number} [groupId=0]  Group ID.
-     * @return {string}         Cache key.
+     * @param feedbackId Feedback ID.
+     * @param groupId Group ID.
+     * @return Cache key.
      */
     protected getAnalysisDataCacheKey(feedbackId: number, groupId: number = 0): string {
         return this.getAnalysisDataPrefixCacheKey(feedbackId) + groupId;
@@ -327,8 +327,8 @@ export class AddonModFeedbackProvider {
     /**
      * Get prefix cache key for feedback analysis data WS calls.
      *
-     * @param {number} feedbackId Feedback ID.
-     * @return {string}         Cache key.
+     * @param feedbackId Feedback ID.
+     * @return Cache key.
      */
     protected getAnalysisDataPrefixCacheKey(feedbackId: number): string {
         return this.getFeedbackDataPrefixCacheKey(feedbackId) + ':analysis:';
@@ -337,12 +337,12 @@ export class AddonModFeedbackProvider {
     /**
      * Find an attempt in all responses analysis.
      *
-     * @param   {number}    feedbackId      Feedback ID.
-     * @param   {number}    attemptId       Attempt id to find.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param   {string}    [siteId]        Site ID. If not defined, current site.
-     * @param   {any}       [previous]      Only for recurrent use. Object with the previous fetched info.
-     * @return  {Promise<any>}              Promise resolved when the info is retrieved.
+     * @param feedbackId Feedback ID.
+     * @param attemptId Attempt id to find.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @param previous Only for recurrent use. Object with the previous fetched info.
+     * @return Promise resolved when the info is retrieved.
      */
     getAttempt(feedbackId: number, attemptId: number, ignoreCache?: boolean, siteId?: string, previous?: any): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -396,8 +396,8 @@ export class AddonModFeedbackProvider {
     /**
      * Get prefix cache key for feedback completion data WS calls.
      *
-     * @param {number} feedbackId Feedback ID.
-     * @return {string}         Cache key.
+     * @param feedbackId Feedback ID.
+     * @return Cache key.
      */
     protected getCompletedDataCacheKey(feedbackId: number): string {
         return this.getFeedbackDataPrefixCacheKey(feedbackId) + ':completed:';
@@ -406,10 +406,10 @@ export class AddonModFeedbackProvider {
     /**
      * Returns the temporary completion timemodified for the current user.
      *
-     * @param   {number}    feedbackId      Feedback ID.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param   {string}    [siteId]        Site ID. If not defined, current site.
-     * @return  {Promise<any>}                   Promise resolved when the info is retrieved.
+     * @param feedbackId Feedback ID.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the info is retrieved.
      */
     getCurrentCompletedTimeModified(feedbackId: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -441,8 +441,8 @@ export class AddonModFeedbackProvider {
     /**
      * Get prefix cache key for feedback current completed temp data WS calls.
      *
-     * @param {number} feedbackId Feedback ID.
-     * @return {string}         Cache key.
+     * @param feedbackId Feedback ID.
+     * @return Cache key.
      */
     protected getCurrentCompletedTimeModifiedDataCacheKey(feedbackId: number): string {
         return this.getFeedbackDataPrefixCacheKey(feedbackId) + ':completedtime:';
@@ -451,11 +451,11 @@ export class AddonModFeedbackProvider {
     /**
      * Returns the temporary responses or responses of the last submission for the current user.
      *
-     * @param   {number}    feedbackId          Feedback ID.
-     * @param   {boolean}   [offline=false]     True if it should return cached data. Has priority over ignoreCache.
-     * @param   {boolean}   [ignoreCache=false] True if it should ignore cached data (it always fail in offline or server down).
-     * @param   {string}    [siteId]            Site ID. If not defined, current site.
-     * @return  {Promise<any>}                  Promise resolved when the info is retrieved.
+     * @param feedbackId Feedback ID.
+     * @param offline True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the info is retrieved.
      */
     getCurrentValues(feedbackId: number, offline: boolean = false, ignoreCache: boolean = false, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -497,8 +497,8 @@ export class AddonModFeedbackProvider {
     /**
      * Get cache key for get current values feedback data WS calls.
      *
-     * @param  {number} feedbackId  Feedback ID.
-     * @return {string}             Cache key.
+     * @param feedbackId Feedback ID.
+     * @return Cache key.
      */
     protected getCurrentValuesDataCacheKey(feedbackId: number): string {
         return this.getFeedbackDataPrefixCacheKey(feedbackId) + ':currentvalues';
@@ -507,11 +507,11 @@ export class AddonModFeedbackProvider {
     /**
      * Get  access information for a given feedback.
      *
-     * @param   {number}    feedbackId          Feedback ID.
-     * @param   {boolean}   [offline=false]     True if it should return cached data. Has priority over ignoreCache.
-     * @param   {boolean}   [ignoreCache=false] True if it should ignore cached data (it always fail in offline or server down).
-     * @param   {string}    [siteId]            Site ID. If not defined, current site.
-     * @return  {Promise<any>}                  Promise resolved when the feedback is retrieved.
+     * @param feedbackId Feedback ID.
+     * @param offline True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the feedback is retrieved.
      */
     getFeedbackAccessInformation(feedbackId: number, offline: boolean = false, ignoreCache: boolean = false, siteId?: string):
             Promise<any> {
@@ -537,8 +537,8 @@ export class AddonModFeedbackProvider {
     /**
      * Get cache key for feedback access information data WS calls.
      *
-     * @param {number} feedbackId Feedback ID.
-     * @return {string}         Cache key.
+     * @param feedbackId Feedback ID.
+     * @return Cache key.
      */
     protected getFeedbackAccessInformationDataCacheKey(feedbackId: number): string {
         return this.getFeedbackDataPrefixCacheKey(feedbackId) + ':access';
@@ -547,8 +547,8 @@ export class AddonModFeedbackProvider {
     /**
      * Get cache key for feedback data WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @return {string}         Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getFeedbackCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'feedback:' + courseId;
@@ -557,8 +557,8 @@ export class AddonModFeedbackProvider {
     /**
      * Get prefix cache key for all feedback activity data WS calls.
      *
-     * @param {number} feedbackId Feedback ID.
-     * @return {string}         Cache key.
+     * @param feedbackId Feedback ID.
+     * @return Cache key.
      */
     protected getFeedbackDataPrefixCacheKey(feedbackId: number): string {
         return this.ROOT_CACHE_KEY + feedbackId;
@@ -567,13 +567,13 @@ export class AddonModFeedbackProvider {
     /**
      * Get a feedback with key=value. If more than one is found, only the first will be returned.
      *
-     * @param {number}   courseId            Course ID.
-     * @param {string}   key                 Name of the property to check.
-     * @param {any}      value               Value to search.
-     * @param {string}   [siteId]            Site ID. If not defined, current site.
-     * @param {boolean} [forceCache]  True to always get the value from cache, false otherwise. Default false.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<any>}  Promise resolved when the feedback is retrieved.
+     * @param courseId Course ID.
+     * @param key Name of the property to check.
+     * @param value Value to search.
+     * @param siteId Site ID. If not defined, current site.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise resolved when the feedback is retrieved.
      */
     protected getFeedbackDataByKey(courseId: number, key: string, value: any, siteId?: string, forceCache?: boolean,
             ignoreCache?: boolean): Promise<any> {
@@ -612,12 +612,12 @@ export class AddonModFeedbackProvider {
     /**
      * Get a feedback by course module ID.
      *
-     * @param {number}   courseId       Course ID.
-     * @param {number}   cmId           Course module ID.
-     * @param {string}   [siteId]       Site ID. If not defined, current site.
-     * @param {boolean} [forceCache]   True to always get the value from cache, false otherwise. Default false.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<any>}   Promise resolved when the feedback is retrieved.
+     * @param courseId Course ID.
+     * @param cmId Course module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise resolved when the feedback is retrieved.
      */
     getFeedback(courseId: number, cmId: number, siteId?: string, forceCache?: boolean, ignoreCache?: boolean): Promise<any> {
         return this.getFeedbackDataByKey(courseId, 'coursemodule', cmId, siteId, forceCache, ignoreCache);
@@ -626,12 +626,12 @@ export class AddonModFeedbackProvider {
     /**
      * Get a feedback by ID.
      *
-     * @param {number}  courseId      Course ID.
-     * @param {number}  id            Feedback ID.
-     * @param {string}  [siteId]      Site ID. If not defined, current site.
-     * @param {boolean} [forceCache]  True to always get the value from cache, false otherwise. Default false.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<any>}         Promise resolved when the feedback is retrieved.
+     * @param courseId Course ID.
+     * @param id Feedback ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise resolved when the feedback is retrieved.
      */
     getFeedbackById(courseId: number, id: number, siteId?: string, forceCache?: boolean, ignoreCache?: boolean): Promise<any> {
         return this.getFeedbackDataByKey(courseId, 'id', id, siteId, forceCache, ignoreCache);
@@ -640,10 +640,10 @@ export class AddonModFeedbackProvider {
     /**
      * Returns the items (questions) in the given feedback.
      *
-     * @param   {number}    feedbackId      Feedback ID.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param   {string}    [siteId]        Site ID. If not defined, current site.
-     * @return  {Promise<any>}                   Promise resolved when the info is retrieved.
+     * @param feedbackId Feedback ID.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the info is retrieved.
      */
     getItems(feedbackId: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -667,8 +667,8 @@ export class AddonModFeedbackProvider {
     /**
      * Get cache key for get items feedback data WS calls.
      *
-     * @param  {number} feedbackId  Feedback ID.
-     * @return {string}             Cache key.
+     * @param feedbackId Feedback ID.
+     * @return Cache key.
      */
     protected getItemsDataCacheKey(feedbackId: number): string {
         return this.getFeedbackDataPrefixCacheKey(feedbackId) + ':items';
@@ -677,12 +677,12 @@ export class AddonModFeedbackProvider {
     /**
      * Retrieves a list of students who didn't submit the feedback.
      *
-     * @param   {number}    feedbackId      Feedback ID.
-     * @param   {number}    [groupId=0]     Group id, 0 means that the function will determine the user group.
-     * @param   {number}    [page=0]        The page of records to return.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param   {string}    [siteId]        Site ID. If not defined, current site.
-     * @return  {Promise<any>}              Promise resolved when the info is retrieved.
+     * @param feedbackId Feedback ID.
+     * @param groupId Group id, 0 means that the function will determine the user group.
+     * @param page The page of records to return.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the info is retrieved.
      */
     getNonRespondents(feedbackId: number, groupId: number = 0, page: number = 0, ignoreCache?: boolean, siteId?: string)
             : Promise<any> {
@@ -709,9 +709,9 @@ export class AddonModFeedbackProvider {
     /**
      * Get cache key for non respondents feedback data WS calls.
      *
-     * @param  {number} feedbackId  Feedback ID.
-     * @param  {number} [groupId=0] Group id, 0 means that the function will determine the user group.
-     * @return {string}             Cache key.
+     * @param feedbackId Feedback ID.
+     * @param groupId Group id, 0 means that the function will determine the user group.
+     * @return Cache key.
      */
     protected getNonRespondentsDataCacheKey(feedbackId: number, groupId: number = 0): string {
         return this.getNonRespondentsDataPrefixCacheKey(feedbackId) + groupId;
@@ -720,8 +720,8 @@ export class AddonModFeedbackProvider {
     /**
      * Get prefix cache key for feedback non respondents data WS calls.
      *
-     * @param {number} feedbackId Feedback ID.
-     * @return {string}           Cache key.
+     * @param feedbackId Feedback ID.
+     * @return Cache key.
      */
     protected getNonRespondentsDataPrefixCacheKey(feedbackId: number): string {
         return this.getFeedbackDataPrefixCacheKey(feedbackId) + ':nonrespondents:';
@@ -730,10 +730,10 @@ export class AddonModFeedbackProvider {
     /**
      * Get a single feedback page items. This function is not cached, use AddonModFeedbackHelperProvider#getPageItems instead.
      *
-     * @param   {number}    feedbackId  Feedback ID.
-     * @param   {number}    page        The page to get.
-     * @param   {string}    [siteId]    Site ID. If not defined, current site.
-     * @return  {Promise<any>}          Promise resolved when the info is retrieved.
+     * @param feedbackId Feedback ID.
+     * @param page The page to get.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the info is retrieved.
      */
     getPageItems(feedbackId: number, page: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -749,12 +749,12 @@ export class AddonModFeedbackProvider {
     /**
      * Get a single feedback page items. If offline or server down it will use getItems to calculate dependencies.
      *
-     * @param   {number}  feedbackId          Feedback ID.
-     * @param   {number}  page                The page to get.
-     * @param   {boolean} [offline=false]     True if it should return cached data. Has priority over ignoreCache.
-     * @param   {boolean} [ignoreCache=false] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param   {string}  [siteId]            Site ID. If not defined, current site.
-     * @return  {Promise<any>}                Promise resolved when the info is retrieved.
+     * @param feedbackId Feedback ID.
+     * @param page The page to get.
+     * @param offline True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the info is retrieved.
      */
     getPageItemsWithValues(feedbackId: number, page: number, offline: boolean = false, ignoreCache: boolean = false,
             siteId?: string): Promise<any> {
@@ -816,11 +816,11 @@ export class AddonModFeedbackProvider {
     /**
      * Convenience function to get the page we can jump.
      *
-     * @param  {number}  feedbackId Feedback ID.
-     * @param  {number}  page       Page where we want to jump.
-     * @param  {number}  changePage If page change is forward (1) or backward (-1).
-     * @param  {string}  siteId     Site ID.
-     * @return {Promise<number | false>}  Page number where to jump. Or false if completed or first page.
+     * @param feedbackId Feedback ID.
+     * @param page Page where we want to jump.
+     * @param changePage If page change is forward (1) or backward (-1).
+     * @param siteId Site ID.
+     * @return Page number where to jump. Or false if completed or first page.
      */
     protected getPageJumpTo(feedbackId: number, page: number, changePage: number, siteId: string): Promise<number | false> {
         return this.getPageItemsWithValues(feedbackId, page, true, false, siteId).then((resp) => {
@@ -842,12 +842,12 @@ export class AddonModFeedbackProvider {
     /**
      * Returns the feedback user responses.
      *
-     * @param   {number}    feedbackId      Feedback ID.
-     * @param   {number}    groupId         Group id, 0 means that the function will determine the user group.
-     * @param   {number}    page            The page of records to return.
-     * @param   {boolean} [ignoreCache=false] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param   {string}    [siteId]        Site ID. If not defined, current site.
-     * @return  {Promise<any>}              Promise resolved when the info is retrieved.
+     * @param feedbackId Feedback ID.
+     * @param groupId Group id, 0 means that the function will determine the user group.
+     * @param page The page of records to return.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the info is retrieved.
      */
     getResponsesAnalysis(feedbackId: number, groupId: number, page: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -872,9 +872,9 @@ export class AddonModFeedbackProvider {
     /**
      * Get cache key for responses analysis feedback data WS calls.
      *
-     * @param  {number} feedbackId  Feedback ID.
-     * @param  {number} [groupId=0] Group id, 0 means that the function will determine the user group.
-     * @return {string}             Cache key.
+     * @param feedbackId Feedback ID.
+     * @param groupId Group id, 0 means that the function will determine the user group.
+     * @return Cache key.
      */
     protected getResponsesAnalysisDataCacheKey(feedbackId: number, groupId: number = 0): string {
         return this.getResponsesAnalysisDataPrefixCacheKey(feedbackId) + groupId;
@@ -883,8 +883,8 @@ export class AddonModFeedbackProvider {
     /**
      * Get prefix cache key for feedback responses analysis data WS calls.
      *
-     * @param {number} feedbackId Feedback ID.
-     * @return {string}         Cache key.
+     * @param feedbackId Feedback ID.
+     * @return Cache key.
      */
     protected getResponsesAnalysisDataPrefixCacheKey(feedbackId: number): string {
         return this.getFeedbackDataPrefixCacheKey(feedbackId) + ':responsesanalysis:';
@@ -893,11 +893,11 @@ export class AddonModFeedbackProvider {
     /**
      * Gets the resume page information.
      *
-     * @param   {number}    feedbackId          Feedback ID.
-     * @param   {boolean}   [offline=false]     True if it should return cached data. Has priority over ignoreCache.
-     * @param   {boolean}   [ignoreCache=false] True if it should ignore cached data (it always fail in offline or server down).
-     * @param   {string}    [siteId]            Site ID. If not defined, current site.
-     * @return  {Promise<any>}                  Promise resolved when the info is retrieved.
+     * @param feedbackId Feedback ID.
+     * @param offline True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the info is retrieved.
      */
     getResumePage(feedbackId: number, offline: boolean = false, ignoreCache: boolean = false, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -929,8 +929,8 @@ export class AddonModFeedbackProvider {
     /**
      * Get prefix cache key for resume feedback page data WS calls.
      *
-     * @param {number} feedbackId   Feedback ID.
-     * @return {string}             Cache key.
+     * @param feedbackId Feedback ID.
+     * @return Cache key.
      */
     protected getResumePageDataCacheKey(feedbackId: number): string {
         return this.getFeedbackDataPrefixCacheKey(feedbackId) + ':launch';
@@ -939,9 +939,9 @@ export class AddonModFeedbackProvider {
     /**
      * Invalidates feedback data except files and module info.
      *
-     * @param  {number} feedbackId   Feedback ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the data is invalidated.
+     * @param feedbackId Feedback ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAllFeedbackData(feedbackId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -952,9 +952,9 @@ export class AddonModFeedbackProvider {
     /**
      * Invalidates feedback analysis data.
      *
-     * @param {number} feedbackId   Feedback ID.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the data is invalidated.
+     * @param feedbackId Feedback ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAnalysisData(feedbackId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -966,10 +966,10 @@ export class AddonModFeedbackProvider {
      * Invalidate the prefetched content.
      * To invalidate files, use AddonFeedbackProvider#invalidateFiles.
      *
-     * @param  {number} moduleId The module ID.
-     * @param  {number} courseId Course ID of the module.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID of the module.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -994,9 +994,9 @@ export class AddonModFeedbackProvider {
     /**
      * Invalidates temporary completion record data.
      *
-     * @param  {number} feedbackId   Feedback ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the data is invalidated.
+     * @param feedbackId Feedback ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCurrentValuesData(feedbackId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1007,9 +1007,9 @@ export class AddonModFeedbackProvider {
     /**
      * Invalidates feedback access information data.
      *
-     * @param {number} feedbackId   Feedback ID.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the data is invalidated.
+     * @param feedbackId Feedback ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateFeedbackAccessInformationData(feedbackId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1020,9 +1020,9 @@ export class AddonModFeedbackProvider {
     /**
      * Invalidates feedback data.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}   Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateFeedbackData(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1033,9 +1033,9 @@ export class AddonModFeedbackProvider {
     /**
      * Invalidate the prefetched files.
      *
-     * @param {number} moduleId  The module ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved when the files are invalidated.
+     * @param moduleId The module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the files are invalidated.
      */
     invalidateFiles(moduleId: number, siteId?: string): Promise<any> {
         return this.filepoolProvider.invalidateFilesByComponent(siteId, AddonModFeedbackProvider.COMPONENT, moduleId);
@@ -1044,9 +1044,9 @@ export class AddonModFeedbackProvider {
     /**
      * Invalidates feedback non respondents record data.
      *
-     * @param  {number} feedbackId   Feedback ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the data is invalidated.
+     * @param feedbackId Feedback ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateNonRespondentsData(feedbackId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1058,9 +1058,9 @@ export class AddonModFeedbackProvider {
     /**
      * Invalidates feedback user responses record data.
      *
-     * @param  {number} feedbackId   Feedback ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the data is invalidated.
+     * @param feedbackId Feedback ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateResponsesAnalysisData(feedbackId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1072,9 +1072,9 @@ export class AddonModFeedbackProvider {
     /**
      * Invalidates launch feedback data.
      *
-     * @param {number} feedbackId   Feedback ID.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the data is invalidated.
+     * @param feedbackId Feedback ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateResumePageData(feedbackId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1085,10 +1085,10 @@ export class AddonModFeedbackProvider {
     /**
      * Returns if feedback has been completed
      *
-     * @param   {number}    feedbackId      Feedback ID.
-     * @param   {boolean} [ignoreCache=false] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param   {string}    [siteId]        Site ID. If not defined, current site.
-     * @return  {Promise<boolean>}              Promise resolved when the info is retrieved.
+     * @param feedbackId Feedback ID.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the info is retrieved.
      */
     isCompleted(feedbackId: number, ignoreCache?: boolean, siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1111,8 +1111,8 @@ export class AddonModFeedbackProvider {
     /**
      * Return whether or not the plugin is enabled in a certain site. Plugin is enabled if the feedback WS are available.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
      * @since 3.3
      */
     isPluginEnabled(siteId?: string): Promise<boolean> {
@@ -1125,11 +1125,11 @@ export class AddonModFeedbackProvider {
     /**
      * Report the feedback as being viewed.
      *
-     * @param {number} id                   Module ID.
-     * @param {string} [name] Name of the feedback.
-     * @param  {boolean} [formViewed=false] True if form was viewed.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}               Promise resolved when the WS call is successful.
+     * @param id Module ID.
+     * @param name Name of the feedback.
+     * @param formViewed True if form was viewed.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(id: number, name?: string, formViewed: boolean = false, siteId?: string): Promise<any> {
         const params = {
@@ -1144,14 +1144,14 @@ export class AddonModFeedbackProvider {
     /**
      * Process a jump between pages.
      *
-     * @param   {number}    feedbackId      Feedback ID.
-     * @param   {number}    page            The page being processed.
-     * @param   {any}       responses       The data to be processed the key is the field name (usually type[index]_id).
-     * @param   {boolean}   goPrevious      Whether we want to jump to previous page.
-     * @param   {boolean}   formHasErrors   Whether the form we sent has required but empty fields (only used in offline).
-     * @param   {number}    courseId        Course ID the feedback belongs to.
-     * @param   {string}    [siteId]        Site ID. If not defined, current site.
-     * @return  {Promise<any>}              Promise resolved when the info is retrieved.
+     * @param feedbackId Feedback ID.
+     * @param page The page being processed.
+     * @param responses The data to be processed the key is the field name (usually type[index]_id).
+     * @param goPrevious Whether we want to jump to previous page.
+     * @param formHasErrors Whether the form we sent has required but empty fields (only used in offline).
+     * @param courseId Course ID the feedback belongs to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the info is retrieved.
      */
     processPage(feedbackId: number, page: number, responses: any, goPrevious: boolean, formHasErrors: boolean, courseId: number,
             siteId?: string): Promise<any> {
@@ -1231,12 +1231,12 @@ export class AddonModFeedbackProvider {
     /**
      * Process a jump between pages.
      *
-     * @param   {number}    feedbackId      Feedback ID.
-     * @param   {number}    page            The page being processed.
-     * @param   {any}       responses       The data to be processed the key is the field name (usually type[index]_id).
-     * @param   {boolean}   goPrevious      Whether we want to jump to previous page.
-     * @param   {string}    [siteId]        Site ID. If not defined, current site.
-     * @return  {Promise<any>}                   Promise resolved when the info is retrieved.
+     * @param feedbackId Feedback ID.
+     * @param page The page being processed.
+     * @param responses The data to be processed the key is the field name (usually type[index]_id).
+     * @param goPrevious Whether we want to jump to previous page.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the info is retrieved.
      */
     processPageOnline(feedbackId: number, page: number, responses: any, goPrevious: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/addon/mod/feedback/providers/helper.ts b/src/addon/mod/feedback/providers/helper.ts
index e66a24287..64b3f5f2c 100644
--- a/src/addon/mod/feedback/providers/helper.ts
+++ b/src/addon/mod/feedback/providers/helper.ts
@@ -45,12 +45,12 @@ export class AddonModFeedbackHelperProvider {
     /**
      * Check if the page we are going to open is in the history and returns the view controller in the stack to go back.
      *
-     * @param {string} pageName       Name of the page we want to navigate.
-     * @param {number} instance       Activity instance Id. I.e FeedbackId.
-     * @param {string} paramName      Param name where to find the instance number.
-     * @param {string} prefix         Prefix to check if we are out of the activity context.
-     * @param {NavController} navCtrl Nav Controller of the view.
-     * @return {ViewController}   Returns view controller found or null.
+     * @param pageName Name of the page we want to navigate.
+     * @param instance Activity instance Id. I.e FeedbackId.
+     * @param paramName Param name where to find the instance number.
+     * @param prefix Prefix to check if we are out of the activity context.
+     * @param navCtrl Nav Controller of the view.
+     * @return Returns view controller found or null.
      */
     protected getPageView(pageName: string, instance: number, paramName: string, prefix: string,
             navCtrl: NavController): ViewController {
@@ -85,10 +85,10 @@ export class AddonModFeedbackHelperProvider {
     /**
      * Retrieves a list of students who didn't submit the feedback with extra info.
      *
-     * @param   {number}    feedbackId      Feedback ID.
-     * @param   {number}    groupId         Group id, 0 means that the function will determine the user group.
-     * @param   {number}    page            The page of records to return.
-     * @return  {Promise<any>}              Promise resolved when the info is retrieved.
+     * @param feedbackId Feedback ID.
+     * @param groupId Group id, 0 means that the function will determine the user group.
+     * @param page The page of records to return.
+     * @return Promise resolved when the info is retrieved.
      */
     getNonRespondents(feedbackId: number, groupId: number, page: number): Promise<any> {
         return this.feedbackProvider.getNonRespondents(feedbackId, groupId, page).then((responses) => {
@@ -103,8 +103,8 @@ export class AddonModFeedbackHelperProvider {
     /**
      * Get page items responses to be sent.
      *
-     * @param   {any[]} items    Items where the values are.
-     * @return  {any}            Responses object to be sent.
+     * @param items Items where the values are.
+     * @return Responses object to be sent.
      */
     getPageItemsResponses(items: any[]): any {
         const responses = {};
@@ -185,10 +185,10 @@ export class AddonModFeedbackHelperProvider {
     /**
      * Returns the feedback user responses with extra info.
      *
-     * @param   {number}    feedbackId      Feedback ID.
-     * @param   {number}    groupId         Group id, 0 means that the function will determine the user group.
-     * @param   {number}    page            The page of records to return.
-     * @return  {Promise<any>}              Promise resolved when the info is retrieved.
+     * @param feedbackId Feedback ID.
+     * @param groupId Group id, 0 means that the function will determine the user group.
+     * @param page The page of records to return.
+     * @return Promise resolved when the info is retrieved.
      */
     getResponsesAnalysis(feedbackId: number, groupId: number, page: number): Promise<any> {
         return this.feedbackProvider.getResponsesAnalysis(feedbackId, groupId, page).then((responses) => {
@@ -203,10 +203,10 @@ export class AddonModFeedbackHelperProvider {
     /**
      * Handle a show entries link.
      *
-     * @param {NavController} navCtrl Nav controller to use to navigate. Can be undefined/null.
-     * @param {any} params URL params.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param navCtrl Nav controller to use to navigate. Can be undefined/null.
+     * @param params URL params.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     handleShowEntriesLink(navCtrl: NavController, params: any, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -245,8 +245,8 @@ export class AddonModFeedbackHelperProvider {
     /**
      * Add Image profile url field on attempts
      *
-     * @param  {any}          attempts Attempts array to get profile from.
-     * @return {Promise<any>}          Returns the same array with the profileimageurl added if found.
+     * @param attempts Attempts array to get profile from.
+     * @return Returns the same array with the profileimageurl added if found.
      */
     protected addImageProfileToAttempts(attempts: any): Promise<any> {
         const promises = attempts.map((attempt) => {
@@ -265,12 +265,12 @@ export class AddonModFeedbackHelperProvider {
     /**
      * Helper function to open a feature in the app.
      *
-     * @param {string}        feature   Name of the feature to open.
-     * @param {NavController} navCtrl   NavController.
-     * @param {any}           module    Course module activity object.
-     * @param {number}        courseId  Course Id.
-     * @param {number}        [group=0] Course module activity object.
-     * @return {Promise<void>}    Resolved when navigation animation is done.
+     * @param feature Name of the feature to open.
+     * @param navCtrl NavController.
+     * @param module Course module activity object.
+     * @param courseId Course Id.
+     * @param group Course module activity object.
+     * @return Resolved when navigation animation is done.
      */
     openFeature(feature: string, navCtrl: NavController, module: any, courseId: number, group: number = 0): Promise<void> {
         const pageName = feature && feature != 'analysis' ? 'AddonModFeedback' + feature + 'Page' : 'AddonModFeedbackIndexPage',
@@ -300,8 +300,8 @@ export class AddonModFeedbackHelperProvider {
     /**
      * Helper funtion for item type Label.
      *
-     * @param  {any} item Item to process.
-     * @return {any}      Item processed to show form.
+     * @param item Item to process.
+     * @return Item processed to show form.
      */
     protected getItemFormLabel(item: any): any {
         item.template = 'label';
@@ -314,8 +314,8 @@ export class AddonModFeedbackHelperProvider {
     /**
      * Helper funtion for item type Info.
      *
-     * @param  {any} item Item to process.
-     * @return {any}      Item processed to show form.
+     * @param item Item to process.
+     * @return Item processed to show form.
      */
     protected getItemFormInfo(item: any): any {
         item.template = 'label';
@@ -340,8 +340,8 @@ export class AddonModFeedbackHelperProvider {
     /**
      * Helper funtion for item type Numeric.
      *
-     * @param  {any} item Item to process.
-     * @return {any}      Item processed to show form.
+     * @param item Item to process.
+     * @return Item processed to show form.
      */
     protected getItemFormNumeric(item: any): any {
         item.template = 'numeric';
@@ -361,8 +361,8 @@ export class AddonModFeedbackHelperProvider {
     /**
      * Helper funtion for item type Text field.
      *
-     * @param  {any} item Item to process.
-     * @return {any}      Item processed to show form.
+     * @param item Item to process.
+     * @return Item processed to show form.
      */
     protected getItemFormTextfield(item: any): any {
         item.template = 'textfield';
@@ -375,8 +375,8 @@ export class AddonModFeedbackHelperProvider {
     /**
      * Helper funtion for item type Textarea.
      *
-     * @param  {any} item Item to process.
-     * @return {any}      Item processed to show form.
+     * @param item Item to process.
+     * @return Item processed to show form.
      */
     protected getItemFormTextarea(item: any): any {
         item.template = 'textarea';
@@ -388,8 +388,8 @@ export class AddonModFeedbackHelperProvider {
     /**
      * Helper funtion for item type Multichoice.
      *
-     * @param  {any} item Item to process.
-     * @return {any}      Item processed to show form.
+     * @param item Item to process.
+     * @return Item processed to show form.
      */
     protected getItemFormMultichoice(item: any): any {
         let parts = item.presentation.split(AddonModFeedbackProvider.MULTICHOICE_TYPE_SEP) || [];
@@ -443,8 +443,8 @@ export class AddonModFeedbackHelperProvider {
     /**
      * Helper funtion for item type Captcha.
      *
-     * @param  {any} item Item to process.
-     * @return {any}      Item processed to show form.
+     * @param item Item to process.
+     * @return Item processed to show form.
      */
     protected getItemFormCaptcha(item: any): any {
         const data = this.textUtils.parseJSON(item.otherdata);
@@ -462,9 +462,9 @@ export class AddonModFeedbackHelperProvider {
     /**
      * Process and returns item to print form.
      *
-     * @param {any}  item        Item to process.
-     * @param {boolean} preview  Previewing options.
-     * @return {any}             Item processed to show form.
+     * @param item Item to process.
+     * @param preview Previewing options.
+     * @return Item processed to show form.
      */
     getItemForm(item: any, preview: boolean): any {
         switch (item.typ) {
@@ -502,9 +502,9 @@ export class AddonModFeedbackHelperProvider {
      * Returns human-readable boundaries (min - max).
      * Based on Moodle's get_boundaries_for_display.
      *
-     * @param {number} rangeFrom Range from.
-     * @param {number} rangeTo Range to.
-     * @return {string} Human-readable boundaries.
+     * @param rangeFrom Range from.
+     * @param rangeTo Range to.
+     * @return Human-readable boundaries.
      */
     protected getNumericBoundariesForDisplay(rangeFrom: number, rangeTo: number): string {
         const rangeFromSet = typeof rangeFrom == 'number',
diff --git a/src/addon/mod/feedback/providers/list-link-handler.ts b/src/addon/mod/feedback/providers/list-link-handler.ts
index 8d6750e0b..b9ecdd7a5 100644
--- a/src/addon/mod/feedback/providers/list-link-handler.ts
+++ b/src/addon/mod/feedback/providers/list-link-handler.ts
@@ -33,7 +33,7 @@ export class AddonModFeedbackListLinkHandler extends CoreContentLinksModuleListH
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): Promise<boolean> {
         return this.feedbackProvider.isPluginEnabled();
diff --git a/src/addon/mod/feedback/providers/module-handler.ts b/src/addon/mod/feedback/providers/module-handler.ts
index 7744ce1b3..b5b6da733 100644
--- a/src/addon/mod/feedback/providers/module-handler.ts
+++ b/src/addon/mod/feedback/providers/module-handler.ts
@@ -45,7 +45,7 @@ export class AddonModFeedbackModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): Promise<boolean> {
         return this.feedbackProvider.isPluginEnabled();
@@ -54,10 +54,10 @@ export class AddonModFeedbackModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         return {
@@ -79,9 +79,9 @@ export class AddonModFeedbackModuleHandler implements CoreCourseModuleHandler {
      * Get the component to render the module. This is needed to support singleactivity course format.
      * The component returned must implement CoreCourseModuleMainComponent.
      *
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any} The component to use, undefined if not found.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component to use, undefined if not found.
      */
     getMainComponent(course: any, module: any): any {
         return AddonModFeedbackIndexComponent;
diff --git a/src/addon/mod/feedback/providers/offline.ts b/src/addon/mod/feedback/providers/offline.ts
index b9fd588ef..86d604e16 100644
--- a/src/addon/mod/feedback/providers/offline.ts
+++ b/src/addon/mod/feedback/providers/offline.ts
@@ -70,10 +70,10 @@ export class AddonModFeedbackOfflineProvider {
     /**
      * Delete the stored for a certain feedback page.
      *
-     * @param  {number} feedbackId Feedback ID.
-     * @param  {number} page       Page of the form to delete responses from.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved if deleted, rejected if failure.
+     * @param feedbackId Feedback ID.
+     * @param page Page of the form to delete responses from.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if deleted, rejected if failure.
      */
     deleteFeedbackPageResponses(feedbackId: number, page: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -84,8 +84,8 @@ export class AddonModFeedbackOfflineProvider {
     /**
      * Get all the stored feedback responses data from all the feedback.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved with entries.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with entries.
      */
     getAllFeedbackResponses(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -102,9 +102,9 @@ export class AddonModFeedbackOfflineProvider {
     /**
      * Get all the stored responses from a certain feedback.
      *
-     * @param  {number} feedbackId Feedback ID.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved with responses.
+     * @param feedbackId Feedback ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with responses.
      */
     getFeedbackResponses(feedbackId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -121,10 +121,10 @@ export class AddonModFeedbackOfflineProvider {
     /**
      * Get the stored responses for a certain feedback page.
      *
-     * @param  {number} feedbackId Feedback ID.
-     * @param  {number} page       Page of the form to get responses from.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved with responses.
+     * @param feedbackId Feedback ID.
+     * @param page Page of the form to get responses from.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with responses.
      */
     getFeedbackPageResponses(feedbackId: number, page: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -139,9 +139,9 @@ export class AddonModFeedbackOfflineProvider {
     /**
      * Get if the feedback have something to be synced.
      *
-     * @param  {number} feedbackId Feedback ID.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved with true if the feedback have something to be synced.
+     * @param feedbackId Feedback ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if the feedback have something to be synced.
      */
     hasFeedbackOfflineData(feedbackId: number, siteId?: string): Promise<any> {
         return this.getFeedbackResponses(feedbackId, siteId).then((responses) => {
@@ -152,12 +152,12 @@ export class AddonModFeedbackOfflineProvider {
     /**
      * Save page responses to be sent later.
      *
-     * @param  {number} feedbackId   Feedback ID.
-     * @param  {number} page         The page being processed.
-     * @param  {any} responses    The data to be processed the key is the field name (usually type[index]_id)
-     * @param  {number} courseId     Course ID the feedback belongs to.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}             Promise resolved if stored, rejected if failure.
+     * @param feedbackId Feedback ID.
+     * @param page The page being processed.
+     * @param responses The data to be processed the key is the field name (usually type[index]_id)
+     * @param courseId Course ID the feedback belongs to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     saveResponses(feedbackId: number, page: number, responses: any, courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/addon/mod/feedback/providers/prefetch-handler.ts b/src/addon/mod/feedback/providers/prefetch-handler.ts
index 097e31331..07d3d0b84 100644
--- a/src/addon/mod/feedback/providers/prefetch-handler.ts
+++ b/src/addon/mod/feedback/providers/prefetch-handler.ts
@@ -52,10 +52,10 @@ export class AddonModFeedbackPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Get the list of downloadable files.
      *
-     * @param  {any} module       Module to get the files.
-     * @param  {number} courseId  Course ID the module belongs to.
-     * @param  {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @return {Promise<any>}     Promise resolved with the list of files.
+     * @param module Module to get the files.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @return Promise resolved with the list of files.
      */
     getFiles(module: any, courseId: number, single?: boolean): Promise<any[]> {
         let files = [];
@@ -82,9 +82,9 @@ export class AddonModFeedbackPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Returns feedback intro files.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @return {Promise<any[]>} Promise resolved with list of intro files.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @return Promise resolved with list of intro files.
      */
     getIntroFiles(module: any, courseId: number): Promise<any[]> {
         return this.feedbackProvider.getFeedback(courseId, module.id).catch(() => {
@@ -97,9 +97,9 @@ export class AddonModFeedbackPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         return this.feedbackProvider.invalidateContent(moduleId, courseId);
@@ -108,9 +108,9 @@ export class AddonModFeedbackPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Invalidate WS calls needed to determine module status.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when invalidated.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when invalidated.
      */
     invalidateModule(module: any, courseId: number): Promise<any> {
         return this.feedbackProvider.invalidateFeedbackData(courseId);
@@ -121,9 +121,9 @@ export class AddonModFeedbackPrefetchHandler extends CoreCourseActivityPrefetchH
      * A feedback isn't downloadable if it's not open yet.
      * Closed feedback are downloadable because teachers can always see the results.
      *
-     * @param {any} module    Module to check.
-     * @param {number} courseId  Course ID the module belongs to.
-     * @return {Promise<any>}         Promise resolved with true if downloadable, resolved with false otherwise.
+     * @param module Module to check.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved with true if downloadable, resolved with false otherwise.
      */
     isDownloadable(module: any, courseId: number): boolean | Promise<boolean> {
         return this.feedbackProvider.getFeedback(courseId, module.id, undefined, true).then((feedback) => {
@@ -146,7 +146,7 @@ export class AddonModFeedbackPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
+     * @return A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.feedbackProvider.isPluginEnabled();
@@ -155,11 +155,11 @@ export class AddonModFeedbackPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Prefetch a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
      */
     prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string): Promise<any> {
         return this.prefetchPackage(module, courseId, single, this.prefetchFeedback.bind(this));
@@ -168,11 +168,11 @@ export class AddonModFeedbackPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Prefetch a feedback.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} single True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {String} siteId Site ID.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
      */
     protected prefetchFeedback(module: any, courseId: number, single: boolean, siteId: string): Promise<any> {
         // Prefetch the feedback data.
@@ -232,10 +232,10 @@ export class AddonModFeedbackPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Sync a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     sync(module: any, courseId: number, siteId?: any): Promise<any> {
         if (!this.syncProvider) {
diff --git a/src/addon/mod/feedback/providers/print-link-handler.ts b/src/addon/mod/feedback/providers/print-link-handler.ts
index 3be523950..978398fb0 100644
--- a/src/addon/mod/feedback/providers/print-link-handler.ts
+++ b/src/addon/mod/feedback/providers/print-link-handler.ts
@@ -38,11 +38,11 @@ export class AddonModFeedbackPrintLinkHandler extends CoreContentLinksHandlerBas
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -71,11 +71,11 @@ export class AddonModFeedbackPrintLinkHandler extends CoreContentLinksHandlerBas
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         if (typeof params.id == 'undefined') {
diff --git a/src/addon/mod/feedback/providers/push-click-handler.ts b/src/addon/mod/feedback/providers/push-click-handler.ts
index 675e7d0dd..27f288438 100644
--- a/src/addon/mod/feedback/providers/push-click-handler.ts
+++ b/src/addon/mod/feedback/providers/push-click-handler.ts
@@ -36,8 +36,8 @@ export class AddonModFeedbackPushClickHandler implements CorePushNotificationsCl
     /**
      * Check if a notification click is handled by this handler.
      *
-     * @param {any} notification The notification to check.
-     * @return {boolean} Whether the notification click is handled by this handler
+     * @param notification The notification to check.
+     * @return Whether the notification click is handled by this handler
      */
     handles(notification: any): boolean | Promise<boolean> {
         if (this.utils.isTrueOrOne(notification.notif) && notification.moodlecomponent == 'mod_feedback' &&
@@ -52,8 +52,8 @@ export class AddonModFeedbackPushClickHandler implements CorePushNotificationsCl
     /**
      * Handle the notification click.
      *
-     * @param {any} notification The notification to check.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param notification The notification to check.
+     * @return Promise resolved when done.
      */
     handleClick(notification: any): Promise<any> {
         const contextUrlParams = this.urlUtils.extractUrlParams(notification.contexturl),
diff --git a/src/addon/mod/feedback/providers/show-entries-link-handler.ts b/src/addon/mod/feedback/providers/show-entries-link-handler.ts
index 498703386..195e3f33d 100644
--- a/src/addon/mod/feedback/providers/show-entries-link-handler.ts
+++ b/src/addon/mod/feedback/providers/show-entries-link-handler.ts
@@ -35,11 +35,11 @@ export class AddonModFeedbackShowEntriesLinkHandler extends CoreContentLinksHand
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -54,11 +54,11 @@ export class AddonModFeedbackShowEntriesLinkHandler extends CoreContentLinksHand
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return this.feedbackProvider.isPluginEnabled(siteId).then((enabled) => {
diff --git a/src/addon/mod/feedback/providers/show-non-respondents-link-handler.ts b/src/addon/mod/feedback/providers/show-non-respondents-link-handler.ts
index cb88ecaa3..8ed384cd6 100644
--- a/src/addon/mod/feedback/providers/show-non-respondents-link-handler.ts
+++ b/src/addon/mod/feedback/providers/show-non-respondents-link-handler.ts
@@ -38,11 +38,11 @@ export class AddonModFeedbackShowNonRespondentsLinkHandler extends CoreContentLi
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -70,11 +70,11 @@ export class AddonModFeedbackShowNonRespondentsLinkHandler extends CoreContentLi
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return this.feedbackProvider.isPluginEnabled(siteId).then((enabled) => {
diff --git a/src/addon/mod/feedback/providers/sync-cron-handler.ts b/src/addon/mod/feedback/providers/sync-cron-handler.ts
index 94d43e905..2e455497a 100644
--- a/src/addon/mod/feedback/providers/sync-cron-handler.ts
+++ b/src/addon/mod/feedback/providers/sync-cron-handler.ts
@@ -29,9 +29,9 @@ export class AddonModFeedbackSyncCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         return this.feedbackSync.syncAllFeedbacks(siteId, force);
@@ -40,7 +40,7 @@ export class AddonModFeedbackSyncCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return this.feedbackSync.syncInterval;
diff --git a/src/addon/mod/feedback/providers/sync.ts b/src/addon/mod/feedback/providers/sync.ts
index c643f237b..72072a3cf 100644
--- a/src/addon/mod/feedback/providers/sync.ts
+++ b/src/addon/mod/feedback/providers/sync.ts
@@ -56,11 +56,11 @@ export class AddonModFeedbackSyncProvider extends CoreCourseActivitySyncBaseProv
     /**
      * Conveniece function to prefetch data after an update.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID.
-     * @param {RegExp} [regex] If regex matches, don't download the data. Defaults to check files and timers.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID.
+     * @param regex If regex matches, don't download the data. Defaults to check files and timers.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     prefetchAfterUpdate(module: any, courseId: number, regex?: RegExp, siteId?: string): Promise<any> {
         regex = regex || /^.*files$|^timers/;
@@ -71,9 +71,9 @@ export class AddonModFeedbackSyncProvider extends CoreCourseActivitySyncBaseProv
     /**
      * Try to synchronize all the feedbacks in a certain site or in all sites.
      *
-     * @param  {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} force Wether to force sync not depending on last execution.
-     * @return {Promise<any>}    Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     syncAllFeedbacks(siteId?: string, force?: boolean): Promise<any> {
         return this.syncOnSites('all feedbacks', this.syncAllFeedbacksFunc.bind(this), [force], siteId);
@@ -82,9 +82,9 @@ export class AddonModFeedbackSyncProvider extends CoreCourseActivitySyncBaseProv
     /**
      * Sync all pending feedbacks on a site.
      *
-     * @param {string}  [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} force    Wether to force sync not depending on last execution.
-     * @param {Promise<any>}     Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether to force sync not depending on last execution.
+     * @param Promise resolved if sync is successful, rejected if sync fails.
      */
     protected syncAllFeedbacksFunc(siteId?: string, force?: boolean): Promise<any> {
          // Sync all new responses.
@@ -122,9 +122,9 @@ export class AddonModFeedbackSyncProvider extends CoreCourseActivitySyncBaseProv
     /**
      * Sync a feedback only if a certain time has passed since the last time.
      *
-     * @param  {number} feedbackId  Feedback ID.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}       Promise resolved when the feedback is synced or if it doesn't need to be synced.
+     * @param feedbackId Feedback ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the feedback is synced or if it doesn't need to be synced.
      */
     syncFeedbackIfNeeded(feedbackId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -139,9 +139,9 @@ export class AddonModFeedbackSyncProvider extends CoreCourseActivitySyncBaseProv
     /**
      * Synchronize all offline responses of a feedback.
      *
-     * @param  {number} feedbackId Feedback ID to be synced.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved if sync is successful, rejected otherwise.
+     * @param feedbackId Feedback ID to be synced.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     syncFeedback(feedbackId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -260,12 +260,12 @@ export class AddonModFeedbackSyncProvider extends CoreCourseActivitySyncBaseProv
     /**
      * Convenience function to sync process page calls.
      *
-     * @param  {any}          feedback     Feedback object.
-     * @param  {any}          data         Response data.
-     * @param  {string}       siteId       Site Id.
-     * @param  {number}       timemodified Current completed modification time.
-     * @param  {any}          result       Result object to be modified.
-     * @return {Promise<any>}              Resolve when done or rejected with error.
+     * @param feedback Feedback object.
+     * @param data Response data.
+     * @param siteId Site Id.
+     * @param timemodified Current completed modification time.
+     * @param result Result object to be modified.
+     * @return Resolve when done or rejected with error.
      */
     protected processPage(feedback: any, data: any, siteId: string, timemodified: number, result: any): Promise<any> {
         // Delete all pages that are submitted before changing website.
diff --git a/src/addon/mod/folder/components/index/index.ts b/src/addon/mod/folder/components/index/index.ts
index d8c296b00..d23b70e38 100644
--- a/src/addon/mod/folder/components/index/index.ts
+++ b/src/addon/mod/folder/components/index/index.ts
@@ -70,7 +70,7 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         return this.folderProvider.invalidateContent(this.module.id, this.courseId);
@@ -78,7 +78,7 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
 
     /**
      * Convenience function to set scope data using module.
-     * @param {any} module Module to show.
+     * @param module Module to show.
      */
     protected showModuleData(module: any): void {
         this.description = module.intro || module.description;
@@ -96,8 +96,8 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
     /**
      * Download folder contents.
      *
-     * @param {boolean} [refresh] Whether we're refreshing data.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Whether we're refreshing data.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh?: boolean): Promise<any> {
         let promise;
diff --git a/src/addon/mod/folder/pages/index/index.ts b/src/addon/mod/folder/pages/index/index.ts
index e0b187c19..2131aa82e 100644
--- a/src/addon/mod/folder/pages/index/index.ts
+++ b/src/addon/mod/folder/pages/index/index.ts
@@ -42,7 +42,7 @@ export class AddonModFolderIndexPage {
     /**
      * Update some data based on the folder instance.
      *
-     * @param {any} folder Folder instance.
+     * @param folder Folder instance.
      */
     updateData(folder: any): void {
         this.title = folder.name || this.title;
diff --git a/src/addon/mod/folder/providers/folder.ts b/src/addon/mod/folder/providers/folder.ts
index ce3336634..989a0c69a 100644
--- a/src/addon/mod/folder/providers/folder.ts
+++ b/src/addon/mod/folder/providers/folder.ts
@@ -38,10 +38,10 @@ export class AddonModFolderProvider {
     /**
      * Get a folder by course module ID.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} cmId     Course module ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the book is retrieved.
+     * @param courseId Course ID.
+     * @param cmId Course module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the book is retrieved.
      */
     getFolder(courseId: number, cmId: number, siteId?: string): Promise<any> {
         return this.getFolderByKey(courseId, 'coursemodule', cmId, siteId);
@@ -50,11 +50,11 @@ export class AddonModFolderProvider {
     /**
      * Get a folder.
      *
-     * @param {number} courseId  Course ID.
-     * @param {string} key       Name of the property to check.
-     * @param {any}  value     Value to search.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}          Promise resolved when the book is retrieved.
+     * @param courseId Course ID.
+     * @param key Name of the property to check.
+     * @param value Value to search.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the book is retrieved.
      */
     protected getFolderByKey(courseId: number, key: string, value: any, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -84,8 +84,8 @@ export class AddonModFolderProvider {
     /**
      * Get cache key for folder data WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @return {string}         Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getFolderCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'folder:' + courseId;
@@ -94,10 +94,9 @@ export class AddonModFolderProvider {
     /**
      * Invalidate the prefetched content.
      *
-     * @param  {number} moduleId The module ID.
-     * @param  {number} courseId Course ID of the module.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}
+     * @param moduleId The module ID.
+     * @param courseId Course ID of the module.
+     * @param siteId Site ID. If not defined, current site.
      */
     invalidateContent(moduleId: number, courseId: number, siteId?: string): Promise<any> {
         const promises = [];
@@ -111,9 +110,9 @@ export class AddonModFolderProvider {
     /**
      * Invalidates folder data.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}   Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateFolderData(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -124,7 +123,7 @@ export class AddonModFolderProvider {
     /**
      * Returns whether or not getFolder WS available or not.
      *
-     * @return {boolean} If WS is avalaible.
+     * @return If WS is avalaible.
      * @since 3.3
      */
     isGetFolderWSAvailable(): boolean {
@@ -134,10 +133,10 @@ export class AddonModFolderProvider {
     /**
      * Report a folder as being viewed.
      *
-     * @param {number} id Module ID.
-     * @param {string} [name] Name of the folder.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the WS call is successful.
+     * @param id Module ID.
+     * @param name Name of the folder.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(id: number, name?: string, siteId?: string): Promise<any> {
         const params = {
diff --git a/src/addon/mod/folder/providers/helper.ts b/src/addon/mod/folder/providers/helper.ts
index 9715a6a8a..38e4a4ae8 100644
--- a/src/addon/mod/folder/providers/helper.ts
+++ b/src/addon/mod/folder/providers/helper.ts
@@ -29,8 +29,8 @@ export class AddonModFolderHelperProvider {
      * Folders found in filepaths are added to the array. Each folder has the properties: name, fileicon,
      * type (folder), filepath and contents (array with files and subfolders).
      *
-     * @param {any[]} contents Folder contents.
-     * @return {any[]}         Formatted contents.
+     * @param contents Folder contents.
+     * @return Formatted contents.
      */
     formatContents(contents: any[]): any[] {
         const files = [],
diff --git a/src/addon/mod/folder/providers/module-handler.ts b/src/addon/mod/folder/providers/module-handler.ts
index 5d372a12c..b0a66e1ae 100644
--- a/src/addon/mod/folder/providers/module-handler.ts
+++ b/src/addon/mod/folder/providers/module-handler.ts
@@ -44,7 +44,7 @@ export class AddonModFolderModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -53,10 +53,10 @@ export class AddonModFolderModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         return {
@@ -78,9 +78,9 @@ export class AddonModFolderModuleHandler implements CoreCourseModuleHandler {
      * Get the component to render the module. This is needed to support singleactivity course format.
      * The component returned must implement CoreCourseModuleMainComponent.
      *
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any} The component to use, undefined if not found.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component to use, undefined if not found.
      */
     getMainComponent(course: any, module: any): any {
         return AddonModFolderIndexComponent;
diff --git a/src/addon/mod/folder/providers/pluginfile-handler.ts b/src/addon/mod/folder/providers/pluginfile-handler.ts
index 943d2b0d4..ea5b6a576 100644
--- a/src/addon/mod/folder/providers/pluginfile-handler.ts
+++ b/src/addon/mod/folder/providers/pluginfile-handler.ts
@@ -26,8 +26,8 @@ export class AddonModFolderPluginFileHandler implements CorePluginFileHandler {
     /**
      * Return the RegExp to match the revision on pluginfile URLs.
      *
-     * @param {string[]} args Arguments of the pluginfile URL defining component and filearea at least.
-     * @return {RegExp} RegExp to match the revision on pluginfile URLs.
+     * @param args Arguments of the pluginfile URL defining component and filearea at least.
+     * @return RegExp to match the revision on pluginfile URLs.
      */
     getComponentRevisionRegExp(args: string[]): RegExp {
         // Check filearea.
@@ -40,8 +40,8 @@ export class AddonModFolderPluginFileHandler implements CorePluginFileHandler {
     /**
      * Should return the string to remove the revision on pluginfile url.
      *
-     * @param {string[]} args Arguments of the pluginfile URL defining component and filearea at least.
-     * @return {string} String to remove the revision on pluginfile url.
+     * @param args Arguments of the pluginfile URL defining component and filearea at least.
+     * @return String to remove the revision on pluginfile url.
      */
     getComponentRevisionReplace(args: string[]): string {
         // Component + Filearea + Revision
diff --git a/src/addon/mod/folder/providers/prefetch-handler.ts b/src/addon/mod/folder/providers/prefetch-handler.ts
index 77197e136..f03180806 100644
--- a/src/addon/mod/folder/providers/prefetch-handler.ts
+++ b/src/addon/mod/folder/providers/prefetch-handler.ts
@@ -42,13 +42,13 @@ export class AddonModFolderPrefetchHandler extends CoreCourseResourcePrefetchHan
     /**
      * Download or prefetch the content.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @param {boolean} [prefetch] True to prefetch, false to download right away.
-     * @param {string} [dirPath] Path of the directory where to store all the content files. This is to keep the files
-     *                           relative paths and make the package work in an iframe. Undefined to download the files
-     *                           in the filepool root folder.
-     * @return {Promise<any>} Promise resolved when all content is downloaded. Data returned is not reliable.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @param prefetch True to prefetch, false to download right away.
+     * @param dirPath Path of the directory where to store all the content files. This is to keep the files
+     *                relative paths and make the package work in an iframe. Undefined to download the files
+     *                in the filepool root folder.
+     * @return Promise resolved when all content is downloaded. Data returned is not reliable.
      */
     downloadOrPrefetch(module: any, courseId: number, prefetch?: boolean, dirPath?: string): Promise<any> {
         const promises = [];
@@ -65,9 +65,9 @@ export class AddonModFolderPrefetchHandler extends CoreCourseResourcePrefetchHan
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         return this.folderProvider.invalidateContent(moduleId, courseId);
@@ -76,9 +76,9 @@ export class AddonModFolderPrefetchHandler extends CoreCourseResourcePrefetchHan
     /**
      * Invalidate WS calls needed to determine module status.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when invalidated.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when invalidated.
      */
     invalidateModule(module: any, courseId: number): Promise<any> {
         const promises = [];
diff --git a/src/addon/mod/forum/components/index/index.ts b/src/addon/mod/forum/components/index/index.ts
index b3a4209b6..9d3f84803 100644
--- a/src/addon/mod/forum/components/index/index.ts
+++ b/src/addon/mod/forum/components/index/index.ts
@@ -163,10 +163,10 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Download the component contents.
      *
-     * @param  {boolean} [refresh=false]    Whether we're refreshing data.
-     * @param  {boolean} [sync=false]       If the refresh needs syncing.
-     * @param  {boolean} [showErrors=false] Wether to show errors to the user or hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Whether we're refreshing data.
+     * @param sync If the refresh needs syncing.
+     * @param showErrors Wether to show errors to the user or hide them.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<any> {
         this.loadMoreError = false;
@@ -253,7 +253,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Convenience function to fetch offline discussions.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchOfflineDiscussion(): Promise<any> {
         return this.forumOffline.getNewDiscussions(this.forum.id).then((offlineDiscussions) => {
@@ -299,8 +299,8 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Convenience function to get forum discussions.
      *
-     * @param  {boolean} refresh Whether we're refreshing data.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Whether we're refreshing data.
+     * @return Promise resolved when done.
      */
     protected fetchDiscussions(refresh: boolean): Promise<any> {
         this.loadMoreError = false;
@@ -371,8 +371,8 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Convenience function to load more forum discussions.
      *
-     * @param {any} [infiniteComplete] Infinite scroll complete function. Only used from core-infinite-loading.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
+     * @return Promise resolved when done.
      */
     fetchMoreDiscussions(infiniteComplete?: any): Promise<any> {
         return this.fetchDiscussions(false).catch((message) => {
@@ -387,7 +387,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Convenience function to fetch the sort order preference.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchSortOrderPreference(): Promise<any> {
         let promise;
@@ -408,7 +408,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         const promises = [];
@@ -431,7 +431,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Performs the sync of the activity.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected sync(): Promise<boolean> {
         return this.prefetchHandler.sync(this.module, this.courseId);
@@ -440,8 +440,8 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Checks if sync has succeed from result sync data.
      *
-     * @param  {any} result Data returned on the sync function.
-     * @return {boolean} Whether it succeed or not.
+     * @param result Data returned on the sync function.
+     * @return Whether it succeed or not.
      */
     protected hasSyncSucceed(result: any): boolean {
         return result.updated;
@@ -450,8 +450,8 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Compares sync event data with current data to check if refresh content is needed.
      *
-     * @param  {any} syncEventData Data receiven on sync observer.
-     * @return {boolean} True if refresh is needed, false otherwise.
+     * @param syncEventData Data receiven on sync observer.
+     * @return True if refresh is needed, false otherwise.
      */
     protected isRefreshSyncNeeded(syncEventData: any): boolean {
         return this.forum && syncEventData.source != 'index' && syncEventData.forumId == this.forum.id &&
@@ -461,8 +461,8 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Function called when we receive an event of new discussion or reply to discussion.
      *
-     * @param {boolean} isNewDiscussion Whether it's a new discussion event.
-     * @param {any} data Event data.
+     * @param isNewDiscussion Whether it's a new discussion event.
+     * @param data Event data.
      */
     protected eventReceived(isNewDiscussion: boolean, data: any): void {
         if ((this.forum && this.forum.id === data.forumId) || data.cmId === this.module.id) {
@@ -499,7 +499,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Opens a discussion.
      *
-     * @param {any} discussion Discussion object.
+     * @param discussion Discussion object.
      */
     openDiscussion(discussion: any): void {
         const params = {
@@ -515,7 +515,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Opens the new discussion form.
      *
-     * @param {number} [timeCreated=0] Creation time of the offline discussion.
+     * @param timeCreated Creation time of the offline discussion.
      */
     openNewDiscussion(timeCreated: number = 0): void {
         const params = {
@@ -532,7 +532,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Display the sort order selector modal.
      *
-     * @param {MouseEvent} event Event.
+     * @param event Event.
      */
     showSortOrderSelector(event: MouseEvent): void {
         if (!this.sortingAvailable) {
diff --git a/src/addon/mod/forum/components/post/post.ts b/src/addon/mod/forum/components/post/post.ts
index d6a9ca54d..d940e20da 100644
--- a/src/addon/mod/forum/components/post/post.ts
+++ b/src/addon/mod/forum/components/post/post.ts
@@ -83,12 +83,12 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
     /**
      * Set data to new post, clearing temporary files and updating original data.
      *
-     * @param {number} [replyingTo] Id of post beeing replied.
-     * @param {boolean} [isEditing] True it's an offline reply beeing edited, false otherwise.
-     * @param {string} [subject] Subject of the reply.
-     * @param {string} [message] Message of the reply.
-     * @param {boolean} [isPrivate] True if it's private reply.
-     * @param {any[]} [files] Reply attachments.
+     * @param replyingTo Id of post beeing replied.
+     * @param isEditing True it's an offline reply beeing edited, false otherwise.
+     * @param subject Subject of the reply.
+     * @param message Message of the reply.
+     * @param isPrivate True if it's private reply.
+     * @param files Reply attachments.
      */
     protected setReplyData(replyingTo?: number, isEditing?: boolean, subject?: string, message?: string, files?: any[],
             isPrivate?: boolean): void {
@@ -172,7 +172,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
     /**
      * Message changed.
      *
-     * @param {string} text The new text.
+     * @param text The new text.
      */
     onMessageChange(text: string): void {
         this.replyData.message = text;
@@ -338,7 +338,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
     /**
      * Confirm discard changes if any.
      *
-     * @return {Promise<void>} Promise resolved if the user confirms or data was not changed and rejected otherwise.
+     * @return Promise resolved if the user confirms or data was not changed and rejected otherwise.
      */
     protected confirmDiscard(): Promise<void> {
         if (this.forumHelper.hasPostDataChanged(this.replyData, this.originalData)) {
diff --git a/src/addon/mod/forum/pages/discussion/discussion.ts b/src/addon/mod/forum/pages/discussion/discussion.ts
index 7c395fc57..278f21f7d 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.ts
+++ b/src/addon/mod/forum/pages/discussion/discussion.ts
@@ -188,7 +188,7 @@ export class AddonModForumDiscussionPage implements OnDestroy {
     /**
      * Check if we can leave the page or not.
      *
-     * @return {boolean|Promise<void>} Resolved if we can leave it, rejected if not.
+     * @return Resolved if we can leave it, rejected if not.
      */
     ionViewCanLeave(): boolean | Promise<void> {
         let promise: any;
@@ -209,7 +209,7 @@ export class AddonModForumDiscussionPage implements OnDestroy {
     /**
      * Convenience function to get the forum.
      *
-     * @return {Promise<any>} Promise resolved with the forum.
+     * @return Promise resolved with the forum.
      */
     protected fetchForum(): Promise<any> {
         if (this.courseId && this.cmId) {
@@ -225,10 +225,10 @@ export class AddonModForumDiscussionPage implements OnDestroy {
     /**
      * Convenience function to get the posts.
      *
-     * @param  {boolean} [sync]            Whether to try to synchronize the discussion.
-     * @param  {boolean} [showErrors]      Whether to show errors in a modal.
-     * @param  {boolean} [forceMarkAsRead] Whether to mark all posts as read.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param sync Whether to try to synchronize the discussion.
+     * @param showErrors Whether to show errors in a modal.
+     * @param forceMarkAsRead Whether to mark all posts as read.
+     * @return Promise resolved when done.
      */
     protected fetchPosts(sync?: boolean, showErrors?: boolean, forceMarkAsRead?: boolean): Promise<any> {
         let syncPromise;
@@ -405,8 +405,8 @@ export class AddonModForumDiscussionPage implements OnDestroy {
     /**
      * Tries to synchronize the posts discussion.
      *
-     * @param  {boolean} showErrors Whether to show errors in a modal.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param showErrors Whether to show errors in a modal.
+     * @return Promise resolved when done.
      */
     protected syncDiscussion(showErrors: boolean): Promise<any> {
         const promises = [];
@@ -446,10 +446,10 @@ export class AddonModForumDiscussionPage implements OnDestroy {
     /**
      * Refresh the data.
      *
-     * @param {any}       [refresher] Refresher.
-     * @param {Function}  [done] Function to call when done.
-     * @param {boolean}   [showErrors=false] If show errors to the user of hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @param done Function to call when done.
+     * @param showErrors If show errors to the user of hide them.
+     * @return Promise resolved when done.
      */
     doRefresh(refresher?: any, done?: () => void, showErrors: boolean = false): Promise<any> {
         if (this.discussionLoaded) {
@@ -465,9 +465,9 @@ export class AddonModForumDiscussionPage implements OnDestroy {
     /**
      * Refresh posts.
      *
-     * @param  {boolean} [sync]       Whether to try to synchronize the discussion.
-     * @param  {boolean} [showErrors] Whether to show errors in a modal.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param sync Whether to try to synchronize the discussion.
+     * @param showErrors Whether to show errors in a modal.
+     * @return Promise resolved when done.
      */
     refreshPosts(sync?: boolean, showErrors?: boolean): Promise<any> {
         this.domUtils.scrollToTop(this.content);
@@ -491,8 +491,8 @@ export class AddonModForumDiscussionPage implements OnDestroy {
     /**
      * Function to change posts sorting
      *
-     * @param  {SortType} type Sort type.
-     * @return {Promise<any>} Promised resolved when done.
+     * @param type Sort type.
+     * @return Promised resolved when done.
      */
     changeSort(type: SortType): Promise<any> {
         this.discussionLoaded = false;
@@ -505,7 +505,7 @@ export class AddonModForumDiscussionPage implements OnDestroy {
     /**
      * Lock or unlock the discussion.
      *
-     * @param {boolean} locked True to lock the discussion, false to unlock.
+     * @param locked True to lock the discussion, false to unlock.
      */
     setLockState(locked: boolean): void {
         const modal = this.domUtils.showModalLoading('core.sending', true);
@@ -532,7 +532,7 @@ export class AddonModForumDiscussionPage implements OnDestroy {
     /**
      * Pin or unpin the discussion.
      *
-     * @param {boolean} pinned True to pin the discussion, false to unpin it.
+     * @param pinned True to pin the discussion, false to unpin it.
      */
     setPinState(pinned: boolean): void {
         const modal = this.domUtils.showModalLoading('core.sending', true);
@@ -559,7 +559,7 @@ export class AddonModForumDiscussionPage implements OnDestroy {
     /**
      * Star or unstar the discussion.
      *
-     * @param {boolean} starred True to star the discussion, false to unstar it.
+     * @param starred True to star the discussion, false to unstar it.
      */
     toggleFavouriteState(starred: boolean): void {
         const modal = this.domUtils.showModalLoading('core.sending', true);
diff --git a/src/addon/mod/forum/pages/index/index.ts b/src/addon/mod/forum/pages/index/index.ts
index 102e0b88f..97b78dc3a 100644
--- a/src/addon/mod/forum/pages/index/index.ts
+++ b/src/addon/mod/forum/pages/index/index.ts
@@ -40,7 +40,7 @@ export class AddonModForumIndexPage {
     /**
      * Update some data based on the forum instance.
      *
-     * @param {any} forum Forum instance.
+     * @param forum Forum instance.
      */
     updateData(forum: any): void {
         this.title = forum.name || this.title;
diff --git a/src/addon/mod/forum/pages/new-discussion/new-discussion.ts b/src/addon/mod/forum/pages/new-discussion/new-discussion.ts
index 337966e1d..1291edfaa 100644
--- a/src/addon/mod/forum/pages/new-discussion/new-discussion.ts
+++ b/src/addon/mod/forum/pages/new-discussion/new-discussion.ts
@@ -128,8 +128,8 @@ export class AddonModForumNewDiscussionPage implements OnDestroy {
     /**
      * Fetch if forum uses groups and the groups it uses.
      *
-     * @param  {boolean} [refresh] Whether we're refreshing data.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Whether we're refreshing data.
+     * @return Promise resolved when done.
      */
     protected fetchDiscussionData(refresh?: boolean): Promise<any> {
         return this.groupsProvider.getActivityGroupMode(this.cmId).then((mode) => {
@@ -253,8 +253,8 @@ export class AddonModForumNewDiscussionPage implements OnDestroy {
     /**
      * Validate which of the groups returned by getActivityAllowedGroups in visible groups should be shown to post to.
      *
-     * @param  {any[]} forumGroups Forum groups.
-     * @return {Promise<any[]>} Promise resolved with the list of groups.
+     * @param forumGroups Forum groups.
+     * @return Promise resolved with the list of groups.
      */
     protected validateVisibleGroups(forumGroups: any[]): Promise<any[]> {
         // We first check if the user can post to all the groups.
@@ -301,9 +301,9 @@ export class AddonModForumNewDiscussionPage implements OnDestroy {
     /**
      * Filter forum groups, returning only those that are inside user groups.
      *
-     * @param  {any[]} forumGroups Forum groups.
-     * @param  {any[]} userGroups User groups.
-     * @return {any[]} Filtered groups.
+     * @param forumGroups Forum groups.
+     * @param userGroups User groups.
+     * @return Filtered groups.
      */
     protected filterGroups(forumGroups: any[], userGroups: any[]): any[] {
         const filtered = [];
@@ -321,9 +321,9 @@ export class AddonModForumNewDiscussionPage implements OnDestroy {
     /**
      * Add the "All participants" option to a list of groups if the user can add a discussion to all participants.
      *
-     * @param  {any[]}   groups Groups.
-     * @param  {boolean} check  True to check if the user can add a discussion to all participants.
-     * @return {Promise<any[]>} Promise resolved with the list of groups.
+     * @param groups Groups.
+     * @param check True to check if the user can add a discussion to all participants.
+     * @return Promise resolved with the list of groups.
      */
     protected addAllParticipantsOption(groups: any[], check: boolean): Promise<any[]> {
         if (!this.forumProvider.isAllParticipantsFixed()) {
@@ -365,7 +365,7 @@ export class AddonModForumNewDiscussionPage implements OnDestroy {
     /**
      * Pull to refresh.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshGroups(refresher: any): void {
         const promises = [
@@ -384,8 +384,8 @@ export class AddonModForumNewDiscussionPage implements OnDestroy {
     /**
      * Convenience function to update or return to discussions depending on device.
      *
-     * @param {number} [discussionIds] Ids of the new discussions.
-     * @param {number} [discTimecreated] The time created of the discussion (if offline).
+     * @param discussionIds Ids of the new discussions.
+     * @param discTimecreated The time created of the discussion (if offline).
      */
     protected returnToDiscussions(discussionIds?: number[], discTimecreated?: number): void {
         const data: any = {
@@ -423,7 +423,7 @@ export class AddonModForumNewDiscussionPage implements OnDestroy {
     /**
      * Message changed.
      *
-     * @param {string} text The new text.
+     * @param text The new text.
      */
     onMessageChange(text: string): void {
         this.newDiscussion.message = text;
@@ -515,7 +515,7 @@ export class AddonModForumNewDiscussionPage implements OnDestroy {
     /**
      * Check if we can leave the page or not.
      *
-     * @return {boolean|Promise<void>} Resolved if we can leave it, rejected if not.
+     * @return Resolved if we can leave it, rejected if not.
      */
     ionViewCanLeave(): boolean | Promise<void> {
         let promise: any;
diff --git a/src/addon/mod/forum/pages/sort-order-selector/sort-order-selector.ts b/src/addon/mod/forum/pages/sort-order-selector/sort-order-selector.ts
index 0d83646a6..eb69c3270 100644
--- a/src/addon/mod/forum/pages/sort-order-selector/sort-order-selector.ts
+++ b/src/addon/mod/forum/pages/sort-order-selector/sort-order-selector.ts
@@ -43,7 +43,7 @@ export class AddonModForumSortOrderSelectorPage {
     /**
      * Select a sort order.
      *
-     * @param {any} sortOrder Selected sort order.
+     * @param sortOrder Selected sort order.
      */
     selectSortOrder(sortOrder: any): void {
         this.viewCtrl.dismiss(sortOrder);
diff --git a/src/addon/mod/forum/providers/discussion-link-handler.ts b/src/addon/mod/forum/providers/discussion-link-handler.ts
index d1c5399be..3b304cf5f 100644
--- a/src/addon/mod/forum/providers/discussion-link-handler.ts
+++ b/src/addon/mod/forum/providers/discussion-link-handler.ts
@@ -34,12 +34,12 @@ export class AddonModForumDiscussionLinkHandler extends CoreContentLinksHandlerB
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @param {any} [data] Extra data to handle the URL.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @param data Extra data to handle the URL.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number, data?: any):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -67,11 +67,11 @@ export class AddonModForumDiscussionLinkHandler extends CoreContentLinksHandlerB
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/mod/forum/providers/forum.ts b/src/addon/mod/forum/providers/forum.ts
index 6a8d7aa0f..2bb8872e2 100644
--- a/src/addon/mod/forum/providers/forum.ts
+++ b/src/addon/mod/forum/providers/forum.ts
@@ -64,9 +64,9 @@ export class AddonModForumProvider {
     /**
      * Get cache key for can add discussion WS calls.
      *
-     * @param  {number} forumId Forum ID.
-     * @param  {number} groupId Group ID.
-     * @return {string}         Cache key.
+     * @param forumId Forum ID.
+     * @param groupId Group ID.
+     * @return Cache key.
      */
     protected getCanAddDiscussionCacheKey(forumId: number, groupId: number): string {
         return this.getCommonCanAddDiscussionCacheKey(forumId) + groupId;
@@ -75,8 +75,8 @@ export class AddonModForumProvider {
     /**
      * Get common part of cache key for can add discussion WS calls.
      *
-     * @param  {number} forumId Forum ID.
-     * @return {string}         Cache key.
+     * @param forumId Forum ID.
+     * @return Cache key.
      */
     protected getCommonCanAddDiscussionCacheKey(forumId: number): string {
         return this.ROOT_CACHE_KEY + 'canadddiscussion:' + forumId + ':';
@@ -85,8 +85,8 @@ export class AddonModForumProvider {
     /**
      * Get cache key for forum data WS calls.
      *
-     * @param  {number} courseId Course ID.
-     * @return {string}          Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getForumDataCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'forum:' + courseId;
@@ -95,8 +95,8 @@ export class AddonModForumProvider {
     /**
      * Get cache key for forum access information WS calls.
      *
-     * @param  {number} forumId Forum ID.
-     * @return {string}         Cache key.
+     * @param forumId Forum ID.
+     * @return Cache key.
      */
     protected getAccessInformationCacheKey(forumId: number): string {
         return this.ROOT_CACHE_KEY + 'accessInformation:' + forumId;
@@ -105,8 +105,8 @@ export class AddonModForumProvider {
     /**
      * Get cache key for forum discussion posts WS calls.
      *
-     * @param  {number} discussionId Discussion ID.
-     * @return {string}              Cache key.
+     * @param discussionId Discussion ID.
+     * @return Cache key.
      */
     protected getDiscussionPostsCacheKey(discussionId: number): string {
         return this.ROOT_CACHE_KEY + 'discussion:' + discussionId;
@@ -115,9 +115,9 @@ export class AddonModForumProvider {
     /**
      * Get cache key for forum discussions list WS calls.
      *
-     * @param  {number} forumId Forum ID.
-     * @param  {number} sortOrder Sort order.
-     * @return {string} Cache key.
+     * @param forumId Forum ID.
+     * @param sortOrder Sort order.
+     * @return Cache key.
      */
     protected getDiscussionsListCacheKey(forumId: number, sortOrder: number): string {
         let key = this.ROOT_CACHE_KEY + 'discussions:' + forumId;
@@ -132,13 +132,13 @@ export class AddonModForumProvider {
     /**
      * Add a new discussion. It will fail if offline or cannot connect.
      *
-     * @param  {number} forumId   Forum ID.
-     * @param  {string} subject   New discussion's subject.
-     * @param  {string} message   New discussion's message.
-     * @param  {any}    [options] Options (subscribe, pin, ...).
-     * @param  {string} [groupId] Group this discussion belongs to.
-     * @param  {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<any>}     Promise resolved when the discussion is created.
+     * @param forumId Forum ID.
+     * @param subject New discussion's subject.
+     * @param message New discussion's message.
+     * @param options Options (subscribe, pin, ...).
+     * @param groupId Group this discussion belongs to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the discussion is created.
      */
     addNewDiscussionOnline(forumId: number, subject: string, message: string, options?: any, groupId?: number, siteId?: string)
             : Promise<any> {
@@ -168,13 +168,13 @@ export class AddonModForumProvider {
     /**
      * Check if a user can post to a certain group.
      *
-     * @param  {number} forumId  Forum ID.
-     * @param  {number} groupId  Group ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved with an object with the following properties:
-     *                            - status (boolean)
-     *                            - canpindiscussions (boolean)
-     *                            - cancreateattachment (boolean)
+     * @param forumId Forum ID.
+     * @param groupId Group ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with an object with the following properties:
+     *         - status (boolean)
+     *         - canpindiscussions (boolean)
+     *         - cancreateattachment (boolean)
      */
     canAddDiscussion(forumId: number, groupId: number, siteId?: string): Promise<any> {
         const params = {
@@ -208,11 +208,11 @@ export class AddonModForumProvider {
     /**
      * Check if a user can post to all groups.
      *
-     * @param  {number} forumId Forum ID.
-     * @return {Promise<any>}   Promise resolved with an object with the following properties:
-     *                           - status (boolean)
-     *                           - canpindiscussions (boolean)
-     *                           - cancreateattachment (boolean)
+     * @param forumId Forum ID.
+     * @return Promise resolved with an object with the following properties:
+     *         - status (boolean)
+     *         - canpindiscussions (boolean)
+     *         - cancreateattachment (boolean)
      */
     canAddDiscussionToAll(forumId: number): Promise<any> {
         return this.canAddDiscussion(forumId, AddonModForumProvider.ALL_PARTICIPANTS);
@@ -221,8 +221,8 @@ export class AddonModForumProvider {
     /**
      * Extract the starting post of a discussion from a list of posts. The post is removed from the array passed as a parameter.
      *
-     * @param  {any[]} posts Posts to search.
-     * @return {any}         Starting post or undefined if not found.
+     * @param posts Posts to search.
+     * @return Starting post or undefined if not found.
      */
     extractStartingPost(posts: any[]): any {
         // Check the last post first, since they'll usually be ordered by create time.
@@ -238,7 +238,7 @@ export class AddonModForumProvider {
     /**
      * There was a bug adding new discussions to All Participants (see MDL-57962). Check if it's fixed.
      *
-     * @return {boolean} True if fixed, false otherwise.
+     * @return True if fixed, false otherwise.
      */
     isAllParticipantsFixed(): boolean {
         return this.sitesProvider.getCurrentSite().isVersionGreaterEqualThan(['3.1.5', '3.2.2']);
@@ -247,9 +247,9 @@ export class AddonModForumProvider {
     /**
      * Format discussions, setting groupname if the discussion group is valid.
      *
-     * @param  {number} cmId        Forum cmid.
-     * @param  {any[]}  discussions List of discussions to format.
-     * @return {Promise<any[]>}     Promise resolved with the formatted discussions.
+     * @param cmId Forum cmid.
+     * @param discussions List of discussions to format.
+     * @return Promise resolved with the formatted discussions.
      */
     formatDiscussionsGroups(cmId: number, discussions: any[]): Promise<any[]> {
         discussions = this.utils.clone(discussions);
@@ -288,9 +288,9 @@ export class AddonModForumProvider {
     /**
      * Get all course forums.
      *
-     * @param  {number} courseId Course ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>}  Promise resolved when the forums are retrieved.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the forums are retrieved.
      */
     getCourseForums(courseId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -309,10 +309,10 @@ export class AddonModForumProvider {
     /**
      * Get a forum by course module ID.
      *
-     * @param  {number} courseId Course ID.
-     * @param  {number} cmId     Course module ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when the forum is retrieved.
+     * @param courseId Course ID.
+     * @param cmId Course module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the forum is retrieved.
      */
     getForum(courseId: number, cmId: number, siteId?: string): Promise<any> {
         return this.getCourseForums(courseId, siteId).then((forums) => {
@@ -328,10 +328,10 @@ export class AddonModForumProvider {
     /**
      * Get a forum by forum ID.
      *
-     * @param  {number} courseId Course ID.
-     * @param  {number} forumId  Forum ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when the forum is retrieved.
+     * @param courseId Course ID.
+     * @param forumId Forum ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the forum is retrieved.
      */
     getForumById(courseId: number, forumId: number, siteId?: string): Promise<any> {
         return this.getCourseForums(courseId, siteId).then((forums) => {
@@ -347,10 +347,10 @@ export class AddonModForumProvider {
     /**
      * Get access information for a given forum.
      *
-     * @param  {number}  forumId      Forum ID.
-     * @param  {boolean} [forceCache] True to always get the value from cache. false otherwise.
-     * @param  {string}  [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>} Object with access information.
+     * @param forumId Forum ID.
+     * @param forceCache True to always get the value from cache. false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Object with access information.
      * @since 3.7
      */
     getAccessInformation(forumId: number, forceCache?: boolean, siteId?: string): Promise<any> {
@@ -375,9 +375,9 @@ export class AddonModForumProvider {
     /**
      * Get forum discussion posts.
      *
-     * @param  {number} discussionId Discussion ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<{posts: any[], ratinginfo?: CoreRatingInfo}>} Promise resolved with forum posts and rating info.
+     * @param discussionId Discussion ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with forum posts and rating info.
      */
     getDiscussionPosts(discussionId: number, siteId?: string): Promise<{posts: any[], ratinginfo?: CoreRatingInfo}> {
         const params = {
@@ -403,8 +403,8 @@ export class AddonModForumProvider {
     /**
      * Sort forum discussion posts by an specified field.
      *
-     * @param {any[]}  posts     Discussion posts to be sorted in place.
-     * @param {string} direction Direction of the sorting (ASC / DESC).
+     * @param posts Discussion posts to be sorted in place.
+     * @param direction Direction of the sorting (ASC / DESC).
      */
     sortDiscussionPosts(posts: any[], direction: string): void {
         // @todo: Check children when sorting.
@@ -422,8 +422,8 @@ export class AddonModForumProvider {
     /**
      * Return whether discussion lists can be sorted.
      *
-     * @param {CoreSite} [site] Site. If not defined, current site.
-     * @return {boolean} True if discussion lists can be sorted.
+     * @param site Site. If not defined, current site.
+     * @return True if discussion lists can be sorted.
      */
     isDiscussionListSortingAvailable(site?: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
@@ -434,7 +434,7 @@ export class AddonModForumProvider {
     /**
      * Return the list of available sort orders.
      *
-     * @return {{label: string, value: number}[]} List of sort orders.
+     * @return List of sort orders.
      */
     getAvailableSortOrders(): {label: string, value: number}[] {
         const sortOrders = [
@@ -475,14 +475,14 @@ export class AddonModForumProvider {
     /**
      * Get forum discussions.
      *
-     * @param  {number}  forumId      Forum ID.
-     * @param  {number}  [sortOrder]  Sort order.
-     * @param  {number}  [page=0]     Page.
-     * @param  {boolean} [forceCache] True to always get the value from cache. false otherwise.
-     * @param  {string}  [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved with an object with:
-     *                                 - discussions: List of discussions.
-     *                                 - canLoadMore: True if there may be more discussions to load.
+     * @param forumId Forum ID.
+     * @param sortOrder Sort order.
+     * @param page Page.
+     * @param forceCache True to always get the value from cache. false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with an object with:
+     *         - discussions: List of discussions.
+     *         - canLoadMore: True if there may be more discussions to load.
      */
     getDiscussions(forumId: number, sortOrder?: number, page: number = 0, forceCache?: boolean, siteId?: string): Promise<any> {
         sortOrder = sortOrder || AddonModForumProvider.SORTORDER_LASTPOST_DESC;
@@ -555,15 +555,15 @@ export class AddonModForumProvider {
      * Get forum discussions in several pages.
      * If a page fails, the discussions until that page will be returned along with a flag indicating an error occurred.
      *
-     * @param  {number}  forumId     Forum ID.
-     * @param  {number}  [sortOrder] Sort order.
-     * @param  {boolean} [forceCache] True to always get the value from cache, false otherwise.
-     * @param  {number}  [numPages]  Number of pages to get. If not defined, all pages.
-     * @param  {number}  [startPage] Page to start. If not defined, first page.
-     * @param  {string}  [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved with an object with:
-     *                                - discussions: List of discussions.
-     *                                - error: True if an error occurred, false otherwise.
+     * @param forumId Forum ID.
+     * @param sortOrder Sort order.
+     * @param forceCache True to always get the value from cache, false otherwise.
+     * @param numPages Number of pages to get. If not defined, all pages.
+     * @param startPage Page to start. If not defined, first page.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with an object with:
+     *         - discussions: List of discussions.
+     *         - error: True if an error occurred, false otherwise.
      */
     getDiscussionsInPages(forumId: number, sortOrder?: number, forceCache?: boolean, numPages?: number, startPage?: number,
             siteId?: string): Promise<any> {
@@ -606,9 +606,9 @@ export class AddonModForumProvider {
     /**
      * Invalidates can add discussion WS calls.
      *
-     * @param  {number} forumId  Forum ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when the data is invalidated.
+     * @param forumId Forum ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCanAddDiscussion(forumId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -620,9 +620,9 @@ export class AddonModForumProvider {
      * Invalidate the prefetched content except files.
      * To invalidate files, use AddonModForum#invalidateFiles.
      *
-     * @param  {number} moduleId The module ID.
-     * @param  {number} courseId Course ID.
-     * @return {Promise<any>}    Promise resolved when data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID.
+     * @return Promise resolved when data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         // Get the forum first, we need the forum ID.
@@ -659,9 +659,9 @@ export class AddonModForumProvider {
     /**
      * Invalidates access information.
      *
-     * @param  {number} forumId  Forum ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when the data is invalidated.
+     * @param forumId Forum ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAccessInformation(forumId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -672,9 +672,9 @@ export class AddonModForumProvider {
     /**
      * Invalidates forum discussion posts.
      *
-     * @param  {number} discussionId Discussion ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the data is invalidated.
+     * @param discussionId Discussion ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateDiscussionPosts(discussionId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -685,9 +685,9 @@ export class AddonModForumProvider {
     /**
      * Invalidates discussion list.
      *
-     * @param  {number} forumId  Forum ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when the data is invalidated.
+     * @param forumId Forum ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateDiscussionsList(forumId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -700,8 +700,8 @@ export class AddonModForumProvider {
     /**
      * Invalidate the prefetched files.
      *
-     * @param  {number} moduleId The module ID.
-     * @return {Promise<any>}   Promise resolved when the files are invalidated.
+     * @param moduleId The module ID.
+     * @return Promise resolved when the files are invalidated.
      */
     invalidateFiles(moduleId: number): Promise<any> {
         const siteId = this.sitesProvider.getCurrentSiteId();
@@ -712,8 +712,8 @@ export class AddonModForumProvider {
     /**
      * Invalidates forum data.
      *
-     * @param  {number} courseId Course ID.
-     * @return {Promise<any>}    Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateForumData(courseId: number): Promise<any> {
         return this.sitesProvider.getCurrentSite().invalidateWsCacheForKey(this.getForumDataCacheKey(courseId));
@@ -722,10 +722,10 @@ export class AddonModForumProvider {
     /**
      * Report a forum as being viewed.
      *
-     * @param  {number} id    Module ID.
-     * @param {string} [name] Name of the forum.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the WS call is successful.
+     * @param id Module ID.
+     * @param name Name of the forum.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(id: number, name?: string, siteId?: string): Promise<any> {
         const params = {
@@ -739,11 +739,11 @@ export class AddonModForumProvider {
     /**
      * Report a forum discussion as being viewed.
      *
-     * @param  {number} id    Discussion ID.
-     * @param  {number} forumId  Forum ID.
-     * @param {string} [name] Name of the forum.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the WS call is successful.
+     * @param id Discussion ID.
+     * @param forumId Forum ID.
+     * @param name Name of the forum.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logDiscussionView(id: number, forumId: number, name?: string, siteId?: string): Promise<any> {
         const params = {
@@ -757,17 +757,17 @@ export class AddonModForumProvider {
     /**
      * Reply to a certain post.
      *
-     * @param  {number}  postId         ID of the post being replied.
-     * @param  {number}  discussionId   ID of the discussion the user is replying to.
-     * @param  {number}  forumId        ID of the forum the user is replying to.
-     * @param  {string}  name           Forum name.
-     * @param  {number}  courseId       Course ID the forum belongs to.
-     * @param  {string}  subject        New post's subject.
-     * @param  {string}  message        New post's message.
-     * @param  {any}     [options]      Options (subscribe, attachments, ...).
-     * @param  {string}  [siteId]       Site ID. If not defined, current site.
-     * @param  {boolean} [allowOffline] True if it can be stored in offline, false otherwise.
-     * @return {Promise<any>}           Promise resolved with post ID if sent online, resolved with false if stored offline.
+     * @param postId ID of the post being replied.
+     * @param discussionId ID of the discussion the user is replying to.
+     * @param forumId ID of the forum the user is replying to.
+     * @param name Forum name.
+     * @param courseId Course ID the forum belongs to.
+     * @param subject New post's subject.
+     * @param message New post's message.
+     * @param options Options (subscribe, attachments, ...).
+     * @param siteId Site ID. If not defined, current site.
+     * @param allowOffline True if it can be stored in offline, false otherwise.
+     * @return Promise resolved with post ID if sent online, resolved with false if stored offline.
      */
     replyPost(postId: number, discussionId: number, forumId: number, name: string, courseId: number, subject: string,
             message: string, options?: any, siteId?: string, allowOffline?: boolean): Promise<any> {
@@ -811,12 +811,12 @@ export class AddonModForumProvider {
     /**
      * Reply to a certain post. It will fail if offline or cannot connect.
      *
-     * @param  {number} postId    ID of the post being replied.
-     * @param  {string} subject   New post's subject.
-     * @param  {string} message   New post's message.
-     * @param  {any}    [options] Options (subscribe, attachments, ...).
-     * @param  {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<number>}  Promise resolved with the created post id.
+     * @param postId ID of the post being replied.
+     * @param subject New post's subject.
+     * @param message New post's message.
+     * @param options Options (subscribe, attachments, ...).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the created post id.
      */
     replyPostOnline(postId: number, subject: string, message: string, options?: any, siteId?: string): Promise<number> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -840,11 +840,11 @@ export class AddonModForumProvider {
     /**
      * Lock or unlock a discussion.
      *
-     * @param {number} forumId Forum id.
-     * @param {number} discussionId DIscussion id.
-     * @param {boolean} locked True to lock, false to unlock.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resvoled when done.
+     * @param forumId Forum id.
+     * @param discussionId DIscussion id.
+     * @param locked True to lock, false to unlock.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resvoled when done.
      * @since 3.7
      */
     setLockState(forumId: number, discussionId: number, locked: boolean, siteId?: string): Promise<any> {
@@ -862,8 +862,8 @@ export class AddonModForumProvider {
     /**
      * Returns whether the set pin state WS is available.
      *
-     * @param  {CoreSite} [site] Site. If not defined, current site.
-     * @return {boolean} Whether it's available.
+     * @param site Site. If not defined, current site.
+     * @return Whether it's available.
      * @since 3.7
      */
     isSetPinStateAvailableForSite(site?: CoreSite): boolean {
@@ -875,10 +875,10 @@ export class AddonModForumProvider {
     /**
      * Pin or unpin a discussion.
      *
-     * @param {number} discussionId Discussion id.
-     * @param {boolean} locked True to pin, false to unpin.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resvoled when done.
+     * @param discussionId Discussion id.
+     * @param locked True to pin, false to unpin.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resvoled when done.
      * @since 3.7
      */
     setPinState(discussionId: number, pinned: boolean, siteId?: string): Promise<any> {
@@ -895,10 +895,10 @@ export class AddonModForumProvider {
     /**
      * Star or unstar a discussion.
      *
-     * @param {number} discussionId Discussion id.
-     * @param {boolean} starred True to star, false to unstar.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resvoled when done.
+     * @param discussionId Discussion id.
+     * @param starred True to star, false to unstar.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resvoled when done.
      * @since 3.7
      */
     toggleFavouriteState(discussionId: number, starred: boolean, siteId?: string): Promise<any> {
@@ -915,7 +915,7 @@ export class AddonModForumProvider {
     /**
      * Store the users data from a discussions/posts list.
      *
-     * @param {any[]} list Array of posts or discussions.
+     * @param list Array of posts or discussions.
      */
     protected storeUserData(list: any[]): void {
         const users = {};
diff --git a/src/addon/mod/forum/providers/helper.ts b/src/addon/mod/forum/providers/helper.ts
index fb46fab35..202241d23 100644
--- a/src/addon/mod/forum/providers/helper.ts
+++ b/src/addon/mod/forum/providers/helper.ts
@@ -43,17 +43,17 @@ export class AddonModForumHelperProvider {
     /**
      * Add a new discussion.
      *
-     * @param {number} forumId Forum ID.
-     * @param {string} name Forum name.
-     * @param {number} courseId Course ID the forum belongs to.
-     * @param {string} subject New discussion's subject.
-     * @param {string} message New discussion's message.
-     * @param {any[]} [attachments] New discussion's attachments.
-     * @param {any} [options] Options (subscribe, pin, ...).
-     * @param {number[]} [groupIds] Groups this discussion belongs to.
-     * @param {number} [timeCreated] The time the discussion was created. Only used when editing discussion.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number[]>} Promise resolved with ids of the created discussions or null if stored offline
+     * @param forumId Forum ID.
+     * @param name Forum name.
+     * @param courseId Course ID the forum belongs to.
+     * @param subject New discussion's subject.
+     * @param message New discussion's message.
+     * @param attachments New discussion's attachments.
+     * @param options Options (subscribe, pin, ...).
+     * @param groupIds Groups this discussion belongs to.
+     * @param timeCreated The time the discussion was created. Only used when editing discussion.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with ids of the created discussions or null if stored offline
      */
     addNewDiscussion(forumId: number, name: string, courseId: number, subject: string, message: string, attachments?: any[],
             options?: any, groupIds?: number[], timeCreated?: number, siteId?: string): Promise<number[]> {
@@ -155,9 +155,9 @@ export class AddonModForumHelperProvider {
     /**
      * Convert offline reply to online format in order to be compatible with them.
      *
-     * @param  {any}    offlineReply Offline version of the reply.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved with the object converted to Online.
+     * @param offlineReply Offline version of the reply.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the object converted to Online.
      */
     convertOfflineReplyToOnline(offlineReply: any, siteId?: string): Promise<any> {
         const reply: any = {
@@ -212,10 +212,10 @@ export class AddonModForumHelperProvider {
     /**
      * Delete stored attachment files for a new discussion.
      *
-     * @param  {number} forumId     Forum ID.
-     * @param  {number} timecreated The time the discussion was created.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}       Promise resolved when deleted.
+     * @param forumId Forum ID.
+     * @param timecreated The time the discussion was created.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when deleted.
      */
     deleteNewDiscussionStoredFiles(forumId: number, timecreated: number, siteId?: string): Promise<any> {
         return this.forumOffline.getNewDiscussionFolder(forumId, timecreated, siteId).then((folderPath) => {
@@ -228,11 +228,11 @@ export class AddonModForumHelperProvider {
     /**
      * Delete stored attachment files for a reply.
      *
-     * @param  {number} forumId  Forum ID.
-     * @param  {number} postId   ID of the post being replied.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @param  {number} [userId] User the reply belongs to. If not defined, current user in site.
-     * @return {Promise<any>}    Promise resolved when deleted.
+     * @param forumId Forum ID.
+     * @param postId ID of the post being replied.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the reply belongs to. If not defined, current user in site.
+     * @return Promise resolved when deleted.
      */
     deleteReplyStoredFiles(forumId: number, postId: number, siteId?: string, userId?: number): Promise<any> {
         return this.forumOffline.getReplyFolder(forumId, postId, siteId, userId).then((folderPath) => {
@@ -245,8 +245,8 @@ export class AddonModForumHelperProvider {
     /**
      * Returns the availability message of the given forum.
      *
-     * @param {any} forum Forum instance.
-     * @return {string} Message or null if the forum has no cut-off or due date.
+     * @param forum Forum instance.
+     * @return Message or null if the forum has no cut-off or due date.
      */
     getAvailabilityMessage(forum: any): string {
         if (this.isCutoffDateReached(forum)) {
@@ -269,10 +269,10 @@ export class AddonModForumHelperProvider {
      *
      * This function is inefficient because it needs to fetch all discussion pages in the worst case.
      *
-     * @param {number} forumId Forum ID.
-     * @param {number} discussionId Discussion ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the discussion data.
+     * @param forumId Forum ID.
+     * @param discussionId Discussion ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the discussion data.
      */
     getDiscussionById(forumId: number, discussionId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -299,10 +299,10 @@ export class AddonModForumHelperProvider {
     /**
      * Get a list of stored attachment files for a new discussion. See AddonModForumHelper#storeNewDiscussionFiles.
      *
-     * @param  {number} forumId     Forum ID.
-     * @param  {number} timecreated The time the discussion was created.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any[]>}     Promise resolved with the files.
+     * @param forumId Forum ID.
+     * @param timecreated The time the discussion was created.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the files.
      */
     getNewDiscussionStoredFiles(forumId: number, timecreated: number, siteId?: string): Promise<any[]> {
         return this.forumOffline.getNewDiscussionFolder(forumId, timecreated, siteId).then((folderPath) => {
@@ -313,11 +313,11 @@ export class AddonModForumHelperProvider {
     /**
      * Get a list of stored attachment files for a reply. See AddonModForumHelper#storeReplyFiles.
      *
-     * @param  {number} forumId  Forum ID.
-     * @param  {number} postId   ID of the post being replied.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @param  {number} [userId] User the reply belongs to. If not defined, current user in site.
-     * @return {Promise<any[]>}  Promise resolved with the files.
+     * @param forumId Forum ID.
+     * @param postId ID of the post being replied.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the reply belongs to. If not defined, current user in site.
+     * @return Promise resolved with the files.
      */
     getReplyStoredFiles(forumId: number, postId: number, siteId?: string, userId?: number): Promise<any[]> {
         return this.forumOffline.getReplyFolder(forumId, postId, siteId, userId).then((folderPath) => {
@@ -328,9 +328,9 @@ export class AddonModForumHelperProvider {
     /**
      * Check if the data of a post/discussion has changed.
      *
-     * @param  {any} post       Current data.
-     * @param  {any} [original] Original ata.
-     * @return {boolean} True if data has changed, false otherwise.
+     * @param post Current data.
+     * @param original Original ata.
+     * @return True if data has changed, false otherwise.
      */
     hasPostDataChanged(post: any, original?: any): boolean {
         if (!original || original.subject == null) {
@@ -352,8 +352,7 @@ export class AddonModForumHelperProvider {
     /**
      * Is the cutoff date for the forum reached?
      *
-     * @param {any} forum Forum instance.
-     * @return {boolean}
+     * @param forum Forum instance.
      */
     isCutoffDateReached(forum: any): boolean {
         const now = Date.now() / 1000;
@@ -364,8 +363,7 @@ export class AddonModForumHelperProvider {
     /**
      * Is the due date for the forum reached?
      *
-     * @param {any} forum Forum instance.
-     * @return {boolean}
+     * @param forum Forum instance.
      */
     isDueDateReached(forum: any): boolean {
         const now = Date.now() / 1000;
@@ -377,11 +375,11 @@ export class AddonModForumHelperProvider {
      * Given a list of files (either online files or local files), store the local files in a local folder
      * to be submitted later.
      *
-     * @param  {number} forumId     Forum ID.
-     * @param  {number} timecreated The time the discussion was created.
-     * @param  {any[]}  files       List of files.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}       Promise resolved if success, rejected otherwise.
+     * @param forumId Forum ID.
+     * @param timecreated The time the discussion was created.
+     * @param files List of files.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success, rejected otherwise.
      */
     storeNewDiscussionFiles(forumId: number, timecreated: number, files: any[], siteId?: string): Promise<any> {
         // Get the folder where to store the files.
@@ -394,12 +392,12 @@ export class AddonModForumHelperProvider {
      * Given a list of files (either online files or local files), store the local files in a local folder
      * to be submitted later.
      *
-     * @param  {number} forumId  Forum ID.
-     * @param  {number} postId   ID of the post being replied.
-     * @param  {any[]}  files    List of files.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @param  {number} [userId] User the reply belongs to. If not defined, current user in site.
-     * @return {Promise<any>}    Promise resolved if success, rejected otherwise.
+     * @param forumId Forum ID.
+     * @param postId ID of the post being replied.
+     * @param files List of files.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the reply belongs to. If not defined, current user in site.
+     * @return Promise resolved if success, rejected otherwise.
      */
     storeReplyFiles(forumId: number, postId: number, files: any[], siteId?: string, userId?: number): Promise<any> {
         // Get the folder where to store the files.
@@ -411,12 +409,12 @@ export class AddonModForumHelperProvider {
     /**
      * Upload or store some files for a new discussion, depending if the user is offline or not.
      *
-     * @param  {number}  forumId     Forum ID.
-     * @param  {number}  timecreated The time the discussion was created.
-     * @param  {any[]}   files       List of files.
-     * @param  {boolean} offline     True if files sould be stored for offline, false to upload them.
-     * @param  {string}  [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved if success.
+     * @param forumId Forum ID.
+     * @param timecreated The time the discussion was created.
+     * @param files List of files.
+     * @param offline True if files sould be stored for offline, false to upload them.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success.
      */
     uploadOrStoreNewDiscussionFiles(forumId: number, timecreated: number, files: any[], offline: boolean, siteId?: string)
             : Promise<any> {
@@ -430,13 +428,13 @@ export class AddonModForumHelperProvider {
     /**
      * Upload or store some files for a reply, depending if the user is offline or not.
      *
-     * @param  {number}  forumId  Forum ID.
-     * @param  {number}  postId   ID of the post being replied.
-     * @param  {any[]}   files    List of files.
-     * @param  {boolean} offline  True if files sould be stored for offline, false to upload them.
-     * @param  {string}  [siteId] Site ID. If not defined, current site.
-     * @param  {number}  [userId] User the reply belongs to. If not defined, current user in site.
-     * @return {Promise<any>}     Promise resolved if success.
+     * @param forumId Forum ID.
+     * @param postId ID of the post being replied.
+     * @param files List of files.
+     * @param offline True if files sould be stored for offline, false to upload them.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the reply belongs to. If not defined, current user in site.
+     * @return Promise resolved if success.
      */
     uploadOrStoreReplyFiles(forumId: number, postId: number, files: any[], offline: boolean, siteId?: string, userId?: number)
             : Promise<any> {
diff --git a/src/addon/mod/forum/providers/index-link-handler.ts b/src/addon/mod/forum/providers/index-link-handler.ts
index 2b7b23e7c..fce6e746f 100644
--- a/src/addon/mod/forum/providers/index-link-handler.ts
+++ b/src/addon/mod/forum/providers/index-link-handler.ts
@@ -39,11 +39,11 @@ export class AddonModForumIndexLinkHandler extends CoreContentLinksModuleIndexHa
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return true;
@@ -52,11 +52,11 @@ export class AddonModForumIndexLinkHandler extends CoreContentLinksModuleIndexHa
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
diff --git a/src/addon/mod/forum/providers/module-handler.ts b/src/addon/mod/forum/providers/module-handler.ts
index f87f93d03..860dea961 100644
--- a/src/addon/mod/forum/providers/module-handler.ts
+++ b/src/addon/mod/forum/providers/module-handler.ts
@@ -52,7 +52,7 @@ export class AddonModForumModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean {
         return true;
@@ -61,10 +61,10 @@ export class AddonModForumModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         const data: CoreCourseModuleHandlerData = {
@@ -106,9 +106,9 @@ export class AddonModForumModuleHandler implements CoreCourseModuleHandler {
      * Get the component to render the module. This is needed to support singleactivity course format.
      * The component returned must implement CoreCourseModuleMainComponent.
      *
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any} The component to use, undefined if not found.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component to use, undefined if not found.
      */
     getMainComponent(course: any, module: any): any {
         return AddonModForumIndexComponent;
@@ -118,7 +118,7 @@ export class AddonModForumModuleHandler implements CoreCourseModuleHandler {
      * Whether to display the course refresher in single activity course format. If it returns false, a refresher must be
      * included in the template that calls the doRefresh method of the component. Defaults to true.
      *
-     * @return {boolean} Whether the refresher should be displayed.
+     * @return Whether the refresher should be displayed.
      */
     displayRefresherInSingleActivity(): boolean {
         return false;
@@ -127,10 +127,10 @@ export class AddonModForumModuleHandler implements CoreCourseModuleHandler {
     /**
      * Triggers an update for the extra badge text.
      *
-     * @param  {CoreCourseModuleHandlerData} data Course Module Handler data.
-     * @param  {number} courseId Course ID.
-     * @param  {number} moduleId Course module ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
+     * @param data Course Module Handler data.
+     * @param courseId Course ID.
+     * @param moduleId Course module ID.
+     * @param siteId Site ID. If not defined, current site.
      */
     updateExtraBadge(data: CoreCourseModuleHandlerData, courseId: number, moduleId: number, siteId?: string): void {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
diff --git a/src/addon/mod/forum/providers/offline.ts b/src/addon/mod/forum/providers/offline.ts
index af6a08b11..2a1f161a3 100644
--- a/src/addon/mod/forum/providers/offline.ts
+++ b/src/addon/mod/forum/providers/offline.ts
@@ -132,11 +132,11 @@ export class AddonModForumOfflineProvider {
     /**
      * Delete a forum offline discussion.
      *
-     * @param  {number} forumId     Forum ID.
-     * @param  {number} timeCreated The time the discussion was created.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @param  {number} [userId]    User the discussion belongs to. If not defined, current user in site.
-     * @return {Promise<any>}       Promise resolved if stored, rejected if failure.
+     * @param forumId Forum ID.
+     * @param timeCreated The time the discussion was created.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the discussion belongs to. If not defined, current user in site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     deleteNewDiscussion(forumId: number, timeCreated: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -153,11 +153,11 @@ export class AddonModForumOfflineProvider {
     /**
      * Get a forum offline discussion.
      *
-     * @param  {number} forumId     Forum ID.
-     * @param  {number} timeCreated The time the discussion was created.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @param  {number} [userId]    User the discussion belongs to. If not defined, current user in site.
-     * @return {Promise<any>}       Promise resolved if stored, rejected if failure.
+     * @param forumId Forum ID.
+     * @param timeCreated The time the discussion was created.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the discussion belongs to. If not defined, current user in site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     getNewDiscussion(forumId: number, timeCreated: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -178,8 +178,8 @@ export class AddonModForumOfflineProvider {
     /**
      * Get all offline new discussions.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>}  Promise resolved with discussions.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with discussions.
      */
     getAllNewDiscussions(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -190,10 +190,10 @@ export class AddonModForumOfflineProvider {
     /**
      * Check if there are offline new discussions to send.
      *
-     * @param  {number} forumId   Forum ID.
-     * @param  {string} [siteId]  Site ID. If not defined, current site.
-     * @param  {number} [userId]  User the discussions belong to. If not defined, current user in site.
-     * @return {Promise<boolean>} Promise resolved with boolean: true if has offline answers, false otherwise.
+     * @param forumId Forum ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the discussions belong to. If not defined, current user in site.
+     * @return Promise resolved with boolean: true if has offline answers, false otherwise.
      */
     hasNewDiscussions(forumId: number, siteId?: string, userId?: number): Promise<boolean> {
         return this.getNewDiscussions(forumId, siteId, userId).then((discussions) => {
@@ -207,10 +207,10 @@ export class AddonModForumOfflineProvider {
     /**
      * Get new discussions to be synced.
      *
-     * @param  {number} forumId  Forum ID to get.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @param  {number} [userId] User the discussions belong to. If not defined, current user in site.
-     * @return {Promise<any[]>}  Promise resolved with the object to be synced.
+     * @param forumId Forum ID to get.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the discussions belong to. If not defined, current user in site.
+     * @return Promise resolved with the object to be synced.
      */
     getNewDiscussions(forumId: number, siteId?: string, userId?: number): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -227,17 +227,17 @@ export class AddonModForumOfflineProvider {
     /**
      * Offline version for adding a new discussion to a forum.
      *
-     * @param  {number} forumId       Forum ID.
-     * @param  {string} name          Forum name.
-     * @param  {number} courseId      Course ID the forum belongs to.
-     * @param  {string} subject       New discussion's subject.
-     * @param  {string} message       New discussion's message.
-     * @param  {any}    [options]     Options (subscribe, pin, ...).
-     * @param  {string} [groupId]     Group this discussion belongs to.
-     * @param  {number} [timeCreated] The time the discussion was created. If not defined, current time.
-     * @param  {string} [siteId]      Site ID. If not defined, current site.
-     * @param  {number} [userId]      User the discussion belong to. If not defined, current user in site.
-     * @return {Promise<any>}         Promise resolved when new discussion is successfully saved.
+     * @param forumId Forum ID.
+     * @param name Forum name.
+     * @param courseId Course ID the forum belongs to.
+     * @param subject New discussion's subject.
+     * @param message New discussion's message.
+     * @param options Options (subscribe, pin, ...).
+     * @param groupId Group this discussion belongs to.
+     * @param timeCreated The time the discussion was created. If not defined, current time.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the discussion belong to. If not defined, current user in site.
+     * @return Promise resolved when new discussion is successfully saved.
      */
     addNewDiscussion(forumId: number, name: string, courseId: number, subject: string, message: string, options?: any,
             groupId?: number, timeCreated?: number, siteId?: string, userId?: number): Promise<any> {
@@ -261,10 +261,10 @@ export class AddonModForumOfflineProvider {
     /**
      * Delete forum offline replies.
      *
-     * @param  {number} postId   ID of the post being replied.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @param  {number} [userId] User the reply belongs to. If not defined, current user in site.
-     * @return {Promise<any>}    Promise resolved if stored, rejected if failure.
+     * @param postId ID of the post being replied.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the reply belongs to. If not defined, current user in site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     deleteReply(postId: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -280,8 +280,8 @@ export class AddonModForumOfflineProvider {
     /**
      * Get all offline replies.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>}  Promise resolved with replies.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with replies.
      */
     getAllReplies(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -292,10 +292,10 @@ export class AddonModForumOfflineProvider {
     /**
      * Check if there is an offline reply for a forum to be synced.
      *
-     * @param  {number} forumId   ID of the forum being replied.
-     * @param  {string} [siteId]  Site ID. If not defined, current site.
-     * @param  {number} [userId]  User the replies belong to. If not defined, current user in site.
-     * @return {Promise<boolean>} Promise resolved with boolean: true if has offline answers, false otherwise.
+     * @param forumId ID of the forum being replied.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the replies belong to. If not defined, current user in site.
+     * @return Promise resolved with boolean: true if has offline answers, false otherwise.
      */
     hasForumReplies(forumId: number, siteId?: string, userId?: number): Promise<boolean> {
         return this.getForumReplies(forumId, siteId, userId).then((replies) => {
@@ -309,10 +309,10 @@ export class AddonModForumOfflineProvider {
     /**
      * Get the replies of a forum to be synced.
      *
-     * @param  {number} forumId  ID of the forum being replied.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @param  {number} [userId] User the replies belong to. If not defined, current user in site.
-     * @return {Promise<any[]>}  Promise resolved with replies.
+     * @param forumId ID of the forum being replied.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the replies belong to. If not defined, current user in site.
+     * @return Promise resolved with replies.
      */
     getForumReplies(forumId: number, siteId?: string, userId?: number): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -329,10 +329,10 @@ export class AddonModForumOfflineProvider {
     /**
      * Check if there is an offline reply to be synced.
      *
-     * @param  {number} discussionId ID of the discussion the user is replying to.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @param  {number} [userId]     User the replies belong to. If not defined, current user in site.
-     * @return {Promise<boolean>}    Promise resolved with boolean: true if has offline answers, false otherwise.
+     * @param discussionId ID of the discussion the user is replying to.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the replies belong to. If not defined, current user in site.
+     * @return Promise resolved with boolean: true if has offline answers, false otherwise.
      */
     hasDiscussionReplies(discussionId: number, siteId?: string, userId?: number): Promise<boolean> {
         return this.getDiscussionReplies(discussionId, siteId, userId).then((replies) => {
@@ -346,10 +346,10 @@ export class AddonModForumOfflineProvider {
     /**
      * Get the replies of a discussion to be synced.
      *
-     * @param  {number} discussionId ID of the discussion the user is replying to.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @param  {number} [userId]     User the replies belong to. If not defined, current user in site.
-     * @return {Promise<any[]>}      Promise resolved with discussions.
+     * @param discussionId ID of the discussion the user is replying to.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the replies belong to. If not defined, current user in site.
+     * @return Promise resolved with discussions.
      */
     getDiscussionReplies(discussionId: number, siteId?: string, userId?: number): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -366,17 +366,17 @@ export class AddonModForumOfflineProvider {
     /**
      * Offline version for replying to a certain post.
      *
-     * @param  {number}  postId       ID of the post being replied.
-     * @param  {number}  discussionId ID of the discussion the user is replying to.
-     * @param  {number}  forumId      ID of the forum the user is replying to.
-     * @param  {string}  name         Forum name.
-     * @param  {number}  courseId     Course ID the forum belongs to.
-     * @param  {string}  subject      New post's subject.
-     * @param  {string}  message      New post's message.
-     * @param  {any}     [options]    Options (subscribe, attachments, ...).
-     * @param  {string}  [siteId]     Site ID. If not defined, current site.
-     * @param  {number}  [userId]     User the post belong to. If not defined, current user in site.
-     * @return {Promise<any>}         Promise resolved when the post is created.
+     * @param postId ID of the post being replied.
+     * @param discussionId ID of the discussion the user is replying to.
+     * @param forumId ID of the forum the user is replying to.
+     * @param name Forum name.
+     * @param courseId Course ID the forum belongs to.
+     * @param subject New post's subject.
+     * @param message New post's message.
+     * @param options Options (subscribe, attachments, ...).
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the post belong to. If not defined, current user in site.
+     * @return Promise resolved when the post is created.
      */
     replyPost(postId: number, discussionId: number, forumId: number, name: string, courseId: number, subject: string,
             message: string, options?: any, siteId?: string, userId?: number): Promise<any> {
@@ -401,9 +401,9 @@ export class AddonModForumOfflineProvider {
     /**
      * Get the path to the folder where to store files for offline attachments in a forum.
      *
-     * @param  {number} forumId  Forum ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<string>} Promise resolved with the path.
+     * @param forumId Forum ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the path.
      */
     getForumFolder(forumId: number, siteId?: string): Promise<string> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -416,10 +416,10 @@ export class AddonModForumOfflineProvider {
     /**
      * Get the path to the folder where to store files for a new offline discussion.
      *
-     * @param  {number} forumId     Forum ID.
-     * @param  {number} timeCreated The time the discussion was created.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<string>}    Promise resolved with the path.
+     * @param forumId Forum ID.
+     * @param timeCreated The time the discussion was created.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the path.
      */
     getNewDiscussionFolder(forumId: number, timeCreated: number, siteId?: string): Promise<string> {
         return this.getForumFolder(forumId, siteId).then((folderPath) => {
@@ -430,11 +430,11 @@ export class AddonModForumOfflineProvider {
     /**
      * Get the path to the folder where to store files for a new offline reply.
      *
-     * @param  {number} forumId  Forum ID.
-     * @param  {number} postId   ID of the post being replied.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @param  {number} [userId] User the replies belong to. If not defined, current user in site.
-     * @return {Promise<string>} Promise resolved with the path.
+     * @param forumId Forum ID.
+     * @param postId ID of the post being replied.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the replies belong to. If not defined, current user in site.
+     * @return Promise resolved with the path.
      */
     getReplyFolder(forumId: number, postId: number, siteId?: string, userId?: number): Promise<string> {
         return this.getForumFolder(forumId, siteId).then((folderPath) => {
@@ -449,8 +449,8 @@ export class AddonModForumOfflineProvider {
     /**
      * Parse "options" column of fetched records.
      *
-     * @param  {any[]} records List of records.
-     * @return {any[]}         List of records with options parsed.
+     * @param records List of records.
+     * @return List of records with options parsed.
      */
     protected parseRecordOptions(records: any[]): any[] {
         records.forEach((record) => {
diff --git a/src/addon/mod/forum/providers/post-link-handler.ts b/src/addon/mod/forum/providers/post-link-handler.ts
index 73d691dc1..9dba78fb0 100644
--- a/src/addon/mod/forum/providers/post-link-handler.ts
+++ b/src/addon/mod/forum/providers/post-link-handler.ts
@@ -37,11 +37,11 @@ export class AddonModForumPostLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -72,11 +72,11 @@ export class AddonModForumPostLinkHandler extends CoreContentLinksHandlerBase {
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return typeof params.forum != 'undefined';
diff --git a/src/addon/mod/forum/providers/prefetch-handler.ts b/src/addon/mod/forum/providers/prefetch-handler.ts
index e698a4977..78ddd67d3 100644
--- a/src/addon/mod/forum/providers/prefetch-handler.ts
+++ b/src/addon/mod/forum/providers/prefetch-handler.ts
@@ -54,10 +54,10 @@ export class AddonModForumPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Get list of files. If not defined, we'll assume they're in module.contents.
      *
-     * @param {any} module Module.
-     * @param {Number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @return {Promise<any[]>} Promise resolved with the list of files.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @return Promise resolved with the list of files.
      */
     getFiles(module: any, courseId: number, single?: boolean): Promise<any[]> {
         return this.forumProvider.getForum(courseId, module.id).then((forum) => {
@@ -77,8 +77,8 @@ export class AddonModForumPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Given a list of forum posts, return a list with all the files (attachments and embedded files).
      *
-     * @param {any[]} posts Forum posts.
-     * @return {any[]} Files.
+     * @param posts Forum posts.
+     * @return Files.
      */
     protected getPostsFiles(posts: any[]): any[] {
         let files = [];
@@ -101,8 +101,8 @@ export class AddonModForumPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Get the posts to be prefetched.
      *
-     * @param {any} forum Forum instance.
-     * @return {Promise<any[]>} Promise resolved with array of posts.
+     * @param forum Forum instance.
+     * @return Promise resolved with array of posts.
      */
     protected getPostsForPrefetch(forum: any): Promise<any[]> {
         const promises = this.forumProvider.getAvailableSortOrders().map((sortOrder) => {
@@ -145,9 +145,9 @@ export class AddonModForumPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId The course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId The course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         return this.forumProvider.invalidateContent(moduleId, courseId);
@@ -157,9 +157,9 @@ export class AddonModForumPrefetchHandler extends CoreCourseActivityPrefetchHand
      * Invalidate WS calls needed to determine module status (usually, to check if module is downloadable).
      * It doesn't need to invalidate check updates. It should NOT invalidate files nor all the prefetched data.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when invalidated.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when invalidated.
      */
     invalidateModule(module: any, courseId: number): Promise<any> {
         // Invalidate forum data to recalculate unread message count badge.
@@ -174,11 +174,11 @@ export class AddonModForumPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Prefetch a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
      */
     prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string): Promise<any> {
         return this.prefetchPackage(module, courseId, single, this.prefetchForum.bind(this));
@@ -187,11 +187,11 @@ export class AddonModForumPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Prefetch a forum.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} single True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} siteId Site ID.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
      */
     protected prefetchForum(module: any, courseId: number, single: boolean, siteId: string): Promise<any> {
         // Get the forum data.
@@ -239,10 +239,10 @@ export class AddonModForumPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Prefetch groups info for a forum.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseI Course ID the module belongs to.
-     * @param {boolean} canCreateDiscussions Whether the user can create discussions in the forum.
-     * @return {Promise<any>} Promise resolved when group data has been prefetched.
+     * @param module The module object returned by WS.
+     * @param courseI Course ID the module belongs to.
+     * @param canCreateDiscussions Whether the user can create discussions in the forum.
+     * @return Promise resolved when group data has been prefetched.
      */
     protected prefetchGroupsInfo(forum: any, courseId: number, canCreateDiscussions: boolean): any {
         // Check group mode.
@@ -299,10 +299,10 @@ export class AddonModForumPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Sync a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     sync(module: any, courseId: number, siteId?: any): Promise<any> {
         const promises = [];
diff --git a/src/addon/mod/forum/providers/push-click-handler.ts b/src/addon/mod/forum/providers/push-click-handler.ts
index 01cff72f8..6c9bdced2 100644
--- a/src/addon/mod/forum/providers/push-click-handler.ts
+++ b/src/addon/mod/forum/providers/push-click-handler.ts
@@ -34,8 +34,8 @@ export class AddonModForumPushClickHandler implements CorePushNotificationsClick
     /**
      * Check if a notification click is handled by this handler.
      *
-     * @param {any} notification The notification to check.
-     * @return {boolean} Whether the notification click is handled by this handler
+     * @param notification The notification to check.
+     * @return Whether the notification click is handled by this handler
      */
     handles(notification: any): boolean | Promise<boolean> {
         return this.utils.isTrueOrOne(notification.notif) && notification.moodlecomponent == 'mod_forum' &&
@@ -45,8 +45,8 @@ export class AddonModForumPushClickHandler implements CorePushNotificationsClick
     /**
      * Handle the notification click.
      *
-     * @param {any} notification The notification to check.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param notification The notification to check.
+     * @return Promise resolved when done.
      */
     handleClick(notification: any): Promise<any> {
         const contextUrlParams = this.urlUtils.extractUrlParams(notification.contexturl),
diff --git a/src/addon/mod/forum/providers/sync-cron-handler.ts b/src/addon/mod/forum/providers/sync-cron-handler.ts
index 53a2406e7..65a9bc73c 100644
--- a/src/addon/mod/forum/providers/sync-cron-handler.ts
+++ b/src/addon/mod/forum/providers/sync-cron-handler.ts
@@ -29,9 +29,9 @@ export class AddonModForumSyncCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         return this.forumSync.syncAllForums(siteId, force);
@@ -40,7 +40,7 @@ export class AddonModForumSyncCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return this.forumSync.syncInterval;
diff --git a/src/addon/mod/forum/providers/sync.ts b/src/addon/mod/forum/providers/sync.ts
index fcfbc2743..65441da66 100644
--- a/src/addon/mod/forum/providers/sync.ts
+++ b/src/addon/mod/forum/providers/sync.ts
@@ -70,9 +70,9 @@ export class AddonModForumSyncProvider extends CoreSyncBaseProvider {
     /**
      * Try to synchronize all the forums in a certain site or in all sites.
      *
-     * @param  {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @return {Promise<any>}    Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     syncAllForums(siteId?: string, force?: boolean): Promise<any> {
         return this.syncOnSites('all forums', this.syncAllForumsFunc.bind(this), [force], siteId);
@@ -81,9 +81,9 @@ export class AddonModForumSyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync all forums on a site.
      *
-     * @param  {string} siteId Site ID to sync.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @return {Promise<any>}          Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     protected syncAllForumsFunc(siteId: string, force?: boolean): Promise<any> {
         const sitePromises = [];
@@ -153,10 +153,10 @@ export class AddonModForumSyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync a forum only if a certain time has passed since the last time.
      *
-     * @param  {number} forumId  Forum ID.
-     * @param  {number} userId   User the discussion belong to.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when the forum is synced or if it doesn't need to be synced.
+     * @param forumId Forum ID.
+     * @param userId User the discussion belong to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the forum is synced or if it doesn't need to be synced.
      */
     syncForumDiscussionsIfNeeded(forumId: number, userId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -173,10 +173,10 @@ export class AddonModForumSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize all offline discussions of a forum.
      *
-     * @param  {number} forumId  Forum ID to be synced.
-     * @param  {number} [userId] User the discussions belong to.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved if sync is successful, rejected otherwise.
+     * @param forumId Forum ID to be synced.
+     * @param userId User the discussions belong to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     syncForumDiscussions(forumId: number, userId?: number, siteId?: string): Promise<any> {
         userId = userId || this.sitesProvider.getCurrentSiteUserId();
@@ -307,11 +307,11 @@ export class AddonModForumSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize forum offline ratings.
      *
-     * @param {number} [cmId] Course module to be synced. If not defined, sync all forums.
-     * @param {number} [discussionId] Discussion id to be synced. If not defined, sync all discussions.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected otherwise.
+     * @param cmId Course module to be synced. If not defined, sync all forums.
+     * @param discussionId Discussion id to be synced. If not defined, sync all discussions.
+     * @param force Wether to force sync not depending on last execution.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     syncRatings(cmId?: number, discussionId?: number, force?: boolean, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -352,10 +352,10 @@ export class AddonModForumSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize all offline discussion replies of a forum.
      *
-     * @param  {number} forumId  Forum ID to be synced.
-     * @param  {number} [userId] User the discussions belong to.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved if sync is successful, rejected otherwise.
+     * @param forumId Forum ID to be synced.
+     * @param userId User the discussions belong to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     syncForumReplies(forumId: number, userId?: number, siteId?: string): Promise<any> {
         // Get offline forum replies to be sent.
@@ -393,10 +393,10 @@ export class AddonModForumSyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync a forum discussion replies only if a certain time has passed since the last time.
      *
-     * @param  {number} discussionId Discussion ID to be synced.
-     * @param  {number} [userId]     User the posts belong to.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the forum discussion is synced or if it doesn't need to be synced.
+     * @param discussionId Discussion ID to be synced.
+     * @param userId User the posts belong to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the forum discussion is synced or if it doesn't need to be synced.
      */
     syncDiscussionRepliesIfNeeded(discussionId: number, userId?: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -413,10 +413,10 @@ export class AddonModForumSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize all offline replies from a discussion.
      *
-     * @param  {number} discussionId Discussion ID to be synced.
-     * @param  {number} [userId]     User the posts belong to.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved if sync is successful, rejected otherwise.
+     * @param discussionId Discussion ID to be synced.
+     * @param userId User the posts belong to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     syncDiscussionReplies(discussionId: number, userId?: number, siteId?: string): Promise<any> {
         userId = userId || this.sitesProvider.getCurrentSiteUserId();
@@ -523,11 +523,11 @@ export class AddonModForumSyncProvider extends CoreSyncBaseProvider {
     /**
      * Delete a new discussion.
      *
-     * @param  {number} forumId     Forum ID the discussion belongs to.
-     * @param  {number} timecreated The timecreated of the discussion.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @param  {number} [userId]    User the discussion belongs to. If not defined, current user in site.
-     * @return {Promise<any>}       Promise resolved when deleted.
+     * @param forumId Forum ID the discussion belongs to.
+     * @param timecreated The timecreated of the discussion.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the discussion belongs to. If not defined, current user in site.
+     * @return Promise resolved when deleted.
      */
     protected deleteNewDiscussion(forumId: number, timecreated: number, siteId?: string, userId?: number): Promise<any> {
         const promises = [];
@@ -543,11 +543,11 @@ export class AddonModForumSyncProvider extends CoreSyncBaseProvider {
     /**
      * Delete a new discussion.
      *
-     * @param  {number} forumId  Forum ID the discussion belongs to.
-     * @param  {number} postId   ID of the post being replied.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @param  {number} [userId] User the discussion belongs to. If not defined, current user in site.
-     * @return {Promise<any>}    Promise resolved when deleted.
+     * @param forumId Forum ID the discussion belongs to.
+     * @param postId ID of the post being replied.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the discussion belongs to. If not defined, current user in site.
+     * @return Promise resolved when deleted.
      */
     protected deleteReply(forumId: number, postId: number, siteId?: string, userId?: number): Promise<any> {
         const promises = [];
@@ -563,12 +563,12 @@ export class AddonModForumSyncProvider extends CoreSyncBaseProvider {
     /**
      * Upload attachments of an offline post/discussion.
      *
-     * @param  {number}  forumId  Forum ID the post belongs to.
-     * @param  {any}     post     Offline post or discussion.
-     * @param  {boolean} isDisc   True if it's a new discussion, false if it's a reply.
-     * @param  {string}  [siteId] Site ID. If not defined, current site.
-     * @param  {number}  [userId] User the reply belongs to. If not defined, current user in site.
-     * @return {Promise<any>}     Promise resolved with draftid if uploaded, resolved with undefined if nothing to upload.
+     * @param forumId Forum ID the post belongs to.
+     * @param post Offline post or discussion.
+     * @param isDisc True if it's a new discussion, false if it's a reply.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the reply belongs to. If not defined, current user in site.
+     * @return Promise resolved with draftid if uploaded, resolved with undefined if nothing to upload.
      */
     protected uploadAttachments(forumId: number, post: any, isDisc: boolean, siteId?: string, userId?: number): Promise<any> {
         const attachments = post && post.options && post.options.attachmentsid;
@@ -607,9 +607,9 @@ export class AddonModForumSyncProvider extends CoreSyncBaseProvider {
     /**
      * Get the ID of a forum sync.
      *
-     * @param  {number} forumId  Forum ID.
-     * @param  {number} [userId] User the responses belong to.. If not defined, current user.
-     * @return {string}          Sync ID.
+     * @param forumId Forum ID.
+     * @param userId User the responses belong to.. If not defined, current user.
+     * @return Sync ID.
      */
     getForumSyncId(forumId: number, userId?: number): string {
         userId = userId || this.sitesProvider.getCurrentSiteUserId();
@@ -620,9 +620,9 @@ export class AddonModForumSyncProvider extends CoreSyncBaseProvider {
     /**
      * Get the ID of a discussion sync.
      *
-     * @param  {number} discussionId Discussion ID.
-     * @param  {number} [userId]     User the responses belong to.. If not defined, current user.
-     * @return {string}              Sync ID.
+     * @param discussionId Discussion ID.
+     * @param userId User the responses belong to.. If not defined, current user.
+     * @return Sync ID.
      */
     getDiscussionSyncId(discussionId: number, userId?: number): string {
         userId = userId || this.sitesProvider.getCurrentSiteUserId();
diff --git a/src/addon/mod/forum/providers/tag-area-handler.ts b/src/addon/mod/forum/providers/tag-area-handler.ts
index 02505b31c..528cc8236 100644
--- a/src/addon/mod/forum/providers/tag-area-handler.ts
+++ b/src/addon/mod/forum/providers/tag-area-handler.ts
@@ -29,7 +29,7 @@ export class AddonModForumTagAreaHandler implements CoreTagAreaHandler {
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -38,8 +38,8 @@ export class AddonModForumTagAreaHandler implements CoreTagAreaHandler {
     /**
      * Parses the rendered content of a tag index and returns the items.
      *
-     * @param {string} content Rendered content.
-     * @return {any[]|Promise<any[]>} Area items (or promise resolved with the items).
+     * @param content Rendered content.
+     * @return Area items (or promise resolved with the items).
      */
     parseContent(content: string): any[] | Promise<any[]> {
         return this.tagHelper.parseFeedContent(content);
@@ -48,8 +48,8 @@ export class AddonModForumTagAreaHandler implements CoreTagAreaHandler {
     /**
      * Get the component to use to display items.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return CoreTagFeedComponent;
diff --git a/src/addon/mod/glossary/components/index/index.ts b/src/addon/mod/glossary/components/index/index.ts
index ed3d807e9..7572f19b6 100644
--- a/src/addon/mod/glossary/components/index/index.ts
+++ b/src/addon/mod/glossary/components/index/index.ts
@@ -120,10 +120,10 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Download the component contents.
      *
-     * @param  {boolean} [refresh=false]    Whether we're refreshing data.
-     * @param  {boolean} [sync=false]       If the refresh needs syncing.
-     * @param  {boolean} [showErrors=false] Wether to show errors to the user or hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Whether we're refreshing data.
+     * @param sync If the refresh needs syncing.
+     * @param showErrors Wether to show errors to the user or hide them.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<any> {
         return this.glossaryProvider.getGlossary(this.courseId, this.module.id).then((glossary) => {
@@ -167,8 +167,8 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Convenience function to fetch entries.
      *
-     * @param {boolean} [append=false] True if fetched entries are appended to exsiting ones.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param append True if fetched entries are appended to exsiting ones.
+     * @return Promise resolved when done.
      */
     protected fetchEntries(append: boolean = false): Promise<any> {
         this.loadMoreError = false;
@@ -196,7 +196,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         const promises = [];
@@ -217,7 +217,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Performs the sync of the activity.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected sync(): Promise<boolean> {
         return this.prefetchHandler.sync(this.module, this.courseId);
@@ -226,8 +226,8 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Checks if sync has succeed from result sync data.
      *
-     * @param  {any} result Data returned on the sync function.
-     * @return {boolean} Whether it succeed or not.
+     * @param result Data returned on the sync function.
+     * @return Whether it succeed or not.
      */
     protected hasSyncSucceed(result: any): boolean {
         return result.updated;
@@ -236,8 +236,8 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Compares sync event data with current data to check if refresh content is needed.
      *
-     * @param  {any} syncEventData Data receiven on sync observer.
-     * @return {boolean} True if refresh is needed, false otherwise.
+     * @param syncEventData Data receiven on sync observer.
+     * @return True if refresh is needed, false otherwise.
      */
     protected isRefreshSyncNeeded(syncEventData: any): boolean {
         return this.glossary && syncEventData.glossaryId == this.glossary.id &&
@@ -247,7 +247,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Change fetch mode.
      *
-     * @param {FetchMode} mode New mode.
+     * @param mode New mode.
      */
     protected switchMode(mode: FetchMode): void {
         this.fetchMode = mode;
@@ -321,8 +321,8 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Convenience function to load more forum discussions.
      *
-     * @param {any} [infiniteComplete] Infinite scroll complete function. Only used from core-infinite-loading.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
+     * @return Promise resolved when done.
      */
     loadMoreEntries(infiniteComplete?: any): Promise<any> {
         return this.fetchEntries(true).catch((error) => {
@@ -336,7 +336,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Show the mode picker menu.
      *
-     * @param {MouseEvent} event Event.
+     * @param event Event.
      */
     openModePicker(event: MouseEvent): void {
         const popover = this.popoverCtrl.create(AddonModGlossaryModePickerPopoverComponent, {
@@ -371,7 +371,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Opens an entry.
      *
-     * @param {number} entryId Entry id.
+     * @param entryId Entry id.
      */
     openEntry(entryId: number): void {
         const params = {
@@ -385,7 +385,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Opens new entry editor.
      *
-     * @param {any} [entry] Offline entry to edit.
+     * @param entry Offline entry to edit.
      */
     openNewEntry(entry?: any): void {
         const params = {
@@ -401,7 +401,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Search entries.
      *
-     * @param {string} query Text entered on the search box.
+     * @param query Text entered on the search box.
      */
     search(query: string): void {
         this.loadingMessage = this.translate.instant('core.searching');
@@ -413,7 +413,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Function called when we receive an event of new entry.
      *
-     * @param {any} data Event data.
+     * @param data Event data.
      */
     protected eventReceived(data: any): void {
         if (this.glossary && this.glossary.id === data.glossaryId) {
diff --git a/src/addon/mod/glossary/components/mode-picker/mode-picker.ts b/src/addon/mod/glossary/components/mode-picker/mode-picker.ts
index 1881670c4..d8a22f237 100644
--- a/src/addon/mod/glossary/components/mode-picker/mode-picker.ts
+++ b/src/addon/mod/glossary/components/mode-picker/mode-picker.ts
@@ -57,9 +57,9 @@ export class AddonModGlossaryModePickerPopoverComponent {
     /**
      * Function called when a mode is clicked.
      *
-     * @param {Event} event Click event.
-     * @param {string} key Clicked mode key.
-     * @return {boolean} Return true if success, false if error.
+     * @param event Click event.
+     * @param key Clicked mode key.
+     * @return Return true if success, false if error.
      */
     modePicked(event: Event, key: string): boolean {
         this.viewCtrl.dismiss(key);
diff --git a/src/addon/mod/glossary/pages/edit/edit.ts b/src/addon/mod/glossary/pages/edit/edit.ts
index 837b0e760..d61f40e96 100644
--- a/src/addon/mod/glossary/pages/edit/edit.ts
+++ b/src/addon/mod/glossary/pages/edit/edit.ts
@@ -129,7 +129,7 @@ export class AddonModGlossaryEditPage implements OnInit {
     /**
      * Definition changed.
      *
-     * @param {string} text The new text.
+     * @param text The new text.
      */
     onDefinitionChange(text: string): void {
         this.entry.definition = text;
@@ -138,7 +138,7 @@ export class AddonModGlossaryEditPage implements OnInit {
     /**
      * Check if we can leave the page or not.
      *
-     * @return {boolean|Promise<void>} Resolved if we can leave it, rejected if not.
+     * @return Resolved if we can leave it, rejected if not.
      */
     ionViewCanLeave(): boolean | Promise<void> {
         let promise: any;
diff --git a/src/addon/mod/glossary/pages/entry/entry.ts b/src/addon/mod/glossary/pages/entry/entry.ts
index a5b38641d..238185d53 100644
--- a/src/addon/mod/glossary/pages/entry/entry.ts
+++ b/src/addon/mod/glossary/pages/entry/entry.ts
@@ -66,8 +66,8 @@ export class AddonModGlossaryEntryPage {
     /**
      * Refresh the data.
      *
-     * @param {any} [refresher] Refresher.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @return Promise resolved when done.
      */
      doRefresh(refresher?: any): Promise<any> {
         return this.glossaryProvider.invalidateEntry(this.entry.id).catch(() => {
@@ -82,8 +82,8 @@ export class AddonModGlossaryEntryPage {
     /**
      * Convenience function to get the glossary entry.
      *
-     * @param {boolean} [refresh] Whether we're refreshing data.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Whether we're refreshing data.
+     * @return Promise resolved when done.
      */
     protected fetchEntry(refresh?: boolean): Promise<any> {
         return this.glossaryProvider.getEntry(this.entryId).then((result) => {
diff --git a/src/addon/mod/glossary/pages/index/index.ts b/src/addon/mod/glossary/pages/index/index.ts
index a812235fe..f653663ba 100644
--- a/src/addon/mod/glossary/pages/index/index.ts
+++ b/src/addon/mod/glossary/pages/index/index.ts
@@ -40,7 +40,7 @@ export class AddonModGlossaryIndexPage {
     /**
      * Update some data based on the glossary instance.
      *
-     * @param {any} glossary Glossary instance.
+     * @param glossary Glossary instance.
      */
     updateData(glossary: any): void {
         this.title = glossary.name || this.title;
diff --git a/src/addon/mod/glossary/providers/edit-link-handler.ts b/src/addon/mod/glossary/providers/edit-link-handler.ts
index c86557aee..78da8a40d 100644
--- a/src/addon/mod/glossary/providers/edit-link-handler.ts
+++ b/src/addon/mod/glossary/providers/edit-link-handler.ts
@@ -39,11 +39,11 @@ export class AddonModGlossaryEditLinkHandler extends CoreContentLinksHandlerBase
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -76,11 +76,11 @@ export class AddonModGlossaryEditLinkHandler extends CoreContentLinksHandlerBase
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return typeof params.cmid != 'undefined';
diff --git a/src/addon/mod/glossary/providers/entry-link-handler.ts b/src/addon/mod/glossary/providers/entry-link-handler.ts
index 99acce7b7..9ae7f72b4 100644
--- a/src/addon/mod/glossary/providers/entry-link-handler.ts
+++ b/src/addon/mod/glossary/providers/entry-link-handler.ts
@@ -40,11 +40,11 @@ export class AddonModGlossaryEntryLinkHandler extends CoreContentLinksHandlerBas
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
diff --git a/src/addon/mod/glossary/providers/glossary.ts b/src/addon/mod/glossary/providers/glossary.ts
index cd494187f..b31e09900 100644
--- a/src/addon/mod/glossary/providers/glossary.ts
+++ b/src/addon/mod/glossary/providers/glossary.ts
@@ -81,8 +81,8 @@ export class AddonModGlossaryProvider {
     /**
      * Get the course glossary cache key.
      *
-     * @param  {number} courseId Course Id.
-     * @return {string}          Cache key.
+     * @param courseId Course Id.
+     * @return Cache key.
      */
     protected getCourseGlossariesCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'courseGlossaries:' + courseId;
@@ -91,9 +91,9 @@ export class AddonModGlossaryProvider {
     /**
      * Get all the glossaries in a course.
      *
-     * @param  {number} courseId Course Id.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>}  Resolved with the glossaries.
+     * @param courseId Course Id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved with the glossaries.
      */
     getCourseGlossaries(courseId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -114,9 +114,9 @@ export class AddonModGlossaryProvider {
     /**
      * Invalidate all glossaries in a course.
      *
-     * @param  {number} courseId Course Id.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>}  Resolved when data is invalidated.
+     * @param courseId Course Id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when data is invalidated.
      */
     invalidateCourseGlossaries(courseId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -129,11 +129,11 @@ export class AddonModGlossaryProvider {
     /**
      * Get the entries by author cache key.
      *
-     * @param  {number} glossaryId Glossary Id.
-     * @param  {string} letter     First letter of firstname or lastname, or either keywords: ALL or SPECIAL.
-     * @param  {string} field      Search and order using: FIRSTNAME or LASTNAME
-     * @param  {string} sort       The direction of the order: ASC or DESC
-     * @return {string}            Cache key.
+     * @param glossaryId Glossary Id.
+     * @param letter First letter of firstname or lastname, or either keywords: ALL or SPECIAL.
+     * @param field Search and order using: FIRSTNAME or LASTNAME
+     * @param sort The direction of the order: ASC or DESC
+     * @return Cache key.
      */
     protected getEntriesByAuthorCacheKey(glossaryId: number, letter: string, field: string, sort: string): string {
         return this.ROOT_CACHE_KEY + 'entriesByAuthor:' + glossaryId + ':' + letter + ':' + field + ':' + sort;
@@ -142,16 +142,16 @@ export class AddonModGlossaryProvider {
     /**
      * Get entries by author.
      *
-     * @param  {number}  glossaryId Glossary Id.
-     * @param  {string}  letter     First letter of firstname or lastname, or either keywords: ALL or SPECIAL.
-     * @param  {string}  field      Search and order using: FIRSTNAME or LASTNAME
-     * @param  {string}  sort       The direction of the order: ASC or DESC
-     * @param  {number}  from       Start returning records from here.
-     * @param  {number}  limit      Number of records to return.
-     * @param  {boolean} omitExpires True to always get the value from cache. If data isn't cached, it will call the WS.
-     * @param  {boolean} forceOffline True to always get the value from cache. If data isn't cached, it won't call the WS.
-     * @param  {string}  [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any[]>}     Resolved with the entries.
+     * @param glossaryId Glossary Id.
+     * @param letter First letter of firstname or lastname, or either keywords: ALL or SPECIAL.
+     * @param field Search and order using: FIRSTNAME or LASTNAME
+     * @param sort The direction of the order: ASC or DESC
+     * @param from Start returning records from here.
+     * @param limit Number of records to return.
+     * @param omitExpires True to always get the value from cache. If data isn't cached, it will call the WS.
+     * @param forceOffline True to always get the value from cache. If data isn't cached, it won't call the WS.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved with the entries.
      */
     getEntriesByAuthor(glossaryId: number, letter: string, field: string, sort: string, from: number, limit: number,
             omitExpires: boolean, forceOffline: boolean, siteId?: string): Promise<any[]> {
@@ -178,12 +178,12 @@ export class AddonModGlossaryProvider {
     /**
      * Invalidate cache of entries by author.
      *
-     * @param  {number} glossaryId Glossary Id.
-     * @param  {string} letter     First letter of firstname or lastname, or either keywords: ALL or SPECIAL.
-     * @param  {string} field      Search and order using: FIRSTNAME or LASTNAME
-     * @param  {string} sort       The direction of the order: ASC or DESC
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Resolved when data is invalidated.
+     * @param glossaryId Glossary Id.
+     * @param letter First letter of firstname or lastname, or either keywords: ALL or SPECIAL.
+     * @param field Search and order using: FIRSTNAME or LASTNAME
+     * @param sort The direction of the order: ASC or DESC
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when data is invalidated.
      */
     invalidateEntriesByAuthor(glossaryId: number, letter: string, field: string, sort: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -196,15 +196,15 @@ export class AddonModGlossaryProvider {
     /**
      * Get entries by category.
      *
-     * @param  {number} glossaryId  Glossary Id.
-     * @param  {string} categoryId  The category ID. Use constant SHOW_ALL_CATEGORIES for all categories, or
-     *                              constant SHOW_NOT_CATEGORISED for uncategorised entries.
-     * @param  {number} from        Start returning records from here.
-     * @param  {number} limit       Number of records to return.
-     * @param  {boolean} omitExpires True to always get the value from cache. If data isn't cached, it will call the WS.
-     * @param  {boolean} forceOffline True to always get the value from cache. If data isn't cached, it won't call the WS.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any[]>}     Resolved with the entries.
+     * @param glossaryId Glossary Id.
+     * @param categoryId The category ID. Use constant SHOW_ALL_CATEGORIES for all categories, or
+     *                   constant SHOW_NOT_CATEGORISED for uncategorised entries.
+     * @param from Start returning records from here.
+     * @param limit Number of records to return.
+     * @param omitExpires True to always get the value from cache. If data isn't cached, it will call the WS.
+     * @param forceOffline True to always get the value from cache. If data isn't cached, it won't call the WS.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved with the entries.
      */
     getEntriesByCategory(glossaryId: number, categoryId: number, from: number, limit: number, omitExpires: boolean,
             forceOffline: boolean, siteId?: string): Promise<any[]> {
@@ -230,11 +230,11 @@ export class AddonModGlossaryProvider {
     /**
      * Invalidate cache of entries by category.
      *
-     * @param  {number} glossaryId Glossary Id.
-     * @param  {string} categoryId The category ID. Use constant SHOW_ALL_CATEGORIES for all categories, or
-     *                             constant SHOW_NOT_CATEGORISED for uncategorised entries.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Resolved when data is invalidated.
+     * @param glossaryId Glossary Id.
+     * @param categoryId The category ID. Use constant SHOW_ALL_CATEGORIES for all categories, or
+     *                   constant SHOW_NOT_CATEGORISED for uncategorised entries.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when data is invalidated.
      */
     invalidateEntriesByCategory(glossaryId: number, categoryId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -247,10 +247,10 @@ export class AddonModGlossaryProvider {
     /**
      * Get the entries by category cache key.
      *
-     * @param  {number} glossaryId Glossary Id.
-     * @param  {string} categoryId The category ID. Use constant SHOW_ALL_CATEGORIES for all categories, or
-     *                             constant SHOW_NOT_CATEGORISED for uncategorised entries.
-     * @return {string}            Cache key.
+     * @param glossaryId Glossary Id.
+     * @param categoryId The category ID. Use constant SHOW_ALL_CATEGORIES for all categories, or
+     *                   constant SHOW_NOT_CATEGORISED for uncategorised entries.
+     * @return Cache key.
      */
     getEntriesByCategoryCacheKey(glossaryId: number, categoryId: number): string {
         return this.ROOT_CACHE_KEY + 'entriesByCategory:' + glossaryId + ':' + categoryId;
@@ -259,10 +259,10 @@ export class AddonModGlossaryProvider {
     /**
      * Get the entries by date cache key.
      *
-     * @param  {number} glossaryId Glossary Id.
-     * @param  {string} order      The way to order the records.
-     * @param  {string} sort       The direction of the order.
-     * @return {string}            Cache key.
+     * @param glossaryId Glossary Id.
+     * @param order The way to order the records.
+     * @param sort The direction of the order.
+     * @return Cache key.
      */
     getEntriesByDateCacheKey(glossaryId: number, order: string, sort: string): string {
         return this.ROOT_CACHE_KEY + 'entriesByDate:' + glossaryId + ':' + order + ':' + sort;
@@ -271,15 +271,15 @@ export class AddonModGlossaryProvider {
     /**
      * Get entries by date.
      *
-     * @param  {number}  glossaryId Glossary Id.
-     * @param  {string}  order      The way to order the records.
-     * @param  {string}  sort       The direction of the order.
-     * @param  {number}  from       Start returning records from here.
-     * @param  {number}  limit      Number of records to return.
-     * @param  {boolean} omitExpires True to always get the value from cache. If data isn't cached, it will call the WS.
-     * @param  {boolean} forceOffline True to always get the value from cache. If data isn't cached, it won't call the WS.
-     * @param  {string}  [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any[]>}     Resolved with the entries.
+     * @param glossaryId Glossary Id.
+     * @param order The way to order the records.
+     * @param sort The direction of the order.
+     * @param from Start returning records from here.
+     * @param limit Number of records to return.
+     * @param omitExpires True to always get the value from cache. If data isn't cached, it will call the WS.
+     * @param forceOffline True to always get the value from cache. If data isn't cached, it won't call the WS.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved with the entries.
      */
     getEntriesByDate(glossaryId: number, order: string, sort: string, from: number, limit: number, omitExpires: boolean,
             forceOffline: boolean, siteId?: string): Promise<any[]> {
@@ -306,11 +306,11 @@ export class AddonModGlossaryProvider {
     /**
      * Invalidate cache of entries by date.
      *
-     * @param  {number} glossaryId Glossary Id.
-     * @param  {string} order      The way to order the records.
-     * @param  {string} sort       The direction of the order.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Resolved when data is invalidated.
+     * @param glossaryId Glossary Id.
+     * @param order The way to order the records.
+     * @param sort The direction of the order.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when data is invalidated.
      */
     invalidateEntriesByDate(glossaryId: number, order: string, sort: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -323,9 +323,9 @@ export class AddonModGlossaryProvider {
     /**
      * Get the entries by letter cache key.
      *
-     * @param  {number} glossaryId Glossary Id.
-     * @param  {string} letter     A letter, or a special keyword.
-     * @return {string}            Cache key.
+     * @param glossaryId Glossary Id.
+     * @param letter A letter, or a special keyword.
+     * @return Cache key.
      */
     protected getEntriesByLetterCacheKey(glossaryId: number, letter: string): string {
         return this.ROOT_CACHE_KEY + 'entriesByLetter:' + glossaryId + ':' + letter;
@@ -334,14 +334,14 @@ export class AddonModGlossaryProvider {
     /**
      * Get entries by letter.
      *
-     * @param  {number}  glossaryId Glossary Id.
-     * @param  {string}  letter     A letter, or a special keyword.
-     * @param  {number}  from       Start returning records from here.
-     * @param  {number}  limit      Number of records to return.
-     * @param  {boolean} omitExpires True to always get the value from cache. If data isn't cached, it will call the WS.
-     * @param  {boolean} forceOffline True to always get the value from cache. If data isn't cached, it won't call the WS.
-     * @param  {string}  [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}     Resolved with the entries.
+     * @param glossaryId Glossary Id.
+     * @param letter A letter, or a special keyword.
+     * @param from Start returning records from here.
+     * @param limit Number of records to return.
+     * @param omitExpires True to always get the value from cache. If data isn't cached, it will call the WS.
+     * @param forceOffline True to always get the value from cache. If data isn't cached, it won't call the WS.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved with the entries.
      */
     getEntriesByLetter(glossaryId: number, letter: string, from: number, limit: number, omitExpires: boolean, forceOffline: boolean,
             siteId?: string): Promise<any> {
@@ -377,10 +377,10 @@ export class AddonModGlossaryProvider {
     /**
      * Invalidate cache of entries by letter.
      *
-     * @param  {number} glossaryId Glossary Id.
-     * @param  {string} letter     A letter, or a special keyword.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Resolved when data is invalidated.
+     * @param glossaryId Glossary Id.
+     * @param letter A letter, or a special keyword.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when data is invalidated.
      */
     invalidateEntriesByLetter(glossaryId: number, letter: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -393,12 +393,12 @@ export class AddonModGlossaryProvider {
     /**
      * Get the entries by search cache key.
      *
-     * @param  {number}  glossaryId Glossary Id.
-     * @param  {string}  query      The search query.
-     * @param  {boolean} fullSearch Whether or not full search is required.
-     * @param  {string}  order      The way to order the results.
-     * @param  {string}  sort       The direction of the order.
-     * @return {string}             Cache key.
+     * @param glossaryId Glossary Id.
+     * @param query The search query.
+     * @param fullSearch Whether or not full search is required.
+     * @param order The way to order the results.
+     * @param sort The direction of the order.
+     * @return Cache key.
      */
     protected getEntriesBySearchCacheKey(glossaryId: number, query: string, fullSearch: boolean, order: string, sort: string):
             string {
@@ -408,17 +408,17 @@ export class AddonModGlossaryProvider {
     /**
      * Get entries by search.
      *
-     * @param  {number}  glossaryId Glossary Id.
-     * @param  {string}  query      The search query.
-     * @param  {boolean} fullSearch Whether or not full search is required.
-     * @param  {string}  order      The way to order the results.
-     * @param  {string}  sort       The direction of the order.
-     * @param  {number}  from       Start returning records from here.
-     * @param  {number}  limit      Number of records to return.
-     * @param  {boolean} omitExpires True to always get the value from cache. If data isn't cached, it will call the WS.
-     * @param  {boolean} forceOffline True to always get the value from cache. If data isn't cached, it won't call the WS.
-     * @param  {string}  [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any[]>}     Resolved with the entries.
+     * @param glossaryId Glossary Id.
+     * @param query The search query.
+     * @param fullSearch Whether or not full search is required.
+     * @param order The way to order the results.
+     * @param sort The direction of the order.
+     * @param from Start returning records from here.
+     * @param limit Number of records to return.
+     * @param omitExpires True to always get the value from cache. If data isn't cached, it will call the WS.
+     * @param forceOffline True to always get the value from cache. If data isn't cached, it won't call the WS.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved with the entries.
      */
     getEntriesBySearch(glossaryId: number, query: string, fullSearch: boolean, order: string, sort: string, from: number,
             limit: number, omitExpires: boolean, forceOffline: boolean, siteId?: string): Promise<any[]> {
@@ -446,13 +446,13 @@ export class AddonModGlossaryProvider {
     /**
      * Invalidate cache of entries by search.
      *
-     * @param  {number}  glossaryId Glossary Id.
-     * @param  {string}  query      The search query.
-     * @param  {boolean} fullSearch Whether or not full search is required.
-     * @param  {string}  order      The way to order the results.
-     * @param  {string}  sort       The direction of the order.
-     * @param  {string}  [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}       Resolved when data is invalidated.
+     * @param glossaryId Glossary Id.
+     * @param query The search query.
+     * @param fullSearch Whether or not full search is required.
+     * @param order The way to order the results.
+     * @param sort The direction of the order.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when data is invalidated.
      */
     invalidateEntriesBySearch(glossaryId: number, query: string, fullSearch: boolean, order: string, sort: string, siteId?: string):
             Promise<any> {
@@ -466,8 +466,8 @@ export class AddonModGlossaryProvider {
     /**
      * Get the glossary categories cache key.
      *
-     * @param  {number} glossaryId Glossary Id.
-     * @return {string}            The cache key.
+     * @param glossaryId Glossary Id.
+     * @return The cache key.
      */
     protected getCategoriesCacheKey(glossaryId: number): string {
         return this.ROOT_CACHE_KEY + 'categories:' + glossaryId;
@@ -476,9 +476,9 @@ export class AddonModGlossaryProvider {
     /**
      * Get all the categories related to the glossary.
      *
-     * @param  {number} glossaryId Glossary Id.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any[]>}    Promise resolved with the categories if supported or empty array if not.
+     * @param glossaryId Glossary Id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the categories if supported or empty array if not.
      */
     getAllCategories(glossaryId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -489,12 +489,12 @@ export class AddonModGlossaryProvider {
     /**
      * Get the categories related to the glossary by sections. It's a recursive function see initial call values.
      *
-     * @param  {number} glossaryId Glossary Id.
-     * @param  {number} from       Number of categories already fetched, so fetch will be done from this number.  Initial value 0.
-     * @param  {number} limit      Number of categories to fetch. Initial value LIMIT_CATEGORIES.
-     * @param  {any[]}  categories Already fetched categories where to append the fetch. Initial value [].
-     * @param  {any}    site       Site object.
-     * @return {Promise<any[]>}    Promise resolved with the categories.
+     * @param glossaryId Glossary Id.
+     * @param from Number of categories already fetched, so fetch will be done from this number.  Initial value 0.
+     * @param limit Number of categories to fetch. Initial value LIMIT_CATEGORIES.
+     * @param categories Already fetched categories where to append the fetch. Initial value [].
+     * @param site Site object.
+     * @return Promise resolved with the categories.
      */
     protected getCategories(glossaryId: number, from: number, limit: number, categories: any[], site: CoreSite): Promise<any[]> {
         const params = {
@@ -523,9 +523,9 @@ export class AddonModGlossaryProvider {
     /**
      * Invalidate cache of categories by glossary id.
      *
-     * @param  {number} glossaryId Glossary Id.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved when categories data has been invalidated,
+     * @param glossaryId Glossary Id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when categories data has been invalidated,
      */
     invalidateCategories(glossaryId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -536,8 +536,8 @@ export class AddonModGlossaryProvider {
     /**
      * Get an entry by ID cache key.
      *
-     * @param  {number} entryId Entry Id.
-     * @return {string}         Cache key.
+     * @param entryId Entry Id.
+     * @return Cache key.
      */
     protected getEntryCacheKey(entryId: number): string {
         return this.ROOT_CACHE_KEY + 'getEntry:' + entryId;
@@ -546,9 +546,9 @@ export class AddonModGlossaryProvider {
     /**
      * Get one entry by ID.
      *
-     * @param  {number} entryId  Entry ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved with the entry.
+     * @param entryId Entry ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the entry.
      */
     getEntry(entryId: number, siteId?: string): Promise<{entry: any, ratinginfo: CoreRatingInfo, from?: number}> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -619,9 +619,9 @@ export class AddonModGlossaryProvider {
     /**
      * Get a glossary ID and the "from" of a given entry.
      *
-     * @param {number} entryId Entry ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number>} Promise resolved with the glossary ID and the "from".
+     * @param entryId Entry ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the glossary ID and the "from".
      */
     getStoredDataForEntry(entryId: number, siteId?: string): Promise<{glossaryId: number, from: number}> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -641,14 +641,14 @@ export class AddonModGlossaryProvider {
     /**
      * Performs the fetch of the entries using the propper function and arguments.
      *
-     * @param  {Function} fetchFunction      Function to fetch.
-     * @param  {any[]}    fetchArguments     Arguments to call the fetching.
-     * @param  {number}   [limitFrom=0]      Number of entries already fetched, so fetch will be done from this number.
-     * @param  {number}   [limitNum]         Number of records to return. Defaults to LIMIT_ENTRIES.
-     * @param  {boolean}  [omitExpires=false] True to always get the value from cache. If data isn't cached, it will call the WS.
-     * @param  {boolean}  [forceOffline=false] True to always get the value from cache. If data isn't cached, it won't call the WS.
-     * @param  {string}   [siteId]           Site ID. If not defined, current site.
-     * @return {Promise<any>}                Promise resolved with the response.
+     * @param fetchFunction Function to fetch.
+     * @param fetchArguments Arguments to call the fetching.
+     * @param limitFrom Number of entries already fetched, so fetch will be done from this number.
+     * @param limitNum Number of records to return. Defaults to LIMIT_ENTRIES.
+     * @param omitExpires True to always get the value from cache. If data isn't cached, it will call the WS.
+     * @param forceOffline True to always get the value from cache. If data isn't cached, it won't call the WS.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the response.
      */
     fetchEntries(fetchFunction: Function, fetchArguments: any[], limitFrom: number = 0, limitNum?: number,
             omitExpires: boolean = false, forceOffline: boolean = false, siteId?: string): Promise<any> {
@@ -668,12 +668,12 @@ export class AddonModGlossaryProvider {
     /**
      * Performs the whole fetch of the entries using the propper function and arguments.
      *
-     * @param  {Function} fetchFunction      Function to fetch.
-     * @param  {any[]}    fetchArguments     Arguments to call the fetching.
-     * @param  {boolean}  [omitExpires=false] True to always get the value from cache. If data isn't cached, it will call the WS.
-     * @param  {boolean}  [forceOffline=false] True to always get the value from cache. If data isn't cached, it won't call the WS.
-     * @param  {string}   [siteId]           Site ID. If not defined, current site.
-     * @return {Promise<any[]>}              Promise resolved with all entrries.
+     * @param fetchFunction Function to fetch.
+     * @param fetchArguments Arguments to call the fetching.
+     * @param omitExpires True to always get the value from cache. If data isn't cached, it will call the WS.
+     * @param forceOffline True to always get the value from cache. If data isn't cached, it won't call the WS.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with all entrries.
      */
     fetchAllEntries(fetchFunction: Function, fetchArguments: any[], omitExpires: boolean = false, forceOffline: boolean = false,
             siteId?: string): Promise<any[]> {
@@ -697,9 +697,9 @@ export class AddonModGlossaryProvider {
     /**
      * Invalidate cache of entry by ID.
      *
-     * @param  {number} entryId  Entry Id.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Resolved when data is invalidated.
+     * @param entryId Entry Id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when data is invalidated.
      */
     invalidateEntry(entryId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -710,9 +710,9 @@ export class AddonModGlossaryProvider {
     /**
      * Invalidate cache of all entries in the array.
      *
-     * @param  {any[]}  entries  Entry objects to invalidate.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Resolved when data is invalidated.
+     * @param entries Entry objects to invalidate.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when data is invalidated.
      */
     protected invalidateEntries(entries: any[], siteId?: string): Promise<any> {
         const keys = [];
@@ -729,9 +729,9 @@ export class AddonModGlossaryProvider {
      * Invalidate the prefetched content except files.
      * To invalidate files, use AddonModGlossary#invalidateFiles.
      *
-     * @param  {number} moduleId The module ID.
-     * @param  {number} courseId Course ID.
-     * @return {Promise<any>}    Promise resolved when data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID.
+     * @return Promise resolved when data is invalidated.
      */
      invalidateContent(moduleId: number, courseId: number): Promise<any> {
         return this.getGlossary(courseId, moduleId).then((glossary) => {
@@ -748,10 +748,10 @@ export class AddonModGlossaryProvider {
      * Invalidate the prefetched content for a given glossary, except files.
      * To invalidate files, use AddonModGlossaryProvider#invalidateFiles.
      *
-     * @param  {any}     glossary          The glossary object.
-     * @param  {boolean} [onlyEntriesList] If true, entries won't be invalidated.
-     * @param  {string}  [siteId]          Site ID. If not defined, current site.
-     * @return {Promise<any>}              Promise resolved when data is invalidated.
+     * @param glossary The glossary object.
+     * @param onlyEntriesList If true, entries won't be invalidated.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when data is invalidated.
      */
     invalidateGlossaryEntries(glossary: any, onlyEntriesList?: boolean, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -791,9 +791,9 @@ export class AddonModGlossaryProvider {
     /**
      * Invalidate the prefetched files.
      *
-     * @param  {number} moduleId The module ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when the files are invalidated.
+     * @param moduleId The module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the files are invalidated.
      */
     protected invalidateFiles(moduleId: number, siteId?: string): Promise<any> {
         return this.filepoolProvider.invalidateFilesByComponent(siteId, AddonModGlossaryProvider.COMPONENT, moduleId);
@@ -802,10 +802,10 @@ export class AddonModGlossaryProvider {
     /**
      * Get one glossary by cmid.
      *
-     * @param  {number} courseId Course Id.
-     * @param  {number} cmId     Course Module Id.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved with the glossary.
+     * @param courseId Course Id.
+     * @param cmId Course Module Id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the glossary.
      */
     getGlossary(courseId: number, cmId: number, siteId?: string): Promise<any> {
         return this.getCourseGlossaries(courseId, siteId).then((glossaries) => {
@@ -822,10 +822,10 @@ export class AddonModGlossaryProvider {
     /**
      * Get one glossary by glossary ID.
      *
-     * @param  {number} courseId   Course Id.
-     * @param  {number} glossaryId Glossary Id.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved with the glossary.
+     * @param courseId Course Id.
+     * @param glossaryId Glossary Id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the glossary.
      */
     getGlossaryById(courseId: number, glossaryId: number, siteId?: string): Promise<any> {
         return this.getCourseGlossaries(courseId, siteId).then((glossaries) => {
@@ -842,19 +842,19 @@ export class AddonModGlossaryProvider {
     /**
      * Create a new entry on a glossary
      *
-     * @param  {number}  glossaryId        Glossary ID.
-     * @param  {string}  concept           Glossary entry concept.
-     * @param  {string}  definition        Glossary entry concept definition.
-     * @param  {number}  courseId          Course ID of the glossary.
-     * @param  {any}     [options]         Array of options for the entry.
-     * @param  {any}     [attach]          Attachments ID if sending online, result of CoreFileUploaderProvider#storeFilesToUpload
-     *                                     otherwise.
-     * @param  {number}  [timeCreated]     The time the entry was created. If not defined, current time.
-     * @param  {string}  [siteId]          Site ID. If not defined, current site.
-     * @param  {any}     [discardEntry]    The entry provided will be discarded if found.
-     * @param  {boolean} [allowOffline]    True if it can be stored in offline, false otherwise.
-     * @param  {boolean} [checkDuplicates] Check for duplicates before storing offline. Only used if allowOffline is true.
-     * @return {Promise<number | false>}   Promise resolved with entry ID if entry was created in server, false if stored in device.
+     * @param glossaryId Glossary ID.
+     * @param concept Glossary entry concept.
+     * @param definition Glossary entry concept definition.
+     * @param courseId Course ID of the glossary.
+     * @param options Array of options for the entry.
+     * @param attach Attachments ID if sending online, result of CoreFileUploaderProvider#storeFilesToUpload
+     *               otherwise.
+     * @param timeCreated The time the entry was created. If not defined, current time.
+     * @param siteId Site ID. If not defined, current site.
+     * @param discardEntry The entry provided will be discarded if found.
+     * @param allowOffline True if it can be stored in offline, false otherwise.
+     * @param checkDuplicates Check for duplicates before storing offline. Only used if allowOffline is true.
+     * @return Promise resolved with entry ID if entry was created in server, false if stored in device.
      */
     addEntry(glossaryId: number, concept: string, definition: string, courseId: number, options: any, attach: any,
             timeCreated: number, siteId?: string, discardEntry?: any, allowOffline?: boolean, checkDuplicates?: boolean):
@@ -918,13 +918,13 @@ export class AddonModGlossaryProvider {
     /**
      * Create a new entry on a glossary. It does not cache calls. It will fail if offline or cannot connect.
      *
-     * @param  {number} glossaryId Glossary ID.
-     * @param  {string} concept    Glossary entry concept.
-     * @param  {string} definition Glossary entry concept definition.
-     * @param  {any}    [options]  Array of options for the entry.
-     * @param  {number} [attachId] Attachments ID (if any attachment).
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<number>}   Promise resolved with the entry ID if created, rejected otherwise.
+     * @param glossaryId Glossary ID.
+     * @param concept Glossary entry concept.
+     * @param definition Glossary entry concept definition.
+     * @param options Array of options for the entry.
+     * @param attachId Attachments ID (if any attachment).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the entry ID if created, rejected otherwise.
      */
     addEntryOnline(glossaryId: number, concept: string, definition: string, options?: any, attachId?: number, siteId?: string):
             Promise<number> {
@@ -962,11 +962,11 @@ export class AddonModGlossaryProvider {
     /**
      * Check if a entry concept is already used.
      *
-     * @param  {number} glossaryId    Glossary ID.
-     * @param  {string} concept       Concept to check.
-     * @param  {number} [timeCreated] Timecreated to check that is not the timecreated we are editing.
-     * @param  {string} [siteId]      Site ID. If not defined, current site.
-     * @return {Promise<boolean>}     Promise resolved with true if used, resolved with false if not used or error.
+     * @param glossaryId Glossary ID.
+     * @param concept Concept to check.
+     * @param timeCreated Timecreated to check that is not the timecreated we are editing.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if used, resolved with false if not used or error.
      */
     isConceptUsed(glossaryId: number, concept: string, timeCreated?: number, siteId?: string): Promise<boolean> {
         // Check offline first.
@@ -991,7 +991,7 @@ export class AddonModGlossaryProvider {
      * Return whether or not the plugin is enabled for editing in the current site. Plugin is enabled if the glossary WS are
      * available.
      *
-     * @return {boolean} Whether the glossary editing is available or not.
+     * @return Whether the glossary editing is available or not.
      */
     isPluginEnabledForEditing(): boolean {
         return  this.sitesProvider.getCurrentSite().wsAvailable('mod_glossary_add_entry');
@@ -1000,11 +1000,11 @@ export class AddonModGlossaryProvider {
     /**
      * Report a glossary as being viewed.
      *
-     * @param  {number} glossaryId Glossary ID.
-     * @param  {string} mode       The mode in which the glossary was viewed.
-     * @param {string} [name] Name of the glossary.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved when the WS call is successful.
+     * @param glossaryId Glossary ID.
+     * @param mode The mode in which the glossary was viewed.
+     * @param name Name of the glossary.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(glossaryId: number, mode: string, name?: string, siteId?: string): Promise<any> {
         const params = {
@@ -1019,11 +1019,11 @@ export class AddonModGlossaryProvider {
     /**
      * Report a glossary entry as being viewed.
      *
-     * @param  {number} entryId Entry ID.
-     * @param  {number} glossaryId Glossary ID.
-     * @param {string} [name] Name of the glossary.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}   Promise resolved when the WS call is successful.
+     * @param entryId Entry ID.
+     * @param glossaryId Glossary ID.
+     * @param name Name of the glossary.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logEntryView(entryId: number, glossaryId: number, name?: string, siteId?: string): Promise<any> {
         const params = {
@@ -1037,11 +1037,11 @@ export class AddonModGlossaryProvider {
     /**
      * Store several entries so we can determine their glossaryId in offline.
      *
-     * @param {number} glossaryId Glossary ID the entries belongs to.
-     * @param {any[]} entries Entries.
-     * @param {number} from The "page" the entries belong to.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param glossaryId Glossary ID the entries belongs to.
+     * @param entries Entries.
+     * @param from The "page" the entries belong to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     protected storeEntries(glossaryId: number, entries: any[], from: number, siteId?: string): Promise<any> {
         const promises = [];
@@ -1056,11 +1056,11 @@ export class AddonModGlossaryProvider {
     /**
      * Store an entry so we can determine its glossaryId in offline.
      *
-     * @param {number} glossaryId Glossary ID the entry belongs to.
-     * @param {number} entryId Entry ID.
-     * @param {number} from The "page" the entry belongs to.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param glossaryId Glossary ID the entry belongs to.
+     * @param entryId Entry ID.
+     * @param from The "page" the entry belongs to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     protected storeEntryId(glossaryId: number, entryId: number, from: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/addon/mod/glossary/providers/helper.ts b/src/addon/mod/glossary/providers/helper.ts
index 4ec569c47..4f9c86636 100644
--- a/src/addon/mod/glossary/providers/helper.ts
+++ b/src/addon/mod/glossary/providers/helper.ts
@@ -31,11 +31,11 @@ export class AddonModGlossaryHelperProvider {
     /**
      * Delete stored attachment files for a new entry.
      *
-     * @param  {number} glossaryId  Glossary ID.
-     * @param  {string} entryName   The name of the entry.
-     * @param  {number} timeCreated The time the entry was created.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}       Promise resolved when deleted.
+     * @param glossaryId Glossary ID.
+     * @param entryName The name of the entry.
+     * @param timeCreated The time the entry was created.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when deleted.
      */
     deleteStoredFiles(glossaryId: number, entryName: string, timeCreated: number, siteId?: string): Promise<any> {
         return this.glossaryOffline.getEntryFolder(glossaryId, entryName, timeCreated, siteId).then((folderPath) => {
@@ -48,11 +48,11 @@ export class AddonModGlossaryHelperProvider {
     /**
      * Get a list of stored attachment files for a new entry. See AddonModGlossaryHelperProvider#storeFiles.
      *
-     * @param  {number} glossaryId    lossary ID.
-     * @param  {string} entryName     The name of the entry.
-     * @param  {number} [timeCreated] The time the entry was created.
-     * @param  {string} [siteId]      Site ID. If not defined, current site.
-     * @return {Promise<any[]>}         Promise resolved with the files.
+     * @param glossaryId lossary ID.
+     * @param entryName The name of the entry.
+     * @param timeCreated The time the entry was created.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the files.
      */
     getStoredFiles(glossaryId: number, entryName: string, timeCreated: number, siteId?: string): Promise<any[]> {
         return this.glossaryOffline.getEntryFolder(glossaryId, entryName, timeCreated, siteId).then((folderPath) => {
@@ -63,10 +63,10 @@ export class AddonModGlossaryHelperProvider {
     /**
      * Check if the data of an entry has changed.
      *
-     * @param  {any}   entry    Current data.
-     * @param  {any[]} files    Files attached.
-     * @param  {any}   original Original content.
-     * @return {boolean}        True if data has changed, false otherwise.
+     * @param entry Current data.
+     * @param files Files attached.
+     * @param original Original content.
+     * @return True if data has changed, false otherwise.
      */
     hasEntryDataChanged(entry: any, files: any[], original: any): boolean {
         if (!original || typeof original.concept == 'undefined') {
@@ -85,12 +85,12 @@ export class AddonModGlossaryHelperProvider {
      * Given a list of files (either online files or local files), store the local files in a local folder
      * to be submitted later.
      *
-     * @param  {number} glossaryId    Glossary ID.
-     * @param  {string} entryName     The name of the entry.
-     * @param  {number} [timeCreated] The time the entry was created.
-     * @param  {any[]}  files         List of files.
-     * @param  {string} [siteId]      Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved if success, rejected otherwise.
+     * @param glossaryId Glossary ID.
+     * @param entryName The name of the entry.
+     * @param timeCreated The time the entry was created.
+     * @param files List of files.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success, rejected otherwise.
      */
     storeFiles(glossaryId: number, entryName: string, timeCreated: number, files: any[], siteId?: string): Promise<any> {
         // Get the folder where to store the files.
@@ -102,13 +102,13 @@ export class AddonModGlossaryHelperProvider {
     /**
      * Upload or store some files, depending if the user is offline or not.
      *
-     * @param  {number}  glossaryId    Glossary ID.
-     * @param  {string}  entryName     The name of the entry.
-     * @param  {number}  [timeCreated] The time the entry was created.
-     * @param  {any[]}   files         List of files.
-     * @param  {boolean} offline       True if files sould be stored for offline, false to upload them.
-     * @param  {string}  [siteId]      Site ID. If not defined, current site.
-     * @return {Promise<any>}          Promise resolved if success.
+     * @param glossaryId Glossary ID.
+     * @param entryName The name of the entry.
+     * @param timeCreated The time the entry was created.
+     * @param files List of files.
+     * @param offline True if files sould be stored for offline, false to upload them.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success.
      */
     uploadOrStoreFiles(glossaryId: number, entryName: string, timeCreated: number, files: any[], offline: boolean,
             siteId?: string): Promise<any> {
diff --git a/src/addon/mod/glossary/providers/module-handler.ts b/src/addon/mod/glossary/providers/module-handler.ts
index 88b952b13..9e2df7a4b 100644
--- a/src/addon/mod/glossary/providers/module-handler.ts
+++ b/src/addon/mod/glossary/providers/module-handler.ts
@@ -46,7 +46,7 @@ export class AddonModGlossaryModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean {
         return true;
@@ -55,10 +55,10 @@ export class AddonModGlossaryModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         return {
@@ -80,9 +80,9 @@ export class AddonModGlossaryModuleHandler implements CoreCourseModuleHandler {
      * Get the component to render the module. This is needed to support singleactivity course format.
      * The component returned must implement CoreCourseModuleMainComponent.
      *
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any} The component to use, undefined if not found.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component to use, undefined if not found.
      */
     getMainComponent(course: any, module: any): any {
         return AddonModGlossaryIndexComponent;
@@ -92,7 +92,7 @@ export class AddonModGlossaryModuleHandler implements CoreCourseModuleHandler {
      * Whether to display the course refresher in single activity course format. If it returns false, a refresher must be
      * included in the template that calls the doRefresh method of the component. Defaults to true.
      *
-     * @return {boolean} Whether the refresher should be displayed.
+     * @return Whether the refresher should be displayed.
      */
     displayRefresherInSingleActivity(): boolean {
         return false;
diff --git a/src/addon/mod/glossary/providers/offline.ts b/src/addon/mod/glossary/providers/offline.ts
index ffe5aef84..b50c3a34c 100644
--- a/src/addon/mod/glossary/providers/offline.ts
+++ b/src/addon/mod/glossary/providers/offline.ts
@@ -86,11 +86,11 @@ export class AddonModGlossaryOfflineProvider {
     /**
      * Delete a new entry.
      *
-     * @param  {number} glossaryId  Glossary ID.
-     * @param  {string} concept     Glossary entry concept.
-     * @param  {number} timeCreated The time the entry was created.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<void>}      Promise resolved if deleted, rejected if failure.
+     * @param glossaryId Glossary ID.
+     * @param concept Glossary entry concept.
+     * @param timeCreated The time the entry was created.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if deleted, rejected if failure.
      */
     deleteNewEntry(glossaryId: number, concept: string, timeCreated: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -107,8 +107,8 @@ export class AddonModGlossaryOfflineProvider {
     /**
      * Get all the stored new entries from all the glossaries.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with entries.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with entries.
      */
     getAllNewEntries(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -121,11 +121,11 @@ export class AddonModGlossaryOfflineProvider {
     /**
      * Get a stored new entry.
      *
-     * @param  {number} glossaryId  Glossary ID.
-     * @param  {string} concept     Glossary entry concept.
-     * @param  {number} timeCreated The time the entry was created.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with entry.
+     * @param glossaryId Glossary ID.
+     * @param concept Glossary entry concept.
+     * @param timeCreated The time the entry was created.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with entry.
      */
     getNewEntry(glossaryId: number, concept: string, timeCreated: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -143,10 +143,10 @@ export class AddonModGlossaryOfflineProvider {
     /**
      * Get all the stored add entry data from a certain glossary.
      *
-     * @param  {number} glossaryId Glossary ID.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @param  {number} [userId]   User the entries belong to. If not defined, current user in site.
-     * @return {Promise<any[]>} Promise resolved with entries.
+     * @param glossaryId Glossary ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the entries belong to. If not defined, current user in site.
+     * @return Promise resolved with entries.
      */
     getGlossaryNewEntries(glossaryId: number, siteId?: string, userId?: number): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -164,11 +164,11 @@ export class AddonModGlossaryOfflineProvider {
     /**
      * Check if a concept is used offline.
      *
-     * @param  {number} glossaryId    Glossary ID.
-     * @param  {string} concept       Concept to check.
-     * @param  {number} [timeCreated] Time of the entry we are editing.
-     * @param  {string} [siteId]      Site ID. If not defined, current site.
-     * @return {Promise<boolean>}     Promise resolved with true if concept is found, false otherwise.
+     * @param glossaryId Glossary ID.
+     * @param concept Concept to check.
+     * @param timeCreated Time of the entry we are editing.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if concept is found, false otherwise.
      */
     isConceptUsed(glossaryId: number, concept: string, timeCreated?: number, siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -198,17 +198,17 @@ export class AddonModGlossaryOfflineProvider {
     /**
      * Save a new entry to be sent later.
      *
-     * @param  {number} glossaryId     Glossary ID.
-     * @param  {string} concept        Glossary entry concept.
-     * @param  {string} definition     Glossary entry concept definition.
-     * @param  {number} courseId       Course ID of the glossary.
-     * @param  {any}    [options]      Options for the entry.
-     * @param  {any}    [attachments]  Result of CoreFileUploaderProvider#storeFilesToUpload for attachments.
-     * @param  {number} [timeCreated]  The time the entry was created. If not defined, current time.
-     * @param  {string} [siteId]       Site ID. If not defined, current site.
-     * @param  {number} [userId]       User the entry belong to. If not defined, current user in site.
-     * @param  {any}    [discardEntry] The entry provided will be discarded if found.
-     * @return {Promise<false>}        Promise resolved if stored, rejected if failure.
+     * @param glossaryId Glossary ID.
+     * @param concept Glossary entry concept.
+     * @param definition Glossary entry concept definition.
+     * @param courseId Course ID of the glossary.
+     * @param options Options for the entry.
+     * @param attachments Result of CoreFileUploaderProvider#storeFilesToUpload for attachments.
+     * @param timeCreated The time the entry was created. If not defined, current time.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the entry belong to. If not defined, current user in site.
+     * @param discardEntry The entry provided will be discarded if found.
+     * @return Promise resolved if stored, rejected if failure.
      */
     addNewEntry(glossaryId: number, concept: string, definition: string, courseId: number, options?: any, attachments?: any,
             timeCreated?: number, siteId?: string, userId?: number, discardEntry?: any): Promise<false> {
@@ -242,9 +242,9 @@ export class AddonModGlossaryOfflineProvider {
     /**
      * Get the path to the folder where to store files for offline attachments in a glossary.
      *
-     * @param  {number} glossaryId Glossary ID.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<string>}   Promise resolved with the path.
+     * @param glossaryId Glossary ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the path.
      */
     getGlossaryFolder(glossaryId: number, siteId?: string): Promise<string> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -258,11 +258,11 @@ export class AddonModGlossaryOfflineProvider {
     /**
      * Get the path to the folder where to store files for a new offline entry.
      *
-     * @param  {number} glossaryId  Glossary ID.
-     * @param  {string} concept     The name of the entry.
-     * @param  {number} timeCreated Time to allow duplicated entries.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<string>}    Promise resolved with the path.
+     * @param glossaryId Glossary ID.
+     * @param concept The name of the entry.
+     * @param timeCreated Time to allow duplicated entries.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the path.
      */
     getEntryFolder(glossaryId: number, concept: string, timeCreated: number, siteId?: string): Promise<string> {
         return this.getGlossaryFolder(glossaryId, siteId).then((folderPath) => {
@@ -273,8 +273,8 @@ export class AddonModGlossaryOfflineProvider {
     /**
      * Parse "options" and "attachments" columns of a fetched record.
      *
-     * @param  {any} records Record object
-     * @return {any}         Record object with columns parsed.
+     * @param records Record object
+     * @return Record object with columns parsed.
      */
     protected parseRecord(record: any): any {
         record.options = this.textUtils.parseJSON(record.options);
diff --git a/src/addon/mod/glossary/providers/prefetch-handler.ts b/src/addon/mod/glossary/providers/prefetch-handler.ts
index 9235c4b54..5b852178c 100644
--- a/src/addon/mod/glossary/providers/prefetch-handler.ts
+++ b/src/addon/mod/glossary/providers/prefetch-handler.ts
@@ -50,10 +50,10 @@ export class AddonModGlossaryPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Get list of files. If not defined, we'll assume they're in module.contents.
      *
-     * @param {any} module Module.
-     * @param {Number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @return {Promise<any[]>} Promise resolved with the list of files.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @return Promise resolved with the list of files.
      */
     getFiles(module: any, courseId: number, single?: boolean): Promise<any[]> {
         return this.glossaryProvider.getGlossary(courseId, module.id).then((glossary) => {
@@ -70,10 +70,10 @@ export class AddonModGlossaryPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Get the list of downloadable files. It includes entry embedded files.
      *
-     * @param  {any}   module   Module to get the files.
-     * @param  {any}   glossary Glossary
-     * @param  {any[]} entries  Entries of the Glossary.
-     * @return {any[]}          List of Files.
+     * @param module Module to get the files.
+     * @param glossary Glossary
+     * @param entries Entries of the Glossary.
+     * @return List of Files.
      */
     protected getFilesFromGlossaryAndEntries(module: any, glossary: any, entries: any[]): any[] {
         let files = this.getIntroFilesFromInstance(module, glossary);
@@ -96,9 +96,9 @@ export class AddonModGlossaryPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId The course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId The course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         return this.glossaryProvider.invalidateContent(moduleId, courseId);
@@ -107,11 +107,11 @@ export class AddonModGlossaryPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Prefetch a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
      */
     prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string): Promise<any> {
         return this.prefetchPackage(module, courseId, single, this.prefetchGlossary.bind(this));
@@ -120,11 +120,11 @@ export class AddonModGlossaryPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Prefetch a glossary.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} single True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} siteId Site ID.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
      */
     protected prefetchGlossary(module: any, courseId: number, single: boolean, siteId: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -193,10 +193,10 @@ export class AddonModGlossaryPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Sync a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     sync(module: any, courseId: number, siteId?: any): Promise<any> {
         const promises = [
diff --git a/src/addon/mod/glossary/providers/sync-cron-handler.ts b/src/addon/mod/glossary/providers/sync-cron-handler.ts
index d952ce356..52ed49b68 100644
--- a/src/addon/mod/glossary/providers/sync-cron-handler.ts
+++ b/src/addon/mod/glossary/providers/sync-cron-handler.ts
@@ -29,9 +29,9 @@ export class AddonModGlossarySyncCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         return this.glossarySync.syncAllGlossaries(siteId, force);
@@ -40,7 +40,7 @@ export class AddonModGlossarySyncCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return this.glossarySync.syncInterval;
diff --git a/src/addon/mod/glossary/providers/sync.ts b/src/addon/mod/glossary/providers/sync.ts
index 746563f67..da90b1f65 100644
--- a/src/addon/mod/glossary/providers/sync.ts
+++ b/src/addon/mod/glossary/providers/sync.ts
@@ -67,9 +67,9 @@ export class AddonModGlossarySyncProvider extends CoreSyncBaseProvider {
     /**
      * Try to synchronize all the glossaries in a certain site or in all sites.
      *
-     * @param  {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @return {Promise<any>}    Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     syncAllGlossaries(siteId?: string, force?: boolean): Promise<any> {
         return this.syncOnSites('all glossaries', this.syncAllGlossariesFunc.bind(this), [force], siteId);
@@ -78,9 +78,9 @@ export class AddonModGlossarySyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync all glossaries on a site.
      *
-     * @param  {string} siteId Site ID to sync.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @return {Promise<any>}    Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     protected syncAllGlossariesFunc(siteId: string, force?: boolean): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -126,10 +126,10 @@ export class AddonModGlossarySyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync a glossary only if a certain time has passed since the last time.
      *
-     * @param  {number} glossaryId Glossary ID.
-     * @param  {number} userId     User the entry belong to.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved when the glossary is synced or if it doesn't need to be synced.
+     * @param glossaryId Glossary ID.
+     * @param userId User the entry belong to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the glossary is synced or if it doesn't need to be synced.
      */
     syncGlossaryEntriesIfNeeded(glossaryId: number, userId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -146,10 +146,10 @@ export class AddonModGlossarySyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize all offline entries of a glossary.
      *
-     * @param  {number} glossaryId Glossary ID to be synced.
-     * @param  {number} [userId]   User the entries belong to.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved if sync is successful, rejected otherwise.
+     * @param glossaryId Glossary ID to be synced.
+     * @param userId User the entries belong to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     syncGlossaryEntries(glossaryId: number, userId?: number, siteId?: string): Promise<any> {
         userId = userId || this.sitesProvider.getCurrentSiteUserId();
@@ -258,10 +258,10 @@ export class AddonModGlossarySyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize offline ratings.
      *
-     * @param {number} [cmId] Course module to be synced. If not defined, sync all glossaries.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected otherwise.
+     * @param cmId Course module to be synced. If not defined, sync all glossaries.
+     * @param force Wether to force sync not depending on last execution.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     syncRatings(cmId?: number, force?: boolean, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -303,11 +303,11 @@ export class AddonModGlossarySyncProvider extends CoreSyncBaseProvider {
     /**
      * Delete a new entry.
      *
-     * @param  {number} glossaryId  Glossary ID.
-     * @param  {string} concept     Glossary entry concept.
-     * @param  {number} timeCreated Time to allow duplicated entries.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}       Promise resolved when deleted.
+     * @param glossaryId Glossary ID.
+     * @param concept Glossary entry concept.
+     * @param timeCreated Time to allow duplicated entries.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when deleted.
      */
    protected deleteAddEntry(glossaryId: number, concept: string, timeCreated: number, siteId?: string): Promise<any> {
        const promises = [];
@@ -323,10 +323,10 @@ export class AddonModGlossarySyncProvider extends CoreSyncBaseProvider {
     /**
      * Upload attachments of an offline entry.
      *
-     * @param  {number} glossaryId Glossary ID.
-     * @param  {any}    entry      Offline entry.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<number>} Promise resolved with draftid if uploaded, resolved with 0 if nothing to upload.
+     * @param glossaryId Glossary ID.
+     * @param entry Offline entry.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with draftid if uploaded, resolved with 0 if nothing to upload.
      */
     protected uploadAttachments(glossaryId: number, entry: any, siteId?: string): Promise<number> {
         if (entry.attachments) {
@@ -357,9 +357,9 @@ export class AddonModGlossarySyncProvider extends CoreSyncBaseProvider {
     /**
      * Get the ID of a glossary sync.
      *
-     * @param  {number} glossaryId Glossary ID.
-     * @param  {number} [userId]   User the entries belong to.. If not defined, current user.
-     * @return {string}            Sync ID.
+     * @param glossaryId Glossary ID.
+     * @param userId User the entries belong to.. If not defined, current user.
+     * @return Sync ID.
      */
     protected getGlossarySyncId(glossaryId: number, userId?: number): string {
         userId = userId || this.sitesProvider.getCurrentSiteUserId();
diff --git a/src/addon/mod/glossary/providers/tag-area-handler.ts b/src/addon/mod/glossary/providers/tag-area-handler.ts
index 4c62f698d..fc1d3345e 100644
--- a/src/addon/mod/glossary/providers/tag-area-handler.ts
+++ b/src/addon/mod/glossary/providers/tag-area-handler.ts
@@ -29,7 +29,7 @@ export class AddonModGlossaryTagAreaHandler implements CoreTagAreaHandler {
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -38,8 +38,8 @@ export class AddonModGlossaryTagAreaHandler implements CoreTagAreaHandler {
     /**
      * Parses the rendered content of a tag index and returns the items.
      *
-     * @param {string} content Rendered content.
-     * @return {any[]|Promise<any[]>} Area items (or promise resolved with the items).
+     * @param content Rendered content.
+     * @return Area items (or promise resolved with the items).
      */
     parseContent(content: string): any[] | Promise<any[]> {
         return this.tagHelper.parseFeedContent(content);
@@ -48,8 +48,8 @@ export class AddonModGlossaryTagAreaHandler implements CoreTagAreaHandler {
     /**
      * Get the component to use to display items.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return CoreTagFeedComponent;
diff --git a/src/addon/mod/imscp/components/index/index.ts b/src/addon/mod/imscp/components/index/index.ts
index 3b793da19..37edb9b87 100644
--- a/src/addon/mod/imscp/components/index/index.ts
+++ b/src/addon/mod/imscp/components/index/index.ts
@@ -62,7 +62,7 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         return this.imscpProvider.invalidateContent(this.module.id, this.courseId);
@@ -71,8 +71,8 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
     /**
      * Download imscp contents.
      *
-     * @param  {boolean} [refresh] Whether we're refreshing data.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Whether we're refreshing data.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh?: boolean): Promise<any> {
         let downloadFailed = false;
@@ -120,8 +120,8 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
     /**
      * Loads an item.
      *
-     * @param  {string} itemId Item ID.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param itemId Item ID.
+     * @return Promise resolved when done.
      */
     loadItem(itemId: string): Promise<any> {
         return this.imscpProvider.getIframeSrc(this.module, itemId).then((src) => {
@@ -144,7 +144,7 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
     /**
      * Show the TOC.
      *
-     * @param {MouseEvent} event Event.
+     * @param event Event.
      */
     showToc(event: MouseEvent): void {
         // Create the toc modal.
diff --git a/src/addon/mod/imscp/pages/index/index.ts b/src/addon/mod/imscp/pages/index/index.ts
index b94d81b8b..8300d2629 100644
--- a/src/addon/mod/imscp/pages/index/index.ts
+++ b/src/addon/mod/imscp/pages/index/index.ts
@@ -40,7 +40,7 @@ export class AddonModImscpIndexPage {
     /**
      * Update some data based on the imscp instance.
      *
-     * @param {any} imscp Imscp instance.
+     * @param imscp Imscp instance.
      */
     updateData(imscp: any): void {
         this.title = imscp.name || this.title;
diff --git a/src/addon/mod/imscp/pages/toc/toc.ts b/src/addon/mod/imscp/pages/toc/toc.ts
index 1880e4813..80f67f1b7 100644
--- a/src/addon/mod/imscp/pages/toc/toc.ts
+++ b/src/addon/mod/imscp/pages/toc/toc.ts
@@ -35,7 +35,7 @@ export class AddonModImscpTocPage {
     /**
      * Function called when an item is clicked.
      *
-     * @param {string} id ID of the clicked item.
+     * @param id ID of the clicked item.
      */
     loadItem(id: string): void {
         this.viewCtrl.dismiss(id);
@@ -44,8 +44,8 @@ export class AddonModImscpTocPage {
     /**
      * Get dummy array for padding.
      *
-     * @param {number} n Array length.
-     * @return {number[]} Dummy array with n elements.
+     * @param n Array length.
+     * @return Dummy array with n elements.
      */
     getNumberForPadding(n: number): number[] {
         return new Array(n);
diff --git a/src/addon/mod/imscp/providers/imscp.ts b/src/addon/mod/imscp/providers/imscp.ts
index 86166f3c2..366cb7bf6 100644
--- a/src/addon/mod/imscp/providers/imscp.ts
+++ b/src/addon/mod/imscp/providers/imscp.ts
@@ -39,8 +39,8 @@ export class AddonModImscpProvider {
     /**
      * Get the IMSCP toc as an array.
      *
-     * @param  {any[]} contents The module contents.
-     * @return {any} The toc.
+     * @param contents The module contents.
+     * @return The toc.
      */
     protected getToc(contents: any[]): any {
         if (!contents || !contents.length) {
@@ -53,8 +53,8 @@ export class AddonModImscpProvider {
     /**
      * Get the imscp toc as an array of items (not nested) to build the navigation tree.
      *
-     * @param  {any[]} contents The module contents.
-     * @return {any[]} The toc as a list.
+     * @param contents The module contents.
+     * @return The toc as a list.
      */
     createItemList(contents: any[]): any[] {
         const items = [];
@@ -72,9 +72,9 @@ export class AddonModImscpProvider {
     /**
      * Get the previous item to the given one.
      *
-     * @param  {any[]}  items  The items list.
-     * @param  {string} itemId The current item.
-     * @return {string} The previous item id.
+     * @param items The items list.
+     * @param itemId The current item.
+     * @return The previous item id.
      */
     getPreviousItem(items: any[], itemId: string): string {
         const position = this.getItemPosition(items, itemId);
@@ -93,9 +93,9 @@ export class AddonModImscpProvider {
     /**
      * Get the next item to the given one.
      *
-     * @param  {any[]}  items  The items list.
-     * @param  {string} itemId The current item.
-     * @return {string} The next item id.
+     * @param items The items list.
+     * @param itemId The current item.
+     * @return The next item id.
      */
     getNextItem(items: any[], itemId: string): string {
         const position = this.getItemPosition(items, itemId);
@@ -114,9 +114,9 @@ export class AddonModImscpProvider {
     /**
      * Get the position of a item.
      *
-     * @param  {any[]}  items  The items list.
-     * @param  {string} itemId The item to search.
-     * @return {number} The item position.
+     * @param items The items list.
+     * @param itemId The item to search.
+     * @return The item position.
      */
     protected getItemPosition(items: any[], itemId: string): number {
         for (let i = 0; i < items.length; i++) {
@@ -131,8 +131,8 @@ export class AddonModImscpProvider {
     /**
      * Check if we should ommit the file download.
      *
-     * @param  {string} fileName The file name
-     * @return {boolean} True if we should ommit the file.
+     * @param fileName The file name
+     * @return True if we should ommit the file.
      */
     protected checkSpecialFiles(fileName: string): boolean {
         return fileName == 'imsmanifest.xml';
@@ -141,8 +141,8 @@ export class AddonModImscpProvider {
     /**
      * Get cache key for imscp data WS calls.
      *
-     * @param  {number} courseId Course ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getImscpDataCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY +  'imscp:' + courseId;
@@ -151,11 +151,11 @@ export class AddonModImscpProvider {
     /**
      * Get a imscp with key=value. If more than one is found, only the first will be returned.
      *
-     * @param  {number} courseId Course ID.
-     * @param  {string} key      Name of the property to check.
-     * @param  {any}    value    Value to search.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the imscp is retrieved.
+     * @param courseId Course ID.
+     * @param key Name of the property to check.
+     * @param value Value to search.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the imscp is retrieved.
      */
     protected getImscpByKey(courseId: number, key: string, value: any, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -183,10 +183,10 @@ export class AddonModImscpProvider {
     /**
      * Get a imscp by course module ID.
      *
-     * @param  {number} courseId Course ID.
-     * @param  {number} cmId     Course module ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the imscp is retrieved.
+     * @param courseId Course ID.
+     * @param cmId Course module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the imscp is retrieved.
      */
     getImscp(courseId: number, cmId: number, siteId?: string): Promise<any> {
         return this.getImscpByKey(courseId, 'coursemodule', cmId, siteId);
@@ -195,9 +195,9 @@ export class AddonModImscpProvider {
     /**
      * Given a filepath, get a certain fileurl from module contents.
      *
-     * @param  {any[]}  contents       Module contents.
-     * @param  {string} targetFilePath Path of the searched file.
-     * @return {string} File URL.
+     * @param contents Module contents.
+     * @param targetFilePath Path of the searched file.
+     * @return File URL.
      */
     protected getFileUrlFromContents(contents: any[], targetFilePath: string): string {
         let indexUrl;
@@ -218,9 +218,9 @@ export class AddonModImscpProvider {
     /**
      * Get src of a imscp item.
      *
-     * @param  {any}    module     The module object.
-     * @param  {string} [itemHref] Href of item to get. If not defined, gets src of main item.
-     * @return {Promise<string>} Promise resolved with the item src.
+     * @param module The module object.
+     * @param itemHref Href of item to get. If not defined, gets src of main item.
+     * @return Promise resolved with the item src.
      */
     getIframeSrc(module: any, itemHref?: string): Promise<string> {
         if (!itemHref) {
@@ -254,10 +254,10 @@ export class AddonModImscpProvider {
     /**
      * Invalidate the prefetched content.
      *
-     * @param  {number} moduleId The module ID.
-     * @param  {number} courseId Course ID of the module.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the content is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID of the module.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the content is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -274,9 +274,9 @@ export class AddonModImscpProvider {
     /**
      * Invalidates imscp data.
      *
-     * @param  {number} courseId Course ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateImscpData(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -288,8 +288,8 @@ export class AddonModImscpProvider {
      * Check if a file is downloadable. The file param must have 'type' and 'filename' attributes
      * like in core_course_get_contents response.
      *
-     * @param  {any} file File to check.
-     * @return {boolean} True if downloadable, false otherwise.
+     * @param file File to check.
+     * @return True if downloadable, false otherwise.
      */
     isFileDownloadable(file: any): boolean {
         return file.type === 'file' && !this.checkSpecialFiles(file.filename);
@@ -298,8 +298,8 @@ export class AddonModImscpProvider {
     /**
      * Return whether or not the plugin is enabled in a certain site.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
      */
     isPluginEnabled(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -310,10 +310,10 @@ export class AddonModImscpProvider {
     /**
      * Report a IMSCP as being viewed.
      *
-     * @param  {string} id Module ID.
-     * @param {string} [name] Name of the imscp.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the WS call is successful.
+     * @param id Module ID.
+     * @param name Name of the imscp.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(id: number, name?: string, siteId?: string): Promise<any> {
         const params = {
diff --git a/src/addon/mod/imscp/providers/list-link-handler.ts b/src/addon/mod/imscp/providers/list-link-handler.ts
index 21bb3dbc4..eec7da06e 100644
--- a/src/addon/mod/imscp/providers/list-link-handler.ts
+++ b/src/addon/mod/imscp/providers/list-link-handler.ts
@@ -33,7 +33,7 @@ export class AddonModImscpListLinkHandler extends CoreContentLinksModuleListHand
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.imscpProvider.isPluginEnabled();
diff --git a/src/addon/mod/imscp/providers/module-handler.ts b/src/addon/mod/imscp/providers/module-handler.ts
index 94f5e48ea..dc3abc139 100644
--- a/src/addon/mod/imscp/providers/module-handler.ts
+++ b/src/addon/mod/imscp/providers/module-handler.ts
@@ -45,7 +45,7 @@ export class AddonModImscpModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.imscpProvider.isPluginEnabled();
@@ -54,10 +54,10 @@ export class AddonModImscpModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         return {
@@ -79,9 +79,9 @@ export class AddonModImscpModuleHandler implements CoreCourseModuleHandler {
      * Get the component to render the module. This is needed to support singleactivity course format.
      * The component returned must implement CoreCourseModuleMainComponent.
      *
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any} The component to use, undefined if not found.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component to use, undefined if not found.
      */
     getMainComponent(course: any, module: any): any {
         return AddonModImscpIndexComponent;
diff --git a/src/addon/mod/imscp/providers/pluginfile-handler.ts b/src/addon/mod/imscp/providers/pluginfile-handler.ts
index f3cd322d6..d15124b18 100644
--- a/src/addon/mod/imscp/providers/pluginfile-handler.ts
+++ b/src/addon/mod/imscp/providers/pluginfile-handler.ts
@@ -26,8 +26,8 @@ export class AddonModImscpPluginFileHandler implements CorePluginFileHandler {
     /**
      * Return the RegExp to match the revision on pluginfile URLs.
      *
-     * @param {string[]} args Arguments of the pluginfile URL defining component and filearea at least.
-     * @return {RegExp} RegExp to match the revision on pluginfile URLs.
+     * @param args Arguments of the pluginfile URL defining component and filearea at least.
+     * @return RegExp to match the revision on pluginfile URLs.
      */
     getComponentRevisionRegExp(args: string[]): RegExp {
         // Check filearea.
@@ -47,8 +47,8 @@ export class AddonModImscpPluginFileHandler implements CorePluginFileHandler {
     /**
      * Should return the string to remove the revision on pluginfile url.
      *
-     * @param {string[]} args Arguments of the pluginfile URL defining component and filearea at least.
-     * @return {string} String to remove the revision on pluginfile url.
+     * @param args Arguments of the pluginfile URL defining component and filearea at least.
+     * @return String to remove the revision on pluginfile url.
      */
     getComponentRevisionReplace(args: string[]): string {
         // Component + Filearea + Revision
diff --git a/src/addon/mod/imscp/providers/prefetch-handler.ts b/src/addon/mod/imscp/providers/prefetch-handler.ts
index 6f8a10c9e..65d49dbbc 100644
--- a/src/addon/mod/imscp/providers/prefetch-handler.ts
+++ b/src/addon/mod/imscp/providers/prefetch-handler.ts
@@ -42,13 +42,13 @@ export class AddonModImscpPrefetchHandler extends CoreCourseResourcePrefetchHand
     /**
      * Download or prefetch the content.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @param {boolean} [prefetch] True to prefetch, false to download right away.
-     * @param {string} [dirPath] Path of the directory where to store all the content files. This is to keep the files
-     *                           relative paths and make the package work in an iframe. Undefined to download the files
-     *                           in the filepool root folder.
-     * @return {Promise<any>} Promise resolved when all content is downloaded. Data returned is not reliable.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @param prefetch True to prefetch, false to download right away.
+     * @param dirPath Path of the directory where to store all the content files. This is to keep the files
+     *                relative paths and make the package work in an iframe. Undefined to download the files
+     *                in the filepool root folder.
+     * @return Promise resolved when all content is downloaded. Data returned is not reliable.
      */
     downloadOrPrefetch(module: any, courseId: number, prefetch?: boolean, dirPath?: string): Promise<any> {
         const siteId = this.sitesProvider.getCurrentSiteId();
@@ -66,9 +66,9 @@ export class AddonModImscpPrefetchHandler extends CoreCourseResourcePrefetchHand
     /**
      * Returns module intro files.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @return {Promise<any[]>} Promise resolved with list of intro files.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @return Promise resolved with list of intro files.
      */
     getIntroFiles(module: any, courseId: number): Promise<any[]> {
         return this.imscpProvider.getImscp(courseId, module.id).catch(() => {
@@ -81,9 +81,9 @@ export class AddonModImscpPrefetchHandler extends CoreCourseResourcePrefetchHand
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         return this.imscpProvider.invalidateContent(moduleId, courseId);
@@ -92,9 +92,9 @@ export class AddonModImscpPrefetchHandler extends CoreCourseResourcePrefetchHand
     /**
      * Invalidate WS calls needed to determine module status.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when invalidated.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when invalidated.
      */
     invalidateModule(module: any, courseId: number): Promise<any> {
         const promises = [];
@@ -108,7 +108,7 @@ export class AddonModImscpPrefetchHandler extends CoreCourseResourcePrefetchHand
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
+     * @return A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.imscpProvider.isPluginEnabled();
@@ -117,8 +117,8 @@ export class AddonModImscpPrefetchHandler extends CoreCourseResourcePrefetchHand
     /**
      * Check if a file is downloadable.
      *
-     * @param  {any} file File to check.
-     * @return {boolean} Whether the file is downloadable.
+     * @param file File to check.
+     * @return Whether the file is downloadable.
      */
     isFileDownloadable(file: any): boolean {
         return this.imscpProvider.isFileDownloadable(file);
diff --git a/src/addon/mod/label/providers/label.ts b/src/addon/mod/label/providers/label.ts
index 2b4e79534..ec75856b6 100644
--- a/src/addon/mod/label/providers/label.ts
+++ b/src/addon/mod/label/providers/label.ts
@@ -33,8 +33,8 @@ export class AddonModLabelProvider {
     /**
      * Get cache key for label data WS calls.
      *
-     * @param  {number} courseId Course ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getLabelDataCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'label:' + courseId;
@@ -43,13 +43,13 @@ export class AddonModLabelProvider {
     /**
      * Get a label with key=value. If more than one is found, only the first will be returned.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} key Name of the property to check.
-     * @param {any} value Value to search.
-     * @param {boolean} [forceCache] True to always get the value from cache, false otherwise.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not provided, current site.
-     * @return {Promise<any>} Promise resolved when the label is retrieved.
+     * @param courseId Course ID.
+     * @param key Name of the property to check.
+     * @param value Value to search.
+     * @param forceCache True to always get the value from cache, false otherwise.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not provided, current site.
+     * @return Promise resolved when the label is retrieved.
      */
     protected getLabelByField(courseId: number, key: string, value: any, forceCache?: boolean, ignoreCache?: boolean,
             siteId?: string): Promise<any> {
@@ -86,12 +86,12 @@ export class AddonModLabelProvider {
     /**
      * Get a label by course module ID.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} cmId Course module ID.
-     * @param {boolean} [forceCache] True to always get the value from cache, false otherwise.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the label is retrieved.
+     * @param courseId Course ID.
+     * @param cmId Course module ID.
+     * @param forceCache True to always get the value from cache, false otherwise.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the label is retrieved.
      */
     getLabel(courseId: number, cmId: number, forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.getLabelByField(courseId, 'coursemodule', cmId, forceCache, ignoreCache, siteId);
@@ -100,12 +100,12 @@ export class AddonModLabelProvider {
     /**
      * Get a label by ID.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} labelId Label ID.
-     * @param {boolean} [forceCache] True to always get the value from cache, false otherwise.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the label is retrieved.
+     * @param courseId Course ID.
+     * @param labelId Label ID.
+     * @param forceCache True to always get the value from cache, false otherwise.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the label is retrieved.
      */
     getLabelById(courseId: number, labelId: number, forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.getLabelByField(courseId, 'id', labelId, forceCache, ignoreCache, siteId);
@@ -114,9 +114,9 @@ export class AddonModLabelProvider {
     /**
      * Invalidate label data.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateLabelData(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(null).then((site) => {
@@ -127,10 +127,10 @@ export class AddonModLabelProvider {
     /**
      * Invalidate the prefetched content.
      *
-     * @param  {number} moduleId The module ID.
-     * @param  {number} courseId Course ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -147,8 +147,8 @@ export class AddonModLabelProvider {
     /**
      * Check if the site has the WS to get label data.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether it's available.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether it's available.
      * @since 3.3
      */
     isGetLabelAvailable(siteId?: string): Promise<boolean> {
@@ -160,8 +160,8 @@ export class AddonModLabelProvider {
     /**
      * Check if the site has the WS to get label data.
      *
-     * @param  {CoreSite} [site] Site. If not defined, current site.
-     * @return {boolean} Whether it's available.
+     * @param site Site. If not defined, current site.
+     * @return Whether it's available.
      * @since 3.3
      */
     isGetLabelAvailableForSite(site?: CoreSite): boolean {
diff --git a/src/addon/mod/label/providers/module-handler.ts b/src/addon/mod/label/providers/module-handler.ts
index 8c8ecfeb8..6a8f72a75 100644
--- a/src/addon/mod/label/providers/module-handler.ts
+++ b/src/addon/mod/label/providers/module-handler.ts
@@ -44,7 +44,7 @@ export class AddonModLabelModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -53,10 +53,10 @@ export class AddonModLabelModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         // Remove the description from the module so it isn't rendered twice.
@@ -76,10 +76,10 @@ export class AddonModLabelModuleHandler implements CoreCourseModuleHandler {
      * The component returned must implement CoreCourseModuleMainComponent.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getMainComponent(injector: Injector, course: any, module: any): any | Promise<any> {
         // There's no need to implement this because label cannot be used in singleactivity course format.
diff --git a/src/addon/mod/label/providers/prefetch-handler.ts b/src/addon/mod/label/providers/prefetch-handler.ts
index 3f86dec31..a52ad9ab8 100644
--- a/src/addon/mod/label/providers/prefetch-handler.ts
+++ b/src/addon/mod/label/providers/prefetch-handler.ts
@@ -44,10 +44,10 @@ export class AddonModLabelPrefetchHandler extends CoreCourseResourcePrefetchHand
     /**
      * Returns module intro files.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<any[]>} Promise resolved with list of intro files.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise resolved with list of intro files.
      */
     getIntroFiles(module: any, courseId: number, ignoreCache?: boolean): Promise<any[]> {
         let promise;
@@ -66,9 +66,9 @@ export class AddonModLabelPrefetchHandler extends CoreCourseResourcePrefetchHand
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         return this.labelProvider.invalidateContent(moduleId, courseId);
@@ -77,9 +77,9 @@ export class AddonModLabelPrefetchHandler extends CoreCourseResourcePrefetchHand
     /**
      * Invalidate WS calls needed to determine module status.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when invalidated.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when invalidated.
      */
     invalidateModule(module: any, courseId: number): Promise<any> {
         const promises = [];
diff --git a/src/addon/mod/lesson/components/index/index.ts b/src/addon/mod/lesson/components/index/index.ts
index b179e7993..d236da208 100644
--- a/src/addon/mod/lesson/components/index/index.ts
+++ b/src/addon/mod/lesson/components/index/index.ts
@@ -93,7 +93,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Change the group displayed.
      *
-     * @param {number} groupId Group ID to display.
+     * @param groupId Group ID to display.
      */
     changeGroup(groupId: number): void {
         this.reportLoaded = false;
@@ -108,10 +108,10 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Get the lesson data.
      *
-     * @param {boolean} [refresh=false] If it's refreshing content.
-     * @param {boolean} [sync=false] If it should try to sync.
-     * @param {boolean} [showErrors=false] If show errors to the user of hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh If it's refreshing content.
+     * @param sync If it should try to sync.
+     * @param showErrors If show errors to the user of hide them.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<any> {
 
@@ -217,7 +217,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Fetch the reports data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchReportData(): Promise<any> {
         return this.groupsProvider.getActivityGroupInfo(this.module.id).then((groupInfo) => {
@@ -232,8 +232,8 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Checks if sync has succeed from result sync data.
      *
-     * @param {any} result Data returned on the sync function.
-     * @return {boolean} If suceed or not.
+     * @param result Data returned on the sync function.
+     * @return If suceed or not.
      */
     protected hasSyncSucceed(result: any): boolean {
         if (result.updated || this.dataSent) {
@@ -292,7 +292,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         const promises = [];
@@ -316,8 +316,8 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Compares sync event data with current data to check if refresh content is needed.
      *
-     * @param {any} syncEventData Data receiven on sync observer.
-     * @return {boolean} True if refresh is needed, false otherwise.
+     * @param syncEventData Data receiven on sync observer.
+     * @return True if refresh is needed, false otherwise.
      */
     protected isRefreshSyncNeeded(syncEventData: any): boolean {
         return this.lesson && syncEventData.lessonId == this.lesson.id;
@@ -326,7 +326,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Function called when the lesson is ready to be seen (no pending prevent access reasons).
      *
-     * @param {boolean} [refresh=false] If it's refreshing content.
+     * @param refresh If it's refreshing content.
      */
     protected lessonReady(refresh?: boolean): void {
         this.askPassword = false;
@@ -355,8 +355,8 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Open the lesson player.
      *
-     * @param  {boolean} continueLast Whether to continue the last retake.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param continueLast Whether to continue the last retake.
+     * @return Promise resolved when done.
      */
     protected playLesson(continueLast: boolean): Promise<any> {
         // Calculate the pageId to load. If there is timelimit, lesson is always restarted from the start.
@@ -426,8 +426,8 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Set a group to view the reports.
      *
-     * @param  {number} groupId Group ID.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param groupId Group ID.
+     * @return Promise resolved when done.
      */
     protected setGroup(groupId: number): Promise<any> {
         this.group = groupId;
@@ -498,8 +498,8 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Displays some data based on the current status.
      *
-     * @param {string} status The current status.
-     * @param {string} [previousStatus] The previous status. If not defined, there is no previous status.
+     * @param status The current status.
+     * @param previousStatus The previous status. If not defined, there is no previous status.
      */
     protected showStatus(status: string, previousStatus?: string): void {
         this.showSpinner = status == CoreConstants.DOWNLOADING;
@@ -508,7 +508,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Start the lesson.
      *
-     * @param {boolean} [continueLast] Whether to continue the last attempt.
+     * @param continueLast Whether to continue the last attempt.
      */
     start(continueLast?: boolean): void {
         if (this.showSpinner) {
@@ -547,8 +547,8 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Submit password for password protected lessons.
      *
-     * @param {Event} e Event.
-     * @param {HTMLInputElement} passwordEl The password input.
+     * @param e Event.
+     * @param passwordEl The password input.
      */
     submitPassword(e: Event, passwordEl: HTMLInputElement): void {
         e.preventDefault();
@@ -591,7 +591,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Performs the sync of the activity.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected sync(): Promise<any> {
         return this.lessonSync.syncLesson(this.lesson.id, true).then((result) => {
@@ -611,8 +611,8 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Validate a password and retrieve extra data.
      *
-     * @param {string} password The password to validate.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param password The password to validate.
+     * @return Promise resolved when done.
      */
     protected validatePassword(password: string): Promise<any> {
         return this.lessonProvider.getLessonWithPassword(this.lesson.id, password).then((lessonData) => {
diff --git a/src/addon/mod/lesson/pages/index/index.ts b/src/addon/mod/lesson/pages/index/index.ts
index 838cbe8a3..8899c8077 100644
--- a/src/addon/mod/lesson/pages/index/index.ts
+++ b/src/addon/mod/lesson/pages/index/index.ts
@@ -44,7 +44,7 @@ export class AddonModLessonIndexPage {
     /**
      * Update some data based on the lesson instance.
      *
-     * @param {any} lesson Lesson instance.
+     * @param lesson Lesson instance.
      */
     updateData(lesson: any): void {
         this.title = lesson.name || this.title;
diff --git a/src/addon/mod/lesson/pages/menu-modal/menu-modal.ts b/src/addon/mod/lesson/pages/menu-modal/menu-modal.ts
index a9406ceb4..e9548064c 100644
--- a/src/addon/mod/lesson/pages/menu-modal/menu-modal.ts
+++ b/src/addon/mod/lesson/pages/menu-modal/menu-modal.ts
@@ -31,7 +31,6 @@ export class AddonModLessonMenuModalPage {
      *       the menu dynamically based on the data retrieved by the page that opened the modal.
      *     - The onDidDismiss function takes a while to be called, making the app seem slow. This way we can directly call
      *       the functions we need without having to wait for the modal to be dismissed.
-     * @type {any}
      */
     pageInstance: any;
 
@@ -49,7 +48,7 @@ export class AddonModLessonMenuModalPage {
     /**
      * Load a certain page.
      *
-     * @param {number} pageId The page ID to load.
+     * @param pageId The page ID to load.
      */
     loadPage(pageId: number): void {
         this.pageInstance.changePage && this.pageInstance.changePage(pageId);
diff --git a/src/addon/mod/lesson/pages/password-modal/password-modal.ts b/src/addon/mod/lesson/pages/password-modal/password-modal.ts
index d748163eb..b1e7699a5 100644
--- a/src/addon/mod/lesson/pages/password-modal/password-modal.ts
+++ b/src/addon/mod/lesson/pages/password-modal/password-modal.ts
@@ -30,8 +30,8 @@ export class AddonModLessonPasswordModalPage {
     /**
      * Send the password back.
      *
-     * @param {Event} e Event.
-     * @param {HTMLInputElement} password The input element.
+     * @param e Event.
+     * @param password The input element.
      */
     submitPassword(e: Event, password: HTMLInputElement): void {
         e.preventDefault();
diff --git a/src/addon/mod/lesson/pages/player/player.ts b/src/addon/mod/lesson/pages/player/player.ts
index a19c4e48f..8c96a6721 100644
--- a/src/addon/mod/lesson/pages/player/player.ts
+++ b/src/addon/mod/lesson/pages/player/player.ts
@@ -130,7 +130,7 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy {
     /**
      * Check if we can leave the page or not.
      *
-     * @return {boolean|Promise<void>} Resolved if we can leave it, rejected if not.
+     * @return Resolved if we can leave it, rejected if not.
      */
     ionViewCanLeave(): boolean | Promise<void> {
         if (this.forceLeave) {
@@ -157,7 +157,7 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy {
     /**
      * A button was clicked.
      *
-     * @param {any} data Button data.
+     * @param data Button data.
      */
     buttonClicked(data: any): void {
         this.processPage(data);
@@ -166,11 +166,11 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy {
     /**
      * Call a function and go offline if allowed and the call fails.
      *
-     * @param {Function} func Function to call.
-     * @param {any[]} args Arguments to pass to the function.
-     * @param {number} offlineParamPos Position of the offline parameter in the args.
-     * @param {number} [jumpsParamPos] Position of the jumps parameter in the args.
-     * @return {Promise<any>} Promise resolved in success, rejected otherwise.
+     * @param func Function to call.
+     * @param args Arguments to pass to the function.
+     * @param offlineParamPos Position of the offline parameter in the args.
+     * @param jumpsParamPos Position of the jumps parameter in the args.
+     * @return Promise resolved in success, rejected otherwise.
      */
     protected callFunction(func: Function, args: any[], offlineParamPos: number, jumpsParamPos?: number): Promise<any> {
         return func.apply(func, args).catch((error) => {
@@ -200,8 +200,8 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy {
     /**
      * Change the page from menu or when continuing from a feedback page.
      *
-     * @param {number} pageId Page to load.
-     * @param {boolean} [ignoreCurrent] If true, allow loading current page.
+     * @param pageId Page to load.
+     * @param ignoreCurrent If true, allow loading current page.
      */
     changePage(pageId: number, ignoreCurrent?: boolean): void {
         if (!ignoreCurrent && !this.eolData && this.currentPage == pageId) {
@@ -222,7 +222,7 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy {
     /**
      * Get the lesson data and load the page.
      *
-     * @return {Promise<boolean>} Promise resolved with true if success, resolved with false otherwise.
+     * @return Promise resolved with true if success, resolved with false otherwise.
      */
     protected fetchLessonData(): Promise<boolean> {
         // Wait for any ongoing sync to finish. We won't sync a lesson while it's being played.
@@ -315,8 +315,8 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy {
     /**
      * Finish the retake.
      *
-     * @param {boolean} [outOfTime] Whether the retake is finished because the user ran out of time.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param outOfTime Whether the retake is finished because the user ran out of time.
+     * @return Promise resolved when done.
      */
     protected finishRetake(outOfTime?: boolean): Promise<any> {
         let promise;
@@ -386,8 +386,8 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy {
     /**
      * Jump to a certain page after performing an action.
      *
-     * @param {number} pageId The page to load.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param pageId The page to load.
+     * @return Promise resolved when done.
      */
     protected jumpToPage(pageId: number): Promise<any> {
         if (pageId === 0) {
@@ -411,8 +411,8 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy {
     /**
      * Start or continue a retake.
      *
-     * @param {number} pageId The page to load.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param pageId The page to load.
+     * @return Promise resolved when done.
      */
     protected launchRetake(pageId: number): Promise<any> {
         let promise;
@@ -453,7 +453,7 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy {
     /**
      * Load the lesson menu.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected loadMenu(): Promise<any> {
         if (this.loadingMenu) {
@@ -479,8 +479,8 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy {
     /**
      * Load a certain page.
      *
-     * @param {number} pageId The page to load.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param pageId The page to load.
+     * @return Promise resolved when done.
      */
     protected loadPage(pageId: number): Promise<any> {
         if (pageId == AddonModLessonProvider.LESSON_EOL) {
@@ -535,8 +535,8 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy {
     /**
      * Process a page, sending some data.
      *
-     * @param {any} data The data to send.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param data The data to send.
+     * @return Promise resolved when done.
      */
     protected processPage(data: any): Promise<any> {
         this.loaded = false;
@@ -605,7 +605,7 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy {
     /**
      * Review the lesson.
      *
-     * @param {number} pageId Page to load.
+     * @param pageId Page to load.
      */
     reviewLesson(pageId: number): void {
         this.loaded = false;
@@ -622,7 +622,7 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy {
     /**
      * Submit a question.
      *
-     * @param {Event} e Event.
+     * @param e Event.
      */
     submitQuestion(e: Event): void {
         e.preventDefault();
diff --git a/src/addon/mod/lesson/pages/user-retake/user-retake.ts b/src/addon/mod/lesson/pages/user-retake/user-retake.ts
index 394f78176..48a8ff7e9 100644
--- a/src/addon/mod/lesson/pages/user-retake/user-retake.ts
+++ b/src/addon/mod/lesson/pages/user-retake/user-retake.ts
@@ -72,7 +72,7 @@ export class AddonModLessonUserRetakePage implements OnInit {
     /**
      * Change the retake displayed.
      *
-     * @param {number} retakeNumber The new retake number.
+     * @param retakeNumber The new retake number.
      */
     changeRetake(retakeNumber: number): void {
         this.loaded = false;
@@ -88,7 +88,7 @@ export class AddonModLessonUserRetakePage implements OnInit {
     /**
      * Pull to refresh.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     doRefresh(refresher: any): void {
         this.refreshData().finally(() => {
@@ -99,7 +99,7 @@ export class AddonModLessonUserRetakePage implements OnInit {
     /**
      * Get lesson and retake data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchData(): Promise<any> {
         return this.lessonProvider.getLessonById(this.courseId, this.lessonId).then((lessonData) => {
@@ -166,7 +166,7 @@ export class AddonModLessonUserRetakePage implements OnInit {
     /**
      * Refreshes data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected refreshData(): Promise<any> {
         const promises = [];
@@ -187,8 +187,8 @@ export class AddonModLessonUserRetakePage implements OnInit {
     /**
      * Set the retake to view and load its data.
      *
-     * @param {number}retakeNumber Retake number to set.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param retakeNumber Retake number to set.
+     * @return Promise resolved when done.
      */
     protected setRetake(retakeNumber: number): Promise<any> {
         this.selectedRetake = retakeNumber;
diff --git a/src/addon/mod/lesson/providers/grade-link-handler.ts b/src/addon/mod/lesson/providers/grade-link-handler.ts
index f76eb8b52..27bf35d6e 100644
--- a/src/addon/mod/lesson/providers/grade-link-handler.ts
+++ b/src/addon/mod/lesson/providers/grade-link-handler.ts
@@ -39,12 +39,12 @@ export class AddonModLessonGradeLinkHandler extends CoreContentLinksModuleGradeH
     /**
      * Go to the page to review.
      *
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} courseId Course ID related to the URL.
-     * @param {string} siteId Site to use.
-     * @param {NavController} [navCtrl] Nav Controller to use to navigate.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL.
+     * @param siteId Site to use.
+     * @param navCtrl Nav Controller to use to navigate.
+     * @return Promise resolved when done.
      */
     protected goToReview(url: string, params: any, courseId: number, siteId: string, navCtrl?: NavController): Promise<any> {
 
@@ -83,11 +83,11 @@ export class AddonModLessonGradeLinkHandler extends CoreContentLinksModuleGradeH
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return this.lessonProvider.isPluginEnabled();
diff --git a/src/addon/mod/lesson/providers/helper.ts b/src/addon/mod/lesson/providers/helper.ts
index 234c0fd45..0fadbf3f5 100644
--- a/src/addon/mod/lesson/providers/helper.ts
+++ b/src/addon/mod/lesson/providers/helper.ts
@@ -33,8 +33,8 @@ export class AddonModLessonHelperProvider {
     /**
      * Given the HTML of next activity link, format it to extract the href and the text.
      *
-     * @param {string} activityLink HTML of the activity link.
-     * @return {{formatted: boolean, label: string, href: string}} Formatted data.
+     * @param activityLink HTML of the activity link.
+     * @return Formatted data.
      */
     formatActivityLink(activityLink: string): {formatted: boolean, label: string, href: string} {
         const element = this.domUtils.convertToElement(activityLink),
@@ -59,8 +59,8 @@ export class AddonModLessonHelperProvider {
     /**
      * Given the HTML of an answer from a content page, extract the data to render the answer.
      *
-     * @param  {String} html Answer's HTML.
-     * @return {{buttonText: string, content: string}} Data to render the answer.
+     * @param html Answer's HTML.
+     * @return Data to render the answer.
      */
     getContentPageAnswerDataFromHtml(html: string): {buttonText: string, content: string} {
         const data = {
@@ -86,8 +86,8 @@ export class AddonModLessonHelperProvider {
     /**
      * Get the buttons to change pages.
      *
-     * @param {string} html Page's HTML.
-     * @return {any[]} List of buttons.
+     * @param html Page's HTML.
+     * @return List of buttons.
      */
     getPageButtonsFromHtml(html: string): any[] {
         const buttons = [],
@@ -138,8 +138,8 @@ export class AddonModLessonHelperProvider {
     /**
      * Given a page data (result of getPageData), get the page contents.
      *
-     * @param {any} data Page data.
-     * @return {string} Page contents.
+     * @param data Page data.
+     * @return Page contents.
      */
     getPageContentsFromPageData(data: any): string {
         // Search the page contents inside the whole page HTML. Use data.pagecontent because it's filtered.
@@ -164,9 +164,9 @@ export class AddonModLessonHelperProvider {
     /**
      * Get a question and all the data required to render it from the page data (result of AddonModLessonProvider.getPageData).
      *
-     * @param {FormGroup} questionForm The form group where to add the controls.
-     * @param {any} pageData Page data (result of $mmaModLesson#getPageData).
-     * @return {any} Question data.
+     * @param questionForm The form group where to add the controls.
+     * @param pageData Page data (result of $mmaModLesson#getPageData).
+     * @return Question data.
      */
     getQuestionFromPageData(questionForm: FormGroup, pageData: any): any {
         const question: any = {},
@@ -359,9 +359,9 @@ export class AddonModLessonHelperProvider {
     /**
      * Given the HTML of an answer from a question page, extract the data to render the answer.
      *
-     * @param {string} html Answer's HTML.
-     * @return {any} Object with the data to render the answer. If the answer doesn't require any parsing, return a string with
-     *               the HTML.
+     * @param html Answer's HTML.
+     * @return Object with the data to render the answer. If the answer doesn't require any parsing, return a string with
+     *         the HTML.
      */
     getQuestionPageAnswerDataFromHtml(html: string): any {
         const data: any = {},
@@ -419,9 +419,9 @@ export class AddonModLessonHelperProvider {
     /**
      * Get a label to identify a retake (lesson attempt).
      *
-     * @param {any} retake Retake object.
-     * @param {boolean} [includeDuration] Whether to include the duration of the retake.
-     * @return {string} Retake label.
+     * @param retake Retake object.
+     * @param includeDuration Whether to include the duration of the retake.
+     * @return Retake label.
      */
     getRetakeLabel(retake: any, includeDuration?: boolean): string {
         const data = {
@@ -455,9 +455,9 @@ export class AddonModLessonHelperProvider {
     /**
      * Prepare the question data to be sent to server.
      *
-     * @param {any} question Question to prepare.
-     * @param {any} data Data to prepare.
-     * @return {any} Data to send.
+     * @param question Question to prepare.
+     * @param data Data to prepare.
+     * @return Data to send.
      */
     prepareQuestionData(question: any, data: any): any {
         if (question.template == 'essay' && question.textarea) {
@@ -478,8 +478,8 @@ export class AddonModLessonHelperProvider {
     /**
      * Given the feedback of a process page in HTML, remove the question text.
      *
-     * @param {string} html Feedback's HTML.
-     * @return {string} Feedback without the question text.
+     * @param html Feedback's HTML.
+     * @return Feedback without the question text.
      */
     removeQuestionFromFeedback(html: string): string {
         const element = this.domUtils.convertToElement(html);
diff --git a/src/addon/mod/lesson/providers/index-link-handler.ts b/src/addon/mod/lesson/providers/index-link-handler.ts
index 16d77cd6e..6228dcbf4 100644
--- a/src/addon/mod/lesson/providers/index-link-handler.ts
+++ b/src/addon/mod/lesson/providers/index-link-handler.ts
@@ -36,11 +36,11 @@ export class AddonModLessonIndexLinkHandler extends CoreContentLinksModuleIndexH
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -65,11 +65,11 @@ export class AddonModLessonIndexLinkHandler extends CoreContentLinksModuleIndexH
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return this.lessonProvider.isPluginEnabled();
@@ -78,12 +78,12 @@ export class AddonModLessonIndexLinkHandler extends CoreContentLinksModuleIndexH
     /**
      * Navigate to a lesson module (index page) with a fixed password.
      *
-     * @param {number} moduleId Module ID.
-     * @param {number} courseId Course ID.
-     * @param {string} password Password.
-     * @param {string} siteId Site ID.
-     * @param {NavController} navCtrl Navigation controller.
-     * @return {Promise<any>} Promise resolved when navigated.
+     * @param moduleId Module ID.
+     * @param courseId Course ID.
+     * @param password Password.
+     * @param siteId Site ID.
+     * @param navCtrl Navigation controller.
+     * @return Promise resolved when navigated.
      */
     protected navigateToModuleWithPassword(moduleId: number, courseId: number, password: string, siteId: string,
                                            navCtrl?: NavController): Promise<any> {
diff --git a/src/addon/mod/lesson/providers/lesson-offline.ts b/src/addon/mod/lesson/providers/lesson-offline.ts
index 1d7882461..7cfc872fb 100644
--- a/src/addon/mod/lesson/providers/lesson-offline.ts
+++ b/src/addon/mod/lesson/providers/lesson-offline.ts
@@ -138,12 +138,12 @@ export class AddonModLessonOfflineProvider {
     /**
      * Delete an offline attempt.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake Lesson retake number.
-     * @param {number} pageId Page ID.
-     * @param {number} timemodified The timemodified of the attempt.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param lessonId Lesson ID.
+     * @param retake Lesson retake number.
+     * @param pageId Page ID.
+     * @param timemodified The timemodified of the attempt.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     deleteAttempt(lessonId: number, retake: number, pageId: number, timemodified: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -159,9 +159,9 @@ export class AddonModLessonOfflineProvider {
     /**
      * Delete offline lesson retake.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     deleteRetake(lessonId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -172,11 +172,11 @@ export class AddonModLessonOfflineProvider {
     /**
      * Delete offline attempts for a retake and page.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake Lesson retake number.
-     * @param {number} pageId Page ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param lessonId Lesson ID.
+     * @param retake Lesson retake number.
+     * @param pageId Page ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     deleteRetakeAttemptsForPage(lessonId: number, retake: number, pageId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -188,13 +188,13 @@ export class AddonModLessonOfflineProvider {
     /**
      * Mark a retake as finished.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} courseId Course ID the lesson belongs to.
-     * @param {number} retake Retake number.
-     * @param {boolean} finished  Whether retake is finished.
-     * @param {boolean} outOfTime If the user ran out of time.
-     * @param {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}           Promise resolved in success, rejected otherwise.
+     * @param lessonId Lesson ID.
+     * @param courseId Course ID the lesson belongs to.
+     * @param retake Retake number.
+     * @param finished Whether retake is finished.
+     * @param outOfTime If the user ran out of time.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved in success, rejected otherwise.
      */
     finishRetake(lessonId: number, courseId: number, retake: number, finished?: boolean, outOfTime?: boolean, siteId?: string)
             : Promise<any> {
@@ -214,8 +214,8 @@ export class AddonModLessonOfflineProvider {
     /**
      * Get all the offline page attempts in a certain site.
      *
-     * @param {string} [siteId] Site ID. If not set, use current site.
-     * @return {Promise<any>} Promise resolved when the offline attempts are retrieved.
+     * @param siteId Site ID. If not set, use current site.
+     * @return Promise resolved when the offline attempts are retrieved.
      */
     getAllAttempts(siteId?: string): Promise<any> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
@@ -228,8 +228,8 @@ export class AddonModLessonOfflineProvider {
     /**
      * Get all the lessons that have offline data in a certain site.
      *
-     * @param {string} [siteId] Site ID. If not set, use current site.
-     * @return {Promise<any>} Promise resolved with an object containing the lessons.
+     * @param siteId Site ID. If not set, use current site.
+     * @return Promise resolved with an object containing the lessons.
      */
     getAllLessonsWithData(siteId?: string): Promise<any> {
         const promises = [],
@@ -257,8 +257,8 @@ export class AddonModLessonOfflineProvider {
     /**
      * Get all the offline retakes in a certain site.
      *
-     * @param {string} [siteId] Site ID. If not set, use current site.
-     * @return {Promise<any>} Promise resolved when the offline retakes are retrieved.
+     * @param siteId Site ID. If not set, use current site.
+     * @return Promise resolved when the offline retakes are retrieved.
      */
     getAllRetakes(siteId?: string): Promise<any> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
@@ -269,10 +269,10 @@ export class AddonModLessonOfflineProvider {
     /**
      * Retrieve the last offline attempt stored in a retake.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake Retake number.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the attempt (undefined if no attempts).
+     * @param lessonId Lesson ID.
+     * @param retake Retake number.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the attempt (undefined if no attempts).
      */
     getLastQuestionPageAttempt(lessonId: number, retake: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -297,9 +297,9 @@ export class AddonModLessonOfflineProvider {
     /**
      * Retrieve all offline attempts for a lesson.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the attempts.
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the attempts.
      */
     getLessonAttempts(lessonId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -312,8 +312,8 @@ export class AddonModLessonOfflineProvider {
     /**
      * Given a list of DB entries (either retakes or page attempts), get the list of lessons.
      *
-     * @param {any} lessons Object where to store the lessons.
-     * @param {any[]} entries List of DB entries.
+     * @param lessons Object where to store the lessons.
+     * @param entries List of DB entries.
      */
     protected getLessonsFromEntries(lessons: any, entries: any[]): void {
         entries.forEach((entry) => {
@@ -329,12 +329,12 @@ export class AddonModLessonOfflineProvider {
     /**
      * Get attempts for question pages and retake in a lesson.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake Retake number.
-     * @param {boolean} [correct] True to only fetch correct attempts, false to get them all.
-     * @param {number} [pageId] If defined, only get attempts on this page.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>}  Promise resolved with the attempts.
+     * @param lessonId Lesson ID.
+     * @param retake Retake number.
+     * @param correct True to only fetch correct attempts, false to get them all.
+     * @param pageId If defined, only get attempts on this page.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the attempts.
      */
     getQuestionsAttempts(lessonId: number, retake: number, correct?: boolean, pageId?: number, siteId?: string): Promise<any[]> {
         let promise;
@@ -361,9 +361,9 @@ export class AddonModLessonOfflineProvider {
     /**
      * Retrieve a retake from site DB.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the retake.
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the retake.
      */
     getRetake(lessonId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -374,10 +374,10 @@ export class AddonModLessonOfflineProvider {
     /**
      * Retrieve all offline attempts for a retake.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake   Retake number.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the retake attempts.
+     * @param lessonId Lesson ID.
+     * @param retake Retake number.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the retake attempts.
      */
     getRetakeAttempts(lessonId: number, retake: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -390,11 +390,11 @@ export class AddonModLessonOfflineProvider {
     /**
      * Retrieve offline attempts for a retake and page.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake   Lesson retake number.
-     * @param {number} pageId   Page ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved with the retake attempts.
+     * @param lessonId Lesson ID.
+     * @param retake Lesson retake number.
+     * @param pageId Page ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the retake attempts.
      */
     getRetakeAttemptsForPage(lessonId: number, retake: number, pageId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -408,11 +408,11 @@ export class AddonModLessonOfflineProvider {
     /**
      * Retrieve offline attempts for certain pages for a retake.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake   Retake number.
-     * @param {number} type     Type of the pages to get: TYPE_QUESTION or TYPE_STRUCTURE.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved with the retake attempts.
+     * @param lessonId Lesson ID.
+     * @param retake Retake number.
+     * @param type Type of the pages to get: TYPE_QUESTION or TYPE_STRUCTURE.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the retake attempts.
      */
     getRetakeAttemptsForType(lessonId: number, retake: number, type: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -426,11 +426,11 @@ export class AddonModLessonOfflineProvider {
     /**
      * Get stored retake. If not found or doesn't match the retake number, return a new one.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} courseId Course ID the lesson belongs to.
-     * @param {number} retake Retake number.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the retake.
+     * @param lessonId Lesson ID.
+     * @param courseId Course ID the lesson belongs to.
+     * @param retake Retake number.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the retake.
      */
     protected getRetakeWithFallback(lessonId: number, courseId: number, retake: number, siteId?: string): Promise<any> {
         // Get current stored retake.
@@ -455,9 +455,9 @@ export class AddonModLessonOfflineProvider {
     /**
      * Check if there is a finished retake for a certain lesson.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean.
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean.
      */
     hasFinishedRetake(lessonId: number, siteId?: string): Promise<boolean> {
         return this.getRetake(lessonId, siteId).then((retake) => {
@@ -470,9 +470,9 @@ export class AddonModLessonOfflineProvider {
     /**
      * Check if a lesson has offline data.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean.
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean.
      */
     hasOfflineData(lessonId: number, siteId?: string): Promise<boolean> {
         const promises = [];
@@ -498,10 +498,10 @@ export class AddonModLessonOfflineProvider {
     /**
      * Check if there are offline attempts for a retake.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake Retake number.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with a boolean.
+     * @param lessonId Lesson ID.
+     * @param retake Retake number.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with a boolean.
      */
     hasRetakeAttempts(lessonId: number, retake: number, siteId?: string): Promise<boolean> {
         return this.getRetakeAttempts(lessonId, retake, siteId).then((list) => {
@@ -514,8 +514,8 @@ export class AddonModLessonOfflineProvider {
     /**
      * Parse some properties of a page attempt.
      *
-     * @param {any} attempt The attempt to treat.
-     * @return {any} The treated attempt.
+     * @param attempt The attempt to treat.
+     * @return The treated attempt.
      */
     protected parsePageAttempt(attempt: any): any {
         attempt.data = this.textUtils.parseJSON(attempt.data);
@@ -527,8 +527,8 @@ export class AddonModLessonOfflineProvider {
     /**
      * Parse some properties of some page attempts.
      *
-     * @param {any[]} attempts The attempts to treat.
-     * @return {any[]} The treated attempts.
+     * @param attempts The attempts to treat.
+     * @return The treated attempts.
      */
     protected parsePageAttempts(attempts: any[]): any[] {
         attempts.forEach((attempt) => {
@@ -541,17 +541,17 @@ export class AddonModLessonOfflineProvider {
     /**
      * Process a lesson page, saving its data.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} courseId Course ID the lesson belongs to.
-     * @param {number} retake Retake number.
-     * @param {any} page Page.
-     * @param {any} data Data to save.
-     * @param {number} newPageId New page ID (calculated).
-     * @param {number} [answerId] The answer ID that the user answered.
-     * @param {boolean} [correct] If answer is correct. Only for question pages.
-     * @param {any} [userAnswer] The user's answer (userresponse from checkAnswer).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved in success, rejected otherwise.
+     * @param lessonId Lesson ID.
+     * @param courseId Course ID the lesson belongs to.
+     * @param retake Retake number.
+     * @param page Page.
+     * @param data Data to save.
+     * @param newPageId New page ID (calculated).
+     * @param answerId The answer ID that the user answered.
+     * @param correct If answer is correct. Only for question pages.
+     * @param userAnswer The user's answer (userresponse from checkAnswer).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved in success, rejected otherwise.
      */
     processPage(lessonId: number, courseId: number, retake: number, page: any, data: any, newPageId: number, answerId?: number,
             correct?: boolean, userAnswer?: any, siteId?: string): Promise<any> {
@@ -583,12 +583,12 @@ export class AddonModLessonOfflineProvider {
     /**
      * Set the last question page attempted in a retake.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} courseId Course ID the lesson belongs to.
-     * @param {number} retake Retake number.
-     * @param {number} lastPage ID of the last question page attempted.
-     * @param {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved in success, rejected otherwise.
+     * @param lessonId Lesson ID.
+     * @param courseId Course ID the lesson belongs to.
+     * @param retake Retake number.
+     * @param lastPage ID of the last question page attempted.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved in success, rejected otherwise.
      */
     setLastQuestionPageAttempted(lessonId: number, courseId: number, retake: number, lastPage: number, siteId?: string)
             : Promise<any> {
diff --git a/src/addon/mod/lesson/providers/lesson-sync.ts b/src/addon/mod/lesson/providers/lesson-sync.ts
index 1a1abdaf6..d17c76200 100644
--- a/src/addon/mod/lesson/providers/lesson-sync.ts
+++ b/src/addon/mod/lesson/providers/lesson-sync.ts
@@ -37,13 +37,11 @@ import { AddonModLessonPrefetchHandler } from './prefetch-handler';
 export interface AddonModLessonSyncResult {
     /**
      * List of warnings.
-     * @type {string[]}
      */
     warnings: string[];
 
     /**
      * Whether some data was sent to the server or offline data was updated.
-     * @type {boolean}
      */
     updated: boolean;
 }
@@ -108,9 +106,9 @@ export class AddonModLessonSyncProvider extends CoreCourseActivitySyncBaseProvid
     /**
      * Unmark a retake as finished in a synchronization.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     deleteRetakeFinishedInSync(lessonId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -123,9 +121,9 @@ export class AddonModLessonSyncProvider extends CoreCourseActivitySyncBaseProvid
     /**
      * Get a retake finished in a synchronization for a certain lesson (if any).
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the retake entry (undefined if no retake).
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the retake entry (undefined if no retake).
      */
     getRetakeFinishedInSync(lessonId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -138,10 +136,10 @@ export class AddonModLessonSyncProvider extends CoreCourseActivitySyncBaseProvid
     /**
      * Check if a lesson has data to synchronize.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake  Retake number.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether it has data to sync.
+     * @param lessonId Lesson ID.
+     * @param retake Retake number.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether it has data to sync.
      */
     hasDataToSync(lessonId: number, retake: number, siteId?: string): Promise<boolean> {
         const promises = [];
@@ -165,11 +163,11 @@ export class AddonModLessonSyncProvider extends CoreCourseActivitySyncBaseProvid
     /**
      * Mark a retake as finished in a synchronization.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake The retake number.
-     * @param {number} pageId The page ID to start reviewing from.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param lessonId Lesson ID.
+     * @param retake The retake number.
+     * @param pageId The page ID to start reviewing from.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     setRetakeFinishedInSync(lessonId: number, retake: number, pageId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -185,9 +183,9 @@ export class AddonModLessonSyncProvider extends CoreCourseActivitySyncBaseProvid
     /**
      * Try to synchronize all the lessons in a certain site or in all sites.
      *
-     * @param {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     syncAllLessons(siteId?: string, force?: boolean): Promise<any> {
         return this.syncOnSites('all lessons', this.syncAllLessonsFunc.bind(this), [force], siteId);
@@ -196,9 +194,9 @@ export class AddonModLessonSyncProvider extends CoreCourseActivitySyncBaseProvid
     /**
      * Sync all lessons on a site.
      *
-     * @param  {string} siteId Site ID to sync.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @param {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync.
+     * @param force Wether to force sync not depending on last execution.
+     * @param Promise resolved if sync is successful, rejected if sync fails.
      */
     protected syncAllLessonsFunc(siteId: string, force?: boolean): Promise<any> {
         // Get all the lessons that have something to be synchronized.
@@ -228,10 +226,10 @@ export class AddonModLessonSyncProvider extends CoreCourseActivitySyncBaseProvid
     /**
      * Sync a lesson only if a certain time has passed since the last time.
      *
-     * @param {any} lessonId Lesson ID.
-     * @param {boolean} [askPreflight] Whether we should ask for password if needed.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the lesson is synced or if it doesn't need to be synced.
+     * @param lessonId Lesson ID.
+     * @param askPreflight Whether we should ask for password if needed.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the lesson is synced or if it doesn't need to be synced.
      */
     syncLessonIfNeeded(lessonId: number, askPassword?: boolean, siteId?: string): Promise<any> {
         return this.isSyncNeeded(lessonId, siteId).then((needed) => {
@@ -244,11 +242,11 @@ export class AddonModLessonSyncProvider extends CoreCourseActivitySyncBaseProvid
     /**
      * Try to synchronize a lesson.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {boolean} askPassword True if we should ask for password if needed, false otherwise.
-     * @param {boolean} ignoreBlock True to ignore the sync block setting.
-     * @param {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<AddonModLessonSyncResult>} Promise resolved in success.
+     * @param lessonId Lesson ID.
+     * @param askPassword True if we should ask for password if needed, false otherwise.
+     * @param ignoreBlock True to ignore the sync block setting.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved in success.
      */
     syncLesson(lessonId: number, askPassword?: boolean, ignoreBlock?: boolean, siteId?: string): Promise<AddonModLessonSyncResult> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -458,12 +456,12 @@ export class AddonModLessonSyncProvider extends CoreCourseActivitySyncBaseProvid
     /**
      * Send an attempt to the site and delete it afterwards.
      *
-     * @param {any} lesson Lesson.
-     * @param {string} password Password (if any).
-     * @param {any} attempt Attempt to send.
-     * @param {AddonModLessonSyncResult} result Result where to store the data.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param lesson Lesson.
+     * @param password Password (if any).
+     * @param attempt Attempt to send.
+     * @param result Result where to store the data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     protected sendAttempt(lesson: any, password: string, attempt: any, result: AddonModLessonSyncResult, siteId?: string)
             : Promise<any> {
diff --git a/src/addon/mod/lesson/providers/lesson.ts b/src/addon/mod/lesson/providers/lesson.ts
index 72feffd7f..69f5daca7 100644
--- a/src/addon/mod/lesson/providers/lesson.ts
+++ b/src/addon/mod/lesson/providers/lesson.ts
@@ -58,43 +58,36 @@ export interface AddonModLessonRecordAttemptResult extends AddonModLessonCheckAn
 export interface AddonModLessonGrade {
     /**
      * Number of questions answered.
-     * @type {number}
      */
     nquestions: number;
 
     /**
      * Number of question attempts.
-     * @type {number}
      */
     attempts: number;
 
     /**
      * Max points possible.
-     * @type {number}
      */
     total: number;
 
     /**
      * Points earned by the student.
-     * @type {number}
      */
     earned: number;
 
     /**
      * Calculated percentage grade.
-     * @type {number}
      */
     grade: number;
 
     /**
      * Numer of manually graded questions.
-     * @type {number}
      */
     nmanual: number;
 
     /**
      * Point value for manually graded questions.
-     * @type {number}
      */
     manualpoints: number;
 }
@@ -200,12 +193,12 @@ export class AddonModLessonProvider {
     /**
      * Add an answer and its response to a feedback string (HTML).
      *
-     * @param {string} feedback The current feedback.
-     * @param {string} answer Student answer.
-     * @param {number} answerFormat Answer format.
-     * @param {string} response Response.
-     * @param {string} className Class to add to the response.
-     * @return {string} New feedback.
+     * @param feedback The current feedback.
+     * @param answer Student answer.
+     * @param answerFormat Answer format.
+     * @param response Response.
+     * @param className Class to add to the response.
+     * @return New feedback.
      */
     protected addAnswerAndResponseToFeedback(feedback: string, answer: string, answerFormat: number, response: string,
             className: string): string {
@@ -229,9 +222,9 @@ export class AddonModLessonProvider {
     /**
      * Add a message to a list of messages, following the format of the messages returned by WS.
      *
-     * @param {any[]} messages List of messages where to add the message.
-     * @param {string} stringName The ID of the message to be translated. E.g. 'addon.mod_lesson.numberofpagesviewednotice'.
-     * @param {any} [stringParams] The params of the message (if any).
+     * @param messages List of messages where to add the message.
+     * @param stringName The ID of the message to be translated. E.g. 'addon.mod_lesson.numberofpagesviewednotice'.
+     * @param stringParams The params of the message (if any).
      */
     protected addMessage(messages: any[], stringName: string, stringParams?: any): void {
         messages.push({
@@ -242,10 +235,10 @@ export class AddonModLessonProvider {
     /**
      * Add a property to the result of the "process EOL page" simulation in offline.
      *
-     * @param {any} result Result where to add the value.
-     * @param {string} name Name of the property.
-     * @param {any} value Value to add.
-     * @param {boolean} addMessage Whether to add a message related to the value.
+     * @param result Result where to add the value.
+     * @param name Name of the property.
+     * @param value Value to add.
+     * @param addMessage Whether to add a message related to the value.
      */
     protected addResultValueEolPage(result: any, name: string, value: any, addMessage?: boolean): void {
         let message = '';
@@ -265,8 +258,8 @@ export class AddonModLessonProvider {
     /**
      * Check if an answer page (from getUserRetake) is a content page.
      *
-     * @param {any} page Answer page.
-     * @return {boolean} Whether it's a content page.
+     * @param page Answer page.
+     * @return Whether it's a content page.
      */
     answerPageIsContent(page: any): boolean {
         // The page doesn't have any reliable field to use for checking this. Check qtype first (translated string).
@@ -291,8 +284,8 @@ export class AddonModLessonProvider {
     /**
      * Check if an answer page (from getUserRetake) is a question page.
      *
-     * @param {any} page Answer page.
-     * @return {boolean} Whether it's a question page.
+     * @param page Answer page.
+     * @return Whether it's a question page.
      */
     answerPageIsQuestion(page: any): boolean {
         if (!page.answerdata) {
@@ -320,13 +313,13 @@ export class AddonModLessonProvider {
     /**
      * Calculate some offline data like progress and ongoingscore.
      *
-     * @param {any} lesson Lesson.
-     * @param {any} accessInfo Result of get access info.
-     * @param {string} [password] Lesson password (if any).
-     * @param {boolean} [review] If the user wants to review just after finishing (1 hour margin).
-     * @param {any} [pageIndex] Object containing all the pages indexed by ID. If not defined, it will be calculated.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<{reviewmode: boolean, progress: number, ongoingscore: string}>} Promise resolved with the data.
+     * @param lesson Lesson.
+     * @param accessInfo Result of get access info.
+     * @param password Lesson password (if any).
+     * @param review If the user wants to review just after finishing (1 hour margin).
+     * @param pageIndex Object containing all the pages indexed by ID. If not defined, it will be calculated.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the data.
      */
     protected calculateOfflineData(lesson: any, accessInfo?: any, password?: string, review?: boolean, pageIndex?: any,
             siteId?: string): Promise<{reviewmode: boolean, progress: number, ongoingscore: string}> {
@@ -365,13 +358,13 @@ export class AddonModLessonProvider {
      * Calculate the progress of the current user in the lesson.
      * Based on Moodle's calculate_progress.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {any} accessInfo Result of get access info.
-     * @param {string} [password] Lesson password (if any).
-     * @param {boolean} [review] If the user wants to review just after finishing (1 hour margin).
-     * @param {any} [pageIndex] Object containing all the pages indexed by ID. If not defined, it will be calculated.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with a number: the progress (scale 0-100).
+     * @param lessonId Lesson ID.
+     * @param accessInfo Result of get access info.
+     * @param password Lesson password (if any).
+     * @param review If the user wants to review just after finishing (1 hour margin).
+     * @param pageIndex Object containing all the pages indexed by ID. If not defined, it will be calculated.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with a number: the progress (scale 0-100).
      */
     calculateProgress(lessonId: number, accessInfo: any, password?: string, review?: boolean, pageIndex?: any, siteId?: string)
             : Promise<number> {
@@ -429,12 +422,12 @@ export class AddonModLessonProvider {
      * Check if the answer provided by the user is correct or not and return the result object.
      * This method is based on the check_answer implementation of all page types (Moodle).
      *
-     * @param {any} lesson Lesson.
-     * @param {any} pageData Result of getPageData for the page to process.
-     * @param {any} data Data containing the user answer.
-     * @param {any} jumps Result of get pages possible jumps.
-     * @param {any} pageIndex Object containing all the pages indexed by ID.
-     * @return {AddonModLessonCheckAnswerResult} Result.
+     * @param lesson Lesson.
+     * @param pageData Result of getPageData for the page to process.
+     * @param data Data containing the user answer.
+     * @param jumps Result of get pages possible jumps.
+     * @param pageIndex Object containing all the pages indexed by ID.
+     * @return Result.
      */
     protected checkAnswer(lesson: any, pageData: any, data: any, jumps: any, pageIndex: any): AddonModLessonCheckAnswerResult {
         // Default result.
@@ -492,9 +485,9 @@ export class AddonModLessonProvider {
     /**
      * Check an essay answer.
      *
-     * @param {any} pageData Result of getPageData for the page to process.
-     * @param {any} data Data containing the user answer.
-     * @param {AddonModLessonCheckAnswerResult} result Object where to store the result.
+     * @param pageData Result of getPageData for the page to process.
+     * @param data Data containing the user answer.
+     * @param result Object where to store the result.
      */
     protected checkAnswerEssay(pageData: any, data: any, result: AddonModLessonCheckAnswerResult): void {
         let studentAnswer;
@@ -549,9 +542,9 @@ export class AddonModLessonProvider {
     /**
      * Check a matching answer.
      *
-     * @param {any} pageData Result of getPageData for the page to process.
-     * @param {any} data Data containing the user answer.
-     * @param {AddonModLessonCheckAnswerResult} result Object where to store the result.
+     * @param pageData Result of getPageData for the page to process.
+     * @param data Data containing the user answer.
+     * @param result Object where to store the result.
      */
     protected checkAnswerMatching(pageData: any, data: any, result: AddonModLessonCheckAnswerResult): void {
         if (!data) {
@@ -620,11 +613,11 @@ export class AddonModLessonProvider {
     /**
      * Check a multichoice answer.
      *
-     * @param {any} lesson Lesson.
-     * @param {any} pageData Result of getPageData for the page to process.
-     * @param {any} data Data containing the user answer.
-     * @param {any} pageIndex Object containing all the pages indexed by ID.
-     * @param {AddonModLessonCheckAnswerResult} result Object where to store the result.
+     * @param lesson Lesson.
+     * @param pageData Result of getPageData for the page to process.
+     * @param data Data containing the user answer.
+     * @param pageIndex Object containing all the pages indexed by ID.
+     * @param result Object where to store the result.
      */
     protected checkAnswerMultichoice(lesson: any, pageData: any, data: any, pageIndex: any,
             result: AddonModLessonCheckAnswerResult): void {
@@ -751,11 +744,11 @@ export class AddonModLessonProvider {
     /**
      * Check a numerical answer.
      *
-     * @param {any} lesson Lesson.
-     * @param {any} pageData Result of getPageData for the page to process.
-     * @param {any} data Data containing the user answer.
-     * @param {any} pageIndex Object containing all the pages indexed by ID.
-     * @param {any} result Object where to store the result.
+     * @param lesson Lesson.
+     * @param pageData Result of getPageData for the page to process.
+     * @param data Data containing the user answer.
+     * @param pageIndex Object containing all the pages indexed by ID.
+     * @param result Object where to store the result.
      */
     protected checkAnswerNumerical(lesson: any, pageData: any, data: any, pageIndex: any, result: AddonModLessonCheckAnswerResult)
             : void {
@@ -807,11 +800,11 @@ export class AddonModLessonProvider {
     /**
      * Check a short answer.
      *
-     * @param {any} lesson Lesson.
-     * @param {any} pageData Result of getPageData for the page to process.
-     * @param {any} data Data containing the user answer.
-     * @param {any} pageIndex Object containing all the pages indexed by ID.
-     * @param {any} result Object where to store the result.
+     * @param lesson Lesson.
+     * @param pageData Result of getPageData for the page to process.
+     * @param data Data containing the user answer.
+     * @param pageIndex Object containing all the pages indexed by ID.
+     * @param result Object where to store the result.
      */
     protected checkAnswerShort(lesson: any, pageData: any, data: any, pageIndex: any, result: AddonModLessonCheckAnswerResult)
             : void {
@@ -925,11 +918,11 @@ export class AddonModLessonProvider {
     /**
      * Check a truefalse answer.
      *
-     * @param {any} lesson Lesson.
-     * @param {any} pageData Result of getPageData for the page to process.
-     * @param {any} data Data containing the user answer.
-     * @param {any} pageIndex Object containing all the pages indexed by ID.
-     * @param {any} result Object where to store the result.
+     * @param lesson Lesson.
+     * @param pageData Result of getPageData for the page to process.
+     * @param data Data containing the user answer.
+     * @param pageIndex Object containing all the pages indexed by ID.
+     * @param result Object where to store the result.
      */
     protected checkAnswerTruefalse(lesson: any, pageData: any, data: any, pageIndex: any, result: AddonModLessonCheckAnswerResult)
             : void {
@@ -959,9 +952,9 @@ export class AddonModLessonProvider {
     /**
      * Check the "other answers" value.
      *
-     * @param {any} lesson Lesson.
-     * @param {any} pageData Result of getPageData for the page to process.
-     * @param {AddonModLessonCheckAnswerResult} result Object where to store the result.
+     * @param lesson Lesson.
+     * @param pageData Result of getPageData for the page to process.
+     * @param result Object where to store the result.
      */
     protected checkOtherAnswers(lesson: any, pageData: any, result: AddonModLessonCheckAnswerResult): void {
         // We could check here to see if we have a wrong answer jump to use.
@@ -986,8 +979,8 @@ export class AddonModLessonProvider {
     /**
      * Create a list of pages indexed by page ID based on a list of pages.
      *
-     * @param {Object[]} pageList Result of get pages.
-     * @return {any} Pages index.
+     * @param pageList Result of get pages.
+     * @return Pages index.
      */
     protected createPagesIndex(pageList: any[]): any {
         // Index the pages by page ID.
@@ -1003,15 +996,15 @@ export class AddonModLessonProvider {
     /**
      * Finishes a retake.
      *
-     * @param {any} lesson Lesson.
-     * @param {number} courseId Course ID the lesson belongs to.
-     * @param {string} [password] Lesson password (if any).
-     * @param {boolean} [outOfTime] If the user ran out of time.
-     * @param {boolean} [review] If the user wants to review just after finishing (1 hour margin).
-     * @param {boolean} [offline] Whether it's offline mode.
-     * @param {any} [accessInfo] Result of get access info. Required if offline is true.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved in success, rejected otherwise.
+     * @param lesson Lesson.
+     * @param courseId Course ID the lesson belongs to.
+     * @param password Lesson password (if any).
+     * @param outOfTime If the user ran out of time.
+     * @param review If the user wants to review just after finishing (1 hour margin).
+     * @param offline Whether it's offline mode.
+     * @param accessInfo Result of get access info. Required if offline is true.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved in success, rejected otherwise.
      */
     finishRetake(lesson: any, courseId: number, password?: string, outOfTime?: boolean, review?: boolean, offline?: boolean,
             accessInfo?: any, siteId?: string): Promise<any> {
@@ -1144,12 +1137,12 @@ export class AddonModLessonProvider {
     /**
      * Finishes a retake. It will fail if offline or cannot connect.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [password] Lesson password (if any).
-     * @param {boolean} [outOfTime] If the user ran out of time.
-     * @param {boolean} [review] If the user wants to review just after finishing (1 hour margin).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved in success, rejected otherwise.
+     * @param lessonId Lesson ID.
+     * @param password Lesson password (if any).
+     * @param outOfTime If the user ran out of time.
+     * @param review If the user wants to review just after finishing (1 hour margin).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved in success, rejected otherwise.
      */
     finishRetakeOnline(lessonId: number, password?: string, outOfTime?: boolean, review?: boolean, siteId?: string): Promise<any> {
 
@@ -1186,11 +1179,11 @@ export class AddonModLessonProvider {
     /**
      * Get the access information of a certain lesson.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {boolean} [forceCache] Whether it should always return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the access information.
+     * @param lessonId Lesson ID.
+     * @param forceCache Whether it should always return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the access information.
      */
     getAccessInformation(lessonId: number, forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1215,8 +1208,8 @@ export class AddonModLessonProvider {
     /**
      * Get cache key for access information WS calls.
      *
-     * @param {number} lessonId Lesson ID.
-     * @return {string} Cache key.
+     * @param lessonId Lesson ID.
+     * @return Cache key.
      */
     protected getAccessInformationCacheKey(lessonId: number): string {
         return this.ROOT_CACHE_KEY + 'accessInfo:' + lessonId;
@@ -1225,10 +1218,10 @@ export class AddonModLessonProvider {
     /**
      * Get content pages viewed in online and offline.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake Retake number.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<{online: any[], offline: any[]}>} Promise resolved with an object with the online and offline viewed pages.
+     * @param lessonId Lesson ID.
+     * @param retake Retake number.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with an object with the online and offline viewed pages.
      */
     getContentPagesViewed(lessonId: number, retake: number, siteId?: string): Promise<{online: any[], offline: any[]}> {
         const promises = [],
@@ -1258,9 +1251,9 @@ export class AddonModLessonProvider {
     /**
      * Get cache key for get content pages viewed WS calls.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake Retake number.
-     * @return {string} Cache key.
+     * @param lessonId Lesson ID.
+     * @param retake Retake number.
+     * @return Cache key.
      */
     protected getContentPagesViewedCacheKey(lessonId: number, retake: number): string {
         return this.getContentPagesViewedCommonCacheKey(lessonId) + ':' + retake;
@@ -1269,8 +1262,8 @@ export class AddonModLessonProvider {
     /**
      * Get common cache key for get content pages viewed WS calls.
      *
-     * @param {number} lessonId Lesson ID.
-     * @return {string} Cache key.
+     * @param lessonId Lesson ID.
+     * @return Cache key.
      */
     protected getContentPagesViewedCommonCacheKey(lessonId: number): string {
         return this.ROOT_CACHE_KEY + 'contentPagesViewed:' + lessonId;
@@ -1279,10 +1272,10 @@ export class AddonModLessonProvider {
     /**
      * Get IDS of content pages viewed in online and offline.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake Retake number.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number[]>} Promise resolved with list of IDs.
+     * @param lessonId Lesson ID.
+     * @param retake Retake number.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with list of IDs.
      */
     getContentPagesViewedIds(lessonId: number, retake: number, siteId?: string): Promise<number[]> {
         return this.getContentPagesViewed(lessonId, retake, siteId).then((result) => {
@@ -1304,12 +1297,12 @@ export class AddonModLessonProvider {
     /**
      * Get the list of content pages viewed in the site for a certain retake.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake Retake number.
-     * @param {boolean} [forceCache] Whether it should always return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the viewed pages.
+     * @param lessonId Lesson ID.
+     * @param retake Retake number.
+     * @param forceCache Whether it should always return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the viewed pages.
      */
     getContentPagesViewedOnline(lessonId: number, retake: number, forceCache?: boolean, ignoreCache?: boolean, siteId?: string)
             : Promise<any[]> {
@@ -1339,10 +1332,10 @@ export class AddonModLessonProvider {
     /**
      * Get the last content page viewed.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake Retake number.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the last content page viewed.
+     * @param lessonId Lesson ID.
+     * @param retake Retake number.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the last content page viewed.
      */
     getLastContentPageViewed(lessonId: number, retake: number, siteId?: string): Promise<any> {
         return this.getContentPagesViewed(lessonId, retake, siteId).then((data) => {
@@ -1373,10 +1366,10 @@ export class AddonModLessonProvider {
      * Get the last page seen.
      * Based on Moodle's get_last_page_seen.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake Retake number.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number>} Promise resolved with the last page seen.
+     * @param lessonId Lesson ID.
+     * @param retake Retake number.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the last page seen.
      */
     getLastPageSeen(lessonId: number, retake: number, siteId?: string): Promise<number> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -1411,12 +1404,12 @@ export class AddonModLessonProvider {
     /**
      * Get a Lesson by module ID.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} cmid Course module ID.
-     * @param {boolean} [forceCache] Whether it should always return cached data.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the lesson is retrieved.
+     * @param courseId Course ID.
+     * @param cmid Course module ID.
+     * @param forceCache Whether it should always return cached data.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the lesson is retrieved.
      */
     getLesson(courseId: number, cmId: number, forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.getLessonByField(courseId, 'coursemodule', cmId, forceCache, ignoreCache, siteId);
@@ -1425,13 +1418,13 @@ export class AddonModLessonProvider {
     /**
      * Get a Lesson with key=value. If more than one is found, only the first will be returned.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} key Name of the property to check.
-     * @param {any} value Value to search.
-     * @param {boolean} [forceCache] Whether it should always return cached data.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the lesson is retrieved.
+     * @param courseId Course ID.
+     * @param key Name of the property to check.
+     * @param value Value to search.
+     * @param forceCache Whether it should always return cached data.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the lesson is retrieved.
      */
     protected getLessonByField(courseId: number, key: string, value: any, forceCache?: boolean, ignoreCache?: boolean,
             siteId?: string): Promise<any> {
@@ -1471,12 +1464,12 @@ export class AddonModLessonProvider {
     /**
      * Get a Lesson by lesson ID.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} id Lesson ID.
-     * @param {boolean} [forceCache] Whether it should always return cached data.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the lesson is retrieved.
+     * @param courseId Course ID.
+     * @param id Lesson ID.
+     * @param forceCache Whether it should always return cached data.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the lesson is retrieved.
      */
     getLessonById(courseId: number, id: number, forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.getLessonByField(courseId, 'id', id, forceCache, ignoreCache, siteId);
@@ -1485,8 +1478,8 @@ export class AddonModLessonProvider {
     /**
      * Get cache key for Lesson data WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getLessonDataCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'lesson:' + courseId;
@@ -1495,14 +1488,14 @@ export class AddonModLessonProvider {
     /**
      * Get a lesson protected with password.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [password] Password.
-     * @param {boolean} [validatePassword=true] If true, the function will fail if the password is wrong.
-     *                                          If false, it will return a lesson with the basic data if password is wrong.
-     * @param {boolean} [forceCache] Whether it should always return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the lesson.
+     * @param lessonId Lesson ID.
+     * @param password Password.
+     * @param validatePassword If true, the function will fail if the password is wrong.
+     *                         If false, it will return a lesson with the basic data if password is wrong.
+     * @param forceCache Whether it should always return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the lesson.
      */
     getLessonWithPassword(lessonId: number, password?: string, validatePassword: boolean = true, forceCache?: boolean,
             ignoreCache?: boolean, siteId?: string): Promise<any> {
@@ -1549,8 +1542,8 @@ export class AddonModLessonProvider {
     /**
      * Get cache key for get lesson with password WS calls.
      *
-     * @param {number} lessonId Lesson ID.
-     * @return {string} Cache key.
+     * @param lessonId Lesson ID.
+     * @return Cache key.
      */
     protected getLessonWithPasswordCacheKey(lessonId: number): string {
         return this.ROOT_CACHE_KEY + 'lessonWithPswrd:' + lessonId;
@@ -1559,10 +1552,10 @@ export class AddonModLessonProvider {
     /**
      * Given a page ID, a jumpto and all the possible jumps, calcualate the new page ID.
      *
-     * @param {number} pageId Current page ID.
-     * @param {number} jumpTo The jumpto.
-     * @param {any} jumps Result of get pages possible jumps.
-     * @return {number} New page ID.
+     * @param pageId Current page ID.
+     * @param jumpTo The jumpto.
+     * @param jumps Result of get pages possible jumps.
+     * @return New page ID.
      */
     protected getNewPageId(pageId: number, jumpTo: number, jumps: any): number {
         // If jump not found, return current jumpTo.
@@ -1579,13 +1572,13 @@ export class AddonModLessonProvider {
     /**
      * Get the ongoing score message for the user (depending on the user permission and lesson settings).
      *
-     * @param {any} lesson Lesson.
-     * @param {any} accessInfo Result of get access info.
-     * @param {string} [password] Lesson password (if any).
-     * @param {boolean} [review] If the user wants to review just after finishing (1 hour margin).
-     * @param {any} [pageIndex] Object containing all the pages indexed by ID. If not provided, it will be calculated.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<string>} Promise resolved with the ongoing score message.
+     * @param lesson Lesson.
+     * @param accessInfo Result of get access info.
+     * @param password Lesson password (if any).
+     * @param review If the user wants to review just after finishing (1 hour margin).
+     * @param pageIndex Object containing all the pages indexed by ID. If not provided, it will be calculated.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the ongoing score message.
      */
     getOngoingScoreMessage(lesson: any, accessInfo: any, password?: string, review?: boolean, pageIndex?: any, siteId?: string)
             : Promise<string> {
@@ -1619,12 +1612,12 @@ export class AddonModLessonProvider {
     /**
      * Get the possible answers from a page.
      *
-     * @param {any} lesson Lesson.
-     * @param {number} pageId Page ID.
-     * @param {string} [password] Lesson password (if any).
-     * @param {boolean} [review] If the user wants to review just after finishing (1 hour margin).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the list of possible answers.
+     * @param lesson Lesson.
+     * @param pageId Page ID.
+     * @param password Lesson password (if any).
+     * @param review If the user wants to review just after finishing (1 hour margin).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of possible answers.
      */
     protected getPageAnswers(lesson: any, pageId: number, password?: string, review?: boolean, siteId?: string): Promise<any[]> {
         return this.getPageData(lesson, pageId, password, review, true, true, false, undefined, undefined, siteId).then((data) => {
@@ -1635,12 +1628,12 @@ export class AddonModLessonProvider {
     /**
      * Get all the possible answers from a list of pages, indexed by answerId.
      *
-     * @param {any} lesson Lesson.
-     * @param {number[]} pageIds List of page IDs.
-     * @param {string} [password] Lesson password (if any).
-     * @param {boolean} [review] If the user wants to review just after finishing (1 hour margin).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with an object containing the answers.
+     * @param lesson Lesson.
+     * @param pageIds List of page IDs.
+     * @param password Lesson password (if any).
+     * @param review If the user wants to review just after finishing (1 hour margin).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with an object containing the answers.
      */
     protected getPagesAnswers(lesson: any, pageIds: number[], password?: string, review?: boolean, siteId?: string)
             : Promise<any> {
@@ -1666,17 +1659,17 @@ export class AddonModLessonProvider {
     /**
      * Get page data.
      *
-     * @param {any} lesson Lesson.
-     * @param {number} pageId Page ID.
-     * @param {string} [password] Lesson password (if any).
-     * @param {boolean} [review] If the user wants to review just after finishing (1 hour margin).
-     * @param {boolean} [includeContents] Include the page rendered contents.
-     * @param {boolean} [forceCache] Whether it should always return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {any} [accessInfo] Result of get access info. Required if offline is true.
-     * @param {any} [jumps] Result of get pages possible jumps. Required if offline is true.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the page data.
+     * @param lesson Lesson.
+     * @param pageId Page ID.
+     * @param password Lesson password (if any).
+     * @param review If the user wants to review just after finishing (1 hour margin).
+     * @param includeContents Include the page rendered contents.
+     * @param forceCache Whether it should always return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param accessInfo Result of get access info. Required if offline is true.
+     * @param jumps Result of get pages possible jumps. Required if offline is true.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the page data.
      */
     getPageData(lesson: any, pageId: number, password?: string, review?: boolean, includeContents?: boolean, forceCache?: boolean,
             ignoreCache?: boolean, accessInfo?: any, jumps?: any, siteId?: string): Promise<any> {
@@ -1732,9 +1725,9 @@ export class AddonModLessonProvider {
     /**
      * Get cache key for get page data WS calls.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} pageId Page ID.
-     * @return {string} Cache key.
+     * @param lessonId Lesson ID.
+     * @param pageId Page ID.
+     * @return Cache key.
      */
     protected getPageDataCacheKey(lessonId: number, pageId: number): string {
         return this.getPageDataCommonCacheKey(lessonId) + ':' + pageId;
@@ -1743,8 +1736,8 @@ export class AddonModLessonProvider {
     /**
      * Get common cache key for get page data WS calls.
      *
-     * @param {number} lessonId Lesson ID.
-     * @return {string} Cache key.
+     * @param lessonId Lesson ID.
+     * @return Cache key.
      */
     protected getPageDataCommonCacheKey(lessonId: number): string {
         return this.ROOT_CACHE_KEY + 'pageData:' + lessonId;
@@ -1753,12 +1746,12 @@ export class AddonModLessonProvider {
     /**
      * Get lesson pages.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [password] Lesson password (if any).
-     * @param {boolean} [forceCache] Whether it should always return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the pages.
+     * @param lessonId Lesson ID.
+     * @param password Lesson password (if any).
+     * @param forceCache Whether it should always return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the pages.
      */
     getPages(lessonId: number, password?: string, forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any[]> {
 
@@ -1791,8 +1784,8 @@ export class AddonModLessonProvider {
     /**
      * Get cache key for get pages WS calls.
      *
-     * @param {number} lessonId Lesson ID.
-     * @return {string} Cache key.
+     * @param lessonId Lesson ID.
+     * @return Cache key.
      */
     protected getPagesCacheKey(lessonId: number): string {
         return this.ROOT_CACHE_KEY + 'pages:' + lessonId;
@@ -1801,11 +1794,11 @@ export class AddonModLessonProvider {
     /**
      * Get possible jumps for a lesson.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {boolean} [forceCache] Whether it should always return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the jumps.
+     * @param lessonId Lesson ID.
+     * @param forceCache Whether it should always return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the jumps.
      */
     getPagesPossibleJumps(lessonId: number, forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any> {
 
@@ -1847,8 +1840,8 @@ export class AddonModLessonProvider {
     /**
      * Get cache key for get pages possible jumps WS calls.
      *
-     * @param {number} lessonId Lesson ID.
-     * @return {string} Cache key.
+     * @param lessonId Lesson ID.
+     * @return Cache key.
      */
     protected getPagesPossibleJumpsCacheKey(lessonId: number): string {
         return this.ROOT_CACHE_KEY + 'pagesJumps:' + lessonId;
@@ -1859,12 +1852,12 @@ export class AddonModLessonProvider {
      * Please try to use WS response messages instead of this function if possible.
      * Based on Moodle's add_messages_on_page_process.
      *
-     * @param {any} lesson Lesson.
-     * @param {any} accessInfo Result of get access info.
-     * @param {any} result Result of process page.
-     * @param {boolean} review If the user wants to review just after finishing (1 hour margin).
-     * @param {any} jumps Result of get pages possible jumps.
-     * @return {any[]} Array with the messages.
+     * @param lesson Lesson.
+     * @param accessInfo Result of get access info.
+     * @param result Result of process page.
+     * @param review If the user wants to review just after finishing (1 hour margin).
+     * @param jumps Result of get pages possible jumps.
+     * @return Array with the messages.
      */
     getPageProcessMessages(lesson: any, accessInfo: any, result: any, review: boolean, jumps: any): any[] {
         const messages = [];
@@ -1894,12 +1887,12 @@ export class AddonModLessonProvider {
     /**
      * Get the IDs of all the pages that have at least 1 question attempt.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake Retake number.
-     * @param {boolean} [correct] True to only fetch correct attempts, false to get them all.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined, site's user.
-     * @return {Promise<number[]>} Promise resolved with the IDs.
+     * @param lessonId Lesson ID.
+     * @param retake Retake number.
+     * @param correct True to only fetch correct attempts, false to get them all.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined, site's user.
+     * @return Promise resolved with the IDs.
      */
     getPagesIdsWithQuestionAttempts(lessonId: number, retake: number, correct?: boolean, siteId?: string, userId?: number)
             : Promise<number[]> {
@@ -1925,14 +1918,14 @@ export class AddonModLessonProvider {
      * Please try to use WS response messages instead of this function if possible.
      * Based on Moodle's add_messages_on_page_view.
      *
-     * @param {any} lesson Lesson.
-     * @param {any} accessInfo Result of get access info. Required if offline is true.
-     * @param {any} page Page loaded.
-     * @param {boolean} review If the user wants to review just after finishing (1 hour margin).
-     * @param {any} jumps Result of get pages possible jumps.
-     * @param {string} [password] Lesson password (if any).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the list of messages.
+     * @param lesson Lesson.
+     * @param accessInfo Result of get access info. Required if offline is true.
+     * @param page Page loaded.
+     * @param review If the user wants to review just after finishing (1 hour margin).
+     * @param jumps Result of get pages possible jumps.
+     * @param password Lesson password (if any).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of messages.
      */
     getPageViewMessages(lesson: any, accessInfo: any, page: any, review: boolean, jumps: any, password?: string, siteId?: string)
             : Promise<any[]> {
@@ -1991,13 +1984,13 @@ export class AddonModLessonProvider {
     /**
      * Get questions attempts, including offline attempts.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake Retake number.
-     * @param {boolean} [correct] True to only fetch correct attempts, false to get them all.
-     * @param {number} [pageId] If defined, only get attempts on this page.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined, site's user.
-     * @return {Promise<{online: any[], offline: any[]}>} Promise resolved with the questions attempts.
+     * @param lessonId Lesson ID.
+     * @param retake Retake number.
+     * @param correct True to only fetch correct attempts, false to get them all.
+     * @param pageId If defined, only get attempts on this page.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined, site's user.
+     * @return Promise resolved with the questions attempts.
      */
     getQuestionsAttempts(lessonId: number, retake: number, correct?: boolean, pageId?: number, siteId?: string, userId?: number)
             : Promise<{online: any[], offline: any[]}> {
@@ -2028,10 +2021,10 @@ export class AddonModLessonProvider {
     /**
      * Get cache key for get questions attempts WS calls.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake Retake number.
-     * @param {number} userId User ID.
-     * @return {string} Cache key.
+     * @param lessonId Lesson ID.
+     * @param retake Retake number.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getQuestionsAttemptsCacheKey(lessonId: number, retake: number, userId: number): string {
         return this.getQuestionsAttemptsCommonCacheKey(lessonId) + ':' + userId + ':' + retake;
@@ -2040,8 +2033,8 @@ export class AddonModLessonProvider {
     /**
      * Get common cache key for get questions attempts WS calls.
      *
-     * @param {number} lessonId Lesson ID.
-     * @return {string} Cache key.
+     * @param lessonId Lesson ID.
+     * @return Cache key.
      */
     protected getQuestionsAttemptsCommonCacheKey(lessonId: number): string {
         return this.ROOT_CACHE_KEY + 'questionsAttempts:' + lessonId;
@@ -2050,15 +2043,15 @@ export class AddonModLessonProvider {
     /**
      * Get questions attempts from the site.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake Retake number.
-     * @param {boolean} [correct] True to only fetch correct attempts, false to get them all.
-     * @param {number} [pageId] If defined, only get attempts on this page.
-     * @param {boolean} [forceCache] Whether it should always return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined, site's user.
-     * @return {Promise<any[]>} Promise resolved with the questions attempts.
+     * @param lessonId Lesson ID.
+     * @param retake Retake number.
+     * @param correct True to only fetch correct attempts, false to get them all.
+     * @param pageId If defined, only get attempts on this page.
+     * @param forceCache Whether it should always return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined, site's user.
+     * @return Promise resolved with the questions attempts.
      */
     getQuestionsAttemptsOnline(lessonId: number, retake: number, correct?: boolean, pageId?: number, forceCache?: boolean,
             ignoreCache?: boolean, siteId?: string, userId?: number): Promise<any[]> {
@@ -2107,12 +2100,12 @@ export class AddonModLessonProvider {
     /**
      * Get the overview of retakes in a lesson (named "attempts overview" in Moodle).
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} [groupId] The group to get. If not defined, all participants.
-     * @param {boolean} [forceCache] Whether it should always return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the retakes overview.
+     * @param lessonId Lesson ID.
+     * @param groupId The group to get. If not defined, all participants.
+     * @param forceCache Whether it should always return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the retakes overview.
      */
     getRetakesOverview(lessonId: number, groupId?: number, forceCache?: boolean, ignoreCache?: boolean, siteId?: string)
             : Promise<any> {
@@ -2145,9 +2138,9 @@ export class AddonModLessonProvider {
     /**
      * Get cache key for get retakes overview WS calls.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} groupId Group ID.
-     * @return {string} Cache key.
+     * @param lessonId Lesson ID.
+     * @param groupId Group ID.
+     * @return Cache key.
      */
     protected getRetakesOverviewCacheKey(lessonId: number, groupId: number): string {
         return this.getRetakesOverviewCommonCacheKey(lessonId) + ':' + groupId;
@@ -2156,8 +2149,8 @@ export class AddonModLessonProvider {
     /**
      * Get common cache key for get retakes overview WS calls.
      *
-     * @param {number} lessonId Lesson ID.
-     * @return {string} Cache key.
+     * @param lessonId Lesson ID.
+     * @return Cache key.
      */
     protected getRetakesOverviewCommonCacheKey(lessonId: number): string {
         return this.ROOT_CACHE_KEY + 'retakesOverview:' + lessonId;
@@ -2166,9 +2159,9 @@ export class AddonModLessonProvider {
     /**
      * Get a password stored in DB.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<string>} Promise resolved with password on success, rejected otherwise.
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with password on success, rejected otherwise.
      */
     getStoredPassword(lessonId: number, siteId?: string): Promise<string> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2183,10 +2176,10 @@ export class AddonModLessonProvider {
      * encountered or no more pages exist.
      * Based on Moodle's get_sub_pages_of.
      *
-     * @param {any} pages Index of lesson pages, indexed by page ID. See createPagesIndex.
-     * @param {number} pageId Page ID to get subpages of.
-     * @param {number[]} end An array of LESSON_PAGE_* types that signify an end of the subtype.
-     * @return {Object[]} List of subpages.
+     * @param pages Index of lesson pages, indexed by page ID. See createPagesIndex.
+     * @param pageId Page ID to get subpages of.
+     * @param end An array of LESSON_PAGE_* types that signify an end of the subtype.
+     * @return List of subpages.
      */
     getSubpagesOf(pages: any, pageId: number, ends: number[]): any[] {
         const subPages = [];
@@ -2210,12 +2203,12 @@ export class AddonModLessonProvider {
     /**
      * Get lesson timers.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {boolean} [forceCache] Whether it should always return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @return {Promise<any[]>} Promise resolved with the pages.
+     * @param lessonId Lesson ID.
+     * @param forceCache Whether it should always return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined, site's current user.
+     * @return Promise resolved with the pages.
      */
     getTimers(lessonId: number, forceCache?: boolean, ignoreCache?: boolean, siteId?: string, userId?: number): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2245,9 +2238,9 @@ export class AddonModLessonProvider {
     /**
      * Get cache key for get timers WS calls.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} userId User ID.
-     * @return {string} Cache key.
+     * @param lessonId Lesson ID.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getTimersCacheKey(lessonId: number, userId: number): string {
         return this.getTimersCommonCacheKey(lessonId) + ':' + userId;
@@ -2256,8 +2249,8 @@ export class AddonModLessonProvider {
     /**
      * Get common cache key for get timers WS calls.
      *
-     * @param {number} lessonId Lesson ID.
-     * @return {string} Cache key.
+     * @param lessonId Lesson ID.
+     * @return Cache key.
      */
     protected getTimersCommonCacheKey(lessonId: number): string {
         return this.ROOT_CACHE_KEY + 'timers:' + lessonId;
@@ -2266,8 +2259,8 @@ export class AddonModLessonProvider {
     /**
      * Get the list of used answers (with valid answer) in a multichoice question page.
      *
-     * @param {any} pageData Result of getPageData for the page to process.
-     * @return {any[]} List of used answers.
+     * @param pageData Result of getPageData for the page to process.
+     * @return List of used answers.
      */
     protected getUsedAnswersMultichoice(pageData: any): any[] {
         const answers = this.utils.clone(pageData.answers);
@@ -2280,8 +2273,8 @@ export class AddonModLessonProvider {
     /**
      * Get the user's response in a matching question page.
      *
-     * @param {any} data Data containing the user answer.
-     * @return {any} User response.
+     * @param data Data containing the user answer.
+     * @return User response.
      */
     protected getUserResponseMatching(data: any): any {
         if (data.response) {
@@ -2306,8 +2299,8 @@ export class AddonModLessonProvider {
     /**
      * Get the user's response in a multichoice page if multiple answers are allowed.
      *
-     * @param {any} data Data containing the user answer.
-     * @return {any[]} User response.
+     * @param data Data containing the user answer.
+     * @return User response.
      */
     protected getUserResponseMultichoice(data: any): any[] {
         if (data.answer) {
@@ -2336,13 +2329,13 @@ export class AddonModLessonProvider {
     /**
      * Get a user's retake.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake Retake number
-     * @param {number} [userId] User ID. Undefined for current user.
-     * @param {boolean} [forceCache] Whether it should always return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the retake data.
+     * @param lessonId Lesson ID.
+     * @param retake Retake number
+     * @param userId User ID. Undefined for current user.
+     * @param forceCache Whether it should always return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the retake data.
      */
     getUserRetake(lessonId: number, retake: number, userId?: number, forceCache?: boolean, ignoreCache?: boolean, siteId?: string)
             : Promise<any> {
@@ -2374,10 +2367,10 @@ export class AddonModLessonProvider {
     /**
      * Get cache key for get user retake WS calls.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} userId User ID.
-     * @param {number} retake Retake number
-     * @return {string} Cache key.
+     * @param lessonId Lesson ID.
+     * @param userId User ID.
+     * @param retake Retake number
+     * @return Cache key.
      */
     protected getUserRetakeCacheKey(lessonId: number, userId: number, retake: number): string {
         return this.getUserRetakeUserCacheKey(lessonId, userId) + ':' + retake;
@@ -2386,9 +2379,9 @@ export class AddonModLessonProvider {
     /**
      * Get user cache key for get user retake WS calls.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} userId User ID.
-     * @return {string} Cache key.
+     * @param lessonId Lesson ID.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getUserRetakeUserCacheKey(lessonId: number, userId: number): string {
         return this.getUserRetakeLessonCacheKey(lessonId) + ':' + userId;
@@ -2397,8 +2390,8 @@ export class AddonModLessonProvider {
     /**
      * Get lesson cache key for get user retake WS calls.
      *
-     * @param {number} lessonId Lesson ID.
-     * @return {string} Cache key.
+     * @param lessonId Lesson ID.
+     * @return Cache key.
      */
     protected getUserRetakeLessonCacheKey(lessonId: number): string {
         return this.ROOT_CACHE_KEY + 'userRetake:' + lessonId;
@@ -2407,10 +2400,10 @@ export class AddonModLessonProvider {
     /**
      * Get the prevent access reason to display for a certain lesson.
      *
-     * @param {any} info Lesson access info.
-     * @param {boolean} [ignorePassword] Whether password protected reason should be ignored (user already entered the password).
-     * @param {boolean} [isReview] Whether user is reviewing a retake.
-     * @return {any} Prevent access reason.
+     * @param info Lesson access info.
+     * @param ignorePassword Whether password protected reason should be ignored (user already entered the password).
+     * @param isReview Whether user is reviewing a retake.
+     * @return Prevent access reason.
      */
     getPreventAccessReason(info: any, ignorePassword?: boolean, isReview?: boolean): any {
         let result;
@@ -2443,10 +2436,10 @@ export class AddonModLessonProvider {
      * Check if a jump is correct.
      * Based in Moodle's jumpto_is_correct.
      *
-     * @param {number} pageId ID of the page from which you are jumping from.
-     * @param {number} jumpTo The jumpto number.
-     * @param {any} pageIndex Object containing all the pages indexed by ID. See createPagesIndex.
-     * @return {boolean} Whether jump is correct.
+     * @param pageId ID of the page from which you are jumping from.
+     * @param jumpTo The jumpto number.
+     * @param pageIndex Object containing all the pages indexed by ID. See createPagesIndex.
+     * @return Whether jump is correct.
      */
     jumptoIsCorrect(pageId: number, jumpTo: number, pageIndex: any): boolean {
         // First test the special values.
@@ -2480,9 +2473,9 @@ export class AddonModLessonProvider {
     /**
      * Invalidates Lesson data.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAccessInformation(lessonId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2493,9 +2486,9 @@ export class AddonModLessonProvider {
     /**
      * Invalidates content pages viewed for all retakes.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContentPagesViewed(lessonId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2506,10 +2499,10 @@ export class AddonModLessonProvider {
     /**
      * Invalidates content pages viewed for a certain retake.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake Retake number.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param lessonId Lesson ID.
+     * @param retake Retake number.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContentPagesViewedForRetake(lessonId: number, retake: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2520,9 +2513,9 @@ export class AddonModLessonProvider {
     /**
      * Invalidates Lesson data.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateLessonData(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2533,9 +2526,9 @@ export class AddonModLessonProvider {
     /**
      * Invalidates lesson with password.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateLessonWithPassword(lessonId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2546,9 +2539,9 @@ export class AddonModLessonProvider {
     /**
      * Invalidates page data for all pages.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidatePageData(lessonId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2559,10 +2552,10 @@ export class AddonModLessonProvider {
     /**
      * Invalidates page data for a certain page.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} pageId Page ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param lessonId Lesson ID.
+     * @param pageId Page ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidatePageDataForPage(lessonId: number, pageId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2573,9 +2566,9 @@ export class AddonModLessonProvider {
     /**
      * Invalidates pages.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidatePages(lessonId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2586,9 +2579,9 @@ export class AddonModLessonProvider {
     /**
      * Invalidates pages possible jumps.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidatePagesPossibleJumps(lessonId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2599,9 +2592,9 @@ export class AddonModLessonProvider {
     /**
      * Invalidates questions attempts for all retakes.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateQuestionsAttempts(lessonId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2612,11 +2605,11 @@ export class AddonModLessonProvider {
     /**
      * Invalidates question attempts for a certain retake and user.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake Retake number.
-     * @param {string} [siteId] Site ID. If not defined, current site..
-     * @param {number} [userId] User ID. If not defined, site's user.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param lessonId Lesson ID.
+     * @param retake Retake number.
+     * @param siteId Site ID. If not defined, current site..
+     * @param userId User ID. If not defined, site's user.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateQuestionsAttemptsForRetake(lessonId: number, retake: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2629,9 +2622,9 @@ export class AddonModLessonProvider {
     /**
      * Invalidates retakes overview for all groups in a lesson.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateRetakesOverview(lessonId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2642,10 +2635,10 @@ export class AddonModLessonProvider {
     /**
      * Invalidates retakes overview for a certain group in a lesson.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} groupId Group ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param lessonId Lesson ID.
+     * @param groupId Group ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateRetakesOverviewForGroup(lessonId: number, groupId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2656,9 +2649,9 @@ export class AddonModLessonProvider {
     /**
      * Invalidates timers for all users in a lesson.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateTimers(lessonId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2669,10 +2662,10 @@ export class AddonModLessonProvider {
     /**
      * Invalidates timers for a certain user.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined, site's current user.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined, site's current user.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateTimersForUser(lessonId: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2685,11 +2678,11 @@ export class AddonModLessonProvider {
     /**
      * Invalidates a certain retake for a certain user.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} retake Retake number.
-     * @param {number} [userId] User ID. Undefined for current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param lessonId Lesson ID.
+     * @param retake Retake number.
+     * @param userId User ID. Undefined for current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateUserRetake(lessonId: number, retake: number, userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2702,9 +2695,9 @@ export class AddonModLessonProvider {
     /**
      * Invalidates all retakes for all users in a lesson.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateUserRetakesForLesson(lessonId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2715,10 +2708,10 @@ export class AddonModLessonProvider {
     /**
      * Invalidates all retakes for a certain user in a lesson.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} [userId] User ID. Undefined for current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param lessonId Lesson ID.
+     * @param userId User ID. Undefined for current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateUserRetakesForUser(lessonId: number, userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2731,11 +2724,11 @@ export class AddonModLessonProvider {
     /**
      * Check if a page answer is correct.
      *
-     * @param {any} lesson Lesson.
-     * @param {number} pageId The page ID.
-     * @param {any} answer The answer to check.
-     * @param {any} pageIndex Object containing all the pages indexed by ID.
-     * @return {boolean} Whether the answer is correct.
+     * @param lesson Lesson.
+     * @param pageId The page ID.
+     * @param answer The answer to check.
+     * @param pageIndex Object containing all the pages indexed by ID.
+     * @return Whether the answer is correct.
      */
     protected isAnswerCorrect(lesson: any, pageId: number, answer: any, pageIndex: any): boolean {
         if (lesson.custom) {
@@ -2749,8 +2742,8 @@ export class AddonModLessonProvider {
     /**
      * Check if a lesson is enabled to be used in offline.
      *
-     * @param {any} lesson Lesson.
-     * @return {boolean} Whether offline is enabled.
+     * @param lesson Lesson.
+     * @return Whether offline is enabled.
      */
     isLessonOffline(lesson: any): boolean {
         return !!lesson.allowofflineattempts;
@@ -2759,8 +2752,8 @@ export class AddonModLessonProvider {
     /**
      * Check if a lesson is password protected based in the access info.
      *
-     * @param {any} info Lesson access info.
-     * @return {boolean} Whether the lesson is password protected.
+     * @param info Lesson access info.
+     * @return Whether the lesson is password protected.
      */
     isPasswordProtected(info: any): boolean {
         if (info && info.preventaccessreasons) {
@@ -2779,8 +2772,8 @@ export class AddonModLessonProvider {
     /**
      * Return whether or not the plugin is enabled in a certain site. Plugin is enabled if the lesson WS are available.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
      */
     isPluginEnabled(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2792,8 +2785,8 @@ export class AddonModLessonProvider {
     /**
      * Check if a page is a question page or a content page.
      *
-     * @param {number} type Type of the page.
-     * @return {boolean} True if question page, false if content page.
+     * @param type Type of the page.
+     * @return True if question page, false if content page.
      */
     isQuestionPage(type: number): boolean {
         return type == AddonModLessonProvider.TYPE_QUESTION;
@@ -2802,12 +2795,12 @@ export class AddonModLessonProvider {
     /**
      * Start or continue a retake.
      *
-     * @param {string} id Lesson ID.
-     * @param {string} [password] Lesson password (if any).
-     * @param {number} [pageId] Page id to continue from (only when continuing a retake).
-     * @param {boolean} [review] If the user wants to review just after finishing (1 hour margin).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the WS call is successful.
+     * @param id Lesson ID.
+     * @param password Lesson password (if any).
+     * @param pageId Page id to continue from (only when continuing a retake).
+     * @param review If the user wants to review just after finishing (1 hour margin).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     launchRetake(id: number, password?: string, pageId?: number, review?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -2837,8 +2830,8 @@ export class AddonModLessonProvider {
     /**
      * Check if the user left during a timed session.
      *
-     * @param {any} info Lesson access info.
-     * @return {boolean} True if left during timed, false otherwise.
+     * @param info Lesson access info.
+     * @return True if left during timed, false otherwise.
      */
     leftDuringTimed(info: any): boolean {
         return info && info.lastpageseen && info.lastpageseen != AddonModLessonProvider.LESSON_EOL && info.leftduringtimedsession;
@@ -2848,8 +2841,8 @@ export class AddonModLessonProvider {
      * Checks to see if a LESSON_CLUSTERJUMP or a LESSON_UNSEENBRANCHPAGE is used in a lesson.
      * Based on Moodle's lesson_display_teacher_warning.
      *
-     * @param {any} jumps Result of get pages possible jumps.
-     * @return {boolean} Whether the lesson uses one of those jumps.
+     * @param jumps Result of get pages possible jumps.
+     * @return Whether the lesson uses one of those jumps.
      */
     lessonDisplayTeacherWarning(jumps: any): boolean {
         if (!jumps) {
@@ -2875,14 +2868,14 @@ export class AddonModLessonProvider {
      * Calculates a user's grade for a lesson.
      * Based on Moodle's lesson_grade.
      *
-     * @param {any} lesson Lesson.
-     * @param {number} retake Retake number.
-     * @param {string} [password] Lesson password (if any).
-     * @param {boolean} [review] If the user wants to review just after finishing (1 hour margin).
-     * @param {any} [pageIndex] Object containing all the pages indexed by ID. If not provided, it will be calculated.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined, site's user.
-     * @return {Promise<AddonModLessonCheckAnswerResult>} Promise resolved with the grade data.
+     * @param lesson Lesson.
+     * @param retake Retake number.
+     * @param password Lesson password (if any).
+     * @param review If the user wants to review just after finishing (1 hour margin).
+     * @param pageIndex Object containing all the pages indexed by ID. If not provided, it will be calculated.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined, site's user.
+     * @return Promise resolved with the grade data.
      */
     lessonGrade(lesson: any, retake: number, password?: string, review?: boolean, pageIndex?: any, siteId?: string,
             userId?: number): Promise<AddonModLessonGrade> {
@@ -3024,11 +3017,11 @@ export class AddonModLessonProvider {
     /**
      * Report a lesson as being viewed.
      *
-     * @param {string} id Module ID.
-     * @param {string} [password] Lesson password (if any).
-     * @param {string} [name] Name of the assign.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the WS call is successful.
+     * @param id Module ID.
+     * @param password Lesson password (if any).
+     * @param name Name of the assign.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logViewLesson(id: number, password?: string, name?: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -3049,17 +3042,17 @@ export class AddonModLessonProvider {
     /**
      * Process a lesson page, saving its data.
      *
-     * @param {any} lesson Lesson.
-     * @param {number} courseId Course ID the lesson belongs to.
-     * @param {any} pageData Result of getPageData for the page to process.
-     * @param {any} data Data to save.
-     * @param {string} [password] Lesson password (if any).
-     * @param {boolean} [review] If the user wants to review just after finishing (1 hour margin).
-     * @param {boolean} [offline] Whether it's offline mode.
-     * @param {any} [accessInfo] Result of get access info. Required if offline is true.
-     * @param {any} [jumps] Result of get pages possible jumps. Required if offline is true.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param lesson Lesson.
+     * @param courseId Course ID the lesson belongs to.
+     * @param pageData Result of getPageData for the page to process.
+     * @param data Data to save.
+     * @param password Lesson password (if any).
+     * @param review If the user wants to review just after finishing (1 hour margin).
+     * @param offline Whether it's offline mode.
+     * @param accessInfo Result of get access info. Required if offline is true.
+     * @param jumps Result of get pages possible jumps. Required if offline is true.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     processPage(lesson: any, courseId: number, pageData: any, data: any, password?: string, review?: boolean, offline?: boolean,
             accessInfo?: boolean, jumps?: any, siteId?: string): Promise<any> {
@@ -3118,13 +3111,13 @@ export class AddonModLessonProvider {
     /**
      * Process a lesson page, saving its data. It will fail if offline or cannot connect.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {number} pageId Page ID.
-     * @param {any} data Data to save.
-     * @param {string} [password] Lesson password (if any).
-     * @param {boolean} [review] If the user wants to review just after finishing (1 hour margin).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved in success, rejected otherwise.
+     * @param lessonId Lesson ID.
+     * @param pageId Page ID.
+     * @param data Data to save.
+     * @param password Lesson password (if any).
+     * @param review If the user wants to review just after finishing (1 hour margin).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved in success, rejected otherwise.
      */
     processPageOnline(lessonId: number, pageId: number, data: any, password?: string, review?: boolean, siteId?: string)
             : Promise<any> {
@@ -3149,16 +3142,16 @@ export class AddonModLessonProvider {
      * Records an attempt on a certain page.
      * Based on Moodle's record_attempt.
      *
-     * @param {any} lesson Lesson.
-     * @param {number} courseId Course ID the lesson belongs to.
-     * @param {any} pageData Result of getPageData for the page to process.
-     * @param {any} data Data to save.
-     * @param {boolean} review If the user wants to review just after finishing (1 hour margin).
-     * @param {any} accessInfo Result of get access info.
-     * @param {any} jumps Result of get pages possible jumps.
-     * @param {any} pageIndex Object containing all the pages indexed by ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<AddonModLessonRecordAttemptResult>} Promise resolved with the result.
+     * @param lesson Lesson.
+     * @param courseId Course ID the lesson belongs to.
+     * @param pageData Result of getPageData for the page to process.
+     * @param data Data to save.
+     * @param review If the user wants to review just after finishing (1 hour margin).
+     * @param accessInfo Result of get access info.
+     * @param jumps Result of get pages possible jumps.
+     * @param pageIndex Object containing all the pages indexed by ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the result.
      */
     protected recordAttempt(lesson: any, courseId: number, pageData: any, data: any, review: boolean, accessInfo: any, jumps: any,
             pageIndex: any, siteId?: string): Promise<AddonModLessonRecordAttemptResult> {
@@ -3333,9 +3326,9 @@ export class AddonModLessonProvider {
     /**
      * Remove a password stored in DB.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when removed.
+     * @param lessonId Lesson ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when removed.
      */
     removeStoredPassword(lessonId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -3346,10 +3339,10 @@ export class AddonModLessonProvider {
     /**
      * Store a password in DB.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {string} password Password to store.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when stored.
+     * @param lessonId Lesson ID.
+     * @param password Password to store.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when stored.
      */
     storePassword(lessonId: number, password: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -3368,11 +3361,11 @@ export class AddonModLessonProvider {
      * modify the list of viewedPagesIds for cluster pages.
      * Based on Moodle's valid_page_and_view.
      *
-     * @param {any} pages Index of lesson pages, indexed by page ID. See createPagesIndex.
-     * @param {any} page Page to check.
-     * @param {any} validPages Valid pages, indexed by page ID.
-     * @param {number[]} viewedPagesIds List of viewed pages IDs.
-     * @return {number} Next page ID.
+     * @param pages Index of lesson pages, indexed by page ID. See createPagesIndex.
+     * @param page Page to check.
+     * @param validPages Valid pages, indexed by page ID.
+     * @param viewedPagesIds List of viewed pages IDs.
+     * @return Next page ID.
      */
     validPageAndView(pages: any, page: any, validPages: any, viewedPagesIds: number[]): number {
 
diff --git a/src/addon/mod/lesson/providers/list-link-handler.ts b/src/addon/mod/lesson/providers/list-link-handler.ts
index d208a3bba..273e6d6f8 100644
--- a/src/addon/mod/lesson/providers/list-link-handler.ts
+++ b/src/addon/mod/lesson/providers/list-link-handler.ts
@@ -33,7 +33,7 @@ export class AddonModLessonListLinkHandler extends CoreContentLinksModuleListHan
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {Promise<boolean>} Promise resolved with boolean: whether or not the handler is enabled on a site level.
+     * @return Promise resolved with boolean: whether or not the handler is enabled on a site level.
      */
     isEnabled(): Promise<boolean> {
         return this.lessonProvider.isPluginEnabled();
diff --git a/src/addon/mod/lesson/providers/module-handler.ts b/src/addon/mod/lesson/providers/module-handler.ts
index ec28dc40c..a2e706cd0 100644
--- a/src/addon/mod/lesson/providers/module-handler.ts
+++ b/src/addon/mod/lesson/providers/module-handler.ts
@@ -45,7 +45,7 @@ export class AddonModLessonModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {Promise<boolean>} Promise resolved with boolean: whether or not the handler is enabled on a site level.
+     * @return Promise resolved with boolean: whether or not the handler is enabled on a site level.
      */
     isEnabled(): Promise<boolean> {
         return this.lessonProvider.isPluginEnabled();
@@ -54,10 +54,10 @@ export class AddonModLessonModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         return {
@@ -79,9 +79,9 @@ export class AddonModLessonModuleHandler implements CoreCourseModuleHandler {
      * Get the component to render the module. This is needed to support singleactivity course format.
      * The component returned must implement CoreCourseModuleMainComponent.
      *
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any} The component to use, undefined if not found.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component to use, undefined if not found.
      */
     getMainComponent(course: any, module: any): any {
         return AddonModLessonIndexComponent;
diff --git a/src/addon/mod/lesson/providers/prefetch-handler.ts b/src/addon/mod/lesson/providers/prefetch-handler.ts
index bbd7666c6..80a32c44b 100644
--- a/src/addon/mod/lesson/providers/prefetch-handler.ts
+++ b/src/addon/mod/lesson/providers/prefetch-handler.ts
@@ -50,8 +50,8 @@ export class AddonModLessonPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Ask password.
      *
-     * @param {any} info Lesson access info.
-     * @return {Promise<string>} Promise resolved with the password.
+     * @param info Lesson access info.
+     * @return Promise resolved with the password.
      */
     protected askUserPassword(info: any): Promise<string> {
         // Create and show the modal.
@@ -74,11 +74,11 @@ export class AddonModLessonPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Get the download size of a module.
      *
-     * @param {any} module Module.
-     * @param {Number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @return {Promise<{size: number, total: boolean}>} Promise resolved with the size and a boolean indicating if it was able
-     *                                                   to calculate the total size.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @return Promise resolved with the size and a boolean indicating if it was able
+     *         to calculate the total size.
      */
     getDownloadSize(module: any, courseId: any, single?: boolean): Promise<{ size: number, total: boolean }> {
         const siteId = this.sitesProvider.getCurrentSiteId();
@@ -115,12 +115,12 @@ export class AddonModLessonPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Get the lesson password if needed. If not stored, it can ask the user to enter it.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {boolean} [forceCache] Whether it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {boolean} [askPassword] True if we should ask for password if needed, false otherwise.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<{password?: string, lesson?: any, accessInfo: any}>} Promise resolved when done.
+     * @param lessonId Lesson ID.
+     * @param forceCache Whether it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param askPassword True if we should ask for password if needed, false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     getLessonPassword(lessonId: number, forceCache?: boolean, ignoreCache?: boolean, askPassword?: boolean, siteId?: string)
             : Promise<{password?: string, lesson?: any, accessInfo: any}> {
@@ -167,9 +167,9 @@ export class AddonModLessonPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId The course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId The course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         // Only invalidate the data that doesn't ignore cache when prefetching.
@@ -185,9 +185,9 @@ export class AddonModLessonPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Invalidate WS calls needed to determine module status.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when invalidated.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when invalidated.
      */
     invalidateModule(module: any, courseId: number): Promise<any> {
         const siteId = this.sitesProvider.getCurrentSiteId();
@@ -206,9 +206,9 @@ export class AddonModLessonPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Check if a module can be downloaded. If the function is not defined, we assume that all modules are downloadable.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {boolean|Promise<boolean>} Whether the module can be downloaded. The promise should never be rejected.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Whether the module can be downloaded. The promise should never be rejected.
      */
     isDownloadable(module: any, courseId: number): boolean | Promise<boolean> {
         const siteId = this.sitesProvider.getCurrentSiteId();
@@ -230,7 +230,7 @@ export class AddonModLessonPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
+     * @return A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.lessonProvider.isPluginEnabled();
@@ -239,11 +239,11 @@ export class AddonModLessonPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Prefetch a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
      */
     prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string): Promise<any> {
         return this.prefetchPackage(module, courseId, single, this.prefetchLesson.bind(this));
@@ -252,11 +252,11 @@ export class AddonModLessonPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Prefetch a lesson.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} single True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {String} siteId Site ID.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
      */
     protected prefetchLesson(module: any, courseId: number, single: boolean, siteId: string): Promise<any> {
         let lesson,
@@ -427,13 +427,13 @@ export class AddonModLessonPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Validate the password.
      *
-     * @param {number} lessonId Lesson ID.
-     * @param {any} info Lesson access info.
-     * @param {string} pwd Password to check.
-     * @param {boolean} [forceCache] Whether it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<{password: string, lesson: any, accessInfo: any}>} Promise resolved when done.
+     * @param lessonId Lesson ID.
+     * @param info Lesson access info.
+     * @param pwd Password to check.
+     * @param forceCache Whether it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     protected validatePassword(lessonId: number, info: any, pwd: string, forceCache?: boolean, ignoreCache?: boolean,
             siteId?: string): Promise<{password: string, lesson: any, accessInfo: any}> {
@@ -455,10 +455,10 @@ export class AddonModLessonPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Sync a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     sync(module: any, courseId: number, siteId?: any): Promise<any> {
         if (!this.syncProvider) {
diff --git a/src/addon/mod/lesson/providers/push-click-handler.ts b/src/addon/mod/lesson/providers/push-click-handler.ts
index 649436683..db47c4b56 100644
--- a/src/addon/mod/lesson/providers/push-click-handler.ts
+++ b/src/addon/mod/lesson/providers/push-click-handler.ts
@@ -33,8 +33,8 @@ export class AddonModLessonPushClickHandler implements CorePushNotificationsClic
     /**
      * Check if a notification click is handled by this handler.
      *
-     * @param {any} notification The notification to check.
-     * @return {boolean} Whether the notification click is handled by this handler
+     * @param notification The notification to check.
+     * @return Whether the notification click is handled by this handler
      */
     handles(notification: any): boolean | Promise<boolean> {
         if (this.utils.isTrueOrOne(notification.notif) && notification.moodlecomponent == 'mod_lesson' &&
@@ -49,8 +49,8 @@ export class AddonModLessonPushClickHandler implements CorePushNotificationsClic
     /**
      * Handle the notification click.
      *
-     * @param {any} notification The notification to check.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param notification The notification to check.
+     * @return Promise resolved when done.
      */
     handleClick(notification: any): Promise<any> {
         const data = notification.customdata || {},
diff --git a/src/addon/mod/lesson/providers/report-link-handler.ts b/src/addon/mod/lesson/providers/report-link-handler.ts
index 76d8703ac..790f110b2 100644
--- a/src/addon/mod/lesson/providers/report-link-handler.ts
+++ b/src/addon/mod/lesson/providers/report-link-handler.ts
@@ -40,11 +40,11 @@ export class AddonModLessonReportLinkHandler extends CoreContentLinksHandlerBase
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -67,11 +67,11 @@ export class AddonModLessonReportLinkHandler extends CoreContentLinksHandlerBase
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         if (params.action == 'reportdetail' && !params.userid) {
@@ -85,12 +85,12 @@ export class AddonModLessonReportLinkHandler extends CoreContentLinksHandlerBase
     /**
      * Open report overview.
      *
-     * @param {number} moduleId Module ID.
-     * @param {number} courseId Course ID.
-     * @param {string} groupId Group ID.
-     * @param {string} siteId Site ID.
-     * @param {NavController} [navCtrl] The NavController to use to navigate.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param moduleId Module ID.
+     * @param courseId Course ID.
+     * @param groupId Group ID.
+     * @param siteId Site ID.
+     * @param navCtrl The NavController to use to navigate.
+     * @return Promise resolved when done.
      */
     protected openReportOverview(moduleId: number, courseId?: number, groupId?: number, siteId?: string, navCtrl?: NavController)
             : Promise<any> {
@@ -119,14 +119,14 @@ export class AddonModLessonReportLinkHandler extends CoreContentLinksHandlerBase
     /**
      * Open a user's retake.
      *
-     * @param {number} moduleId Module ID.
-     * @param {number} userId User ID.
-     * @param {number} courseId Course ID.
-     * @param {number} retake Retake to open.
-     * @param {string} groupId Group ID.
-     * @param {string} siteId Site ID.
-     * @param {NavController} [navCtrl] The NavController to use to navigate.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param moduleId Module ID.
+     * @param userId User ID.
+     * @param courseId Course ID.
+     * @param retake Retake to open.
+     * @param groupId Group ID.
+     * @param siteId Site ID.
+     * @param navCtrl The NavController to use to navigate.
+     * @return Promise resolved when done.
      */
     protected openUserRetake(moduleId: number, userId: number, courseId: number, retake: number, siteId: string,
             navCtrl?: NavController): Promise<any> {
diff --git a/src/addon/mod/lesson/providers/sync-cron-handler.ts b/src/addon/mod/lesson/providers/sync-cron-handler.ts
index 3d204645a..446eb712c 100644
--- a/src/addon/mod/lesson/providers/sync-cron-handler.ts
+++ b/src/addon/mod/lesson/providers/sync-cron-handler.ts
@@ -29,9 +29,9 @@ export class AddonModLessonSyncCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         return this.lessonSync.syncAllLessons(siteId, force);
@@ -40,7 +40,7 @@ export class AddonModLessonSyncCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return this.lessonSync.syncInterval;
diff --git a/src/addon/mod/lti/components/index/index.ts b/src/addon/mod/lti/components/index/index.ts
index f61c1e50f..53819e792 100644
--- a/src/addon/mod/lti/components/index/index.ts
+++ b/src/addon/mod/lti/components/index/index.ts
@@ -57,10 +57,10 @@ export class AddonModLtiIndexComponent extends CoreCourseModuleMainActivityCompo
     /**
      * Get the LTI data.
      *
-     * @param {boolean} [refresh=false] If it's refreshing content.
-     * @param {boolean} [sync=false] If it should try to sync.
-     * @param {boolean} [showErrors=false] If show errors to the user of hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh If it's refreshing content.
+     * @param sync If it should try to sync.
+     * @param showErrors If show errors to the user of hide them.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<any> {
         return this.ltiProvider.getLti(this.courseId, this.module.id).then((ltiData) => {
@@ -76,7 +76,7 @@ export class AddonModLtiIndexComponent extends CoreCourseModuleMainActivityCompo
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         const promises = [];
diff --git a/src/addon/mod/lti/pages/index/index.ts b/src/addon/mod/lti/pages/index/index.ts
index ea6ab0034..7109d0d7d 100644
--- a/src/addon/mod/lti/pages/index/index.ts
+++ b/src/addon/mod/lti/pages/index/index.ts
@@ -40,7 +40,7 @@ export class AddonModLtiIndexPage {
     /**
      * Update some data based on the LTI instance.
      *
-     * @param {any} lti LTI instance.
+     * @param lti LTI instance.
      */
     updateData(lti: any): void {
         this.title = lti.name || this.title;
diff --git a/src/addon/mod/lti/providers/lti.ts b/src/addon/mod/lti/providers/lti.ts
index b9c1eea85..73eef5121 100644
--- a/src/addon/mod/lti/providers/lti.ts
+++ b/src/addon/mod/lti/providers/lti.ts
@@ -50,7 +50,7 @@ export class AddonModLtiProvider {
     /**
      * Delete launcher.
      *
-     * @return {Promise<any>} Promise resolved when the launcher file is deleted.
+     * @return Promise resolved when the launcher file is deleted.
      */
     deleteLauncher(): Promise<any> {
         return this.fileProvider.removeFile(this.LAUNCHER_FILE_NAME);
@@ -59,9 +59,9 @@ export class AddonModLtiProvider {
     /**
      * Generates a launcher file.
      *
-     * @param {string} url Launch URL.
-     * @param {AddonModLtiParam[]} params Launch params.
-     * @return {Promise<string>} Promise resolved with the file URL.
+     * @param url Launch URL.
+     * @param params Launch params.
+     * @return Promise resolved with the file URL.
      */
     generateLauncher(url: string, params: AddonModLtiParam[]): Promise<string> {
         if (!this.fileProvider.isAvailable()) {
@@ -100,9 +100,9 @@ export class AddonModLtiProvider {
     /**
      * Get a LTI.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} cmId Course module ID.
-     * @return {Promise<any>} Promise resolved when the LTI is retrieved.
+     * @param courseId Course ID.
+     * @param cmId Course module ID.
+     * @return Promise resolved when the LTI is retrieved.
      */
     getLti(courseId: number, cmId: number): Promise<any> {
         const params: any = {
@@ -128,8 +128,8 @@ export class AddonModLtiProvider {
     /**
      * Get cache key for LTI data WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getLtiCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'lti:' + courseId;
@@ -138,8 +138,8 @@ export class AddonModLtiProvider {
     /**
      * Get a LTI launch data.
      *
-     * @param {number} id LTI id.
-     * @return {Promise<any>} Promise resolved when the launch data is retrieved.
+     * @param id LTI id.
+     * @return Promise resolved when the launch data is retrieved.
      */
     getLtiLaunchData(id: number): Promise<any> {
         const params: any = {
@@ -166,8 +166,8 @@ export class AddonModLtiProvider {
     /**
      * Get cache key for LTI launch data WS calls.
      *
-     * @param {number} id LTI id.
-     * @return {string} Cache key.
+     * @param id LTI id.
+     * @return Cache key.
      */
     protected getLtiLaunchDataCacheKey(id: number): string {
         return this.ROOT_CACHE_KEY + 'launch:' + id;
@@ -176,8 +176,8 @@ export class AddonModLtiProvider {
     /**
      * Invalidates LTI data.
      *
-     * @param {number} courseId Course ID.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateLti(courseId: number): Promise<any> {
         return this.sitesProvider.getCurrentSite().invalidateWsCacheForKey(this.getLtiCacheKey(courseId));
@@ -186,8 +186,8 @@ export class AddonModLtiProvider {
     /**
      * Invalidates options.
      *
-     * @param {number} id LTI id.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param id LTI id.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateLtiLaunchData(id: number): Promise<any> {
         return this.sitesProvider.getCurrentSite().invalidateWsCacheForKey(this.getLtiLaunchDataCacheKey(id));
@@ -196,9 +196,9 @@ export class AddonModLtiProvider {
     /**
      * Launch LTI.
      *
-     * @param {string} url Launch URL.
-     * @param {AddonModLtiParam[]} params Launch params.
-     * @return {Promise<any>} Promise resolved when the WS call is successful.
+     * @param url Launch URL.
+     * @param params Launch params.
+     * @return Promise resolved when the WS call is successful.
      */
     launch(url: string, params: AddonModLtiParam[]): Promise<any> {
         if (!this.urlUtils.isHttpURL(url)) {
@@ -214,10 +214,10 @@ export class AddonModLtiProvider {
     /**
      * Report the LTI as being viewed.
      *
-     * @param {string} id LTI id.
-     * @param {string} [name] Name of the lti.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the WS call is successful.
+     * @param id LTI id.
+     * @param name Name of the lti.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(id: number, name?: string, siteId?: string): Promise<any> {
         const params: any = {
diff --git a/src/addon/mod/lti/providers/module-handler.ts b/src/addon/mod/lti/providers/module-handler.ts
index 351fd9020..36757b9a8 100644
--- a/src/addon/mod/lti/providers/module-handler.ts
+++ b/src/addon/mod/lti/providers/module-handler.ts
@@ -55,7 +55,7 @@ export class AddonModLtiModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -64,10 +64,10 @@ export class AddonModLtiModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         const data: CoreCourseModuleHandlerData = {
@@ -137,9 +137,9 @@ export class AddonModLtiModuleHandler implements CoreCourseModuleHandler {
      * Get the component to render the module. This is needed to support singleactivity course format.
      * The component returned must implement CoreCourseModuleMainComponent.
      *
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any} The component to use, undefined if not found.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component to use, undefined if not found.
      */
     getMainComponent(course: any, module: any): any {
         return AddonModLtiIndexComponent;
diff --git a/src/addon/mod/page/components/index/index.ts b/src/addon/mod/page/components/index/index.ts
index 254bc0f38..bc6b76671 100644
--- a/src/addon/mod/page/components/index/index.ts
+++ b/src/addon/mod/page/components/index/index.ts
@@ -64,7 +64,7 @@ export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComp
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         return this.pageProvider.invalidateContent(this.module.id, this.courseId);
@@ -73,8 +73,8 @@ export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComp
     /**
      * Download page contents.
      *
-     * @param {boolean} [refresh] Whether we're refreshing data.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Whether we're refreshing data.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh?: boolean): Promise<any> {
         let downloadFailed = false;
diff --git a/src/addon/mod/page/pages/index/index.ts b/src/addon/mod/page/pages/index/index.ts
index 089c14afb..8b224d3df 100644
--- a/src/addon/mod/page/pages/index/index.ts
+++ b/src/addon/mod/page/pages/index/index.ts
@@ -40,7 +40,7 @@ export class AddonModPageIndexPage {
     /**
      * Update some data based on the page instance.
      *
-     * @param {any} page Page instance.
+     * @param page Page instance.
      */
     updateData(page: any): void {
         this.title = page.name || this.title;
diff --git a/src/addon/mod/page/providers/helper.ts b/src/addon/mod/page/providers/helper.ts
index 0c15ecdff..13f7209a4 100644
--- a/src/addon/mod/page/providers/helper.ts
+++ b/src/addon/mod/page/providers/helper.ts
@@ -39,9 +39,9 @@ export class AddonModPageHelperProvider {
     /**
      * Gets the page HTML.
      *
-     * @param {any} contents The module contents.
-     * @param {number} moduleId The module ID.
-     * @return {Promise<string>} The HTML of the page.
+     * @param contents The module contents.
+     * @param moduleId The module ID.
+     * @return The HTML of the page.
      */
     getPageHtml(contents: any, moduleId: number): Promise<string> {
         let indexUrl,
@@ -100,8 +100,8 @@ export class AddonModPageHelperProvider {
     /**
      * Returns whether the file is the main page of the module.
      *
-     * @param {any} file An object returned from WS containing file info.
-     * @return {boolean}  Whether the file is the main page or not.
+     * @param file An object returned from WS containing file info.
+     * @return Whether the file is the main page or not.
      */
     protected isMainPage(file: any): boolean {
         const filename = file.filename || '',
diff --git a/src/addon/mod/page/providers/list-link-handler.ts b/src/addon/mod/page/providers/list-link-handler.ts
index 67358bb95..d56ba9d85 100644
--- a/src/addon/mod/page/providers/list-link-handler.ts
+++ b/src/addon/mod/page/providers/list-link-handler.ts
@@ -33,7 +33,7 @@ export class AddonModPageListLinkHandler extends CoreContentLinksModuleListHandl
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.pageProvider.isPluginEnabled();
diff --git a/src/addon/mod/page/providers/module-handler.ts b/src/addon/mod/page/providers/module-handler.ts
index 34b827807..f54293b51 100644
--- a/src/addon/mod/page/providers/module-handler.ts
+++ b/src/addon/mod/page/providers/module-handler.ts
@@ -45,7 +45,7 @@ export class AddonModPageModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.pageProvider.isPluginEnabled();
@@ -54,10 +54,10 @@ export class AddonModPageModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         return {
@@ -79,9 +79,9 @@ export class AddonModPageModuleHandler implements CoreCourseModuleHandler {
      * Get the component to render the module. This is needed to support singleactivity course format.
      * The component returned must implement CoreCourseModuleMainComponent.
      *
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any} The component to use, undefined if not found.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component to use, undefined if not found.
      */
     getMainComponent(course: any, module: any): any {
         return AddonModPageIndexComponent;
diff --git a/src/addon/mod/page/providers/page.ts b/src/addon/mod/page/providers/page.ts
index 95ac2f311..ba42a2412 100644
--- a/src/addon/mod/page/providers/page.ts
+++ b/src/addon/mod/page/providers/page.ts
@@ -40,10 +40,10 @@ export class AddonModPageProvider {
     /**
      * Get a page by course module ID.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} cmId     Course module ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the book is retrieved.
+     * @param courseId Course ID.
+     * @param cmId Course module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the book is retrieved.
      */
     getPageData(courseId: number, cmId: number, siteId?: string): Promise<any> {
         return this.getPageByKey(courseId, 'coursemodule', cmId, siteId);
@@ -52,11 +52,11 @@ export class AddonModPageProvider {
     /**
      * Get a page.
      *
-     * @param {number} courseId  Course ID.
-     * @param {string} key       Name of the property to check.
-     * @param {any}  value     Value to search.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}          Promise resolved when the book is retrieved.
+     * @param courseId Course ID.
+     * @param key Name of the property to check.
+     * @param value Value to search.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the book is retrieved.
      */
     protected getPageByKey(courseId: number, key: string, value: any, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -86,8 +86,8 @@ export class AddonModPageProvider {
     /**
      * Get cache key for page data WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @return {string}         Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getPageCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'page:' + courseId;
@@ -96,10 +96,9 @@ export class AddonModPageProvider {
     /**
      * Invalidate the prefetched content.
      *
-     * @param  {number} moduleId The module ID.
-     * @param  {number} courseId Course ID of the module.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}
+     * @param moduleId The module ID.
+     * @param courseId Course ID of the module.
+     * @param siteId Site ID. If not defined, current site.
      */
     invalidateContent(moduleId: number, courseId: number, siteId?: string): Promise<any> {
         const promises = [];
@@ -114,9 +113,9 @@ export class AddonModPageProvider {
     /**
      * Invalidates page data.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}   Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidatePageData(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -127,7 +126,7 @@ export class AddonModPageProvider {
     /**
      * Returns whether or not getPage WS available or not.
      *
-     * @return {boolean} If WS is avalaible.
+     * @return If WS is avalaible.
      * @since 3.3
      */
     isGetPageWSAvailable(): boolean {
@@ -137,8 +136,8 @@ export class AddonModPageProvider {
     /**
      * Return whether or not the plugin is enabled.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
      */
     isPluginEnabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -149,10 +148,10 @@ export class AddonModPageProvider {
     /**
      * Report a page as being viewed.
      *
-     * @param {number} id Module ID.
-     * @param {string} [name] Name of the page.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the WS call is successful.
+     * @param id Module ID.
+     * @param name Name of the page.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(id: number, name?: string, siteId?: string): Promise<any> {
         const params = {
diff --git a/src/addon/mod/page/providers/pluginfile-handler.ts b/src/addon/mod/page/providers/pluginfile-handler.ts
index 4fa49fcdc..dd7e928af 100644
--- a/src/addon/mod/page/providers/pluginfile-handler.ts
+++ b/src/addon/mod/page/providers/pluginfile-handler.ts
@@ -26,8 +26,8 @@ export class AddonModPagePluginFileHandler implements CorePluginFileHandler {
     /**
      * Return the RegExp to match the revision on pluginfile URLs.
      *
-     * @param {string[]} args Arguments of the pluginfile URL defining component and filearea at least.
-     * @return {RegExp} RegExp to match the revision on pluginfile URLs.
+     * @param args Arguments of the pluginfile URL defining component and filearea at least.
+     * @return RegExp to match the revision on pluginfile URLs.
      */
     getComponentRevisionRegExp(args: string[]): RegExp {
         // Check filearea.
@@ -40,8 +40,8 @@ export class AddonModPagePluginFileHandler implements CorePluginFileHandler {
     /**
      * Should return the string to remove the revision on pluginfile url.
      *
-     * @param {string[]} args Arguments of the pluginfile URL defining component and filearea at least.
-     * @return {string} String to remove the revision on pluginfile url.
+     * @param args Arguments of the pluginfile URL defining component and filearea at least.
+     * @return String to remove the revision on pluginfile url.
      */
     getComponentRevisionReplace(args: string[]): string {
         // Component + Filearea + Revision
diff --git a/src/addon/mod/page/providers/prefetch-handler.ts b/src/addon/mod/page/providers/prefetch-handler.ts
index 87000313c..69043da50 100644
--- a/src/addon/mod/page/providers/prefetch-handler.ts
+++ b/src/addon/mod/page/providers/prefetch-handler.ts
@@ -45,13 +45,13 @@ export class AddonModPagePrefetchHandler extends CoreCourseResourcePrefetchHandl
     /**
      * Download or prefetch the content.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @param {boolean} [prefetch] True to prefetch, false to download right away.
-     * @param {string} [dirPath] Path of the directory where to store all the content files. This is to keep the files
-     *                           relative paths and make the package work in an iframe. Undefined to download the files
-     *                           in the filepool root page.
-     * @return {Promise<any>} Promise resolved when all content is downloaded. Data returned is not reliable.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @param prefetch True to prefetch, false to download right away.
+     * @param dirPath Path of the directory where to store all the content files. This is to keep the files
+     *                relative paths and make the package work in an iframe. Undefined to download the files
+     *                in the filepool root page.
+     * @return Promise resolved when all content is downloaded. Data returned is not reliable.
      */
     downloadOrPrefetch(module: any, courseId: number, prefetch?: boolean, dirPath?: string): Promise<any> {
         const promises = [];
@@ -68,9 +68,9 @@ export class AddonModPagePrefetchHandler extends CoreCourseResourcePrefetchHandl
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         return this.pageProvider.invalidateContent(moduleId, courseId);
@@ -79,9 +79,9 @@ export class AddonModPagePrefetchHandler extends CoreCourseResourcePrefetchHandl
     /**
      * Invalidate WS calls needed to determine module status.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when invalidated.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when invalidated.
      */
     invalidateModule(module: any, courseId: number): Promise<any> {
         const promises = [];
diff --git a/src/addon/mod/quiz/accessrules/delaybetweenattempts/providers/handler.ts b/src/addon/mod/quiz/accessrules/delaybetweenattempts/providers/handler.ts
index d102e9c52..518904872 100644
--- a/src/addon/mod/quiz/accessrules/delaybetweenattempts/providers/handler.ts
+++ b/src/addon/mod/quiz/accessrules/delaybetweenattempts/providers/handler.ts
@@ -31,7 +31,7 @@ export class AddonModQuizAccessDelayBetweenAttemptsHandler implements AddonModQu
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -40,11 +40,11 @@ export class AddonModQuizAccessDelayBetweenAttemptsHandler implements AddonModQu
     /**
      * Whether the rule requires a preflight check when prefetch/start/continue an attempt.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} [attempt] The attempt started/continued. If not supplied, user is starting a new attempt.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean|Promise<boolean>} Whether the rule requires a preflight check.
+     * @param quiz The quiz the rule belongs to.
+     * @param attempt The attempt started/continued. If not supplied, user is starting a new attempt.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Whether the rule requires a preflight check.
      */
     isPreflightCheckRequired(quiz: any, attempt?: any, prefetch?: boolean, siteId?: string): boolean | Promise<boolean> {
         return false;
diff --git a/src/addon/mod/quiz/accessrules/ipaddress/providers/handler.ts b/src/addon/mod/quiz/accessrules/ipaddress/providers/handler.ts
index ca2d1f3d0..e8d4616f0 100644
--- a/src/addon/mod/quiz/accessrules/ipaddress/providers/handler.ts
+++ b/src/addon/mod/quiz/accessrules/ipaddress/providers/handler.ts
@@ -31,7 +31,7 @@ export class AddonModQuizAccessIpAddressHandler implements AddonModQuizAccessRul
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -40,11 +40,11 @@ export class AddonModQuizAccessIpAddressHandler implements AddonModQuizAccessRul
     /**
      * Whether the rule requires a preflight check when prefetch/start/continue an attempt.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} [attempt] The attempt started/continued. If not supplied, user is starting a new attempt.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean|Promise<boolean>} Whether the rule requires a preflight check.
+     * @param quiz The quiz the rule belongs to.
+     * @param attempt The attempt started/continued. If not supplied, user is starting a new attempt.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Whether the rule requires a preflight check.
      */
     isPreflightCheckRequired(quiz: any, attempt?: any, prefetch?: boolean, siteId?: string): boolean | Promise<boolean> {
         return false;
diff --git a/src/addon/mod/quiz/accessrules/numattempts/providers/handler.ts b/src/addon/mod/quiz/accessrules/numattempts/providers/handler.ts
index 125bb2e8c..e2027019d 100644
--- a/src/addon/mod/quiz/accessrules/numattempts/providers/handler.ts
+++ b/src/addon/mod/quiz/accessrules/numattempts/providers/handler.ts
@@ -31,7 +31,7 @@ export class AddonModQuizAccessNumAttemptsHandler implements AddonModQuizAccessR
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -40,11 +40,11 @@ export class AddonModQuizAccessNumAttemptsHandler implements AddonModQuizAccessR
     /**
      * Whether the rule requires a preflight check when prefetch/start/continue an attempt.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} [attempt] The attempt started/continued. If not supplied, user is starting a new attempt.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean|Promise<boolean>} Whether the rule requires a preflight check.
+     * @param quiz The quiz the rule belongs to.
+     * @param attempt The attempt started/continued. If not supplied, user is starting a new attempt.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Whether the rule requires a preflight check.
      */
     isPreflightCheckRequired(quiz: any, attempt?: any, prefetch?: boolean, siteId?: string): boolean | Promise<boolean> {
         return false;
diff --git a/src/addon/mod/quiz/accessrules/offlineattempts/providers/handler.ts b/src/addon/mod/quiz/accessrules/offlineattempts/providers/handler.ts
index 5b7988b06..b5b84382a 100644
--- a/src/addon/mod/quiz/accessrules/offlineattempts/providers/handler.ts
+++ b/src/addon/mod/quiz/accessrules/offlineattempts/providers/handler.ts
@@ -33,12 +33,12 @@ export class AddonModQuizAccessOfflineAttemptsHandler implements AddonModQuizAcc
     /**
      * Add preflight data that doesn't require user interaction. The data should be added to the preflightData param.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} preflightData Object where to add the preflight data.
-     * @param {any} [attempt] The attempt started/continued. If not supplied, user is starting a new attempt.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} Promise resolved when done if async, void if it's synchronous.
+     * @param quiz The quiz the rule belongs to.
+     * @param preflightData Object where to add the preflight data.
+     * @param attempt The attempt started/continued. If not supplied, user is starting a new attempt.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done if async, void if it's synchronous.
      */
     getFixedPreflightData(quiz: any, preflightData: any, attempt?: any, prefetch?: boolean, siteId?: string): void | Promise<any> {
         preflightData.confirmdatasaved = 1;
@@ -49,8 +49,8 @@ export class AddonModQuizAccessOfflineAttemptsHandler implements AddonModQuizAcc
      * Implement this if your access rule requires a preflight check with user interaction.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getPreflightComponent(injector: Injector): any | Promise<any> {
         return AddonModQuizAccessOfflineAttemptsComponent;
@@ -59,7 +59,7 @@ export class AddonModQuizAccessOfflineAttemptsHandler implements AddonModQuizAcc
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -68,11 +68,11 @@ export class AddonModQuizAccessOfflineAttemptsHandler implements AddonModQuizAcc
     /**
      * Whether the rule requires a preflight check when prefetch/start/continue an attempt.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} [attempt] The attempt started/continued. If not supplied, user is starting a new attempt.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean|Promise<boolean>} Whether the rule requires a preflight check.
+     * @param quiz The quiz the rule belongs to.
+     * @param attempt The attempt started/continued. If not supplied, user is starting a new attempt.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Whether the rule requires a preflight check.
      */
     isPreflightCheckRequired(quiz: any, attempt?: any, prefetch?: boolean, siteId?: string): boolean | Promise<boolean> {
         if (prefetch) {
diff --git a/src/addon/mod/quiz/accessrules/openclosedate/providers/handler.ts b/src/addon/mod/quiz/accessrules/openclosedate/providers/handler.ts
index b801b0e24..09c5d8af2 100644
--- a/src/addon/mod/quiz/accessrules/openclosedate/providers/handler.ts
+++ b/src/addon/mod/quiz/accessrules/openclosedate/providers/handler.ts
@@ -32,7 +32,7 @@ export class AddonModQuizAccessOpenCloseDateHandler implements AddonModQuizAcces
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -41,11 +41,11 @@ export class AddonModQuizAccessOpenCloseDateHandler implements AddonModQuizAcces
     /**
      * Whether the rule requires a preflight check when prefetch/start/continue an attempt.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} [attempt] The attempt started/continued. If not supplied, user is starting a new attempt.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean|Promise<boolean>} Whether the rule requires a preflight check.
+     * @param quiz The quiz the rule belongs to.
+     * @param attempt The attempt started/continued. If not supplied, user is starting a new attempt.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Whether the rule requires a preflight check.
      */
     isPreflightCheckRequired(quiz: any, attempt?: any, prefetch?: boolean, siteId?: string): boolean | Promise<boolean> {
         return false;
@@ -54,10 +54,10 @@ export class AddonModQuizAccessOpenCloseDateHandler implements AddonModQuizAcces
     /**
      * Whether or not the time left of an attempt should be displayed.
      *
-     * @param {any} attempt The attempt.
-     * @param {number} endTime The attempt end time (in seconds).
-     * @param {number} timeNow The current time in seconds.
-     * @return {boolean} Whether it should be displayed.
+     * @param attempt The attempt.
+     * @param endTime The attempt end time (in seconds).
+     * @param timeNow The current time in seconds.
+     * @return Whether it should be displayed.
      */
     shouldShowTimeLeft(attempt: any, endTime: number, timeNow: number): boolean {
         // If this is a teacher preview after the close date, do not show the time.
diff --git a/src/addon/mod/quiz/accessrules/password/providers/handler.ts b/src/addon/mod/quiz/accessrules/password/providers/handler.ts
index be42e7591..ac3c7a970 100644
--- a/src/addon/mod/quiz/accessrules/password/providers/handler.ts
+++ b/src/addon/mod/quiz/accessrules/password/providers/handler.ts
@@ -60,12 +60,12 @@ export class AddonModQuizAccessPasswordHandler implements AddonModQuizAccessRule
     /**
      * Add preflight data that doesn't require user interaction. The data should be added to the preflightData param.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} preflightData Object where to add the preflight data.
-     * @param {any} [attempt] The attempt started/continued. If not supplied, user is starting a new attempt.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} Promise resolved when done if async, void if it's synchronous.
+     * @param quiz The quiz the rule belongs to.
+     * @param preflightData Object where to add the preflight data.
+     * @param attempt The attempt started/continued. If not supplied, user is starting a new attempt.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done if async, void if it's synchronous.
      */
     getFixedPreflightData(quiz: any, preflightData: any, attempt?: any, prefetch?: boolean, siteId?: string): void | Promise<any> {
         if (quiz && quiz.id && typeof preflightData.quizpassword == 'undefined') {
@@ -81,9 +81,9 @@ export class AddonModQuizAccessPasswordHandler implements AddonModQuizAccessRule
     /**
      * Get a password stored in DB.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the DB entry on success.
+     * @param quizId Quiz ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the DB entry on success.
      */
     protected getPasswordEntry(quizId: number, siteId?: string): Promise<any> {
 
@@ -97,8 +97,8 @@ export class AddonModQuizAccessPasswordHandler implements AddonModQuizAccessRule
      * Implement this if your access rule requires a preflight check with user interaction.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getPreflightComponent(injector: Injector): any | Promise<any> {
         return AddonModQuizAccessPasswordComponent;
@@ -107,7 +107,7 @@ export class AddonModQuizAccessPasswordHandler implements AddonModQuizAccessRule
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -116,11 +116,11 @@ export class AddonModQuizAccessPasswordHandler implements AddonModQuizAccessRule
     /**
      * Whether the rule requires a preflight check when prefetch/start/continue an attempt.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} [attempt] The attempt started/continued. If not supplied, user is starting a new attempt.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean|Promise<boolean>} Whether the rule requires a preflight check.
+     * @param quiz The quiz the rule belongs to.
+     * @param attempt The attempt started/continued. If not supplied, user is starting a new attempt.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Whether the rule requires a preflight check.
      */
     isPreflightCheckRequired(quiz: any, attempt?: any, prefetch?: boolean, siteId?: string): boolean | Promise<boolean> {
         // If there's a password stored don't require the preflight since we'll use the stored one.
@@ -135,12 +135,12 @@ export class AddonModQuizAccessPasswordHandler implements AddonModQuizAccessRule
     /**
      * Function called when the preflight check has passed. This is a chance to record that fact in some way.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} attempt The attempt started/continued.
-     * @param {any} preflightData Preflight data gathered.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} Promise resolved when done if async, void if it's synchronous.
+     * @param quiz The quiz the rule belongs to.
+     * @param attempt The attempt started/continued.
+     * @param preflightData Preflight data gathered.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done if async, void if it's synchronous.
      */
     notifyPreflightCheckPassed(quiz: any, attempt: any, preflightData: any, prefetch?: boolean, siteId?: string)
             : void | Promise<any> {
@@ -154,12 +154,12 @@ export class AddonModQuizAccessPasswordHandler implements AddonModQuizAccessRule
     /**
      * Function called when the preflight check fails. This is a chance to record that fact in some way.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} attempt The attempt started/continued.
-     * @param {any} preflightData Preflight data gathered.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} Promise resolved when done if async, void if it's synchronous.
+     * @param quiz The quiz the rule belongs to.
+     * @param attempt The attempt started/continued.
+     * @param preflightData Preflight data gathered.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done if async, void if it's synchronous.
      */
     notifyPreflightCheckFailed?(quiz: any, attempt: any, preflightData: any, prefetch?: boolean, siteId?: string)
             : void | Promise<any> {
@@ -173,9 +173,9 @@ export class AddonModQuizAccessPasswordHandler implements AddonModQuizAccessRule
     /**
      * Remove a password from DB.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param quizId Quiz ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     protected removePassword(quizId: number, siteId?: string): Promise<any> {
 
@@ -187,10 +187,10 @@ export class AddonModQuizAccessPasswordHandler implements AddonModQuizAccessRule
     /**
      * Store a password in DB.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {string} password Password.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param quizId Quiz ID.
+     * @param password Password.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     protected storePassword(quizId: number, password: string, siteId?: string): Promise<any> {
 
diff --git a/src/addon/mod/quiz/accessrules/safebrowser/providers/handler.ts b/src/addon/mod/quiz/accessrules/safebrowser/providers/handler.ts
index b5ec88157..b17e263ea 100644
--- a/src/addon/mod/quiz/accessrules/safebrowser/providers/handler.ts
+++ b/src/addon/mod/quiz/accessrules/safebrowser/providers/handler.ts
@@ -31,7 +31,7 @@ export class AddonModQuizAccessSafeBrowserHandler implements AddonModQuizAccessR
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -40,11 +40,11 @@ export class AddonModQuizAccessSafeBrowserHandler implements AddonModQuizAccessR
     /**
      * Whether the rule requires a preflight check when prefetch/start/continue an attempt.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} [attempt] The attempt started/continued. If not supplied, user is starting a new attempt.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean|Promise<boolean>} Whether the rule requires a preflight check.
+     * @param quiz The quiz the rule belongs to.
+     * @param attempt The attempt started/continued. If not supplied, user is starting a new attempt.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Whether the rule requires a preflight check.
      */
     isPreflightCheckRequired(quiz: any, attempt?: any, prefetch?: boolean, siteId?: string): boolean | Promise<boolean> {
         return false;
diff --git a/src/addon/mod/quiz/accessrules/securewindow/providers/handler.ts b/src/addon/mod/quiz/accessrules/securewindow/providers/handler.ts
index d5bb5334b..218061e1f 100644
--- a/src/addon/mod/quiz/accessrules/securewindow/providers/handler.ts
+++ b/src/addon/mod/quiz/accessrules/securewindow/providers/handler.ts
@@ -31,7 +31,7 @@ export class AddonModQuizAccessSecureWindowHandler implements AddonModQuizAccess
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -40,11 +40,11 @@ export class AddonModQuizAccessSecureWindowHandler implements AddonModQuizAccess
     /**
      * Whether the rule requires a preflight check when prefetch/start/continue an attempt.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} [attempt] The attempt started/continued. If not supplied, user is starting a new attempt.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean|Promise<boolean>} Whether the rule requires a preflight check.
+     * @param quiz The quiz the rule belongs to.
+     * @param attempt The attempt started/continued. If not supplied, user is starting a new attempt.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Whether the rule requires a preflight check.
      */
     isPreflightCheckRequired(quiz: any, attempt?: any, prefetch?: boolean, siteId?: string): boolean | Promise<boolean> {
         return false;
diff --git a/src/addon/mod/quiz/accessrules/timelimit/providers/handler.ts b/src/addon/mod/quiz/accessrules/timelimit/providers/handler.ts
index 8ddc8083d..41a23fe40 100644
--- a/src/addon/mod/quiz/accessrules/timelimit/providers/handler.ts
+++ b/src/addon/mod/quiz/accessrules/timelimit/providers/handler.ts
@@ -34,8 +34,8 @@ export class AddonModQuizAccessTimeLimitHandler implements AddonModQuizAccessRul
      * Implement this if your access rule requires a preflight check with user interaction.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getPreflightComponent(injector: Injector): any | Promise<any> {
         return AddonModQuizAccessTimeLimitComponent;
@@ -44,7 +44,7 @@ export class AddonModQuizAccessTimeLimitHandler implements AddonModQuizAccessRul
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -53,11 +53,11 @@ export class AddonModQuizAccessTimeLimitHandler implements AddonModQuizAccessRul
     /**
      * Whether the rule requires a preflight check when prefetch/start/continue an attempt.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} [attempt] The attempt started/continued. If not supplied, user is starting a new attempt.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean|Promise<boolean>} Whether the rule requires a preflight check.
+     * @param quiz The quiz the rule belongs to.
+     * @param attempt The attempt started/continued. If not supplied, user is starting a new attempt.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Whether the rule requires a preflight check.
      */
     isPreflightCheckRequired(quiz: any, attempt?: any, prefetch?: boolean, siteId?: string): boolean | Promise<boolean> {
         // Warning only required if the attempt is not already started.
@@ -67,10 +67,10 @@ export class AddonModQuizAccessTimeLimitHandler implements AddonModQuizAccessRul
     /**
      * Whether or not the time left of an attempt should be displayed.
      *
-     * @param {any} attempt The attempt.
-     * @param {number} endTime The attempt end time (in seconds).
-     * @param {number} timeNow The current time in seconds.
-     * @return {boolean} Whether it should be displayed.
+     * @param attempt The attempt.
+     * @param endTime The attempt end time (in seconds).
+     * @param timeNow The current time in seconds.
+     * @return Whether it should be displayed.
      */
     shouldShowTimeLeft(attempt: any, endTime: number, timeNow: number): boolean {
         // If this is a teacher preview after the time limit expires, don't show the time left.
diff --git a/src/addon/mod/quiz/classes/auto-save.ts b/src/addon/mod/quiz/classes/auto-save.ts
index 9d31a9ab3..8a7be1f77 100644
--- a/src/addon/mod/quiz/classes/auto-save.ts
+++ b/src/addon/mod/quiz/classes/auto-save.ts
@@ -38,12 +38,12 @@ export class AddonModQuizAutoSave {
     /**
      * Constructor.
      *
-     * @param {string} formName Name of the form where the answers are stored.
-     * @param {string} buttonSelector Selector to find the button to show the connection error.
-     * @param {CoreLoggerProvider} loggerProvider CoreLoggerProvider instance.
-     * @param {PopoverController} popoverCtrl PopoverController instance.
-     * @param {CoreQuestionHelperProvider} questionHelper CoreQuestionHelperProvider instance.
-     * @param {AddonModQuizProvider} quizProvider AddonModQuizProvider instance.
+     * @param formName Name of the form where the answers are stored.
+     * @param buttonSelector Selector to find the button to show the connection error.
+     * @param loggerProvider CoreLoggerProvider instance.
+     * @param popoverCtrl PopoverController instance.
+     * @param questionHelper CoreQuestionHelperProvider instance.
+     * @param quizProvider AddonModQuizProvider instance.
      */
     constructor(protected formName: string, protected buttonSelector: string, loggerProvider: CoreLoggerProvider,
             protected popoverCtrl: PopoverController, protected questionHelper: CoreQuestionHelperProvider,
@@ -72,10 +72,10 @@ export class AddonModQuizAutoSave {
     /**
      * Check if the answers have changed in a page.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} attempt Attempt.
-     * @param {any} preflightData Preflight data.
-     * @param {boolean} [offline] Whether the quiz is being attempted in offline mode.
+     * @param quiz Quiz.
+     * @param attempt Attempt.
+     * @param preflightData Preflight data.
+     * @param offline Whether the quiz is being attempted in offline mode.
      */
     checkChanges(quiz: any, attempt: any, preflightData: any, offline?: boolean): void {
         if (this.autoSaveTimeout) {
@@ -110,7 +110,7 @@ export class AddonModQuizAutoSave {
     /**
      * Get answers from a form.
      *
-     * @return {any} Answers.
+     * @return Answers.
      */
     protected getAnswers(): any {
         return this.questionHelper.getAnswersFromForm(document.forms[this.formName]);
@@ -128,7 +128,7 @@ export class AddonModQuizAutoSave {
      * Returns an observable that will notify when an error happens or stops.
      * It will send true when there's an error, and false when the error has been ammended.
      *
-     * @return {BehaviorSubject<boolean>} Observable.
+     * @return Observable.
      */
     onError(): BehaviorSubject<boolean> {
         return this.errorObservable;
@@ -137,10 +137,10 @@ export class AddonModQuizAutoSave {
     /**
      * Schedule an auto save process if it's not scheduled already.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} attempt Attempt.
-     * @param {any} preflightData Preflight data.
-     * @param {boolean} [offline] Whether the quiz is being attempted in offline mode.
+     * @param quiz Quiz.
+     * @param attempt Attempt.
+     * @param preflightData Preflight data.
+     * @param offline Whether the quiz is being attempted in offline mode.
      */
     setAutoSaveTimer(quiz: any, attempt: any, preflightData: any, offline?: boolean): void {
         // Don't schedule if already shceduled or quiz is almost closed.
@@ -190,10 +190,10 @@ export class AddonModQuizAutoSave {
     /**
      * Start a process to periodically check changes in answers.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} attempt Attempt.
-     * @param {any} preflightData Preflight data.
-     * @param {boolean} [offline] Whether the quiz is being attempted in offline mode.
+     * @param quiz Quiz.
+     * @param attempt Attempt.
+     * @param preflightData Preflight data.
+     * @param offline Whether the quiz is being attempted in offline mode.
      */
     startCheckChangesProcess(quiz: any, attempt: any, preflightData: any, offline?: boolean): void {
         if (this.checkChangesInterval || !quiz.autosaveperiod) {
diff --git a/src/addon/mod/quiz/components/index/index.ts b/src/addon/mod/quiz/components/index/index.ts
index cabdb8406..5aae59e52 100644
--- a/src/addon/mod/quiz/components/index/index.ts
+++ b/src/addon/mod/quiz/components/index/index.ts
@@ -148,10 +148,10 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Get the quiz data.
      *
-     * @param {boolean} [refresh=false] If it's refreshing content.
-     * @param {boolean} [sync=false] If it should try to sync.
-     * @param {boolean} [showErrors=false] If show errors to the user of hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh If it's refreshing content.
+     * @param sync If it should try to sync.
+     * @param showErrors If show errors to the user of hide them.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<any> {
 
@@ -235,7 +235,7 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Get the user attempts in the quiz and the result info.
      *
-     * @return {Promise<void>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected getAttempts(): Promise<void> {
 
@@ -314,7 +314,7 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Get result info to show.
      *
-     * @return {Promise<void>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected getResultInfo(): Promise<void> {
 
@@ -370,7 +370,7 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Go to review an attempt that has just been finished.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected goToAutoReview(): Promise<any> {
         // If we go to auto review it means an attempt was finished. Check completion status.
@@ -393,8 +393,8 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Checks if sync has succeed from result sync data.
      *
-     * @param {any} result Data returned on the sync function.
-     * @return {boolean} If suceed or not.
+     * @param result Data returned on the sync function.
+     * @return If suceed or not.
      */
     protected hasSyncSucceed(result: any): boolean {
         if (result.attemptFinished) {
@@ -459,7 +459,7 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         const promises = [];
@@ -482,8 +482,8 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Compares sync event data with current data to check if refresh content is needed.
      *
-     * @param {any} syncEventData Data receiven on sync observer.
-     * @return {boolean} True if refresh is needed, false otherwise.
+     * @param syncEventData Data receiven on sync observer.
+     * @return True if refresh is needed, false otherwise.
      */
     protected isRefreshSyncNeeded(syncEventData: any): boolean {
         if (syncEventData.attemptFinished) {
@@ -510,8 +510,8 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Displays some data based on the current status.
      *
-     * @param {string} status The current status.
-     * @param {string} [previousStatus] The previous status. If not defined, there is no previous status.
+     * @param status The current status.
+     * @param previousStatus The previous status. If not defined, there is no previous status.
      */
     protected showStatus(status: string, previousStatus?: string): void {
         this.showStatusSpinner = status == CoreConstants.DOWNLOADING;
@@ -526,7 +526,7 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Performs the sync of the activity.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected sync(): Promise<any> {
         return this.quizSync.syncQuiz(this.quizData, true);
@@ -535,8 +535,8 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Treat user attempts.
      *
-     * @param {any} attempts The attempts to treat.
-     * @return {Promise<void>} Promise resolved when done.
+     * @param attempts The attempts to treat.
+     * @return Promise resolved when done.
      */
     protected treatAttempts(attempts: any): Promise<any> {
         if (!attempts || !attempts.length) {
diff --git a/src/addon/mod/quiz/pages/attempt/attempt.ts b/src/addon/mod/quiz/pages/attempt/attempt.ts
index 8119dbea7..ea7befc58 100644
--- a/src/addon/mod/quiz/pages/attempt/attempt.ts
+++ b/src/addon/mod/quiz/pages/attempt/attempt.ts
@@ -57,7 +57,7 @@ export class AddonModQuizAttemptPage implements OnInit {
     /**
      * Refresh the data.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     doRefresh(refresher: any): void {
         this.refreshData().finally(() => {
@@ -68,7 +68,7 @@ export class AddonModQuizAttemptPage implements OnInit {
     /**
      * Get quiz data and attempt data.
      *
-     * @return {Promise<void>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchQuizData(): Promise<void> {
         return this.quizProvider.getQuizById(this.courseId, this.quizId).then((quizData) => {
@@ -84,7 +84,7 @@ export class AddonModQuizAttemptPage implements OnInit {
     /**
      * Get the attempt data.
      *
-     * @return {Promise<void>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchAttempt(): Promise<void> {
         const promises = [];
@@ -158,7 +158,7 @@ export class AddonModQuizAttemptPage implements OnInit {
     /**
      * Refresh the data.
      *
-     * @return {Promise<void>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected refreshData(): Promise<void> {
         const promises = [];
diff --git a/src/addon/mod/quiz/pages/index/index.ts b/src/addon/mod/quiz/pages/index/index.ts
index be398552e..2ad9ec51d 100644
--- a/src/addon/mod/quiz/pages/index/index.ts
+++ b/src/addon/mod/quiz/pages/index/index.ts
@@ -40,7 +40,7 @@ export class AddonModQuizIndexPage {
     /**
      * Update some data based on the quiz instance.
      *
-     * @param {any} quiz Quiz instance.
+     * @param quiz Quiz instance.
      */
     updateData(quiz: any): void {
         this.title = quiz.name || this.title;
diff --git a/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.ts b/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.ts
index a01013fed..298153a42 100644
--- a/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.ts
+++ b/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.ts
@@ -30,7 +30,6 @@ export class AddonModQuizNavigationModalPage {
      *     - Some attributes can change dynamically, and we don't want to create the modal everytime the user opens it.
      *     - The onDidDismiss function takes a while to be called, making the app seem slow. This way we can directly call
      *       the functions we need without having to wait for the modal to be dismissed.
-     * @type {any}
      */
     pageInstance: any;
 
@@ -51,8 +50,8 @@ export class AddonModQuizNavigationModalPage {
     /**
      * Load a certain page.
      *
-     * @param {number} page The page to load.
-     * @param {number} [slot] Slot of the question to scroll to.
+     * @param page The page to load.
+     * @param slot Slot of the question to scroll to.
      */
     loadPage(page: number, slot: number): void {
         this.pageInstance.changePage && this.pageInstance.changePage(page, true, slot);
diff --git a/src/addon/mod/quiz/pages/player/player.ts b/src/addon/mod/quiz/pages/player/player.ts
index af65f378a..dc4a38a64 100644
--- a/src/addon/mod/quiz/pages/player/player.ts
+++ b/src/addon/mod/quiz/pages/player/player.ts
@@ -134,7 +134,7 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy {
     /**
      * Check if we can leave the page or not.
      *
-     * @return {boolean|Promise<void>} Resolved if we can leave it, rejected if not.
+     * @return Resolved if we can leave it, rejected if not.
      */
     ionViewCanLeave(): boolean | Promise<void> {
         if (this.forceLeave) {
@@ -175,7 +175,7 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy {
     /**
      * A behaviour button in a question was clicked (Check, Redo, ...).
      *
-     * @param {any} button Clicked button.
+     * @param button Clicked button.
      */
     behaviourButtonClicked(button: any): void {
         // Confirm that the user really wants to do it.
@@ -216,9 +216,9 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy {
     /**
      * Change the current page. If slot is supplied, try to scroll to that question.
      *
-     * @param {number} page Page to load. -1 means summary.
-     * @param {boolean} [fromModal] Whether the page was selected using the navigation modal.
-     * @param {number} [slot] Slot of the question to scroll to.
+     * @param page Page to load. -1 means summary.
+     * @param fromModal Whether the page was selected using the navigation modal.
+     * @param slot Slot of the question to scroll to.
      */
     changePage(page: number, fromModal?: boolean, slot?: number): void {
         if (page != -1 && (this.attempt.state == AddonModQuizProvider.ATTEMPT_OVERDUE || this.attempt.finishedOffline)) {
@@ -285,7 +285,7 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy {
     /**
      * Convenience function to get the quiz data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchData(): Promise<any> {
         // Wait for any ongoing sync to finish. We won't sync a quiz while it's being played.
@@ -348,9 +348,9 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy {
     /**
      * Finish an attempt, either by timeup or because the user clicked to finish it.
      *
-     * @param {boolean} [userFinish] Whether the user clicked to finish the attempt.
-     * @param {boolean} [timeUp] Whether the quiz time is up.
-     * @return {Promise<void>} Promise resolved when done.
+     * @param userFinish Whether the user clicked to finish the attempt.
+     * @param timeUp Whether the quiz time is up.
+     * @return Promise resolved when done.
      */
     finishAttempt(userFinish?: boolean, timeUp?: boolean): Promise<void> {
         let promise;
@@ -387,7 +387,7 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy {
     /**
      * Fix sequence checks of current page.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fixSequenceChecks(): Promise<any> {
         // Get current page data again to get the latest sequencechecks.
@@ -410,7 +410,7 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy {
     /**
      * Get the input answers.
      *
-     * @return {any} Object with the answers.
+     * @return Object with the answers.
      */
     protected getAnswers(): any {
         return this.questionHelper.getAnswersFromForm(document.forms['addon-mod_quiz-player-form']);
@@ -434,8 +434,8 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy {
     /**
      * Load a page questions.
      *
-     * @param {number} page The page to load.
-     * @return {Promise<void>} Promise resolved when done.
+     * @param page The page to load.
+     * @return Promise resolved when done.
      */
     protected loadPage(page: number): Promise<void> {
         return this.quizProvider.getAttemptData(this.attempt.id, page, this.preflightData, this.offline, true).then((data) => {
@@ -477,7 +477,7 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy {
     /**
      * Load attempt summary.
      *
-     * @return {Promise<void>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected loadSummary(): Promise<void> {
         this.summaryQuestions = [];
@@ -502,7 +502,7 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy {
     /**
      * Load data to navigate the questions using the navigation modal.
      *
-     * @return {Promise<void>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected loadNavigation(): Promise<void> {
         // We use the attempt summary to build the navigation because it contains all the questions.
@@ -520,7 +520,7 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy {
     /**
      * Open the navigation modal.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     openNavigation(): Promise<any> {
         let promise;
@@ -552,10 +552,10 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy {
     /**
      * Process attempt.
      *
-     * @param {boolean} [userFinish] Whether the user clicked to finish the attempt.
-     * @param {boolean} [timeUp] Whether the quiz time is up.
-     * @return {Promise<any>} Promise resolved when done.
-     * @param {boolean} [retrying] Whether we're retrying the change.
+     * @param userFinish Whether the user clicked to finish the attempt.
+     * @param timeUp Whether the quiz time is up.
+     * @return Promise resolved when done.
+     * @param retrying Whether we're retrying the change.
      */
     protected processAttempt(userFinish?: boolean, timeUp?: boolean, retrying?: boolean): Promise<any> {
         // Get the answers to send.
@@ -591,7 +591,7 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy {
     /**
      * Scroll to a certain question.
      *
-     * @param {number} slot Slot of the question to scroll to.
+     * @param slot Slot of the question to scroll to.
      */
     protected scrollToQuestion(slot: number): void {
         this.domUtils.scrollToElementBySelector(this.content, '#addon-mod_quiz-question-' + slot);
@@ -600,7 +600,7 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy {
     /**
      * Show connection error.
      *
-     * @param {Event} ev Click event.
+     * @param ev Click event.
      */
     showConnectionError(ev: Event): void {
         this.autoSave.showAutoSaveError(ev);
@@ -633,7 +633,7 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy {
     /**
      * Start or continue an attempt.
      *
-     * @return {Promise<any>} [description]
+     * @return [description]
      */
     protected startOrContinueAttempt(): Promise<any> {
         const attempt = this.newAttempt ? undefined : this.lastAttempt;
diff --git a/src/addon/mod/quiz/pages/preflight-modal/preflight-modal.ts b/src/addon/mod/quiz/pages/preflight-modal/preflight-modal.ts
index 7317b528d..f832b208e 100644
--- a/src/addon/mod/quiz/pages/preflight-modal/preflight-modal.ts
+++ b/src/addon/mod/quiz/pages/preflight-modal/preflight-modal.ts
@@ -99,7 +99,7 @@ export class AddonModQuizPreflightModalPage implements OnInit {
     /**
      * Check that the data is valid and send it back.
      *
-     * @param {Event} e Event.
+     * @param e Event.
      */
     sendData(e: Event): void {
         e.preventDefault();
diff --git a/src/addon/mod/quiz/pages/review/review.ts b/src/addon/mod/quiz/pages/review/review.ts
index 218d7cd60..fead003f9 100644
--- a/src/addon/mod/quiz/pages/review/review.ts
+++ b/src/addon/mod/quiz/pages/review/review.ts
@@ -92,9 +92,9 @@ export class AddonModQuizReviewPage implements OnInit {
     /**
      * Change the current page. If slot is supplied, try to scroll to that question.
      *
-     * @param {number} page Page to load. -1 means all questions in same page.
-     * @param {boolean} [fromModal] Whether the page was selected using the navigation modal.
-     * @param {number} [slot] Slot of the question to scroll to.
+     * @param page Page to load. -1 means all questions in same page.
+     * @param fromModal Whether the page was selected using the navigation modal.
+     * @param slot Slot of the question to scroll to.
      */
     changePage(page: number, fromModal?: boolean, slot?: number): void {
         if (typeof slot != 'undefined' && (this.attempt.currentpage == -1 || page == this.currentPage)) {
@@ -127,7 +127,7 @@ export class AddonModQuizReviewPage implements OnInit {
     /**
      * Convenience function to get the quiz data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchData(): Promise<any> {
         return this.quizProvider.getQuizById(this.courseId, this.quizId).then((quizData) => {
@@ -151,8 +151,8 @@ export class AddonModQuizReviewPage implements OnInit {
     /**
      * Load a page questions.
      *
-     * @param {number} page The page to load.
-     * @return {Promise<void>} Promise resolved when done.
+     * @param page The page to load.
+     * @return Promise resolved when done.
      */
     protected loadPage(page: number): Promise<void> {
         return this.quizProvider.getAttemptReview(this.attemptId, page).then((data) => {
@@ -183,7 +183,7 @@ export class AddonModQuizReviewPage implements OnInit {
     /**
      * Load data to navigate the questions using the navigation modal.
      *
-     * @return {Promise<void>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected loadNavigation(): Promise<void> {
         // Get all questions in single page to retrieve all the questions.
@@ -202,7 +202,7 @@ export class AddonModQuizReviewPage implements OnInit {
     /**
      * Refreshes data.
      *
-     * @param {any} refresher Refresher
+     * @param refresher Refresher
      */
     refreshData(refresher: any): void {
         const promises = [];
@@ -221,7 +221,7 @@ export class AddonModQuizReviewPage implements OnInit {
     /**
      * Scroll to a certain question.
      *
-     * @param {number} slot Slot of the question to scroll to.
+     * @param slot Slot of the question to scroll to.
      */
     protected scrollToQuestion(slot: number): void {
         this.domUtils.scrollToElementBySelector(this.content, '#addon-mod_quiz-question-' + slot);
@@ -230,7 +230,7 @@ export class AddonModQuizReviewPage implements OnInit {
     /**
      * Calculate review summary data.
      *
-     * @param {any} data Result of getAttemptReview.
+     * @param data Result of getAttemptReview.
      */
     protected setSummaryCalculatedData(data: any): void {
 
diff --git a/src/addon/mod/quiz/providers/access-rules-delegate.ts b/src/addon/mod/quiz/providers/access-rules-delegate.ts
index ace7c6c69..788f2a191 100644
--- a/src/addon/mod/quiz/providers/access-rules-delegate.ts
+++ b/src/addon/mod/quiz/providers/access-rules-delegate.ts
@@ -26,30 +26,29 @@ export interface AddonModQuizAccessRuleHandler extends CoreDelegateHandler {
 
     /**
      * Name of the rule the handler supports. E.g. 'password'.
-     * @type {string}
      */
     ruleName: string;
 
     /**
      * Whether the rule requires a preflight check when prefetch/start/continue an attempt.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} [attempt] The attempt started/continued. If not supplied, user is starting a new attempt.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean|Promise<boolean>} Whether the rule requires a preflight check.
+     * @param quiz The quiz the rule belongs to.
+     * @param attempt The attempt started/continued. If not supplied, user is starting a new attempt.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Whether the rule requires a preflight check.
      */
     isPreflightCheckRequired(quiz: any, attempt?: any, prefetch?: boolean, siteId?: string): boolean | Promise<boolean>;
 
     /**
      * Add preflight data that doesn't require user interaction. The data should be added to the preflightData param.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} preflightData Object where to add the preflight data.
-     * @param {any} [attempt] The attempt started/continued. If not supplied, user is starting a new attempt.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} Promise resolved when done if async, void if it's synchronous.
+     * @param quiz The quiz the rule belongs to.
+     * @param preflightData Object where to add the preflight data.
+     * @param attempt The attempt started/continued. If not supplied, user is starting a new attempt.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done if async, void if it's synchronous.
      */
     getFixedPreflightData?(quiz: any, preflightData: any, attempt?: any, prefetch?: boolean, siteId?: string): void | Promise<any>;
 
@@ -58,20 +57,20 @@ export interface AddonModQuizAccessRuleHandler extends CoreDelegateHandler {
      * Implement this if your access rule requires a preflight check with user interaction.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getPreflightComponent?(injector: Injector): any | Promise<any>;
 
     /**
      * Function called when the preflight check has passed. This is a chance to record that fact in some way.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} attempt The attempt started/continued.
-     * @param {any} preflightData Preflight data gathered.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} Promise resolved when done if async, void if it's synchronous.
+     * @param quiz The quiz the rule belongs to.
+     * @param attempt The attempt started/continued.
+     * @param preflightData Preflight data gathered.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done if async, void if it's synchronous.
      */
     notifyPreflightCheckPassed?(quiz: any, attempt: any, preflightData: any, prefetch?: boolean, siteId?: string)
         : void | Promise<any>;
@@ -79,12 +78,12 @@ export interface AddonModQuizAccessRuleHandler extends CoreDelegateHandler {
     /**
      * Function called when the preflight check fails. This is a chance to record that fact in some way.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} attempt The attempt started/continued.
-     * @param {any} preflightData Preflight data gathered.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} Promise resolved when done if async, void if it's synchronous.
+     * @param quiz The quiz the rule belongs to.
+     * @param attempt The attempt started/continued.
+     * @param preflightData Preflight data gathered.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done if async, void if it's synchronous.
      */
     notifyPreflightCheckFailed?(quiz: any, attempt: any, preflightData: any, prefetch?: boolean, siteId?: string)
         : void | Promise<any>;
@@ -92,10 +91,10 @@ export interface AddonModQuizAccessRuleHandler extends CoreDelegateHandler {
     /**
      * Whether or not the time left of an attempt should be displayed.
      *
-     * @param {any} attempt The attempt.
-     * @param {number} endTime The attempt end time (in seconds).
-     * @param {number} timeNow The current time in seconds.
-     * @return {boolean} Whether it should be displayed.
+     * @param attempt The attempt.
+     * @param endTime The attempt end time (in seconds).
+     * @param timeNow The current time in seconds.
+     * @return Whether it should be displayed.
      */
     shouldShowTimeLeft?(attempt: any, endTime: number, timeNow: number): boolean;
 }
@@ -116,8 +115,8 @@ export class AddonModQuizAccessRuleDelegate extends CoreDelegate {
     /**
      * Get the handler for a certain rule.
      *
-     * @param {string} ruleName Name of the access rule.
-     * @return {AddonModQuizAccessRuleHandler} Handler. Undefined if no handler found for the rule.
+     * @param ruleName Name of the access rule.
+     * @return Handler. Undefined if no handler found for the rule.
      */
     getAccessRuleHandler(ruleName: string): AddonModQuizAccessRuleHandler {
         return <AddonModQuizAccessRuleHandler> this.getHandler(ruleName, true);
@@ -126,13 +125,13 @@ export class AddonModQuizAccessRuleDelegate extends CoreDelegate {
     /**
      * Given a list of rules, get some fixed preflight data (data that doesn't require user interaction).
      *
-     * @param {string[]} rules List of active rules names.
-     * @param {any} quiz Quiz.
-     * @param {any} preflightData Object where to store the preflight data.
-     * @param {any} [attempt] The attempt started/continued. If not supplied, user is starting a new attempt.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when all the data has been gathered.
+     * @param rules List of active rules names.
+     * @param quiz Quiz.
+     * @param preflightData Object where to store the preflight data.
+     * @param attempt The attempt started/continued. If not supplied, user is starting a new attempt.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when all the data has been gathered.
      */
     getFixedPreflightData(rules: string[], quiz: any, preflightData: any, attempt?: any, prefetch?: boolean, siteId?: string)
             : Promise<any> {
@@ -153,8 +152,8 @@ export class AddonModQuizAccessRuleDelegate extends CoreDelegate {
     /**
      * Get the Component to use to display the access rule preflight.
      *
-     * @param {Injector} injector Injector.
-     * @return {Promise<any>} Promise resolved with the component to use, undefined if not found.
+     * @param injector Injector.
+     * @return Promise resolved with the component to use, undefined if not found.
      */
     getPreflightComponent(rule: string, injector: Injector): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(rule, 'getPreflightComponent', [injector]));
@@ -163,8 +162,8 @@ export class AddonModQuizAccessRuleDelegate extends CoreDelegate {
     /**
      * Check if an access rule is supported.
      *
-     * @param {string} ruleName Name of the rule.
-     * @return {boolean} Whether it's supported.
+     * @param ruleName Name of the rule.
+     * @return Whether it's supported.
      */
     isAccessRuleSupported(ruleName: string): boolean {
         return this.hasHandler(ruleName, true);
@@ -173,12 +172,12 @@ export class AddonModQuizAccessRuleDelegate extends CoreDelegate {
     /**
      * Given a list of rules, check if preflight check is required.
      *
-     * @param {string[]} rules List of active rules names.
-     * @param {any} quiz Quiz.
-     * @param {any} [attempt] The attempt started/continued. If not supplied, user is starting a new attempt.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether it's required.
+     * @param rules List of active rules names.
+     * @param quiz Quiz.
+     * @param attempt The attempt started/continued. If not supplied, user is starting a new attempt.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether it's required.
      */
     isPreflightCheckRequired(rules: string[], quiz: any, attempt: any, prefetch?: boolean, siteId?: string): Promise<boolean> {
         rules = rules || [];
@@ -205,12 +204,12 @@ export class AddonModQuizAccessRuleDelegate extends CoreDelegate {
     /**
      * Check if preflight check is required for a certain rule.
      *
-     * @param {string} rule Rule name.
-     * @param {any} quiz Quiz.
-     * @param {any} [attempt] The attempt started/continued. If not supplied, user is starting a new attempt.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether it's required.
+     * @param rule Rule name.
+     * @param quiz Quiz.
+     * @param attempt The attempt started/continued. If not supplied, user is starting a new attempt.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether it's required.
      */
     isPreflightCheckRequiredForRule(rule: string, quiz: any, attempt: any, prefetch?: boolean, siteId?: string): Promise<boolean> {
         return Promise.resolve(this.executeFunctionOnEnabled(rule, 'isPreflightCheckRequired', [quiz, attempt, prefetch, siteId]));
@@ -219,13 +218,13 @@ export class AddonModQuizAccessRuleDelegate extends CoreDelegate {
     /**
      * Notify all rules that the preflight check has passed.
      *
-     * @param {string[]} rules List of active rules names.
-     * @param {any} quiz Quiz.
-     * @param {any} attempt Attempt.
-     * @param {any} preflightData Preflight data gathered.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param rules List of active rules names.
+     * @param quiz Quiz.
+     * @param attempt Attempt.
+     * @param preflightData Preflight data gathered.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     notifyPreflightCheckPassed(rules: string[], quiz: any, attempt: any, preflightData: any, prefetch?: boolean, siteId?: string)
             : Promise<any> {
@@ -246,13 +245,13 @@ export class AddonModQuizAccessRuleDelegate extends CoreDelegate {
     /**
      * Notify all rules that the preflight check has failed.
      *
-     * @param {string[]} rules List of active rules names.
-     * @param {any} quiz Quiz.
-     * @param {any} attempt Attempt.
-     * @param {any} preflightData Preflight data gathered.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param rules List of active rules names.
+     * @param quiz Quiz.
+     * @param attempt Attempt.
+     * @param preflightData Preflight data gathered.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     notifyPreflightCheckFailed(rules: string[], quiz: any, attempt: any, preflightData: any, prefetch?: boolean, siteId?: string)
             : Promise<any> {
@@ -273,11 +272,11 @@ export class AddonModQuizAccessRuleDelegate extends CoreDelegate {
     /**
      * Whether or not the time left of an attempt should be displayed.
      *
-     * @param {string[]} rules List of active rules names.
-     * @param {any} attempt The attempt.
-     * @param {number} endTime The attempt end time (in seconds).
-     * @param {number} timeNow The current time in seconds.
-     * @return {boolean} Whether it should be displayed.
+     * @param rules List of active rules names.
+     * @param attempt The attempt.
+     * @param endTime The attempt end time (in seconds).
+     * @param timeNow The current time in seconds.
+     * @return Whether it should be displayed.
      */
     shouldShowTimeLeft(rules: string[], attempt: any, endTime: number, timeNow: number): boolean {
         rules = rules || [];
diff --git a/src/addon/mod/quiz/providers/grade-link-handler.ts b/src/addon/mod/quiz/providers/grade-link-handler.ts
index 1cb006b8c..1775139e2 100644
--- a/src/addon/mod/quiz/providers/grade-link-handler.ts
+++ b/src/addon/mod/quiz/providers/grade-link-handler.ts
@@ -36,11 +36,11 @@ export class AddonModQuizGradeLinkHandler extends CoreContentLinksModuleGradeHan
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return this.quizProvider.isPluginEnabled();
diff --git a/src/addon/mod/quiz/providers/helper.ts b/src/addon/mod/quiz/providers/helper.ts
index 71897ff50..96683ce00 100644
--- a/src/addon/mod/quiz/providers/helper.ts
+++ b/src/addon/mod/quiz/providers/helper.ts
@@ -40,16 +40,16 @@ export class AddonModQuizHelperProvider {
      * Validate a preflight data or show a modal to input the preflight data if required.
      * It calls AddonModQuizProvider.startAttempt if a new attempt is needed.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} accessInfo Quiz access info returned by AddonModQuizProvider.getQuizAccessInformation.
-     * @param {any} preflightData Object where to store the preflight data.
-     * @param {any} [attempt] Attempt to continue. Don't pass any value if the user needs to start a new attempt.
-     * @param {boolean} [offline] Whether the attempt is offline.
-     * @param {boolean} [prefetch] Whether user is prefetching.
-     * @param {string} [title] The title to display in the modal and in the submit button.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {boolean} [retrying] Whether we're retrying after a failure.
-     * @return {Promise<any>} Promise resolved when the preflight data is validated. The resolve param is the attempt.
+     * @param quiz Quiz.
+     * @param accessInfo Quiz access info returned by AddonModQuizProvider.getQuizAccessInformation.
+     * @param preflightData Object where to store the preflight data.
+     * @param attempt Attempt to continue. Don't pass any value if the user needs to start a new attempt.
+     * @param offline Whether the attempt is offline.
+     * @param prefetch Whether user is prefetching.
+     * @param title The title to display in the modal and in the submit button.
+     * @param siteId Site ID. If not defined, current site.
+     * @param retrying Whether we're retrying after a failure.
+     * @return Promise resolved when the preflight data is validated. The resolve param is the attempt.
      */
     getAndCheckPreflightData(quiz: any, accessInfo: any, preflightData: any, attempt: any, offline?: boolean, prefetch?: boolean,
             title?: string, siteId?: string, retrying?: boolean): Promise<any> {
@@ -101,13 +101,13 @@ export class AddonModQuizHelperProvider {
     /**
      * Get the preflight data from the user using a modal.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} accessInfo Quiz access info returned by AddonModQuizProvider.getQuizAccessInformation.
-     * @param {any} [attempt] The attempt started/continued. If not supplied, user is starting a new attempt.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [title] The title to display in the modal and in the submit button.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the preflight data. Rejected if user cancels.
+     * @param quiz Quiz.
+     * @param accessInfo Quiz access info returned by AddonModQuizProvider.getQuizAccessInformation.
+     * @param attempt The attempt started/continued. If not supplied, user is starting a new attempt.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param title The title to display in the modal and in the submit button.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the preflight data. Rejected if user cancels.
      */
     getPreflightData(quiz: any, accessInfo: any, attempt: any, prefetch?: boolean, title?: string, siteId?: string): Promise<any> {
         const notSupported: string[] = [];
@@ -152,8 +152,8 @@ export class AddonModQuizHelperProvider {
      * Gets the mark string from a question HTML.
      * Example result: "Marked out of 1.00".
      *
-     * @param  {string} html Question's HTML.
-     * @return {string}      Question's mark.
+     * @param html Question's HTML.
+     * @return Question's mark.
      */
     getQuestionMarkFromHtml(html: string): string {
         const element = this.domUtils.convertToElement(html);
@@ -164,9 +164,9 @@ export class AddonModQuizHelperProvider {
     /**
      * Get a quiz ID by attempt ID.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number>} Promise resolved with the quiz ID.
+     * @param attemptId Attempt ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the quiz ID.
      */
     getQuizIdByAttemptId(attemptId: number, siteId?: string): Promise<number> {
         // Use getAttemptReview to retrieve the quiz ID.
@@ -182,13 +182,13 @@ export class AddonModQuizHelperProvider {
     /**
      * Handle a review link.
      *
-     * @param {NavController} navCtrl Nav controller, can be undefined/null.
-     * @param {number} attemptId Attempt ID.
-     * @param {number} [page] Page to load, -1 to all questions in same page.
-     * @param {number} [courseId] Course ID.
-     * @param {number} [quizId] Quiz ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param navCtrl Nav controller, can be undefined/null.
+     * @param attemptId Attempt ID.
+     * @param page Page to load, -1 to all questions in same page.
+     * @param courseId Course ID.
+     * @param quizId Quiz ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     handleReviewLink(navCtrl: NavController, attemptId: number, page?: number, courseId?: number, quizId?: number,
             siteId?: string): Promise<any> {
@@ -234,10 +234,10 @@ export class AddonModQuizHelperProvider {
     /**
      * Add some calculated data to the attempt.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} attempt Attempt.
-     * @param {boolean} highlight Whether we should check if attempt should be highlighted.
-     * @param {number} [bestGrade] Quiz's best grade (formatted). Required if highlight=true.
+     * @param quiz Quiz.
+     * @param attempt Attempt.
+     * @param highlight Whether we should check if attempt should be highlighted.
+     * @param bestGrade Quiz's best grade (formatted). Required if highlight=true.
      */
     setAttemptCalculatedData(quiz: any, attempt: any, highlight?: boolean, bestGrade?: string): void {
 
@@ -265,8 +265,8 @@ export class AddonModQuizHelperProvider {
     /**
      * Add some calculated data to the quiz.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} options Options returned by AddonModQuizProvider.getCombinedReviewOptions.
+     * @param quiz Quiz.
+     * @param options Options returned by AddonModQuizProvider.getCombinedReviewOptions.
      */
     setQuizCalculatedData(quiz: any, options: any): void {
         quiz.sumGradesFormatted = this.quizProvider.formatGrade(quiz.sumgrades, quiz.decimalpoints);
@@ -282,16 +282,16 @@ export class AddonModQuizHelperProvider {
     /**
      * Validate the preflight data. It calls AddonModQuizProvider.startAttempt if a new attempt is needed.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} accessInfo Quiz access info returned by AddonModQuizProvider.getQuizAccessInformation.
-     * @param {any} preflightData Object where to store the preflight data.
-     * @param {any} [attempt] Attempt to continue. Don't pass any value if the user needs to start a new attempt.
-     * @param {boolean} [offline] Whether the attempt is offline.
-     * @param {boolean} [sent] Whether preflight data has been entered by the user.
-     * @param {boolean} [prefetch] Whether user is prefetching.
-     * @param {string} [title] The title to display in the modal and in the submit button.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the preflight data is validated.
+     * @param quiz Quiz.
+     * @param accessInfo Quiz access info returned by AddonModQuizProvider.getQuizAccessInformation.
+     * @param preflightData Object where to store the preflight data.
+     * @param attempt Attempt to continue. Don't pass any value if the user needs to start a new attempt.
+     * @param offline Whether the attempt is offline.
+     * @param sent Whether preflight data has been entered by the user.
+     * @param prefetch Whether user is prefetching.
+     * @param title The title to display in the modal and in the submit button.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the preflight data is validated.
      */
     validatePreflightData(quiz: any, accessInfo: any, preflightData: any, attempt: any, offline?: boolean, prefetch?: boolean,
             siteId?: string): Promise<any> {
diff --git a/src/addon/mod/quiz/providers/index-link-handler.ts b/src/addon/mod/quiz/providers/index-link-handler.ts
index e3181f2b8..cb39371ad 100644
--- a/src/addon/mod/quiz/providers/index-link-handler.ts
+++ b/src/addon/mod/quiz/providers/index-link-handler.ts
@@ -32,11 +32,11 @@ export class AddonModQuizIndexLinkHandler extends CoreContentLinksModuleIndexHan
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return this.quizProvider.isPluginEnabled();
diff --git a/src/addon/mod/quiz/providers/module-handler.ts b/src/addon/mod/quiz/providers/module-handler.ts
index f3b484ce9..cf8ea190f 100644
--- a/src/addon/mod/quiz/providers/module-handler.ts
+++ b/src/addon/mod/quiz/providers/module-handler.ts
@@ -46,7 +46,7 @@ export class AddonModQuizModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean {
         return true;
@@ -55,10 +55,10 @@ export class AddonModQuizModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         return {
@@ -80,9 +80,9 @@ export class AddonModQuizModuleHandler implements CoreCourseModuleHandler {
      * Get the component to render the module. This is needed to support singleactivity course format.
      * The component returned must implement CoreCourseModuleMainComponent.
      *
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any} The component to use, undefined if not found.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component to use, undefined if not found.
      */
     getMainComponent(course: any, module: any): any {
         return AddonModQuizIndexComponent;
diff --git a/src/addon/mod/quiz/providers/prefetch-handler.ts b/src/addon/mod/quiz/providers/prefetch-handler.ts
index 132dd3f09..a06d15541 100644
--- a/src/addon/mod/quiz/providers/prefetch-handler.ts
+++ b/src/addon/mod/quiz/providers/prefetch-handler.ts
@@ -53,12 +53,12 @@ export class AddonModQuizPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Download the module.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {boolean} [canStart=true] If true, start a new attempt if needed.
-     * @return {Promise<any>} Promise resolved when all content is downloaded.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param canStart If true, start a new attempt if needed.
+     * @return Promise resolved when all content is downloaded.
      */
     download(module: any, courseId: number, dirPath?: string, single?: boolean, canStart: boolean = true): Promise<any> {
         // Same implementation for download and prefetch.
@@ -68,10 +68,10 @@ export class AddonModQuizPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Get list of files. If not defined, we'll assume they're in module.contents.
      *
-     * @param {any} module Module.
-     * @param {Number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @return {Promise<any[]>} Promise resolved with the list of files.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @return Promise resolved with the list of files.
      */
     getFiles(module: any, courseId: number, single?: boolean): Promise<any[]> {
         return this.quizProvider.getQuiz(courseId, module.id).then((quiz) => {
@@ -91,9 +91,9 @@ export class AddonModQuizPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Get the list of downloadable files on feedback attemptss.
      *
-     * @param  {any}   quiz     Quiz.
-     * @param  {any[]} attempts Quiz user attempts.
-     * @return {Promise<any[]>} List of Files.
+     * @param quiz Quiz.
+     * @param attempts Quiz user attempts.
+     * @return List of Files.
      */
     protected getAttemptsFeedbackFiles(quiz: any, attempts: any[]): Promise<any[]> {
         // We have quiz data, now we'll get specific data for each attempt.
@@ -128,13 +128,13 @@ export class AddonModQuizPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Gather some preflight data for an attempt. This function will start a new attempt if needed.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} accessInfo Quiz access info returned by AddonModQuizProvider.getQuizAccessInformation.
-     * @param {any} [attempt] Attempt to continue. Don't pass any value if the user needs to start a new attempt.
-     * @param {boolean} [askPreflight] Whether it should ask for preflight data if needed.
-     * @param {string} [modalTitle] Lang key of the title to set to preflight modal (e.g. 'addon.mod_quiz.startattempt').
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the preflight data.
+     * @param quiz Quiz.
+     * @param accessInfo Quiz access info returned by AddonModQuizProvider.getQuizAccessInformation.
+     * @param attempt Attempt to continue. Don't pass any value if the user needs to start a new attempt.
+     * @param askPreflight Whether it should ask for preflight data if needed.
+     * @param modalTitle Lang key of the title to set to preflight modal (e.g. 'addon.mod_quiz.startattempt').
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the preflight data.
      */
     getPreflightData(quiz: any, accessInfo: any, attempt?: any, askPreflight?: boolean, title?: string, siteId?: string)
             : Promise<any> {
@@ -165,9 +165,9 @@ export class AddonModQuizPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId The course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId The course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         return this.quizProvider.invalidateContent(moduleId, courseId);
@@ -176,9 +176,9 @@ export class AddonModQuizPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Invalidate WS calls needed to determine module status.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when invalidated.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when invalidated.
      */
     invalidateModule(module: any, courseId: number): Promise<any> {
         // Invalidate the calls required to check if a quiz is downloadable.
@@ -193,9 +193,9 @@ export class AddonModQuizPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Check if a module can be downloaded. If the function is not defined, we assume that all modules are downloadable.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {boolean|Promise<boolean>} Whether the module can be downloaded. The promise should never be rejected.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Whether the module can be downloaded. The promise should never be rejected.
      */
     isDownloadable(module: any, courseId: number): boolean | Promise<boolean> {
         if (this.sitesProvider.getCurrentSite().isOfflineDisabled()) {
@@ -222,7 +222,7 @@ export class AddonModQuizPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
+     * @return A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.quizProvider.isPluginEnabled();
@@ -231,12 +231,12 @@ export class AddonModQuizPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Prefetch a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @param {boolean} [canStart=true] If true, start a new attempt if needed.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @param canStart If true, start a new attempt if needed.
+     * @return Promise resolved when done.
      */
     prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string, canStart: boolean = true): Promise<any> {
         if (module.attemptFinished) {
@@ -254,12 +254,12 @@ export class AddonModQuizPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Prefetch a quiz.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} single True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {String} siteId Site ID.
-     * @param {boolean} canStart If true, start a new attempt if needed.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param siteId Site ID.
+     * @param canStart If true, start a new attempt if needed.
+     * @return Promise resolved when done.
      */
     protected prefetchQuiz(module: any, courseId: number, single: boolean, siteId: string, canStart: boolean): Promise<any> {
         let attempts: any[],
@@ -385,11 +385,11 @@ export class AddonModQuizPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Prefetch all WS data for an attempt.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} attempt Attempt.
-     * @param {any} preflightData Preflight required data (like password).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the prefetch is finished. Data returned is not reliable.
+     * @param quiz Quiz.
+     * @param attempt Attempt.
+     * @param preflightData Preflight required data (like password).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the prefetch is finished. Data returned is not reliable.
      */
     prefetchAttempt(quiz: any, attempt: any, preflightData: any, siteId?: string): Promise<any> {
         const pages = this.quizProvider.getPagesFromLayout(attempt.layout),
@@ -462,10 +462,10 @@ export class AddonModQuizPrefetchHandler extends CoreCourseActivityPrefetchHandl
      * Prefetches some data for a quiz and its last attempt.
      * This function will NOT start a new attempt, it only reads data for the quiz and the last attempt.
      *
-     * @param {any} quiz Quiz.
-     * @param {boolean} [askPreflight] Whether it should ask for preflight data if needed.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param quiz Quiz.
+     * @param askPreflight Whether it should ask for preflight data if needed.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     prefetchQuizAndLastAttempt(quiz: any, askPreflight?: boolean, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -523,13 +523,13 @@ export class AddonModQuizPrefetchHandler extends CoreCourseActivityPrefetchHandl
      * Set the right status to a quiz after prefetching.
      * If the last attempt is finished or there isn't one, set it as not downloaded to show download icon.
      *
-     * @param {any} quiz Quiz.
-     * @param  {any[]} [attempts] List of attempts. If not provided, they will be calculated.
-     * @param {boolean} [forceCache] Whether it should always return cached data. Only if attempts is undefined.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down). Only if
-     *                                attempts is undefined.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param quiz Quiz.
+     * @param attempts List of attempts. If not provided, they will be calculated.
+     * @param forceCache Whether it should always return cached data. Only if attempts is undefined.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down). Only if
+     *                    attempts is undefined.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     setStatusAfterPrefetch(quiz: any, attempts?: any[], forceCache?: boolean, ignoreCache?: boolean, siteId?: string)
             : Promise<any> {
@@ -567,10 +567,10 @@ export class AddonModQuizPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Sync a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     sync(module: any, courseId: number, siteId?: any): Promise<any> {
         if (!this.syncProvider) {
diff --git a/src/addon/mod/quiz/providers/push-click-handler.ts b/src/addon/mod/quiz/providers/push-click-handler.ts
index 43397a59b..05958945f 100644
--- a/src/addon/mod/quiz/providers/push-click-handler.ts
+++ b/src/addon/mod/quiz/providers/push-click-handler.ts
@@ -38,8 +38,8 @@ export class AddonModQuizPushClickHandler implements CorePushNotificationsClickH
     /**
      * Check if a notification click is handled by this handler.
      *
-     * @param {any} notification The notification to check.
-     * @return {boolean} Whether the notification click is handled by this handler
+     * @param notification The notification to check.
+     * @return Whether the notification click is handled by this handler
      */
     handles(notification: any): boolean | Promise<boolean> {
         return this.utils.isTrueOrOne(notification.notif) && notification.moodlecomponent == 'mod_quiz' &&
@@ -49,8 +49,8 @@ export class AddonModQuizPushClickHandler implements CorePushNotificationsClickH
     /**
      * Handle the notification click.
      *
-     * @param {any} notification The notification to check.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param notification The notification to check.
+     * @return Promise resolved when done.
      */
     handleClick(notification: any): Promise<any> {
         const contextUrlParams = this.urlUtils.extractUrlParams(notification.contexturl),
diff --git a/src/addon/mod/quiz/providers/quiz-offline.ts b/src/addon/mod/quiz/providers/quiz-offline.ts
index b7fe048d2..e52cc1da6 100644
--- a/src/addon/mod/quiz/providers/quiz-offline.ts
+++ b/src/addon/mod/quiz/providers/quiz-offline.ts
@@ -93,8 +93,8 @@ export class AddonModQuizOfflineProvider {
     /**
      * Classify the answers in questions.
      *
-     * @param {any} answers List of answers.
-     * @return {any} Object with the questions, the keys are the slot. Each question contains its answers.
+     * @param answers List of answers.
+     * @return Object with the questions, the keys are the slot. Each question contains its answers.
      */
     classifyAnswersInQuestions(answers: any): any {
         const questionsWithAnswers = {};
@@ -120,8 +120,8 @@ export class AddonModQuizOfflineProvider {
      * Given a list of questions with answers classified in it (@see AddonModQuizOfflineProvider.classifyAnswersInQuestions),
      * returns a list of answers (including prefix in the name).
      *
-     * @param {any} questions Questions.
-     * @return {any} Answers.
+     * @param questions Questions.
+     * @return Answers.
      */
     extractAnswersFromQuestions(questions: any): any {
         const answers = {};
@@ -140,8 +140,8 @@ export class AddonModQuizOfflineProvider {
     /**
      * Get all the offline attempts in a certain site.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the offline attempts.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the offline attempts.
      */
     getAllAttempts(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
@@ -152,9 +152,9 @@ export class AddonModQuizOfflineProvider {
     /**
      * Retrieve an attempt answers from site DB.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the answers.
+     * @param attemptId Attempt ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the answers.
      */
     getAttemptAnswers(attemptId: number, siteId?: string): Promise<any[]> {
         return this.questionProvider.getAttemptAnswers(AddonModQuizProvider.COMPONENT, attemptId, siteId);
@@ -163,9 +163,9 @@ export class AddonModQuizOfflineProvider {
     /**
      * Retrieve an attempt from site DB.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the attempt.
+     * @param attemptId Attempt ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the attempt.
      */
     getAttemptById(attemptId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
@@ -176,10 +176,10 @@ export class AddonModQuizOfflineProvider {
     /**
      * Retrieve an attempt from site DB.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {string} [siteId]  Site ID. If not defined, current site.
-     * @param {number} [userId]  User ID. If not defined, user current site's user.
-     * @return {Promise<any[]>} Promise resolved with the attempts.
+     * @param attemptId Attempt ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined, user current site's user.
+     * @return Promise resolved with the attempts.
      */
     getQuizAttempts(quizId: number, siteId?: string, userId?: number): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -192,10 +192,10 @@ export class AddonModQuizOfflineProvider {
     /**
      * Load local state in the questions.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {any[]} questions List of questions.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param attemptId Attempt ID.
+     * @param questions List of questions.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     loadQuestionsLocalStates(attemptId: number, questions: any[], siteId?: string): Promise<any[]> {
         const promises = [];
@@ -220,13 +220,13 @@ export class AddonModQuizOfflineProvider {
     /**
      * Process an attempt, saving its data.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} attempt Attempt.
-     * @param {any} questions Object with the questions of the quiz. The keys should be the question slot.
-     * @param {any} data Data to save.
-     * @param {boolean} [finish] Whether to finish the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved in success, rejected otherwise.
+     * @param quiz Quiz.
+     * @param attempt Attempt.
+     * @param questions Object with the questions of the quiz. The keys should be the question slot.
+     * @param data Data to save.
+     * @param finish Whether to finish the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved in success, rejected otherwise.
      */
     processAttempt(quiz: any, attempt: any, questions: any, data: any, finish?: boolean, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -265,9 +265,9 @@ export class AddonModQuizOfflineProvider {
     /**
      * Remove an attempt and its answers from local DB.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param attemptId Attempt ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     removeAttemptAndAnswers(attemptId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -289,10 +289,10 @@ export class AddonModQuizOfflineProvider {
     /**
      * Remove a question and its answers from local DB.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {number} slot Question slot.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when finished.
+     * @param attemptId Attempt ID.
+     * @param slot Question slot.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when finished.
      */
     removeQuestionAndAnswers(attemptId: number, slot: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -308,13 +308,13 @@ export class AddonModQuizOfflineProvider {
     /**
      * Save an attempt's answers and calculate state for questions modified.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} attempt Attempt.
-     * @param {any} questions Object with the questions of the quiz. The keys should be the question slot.
-     * @param {any} answers Answers to save.
-     * @param {number} [timeMod] Time modified to set in the answers. If not defined, current time.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param quiz Quiz.
+     * @param attempt Attempt.
+     * @param questions Object with the questions of the quiz. The keys should be the question slot.
+     * @param answers Answers to save.
+     * @param timeMod Time modified to set in the answers. If not defined, current time.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     saveAnswers(quiz: any, attempt: any, questions: any, answers: any, timeMod?: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -376,10 +376,10 @@ export class AddonModQuizOfflineProvider {
     /**
      * Set attempt's current page.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {number} page Page to set.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved in success, rejected otherwise.
+     * @param attemptId Attempt ID.
+     * @param page Page to set.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved in success, rejected otherwise.
      */
     setAttemptCurrentPage(attemptId: number, page: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
diff --git a/src/addon/mod/quiz/providers/quiz-sync.ts b/src/addon/mod/quiz/providers/quiz-sync.ts
index 9f7226e9d..881cb4f81 100644
--- a/src/addon/mod/quiz/providers/quiz-sync.ts
+++ b/src/addon/mod/quiz/providers/quiz-sync.ts
@@ -37,13 +37,11 @@ import { AddonModQuizPrefetchHandler } from './prefetch-handler';
 export interface AddonModQuizSyncResult {
     /**
      * List of warnings.
-     * @type {string[]}
      */
     warnings: string[];
 
     /**
      * Whether an attempt was finished in the site due to the sync,
-     * @type {boolean}
      */
     attemptFinished: boolean;
 }
@@ -75,16 +73,16 @@ export class AddonModQuizSyncProvider extends CoreCourseActivitySyncBaseProvider
     /**
      * Finish a sync process: remove offline data if needed, prefetch quiz data, set sync time and return the result.
      *
-     * @param {string} siteId Site ID.
-     * @param {any} quiz Quiz.
-     * @param {number} courseId Course ID.
-     * @param {string[]} warnings List of warnings generated by the sync.
-     * @param {number} [attemptId] Last attempt ID.
-     * @param {any} [offlineAttempt] Offline attempt synchronized, if any.
-     * @param {any} [onlineAttempt] Online data for the offline attempt.
-     * @param {boolean} [removeAttempt] Whether the offline data should be removed.
-     * @param {boolean} [updated] Whether some data was sent to the site.
-     * @return {Promise<AddonModQuizSyncResult>} Promise resolved on success.
+     * @param siteId Site ID.
+     * @param quiz Quiz.
+     * @param courseId Course ID.
+     * @param warnings List of warnings generated by the sync.
+     * @param attemptId Last attempt ID.
+     * @param offlineAttempt Offline attempt synchronized, if any.
+     * @param onlineAttempt Online data for the offline attempt.
+     * @param removeAttempt Whether the offline data should be removed.
+     * @param updated Whether some data was sent to the site.
+     * @return Promise resolved on success.
      */
     protected finishSync(siteId: string, quiz: any, courseId: number, warnings: string[], attemptId?: number, offlineAttempt?: any,
             onlineAttempt?: any, removeAttempt?: boolean, updated?: boolean): Promise<AddonModQuizSyncResult> {
@@ -139,9 +137,9 @@ export class AddonModQuizSyncProvider extends CoreCourseActivitySyncBaseProvider
     /**
      * Check if a quiz has data to synchronize.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether it has data to sync.
+     * @param quizId Quiz ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether it has data to sync.
      */
     hasDataToSync(quizId: number, siteId?: string): Promise<boolean> {
         return this.quizOfflineProvider.getQuizAttempts(quizId, siteId).then((attempts) => {
@@ -154,12 +152,12 @@ export class AddonModQuizSyncProvider extends CoreCourseActivitySyncBaseProvider
     /**
      * Conveniece function to prefetch data after an update.
      *
-     * @param {any} module Module.
-     * @param {any} quiz Quiz.
-     * @param {number} courseId Course ID.
-     * @param {RegExp} [regex] If regex matches, don't download the data. Defaults to check files.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param quiz Quiz.
+     * @param courseId Course ID.
+     * @param regex If regex matches, don't download the data. Defaults to check files.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     prefetchAfterUpdateQuiz(module: any, quiz: any, courseId: number, regex?: RegExp, siteId?: string): Promise<any> {
         regex = regex || /^.*files$/;
@@ -189,9 +187,9 @@ export class AddonModQuizSyncProvider extends CoreCourseActivitySyncBaseProvider
     /**
      * Try to synchronize all the quizzes in a certain site or in all sites.
      *
-     * @param {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     syncAllQuizzes(siteId?: string, force?: boolean): Promise<any> {
         return this.syncOnSites('all quizzes', this.syncAllQuizzesFunc.bind(this), [force], siteId);
@@ -200,9 +198,9 @@ export class AddonModQuizSyncProvider extends CoreCourseActivitySyncBaseProvider
     /**
      * Sync all quizzes on a site.
      *
-     * @param  {string} siteId Site ID to sync.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @param {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync.
+     * @param force Wether to force sync not depending on last execution.
+     * @param Promise resolved if sync is successful, rejected if sync fails.
      */
     protected syncAllQuizzesFunc(siteId?: string, force?: boolean): Promise<any> {
         // Get all offline attempts.
@@ -261,10 +259,10 @@ export class AddonModQuizSyncProvider extends CoreCourseActivitySyncBaseProvider
     /**
      * Sync a quiz only if a certain time has passed since the last time.
      *
-     * @param {any} quiz Quiz.
-     * @param {boolean} [askPreflight] Whether we should ask for preflight data if needed.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the quiz is synced or if it doesn't need to be synced.
+     * @param quiz Quiz.
+     * @param askPreflight Whether we should ask for preflight data if needed.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the quiz is synced or if it doesn't need to be synced.
      */
     syncQuizIfNeeded(quiz: any, askPreflight?: boolean, siteId?: string): Promise<any> {
         return this.isSyncNeeded(quiz.id, siteId).then((needed) => {
@@ -278,10 +276,10 @@ export class AddonModQuizSyncProvider extends CoreCourseActivitySyncBaseProvider
      * Try to synchronize a quiz.
      * The promise returned will be resolved with an array with warnings if the synchronization is successful.
      *
-     * @param {any} quiz Quiz.
-     * @param {boolean} [askPreflight] Whether we should ask for preflight data if needed.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<AddonModQuizSyncResult>} Promise resolved in success.
+     * @param quiz Quiz.
+     * @param askPreflight Whether we should ask for preflight data if needed.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved in success.
      */
     syncQuiz(quiz: any, askPreflight?: boolean, siteId?: string): Promise<AddonModQuizSyncResult> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -414,11 +412,11 @@ export class AddonModQuizSyncProvider extends CoreCourseActivitySyncBaseProvider
     /**
      * Validate questions, discarding the offline answers that can't be synchronized.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {any} onlineQuestions Online questions
-     * @param {any} offlineQuestions Offline questions.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: true if some offline data was discarded, false otherwise.
+     * @param attemptId Attempt ID.
+     * @param onlineQuestions Online questions
+     * @param offlineQuestions Offline questions.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: true if some offline data was discarded, false otherwise.
      */
     validateQuestions(attemptId: number, onlineQuestions: any, offlineQuestions: any, siteId?: string): Promise<boolean> {
         const promises = [];
diff --git a/src/addon/mod/quiz/providers/quiz.ts b/src/addon/mod/quiz/providers/quiz.ts
index 114963f9e..b13182ef8 100644
--- a/src/addon/mod/quiz/providers/quiz.ts
+++ b/src/addon/mod/quiz/providers/quiz.ts
@@ -72,9 +72,9 @@ export class AddonModQuizProvider {
     /**
      * Formats a grade to be displayed.
      *
-     * @param {number} grade Grade.
-     * @param {number} decimals Decimals to use.
-     * @return {string} Grade to display.
+     * @param grade Grade.
+     * @param decimals Decimals to use.
+     * @return Grade to display.
      */
     formatGrade(grade: number, decimals: number): string {
         if (typeof grade == 'undefined' || grade == -1 || grade === null) {
@@ -87,14 +87,14 @@ export class AddonModQuizProvider {
     /**
      * Get attempt questions. Returns all of them or just the ones in certain pages.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} attempt Attempt.
-     * @param {any} preflightData Preflight required data (like password).
-     * @param {number[]} [pages] List of pages to get. If not defined, all pages.
-     * @param {boolean} [offline] Whether it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the questions.
+     * @param quiz Quiz.
+     * @param attempt Attempt.
+     * @param preflightData Preflight required data (like password).
+     * @param pages List of pages to get. If not defined, all pages.
+     * @param offline Whether it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the questions.
      */
     getAllQuestionsData(quiz: any, attempt: any, preflightData: any, pages?: number[], offline?: boolean, ignoreCache?: boolean,
             siteId?: string): Promise<any> {
@@ -130,9 +130,9 @@ export class AddonModQuizProvider {
     /**
      * Get cache key for get attempt access information WS calls.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {number} attemptId Attempt ID.
-     * @return {string} Cache key.
+     * @param quizId Quiz ID.
+     * @param attemptId Attempt ID.
+     * @return Cache key.
      */
     protected getAttemptAccessInformationCacheKey(quizId: number, attemptId: number): string {
         return this.getAttemptAccessInformationCommonCacheKey(quizId) + ':' + attemptId;
@@ -141,8 +141,8 @@ export class AddonModQuizProvider {
     /**
      * Get common cache key for get attempt access information WS calls.
      *
-     * @param {number} quizId Quiz ID.
-     * @return {string} Cache key.
+     * @param quizId Quiz ID.
+     * @return Cache key.
      */
     protected getAttemptAccessInformationCommonCacheKey(quizId: number): string {
         return this.ROOT_CACHE_KEY + 'attemptAccessInformation:' + quizId;
@@ -151,12 +151,12 @@ export class AddonModQuizProvider {
     /**
      * Get access information for an attempt.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {number} attemptId Attempt ID. 0 for user's last attempt.
-     * @param {boolean} offline Whether it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the access information.
+     * @param quizId Quiz ID.
+     * @param attemptId Attempt ID. 0 for user's last attempt.
+     * @param offline Whether it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the access information.
      */
     getAttemptAccessInformation(quizId: number, attemptId: number, offline?: boolean, ignoreCache?: boolean, siteId?: string)
             : Promise<any> {
@@ -184,9 +184,9 @@ export class AddonModQuizProvider {
     /**
      * Get cache key for get attempt data WS calls.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {number} page Page.
-     * @return {string} Cache key.
+     * @param attemptId Attempt ID.
+     * @param page Page.
+     * @return Cache key.
      */
     protected getAttemptDataCacheKey(attemptId: number, page: number): string {
         return this.getAttemptDataCommonCacheKey(attemptId) + ':' + page;
@@ -195,8 +195,8 @@ export class AddonModQuizProvider {
     /**
      * Get common cache key for get attempt data WS calls.
      *
-     * @param {number} attemptId Attempt ID.
-     * @return {string} Cache key.
+     * @param attemptId Attempt ID.
+     * @return Cache key.
      */
     protected getAttemptDataCommonCacheKey(attemptId: number): string {
         return this.ROOT_CACHE_KEY + 'attemptData:' + attemptId;
@@ -205,13 +205,13 @@ export class AddonModQuizProvider {
     /**
      * Get an attempt's data.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {number} page Page number.
-     * @param {any} preflightData Preflight required data (like password).
-     * @param {boolean} [offline] Whether it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the attempt data.
+     * @param attemptId Attempt ID.
+     * @param page Page number.
+     * @param preflightData Preflight required data (like password).
+     * @param offline Whether it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the attempt data.
      */
     getAttemptData(attemptId: number, page: number, preflightData: any, offline?: boolean, ignoreCache?: boolean, siteId?: string)
             : Promise<any> {
@@ -240,9 +240,9 @@ export class AddonModQuizProvider {
     /**
      * Get an attempt's due date.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} attempt Attempt.
-     * @return {number} Attempt's due date, 0 if no due date or invalid data.
+     * @param quiz Quiz.
+     * @param attempt Attempt.
+     * @return Attempt's due date, 0 if no due date or invalid data.
      */
     getAttemptDueDate(quiz: any, attempt: any): number {
         const deadlines = [];
@@ -281,9 +281,9 @@ export class AddonModQuizProvider {
     /**
      * Get an attempt's warning because of due date.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} attempt Attempt.
-     * @return {string} Attempt's warning, undefined if no due date.
+     * @param quiz Quiz.
+     * @param attempt Attempt.
+     * @return Attempt's warning, undefined if no due date.
      */
     getAttemptDueDateWarning(quiz: any, attempt: any): string {
         const dueDate = this.getAttemptDueDate(quiz, attempt);
@@ -298,9 +298,9 @@ export class AddonModQuizProvider {
     /**
      * Turn attempt's state into a readable state, including some extra data depending on the state.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} attempt Attempt.
-     * @return {string[]} List of state sentences.
+     * @param quiz Quiz.
+     * @param attempt Attempt.
+     * @return List of state sentences.
      */
     getAttemptReadableState(quiz: any, attempt: any): string[] {
         if (attempt.finishedOffline) {
@@ -342,8 +342,8 @@ export class AddonModQuizProvider {
     /**
      * Turn attempt's state into a readable state name, without any more data.
      *
-     * @param {string} state State.
-     * @return {string} Readable state name.
+     * @param state State.
+     * @return Readable state name.
      */
     getAttemptReadableStateName(state: string): string {
         switch (state) {
@@ -367,9 +367,9 @@ export class AddonModQuizProvider {
     /**
      * Get cache key for get attempt review WS calls.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {number} page Page.
-     * @return {string} Cache key.
+     * @param attemptId Attempt ID.
+     * @param page Page.
+     * @return Cache key.
      */
     protected getAttemptReviewCacheKey(attemptId: number, page: number): string {
         return this.getAttemptReviewCommonCacheKey(attemptId) + ':' + page;
@@ -378,8 +378,8 @@ export class AddonModQuizProvider {
     /**
      * Get common cache key for get attempt review WS calls.
      *
-     * @param {number} attemptId Attempt ID.
-     * @return {string} Cache key.
+     * @param attemptId Attempt ID.
+     * @return Cache key.
      */
     protected getAttemptReviewCommonCacheKey(attemptId: number): string {
         return this.ROOT_CACHE_KEY + 'attemptReview:' + attemptId;
@@ -388,11 +388,11 @@ export class AddonModQuizProvider {
     /**
      * Get an attempt's review.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {number} [page] Page number. If not defined, return all the questions in all the pages.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the attempt review.
+     * @param attemptId Attempt ID.
+     * @param page Page number. If not defined, return all the questions in all the pages.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the attempt review.
      */
     getAttemptReview(attemptId: number, page?: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
         if (typeof page == 'undefined') {
@@ -421,8 +421,8 @@ export class AddonModQuizProvider {
     /**
      * Get cache key for get attempt summary WS calls.
      *
-     * @param {number} attemptId Attempt ID.
-     * @return {string} Cache key.
+     * @param attemptId Attempt ID.
+     * @return Cache key.
      */
     protected getAttemptSummaryCacheKey(attemptId: number): string {
         return this.ROOT_CACHE_KEY + 'attemptSummary:' + attemptId;
@@ -431,13 +431,13 @@ export class AddonModQuizProvider {
     /**
      * Get an attempt's summary.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {any} preflightData Preflight required data (like password).
-     * @param {boolean} [offline] Whether it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {boolean} [loadLocal] Whether it should load local state for each question. Only applicable if offline=true.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the list of questions for the attempt summary.
+     * @param attemptId Attempt ID.
+     * @param preflightData Preflight required data (like password).
+     * @param offline Whether it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param loadLocal Whether it should load local state for each question. Only applicable if offline=true.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of questions for the attempt summary.
      */
     getAttemptSummary(attemptId: number, preflightData: any, offline?: boolean, ignoreCache?: boolean, loadLocal?: boolean,
             siteId?: string): Promise<any[]> {
@@ -475,9 +475,9 @@ export class AddonModQuizProvider {
     /**
      * Get cache key for get combined review options WS calls.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {number} userId User ID.
-     * @return {string} Cache key.
+     * @param quizId Quiz ID.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getCombinedReviewOptionsCacheKey(quizId: number, userId: number): string {
         return this.getCombinedReviewOptionsCommonCacheKey(quizId) + ':' + userId;
@@ -486,8 +486,8 @@ export class AddonModQuizProvider {
     /**
      * Get common cache key for get combined review options WS calls.
      *
-     * @param {number} quizId Quiz ID.
-     * @return {string} Cache key.
+     * @param quizId Quiz ID.
+     * @return Cache key.
      */
     protected getCombinedReviewOptionsCommonCacheKey(quizId: number): string {
         return this.ROOT_CACHE_KEY + 'combinedReviewOptions:' + quizId;
@@ -496,11 +496,11 @@ export class AddonModQuizProvider {
     /**
      * Get a quiz combined review options.
      *
-     * @param {number} quizId  Quiz ID.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any>}Promise resolved with the combined review options.
+     * @param quizId Quiz ID.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved with the combined review options.
      */
     getCombinedReviewOptions(quizId: number, ignoreCache?: boolean, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -536,9 +536,9 @@ export class AddonModQuizProvider {
     /**
      * Get cache key for get feedback for grade WS calls.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {number} grade  Grade.
-     * @return {string} Cache key.
+     * @param quizId Quiz ID.
+     * @param grade Grade.
+     * @return Cache key.
      */
     protected getFeedbackForGradeCacheKey(quizId: number, grade: number): string {
         return this.getFeedbackForGradeCommonCacheKey(quizId) + ':' + grade;
@@ -547,8 +547,8 @@ export class AddonModQuizProvider {
     /**
      * Get common cache key for get feedback for grade WS calls.
      *
-     * @param {number} quizId Quiz ID.
-     * @return {string} Cache key.
+     * @param quizId Quiz ID.
+     * @return Cache key.
      */
     protected getFeedbackForGradeCommonCacheKey(quizId: number): string {
         return this.ROOT_CACHE_KEY + 'feedbackForGrade:' + quizId;
@@ -557,11 +557,11 @@ export class AddonModQuizProvider {
     /**
      * Get the feedback for a certain grade.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {number} grade Grade.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the feedback.
+     * @param quizId Quiz ID.
+     * @param grade Grade.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the feedback.
      */
     getFeedbackForGrade(quizId: number, grade: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -587,8 +587,8 @@ export class AddonModQuizProvider {
      * Determine the correct number of decimal places required to format a grade.
      * Based on Moodle's quiz_get_grade_format.
      *
-     * @param {any} quiz Quiz.
-     * @return {number} Number of decimals.
+     * @param quiz Quiz.
+     * @return Number of decimals.
      */
     getGradeDecimals(quiz: any): number {
         if (typeof quiz.questiondecimalpoints == 'undefined') {
@@ -605,12 +605,12 @@ export class AddonModQuizProvider {
     /**
      * Gets a quiz grade and feedback from the gradebook.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} moduleId Quiz module ID.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any>} Promise resolved with an object containing the grade and the feedback.
+     * @param courseId Course ID.
+     * @param moduleId Quiz module ID.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved with an object containing the grade and the feedback.
      */
     getGradeFromGradebook(courseId: number, moduleId: number, ignoreCache?: boolean, siteId?: string, userId?: number)
             : Promise<any> {
@@ -623,8 +623,8 @@ export class AddonModQuizProvider {
     /**
      * Given a list of attempts, returns the last finished attempt.
      *
-     * @param {any[]} attempts Attempts.
-     * @return {any} Last finished attempt.
+     * @param attempts Attempts.
+     * @return Last finished attempt.
      */
     getLastFinishedAttemptFromList(attempts: any[]): any {
         if (attempts && attempts.length) {
@@ -642,8 +642,8 @@ export class AddonModQuizProvider {
      * Given a list of questions, check if the quiz can be submitted.
      * Will return an array with the messages to prevent the submit. Empty array if quiz can be submitted.
      *
-     * @param {any[]} questions Questions.
-     * @return {string[]} List of prevent submit messages. Empty array if quiz can be submitted.
+     * @param questions Questions.
+     * @return List of prevent submit messages. Empty array if quiz can be submitted.
      */
     getPreventSubmitMessages(questions: any[]): string[] {
         const messages = [];
@@ -670,8 +670,8 @@ export class AddonModQuizProvider {
     /**
      * Get cache key for quiz data WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getQuizDataCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'quiz:' + courseId;
@@ -680,13 +680,13 @@ export class AddonModQuizProvider {
     /**
      * Get a Quiz with key=value. If more than one is found, only the first will be returned.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} key Name of the property to check.
-     * @param {any} value Value to search.
-     * @param {boolean} [forceCache] Whether it should always return cached data.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the Quiz is retrieved.
+     * @param courseId Course ID.
+     * @param key Name of the property to check.
+     * @param value Value to search.
+     * @param forceCache Whether it should always return cached data.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the Quiz is retrieved.
      */
     protected getQuizByField(courseId: number, key: string, value: any, forceCache?: boolean, ignoreCache?: boolean,
             siteId?: string): Promise<any> {
@@ -726,12 +726,12 @@ export class AddonModQuizProvider {
     /**
      * Get a quiz by module ID.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} cmId Course module ID.
-     * @param {boolean} [forceCache] Whether it should always return cached data.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the quiz is retrieved.
+     * @param courseId Course ID.
+     * @param cmId Course module ID.
+     * @param forceCache Whether it should always return cached data.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the quiz is retrieved.
      */
     getQuiz(courseId: number, cmId: number, forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.getQuizByField(courseId, 'coursemodule', cmId, forceCache, ignoreCache, siteId);
@@ -740,12 +740,12 @@ export class AddonModQuizProvider {
     /**
      * Get a quiz by quiz ID.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} id Quiz ID.
-     * @param {boolean} [forceCache] Whether it should always return cached data.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the quiz is retrieved.
+     * @param courseId Course ID.
+     * @param id Quiz ID.
+     * @param forceCache Whether it should always return cached data.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the quiz is retrieved.
      */
     getQuizById(courseId: number, id: number, forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.getQuizByField(courseId, 'id', id, forceCache, ignoreCache, siteId);
@@ -754,8 +754,8 @@ export class AddonModQuizProvider {
     /**
      * Get cache key for get quiz access information WS calls.
      *
-     * @param {number} quizId Quiz ID.
-     * @return {string} Cache key.
+     * @param quizId Quiz ID.
+     * @return Cache key.
      */
     protected getQuizAccessInformationCacheKey(quizId: number): string {
         return this.ROOT_CACHE_KEY + 'quizAccessInformation:' + quizId;
@@ -764,11 +764,11 @@ export class AddonModQuizProvider {
     /**
      * Get access information for an attempt.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {boolean} [offline] Whether it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the access information.
+     * @param quizId Quiz ID.
+     * @param offline Whether it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the access information.
      */
     getQuizAccessInformation(quizId: number, offline?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -793,8 +793,8 @@ export class AddonModQuizProvider {
     /**
      * Get a readable Quiz grade method.
      *
-     * @param {number|string} method Grading method.
-     * @return {string} Readable grading method.
+     * @param method Grading method.
+     * @return Readable grading method.
      */
     getQuizGradeMethod(method: number | string): string {
         if (typeof method == 'string') {
@@ -818,8 +818,8 @@ export class AddonModQuizProvider {
     /**
      * Get cache key for get quiz required qtypes WS calls.
      *
-     * @param {number} quizId Quiz ID.
-     * @return {string} Cache key.
+     * @param quizId Quiz ID.
+     * @return Cache key.
      */
     protected getQuizRequiredQtypesCacheKey(quizId: number): string {
         return this.ROOT_CACHE_KEY + 'quizRequiredQtypes:' + quizId;
@@ -828,10 +828,10 @@ export class AddonModQuizProvider {
     /**
      * Get the potential question types that would be required for a given quiz.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the access information.
+     * @param quizId Quiz ID.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the access information.
      */
     getQuizRequiredQtypes(quizId: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -861,8 +861,8 @@ export class AddonModQuizProvider {
     /**
      * Given an attempt's layout, return the list of pages.
      *
-     * @param {string} layout Attempt's layout.
-     * @return {number[]} Pages.
+     * @param layout Attempt's layout.
+     * @return Pages.
      * @description
      * An attempt's layout is a string with the question numbers separated by commas. A 0 indicates a change of page.
      * Example: 1,2,3,0,4,5,6,0
@@ -889,9 +889,9 @@ export class AddonModQuizProvider {
      * Given an attempt's layout and a list of questions identified by question slot,
      * return the list of pages that have at least 1 of the questions.
      *
-     * @param {string} layout Attempt's layout.
-     * @param {any} questions List of questions. It needs to be an object where the keys are question slot.
-     * @return {number[]} Pages.
+     * @param layout Attempt's layout.
+     * @param questions List of questions. It needs to be an object where the keys are question slot.
+     * @return Pages.
      * @description
      * An attempt's layout is a string with the question numbers separated by commas. A 0 indicates a change of page.
      * Example: 1,2,3,0,4,5,6,0
@@ -923,8 +923,8 @@ export class AddonModQuizProvider {
     /**
      * Given a list of question types, returns the types that aren't supported.
      *
-     * @param {string[]} questionTypes Question types to check.
-     * @return {string[]} Not supported question types.
+     * @param questionTypes Question types to check.
+     * @return Not supported question types.
      */
     getUnsupportedQuestions(questionTypes: string[]): string[] {
         const notSupported = [];
@@ -941,8 +941,8 @@ export class AddonModQuizProvider {
     /**
      * Given a list of access rules names, returns the rules that aren't supported.
      *
-     * @param {string[]} rulesNames Rules to check.
-     * @return {string[]} Not supported rules names.
+     * @param rulesNames Rules to check.
+     * @return Not supported rules names.
      */
     getUnsupportedRules(rulesNames: string[]): string[] {
         const notSupported = [];
@@ -959,9 +959,9 @@ export class AddonModQuizProvider {
     /**
      * Get cache key for get user attempts WS calls.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {number} userId User ID.
-     * @return {string} Cache key.
+     * @param quizId Quiz ID.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getUserAttemptsCacheKey(quizId: number, userId: number): string {
         return this.getUserAttemptsCommonCacheKey(quizId) + ':' + userId;
@@ -970,8 +970,8 @@ export class AddonModQuizProvider {
     /**
      * Get common cache key for get user attempts WS calls.
      *
-     * @param {number} quizId Quiz ID.
-     * @return {string} Cache key.
+     * @param quizId Quiz ID.
+     * @return Cache key.
      */
     protected getUserAttemptsCommonCacheKey(quizId: number): string {
         return this.ROOT_CACHE_KEY + 'userAttempts:' + quizId;
@@ -980,14 +980,14 @@ export class AddonModQuizProvider {
     /**
      * Get quiz attempts for a certain user.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {number} [status=all]  Status of the attempts to get. By default, 'all'.
-     * @param {boolean} [includePreviews=true] Whether to include previews. Defaults to true.
-     * @param {boolean} [offline] Whether it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any[]>} Promise resolved with the attempts.
+     * @param quizId Quiz ID.
+     * @param status Status of the attempts to get. By default, 'all'.
+     * @param includePreviews Whether to include previews. Defaults to true.
+     * @param offline Whether it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved with the attempts.
      */
     getUserAttempts(quizId: number, status: string = 'all', includePreviews: boolean = true, offline?: boolean,
             ignoreCache?: boolean, siteId?: string, userId?: number): Promise<any[]> {
@@ -1026,9 +1026,9 @@ export class AddonModQuizProvider {
     /**
      * Get cache key for get user best grade WS calls.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {number} userId User ID.
-     * @return {string} Cache key.
+     * @param quizId Quiz ID.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getUserBestGradeCacheKey(quizId: number, userId: number): string {
         return this.getUserBestGradeCommonCacheKey(quizId) + ':' + userId;
@@ -1037,8 +1037,8 @@ export class AddonModQuizProvider {
     /**
      * Get common cache key for get user best grade WS calls.
      *
-     * @param {number} quizId Quiz ID.
-     * @return {string} Cache key.
+     * @param quizId Quiz ID.
+     * @return Cache key.
      */
     protected getUserBestGradeCommonCacheKey(quizId: number): string {
         return this.ROOT_CACHE_KEY + 'userBestGrade:' + quizId;
@@ -1047,11 +1047,11 @@ export class AddonModQuizProvider {
     /**
      * Get best grade in a quiz for a certain user.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any>} Promise resolved with the best grade data.
+     * @param quizId Quiz ID.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved with the best grade data.
      */
     getUserBestGrade(quizId: number, ignoreCache?: boolean, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1077,12 +1077,12 @@ export class AddonModQuizProvider {
     /**
      * Invalidates all the data related to a certain quiz.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {number} [courseId] Course ID.
-     * @param {number} [attemptId] Attempt ID to invalidate some WS calls.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param quizId Quiz ID.
+     * @param courseId Course ID.
+     * @param attemptId Attempt ID to invalidate some WS calls.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAllQuizData(quizId: number, courseId?: number, attemptId?: number, siteId?: string, userId?: number): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -1113,9 +1113,9 @@ export class AddonModQuizProvider {
     /**
      * Invalidates attempt access information for all attempts in a quiz.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param quizId Quiz ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAttemptAccessInformation(quizId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1126,10 +1126,10 @@ export class AddonModQuizProvider {
     /**
      * Invalidates attempt access information for an attempt.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {number} attemptId Attempt ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param quizId Quiz ID.
+     * @param attemptId Attempt ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAttemptAccessInformationForAttempt(quizId: number, attemptId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1140,9 +1140,9 @@ export class AddonModQuizProvider {
     /**
      * Invalidates attempt data for all pages.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param attemptId Attempt ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAttemptData(attemptId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1153,10 +1153,10 @@ export class AddonModQuizProvider {
     /**
      * Invalidates attempt data for a certain page.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {number} page Page.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param attemptId Attempt ID.
+     * @param page Page.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAttemptDataForPage(attemptId: number, page: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1167,9 +1167,9 @@ export class AddonModQuizProvider {
     /**
      * Invalidates attempt review for all pages.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param attemptId Attempt ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAttemptReview(attemptId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1180,10 +1180,10 @@ export class AddonModQuizProvider {
     /**
      * Invalidates attempt review for a certain page.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {number} page Page.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param attemptId Attempt ID.
+     * @param page Page.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAttemptReviewForPage(attemptId: number, page: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1194,9 +1194,9 @@ export class AddonModQuizProvider {
     /**
      * Invalidates attempt summary.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param attemptId Attempt ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAttemptSummary(attemptId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1207,9 +1207,9 @@ export class AddonModQuizProvider {
     /**
      * Invalidates combined review options for all users.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param quizId Quiz ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCombinedReviewOptions(quizId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1220,10 +1220,10 @@ export class AddonModQuizProvider {
     /**
      * Invalidates combined review options for a certain user.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param quizId Quiz ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCombinedReviewOptionsForUser(quizId: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1237,10 +1237,10 @@ export class AddonModQuizProvider {
      * Invalidate the prefetched content except files.
      * To invalidate files, use AddonModQuizProvider.invalidateFiles.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -1259,9 +1259,9 @@ export class AddonModQuizProvider {
     /**
      * Invalidates feedback for all grades of a quiz.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param quizId Quiz ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateFeedback(quizId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1272,10 +1272,10 @@ export class AddonModQuizProvider {
     /**
      * Invalidates feedback for a certain grade.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {number} grade Grade.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param quizId Quiz ID.
+     * @param grade Grade.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateFeedbackForGrade(quizId: number, grade: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1286,8 +1286,8 @@ export class AddonModQuizProvider {
     /**
      * Invalidate the prefetched files.
      *
-     * @param {number} moduleId The module ID.
-     * @return {Promise<any>} Promise resolved when the files are invalidated.
+     * @param moduleId The module ID.
+     * @return Promise resolved when the files are invalidated.
      */
     invalidateFiles(moduleId: number): Promise<any> {
         return this.filepoolProvider.invalidateFilesByComponent(this.sitesProvider.getCurrentSiteId(),
@@ -1297,10 +1297,10 @@ export class AddonModQuizProvider {
     /**
      * Invalidates grade from gradebook for a certain user.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateGradeFromGradebook(courseId: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1313,9 +1313,9 @@ export class AddonModQuizProvider {
     /**
      * Invalidates quiz access information for a quiz.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param quizId Quiz ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateQuizAccessInformation(quizId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1326,9 +1326,9 @@ export class AddonModQuizProvider {
     /**
      * Invalidates required qtypes for a quiz.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param quizId Quiz ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateQuizRequiredQtypes(quizId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1339,9 +1339,9 @@ export class AddonModQuizProvider {
     /**
      * Invalidates user attempts for all users.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param quizId Quiz ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateUserAttempts(quizId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1352,10 +1352,10 @@ export class AddonModQuizProvider {
     /**
      * Invalidates user attempts for a certain user.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param quizId Quiz ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateUserAttemptsForUser(quizId: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1368,9 +1368,9 @@ export class AddonModQuizProvider {
     /**
      * Invalidates user best grade for all users.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param quizId Quiz ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateUserBestGrade(quizId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1381,10 +1381,10 @@ export class AddonModQuizProvider {
     /**
      * Invalidates user best grade for a certain user.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param quizId Quiz ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateUserBestGradeForUser(quizId: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1397,9 +1397,9 @@ export class AddonModQuizProvider {
     /**
      * Invalidates quiz data.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateQuizData(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1410,8 +1410,8 @@ export class AddonModQuizProvider {
     /**
      * Check if an attempt is finished based on its state.
      *
-     * @param {string} state Attempt's state.
-     * @return {boolean} Whether it's finished.
+     * @param state Attempt's state.
+     * @return Whether it's finished.
      */
     isAttemptFinished(state: string): boolean {
         return state == AddonModQuizProvider.ATTEMPT_FINISHED || state == AddonModQuizProvider.ATTEMPT_ABANDONED;
@@ -1420,9 +1420,9 @@ export class AddonModQuizProvider {
     /**
      * Check if an attempt is finished in offline but not synced.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: true if finished in offline but not synced, false otherwise.
+     * @param attemptId Attempt ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: true if finished in offline but not synced, false otherwise.
      */
     isAttemptFinishedOffline(attemptId: number, siteId?: string): Promise<boolean> {
         return this.quizOfflineProvider.getAttemptById(attemptId, siteId).then((attempt) => {
@@ -1438,9 +1438,9 @@ export class AddonModQuizProvider {
      * OR
      * - It finished before autosaveperiod passes.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} attempt Attempt.
-     * @return {boolean} Whether it's nearly over or over.
+     * @param quiz Quiz.
+     * @param attempt Attempt.
+     * @return Whether it's nearly over or over.
      */
     isAttemptTimeNearlyOver(quiz: any, attempt: any): boolean {
         if (attempt.state != AddonModQuizProvider.ATTEMPT_IN_PROGRESS) {
@@ -1461,10 +1461,10 @@ export class AddonModQuizProvider {
     /**
      * Check if last attempt is offline and unfinished.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined, user current site's user.
-     * @return {Promise<boolean>} Promise resolved with boolean: true if last offline attempt is unfinished, false otherwise.
+     * @param attemptId Attempt ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined, user current site's user.
+     * @return Promise resolved with boolean: true if last offline attempt is unfinished, false otherwise.
      */
     isLastAttemptOfflineUnfinished(quiz: any, siteId?: string, userId?: number): Promise<boolean> {
         return this.quizOfflineProvider.getQuizAttempts(quiz.id, siteId, userId).then((attempts) => {
@@ -1479,8 +1479,8 @@ export class AddonModQuizProvider {
     /**
      * Check if a quiz navigation is sequential.
      *
-     * @param {any} quiz Quiz.
-     * @return {boolean} Whether navigation is sequential.
+     * @param quiz Quiz.
+     * @return Whether navigation is sequential.
      */
     isNavigationSequential(quiz: any): boolean {
         return quiz.navmethod == 'sequential';
@@ -1489,8 +1489,8 @@ export class AddonModQuizProvider {
     /**
      * Return whether or not the plugin is enabled in a certain site. Plugin is enabled if the quiz WS are available.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean} Whether the plugin is enabled.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Whether the plugin is enabled.
      */
     isPluginEnabled(siteId?: string): boolean {
         // Quiz WebServices were introduced in 3.1, it will always be enabled.
@@ -1500,8 +1500,8 @@ export class AddonModQuizProvider {
     /**
      * Check if a question is blocked.
      *
-     * @param {any} question Question.
-     * @return {boolean} Whether it's blocked.
+     * @param question Question.
+     * @return Whether it's blocked.
      */
     isQuestionBlocked(question: any): boolean {
         const element = this.domUtils.convertToElement(question.html);
@@ -1512,8 +1512,8 @@ export class AddonModQuizProvider {
     /**
      * Check if a quiz is enabled to be used in offline.
      *
-     * @param {any} quiz Quiz.
-     * @return {boolean} Whether offline is enabled.
+     * @param quiz Quiz.
+     * @return Whether offline is enabled.
      */
     isQuizOffline(quiz: any): boolean {
         // Don't allow downloading the quiz if offline is disabled to prevent wasting a lot of data when opening it.
@@ -1523,9 +1523,9 @@ export class AddonModQuizProvider {
     /**
      * Given a list of attempts, add finishedOffline=true to those attempts that are finished in offline but not synced.
      *
-     * @param {any[]} attempts List of attempts.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<void>} Promise resolved when done.
+     * @param attempts List of attempts.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     loadFinishedOfflineData(attempts: any[], siteId?: string): Promise<void> {
         if (attempts.length) {
@@ -1543,13 +1543,13 @@ export class AddonModQuizProvider {
     /**
      * Report an attempt as being viewed. It did not store logs offline because order of the log is important.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {number} [page=0] Page number.
-     * @param {any} [preflightData] Preflight required data (like password).
-     * @param {boolean} [offline] Whether attempt is offline.
-     * @param {string} [quiz] Quiz instance. If set, a Firebase event will be stored.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the WS call is successful.
+     * @param attemptId Attempt ID.
+     * @param page Page number.
+     * @param preflightData Preflight required data (like password).
+     * @param offline Whether attempt is offline.
+     * @param quiz Quiz instance. If set, a Firebase event will be stored.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logViewAttempt(attemptId: number, page: number = 0, preflightData: any = {}, offline?: boolean, quiz?: any,
             siteId?: string): Promise<any> {
@@ -1578,11 +1578,11 @@ export class AddonModQuizProvider {
     /**
      * Report an attempt's review as being viewed.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {number} quizId Quiz ID.
-     * @param {string} [name] Name of the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the WS call is successful.
+     * @param attemptId Attempt ID.
+     * @param quizId Quiz ID.
+     * @param name Name of the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logViewAttemptReview(attemptId: number, quizId: number, name?: string, siteId?: string): Promise<any> {
         const params = {
@@ -1596,12 +1596,12 @@ export class AddonModQuizProvider {
     /**
      * Report an attempt's summary as being viewed.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {any} preflightData Preflight required data (like password).
-     * @param {number} quizId Quiz ID.
-     * @param {string} [name] Name of the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the WS call is successful.
+     * @param attemptId Attempt ID.
+     * @param preflightData Preflight required data (like password).
+     * @param quizId Quiz ID.
+     * @param name Name of the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logViewAttemptSummary(attemptId: number, preflightData: any, quizId: number, name?: string, siteId?: string): Promise<any> {
         const params = {
@@ -1616,10 +1616,10 @@ export class AddonModQuizProvider {
     /**
      * Report a quiz as being viewed.
      *
-     * @param {number} id Module ID.
-     * @param {string} [name] Name of the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the WS call is successful.
+     * @param id Module ID.
+     * @param name Name of the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logViewQuiz(id: number, name?: string, siteId?: string): Promise<any> {
         const params = {
@@ -1633,15 +1633,15 @@ export class AddonModQuizProvider {
     /**
      * Process an attempt, saving its data.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} attempt Attempt.
-     * @param {any} data Data to save.
-     * @param {any} preflightData Preflight required data (like password).
-     * @param {boolean} [finish] Whether to finish the quiz.
-     * @param {boolean} [timeUp] Whether the quiz time is up, false otherwise.
-     * @param {boolean} [offline] Whether the attempt is offline.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved in success, rejected otherwise.
+     * @param quiz Quiz.
+     * @param attempt Attempt.
+     * @param data Data to save.
+     * @param preflightData Preflight required data (like password).
+     * @param finish Whether to finish the quiz.
+     * @param timeUp Whether the quiz time is up, false otherwise.
+     * @param offline Whether the attempt is offline.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved in success, rejected otherwise.
      */
     processAttempt(quiz: any, attempt: any, data: any, preflightData: any, finish?: boolean, timeUp?: boolean, offline?: boolean,
             siteId?: string): Promise<any> {
@@ -1655,13 +1655,13 @@ export class AddonModQuizProvider {
     /**
      * Process an online attempt, saving its data.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {any} data Data to save.
-     * @param {any} preflightData Preflight required data (like password).
-     * @param {boolean} [finish] Whether to finish the quiz.
-     * @param {boolean} [timeUp] Whether the quiz time is up, false otherwise.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved in success, rejected otherwise.
+     * @param attemptId Attempt ID.
+     * @param data Data to save.
+     * @param preflightData Preflight required data (like password).
+     * @param finish Whether to finish the quiz.
+     * @param timeUp Whether the quiz time is up, false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved in success, rejected otherwise.
      */
     protected processAttemptOnline(attemptId: number, data: any, preflightData: any, finish?: boolean, timeUp?: boolean,
             siteId?: string): Promise<any> {
@@ -1691,13 +1691,13 @@ export class AddonModQuizProvider {
     /**
      * Process an offline attempt, saving its data.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} attempt Attempt.
-     * @param {any} data Data to save.
-     * @param {any} preflightData Preflight required data (like password).
-     * @param {boolean} [finish] Whether to finish the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved in success, rejected otherwise.
+     * @param quiz Quiz.
+     * @param attempt Attempt.
+     * @param data Data to save.
+     * @param preflightData Preflight required data (like password).
+     * @param finish Whether to finish the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved in success, rejected otherwise.
      */
     protected processAttemptOffline(quiz: any, attempt: any, data: any, preflightData: any, finish?: boolean, siteId?: string)
             : Promise<any> {
@@ -1714,8 +1714,8 @@ export class AddonModQuizProvider {
     /**
      * Check if it's a graded quiz. Based on Moodle's quiz_has_grades.
      *
-     * @param {any} quiz Quiz.
-     * @return {boolean} Whether quiz is graded.
+     * @param quiz Quiz.
+     * @return Whether quiz is graded.
      */
     quizHasGrades(quiz: any): boolean {
         return quiz.grade >= 0.000005 && quiz.sumgrades >= 0.000005;
@@ -1725,11 +1725,11 @@ export class AddonModQuizProvider {
      * Convert the raw grade into a grade out of the maximum grade for this quiz.
      * Based on Moodle's quiz_rescale_grade.
      *
-     * @param {string} rawGrade The unadjusted grade, for example attempt.sumgrades.
-     * @param {any} quiz Quiz.
-     * @param {boolean|string} format True to format the results for display, 'question' to format a question grade
-     *                                 (different number of decimal places), false to not format it.
-     * @return {string} Grade to display.
+     * @param rawGrade The unadjusted grade, for example attempt.sumgrades.
+     * @param quiz Quiz.
+     * @param format True to format the results for display, 'question' to format a question grade
+     *               (different number of decimal places), false to not format it.
+     * @return Grade to display.
      */
     rescaleGrade(rawGrade: string, quiz: any, format: boolean | string = true): string {
         let grade: number;
@@ -1761,13 +1761,13 @@ export class AddonModQuizProvider {
     /**
      * Save an attempt data.
      *
-     * @param {any} quiz Quiz.
-     * @param {any} attempt Attempt.
-     * @param {any} data Data to save.
-     * @param {any} preflightData Preflight required data (like password).
-     * @param {boolean} [offline] Whether attempt is offline.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved in success, rejected otherwise.
+     * @param quiz Quiz.
+     * @param attempt Attempt.
+     * @param data Data to save.
+     * @param preflightData Preflight required data (like password).
+     * @param offline Whether attempt is offline.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved in success, rejected otherwise.
      */
     saveAttempt(quiz: any, attempt: any, data: any, preflightData: any, offline?: boolean, siteId?: string): Promise<any> {
         try {
@@ -1786,11 +1786,11 @@ export class AddonModQuizProvider {
     /**
      * Save an attempt data.
      *
-     * @param {number} attemptId Attempt ID.
-     * @param {any} data Data to save.
-     * @param {any} preflightData Preflight required data (like password).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<void>} Promise resolved in success, rejected otherwise.
+     * @param attemptId Attempt ID.
+     * @param data Data to save.
+     * @param preflightData Preflight required data (like password).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved in success, rejected otherwise.
      */
     protected saveAttemptOnline(attemptId: number, data: any, preflightData: any, siteId?: string): Promise<void> {
 
@@ -1815,10 +1815,10 @@ export class AddonModQuizProvider {
     /**
      * Check if time left should be shown.
      *
-     * @param {string[]} rules List of active rules names.
-     * @param {any} attempt Attempt.
-     * @param {number} endTime The attempt end time (in seconds).
-     * @return {boolean} Whether time left should be displayed.
+     * @param rules List of active rules names.
+     * @param attempt Attempt.
+     * @param endTime The attempt end time (in seconds).
+     * @return Whether time left should be displayed.
      */
     shouldShowTimeLeft(rules: string[], attempt: any, endTime: number): boolean {
         const timeNow = this.timeUtils.timestamp();
@@ -1833,11 +1833,11 @@ export class AddonModQuizProvider {
     /**
      * Start an attempt.
      *
-     * @param {number} quizId Quiz ID.
-     * @param {any} preflightData Preflight required data (like password).
-     * @param {boolean} [forceNew] Whether to force a new attempt or not.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the attempt data.
+     * @param quizId Quiz ID.
+     * @param preflightData Preflight required data (like password).
+     * @param forceNew Whether to force a new attempt or not.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the attempt data.
      */
     startAttempt(quizId: number, preflightData: any, forceNew?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/addon/mod/quiz/providers/review-link-handler.ts b/src/addon/mod/quiz/providers/review-link-handler.ts
index 516499fd0..c903756fd 100644
--- a/src/addon/mod/quiz/providers/review-link-handler.ts
+++ b/src/addon/mod/quiz/providers/review-link-handler.ts
@@ -34,12 +34,12 @@ export class AddonModQuizReviewLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @param {any} [data] Extra data to handle the URL.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @param data Extra data to handle the URL.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number, data?: any):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -62,11 +62,11 @@ export class AddonModQuizReviewLinkHandler extends CoreContentLinksHandlerBase {
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return this.quizProvider.isPluginEnabled();
diff --git a/src/addon/mod/quiz/providers/sync-cron-handler.ts b/src/addon/mod/quiz/providers/sync-cron-handler.ts
index 2c3c1bcbe..439db41e3 100644
--- a/src/addon/mod/quiz/providers/sync-cron-handler.ts
+++ b/src/addon/mod/quiz/providers/sync-cron-handler.ts
@@ -29,9 +29,9 @@ export class AddonModQuizSyncCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         return this.quizSync.syncAllQuizzes(siteId, force);
@@ -40,7 +40,7 @@ export class AddonModQuizSyncCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return this.quizSync.syncInterval;
diff --git a/src/addon/mod/resource/components/index/index.ts b/src/addon/mod/resource/components/index/index.ts
index ab8ccffac..fd52daa25 100644
--- a/src/addon/mod/resource/components/index/index.ts
+++ b/src/addon/mod/resource/components/index/index.ts
@@ -64,7 +64,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         return this.resourceProvider.invalidateContent(this.module.id, this.courseId);
@@ -73,8 +73,8 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
     /**
      * Download resource contents.
      *
-     * @param {boolean} [refresh] Whether we're refreshing data.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Whether we're refreshing data.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh?: boolean): Promise<any> {
         // Load module contents if needed. Passing refresh is needed to force reloading contents.
diff --git a/src/addon/mod/resource/pages/index/index.ts b/src/addon/mod/resource/pages/index/index.ts
index 0bc1de345..b1ae19404 100644
--- a/src/addon/mod/resource/pages/index/index.ts
+++ b/src/addon/mod/resource/pages/index/index.ts
@@ -40,7 +40,7 @@ export class AddonModResourceIndexPage {
     /**
      * Update some data based on the resource instance.
      *
-     * @param {any} resource Resource instance.
+     * @param resource Resource instance.
      */
     updateData(resource: any): void {
         this.title = resource.name || this.title;
diff --git a/src/addon/mod/resource/providers/helper.ts b/src/addon/mod/resource/providers/helper.ts
index 0f216e4aa..cf315075a 100644
--- a/src/addon/mod/resource/providers/helper.ts
+++ b/src/addon/mod/resource/providers/helper.ts
@@ -46,9 +46,9 @@ export class AddonModResourceHelperProvider {
     /**
      * Get the HTML to display an embedded resource.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @return {Promise<any>} Promise resolved with the HTML.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @return Promise resolved with the HTML.
      */
     getEmbeddedHtml(module: any, courseId: number): Promise<any> {
         return this.courseHelper.downloadModuleWithMainFileIfNeeded(module, courseId, AddonModResourceProvider.COMPONENT,
@@ -76,8 +76,8 @@ export class AddonModResourceHelperProvider {
     /**
      * Download all the files needed and returns the src of the iframe.
      *
-     * @param {any} module The module object.
-     * @return {Promise<string>} Promise resolved with the iframe src.
+     * @param module The module object.
+     * @return Promise resolved with the iframe src.
      */
     getIframeSrc(module: any): Promise<string> {
         if (!module.contents.length) {
@@ -108,9 +108,9 @@ export class AddonModResourceHelperProvider {
     /**
      * Whether the resource has to be displayed embedded.
      *
-     * @param {any} module    The module object.
-     * @param {number} [display] The display mode (if available).
-     * @return {boolean}         Whether the resource should be displayed embeded.
+     * @param module The module object.
+     * @param display The display mode (if available).
+     * @return Whether the resource should be displayed embeded.
      */
     isDisplayedEmbedded(module: any, display: number): boolean {
         if ((!module.contents.length && !module.contentsinfo) || !this.fileProvider.isAvailable() ||
@@ -132,8 +132,8 @@ export class AddonModResourceHelperProvider {
     /**
      * Whether the resource has to be displayed in an iframe.
      *
-     * @param {any} module The module object.
-     * @return {boolean}   Whether the resource should be displayed in an iframe.
+     * @param module The module object.
+     * @return Whether the resource should be displayed in an iframe.
      */
     isDisplayedInIframe(module: any): boolean {
         if ((!module.contents.length && !module.contentsinfo) || !this.fileProvider.isAvailable()) {
@@ -155,8 +155,8 @@ export class AddonModResourceHelperProvider {
     /**
      * Check if the resource is a Nextcloud file.
      *
-     * @param {any} module Module to check.
-     * @return {boolean} Whether it's a Nextcloud file.
+     * @param module Module to check.
+     * @return Whether it's a Nextcloud file.
      */
     isNextcloudFile(module: any): boolean {
         if (module.contentsinfo) {
@@ -169,9 +169,9 @@ export class AddonModResourceHelperProvider {
     /**
      * Opens a file of the resource activity.
      *
-     * @param  {any} module        Module where to get the contents.
-     * @param  {number} courseId   Course Id, used for completion purposes.
-     * @return {Promise<any>}      Resolved when done.
+     * @param module Module where to get the contents.
+     * @param courseId Course Id, used for completion purposes.
+     * @return Resolved when done.
      */
     openModuleFile(module: any, courseId: number): Promise<any> {
         const modal = this.domUtils.showModalLoading();
diff --git a/src/addon/mod/resource/providers/list-link-handler.ts b/src/addon/mod/resource/providers/list-link-handler.ts
index 8acc2d435..161816640 100644
--- a/src/addon/mod/resource/providers/list-link-handler.ts
+++ b/src/addon/mod/resource/providers/list-link-handler.ts
@@ -33,7 +33,7 @@ export class AddonModResourceListLinkHandler extends CoreContentLinksModuleListH
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.resourceProvider.isPluginEnabled();
diff --git a/src/addon/mod/resource/providers/module-handler.ts b/src/addon/mod/resource/providers/module-handler.ts
index 573546982..f4a9888bf 100644
--- a/src/addon/mod/resource/providers/module-handler.ts
+++ b/src/addon/mod/resource/providers/module-handler.ts
@@ -57,7 +57,7 @@ export class AddonModResourceModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.resourceProvider.isPluginEnabled();
@@ -66,10 +66,10 @@ export class AddonModResourceModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         const updateStatus = (status: string): void => {
@@ -116,9 +116,9 @@ export class AddonModResourceModuleHandler implements CoreCourseModuleHandler {
     /**
      * Returns if contents are loaded to show open button.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @return {Promise<boolean>} Resolved when done.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @return Resolved when done.
      */
     protected hideOpenButton(module: any, courseId: number): Promise<boolean> {
         let promise;
@@ -140,9 +140,9 @@ export class AddonModResourceModuleHandler implements CoreCourseModuleHandler {
     /**
      * Returns the activity icon and data.
      *
-     * @param {any} module        The module object.
-     * @param {number} courseId   The course ID.
-     * @return {Promise<any>}     Resource data.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @return Resource data.
      */
     protected getResourceData(module: any, courseId: number, handlerData: CoreCourseModuleHandlerData): Promise<any> {
         const promises = [];
@@ -238,9 +238,9 @@ export class AddonModResourceModuleHandler implements CoreCourseModuleHandler {
      * Get the component to render the module. This is needed to support singleactivity course format.
      * The component returned must implement CoreCourseModuleMainComponent.
      *
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any} The component to use, undefined if not found.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component to use, undefined if not found.
      */
     getMainComponent(course: any, module: any): any {
         return AddonModResourceIndexComponent;
diff --git a/src/addon/mod/resource/providers/pluginfile-handler.ts b/src/addon/mod/resource/providers/pluginfile-handler.ts
index ecd7154f1..bfda5c467 100644
--- a/src/addon/mod/resource/providers/pluginfile-handler.ts
+++ b/src/addon/mod/resource/providers/pluginfile-handler.ts
@@ -26,8 +26,8 @@ export class AddonModResourcePluginFileHandler implements CorePluginFileHandler
     /**
      * Return the RegExp to match the revision on pluginfile URLs.
      *
-     * @param {string[]} args Arguments of the pluginfile URL defining component and filearea at least.
-     * @return {RegExp} RegExp to match the revision on pluginfile URLs.
+     * @param args Arguments of the pluginfile URL defining component and filearea at least.
+     * @return RegExp to match the revision on pluginfile URLs.
      */
     getComponentRevisionRegExp(args: string[]): RegExp {
         // Check filearea.
@@ -40,8 +40,8 @@ export class AddonModResourcePluginFileHandler implements CorePluginFileHandler
     /**
      * Should return the string to remove the revision on pluginfile url.
      *
-     * @param {string[]} args Arguments of the pluginfile URL defining component and filearea at least.
-     * @return {string} String to remove the revision on pluginfile url.
+     * @param args Arguments of the pluginfile URL defining component and filearea at least.
+     * @return String to remove the revision on pluginfile url.
      */
     getComponentRevisionReplace(args: string[]): string {
         // Component + Filearea + Revision
diff --git a/src/addon/mod/resource/providers/prefetch-handler.ts b/src/addon/mod/resource/providers/prefetch-handler.ts
index 7c3e7be65..eee3a26ef 100644
--- a/src/addon/mod/resource/providers/prefetch-handler.ts
+++ b/src/addon/mod/resource/providers/prefetch-handler.ts
@@ -45,10 +45,10 @@ export class AddonModResourcePrefetchHandler extends CoreCourseResourcePrefetchH
     /**
      * Return the status to show based on current status.
      *
-     * @param {any} module Module.
-     * @param {string} status The current status.
-     * @param {boolean} canCheck Whether the site allows checking for updates.
-     * @return {string} Status to display.
+     * @param module Module.
+     * @param status The current status.
+     * @param canCheck Whether the site allows checking for updates.
+     * @return Status to display.
      */
     determineStatus(module: any, status: string, canCheck: boolean): string {
         if (status == CoreConstants.DOWNLOADED && module) {
@@ -72,13 +72,13 @@ export class AddonModResourcePrefetchHandler extends CoreCourseResourcePrefetchH
     /**
      * Download or prefetch the content.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @param {boolean} [prefetch] True to prefetch, false to download right away.
-     * @param {string} [dirPath] Path of the directory where to store all the content files. This is to keep the files
-     *                           relative paths and make the package work in an iframe. Undefined to download the files
-     *                           in the filepool root folder.
-     * @return {Promise<any>} Promise resolved when all content is downloaded. Data returned is not reliable.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @param prefetch True to prefetch, false to download right away.
+     * @param dirPath Path of the directory where to store all the content files. This is to keep the files
+     *                relative paths and make the package work in an iframe. Undefined to download the files
+     *                in the filepool root folder.
+     * @return Promise resolved when all content is downloaded. Data returned is not reliable.
      */
     downloadOrPrefetch(module: any, courseId: number, prefetch?: boolean, dirPath?: string): Promise<any> {
         let promise;
@@ -105,9 +105,9 @@ export class AddonModResourcePrefetchHandler extends CoreCourseResourcePrefetchH
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         return this.resourceProvider.invalidateContent(moduleId, courseId);
@@ -116,9 +116,9 @@ export class AddonModResourcePrefetchHandler extends CoreCourseResourcePrefetchH
     /**
      * Invalidate WS calls needed to determine module status.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when invalidated.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when invalidated.
      */
     invalidateModule(module: any, courseId: number): Promise<any> {
         const promises = [];
@@ -132,9 +132,9 @@ export class AddonModResourcePrefetchHandler extends CoreCourseResourcePrefetchH
     /**
      * Check if a resource is downloadable.
      *
-     * @param {any} module Module to check.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<boolean>} Promise resolved with true if downloadable, resolved with false otherwise.
+     * @param module Module to check.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved with true if downloadable, resolved with false otherwise.
      */
     isDownloadable(module: any, courseId: number): Promise<boolean> {
         if (this.sitesProvider.getCurrentSite().isVersionGreaterEqualThan('3.7')) {
@@ -151,7 +151,7 @@ export class AddonModResourcePrefetchHandler extends CoreCourseResourcePrefetchH
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
+     * @return A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.resourceProvider.isPluginEnabled();
diff --git a/src/addon/mod/resource/providers/resource.ts b/src/addon/mod/resource/providers/resource.ts
index 3de250b9b..05c8e4620 100644
--- a/src/addon/mod/resource/providers/resource.ts
+++ b/src/addon/mod/resource/providers/resource.ts
@@ -40,8 +40,8 @@ export class AddonModResourceProvider {
     /**
      * Get cache key for resource data WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @return {string}         Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getResourceCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'resource:' + courseId;
@@ -50,11 +50,11 @@ export class AddonModResourceProvider {
     /**
      * Get a resource data.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} key     Name of the property to check.
-     * @param {any}  value   Value to search.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the resource is retrieved.
+     * @param courseId Course ID.
+     * @param key Name of the property to check.
+     * @param value Value to search.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the resource is retrieved.
      */
     protected getResourceDataByKey(courseId: number, key: string, value: any, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -84,10 +84,10 @@ export class AddonModResourceProvider {
     /**
      * Get a resource by course module ID.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} cmId     Course module ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}   Promise resolved when the resource is retrieved.
+     * @param courseId Course ID.
+     * @param cmId Course module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the resource is retrieved.
      */
     getResourceData(courseId: number, cmId: number, siteId?: string): Promise<any> {
         return this.getResourceDataByKey(courseId, 'coursemodule', cmId, siteId);
@@ -96,10 +96,10 @@ export class AddonModResourceProvider {
     /**
      * Invalidate the prefetched content.
      *
-     * @param  {number} moduleId The module ID.
-     * @param  {number} courseId Course ID of the module.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID of the module.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -116,9 +116,9 @@ export class AddonModResourceProvider {
     /**
      * Invalidates resource data.
      *
-     * @param {number} courseid Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}   Promise resolved when the data is invalidated.
+     * @param courseid Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateResourceData(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -129,7 +129,7 @@ export class AddonModResourceProvider {
     /**
      * Returns whether or not getResource WS available or not.
      *
-     * @return {boolean} If WS is abalaible.
+     * @return If WS is abalaible.
      * @since 3.3
      */
     isGetResourceWSAvailable(): boolean {
@@ -139,8 +139,8 @@ export class AddonModResourceProvider {
     /**
      * Return whether or not the plugin is enabled.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
      */
     isPluginEnabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -151,10 +151,10 @@ export class AddonModResourceProvider {
     /**
      * Report the resource as being viewed.
      *
-     * @param {number} id Module ID.
-     * @param {string} [name] Name of the resource.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the WS call is successful.
+     * @param id Module ID.
+     * @param name Name of the resource.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(id: number, name?: string, siteId?: string): Promise<any> {
         const params = {
diff --git a/src/addon/mod/scorm/classes/data-model-12.ts b/src/addon/mod/scorm/classes/data-model-12.ts
index 196d36fda..4c0fd345a 100644
--- a/src/addon/mod/scorm/classes/data-model-12.ts
+++ b/src/addon/mod/scorm/classes/data-model-12.ts
@@ -86,14 +86,14 @@ export class AddonModScormDataModel12 {
     /**
      * Constructor.
      *
-     * @param {CoreEventsProvider} eventsProvider Events provider instance.
-     * @param {AddonModScormProvider} scormProvider SCORM provider instance.
-     * @param {any} scorm SCORM.
-     * @param {number} scoId Current SCO ID.
-     * @param {number} attempt Attempt number.
-     * @param {any} userData The user default data.
-     * @param {string} [mode] Mode being played. By default, MODENORMAL.
-     * @param {boolean} offline Whether the attempt is offline.
+     * @param eventsProvider Events provider instance.
+     * @param scormProvider SCORM provider instance.
+     * @param scorm SCORM.
+     * @param scoId Current SCO ID.
+     * @param attempt Attempt number.
+     * @param userData The user default data.
+     * @param mode Mode being played. By default, MODENORMAL.
+     * @param offline Whether the attempt is offline.
      */
     constructor(protected eventsProvider: CoreEventsProvider, protected scormProvider: AddonModScormProvider,
             protected siteId: string, protected scorm: any, protected scoId: number, protected attempt: number,
@@ -108,9 +108,9 @@ export class AddonModScormDataModel12 {
     /**
      * Utility function for adding two times in format hh:mm:ss.
      *
-     * @param {string} first  First time.
-     * @param {string} second Second time.
-     * @return {string} Total time.
+     * @param first First time.
+     * @param second Second time.
+     * @return Total time.
      */
     protected addTime(first: string, second: string): string {
         const sFirst = first.split(':'),
@@ -165,8 +165,8 @@ export class AddonModScormDataModel12 {
     /**
      * Utility function for cloning an object
      *
-     * @param {any} obj The object to be cloned
-     * @return {any} The object cloned
+     * @param obj The object to be cloned
+     * @return The object cloned
      */
     protected cloneObj(obj: any): any {
         if (obj == null || typeof(obj) != 'object') {
@@ -184,7 +184,7 @@ export class AddonModScormDataModel12 {
     /**
      * Collect all the user tracking data that must be persisted in the system, this is usually called by LMSCommit().
      *
-     * @return {any[]} Collected data.
+     * @return Collected data.
      */
     protected collectData(): any[] {
         const data = [];
@@ -250,8 +250,8 @@ export class AddonModScormDataModel12 {
     /**
      * Get the value of the given element from the non-persistent (current) user data.
      *
-     * @param {string} el The element
-     * @return {any} The element value
+     * @param el The element
+     * @return The element value
      */
     protected getEl(el: string): any {
         if (typeof this.currentUserData[this.scoId] != 'undefined' && typeof this.currentUserData[this.scoId][el] != 'undefined') {
@@ -264,7 +264,7 @@ export class AddonModScormDataModel12 {
     /**
      * Initialize the model.
      *
-     * @param {any} userData The user default data.
+     * @param userData The user default data.
      */
     protected init(userData: any): void {
         // Prepare the definition array containing the default values.
@@ -463,8 +463,8 @@ export class AddonModScormDataModel12 {
     /**
      * Commit the changes.
      *
-     * @param {string} param Param.
-     * @return {string} "true" if success, "false" otherwise.
+     * @param param Param.
+     * @return "true" if success, "false" otherwise.
      */
     LMSCommit(param: string): string {
         if (this.timeout) {
@@ -497,8 +497,8 @@ export class AddonModScormDataModel12 {
     /**
      * Finish the data model.
      *
-     * @param {string} param Param.
-     * @return {string} "true" if success, "false" otherwise.
+     * @param param Param.
+     * @return "true" if success, "false" otherwise.
      */
     LMSFinish(param: string): string {
         this.errorCode = '0';
@@ -540,8 +540,8 @@ export class AddonModScormDataModel12 {
     /**
      * Get diagnostic.
      *
-     * @param  {string} param Param.
-     * @return {string} Result.
+     * @param param Param.
+     * @return Result.
      */
     LMSGetDiagnostic(param: string): string {
         if (param == '') {
@@ -554,8 +554,8 @@ export class AddonModScormDataModel12 {
     /**
      * Get the error message for a certain code.
      *
-     * @param {string} param Error code.
-     * @return {string} Error message.
+     * @param param Error code.
+     * @return Error message.
      */
     LMSGetErrorString(param: string): string {
         if (param != '') {
@@ -568,7 +568,7 @@ export class AddonModScormDataModel12 {
     /**
      * Get the last error code.
      *
-     * @return {string} Last error code.
+     * @return Last error code.
      */
     LMSGetLastError(): string {
         return this.errorCode;
@@ -577,8 +577,8 @@ export class AddonModScormDataModel12 {
     /**
      * Get the value of a certain element.
      *
-     * @param {string} element Name of the element to get.
-     * @return {string} Value.
+     * @param element Name of the element to get.
+     * @return Value.
      */
     LMSGetValue(element: string): string {
         this.errorCode = '0';
@@ -633,8 +633,8 @@ export class AddonModScormDataModel12 {
     /**
      * Initialize the data model.
      *
-     * @param {string} param Param.
-     * @return {string} "true" if initialized, "false" otherwise.
+     * @param param Param.
+     * @return "true" if initialized, "false" otherwise.
      */
     LMSInitialize(param: string): string {
         this.errorCode = '0';
@@ -658,9 +658,9 @@ export class AddonModScormDataModel12 {
     /**
      * Set the value of a certain element.
      *
-     * @param {string} element Name of the element to set.
-     * @param {any} value Value to set.
-     * @return {string} "true" if success, "false" otherwise.
+     * @param element Name of the element to set.
+     * @param value Value to set.
+     * @return "true" if success, "false" otherwise.
      */
     LMSSetValue(element: string, value: any): string {
         this.errorCode = '0';
@@ -794,7 +794,7 @@ export class AddonModScormDataModel12 {
      * The scoId is like a pointer to be able to retrieve the SCO default values and set the new ones in the overall SCORM
      * data structure.
      *
-     * @param {number} scoId The new SCO id.
+     * @param scoId The new SCO id.
      */
     loadSco(scoId: number): void {
         this.scoId = scoId;
@@ -803,8 +803,8 @@ export class AddonModScormDataModel12 {
     /**
      * Set the value of the given element in the non-persistent (current) user data.
      *
-     * @param {string} el The element.
-     * @param {any} value The value.
+     * @param el The element.
+     * @param value The value.
      */
     protected setEl(el: string, value: any): void {
         if (typeof this.currentUserData[this.scoId] == 'undefined') {
@@ -817,7 +817,7 @@ export class AddonModScormDataModel12 {
     /**
      * Set offline mode to true or false.
      *
-     * @param {boolean} offline True if offline, false otherwise.
+     * @param offline True if offline, false otherwise.
      */
     setOffline(offline: boolean): void {
         this.offline = offline;
@@ -826,8 +826,8 @@ export class AddonModScormDataModel12 {
     /**
      * Persist the current user data (this is usually called by LMSCommit).
      *
-     * @param {boolean} storeTotalTime If true, we need to calculate the total time too.
-     * @return {boolean} True if success, false otherwise.
+     * @param storeTotalTime If true, we need to calculate the total time too.
+     * @return True if success, false otherwise.
      */
     protected storeData(storeTotalTime?: boolean): boolean {
         let tracks;
@@ -882,7 +882,7 @@ export class AddonModScormDataModel12 {
     /**
      * Utility function for calculating the total time spent in the SCO.
      *
-     * @return {any} Total time element.
+     * @return Total time element.
      */
     protected totalTime(): any {
         const totalTime = this.addTime(this.getEl('cmi.core.total_time'), this.getEl('cmi.core.session_time'));
@@ -893,7 +893,7 @@ export class AddonModScormDataModel12 {
     /**
      * Convenience function to trigger events.
      *
-     * @param {string} name Name of the event to trigger.
+     * @param name Name of the event to trigger.
      */
     protected triggerEvent(name: string): void {
         this.eventsProvider.trigger(name, {
diff --git a/src/addon/mod/scorm/components/index/index.ts b/src/addon/mod/scorm/components/index/index.ts
index 6672548b7..b93fe28d9 100644
--- a/src/addon/mod/scorm/components/index/index.ts
+++ b/src/addon/mod/scorm/components/index/index.ts
@@ -107,7 +107,7 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Download a SCORM package or restores an ongoing download.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected downloadScormPackage(): Promise<any> {
         this.downloading = true;
@@ -143,10 +143,10 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Get the SCORM data.
      *
-     * @param {boolean} [refresh=false] If it's refreshing content.
-     * @param {boolean} [sync=false] If it should try to sync.
-     * @param {boolean} [showErrors=false] If show errors to the user of hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh If it's refreshing content.
+     * @param sync If it should try to sync.
+     * @param showErrors If show errors to the user of hide them.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<any> {
 
@@ -263,7 +263,7 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Fetch the structure of the SCORM (TOC).
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchStructure(): Promise<any> {
         return this.scormProvider.getOrganizations(this.scorm.id).then((organizations) => {
@@ -285,10 +285,10 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Get the grade of an attempt and add it to the scorm attempts list.
      *
-     * @param {number} attempt The attempt number.
-     * @param {boolean} offline Whether it's an offline attempt.
-     * @param {any} attempts Object where to add the attempt.
-     * @return {Promise<void>} Promise resolved when done.
+     * @param attempt The attempt number.
+     * @param offline Whether it's an offline attempt.
+     * @param attempts Object where to add the attempt.
+     * @return Promise resolved when done.
      */
     protected getAttemptGrade(attempt: number, offline: boolean, attempts: any): Promise<void> {
         return this.scormProvider.getAttemptGrade(this.scorm, attempt, offline).then((grade) => {
@@ -302,7 +302,7 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Get the grades of each attempt and the grade of the SCORM.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected getReportedGrades(): Promise<any> {
         const promises = [],
@@ -351,8 +351,8 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Checks if sync has succeed from result sync data.
      *
-     * @param  {any}     result Data returned on the sync function.
-     * @return {boolean}        If suceed or not.
+     * @param result Data returned on the sync function.
+     * @return If suceed or not.
      */
     protected hasSyncSucceed(result: any): boolean {
         if (result.updated || this.dataSent) {
@@ -412,7 +412,7 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         const promises = [];
@@ -429,8 +429,8 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Compares sync event data with current data to check if refresh content is needed.
      *
-     * @param {any} syncEventData Data receiven on sync observer.
-     * @return {boolean} True if refresh is needed, false otherwise.
+     * @param syncEventData Data receiven on sync observer.
+     * @return True if refresh is needed, false otherwise.
      */
     protected isRefreshSyncNeeded(syncEventData: any): boolean {
         if (syncEventData.updated && this.scorm && syncEventData.scormId == this.scorm.id) {
@@ -455,8 +455,8 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Load the TOC of a certain organization.
      *
-     * @param {string} organizationId The organization id.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param organizationId The organization id.
+     * @return Promise resolved when done.
      */
     protected loadOrganizationToc(organizationId: string): Promise<any> {
         if (!this.scorm.displaycoursestructure) {
@@ -490,8 +490,8 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Open a SCORM. It will download the SCORM package if it's not downloaded or it has changed.
      *
-     * @param {Event} [event] Event.
-     * @param {string} [scoId] SCO that needs to be loaded when the SCORM is opened. If not defined, load first SCO.
+     * @param event Event.
+     * @param scoId SCO that needs to be loaded when the SCORM is opened. If not defined, load first SCO.
      */
     open(event?: Event, scoId?: number): void {
         if (event) {
@@ -534,7 +534,7 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Open a SCORM package.
      *
-     * @param {number} scoId SCO ID.
+     * @param scoId SCO ID.
      */
     protected openScorm(scoId: number): void {
         this.navCtrl.push('AddonModScormPlayerPage', {
@@ -549,8 +549,8 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Displays some data based on the current status.
      *
-     * @param {string} status The current status.
-     * @param {string} [previousStatus] The previous status. If not defined, there is no previous status.
+     * @param status The current status.
+     * @param previousStatus The previous status. If not defined, there is no previous status.
      */
     protected showStatus(status: string, previousStatus?: string): void {
 
@@ -574,7 +574,7 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
     /**
      * Performs the sync of the activity.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected sync(): Promise<any> {
         return this.scormSync.syncScorm(this.scorm).then((result) => {
diff --git a/src/addon/mod/scorm/pages/index/index.ts b/src/addon/mod/scorm/pages/index/index.ts
index 9179fc6d1..1ed77747d 100644
--- a/src/addon/mod/scorm/pages/index/index.ts
+++ b/src/addon/mod/scorm/pages/index/index.ts
@@ -40,7 +40,7 @@ export class AddonModScormIndexPage {
     /**
      * Update some data based on the SCORM instance.
      *
-     * @param {any} scorm SCORM instance.
+     * @param scorm SCORM instance.
      */
     updateData(scorm: any): void {
         this.title = scorm.name || this.title;
diff --git a/src/addon/mod/scorm/pages/player/player.ts b/src/addon/mod/scorm/pages/player/player.ts
index 93024042c..f4c0528a1 100644
--- a/src/addon/mod/scorm/pages/player/player.ts
+++ b/src/addon/mod/scorm/pages/player/player.ts
@@ -163,7 +163,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
     /**
      * Calculate the next and previous SCO.
      *
-     * @param {number} scoId Current SCO ID.
+     * @param scoId Current SCO ID.
      */
     protected calculateNextAndPreviousSco(scoId: number): void {
         this.previousSco = this.scormHelper.getPreviousScoFromToc(this.toc, scoId);
@@ -173,8 +173,8 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
     /**
      * Determine the attempt to use, the mode (normal/preview) and if it's offline or online.
      *
-     * @param {AddonModScormAttemptCountResult} attemptsData Attempts count.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param attemptsData Attempts count.
+     * @return Promise resolved when done.
      */
     protected determineAttemptAndMode(attemptsData: AddonModScormAttemptCountResult): Promise<any> {
         let result;
@@ -223,7 +223,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
     /**
      * Fetch data needed to play the SCORM.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchData(): Promise<any> {
         // Wait for any ongoing sync to finish. We won't sync a SCORM while it's being played.
@@ -251,7 +251,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
     /**
      * Fetch the TOC.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchToc(): Promise<any> {
         this.loadingToc = true;
@@ -312,7 +312,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
     /**
      * Load a SCO.
      *
-     * @param {any} sco The SCO to load.
+     * @param sco The SCO to load.
      */
     protected loadSco(sco: any): void {
         if (!this.dataModel) {
@@ -385,7 +385,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
     /**
      * Show the TOC.
      *
-     * @param {MouseEvent} event Event.
+     * @param event Event.
      */
     openToc(event: MouseEvent): void {
         const modal = this.modalCtrl.create('AddonModScormTocPage', {
@@ -414,7 +414,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
     /**
      * Refresh the TOC.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected refreshToc(): Promise<any> {
         return this.scormProvider.invalidateAllScormData(this.scorm.id).catch(() => {
@@ -429,8 +429,8 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
     /**
      * Set SCORM start time.
      *
-     * @param {number} scoId SCO ID.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param scoId SCO ID.
+     * @return Promise resolved when done.
      */
     protected setStartTime(scoId: number): Promise<any> {
         const tracks = [{
diff --git a/src/addon/mod/scorm/pages/toc/toc.ts b/src/addon/mod/scorm/pages/toc/toc.ts
index 036196b6c..3d1074c12 100644
--- a/src/addon/mod/scorm/pages/toc/toc.ts
+++ b/src/addon/mod/scorm/pages/toc/toc.ts
@@ -45,7 +45,7 @@ export class AddonModScormTocPage {
     /**
      * Function called when a SCO is clicked.
      *
-     * @param {any} sco Clicked SCO.
+     * @param sco Clicked SCO.
      */
     loadSco(sco: any): void {
         if (!sco.prereq || !sco.isvisible || !sco.launch) {
diff --git a/src/addon/mod/scorm/providers/helper.ts b/src/addon/mod/scorm/providers/helper.ts
index ec0e1523b..17b9ddf3f 100644
--- a/src/addon/mod/scorm/providers/helper.ts
+++ b/src/addon/mod/scorm/providers/helper.ts
@@ -37,9 +37,9 @@ export class AddonModScormHelperProvider {
     /**
      * Show a confirm dialog if needed. If SCORM doesn't have size, try to calculate it.
      *
-     * @param {any} scorm SCORM to download.
-     * @param {boolean} [isOutdated] True if package outdated, false if not outdated, undefined to calculate it.
-     * @return {Promise<any>} Promise resolved if the user confirms or no confirmation needed.
+     * @param scorm SCORM to download.
+     * @param isOutdated True if package outdated, false if not outdated, undefined to calculate it.
+     * @return Promise resolved if the user confirms or no confirmation needed.
      */
     confirmDownload(scorm: any, isOutdated?: boolean): Promise<any> {
         // Check if file should be downloaded.
@@ -69,10 +69,10 @@ export class AddonModScormHelperProvider {
     /**
      * Creates a new offline attempt based on an existing online attempt.
      *
-     * @param {any} scorm SCORM.
-     * @param {number} attempt Number of the online attempt.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the attempt is created.
+     * @param scorm SCORM.
+     * @param attempt Number of the online attempt.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the attempt is created.
      */
     convertAttemptToOffline(scorm: any, attempt: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -121,11 +121,11 @@ export class AddonModScormHelperProvider {
     /**
      * Creates a new offline attempt.
      *
-     * @param {any} scorm SCORM.
-     * @param {number} newAttempt Number of the new attempt.
-     * @param {number} lastOnline Number of the last online attempt.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the attempt is created.
+     * @param scorm SCORM.
+     * @param newAttempt Number of the new attempt.
+     * @param lastOnline Number of the last online attempt.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the attempt is created.
      */
     createOfflineAttempt(scorm: any, newAttempt: number, lastOnline: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -158,10 +158,10 @@ export class AddonModScormHelperProvider {
      * - The last incomplete online attempt if it hasn't been continued in offline and all offline attempts are complete.
      * - The attempt with highest number without surpassing max attempts otherwise.
      *
-     * @param {any} scorm SCORM object.
-     * @param {AddonModScormAttemptCountResult} attempts Attempts count.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<{number: number, offline: boolean}>} Promise resolved with the attempt data.
+     * @param scorm SCORM object.
+     * @param attempts Attempts count.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the attempt data.
      */
     determineAttemptToContinue(scorm: any, attempts: AddonModScormAttemptCountResult, siteId?: string)
             : Promise<{number: number, offline: boolean}> {
@@ -195,14 +195,14 @@ export class AddonModScormHelperProvider {
     /**
      * Get the first SCO to load in a SCORM: the first valid and incomplete SCO.
      *
-     * @param {number} scormId Scorm ID.
-     * @param {number} attempt Attempt number.
-     * @param {any[]} [toc] SCORM's TOC. If not provided, it will be calculated.
-     * @param {string} [organization] Organization to use.
-     * @param {string} [mode] Mode.
-     * @param {boolean} [offline] Whether the attempt is offline.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the first SCO.
+     * @param scormId Scorm ID.
+     * @param attempt Attempt number.
+     * @param toc SCORM's TOC. If not provided, it will be calculated.
+     * @param organization Organization to use.
+     * @param mode Mode.
+     * @param offline Whether the attempt is offline.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the first SCO.
      */
     getFirstSco(scormId: number, attempt: number, toc?: any[], organization?: string, mode?: string, offline?: boolean,
             siteId?: string): Promise<any> {
@@ -239,9 +239,9 @@ export class AddonModScormHelperProvider {
      * Get the last attempt (number and whether it's offline).
      * It'll be the highest number as long as it doesn't surpass the max number of attempts.
      *
-     * @param {any} scorm SCORM object.
-     * @param {AddonModScormAttemptCountResult} attempts Attempts count.
-     * @return {{number: number, offline: boolean}} Last attempt data.
+     * @param scorm SCORM object.
+     * @param attempts Attempts count.
+     * @return Last attempt data.
      */
     protected getLastBeforeMax(scorm: any, attempts: AddonModScormAttemptCountResult): {number: number, offline: boolean} {
         if (scorm.maxattempt != 0 && attempts.lastAttempt.number > scorm.maxattempt) {
@@ -260,9 +260,9 @@ export class AddonModScormHelperProvider {
     /**
      * Given a TOC in array format and a scoId, return the next available SCO.
      *
-     * @param {any[]} toc SCORM's TOC.
-     * @param {number} scoId SCO ID.
-     * @return {any} Next SCO.
+     * @param toc SCORM's TOC.
+     * @param scoId SCO ID.
+     * @return Next SCO.
      */
     getNextScoFromToc(toc: any, scoId: number): any {
         for (let i = 0; i < toc.length; i++) {
@@ -281,9 +281,9 @@ export class AddonModScormHelperProvider {
     /**
      * Given a TOC in array format and a scoId, return the previous available SCO.
      *
-     * @param {any[]} toc SCORM's TOC.
-     * @param {number} scoId SCO ID.
-     * @return {any} Previous SCO.
+     * @param toc SCORM's TOC.
+     * @param scoId SCO ID.
+     * @return Previous SCO.
      */
     getPreviousScoFromToc(toc: any, scoId: number): any {
         for (let i = 0; i < toc.length; i++) {
@@ -302,9 +302,9 @@ export class AddonModScormHelperProvider {
     /**
      * Given a TOC in array format and a scoId, return the SCO.
      *
-     * @param {any[]} toc SCORM's TOC.
-     * @param {number} scoId SCO ID.
-     * @return {any} SCO.
+     * @param toc SCORM's TOC.
+     * @param scoId SCO ID.
+     * @return SCO.
      */
     getScoFromToc(toc: any[], scoId: number): any {
         for (let i = 0; i < toc.length; i++) {
@@ -317,10 +317,10 @@ export class AddonModScormHelperProvider {
     /**
      * Searches user data for an online attempt. If the data can't be retrieved, re-try with the previous online attempt.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt Online attempt to get the data.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with user data.
+     * @param scormId SCORM ID.
+     * @param attempt Online attempt to get the data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with user data.
      */
     searchOnlineAttemptUserData(scormId: number, attempt: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
diff --git a/src/addon/mod/scorm/providers/module-handler.ts b/src/addon/mod/scorm/providers/module-handler.ts
index 1f1df4c8d..1fabceed2 100644
--- a/src/addon/mod/scorm/providers/module-handler.ts
+++ b/src/addon/mod/scorm/providers/module-handler.ts
@@ -44,7 +44,7 @@ export class AddonModScormModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean {
         return true;
@@ -53,10 +53,10 @@ export class AddonModScormModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         return {
@@ -78,9 +78,9 @@ export class AddonModScormModuleHandler implements CoreCourseModuleHandler {
      * Get the component to render the module. This is needed to support singleactivity course format.
      * The component returned must implement CoreCourseModuleMainComponent.
      *
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any} The component to use, undefined if not found.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component to use, undefined if not found.
      */
     getMainComponent(course: any, module: any): any {
         return AddonModScormIndexComponent;
diff --git a/src/addon/mod/scorm/providers/pluginfile-handler.ts b/src/addon/mod/scorm/providers/pluginfile-handler.ts
index 58e16d725..e9ed78e91 100644
--- a/src/addon/mod/scorm/providers/pluginfile-handler.ts
+++ b/src/addon/mod/scorm/providers/pluginfile-handler.ts
@@ -26,8 +26,8 @@ export class AddonModScormPluginFileHandler implements CorePluginFileHandler {
     /**
      * Return the RegExp to match the revision on pluginfile URLs.
      *
-     * @param {string[]} args Arguments of the pluginfile URL defining component and filearea at least.
-     * @return {RegExp} RegExp to match the revision on pluginfile URLs.
+     * @param args Arguments of the pluginfile URL defining component and filearea at least.
+     * @return RegExp to match the revision on pluginfile URLs.
      */
     getComponentRevisionRegExp(args: string[]): RegExp {
         // Check filearea.
@@ -40,8 +40,8 @@ export class AddonModScormPluginFileHandler implements CorePluginFileHandler {
     /**
      * Should return the string to remove the revision on pluginfile url.
      *
-     * @param {string[]} args Arguments of the pluginfile URL defining component and filearea at least.
-     * @return {string} String to remove the revision on pluginfile url.
+     * @param args Arguments of the pluginfile URL defining component and filearea at least.
+     * @return String to remove the revision on pluginfile url.
      */
     getComponentRevisionReplace(args: string[]): string {
         // Component + Filearea + Revision
diff --git a/src/addon/mod/scorm/providers/prefetch-handler.ts b/src/addon/mod/scorm/providers/prefetch-handler.ts
index 4b4dd8038..175d1f8fa 100644
--- a/src/addon/mod/scorm/providers/prefetch-handler.ts
+++ b/src/addon/mod/scorm/providers/prefetch-handler.ts
@@ -32,19 +32,16 @@ import { AddonModScormSyncProvider } from './scorm-sync';
 export interface AddonModScormProgressEvent {
     /**
      * Whether the event is due to the download of a chunk of data.
-     * @type {boolean}
      */
     downloading?: boolean;
 
     /**
      * Progress event sent by the download.
-     * @type {ProgressEvent}
      */
     progress?: ProgressEvent;
 
     /**
      * A message related to the progress. This is usually used to notify that a certain step of the download has started.
-     * @type {string}
      */
     message?: string;
 }
@@ -72,11 +69,11 @@ export class AddonModScormPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Download the module.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @return {Promise<any>} Promise resolved when all content is downloaded.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @param onProgress Function to call on progress.
+     * @return Promise resolved when all content is downloaded.
      */
     download(module: any, courseId: number, dirPath?: string, onProgress?: (event: AddonModScormProgressEvent) => any)
             : Promise<any> {
@@ -89,13 +86,13 @@ export class AddonModScormPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Download or prefetch a SCORM.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} single True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {String} siteId Site ID.
-     * @param {boolean} prefetch True to prefetch, false to download right away.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @return {Promise<any>} Promise resolved with the "extra" data to store: the hash of the file.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param siteId Site ID.
+     * @param prefetch True to prefetch, false to download right away.
+     * @param onProgress Function to call on progress.
+     * @return Promise resolved with the "extra" data to store: the hash of the file.
      */
     protected downloadOrPrefetchScorm(module: any, courseId: number, single: boolean, siteId: string, prefetch: boolean,
             onProgress?: (event: AddonModScormProgressEvent) => any): Promise<string> {
@@ -136,11 +133,11 @@ export class AddonModScormPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Downloads/Prefetches and unzips the SCORM package.
      *
-     * @param {any} scorm SCORM object.
-     * @param {boolean} [prefetch] True if prefetch, false otherwise.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the file is downloaded and unzipped.
+     * @param scorm SCORM object.
+     * @param prefetch True if prefetch, false otherwise.
+     * @param onProgress Function to call on progress.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the file is downloaded and unzipped.
      */
     protected downloadOrPrefetchMainFile(scorm: any, prefetch?: boolean, onProgress?: (event: AddonModScormProgressEvent) => any,
             siteId?: string): Promise<any> {
@@ -187,11 +184,11 @@ export class AddonModScormPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Downloads/Prefetches and unzips the SCORM package if it should be downloaded.
      *
-     * @param {any} scorm SCORM object.
-     * @param {boolean} [prefetch] True if prefetch, false otherwise.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the file is downloaded and unzipped.
+     * @param scorm SCORM object.
+     * @param prefetch True if prefetch, false otherwise.
+     * @param onProgress Function to call on progress.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the file is downloaded and unzipped.
      */
     protected downloadOrPrefetchMainFileIfNeeded(scorm: any, prefetch?: boolean,
             onProgress?: (event: AddonModScormProgressEvent) => any, siteId?: string): Promise<any> {
@@ -216,8 +213,8 @@ export class AddonModScormPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Function that converts a regular ProgressEvent into a AddonModScormProgressEvent.
      *
-     * @param {Function} [onProgress] Function to call on progress.
-     * @param {ProgressEvent} [progress] Event returned by the download function.
+     * @param onProgress Function to call on progress.
+     * @param progress Event returned by the download function.
      */
     protected downloadProgress(downloading: boolean, onProgress?: (event: AddonModScormProgressEvent) => any,
             progress?: ProgressEvent): void {
@@ -233,9 +230,9 @@ export class AddonModScormPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Get WS data for SCORM.
      *
-     * @param {any} scorm SCORM object.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is prefetched.
+     * @param scorm SCORM object.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is prefetched.
      */
     fetchWSData(scorm: any, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -276,11 +273,11 @@ export class AddonModScormPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Get the download size of a module.
      *
-     * @param {any} module Module.
-     * @param {Number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @return {Promise<{size: number, total: boolean}>} Promise resolved with the size and a boolean indicating if it was able
-     *                                                   to calculate the total size.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @return Promise resolved with the size and a boolean indicating if it was able
+     *         to calculate the total size.
      */
     getDownloadSize(module: any, courseId: any, single?: boolean): Promise<{ size: number, total: boolean }> {
         return this.scormProvider.getScorm(courseId, module.id, module.url).then((scorm) => {
@@ -300,9 +297,9 @@ export class AddonModScormPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Get the downloaded size of a module. If not defined, we'll use getFiles to calculate it (it can be slow).
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {number|Promise<number>} Size, or promise resolved with the size.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Size, or promise resolved with the size.
      */
     getDownloadedSize(module: any, courseId: number): number | Promise<number> {
         return this.scormProvider.getScorm(courseId, module.id, module.url).then((scorm) => {
@@ -316,10 +313,10 @@ export class AddonModScormPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Get list of files. If not defined, we'll assume they're in module.contents.
      *
-     * @param {any} module Module.
-     * @param {Number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @return {Promise<any[]>} Promise resolved with the list of files.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @return Promise resolved with the list of files.
      */
     getFiles(module: any, courseId: number, single?: boolean): Promise<any[]> {
         return this.scormProvider.getScorm(courseId, module.id, module.url).then((scorm) => {
@@ -333,9 +330,9 @@ export class AddonModScormPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId The course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId The course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         return this.scormProvider.invalidateContent(moduleId, courseId);
@@ -344,9 +341,9 @@ export class AddonModScormPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Invalidate WS calls needed to determine module status.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when invalidated.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when invalidated.
      */
     invalidateModule(module: any, courseId: number): Promise<any> {
         // Invalidate the calls required to check if a SCORM is downloadable.
@@ -356,9 +353,9 @@ export class AddonModScormPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Check if a module can be downloaded. If the function is not defined, we assume that all modules are downloadable.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {boolean|Promise<boolean>} Whether the module can be downloaded. The promise should never be rejected.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Whether the module can be downloaded. The promise should never be rejected.
      */
     isDownloadable(module: any, courseId: number): boolean | Promise<boolean> {
         return this.scormProvider.getScorm(courseId, module.id, module.url).then((scorm) => {
@@ -378,12 +375,12 @@ export class AddonModScormPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Prefetch a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @param onProgress Function to call on progress.
+     * @return Promise resolved when done.
      */
     prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string,
             onProgress?: (event: AddonModScormProgressEvent) => any): Promise<any> {
@@ -396,9 +393,9 @@ export class AddonModScormPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Remove module downloaded files. If not defined, we'll use getFiles to remove them (slow).
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when done.
      */
     removeFiles(module: any, courseId: number): Promise<any> {
         const siteId = this.sitesProvider.getCurrentSiteId();
@@ -433,10 +430,10 @@ export class AddonModScormPrefetchHandler extends CoreCourseActivityPrefetchHand
     /**
      * Sync a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     sync(module: any, courseId: number, siteId?: any): Promise<any> {
         if (!this.syncProvider) {
diff --git a/src/addon/mod/scorm/providers/scorm-offline.ts b/src/addon/mod/scorm/providers/scorm-offline.ts
index 74af07260..9c605f2dd 100644
--- a/src/addon/mod/scorm/providers/scorm-offline.ts
+++ b/src/addon/mod/scorm/providers/scorm-offline.ts
@@ -134,12 +134,12 @@ export class AddonModScormOfflineProvider {
      * This function is used to convert attempts into new attempts, so the stored snapshot will be removed and
      * entries will be marked as not synced.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt Number of the attempt to change.
-     * @param {number} newAttempt New attempt number.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any>} Promise resolved when the attempt number changes.
+     * @param scormId SCORM ID.
+     * @param attempt Number of the attempt to change.
+     * @param newAttempt New attempt number.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved when the attempt number changes.
      */
     changeAttemptNumber(scormId: number, attempt: number, newAttempt: number, siteId?: string, userId?: number): Promise<any> {
 
@@ -186,13 +186,13 @@ export class AddonModScormOfflineProvider {
     /**
      * Creates a new offline attempt. It can be created from scratch or as a copy of another attempt.
      *
-     * @param {any} scorm SCORM.
-     * @param {number} attempt Number of the new attempt.
-     * @param {any} userData User data to store in the attempt.
-     * @param {any} [snapshot] Optional. Snapshot to store in the attempt.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any>} Promise resolved when the new attempt is created.
+     * @param scorm SCORM.
+     * @param attempt Number of the new attempt.
+     * @param userData User data to store in the attempt.
+     * @param snapshot Optional. Snapshot to store in the attempt.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved when the new attempt is created.
      */
     createNewAttempt(scorm: any, attempt: number, userData: any, snapshot?: any, siteId?: string, userId?: number): Promise<any> {
 
@@ -248,11 +248,11 @@ export class AddonModScormOfflineProvider {
     /**
      * Delete all the stored data from an attempt.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt Attempt number.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any>} Promise resolved when all the data has been deleted.
+     * @param scormId SCORM ID.
+     * @param attempt Attempt number.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved when all the data has been deleted.
      */
     deleteAttempt(scormId: number, attempt: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -279,8 +279,8 @@ export class AddonModScormOfflineProvider {
      * Helper function to return a formatted list of interactions for reports.
      * This function is based in Moodle's scorm_format_interactions.
      *
-     * @param {any} scoUserData Userdata from a certain SCO.
-     * @return {any} Formatted userdata.
+     * @param scoUserData Userdata from a certain SCO.
+     * @return Formatted userdata.
      */
     protected formatInteractions(scoUserData: any): any {
         const formatted: any = {};
@@ -334,8 +334,8 @@ export class AddonModScormOfflineProvider {
     /**
      * Get all the offline attempts in a certain site.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved when the offline attempts are retrieved.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the offline attempts are retrieved.
      */
     getAllAttempts(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
@@ -352,11 +352,11 @@ export class AddonModScormOfflineProvider {
     /**
      * Get an offline attempt.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt Attempt number.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<number>} Promise resolved with the attempt.
+     * @param scormId SCORM ID.
+     * @param attempt Attempt number.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved with the attempt.
      */
     getAttempt(scormId: number, attempt: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -374,11 +374,11 @@ export class AddonModScormOfflineProvider {
     /**
      * Get the creation time of an attempt.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt Attempt number.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<number>} Promise resolved with time the attempt was created.
+     * @param scormId SCORM ID.
+     * @param attempt Attempt number.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved with time the attempt was created.
      */
     getAttemptCreationTime(scormId: number, attempt: number, siteId?: string, userId?: number): Promise<number> {
         return this.getAttempt(scormId, attempt, siteId, userId).catch(() => {
@@ -391,10 +391,10 @@ export class AddonModScormOfflineProvider {
     /**
      * Get the offline attempts done by a user in the given SCORM.
      *
-     * @param {number} scormId  SCORM ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any[]>} Promise resolved when the offline attempts are retrieved.
+     * @param scormId SCORM ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved when the offline attempts are retrieved.
      */
     getAttempts(scormId: number, siteId?: string, userId?: number): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -413,11 +413,11 @@ export class AddonModScormOfflineProvider {
     /**
      * Get the snapshot of an attempt.
      *
-     * @param {number} scormId  SCORM ID.
-     * @param {number} attempt  Attempt number.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any>} Promise resolved with the snapshot or undefined if no snapshot.
+     * @param scormId SCORM ID.
+     * @param attempt Attempt number.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved with the snapshot or undefined if no snapshot.
      */
     getAttemptSnapshot(scormId: number, attempt: number, siteId?: string, userId?: number): Promise<any> {
         return this.getAttempt(scormId, attempt, siteId, userId).catch(() => {
@@ -430,8 +430,8 @@ export class AddonModScormOfflineProvider {
     /**
      * Get launch URLs from a list of SCOs, indexing them by SCO ID.
      *
-     * @param {any[]} scos List of SCOs. Each SCO needs to have 'id' and 'launch' properties.
-     * @return {{[scoId: number]: string}} Launch URLs indexed by SCO ID.
+     * @param scos List of SCOs. Each SCO needs to have 'id' and 'launch' properties.
+     * @return Launch URLs indexed by SCO ID.
      */
     protected getLaunchUrlsFromScos(scos: any[]): {[scoId: number]: string} {
         scos = scos || [];
@@ -448,13 +448,13 @@ export class AddonModScormOfflineProvider {
     /**
      * Get data stored in local DB for a certain scorm and attempt.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt Attempt number.
-     * @param {boolean} [excludeSynced] Whether it should only return not synced entries.
-     * @param {boolean} [excludeNotSynced] Whether it should only return synced entries.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any[]>} Promise resolved with the entries.
+     * @param scormId SCORM ID.
+     * @param attempt Attempt number.
+     * @param excludeSynced Whether it should only return not synced entries.
+     * @param excludeNotSynced Whether it should only return synced entries.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved with the entries.
      */
     getScormStoredData(scormId: number, attempt: number, excludeSynced?: boolean, excludeNotSynced?: boolean, siteId?: string,
             userId?: number): Promise<any[]> {
@@ -491,13 +491,13 @@ export class AddonModScormOfflineProvider {
     /**
      * Get the user data for a certain SCORM and offline attempt.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt Attempt number.
-     * @param {any[]} scos SCOs returned by AddonModScormProvider.getScos. If not supplied, this function will only return the
-     *                     SCOs that have something stored and cmi.launch_data will be undefined.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any>} Promise resolved when the user data is retrieved.
+     * @param scormId SCORM ID.
+     * @param attempt Attempt number.
+     * @param scos SCOs returned by AddonModScormProvider.getScos. If not supplied, this function will only return the
+     *             SCOs that have something stored and cmi.launch_data will be undefined.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved when the user data is retrieved.
      */
     getScormUserData(scormId: number, attempt: number, scos: any[], siteId?: string, userId?: number): Promise<any> {
         scos = scos || [];
@@ -627,16 +627,16 @@ export class AddonModScormOfflineProvider {
      * Insert a track in the offline tracks store.
      * This function is based on Moodle's scorm_insert_track.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} scoId SCO ID.
-     * @param {number} attempt Attempt number.
-     * @param {string} element Name of the element to insert.
-     * @param {any} value Value to insert.
-     * @param {boolean} [forceCompleted] True if SCORM forces completed.
-     * @param {any} [scoData] User data for the given SCO.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not set use site's current user.
-     * @return {Promise<any>} Promise resolved when the insert is done.
+     * @param scormId SCORM ID.
+     * @param scoId SCO ID.
+     * @param attempt Attempt number.
+     * @param element Name of the element to insert.
+     * @param value Value to insert.
+     * @param forceCompleted True if SCORM forces completed.
+     * @param scoData User data for the given SCO.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not set use site's current user.
+     * @return Promise resolved when the insert is done.
      */
     protected insertTrack(scormId: number, scoId: number, attempt: number, element: string, value: any, forceCompleted?: boolean,
             scoData?: any, siteId?: string, userId?: number): Promise<any> {
@@ -692,15 +692,15 @@ export class AddonModScormOfflineProvider {
     /**
      * Insert a track in the DB.
      *
-     * @param {SQLiteDB} db Site's DB.
-     * @param {number} userId User ID.
-     * @param {number} scormId SCORM ID.
-     * @param {number} scoId SCO ID.
-     * @param {number} attempt Attempt number.
-     * @param {string} element Name of the element to insert.
-     * @param {any} value Value of the element to insert.
-     * @param {boolean} synchronous True if insert should NOT return a promise. Please use it only if synchronous is a must.
-     * @return {boolean|Promise<any>} Returns a promise if synchronous=false, otherwise returns a boolean.
+     * @param db Site's DB.
+     * @param userId User ID.
+     * @param scormId SCORM ID.
+     * @param scoId SCO ID.
+     * @param attempt Attempt number.
+     * @param element Name of the element to insert.
+     * @param value Value of the element to insert.
+     * @param synchronous True if insert should NOT return a promise. Please use it only if synchronous is a must.
+     * @return Returns a promise if synchronous=false, otherwise returns a boolean.
      */
     protected insertTrackToDB(db: SQLiteDB, userId: number, scormId: number, scoId: number, attempt: number, element: string,
             value: any, synchronous?: boolean): boolean | Promise<any> {
@@ -731,15 +731,15 @@ export class AddonModScormOfflineProvider {
      * Please use this function only if synchronous is a must. It's recommended to use insertTrack.
      * This function is based on Moodle's scorm_insert_track.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} scoId SCO ID.
-     * @param {number} attempt Attempt number.
-     * @param {string} element Name of the element to insert.
-     * @param {any} value Value of the element to insert.
-     * @param {boolean} [forceCompleted] True if SCORM forces completed.
-     * @param {any} [scoData] User data for the given SCO.
-     * @param {number} [userId] User ID. If not set use current user.
-     * @return {boolean} Promise resolved when the insert is done.
+     * @param scormId SCORM ID.
+     * @param scoId SCO ID.
+     * @param attempt Attempt number.
+     * @param element Name of the element to insert.
+     * @param value Value of the element to insert.
+     * @param forceCompleted True if SCORM forces completed.
+     * @param scoData User data for the given SCO.
+     * @param userId User ID. If not set use current user.
+     * @return Promise resolved when the insert is done.
      */
     protected insertTrackSync(scormId: number, scoId: number, attempt: number, element: string, value: any,
             forceCompleted?: boolean, scoData?: any, userId?: number): boolean {
@@ -791,12 +791,12 @@ export class AddonModScormOfflineProvider {
     /**
      * Mark all the entries from a SCO and attempt as synced.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt Attempt number.
-     * @param {number} scoId SCO ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any>} Promise resolved when marked.
+     * @param scormId SCORM ID.
+     * @param attempt Attempt number.
+     * @param scoId SCO ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved when marked.
      */
     markAsSynced(scormId: number, attempt: number, scoId: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -817,8 +817,8 @@ export class AddonModScormOfflineProvider {
     /**
      * Removes the default data form user data.
      *
-     * @param {any} userData User data returned by AddonModScormProvider.getScormUserData.
-     * @return {any} User data without default data.
+     * @param userData User data returned by AddonModScormProvider.getScormUserData.
+     * @return User data without default data.
      */
     protected removeDefaultData(userData: any): any {
         const result = this.utils.clone(userData);
@@ -833,14 +833,14 @@ export class AddonModScormOfflineProvider {
     /**
      * Saves a SCORM tracking record in offline.
      *
-     * @param {any} scorm SCORM.
-     * @param {number} scoId Sco ID.
-     * @param {number} attempt Attempt number.
-     * @param {any[]} tracks Tracking data to store.
-     * @param {any} userData User data for this attempt and SCO.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any>} Promise resolved when data is saved.
+     * @param scorm SCORM.
+     * @param scoId Sco ID.
+     * @param attempt Attempt number.
+     * @param tracks Tracking data to store.
+     * @param userData User data for this attempt and SCO.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved when data is saved.
      */
     saveTracks(scorm: any, scoId: number, attempt: number, tracks: any[], userData: any, siteId?: string, userId?: number)
             : Promise<any> {
@@ -869,13 +869,13 @@ export class AddonModScormOfflineProvider {
      * Saves a SCORM tracking record in offline returning a synchronous value.
      * Please use this function only if synchronous is a must. It's recommended to use saveTracks.
      *
-     * @param  {any} scorm    SCORM.
-     * @param  {number} scoId    Sco ID.
-     * @param  {number} attempt  Attempt number.
-     * @param  {Object[]} tracks Tracking data to store.
-     * @param  {any} userData User data for this attempt and SCO.
-     * @return {boolean}         True if data to insert is valid, false otherwise. Returning true doesn't mean that the data
-     *                           has been stored, this function can return true but the insertion can still fail somehow.
+     * @param scorm SCORM.
+     * @param scoId Sco ID.
+     * @param attempt Attempt number.
+     * @param tracks Tracking data to store.
+     * @param userData User data for this attempt and SCO.
+     * @return True if data to insert is valid, false otherwise. Returning true doesn't mean that the data
+     *         has been stored, this function can return true but the insertion can still fail somehow.
      */
     saveTracksSync(scorm: any, scoId: number, attempt: number, tracks: any[], userData: any, userId?: number): boolean {
         userId = userId || this.sitesProvider.getCurrentSiteUserId();
@@ -895,10 +895,10 @@ export class AddonModScormOfflineProvider {
      * Check for a parameter in userData and return it if it's set or return 'ifempty' if it's empty.
      * Based on Moodle's scorm_isset function.
      *
-     * @param {any} userData Contains user's data.
-     * @param {string} param Name of parameter that should be checked.
-     * @param {any} [ifEmpty] Value to be replaced with if param is not set.
-     * @return {any} Value from userData[param] if set, ifEmpty otherwise.
+     * @param userData Contains user's data.
+     * @param param Name of parameter that should be checked.
+     * @param ifEmpty Value to be replaced with if param is not set.
+     * @return Value from userData[param] if set, ifEmpty otherwise.
      */
     protected scormIsset(userData: any, param: string, ifEmpty: any = ''): any {
         if (typeof userData[param] != 'undefined') {
@@ -911,12 +911,12 @@ export class AddonModScormOfflineProvider {
     /**
      * Set an attempt's snapshot.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt Attempt number.
-     * @param {any} userData User data to store as snapshot.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any>} Promise resolved when snapshot has been stored.
+     * @param scormId SCORM ID.
+     * @param attempt Attempt number.
+     * @param userData User data to store as snapshot.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved when snapshot has been stored.
      */
     setAttemptSnapshot(scormId: number, attempt: number, userData: any, siteId?: string, userId?: number): Promise<any> {
 
diff --git a/src/addon/mod/scorm/providers/scorm-sync.ts b/src/addon/mod/scorm/providers/scorm-sync.ts
index bb6074179..9a5cc7259 100644
--- a/src/addon/mod/scorm/providers/scorm-sync.ts
+++ b/src/addon/mod/scorm/providers/scorm-sync.ts
@@ -36,19 +36,16 @@ import { AddonModScormPrefetchHandler } from './prefetch-handler';
 export interface AddonModScormSyncResult {
     /**
      * List of warnings.
-     * @type {string[]}
      */
     warnings: string[];
 
     /**
      * Whether an attempt was finished in the site due to the sync,
-     * @type {boolean}
      */
     attemptFinished: boolean;
 
     /**
      * Whether some data was sent to the site.
-     * @type {boolean}
      */
     updated: boolean;
 }
@@ -81,16 +78,16 @@ export class AddonModScormSyncProvider extends CoreCourseActivitySyncBaseProvide
      * Add an offline attempt to the right of the new attempts array if possible.
      * If the attempt cannot be created as a new attempt then it will be deleted.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt The offline attempt to treat.
-     * @param {number} lastOffline Last offline attempt number.
-     * @param {number[]} newAttemptsSameOrder Attempts that'll be created as new attempts but keeping the current order.
-     * @param {any} newAttemptsAtEnd Object with attempts that'll be created at the end of the list of attempts (should be max 1).
-     * @param {number} lastOfflineCreated Time when the last offline attempt was created.
-     * @param {boolean} lastOfflineIncomplete Whether the last offline attempt is incomplete.
-     * @param {string[]} warnings Array where to add the warnings.
-     * @param {string} siteId Site ID.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param scormId SCORM ID.
+     * @param attempt The offline attempt to treat.
+     * @param lastOffline Last offline attempt number.
+     * @param newAttemptsSameOrder Attempts that'll be created as new attempts but keeping the current order.
+     * @param newAttemptsAtEnd Object with attempts that'll be created at the end of the list of attempts (should be max 1).
+     * @param lastOfflineCreated Time when the last offline attempt was created.
+     * @param lastOfflineIncomplete Whether the last offline attempt is incomplete.
+     * @param warnings Array where to add the warnings.
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
      */
     protected addToNewOrDelete(scormId: number, attempt: number, lastOffline: number, newAttemptsSameOrder: number[],
             newAttemptsAtEnd: any, lastOfflineCreated: number, lastOfflineIncomplete: boolean, warnings: string[],
@@ -129,11 +126,11 @@ export class AddonModScormSyncProvider extends CoreCourseActivitySyncBaseProvide
     /**
      * Check if can retry an attempt synchronization.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt Attempt number.
-     * @param {number} lastOnline Last online attempt number.
-     * @param {string} siteId Site ID.
-     * @return {Promise<any>} Promise resolved if can retry the synchronization, rejected otherwise.
+     * @param scormId SCORM ID.
+     * @param attempt Attempt number.
+     * @param lastOnline Last online attempt number.
+     * @param siteId Site ID.
+     * @return Promise resolved if can retry the synchronization, rejected otherwise.
      */
     protected canRetrySync(scormId: number, attempt: number, lastOnline: number, siteId: string): Promise<any> {
         // If it's the last attempt we don't need to ignore cache because we already did it.
@@ -153,11 +150,11 @@ export class AddonModScormSyncProvider extends CoreCourseActivitySyncBaseProvide
     /**
      * Create new attempts at the end of the offline attempts list.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {any} newAttempts Object with the attempts to create. The keys are the timecreated, the values are the attempt number.
-     * @param {number} lastOffline Number of last offline attempt.
-     * @param {string} siteId Site ID.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param scormId SCORM ID.
+     * @param newAttempts Object with the attempts to create. The keys are the timecreated, the values are the attempt number.
+     * @param lastOffline Number of last offline attempt.
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
      */
     protected createNewAttemptsAtEnd(scormId: number, newAttempts: any, lastOffline: number, siteId: string): Promise<any> {
         const times = Object.keys(newAttempts).sort(), // Sort in ASC order.
@@ -179,14 +176,14 @@ export class AddonModScormSyncProvider extends CoreCourseActivitySyncBaseProvide
     /**
      * Finish a sync process: remove offline data if needed, prefetch SCORM data, set sync time and return the result.
      *
-     * @param {string} siteId Site ID.
-     * @param {any} scorm SCORM.
-     * @param {string[]} warnings List of warnings generated by the sync.
-     * @param {number} [lastOnline] Last online attempt number before the sync.
-     * @param {boolean} [lastOnlineWasFinished] Whether the last online attempt was finished before the sync.
-     * @param {AddonModScormAttemptCountResult} [initialCount] Attempt count before the sync.
-     * @param {boolean} [updated] Whether some data was sent to the site.
-     * @return {Promise<AddonModScormSyncResult>} Promise resolved on success.
+     * @param siteId Site ID.
+     * @param scorm SCORM.
+     * @param warnings List of warnings generated by the sync.
+     * @param lastOnline Last online attempt number before the sync.
+     * @param lastOnlineWasFinished Whether the last online attempt was finished before the sync.
+     * @param initialCount Attempt count before the sync.
+     * @param updated Whether some data was sent to the site.
+     * @return Promise resolved on success.
      */
     protected finishSync(siteId: string, scorm: any, warnings: string[], lastOnline?: number, lastOnlineWasFinished?: boolean,
             initialCount?: AddonModScormAttemptCountResult, updated?: boolean): Promise<AddonModScormSyncResult> {
@@ -239,10 +236,10 @@ export class AddonModScormSyncProvider extends CoreCourseActivitySyncBaseProvide
     /**
      * Get the creation time and the status (complete/incomplete) of an offline attempt.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt Attempt number.
-     * @param {string} siteId Site ID.
-     * @return {Promise<{incomplete: boolean, timecreated: number}>} Promise resolved with the data.
+     * @param scormId SCORM ID.
+     * @param attempt Attempt number.
+     * @param siteId Site ID.
+     * @return Promise resolved with the data.
      */
     protected getOfflineAttemptData(scormId: number, attempt: number, siteId: string)
             : Promise<{incomplete: boolean, timecreated: number}> {
@@ -264,13 +261,13 @@ export class AddonModScormSyncProvider extends CoreCourseActivitySyncBaseProvide
      * Example: We have offline attempts 1, 2 and 3. #1 and #2 have collisions. #1 can be synced, but #2 needs
      * to be a new attempt. #3 will now be #4, and #2 will now be #3.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number[]} newAttempts Attempts that need to be converted into new attempts.
-     * @param {number} lastOnline Last online attempt.
-     * @param {number} lastCollision Last attempt with collision (exists in online and offline).
-     * @param {number[]} offlineAttempts Numbers of offline attempts.
-     * @param {string} siteId Site ID.
-     * @return {Promise<any>} Promise resolved when attempts have been moved.
+     * @param scormId SCORM ID.
+     * @param newAttempts Attempts that need to be converted into new attempts.
+     * @param lastOnline Last online attempt.
+     * @param lastCollision Last attempt with collision (exists in online and offline).
+     * @param offlineAttempts Numbers of offline attempts.
+     * @param siteId Site ID.
+     * @return Promise resolved when attempts have been moved.
      */
     protected moveNewAttempts(scormId: any, newAttempts: number[], lastOnline: number, lastCollision: number,
             offlineAttempts: number[], siteId: string): Promise<any> {
@@ -364,10 +361,10 @@ export class AddonModScormSyncProvider extends CoreCourseActivitySyncBaseProvide
     /**
      * Save a snapshot from a synchronization.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt Attemot number.
-     * @param {string} siteId  Site ID.
-     * @return {Promise<any>} Promise resolved when the snapshot is stored.
+     * @param scormId SCORM ID.
+     * @param attempt Attemot number.
+     * @param siteId Site ID.
+     * @return Promise resolved when the snapshot is stored.
      */
     protected saveSyncSnapshot(scormId: number, attempt: number, siteId: string): Promise<any> {
         // Try to get current state from the site.
@@ -404,9 +401,9 @@ export class AddonModScormSyncProvider extends CoreCourseActivitySyncBaseProvide
      * It only compares elements with dot notation. This means that, if some SCO has been added to Moodle web
      * but the user hasn't generated data for it, then the snapshot will be detected as equal.
      *
-     * @param {any} snapshot Attempt's snapshot.
-     * @param {any} userData Data retrieved from the site.
-     * @return {boolean} True if snapshot is equal to the user data, false otherwise.
+     * @param snapshot Attempt's snapshot.
+     * @param userData Data retrieved from the site.
+     * @return True if snapshot is equal to the user data, false otherwise.
      */
     protected snapshotEquals(snapshot: any, userData: any): boolean {
         // Check that snapshot contains the data from the site.
@@ -443,9 +440,9 @@ export class AddonModScormSyncProvider extends CoreCourseActivitySyncBaseProvide
     /**
      * Try to synchronize all the SCORMs in a certain site or in all sites.
      *
-     * @param {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} force Wether to force sync not depending on last execution.
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     syncAllScorms(siteId?: string, force?: boolean): Promise<any> {
         return this.syncOnSites('all SCORMs', this.syncAllScormsFunc.bind(this), [force], siteId);
@@ -454,9 +451,9 @@ export class AddonModScormSyncProvider extends CoreCourseActivitySyncBaseProvide
     /**
      * Sync all SCORMs on a site.
      *
-     * @param  {string} siteId Site ID to sync.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @param {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync.
+     * @param force Wether to force sync not depending on last execution.
+     * @param Promise resolved if sync is successful, rejected if sync fails.
      */
     protected syncAllScormsFunc(siteId: string, force?: boolean): Promise<any> {
 
@@ -507,10 +504,10 @@ export class AddonModScormSyncProvider extends CoreCourseActivitySyncBaseProvide
     /**
      * Send data from a SCORM offline attempt to the site.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt Attempt number.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the attempt is successfully synced.
+     * @param scormId SCORM ID.
+     * @param attempt Attempt number.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the attempt is successfully synced.
      */
     protected syncAttempt(scormId: number, attempt: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -583,9 +580,9 @@ export class AddonModScormSyncProvider extends CoreCourseActivitySyncBaseProvide
     /**
      * Sync a SCORM only if a certain time has passed since the last time.
      *
-     * @param {any} scorm SCORM.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the SCORM is synced or if it doesn't need to be synced.
+     * @param scorm SCORM.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the SCORM is synced or if it doesn't need to be synced.
      */
     syncScormIfNeeded(scorm: any, siteId?: string): Promise<any> {
         return this.isSyncNeeded(scorm.id, siteId).then((needed) => {
@@ -600,9 +597,9 @@ export class AddonModScormSyncProvider extends CoreCourseActivitySyncBaseProvide
      * The promise returned will be resolved with an array with warnings if the synchronization is successful. A successful
      * synchronization doesn't mean that all the data has been sent to the site, it's possible that some attempt can't be sent.
      *
-     * @param {any} scorm SCORM.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<AddonModScormSyncResult>} Promise resolved in success.
+     * @param scorm SCORM.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved in success.
      */
     syncScorm(scorm: any, siteId?: string): Promise<AddonModScormSyncResult> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -729,12 +726,12 @@ export class AddonModScormSyncProvider extends CoreCourseActivitySyncBaseProvide
     /**
      * Treat collisions found in a SCORM synchronization process.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number[]} collisions Numbers of attempts that exist both in online and offline.
-     * @param {number} lastOnline Last online attempt.
-     * @param {number[]} offlineAttempts Numbers of offline attempts.
-     * @param {string} siteId Site ID.
-     * @return {Promise<string[]} Promise resolved when the collisions have been treated. It returns warnings array.
+     * @param scormId SCORM ID.
+     * @param collisions Numbers of attempts that exist both in online and offline.
+     * @param lastOnline Last online attempt.
+     * @param offlineAttempts Numbers of offline attempts.
+     * @param siteId Site ID.
+     * @return Promise resolved when the collisions have been treated. It returns warnings array.
      * @description
      *
      * Treat collisions found in a SCORM synchronization process. A collision is when an attempt exists both in offline
diff --git a/src/addon/mod/scorm/providers/scorm.ts b/src/addon/mod/scorm/providers/scorm.ts
index 850875fc9..b0585a0f9 100644
--- a/src/addon/mod/scorm/providers/scorm.ts
+++ b/src/addon/mod/scorm/providers/scorm.ts
@@ -34,25 +34,21 @@ import { CoreCourseLogHelperProvider } from '@core/course/providers/log-helper';
 export interface AddonModScormAttemptCountResult {
     /**
      * List of online attempts numbers.
-     * @type {number[]}
      */
     online?: number[];
 
     /**
      * List of offline attempts numbers.
-     * @type {number[]}
      */
     offline?: number[];
 
     /**
      * Total of unique attempts.
-     * @type {number}
      */
     total?: number;
 
     /**
      * Last attempt in the SCORM: the number and whether it's offline.
-     * @type {{number: number, offline: boolean}}
      */
     lastAttempt?: {number: number, offline: boolean};
 }
@@ -126,9 +122,9 @@ export class AddonModScormProvider {
      * Calculates the SCORM grade based on the grading method and the list of attempts scores.
      * We only treat online attempts to calculate a SCORM grade.
      *
-     * @param {any} scorm SCORM.
-     * @param {any} onlineAttempts Object with the online attempts. Each attempt must have a property called "grade".
-     * @return {number} Grade. -1 if no grade.
+     * @param scorm SCORM.
+     * @param onlineAttempts Object with the online attempts. Each attempt must have a property called "grade".
+     * @return Grade. -1 if no grade.
      */
     calculateScormGrade(scorm: any, onlineAttempts: any): number {
         if (!onlineAttempts || !Object.keys(onlineAttempts).length) {
@@ -181,8 +177,8 @@ export class AddonModScormProvider {
     /**
      * Calculates the size of a SCORM.
      *
-     * @param {any} scorm SCORM.
-     * @return {Promise<number>} Promise resolved with the SCORM size.
+     * @param scorm SCORM.
+     * @return Promise resolved with the SCORM size.
      */
     calculateScormSize(scorm: any): Promise<number> {
         if (scorm.packagesize) {
@@ -195,9 +191,9 @@ export class AddonModScormProvider {
     /**
      * Count the attempts left for the given scorm.
      *
-     * @param {any} scorm SCORM.
-     * @param {number} attemptsCount Number of attempts performed.
-     * @return {number} Number of attempts left.
+     * @param scorm SCORM.
+     * @param attemptsCount Number of attempts performed.
+     * @return Number of attempts left.
      */
     countAttemptsLeft(scorm: any, attemptsCount: number): number {
         if (scorm.maxattempt == 0) {
@@ -216,12 +212,12 @@ export class AddonModScormProvider {
      * Returns the mode and attempt number to use based on mode selected and SCORM data.
      * This function is based on Moodle's scorm_check_mode.
      *
-     * @param {any} scorm SCORM.
-     * @param {string} mode Selected mode.
-     * @param {number} attempt Current attempt.
-     * @param {boolean} [newAttempt] Whether it should start a new attempt.
-     * @param {boolean} [incomplete] Whether current attempt is incomplete.
-     * @return {{mode: string, attempt: number, newAttempt: boolean}} Mode, attempt number and whether to start a new attempt.
+     * @param scorm SCORM.
+     * @param mode Selected mode.
+     * @param attempt Current attempt.
+     * @param newAttempt Whether it should start a new attempt.
+     * @param incomplete Whether current attempt is incomplete.
+     * @return Mode, attempt number and whether to start a new attempt.
      */
     determineAttemptAndMode(scorm: any, mode: string, attempt: number, newAttempt?: boolean, incomplete?: boolean)
             : {mode: string, attempt: number, newAttempt: boolean} {
@@ -289,8 +285,8 @@ export class AddonModScormProvider {
     /**
      * Check if TOC should be displayed in the player.
      *
-     * @param {any} scorm SCORM.
-     * @return {boolean} Whether it should display TOC.
+     * @param scorm SCORM.
+     * @return Whether it should display TOC.
      */
     displayTocInPlayer(scorm: any): boolean {
         return scorm.hidetoc !== 3;
@@ -301,9 +297,9 @@ export class AddonModScormProvider {
      * Evaluates the expression and returns a boolean answer.
      * See 2.3.2.5.1. Sequencing/Navigation Today - from the SCORM 1.2 spec (CAM).
      *
-     * @param {string} prerequisites The AICC_SCRIPT prerequisites expression.
-     * @param {any} trackData The tracked user data of each SCO.
-     * @return {boolean} Whether the prerequisites are fulfilled.
+     * @param prerequisites The AICC_SCRIPT prerequisites expression.
+     * @param trackData The tracked user data of each SCO.
+     * @return Whether the prerequisites are fulfilled.
      */
     evalPrerequisites(prerequisites: string, trackData: any): boolean {
 
@@ -404,9 +400,9 @@ export class AddonModScormProvider {
     /**
      * Formats a grade to be displayed.
      *
-     * @param {any} scorm SCORM.
-     * @param {number} grade Grade.
-     * @return {string} Grade to display.
+     * @param scorm SCORM.
+     * @param grade Grade.
+     * @return Grade to display.
      */
     formatGrade(scorm: any, grade: number): string {
         if (typeof grade == 'undefined' || grade == -1) {
@@ -425,9 +421,9 @@ export class AddonModScormProvider {
     /**
      * Formats a tree-like TOC into an array.
      *
-     * @param {any[]} toc SCORM's TOC (tree format).
-     * @param {number} [level=0] The level of the TOC we're right now. 0 by default.
-     * @return {any[]} SCORM's TOC (array format).
+     * @param toc SCORM's TOC (tree format).
+     * @param level The level of the TOC we're right now. 0 by default.
+     * @return SCORM's TOC (array format).
      */
     formatTocToArray(toc: any[], level: number = 0): any[] {
         if (!toc || !toc.length) {
@@ -449,10 +445,10 @@ export class AddonModScormProvider {
     /**
      * Get access information for a given SCORM.
      *
-     * @param  {number}  scormId      SCORM ID.
-     * @param  {boolean} [forceCache] True to always get the value from cache. false otherwise.
-     * @param  {string}  [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>} Object with access information.
+     * @param scormId SCORM ID.
+     * @param forceCache True to always get the value from cache. false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Object with access information.
      * @since 3.7
      */
     getAccessInformation(scormId: number, forceCache?: boolean, siteId?: string): Promise<any> {
@@ -477,8 +473,8 @@ export class AddonModScormProvider {
     /**
      * Get cache key for access information WS calls.
      *
-     * @param {number} scormId SCORM ID.
-     * @return {string} Cache key.
+     * @param scormId SCORM ID.
+     * @return Cache key.
      */
     protected getAccessInformationCacheKey(scormId: number): string {
         return this.ROOT_CACHE_KEY + 'accessInfo:' + scormId;
@@ -487,12 +483,12 @@ export class AddonModScormProvider {
     /**
      * Get the number of attempts done by a user in the given SCORM.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {boolean} [ignoreMissing] Whether it should ignore attempts without grade/completion. Only for online attempts.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data for online attempts.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<AddonModScormAttemptCountResult>} Promise resolved when done.
+     * @param scormId SCORM ID.
+     * @param ignoreMissing Whether it should ignore attempts without grade/completion. Only for online attempts.
+     * @param ignoreCache Whether it should ignore cached data for online attempts.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved when done.
      */
     getAttemptCount(scormId: number, ignoreMissing?: boolean, ignoreCache?: boolean, siteId?: string, userId?: number)
             : Promise<AddonModScormAttemptCountResult> {
@@ -559,9 +555,9 @@ export class AddonModScormProvider {
     /**
      * Get cache key for SCORM attempt count WS calls.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} [userId] User ID. If not defined, current user.
-     * @return {string} Cache key.
+     * @param scormId SCORM ID.
+     * @param userId User ID. If not defined, current user.
+     * @return Cache key.
      */
     protected getAttemptCountCacheKey(scormId: number, userId: number): string {
         return this.ROOT_CACHE_KEY + 'attemptcount:' + scormId + ':' + userId;
@@ -570,12 +566,12 @@ export class AddonModScormProvider {
     /**
      * Get the number of attempts done by a user in the given SCORM in online.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {boolean} [ignoreMissing] Whether it should ignore attempts that haven't reported a grade/completion.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<number>} Promise resolved when the attempt count is retrieved.
+     * @param scormId SCORM ID.
+     * @param ignoreMissing Whether it should ignore attempts that haven't reported a grade/completion.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved when the attempt count is retrieved.
      */
     getAttemptCountOnline(scormId: number, ignoreMissing?: boolean, ignoreCache?: boolean, siteId?: string, userId?: number)
             : Promise<number> {
@@ -612,11 +608,11 @@ export class AddonModScormProvider {
      * Get the grade for a certain SCORM and attempt.
      * Based on Moodle's scorm_grade_user_attempt.
      *
-     * @param {any} scorm SCORM.
-     * @param {number} attempt Attempt number.
-     * @param {boolean} [offline] Whether the attempt is offline.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number>} Promise resolved with the grade. If the attempt hasn't reported grade/completion, it will be -1.
+     * @param scorm SCORM.
+     * @param attempt Attempt number.
+     * @param offline Whether the attempt is offline.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the grade. If the attempt hasn't reported grade/completion, it will be -1.
      */
     getAttemptGrade(scorm: any, attempt: number, offline?: boolean, siteId?: string): Promise<number> {
         const attemptScore = {
@@ -680,9 +676,9 @@ export class AddonModScormProvider {
     /**
      * Get the list of a organizations defined in a SCORM package.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the list of organizations.
+     * @param scormId SCORM ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of organizations.
      */
     getOrganizations(scormId: number, siteId?: string): Promise<any[]> {
         return this.getScos(scormId, undefined, false, siteId).then((scos) => {
@@ -706,12 +702,12 @@ export class AddonModScormProvider {
     /**
      * Get the organization Toc any
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt The attempt number (to populate SCO track data).
-     * @param {string} [organization] Organization identifier.
-     * @param {boolean} [offline] Whether the attempt is offline.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the toc object.
+     * @param scormId SCORM ID.
+     * @param attempt The attempt number (to populate SCO track data).
+     * @param organization Organization identifier.
+     * @param offline Whether the attempt is offline.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the toc object.
      */
     getOrganizationToc(scormId: number, attempt: number, organization?: string, offline?: boolean, siteId?: string)
             : Promise<any[]> {
@@ -742,8 +738,8 @@ export class AddonModScormProvider {
     /**
      * Get the package URL of a given SCORM.
      *
-     * @param {any} scorm SCORM.
-     * @return {string} Package URL.
+     * @param scorm SCORM.
+     * @return Package URL.
      */
     getPackageUrl(scorm: any): string {
         if (scorm.packageurl) {
@@ -759,13 +755,13 @@ export class AddonModScormProvider {
     /**
      * Get the user data for a certain SCORM and attempt.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt Attempt number.
-     * @param {any[]} [scos] SCOs returned by getScos. Recommended if offline=true.
-     * @param {boolean} [offline] Whether the attempt is offline.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data for online attempts.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the user data is retrieved.
+     * @param scormId SCORM ID.
+     * @param attempt Attempt number.
+     * @param scos SCOs returned by getScos. Recommended if offline=true.
+     * @param offline Whether the attempt is offline.
+     * @param ignoreCache Whether it should ignore cached data for online attempts.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the user data is retrieved.
      */
     getScormUserData(scormId: number, attempt: number, scos?: any[], offline?: boolean, ignoreCache?: boolean, siteId?: string)
             : Promise<any> {
@@ -787,9 +783,9 @@ export class AddonModScormProvider {
     /**
      * Get cache key for SCORM user data WS calls.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt Attempt number.
-     * @return {string} Cache key.
+     * @param scormId SCORM ID.
+     * @param attempt Attempt number.
+     * @return Cache key.
      */
     protected getScormUserDataCacheKey(scormId: number, attempt: number): string {
         return this.getScormUserDataCommonCacheKey(scormId) + ':' + attempt;
@@ -798,8 +794,8 @@ export class AddonModScormProvider {
     /**
      * Get common cache key for SCORM user data WS calls.
      *
-     * @param {number} scormId SCORM ID.
-     * @return {string} Cache key.
+     * @param scormId SCORM ID.
+     * @return Cache key.
      */
     protected getScormUserDataCommonCacheKey(scormId: number): string {
         return this.ROOT_CACHE_KEY + 'userdata:' + scormId;
@@ -808,11 +804,11 @@ export class AddonModScormProvider {
     /**
      * Get the user data for a certain SCORM and attempt in online.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt Attempt number.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the user data is retrieved.
+     * @param scormId SCORM ID.
+     * @param attempt Attempt number.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the user data is retrieved.
      */
     getScormUserDataOnline(scormId: number, attempt: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -852,8 +848,8 @@ export class AddonModScormProvider {
     /**
      * Get cache key for get SCORM scos WS calls.
      *
-     * @param {number} scormId SCORM ID.
-     * @return {string} Cache key.
+     * @param scormId SCORM ID.
+     * @return Cache key.
      */
     protected getScosCacheKey(scormId: number): string {
         return this.ROOT_CACHE_KEY + 'scos:' + scormId;
@@ -862,11 +858,11 @@ export class AddonModScormProvider {
     /**
      * Retrieves the list of SCO objects for a given SCORM and organization.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {string} [organization] Organization.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail if offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]} Promise resolved with a list of SCO.
+     * @param scormId SCORM ID.
+     * @param organization Organization.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail if offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with a list of SCO.
      */
     getScos(scormId: number, organization?: string, ignoreCache?: boolean, siteId?: string): Promise<any[]> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -909,13 +905,13 @@ export class AddonModScormProvider {
      * Retrieves the list of SCO objects for a given SCORM and organization, including data about
      * a certain attempt (status, isvisible, ...).
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt Attempt number.
-     * @param {string} [organization] Organization ID.
-     * @param {boolean} [offline] Whether the attempt is offline.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data for online attempts.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with a list of SCO objects.
+     * @param scormId SCORM ID.
+     * @param attempt Attempt number.
+     * @param organization Organization ID.
+     * @param offline Whether the attempt is offline.
+     * @param ignoreCache Whether it should ignore cached data for online attempts.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with a list of SCO objects.
      */
     getScosWithData(scormId: number, attempt: number, organization?: string, offline?: boolean, ignoreCache?: boolean,
             siteId?: string): Promise<any[]> {
@@ -963,10 +959,10 @@ export class AddonModScormProvider {
     /**
      * Given a SCORM and a SCO, returns the full launch URL for the SCO.
      *
-     * @param {any} scorm SCORM.
-     * @param {any} sco SCO.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<string>} Promise resolved with the URL.
+     * @param scorm SCORM.
+     * @param sco SCO.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the URL.
      */
     getScoSrc(scorm: any, sco: any, siteId?: string): Promise<string> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -1008,9 +1004,9 @@ export class AddonModScormProvider {
     /**
      * Get the path to the folder where a SCORM is downloaded.
      *
-     * @param {string} moduleUrl Module URL (returned by get_course_contents).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<string>} Promise resolved with the folder path.
+     * @param moduleUrl Module URL (returned by get_course_contents).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the folder path.
      */
     getScormFolder(moduleUrl: string, siteId?: string): Promise<string> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -1022,8 +1018,8 @@ export class AddonModScormProvider {
      * Gets a list of files to downlaod for a SCORM, using a format similar to module.contents from get_course_contents.
      * It will only return one file: the ZIP package.
      *
-     * @param {any} scorm SCORM.
-     * @return {any[]} File list.
+     * @param scorm SCORM.
+     * @return File list.
      */
     getScormFileList(scorm: any): any[] {
         const files = [];
@@ -1045,9 +1041,9 @@ export class AddonModScormProvider {
     /**
      * Get the URL and description of the status icon.
      *
-     * @param {any} sco SCO.
-     * @param {boolean} [incomplete] Whether the SCORM is incomplete.
-     * @return {{url: string, description: string}} Image URL and description.
+     * @param sco SCO.
+     * @param incomplete Whether the SCORM is incomplete.
+     * @return Image URL and description.
      */
     getScoStatusIcon(sco: any, incomplete?: boolean): {url: string, description: string} {
         let imageName = '',
@@ -1088,8 +1084,8 @@ export class AddonModScormProvider {
     /**
      * Get cache key for SCORM data WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getScormDataCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'scorm:' + courseId;
@@ -1098,13 +1094,13 @@ export class AddonModScormProvider {
     /**
      * Get a SCORM with key=value. If more than one is found, only the first will be returned.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} key Name of the property to check.
-     * @param {any} value Value to search.
-     * @param {string} [moduleUrl] Module URL.
-     * @param {boolean} [forceCache] Whether it should always return cached data.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the SCORM is retrieved.
+     * @param courseId Course ID.
+     * @param key Name of the property to check.
+     * @param value Value to search.
+     * @param moduleUrl Module URL.
+     * @param forceCache Whether it should always return cached data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the SCORM is retrieved.
      */
     protected getScormByField(courseId: number, key: string, value: any, moduleUrl?: string, forceCache?: boolean, siteId?: string)
             : Promise<any> {
@@ -1154,12 +1150,12 @@ export class AddonModScormProvider {
     /**
      * Get a SCORM by module ID.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} cmId Course module ID.
-     * @param {string} [moduleUrl] Module URL.
-     * @param {boolean} [forceCache] Whether it should always return cached data.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the SCORM is retrieved.
+     * @param courseId Course ID.
+     * @param cmId Course module ID.
+     * @param moduleUrl Module URL.
+     * @param forceCache Whether it should always return cached data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the SCORM is retrieved.
      */
     getScorm(courseId: number, cmId: number, moduleUrl?: string, forceCache?: boolean, siteId?: string): Promise<any> {
         return this.getScormByField(courseId, 'coursemodule', cmId, moduleUrl, forceCache, siteId);
@@ -1168,12 +1164,12 @@ export class AddonModScormProvider {
     /**
      * Get a SCORM by SCORM ID.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} id SCORM ID.
-     * @param {string} [moduleUrl] Module URL.
-     * @param {boolean} [forceCache] Whether it should always return cached data.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the SCORM is retrieved.
+     * @param courseId Course ID.
+     * @param id SCORM ID.
+     * @param moduleUrl Module URL.
+     * @param forceCache Whether it should always return cached data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the SCORM is retrieved.
      */
     getScormById(courseId: number, id: number, moduleUrl?: string, forceCache?: boolean, siteId?: string): Promise<any> {
         return this.getScormByField(courseId, 'id', id, moduleUrl, forceCache, siteId);
@@ -1182,8 +1178,8 @@ export class AddonModScormProvider {
     /**
      * Get a readable SCORM grade method.
      *
-     * @param {any} scorm SCORM.
-     * @return {string} Grading method.
+     * @param scorm SCORM.
+     * @return Grading method.
      */
     getScormGradeMethod(scorm: any): string {
         if (scorm.maxattempt == 1) {
@@ -1224,9 +1220,9 @@ export class AddonModScormProvider {
     /**
      * Invalidates access information.
      *
-     * @param  {number} forumId  SCORM ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param forumId SCORM ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAccessInformation(scormId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1237,10 +1233,10 @@ export class AddonModScormProvider {
     /**
      * Invalidates all the data related to a certain SCORM.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param scormId SCORM ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAllScormData(scormId: number, siteId?: string, userId?: number): Promise<any> {
         const promises = [];
@@ -1256,10 +1252,10 @@ export class AddonModScormProvider {
     /**
      * Invalidates attempt count.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param scormId SCORM ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAttemptCount(scormId: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1272,11 +1268,11 @@ export class AddonModScormProvider {
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId Course ID of the module.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined use site's current user.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID of the module.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined use site's current user.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number, siteId?: string, userId?: number): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -1295,9 +1291,9 @@ export class AddonModScormProvider {
     /**
      * Invalidates SCORM data.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateScormData(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1308,9 +1304,9 @@ export class AddonModScormProvider {
     /**
      * Invalidates SCORM user data for all attempts.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param scormId SCORM ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateScormUserData(scormId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1321,9 +1317,9 @@ export class AddonModScormProvider {
     /**
      * Invalidates SCORM scos for all organizations.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param scormId SCORM ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateScos(scormId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1334,12 +1330,12 @@ export class AddonModScormProvider {
     /**
      * Check if a SCORM's attempt is incomplete.
      *
-     * @param {any} scormId SCORM ID.
-     * @param {number} attempt Attempt.
-     * @param {boolean} offline Whether the attempt is offline.
-     * @param {boolean} ignoreCache Whether it should ignore cached data for online attempts.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with a boolean: true if incomplete, false otherwise.
+     * @param scormId SCORM ID.
+     * @param attempt Attempt.
+     * @param offline Whether the attempt is offline.
+     * @param ignoreCache Whether it should ignore cached data for online attempts.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with a boolean: true if incomplete, false otherwise.
      */
     isAttemptIncomplete(scormId: number, attempt: number, offline?: boolean, ignoreCache?: boolean, siteId?: string)
             : Promise<boolean> {
@@ -1365,8 +1361,8 @@ export class AddonModScormProvider {
      * Given a launch URL, check if it's a external link.
      * Based on Moodle's scorm_external_link.
      *
-     * @param {string} link Link to check.
-     * @return {boolean} Whether it's an external link.
+     * @param link Link to check.
+     * @return Whether it's an external link.
      */
     protected isExternalLink(link: string): boolean {
         link = link.toLowerCase();
@@ -1383,8 +1379,8 @@ export class AddonModScormProvider {
     /**
      * Check if the given SCORM is closed.
      *
-     * @param {any} scorm SCORM to check.
-     * @return {boolean} Whether the SCORM is closed.
+     * @param scorm SCORM to check.
+     * @return Whether the SCORM is closed.
      */
     isScormClosed(scorm: any): boolean {
         const timeNow = this.timeUtils.timestamp();
@@ -1399,8 +1395,8 @@ export class AddonModScormProvider {
     /**
      * Check if the given SCORM is downloadable.
      *
-     * @param {any} scorm SCORM to check.
-     * @return {boolean} Whether the SCORM is downloadable.
+     * @param scorm SCORM to check.
+     * @return Whether the SCORM is downloadable.
      */
     isScormDownloadable(scorm: any): boolean {
         return typeof scorm.protectpackagedownloads != 'undefined' && scorm.protectpackagedownloads === false;
@@ -1409,8 +1405,8 @@ export class AddonModScormProvider {
     /**
      * Check if the given SCORM is open.
      *
-     * @param {any} scorm SCORM to check.
-     * @return {boolean} Whether the SCORM is open.
+     * @param scorm SCORM to check.
+     * @return Whether the SCORM is open.
      */
     isScormOpen(scorm: any): boolean {
         const timeNow = this.timeUtils.timestamp();
@@ -1425,8 +1421,8 @@ export class AddonModScormProvider {
     /**
      * Check if a SCORM is unsupported in the app. If it's not, returns the error code to show.
      *
-     * @param {any} scorm SCORM to check.
-     * @return {string} String with error code if unsupported, undefined if supported.
+     * @param scorm SCORM to check.
+     * @return String with error code if unsupported, undefined if supported.
      */
     isScormUnsupported(scorm: any): string {
         if (!this.isScormValidVersion(scorm)) {
@@ -1441,8 +1437,8 @@ export class AddonModScormProvider {
     /**
      * Check if it's a valid SCORM 1.2.
      *
-     * @param {any} scorm SCORM to check.
-     * @return {boolean} Whether the SCORM is valid.
+     * @param scorm SCORM to check.
+     * @return Whether the SCORM is valid.
      */
     isScormValidVersion(scorm: any): boolean {
         return scorm.version == 'SCORM_1.2';
@@ -1451,8 +1447,8 @@ export class AddonModScormProvider {
     /**
      * Check if a SCO status is incomplete.
      *
-     * @param {string} status SCO status.
-     * @return {boolean} Whether it's incomplete.
+     * @param status SCO status.
+     * @return Whether it's incomplete.
      */
     isStatusIncomplete(status: any): boolean {
         return !status || status == 'notattempted' || status == 'incomplete' || status == 'browsed';
@@ -1461,8 +1457,8 @@ export class AddonModScormProvider {
     /**
      * Check if a package URL is valid.
      *
-     * @param {string} packageUrl Package URL.
-     * @return {boolean} Whether it's valid.
+     * @param packageUrl Package URL.
+     * @return Whether it's valid.
      */
     isValidPackageUrl(packageUrl: string): boolean {
         if (!packageUrl) {
@@ -1478,11 +1474,11 @@ export class AddonModScormProvider {
     /**
      * Report a SCO as being launched.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} scoId SCO ID.
-     * @param {string} [name] Name of the SCORM.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the WS call is successful.
+     * @param scormId SCORM ID.
+     * @param scoId SCO ID.
+     * @param name Name of the SCORM.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logLaunchSco(scormId: number, scoId: number, name?: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1499,10 +1495,10 @@ export class AddonModScormProvider {
     /**
      * Report a SCORM as being viewed.
      *
-     * @param {string} id Module ID.
-     * @param {string} [name] Name of the SCORM.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the WS call is successful.
+     * @param id Module ID.
+     * @param name Name of the SCORM.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(id: number, name?: string, siteId?: string): Promise<any> {
         const params = {
@@ -1516,13 +1512,13 @@ export class AddonModScormProvider {
     /**
      * Saves a SCORM tracking record.
      *
-     * @param {number} scoId Sco ID.
-     * @param {number} attempt Attempt number.
-     * @param {any[]} tracks Tracking data to store.
-     * @param {any} scorm SCORM.
-     * @param {boolean} offline Whether the attempt is offline.
-     * @param {any} [userData] User data for this attempt and SCO. If not defined, it will be retrieved from DB. Recommended.
-     * @return {Promise<any>} Promise resolved when data is saved.
+     * @param scoId Sco ID.
+     * @param attempt Attempt number.
+     * @param tracks Tracking data to store.
+     * @param scorm SCORM.
+     * @param offline Whether the attempt is offline.
+     * @param userData User data for this attempt and SCO. If not defined, it will be retrieved from DB. Recommended.
+     * @return Promise resolved when data is saved.
      */
     saveTracks(scoId: number, attempt: number, tracks: any[], scorm: any, offline?: boolean, userData?: any, siteId?: string)
             : Promise<any> {
@@ -1553,12 +1549,12 @@ export class AddonModScormProvider {
     /**
      * Saves a SCORM tracking record.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} scoId Sco ID.
-     * @param {number} attempt Attempt number.
-     * @param {any[]} tracks Tracking data.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when data is saved.
+     * @param scormId SCORM ID.
+     * @param scoId Sco ID.
+     * @param attempt Attempt number.
+     * @param tracks Tracking data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when data is saved.
      */
     saveTracksOnline(scormId: number, scoId: number, attempt: number, tracks: any[], siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1590,15 +1586,15 @@ export class AddonModScormProvider {
      * Saves a SCORM tracking record using a synchronous call.
      * Please use this function only if synchronous is a must. It's recommended to use saveTracks.
      *
-     * @param {number} scoId Sco ID.
-     * @param {number} attempt Attempt number.
-     * @param {any[]} tracks Tracking data to store.
-     * @param {any} scorm SCORM.
-     * @param {boolean} [offline] Whether the attempt is offline.
-     * @param {any} [userData] User data for this attempt and SCO. Required if offline=true.
-     * @return {boolean} In online returns true if data is inserted, false otherwise.
-     *                   In offline returns true if data to insert is valid, false otherwise. True doesn't mean that the
-     *                   data has been stored, this function can return true but the insertion can still fail somehow.
+     * @param scoId Sco ID.
+     * @param attempt Attempt number.
+     * @param tracks Tracking data to store.
+     * @param scorm SCORM.
+     * @param offline Whether the attempt is offline.
+     * @param userData User data for this attempt and SCO. Required if offline=true.
+     * @return In online returns true if data is inserted, false otherwise.
+     *         In offline returns true if data to insert is valid, false otherwise. True doesn't mean that the
+     *         data has been stored, this function can return true but the insertion can still fail somehow.
      */
     saveTracksSync(scoId: number, attempt: number, tracks: any[], scorm: any, offline?: boolean, userData?: any): boolean {
         if (offline) {
@@ -1625,10 +1621,10 @@ export class AddonModScormProvider {
      * Saves a SCORM tracking record using a synchronous call.
      * Please use this function only if synchronous is a must. It's recommended to use saveTracksOnline.
      *
-     * @param {number} scoId Sco ID.
-     * @param {number} attempt Attempt number.
-     * @param {any[]} tracks Tracking data.
-     * @return {boolean} True if success, false otherwise.
+     * @param scoId Sco ID.
+     * @param attempt Attempt number.
+     * @param tracks Tracking data.
+     * @return True if success, false otherwise.
      */
     saveTracksSyncOnline(scoId: number, attempt: number, tracks: any[]): boolean {
         const params = {
@@ -1671,10 +1667,10 @@ export class AddonModScormProvider {
      * Check if the SCORM main file should be downloaded.
      * This function should only be called if the SCORM can be downloaded (not downloaded or outdated).
      *
-     * @param {any} scorm SCORM to check.
-     * @param {boolean} [isOutdated] True if package outdated, false if not downloaded, undefined to calculate it.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>}  Promise resolved with true if it should be downloaded, false otherwise.
+     * @param scorm SCORM to check.
+     * @param isOutdated True if package outdated, false if not downloaded, undefined to calculate it.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if it should be downloaded, false otherwise.
      */
     shouldDownloadMainFile(scorm: any, isOutdated?: boolean, siteId?: string): Promise<boolean> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -1712,11 +1708,11 @@ export class AddonModScormProvider {
     /**
      * If needed, updates cached user data after saving tracks in online.
      *
-     * @param {number} scormId SCORM ID.
-     * @param {number} attempt Attempt number.
-     * @param {any[]} tracks Tracking data saved.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when updated.
+     * @param scormId SCORM ID.
+     * @param attempt Attempt number.
+     * @param tracks Tracking data saved.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when updated.
      */
     protected updateUserDataAfterSave(scormId: number, attempt: number, tracks: any[], siteId?: string): Promise<any> {
         if (!tracks || !tracks.length) {
diff --git a/src/addon/mod/scorm/providers/sync-cron-handler.ts b/src/addon/mod/scorm/providers/sync-cron-handler.ts
index 33999d0cb..e0fef8e95 100644
--- a/src/addon/mod/scorm/providers/sync-cron-handler.ts
+++ b/src/addon/mod/scorm/providers/sync-cron-handler.ts
@@ -29,9 +29,9 @@ export class AddonModScormSyncCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         return this.scormSync.syncAllScorms(siteId, force);
@@ -40,7 +40,7 @@ export class AddonModScormSyncCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return this.scormSync.syncInterval;
diff --git a/src/addon/mod/survey/components/index/index.ts b/src/addon/mod/survey/components/index/index.ts
index 8b6cfbb65..23f479553 100644
--- a/src/addon/mod/survey/components/index/index.ts
+++ b/src/addon/mod/survey/components/index/index.ts
@@ -64,7 +64,7 @@ export class AddonModSurveyIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         const promises = [];
@@ -80,8 +80,8 @@ export class AddonModSurveyIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Compares sync event data with current data to check if refresh content is needed.
      *
-     * @param {any} syncEventData Data receiven on sync observer.
-     * @return {boolean}          True if refresh is needed, false otherwise.
+     * @param syncEventData Data receiven on sync observer.
+     * @return True if refresh is needed, false otherwise.
      */
     protected isRefreshSyncNeeded(syncEventData: any): boolean {
         if (this.survey && syncEventData.surveyId == this.survey.id && syncEventData.userId == this.userId) {
@@ -94,10 +94,10 @@ export class AddonModSurveyIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Download survey contents.
      *
-     * @param  {boolean}      [refresh=false]    If it's refreshing content.
-     * @param  {boolean}      [sync=false]       If it should try to sync.
-     * @param  {boolean}      [showErrors=false] If show errors to the user of hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh If it's refreshing content.
+     * @param sync If it should try to sync.
+     * @param showErrors If show errors to the user of hide them.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<any> {
         return this.surveyProvider.getSurvey(this.courseId, this.module.id).then((survey) => {
@@ -135,7 +135,7 @@ export class AddonModSurveyIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Convenience function to get survey questions.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchQuestions(): Promise<any> {
         return this.surveyProvider.getQuestions(this.survey.id).then((questions) => {
@@ -161,7 +161,7 @@ export class AddonModSurveyIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Check if answers are valid to be submitted.
      *
-     * @return {boolean}  If answers are valid
+     * @return If answers are valid
      */
     isValidResponse(): boolean {
         for (const x in this.answers) {
@@ -213,7 +213,7 @@ export class AddonModSurveyIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Performs the sync of the activity.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected sync(): Promise<any> {
         return this.surveySync.syncSurvey(this.survey.id, this.userId);
@@ -222,8 +222,8 @@ export class AddonModSurveyIndexComponent extends CoreCourseModuleMainActivityCo
     /**
      * Checks if sync has succeed from result sync data.
      *
-     * @param  {any}     result Data returned on the sync function.
-     * @return {boolean}        If suceed or not.
+     * @param result Data returned on the sync function.
+     * @return If suceed or not.
      */
     protected hasSyncSucceed(result: any): boolean {
         return result.answersSent;
diff --git a/src/addon/mod/survey/pages/index/index.ts b/src/addon/mod/survey/pages/index/index.ts
index 3c18ae76f..ce2546b82 100644
--- a/src/addon/mod/survey/pages/index/index.ts
+++ b/src/addon/mod/survey/pages/index/index.ts
@@ -40,7 +40,7 @@ export class AddonModSurveyIndexPage {
     /**
      * Update some data based on the survey instance.
      *
-     * @param {any} survey Survey instance.
+     * @param survey Survey instance.
      */
     updateData(survey: any): void {
         this.title = survey.name || this.title;
diff --git a/src/addon/mod/survey/providers/helper.ts b/src/addon/mod/survey/providers/helper.ts
index cc3d48e31..23d7dc9b4 100644
--- a/src/addon/mod/survey/providers/helper.ts
+++ b/src/addon/mod/survey/providers/helper.ts
@@ -26,8 +26,8 @@ export class AddonModSurveyHelperProvider {
     /**
      * Turns a string with values separated by commas into an array.
      *
-     * @param {any} value Value to convert.
-     * @return {string[]}    Array.
+     * @param value Value to convert.
+     * @return Array.
      */
     protected commaStringToArray(value: any): string[] {
         if (typeof value == 'string') {
@@ -44,8 +44,8 @@ export class AddonModSurveyHelperProvider {
     /**
      * Gets the parent questions and puts them in an object: ID -> question.
      *
-     * @param {Object[]} questions Questions.
-     * @return {any}            Object with parent questions.
+     * @param questions Questions.
+     * @return Object with parent questions.
      */
     protected getParentQuestions(questions: any[]): any {
         const parents = {};
@@ -63,8 +63,8 @@ export class AddonModSurveyHelperProvider {
      * Format a questions list, turning "multi" and "options" strings into arrays and adding the properties
      * 'num' and 'name'.
      *
-     * @param {any[]} questions Questions.
-     * @return {any[]}           Promise resolved with the formatted questions.
+     * @param questions Questions.
+     * @return Promise resolved with the formatted questions.
      */
     formatQuestions(questions: any[]): any[] {
 
diff --git a/src/addon/mod/survey/providers/module-handler.ts b/src/addon/mod/survey/providers/module-handler.ts
index ed3368ccb..14db300e5 100644
--- a/src/addon/mod/survey/providers/module-handler.ts
+++ b/src/addon/mod/survey/providers/module-handler.ts
@@ -44,7 +44,7 @@ export class AddonModSurveyModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean {
         return true;
@@ -53,10 +53,10 @@ export class AddonModSurveyModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         return {
@@ -78,9 +78,9 @@ export class AddonModSurveyModuleHandler implements CoreCourseModuleHandler {
      * Get the component to render the module. This is needed to support singleactivity course format.
      * The component returned must implement CoreCourseModuleMainComponent.
      *
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any} The component to use, undefined if not found.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component to use, undefined if not found.
      */
     getMainComponent(course: any, module: any): any {
         return AddonModSurveyIndexComponent;
diff --git a/src/addon/mod/survey/providers/offline.ts b/src/addon/mod/survey/providers/offline.ts
index 5e3185315..b9709ca0b 100644
--- a/src/addon/mod/survey/providers/offline.ts
+++ b/src/addon/mod/survey/providers/offline.ts
@@ -72,10 +72,10 @@ export class AddonModSurveyOfflineProvider {
     /**
      * Delete a survey answers.
      *
-     * @param  {number} surveyId Survey ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @param  {number} [userId] User the answers belong to. If not defined, current user in site.
-     * @return {Promise<any>}         Promise resolved if deleted, rejected if failure.
+     * @param surveyId Survey ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the answers belong to. If not defined, current user in site.
+     * @return Promise resolved if deleted, rejected if failure.
      */
     deleteSurveyAnswers(surveyId: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -88,8 +88,8 @@ export class AddonModSurveyOfflineProvider {
     /**
      * Get all the stored data from all the surveys.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved with answers.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with answers.
      */
     getAllData(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -106,10 +106,10 @@ export class AddonModSurveyOfflineProvider {
     /**
      * Get a survey stored answers.
      *
-     * @param  {number} surveyId Survey ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @param  {number} [userId] User the answers belong to. If not defined, current user in site.
-     * @return {Promise<any>}    Promise resolved with the answers.
+     * @param surveyId Survey ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the answers belong to. If not defined, current user in site.
+     * @return Promise resolved with the answers.
      */
     getSurveyAnswers(surveyId: number, siteId?: string, userId?: number): Promise<any> {
         return this.getSurveyData(surveyId, siteId, userId).then((entry) => {
@@ -122,10 +122,10 @@ export class AddonModSurveyOfflineProvider {
     /**
      * Get a survey stored data.
      *
-     * @param  {number} surveyId Survey ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @param  {number} [userId] User the answers belong to. If not defined, current user in site.
-     * @return {Promise<any>}         Promise resolved with the data.
+     * @param surveyId Survey ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the answers belong to. If not defined, current user in site.
+     * @return Promise resolved with the data.
      */
     getSurveyData(surveyId: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -142,10 +142,10 @@ export class AddonModSurveyOfflineProvider {
     /**
      * Check if there are offline answers to send.
      *
-     * @param  {number} surveyId  Survey ID.
-     * @param  {string} [siteId]  Site ID. If not defined, current site.
-     * @param  {number} [userId]  User the answers belong to. If not defined, current user in site.
-     * @return {Promise<boolean>}          Promise resolved with boolean: true if has offline answers, false otherwise.
+     * @param surveyId Survey ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the answers belong to. If not defined, current user in site.
+     * @return Promise resolved with boolean: true if has offline answers, false otherwise.
      */
     hasAnswers(surveyId: number, siteId?: string, userId?: number): Promise<boolean> {
         return this.getSurveyAnswers(surveyId, siteId, userId).then((answers) => {
@@ -156,13 +156,13 @@ export class AddonModSurveyOfflineProvider {
     /**
      * Save answers to be sent later.
      *
-     * @param  {number} surveyId  Survey ID.
-     * @param  {string} name      Survey name.
-     * @param  {number} courseId  Course ID the survey belongs to.
-     * @param  {any[]} answers    Answers.
-     * @param  {string} [siteId]  Site ID. If not defined, current site.
-     * @param  {number} [userId]  User the answers belong to. If not defined, current user in site.
-     * @return {Promise<any>}     Promise resolved if stored, rejected if failure.
+     * @param surveyId Survey ID.
+     * @param name Survey name.
+     * @param courseId Course ID the survey belongs to.
+     * @param answers Answers.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User the answers belong to. If not defined, current user in site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     saveAnswers(surveyId: number, name: string, courseId: number, answers: any[], siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/addon/mod/survey/providers/prefetch-handler.ts b/src/addon/mod/survey/providers/prefetch-handler.ts
index 83945c844..b56636f8f 100644
--- a/src/addon/mod/survey/providers/prefetch-handler.ts
+++ b/src/addon/mod/survey/providers/prefetch-handler.ts
@@ -48,9 +48,9 @@ export class AddonModSurveyPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Returns survey intro files.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @return {Promise<any[]>} Promise resolved with list of intro files.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @return Promise resolved with list of intro files.
      */
     getIntroFiles(module: any, courseId: number): Promise<any[]> {
         return this.surveyProvider.getSurvey(courseId, module.id).catch(() => {
@@ -63,9 +63,9 @@ export class AddonModSurveyPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         return this.surveyProvider.invalidateContent(moduleId, courseId);
@@ -74,9 +74,9 @@ export class AddonModSurveyPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Invalidate WS calls needed to determine module status.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when invalidated.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when invalidated.
      */
     invalidateModule(module: any, courseId: number): Promise<any> {
         return this.surveyProvider.invalidateSurveyData(courseId);
@@ -85,7 +85,7 @@ export class AddonModSurveyPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
+     * @return A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -94,11 +94,11 @@ export class AddonModSurveyPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Prefetch a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
      */
     prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string): Promise<any> {
         return this.prefetchPackage(module, courseId, single, this.prefetchSurvey.bind(this));
@@ -107,11 +107,11 @@ export class AddonModSurveyPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Prefetch a survey.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} single True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {String} siteId Site ID.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
      */
     protected prefetchSurvey(module: any, courseId: number, single: boolean, siteId: string): Promise<any> {
         return this.surveyProvider.getSurvey(courseId, module.id, true, siteId).then((survey) => {
@@ -133,10 +133,10 @@ export class AddonModSurveyPrefetchHandler extends CoreCourseActivityPrefetchHan
     /**
      * Sync a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     sync(module: any, courseId: number, siteId?: any): Promise<any> {
         if (!this.syncProvider) {
diff --git a/src/addon/mod/survey/providers/survey.ts b/src/addon/mod/survey/providers/survey.ts
index 824b7bd33..078fae02c 100644
--- a/src/addon/mod/survey/providers/survey.ts
+++ b/src/addon/mod/survey/providers/survey.ts
@@ -41,10 +41,10 @@ export class AddonModSurveyProvider {
     /**
      * Get a survey's questions.
      *
-     * @param {number} surveyId Survey ID.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the questions are retrieved.
+     * @param surveyId Survey ID.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the questions are retrieved.
      */
     getQuestions(surveyId: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -74,8 +74,8 @@ export class AddonModSurveyProvider {
     /**
      * Get cache key for survey questions WS calls.
      *
-     * @param {number} surveyId Survey ID.
-     * @return {string}         Cache key.
+     * @param surveyId Survey ID.
+     * @return Cache key.
      */
     protected getQuestionsCacheKey(surveyId: number): string {
         return this.ROOT_CACHE_KEY + 'questions:' + surveyId;
@@ -84,8 +84,8 @@ export class AddonModSurveyProvider {
     /**
      * Get cache key for survey data WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @return {string}         Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getSurveyCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'survey:' + courseId;
@@ -94,12 +94,12 @@ export class AddonModSurveyProvider {
     /**
      * Get a survey data.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} key Name of the property to check.
-     * @param {any} value Value to search.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the survey is retrieved.
+     * @param courseId Course ID.
+     * @param key Name of the property to check.
+     * @param value Value to search.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the survey is retrieved.
      */
     protected getSurveyDataByKey(courseId: number, key: string, value: any, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -134,11 +134,11 @@ export class AddonModSurveyProvider {
     /**
      * Get a survey by course module ID.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} cmId Course module ID.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}   Promise resolved when the survey is retrieved.
+     * @param courseId Course ID.
+     * @param cmId Course module ID.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the survey is retrieved.
      */
     getSurvey(courseId: number, cmId: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.getSurveyDataByKey(courseId, 'coursemodule', cmId, ignoreCache, siteId);
@@ -147,11 +147,11 @@ export class AddonModSurveyProvider {
     /**
      * Get a survey by ID.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} id Survey ID.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved when the survey is retrieved.
+     * @param courseId Course ID.
+     * @param id Survey ID.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the survey is retrieved.
      */
     getSurveyById(courseId: number, id: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.getSurveyDataByKey(courseId, 'id', id, ignoreCache, siteId);
@@ -160,10 +160,10 @@ export class AddonModSurveyProvider {
     /**
      * Invalidate the prefetched content.
      *
-     * @param  {number} moduleId The module ID.
-     * @param  {number} courseId Course ID of the module.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID of the module.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -188,9 +188,9 @@ export class AddonModSurveyProvider {
     /**
      * Invalidates survey questions.
      *
-     * @param {number} surveyId Survey ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the data is invalidated.
+     * @param surveyId Survey ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateQuestions(surveyId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -201,9 +201,9 @@ export class AddonModSurveyProvider {
     /**
      * Invalidates survey data.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}   Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateSurveyData(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -214,10 +214,10 @@ export class AddonModSurveyProvider {
     /**
      * Report the survey as being viewed.
      *
-     * @param {number} id Module ID.
-     * @param {string} [name] Name of the assign.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the WS call is successful.
+     * @param id Module ID.
+     * @param name Name of the assign.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(id: number, name?: string, siteId?: string): Promise<any> {
         const params = {
@@ -231,13 +231,13 @@ export class AddonModSurveyProvider {
     /**
      * Send survey answers. If cannot send them to Moodle, they'll be stored in offline to be sent later.
      *
-     * @param  {number} surveyId  Survey ID.
-     * @param  {string} name      Survey name.
-     * @param  {number} courseId  Course ID the survey belongs to.
-     * @param  {any[]} answers Answers.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>}    Promise resolved with boolean if success: true if answers were sent to server,
-     *                           false if stored in device.
+     * @param surveyId Survey ID.
+     * @param name Survey name.
+     * @param courseId Course ID the survey belongs to.
+     * @param answers Answers.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean if success: true if answers were sent to server,
+     *         false if stored in device.
      */
     submitAnswers(surveyId: number, name: string, courseId: number, answers: any[], siteId?: string): Promise<boolean> {
         // Convenience function to store a survey to be synchronized later.
@@ -274,11 +274,11 @@ export class AddonModSurveyProvider {
     /**
      * Send survey answers to Moodle.
      *
-     * @param  {number} surveyId  Survey ID.
-     * @param  {any[]} answers Answers.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}     Promise resolved when answers are successfully submitted. Rejected with object containing
-     *                            the error message (if any) and a boolean indicating if the error was returned by WS.
+     * @param surveyId Survey ID.
+     * @param answers Answers.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when answers are successfully submitted. Rejected with object containing
+     *         the error message (if any) and a boolean indicating if the error was returned by WS.
      */
     submitAnswersOnline(surveyId: number, answers: any[], siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/addon/mod/survey/providers/sync-cron-handler.ts b/src/addon/mod/survey/providers/sync-cron-handler.ts
index f3e2e9552..e3b731569 100644
--- a/src/addon/mod/survey/providers/sync-cron-handler.ts
+++ b/src/addon/mod/survey/providers/sync-cron-handler.ts
@@ -29,9 +29,9 @@ export class AddonModSurveySyncCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         return this.surveySync.syncAllSurveys(siteId, force);
@@ -40,7 +40,7 @@ export class AddonModSurveySyncCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return this.surveySync.syncInterval;
diff --git a/src/addon/mod/survey/providers/sync.ts b/src/addon/mod/survey/providers/sync.ts
index 0a57a0258..4ffc79cd0 100644
--- a/src/addon/mod/survey/providers/sync.ts
+++ b/src/addon/mod/survey/providers/sync.ts
@@ -55,9 +55,9 @@ export class AddonModSurveySyncProvider extends CoreCourseActivitySyncBaseProvid
     /**
      * Get the ID of a survey sync.
      *
-     * @param  {number} surveyId Survey ID.
-     * @param  {number} userId   User the answers belong to.
-     * @return {string}          Sync ID.
+     * @param surveyId Survey ID.
+     * @param userId User the answers belong to.
+     * @return Sync ID.
      * @protected
      */
     getSyncId(surveyId: number, userId: number): string {
@@ -67,9 +67,9 @@ export class AddonModSurveySyncProvider extends CoreCourseActivitySyncBaseProvid
     /**
      * Try to synchronize all the surveys in a certain site or in all sites.
      *
-     * @param  {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @return {Promise<any>}    Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     syncAllSurveys(siteId?: string, force?: boolean): Promise<any> {
         return this.syncOnSites('all surveys', this.syncAllSurveysFunc.bind(this), [force], siteId);
@@ -78,9 +78,9 @@ export class AddonModSurveySyncProvider extends CoreCourseActivitySyncBaseProvid
     /**
      * Sync all pending surveys on a site.
      *
-     * @param  {string} siteId Site ID to sync.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @param {Promise<any>}     Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync.
+     * @param force Wether to force sync not depending on last execution.
+     * @param Promise resolved if sync is successful, rejected if sync fails.
      */
     protected syncAllSurveysFunc(siteId: string, force?: boolean): Promise<any> {
         // Get all survey answers pending to be sent in the site.
@@ -109,10 +109,10 @@ export class AddonModSurveySyncProvider extends CoreCourseActivitySyncBaseProvid
     /**
      * Sync a survey only if a certain time has passed since the last time.
      *
-     * @param  {number} surveyId Survey ID.
-     * @param  {number} userId   User the answers belong to.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when the survey is synced or if it doesn't need to be synced.
+     * @param surveyId Survey ID.
+     * @param userId User the answers belong to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the survey is synced or if it doesn't need to be synced.
      */
     syncSurveyIfNeeded(surveyId: number, userId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -129,10 +129,10 @@ export class AddonModSurveySyncProvider extends CoreCourseActivitySyncBaseProvid
     /**
      * Synchronize a survey.
      *
-     * @param  {number} surveyId Survey ID.
-     * @param  {number} [userId]   User the answers belong to. If not defined, current user.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved if sync is successful, rejected otherwise.
+     * @param surveyId Survey ID.
+     * @param userId User the answers belong to. If not defined, current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     syncSurvey(surveyId: number, userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/addon/mod/url/components/index/index.ts b/src/addon/mod/url/components/index/index.ts
index 842d14194..e7bcd6206 100644
--- a/src/addon/mod/url/components/index/index.ts
+++ b/src/addon/mod/url/components/index/index.ts
@@ -68,7 +68,7 @@ export class AddonModUrlIndexComponent extends CoreCourseModuleMainResourceCompo
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         return this.urlProvider.invalidateContent(this.module.id, this.courseId);
@@ -77,8 +77,8 @@ export class AddonModUrlIndexComponent extends CoreCourseModuleMainResourceCompo
     /**
      * Download url contents.
      *
-     * @param {boolean} [refresh] Whether we're refreshing data.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Whether we're refreshing data.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh?: boolean): Promise<any> {
         let canGetUrl = this.canGetUrl,
@@ -138,8 +138,8 @@ export class AddonModUrlIndexComponent extends CoreCourseModuleMainResourceCompo
     /**
      * Calculate the display options to determine how the URL should be rendered.
      *
-     * @param {any} url Object with the URL data.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param url Object with the URL data.
+     * @return Promise resolved when done.
      */
     protected calculateDisplayOptions(url: any): Promise<any> {
         const displayType = this.urlProvider.getFinalDisplayType(url);
@@ -175,7 +175,7 @@ export class AddonModUrlIndexComponent extends CoreCourseModuleMainResourceCompo
     /**
      * Log view into the site and checks module completion.
      *
-     * @return {Promise<void>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected logView(): Promise<void> {
         return this.urlProvider.logView(this.module.instance, this.module.name).then(() => {
diff --git a/src/addon/mod/url/pages/index/index.ts b/src/addon/mod/url/pages/index/index.ts
index 1e0ec28c6..1b5fde2db 100644
--- a/src/addon/mod/url/pages/index/index.ts
+++ b/src/addon/mod/url/pages/index/index.ts
@@ -40,7 +40,7 @@ export class AddonModUrlIndexPage {
     /**
      * Update some data based on the url instance.
      *
-     * @param {any} url Url instance.
+     * @param url Url instance.
      */
     updateData(url: any): void {
         this.title = url.name || this.title;
diff --git a/src/addon/mod/url/providers/helper.ts b/src/addon/mod/url/providers/helper.ts
index 4620fce98..25a9f99e5 100644
--- a/src/addon/mod/url/providers/helper.ts
+++ b/src/addon/mod/url/providers/helper.ts
@@ -29,7 +29,7 @@ export class AddonModUrlHelperProvider {
     /**
      * Opens a URL.
      *
-     * @param {string} url The URL to go to.
+     * @param url The URL to go to.
      */
     open(url: string): void {
         const modal = this.domUtils.showModalLoading();
diff --git a/src/addon/mod/url/providers/module-handler.ts b/src/addon/mod/url/providers/module-handler.ts
index fb51ea3bc..05f475d59 100644
--- a/src/addon/mod/url/providers/module-handler.ts
+++ b/src/addon/mod/url/providers/module-handler.ts
@@ -50,7 +50,7 @@ export class AddonModUrlModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean {
         return true;
@@ -59,10 +59,10 @@ export class AddonModUrlModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         // tslint:disable: no-this-assignment
@@ -140,9 +140,9 @@ export class AddonModUrlModuleHandler implements CoreCourseModuleHandler {
     /**
      * Returns if contents are loaded to show link button.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @return {Promise<boolean>} Resolved when done.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @return Resolved when done.
      */
     protected hideLinkButton(module: any, courseId: number): Promise<boolean> {
         return this.courseProvider.loadModuleContents(module, courseId, undefined, false, false, undefined, this.modName)
@@ -158,9 +158,9 @@ export class AddonModUrlModuleHandler implements CoreCourseModuleHandler {
      * Get the component to render the module. This is needed to support singleactivity course format.
      * The component returned must implement CoreCourseModuleMainComponent.
      *
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any} The component to use, undefined if not found.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component to use, undefined if not found.
      */
     getMainComponent(course: any, module: any): any {
         return AddonModUrlIndexComponent;
@@ -169,8 +169,8 @@ export class AddonModUrlModuleHandler implements CoreCourseModuleHandler {
     /**
      * Open the URL.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
+     * @param module The module object.
+     * @param courseId The course ID.
      */
     protected openUrl(module: any, courseId: number): void {
         this.urlProvider.logView(module.instance, module.name).then(() => {
diff --git a/src/addon/mod/url/providers/url.ts b/src/addon/mod/url/providers/url.ts
index 13261f104..28ffe8da8 100644
--- a/src/addon/mod/url/providers/url.ts
+++ b/src/addon/mod/url/providers/url.ts
@@ -41,8 +41,8 @@ export class AddonModUrlProvider {
     /**
      * Get the final display type for a certain URL. Based on Moodle's url_get_final_display_type.
      *
-     * @param {any} url URL data.
-     * @return {number} Final display type.
+     * @param url URL data.
+     * @return Final display type.
      */
     getFinalDisplayType(url: any): number {
         if (!url) {
@@ -93,8 +93,8 @@ export class AddonModUrlProvider {
     /**
      * Get cache key for url data WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @return {string}         Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getUrlCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'url:' + courseId;
@@ -103,11 +103,11 @@ export class AddonModUrlProvider {
     /**
      * Get a url data.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} key     Name of the property to check.
-     * @param {any}  value   Value to search.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the url is retrieved.
+     * @param courseId Course ID.
+     * @param key Name of the property to check.
+     * @param value Value to search.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the url is retrieved.
      */
     protected getUrlDataByKey(courseId: number, key: string, value: any, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -137,10 +137,10 @@ export class AddonModUrlProvider {
     /**
      * Get a url by course module ID.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} cmId     Course module ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}   Promise resolved when the url is retrieved.
+     * @param courseId Course ID.
+     * @param cmId Course module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the url is retrieved.
      */
     getUrl(courseId: number, cmId: number, siteId?: string): Promise<any> {
         return this.getUrlDataByKey(courseId, 'coursemodule', cmId, siteId);
@@ -149,8 +149,8 @@ export class AddonModUrlProvider {
     /**
      * Guess the icon for a certain URL. Based on Moodle's url_guess_icon.
      *
-     * @param {string} url URL to check.
-     * @return {string} Icon, empty if it should use the default icon.
+     * @param url URL to check.
+     * @return Icon, empty if it should use the default icon.
      */
     guessIcon(url: string): string {
         url = url || '';
@@ -176,10 +176,10 @@ export class AddonModUrlProvider {
     /**
      * Invalidate the prefetched content.
      *
-     * @param  {number} moduleId The module ID.
-     * @param  {number} courseId Course ID of the module.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID of the module.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -195,9 +195,9 @@ export class AddonModUrlProvider {
     /**
      * Invalidates url data.
      *
-     * @param {number} courseid Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}   Promise resolved when the data is invalidated.
+     * @param courseid Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateUrlData(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -208,7 +208,7 @@ export class AddonModUrlProvider {
     /**
      * Returns whether or not getUrl WS available or not.
      *
-     * @return {boolean} If WS is abalaible.
+     * @return If WS is abalaible.
      * @since 3.3
      */
     isGetUrlWSAvailable(): boolean {
@@ -218,10 +218,10 @@ export class AddonModUrlProvider {
     /**
      * Report the url as being viewed.
      *
-     * @param {number} id Module ID.
-     * @param {string} [name] Name of the assign.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the WS call is successful.
+     * @param id Module ID.
+     * @param name Name of the assign.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(id: number, name?: string, siteId?: string): Promise<any> {
         const params = {
diff --git a/src/addon/mod/wiki/components/index/index.ts b/src/addon/mod/wiki/components/index/index.ts
index cb91ef072..7296709d2 100644
--- a/src/addon/mod/wiki/components/index/index.ts
+++ b/src/addon/mod/wiki/components/index/index.ts
@@ -144,7 +144,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Check if the current page was created or discarded.
      *
-     * @param {any} data Data about created and deleted pages.
+     * @param data Data about created and deleted pages.
      */
     protected checkPageCreatedOrDiscarded(data: any): void {
         if (!this.currentPage && data) {
@@ -182,7 +182,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Construct the map of pages.
      *
-     * @param {any[]} subwikiPages List of pages.
+     * @param subwikiPages List of pages.
      */
     constructMap(subwikiPages: any[]): void {
         let letter,
@@ -216,10 +216,10 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Get the wiki data.
      *
-     * @param {boolean} [refresh=false] If it's refreshing content.
-     * @param {boolean} [sync=false] If it should try to sync.
-     * @param {boolean} [showErrors=false] If show errors to the user of hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh If it's refreshing content.
+     * @param sync If it should try to sync.
+     * @param showErrors If show errors to the user of hide them.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<any> {
 
@@ -315,8 +315,8 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Get wiki page contents.
      *
-     * @param {number} pageId Page to get.
-     * @return {Promise<any>} Promise resolved with the page data.
+     * @param pageId Page to get.
+     * @return Promise resolved with the page data.
      */
     protected fetchPageContents(pageId: number): Promise<any> {
         if (!pageId) {
@@ -361,7 +361,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Fetch the list of pages of a subwiki.
      *
-     * @param {any} subwiki Subwiki.
+     * @param subwiki Subwiki.
      */
     protected fetchSubwikiPages(subwiki: any): Promise<any> {
         let subwikiPages;
@@ -409,7 +409,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Get the subwikis.
      *
-     * @param {number} wikiId Wiki ID.
+     * @param wikiId Wiki ID.
      */
     protected fetchSubwikis(wikiId: number): Promise<any> {
         return this.wikiProvider.getSubwikis(wikiId).then((subwikis) => {
@@ -424,7 +424,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Fetch the page to be shown.
      *
-     * @return {Promise<any>} [description]
+     * @return [description]
      */
     protected fetchWikiPage(): Promise<any> {
         // Search the current Subwiki.
@@ -458,7 +458,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Get the wiki home view. If cannot determine or it's current view, return undefined.
      *
-     * @return {ViewController} The view controller of the home view
+     * @return The view controller of the home view
      */
     protected getWikiHomeView(): ViewController {
 
@@ -580,7 +580,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Go to view a certain page.
      *
-     * @param {any} page Page to view.
+     * @param page Page to view.
      */
     goToPage(page: any): void {
         if (!page.id) {
@@ -621,10 +621,10 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Go to the page to view a certain subwiki.
      *
-     * @param {number} subwikiId Subwiki ID.
-     * @param {number} userId User ID of the subwiki.
-     * @param {number} groupId Group ID of the subwiki.
-     * @param {boolean} canEdit Whether the subwiki can be edited.
+     * @param subwikiId Subwiki ID.
+     * @param userId User ID of the subwiki.
+     * @param groupId Group ID of the subwiki.
+     * @param canEdit Whether the subwiki can be edited.
      */
     goToSubwiki(subwikiId: number, userId: number, groupId: number, canEdit: boolean): void {
         // Check if the subwiki is disabled.
@@ -648,7 +648,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Checks if there is any subwiki selected.
      *
-     * @return {boolean} Whether there is any subwiki selected.
+     * @return Whether there is any subwiki selected.
      */
     protected isAnySubwikiSelected(): boolean {
         return this.subwikiData.subwikiSelected > 0 || this.subwikiData.userSelected > 0 || this.subwikiData.groupSelected > 0;
@@ -657,8 +657,8 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Checks if the given subwiki is the one picked on the subwiki picker.
      *
-     * @param {any} subwiki Subwiki to check.
-     * @return {boolean} Whether it's the selected subwiki.
+     * @param subwiki Subwiki to check.
+     * @return Whether it's the selected subwiki.
      */
     protected isSubwikiSelected(subwiki: any): boolean {
         const subwikiId = parseInt(subwiki.id, 10) || 0;
@@ -676,8 +676,8 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Replace edit links to have full url.
      *
-     * @param {string} content Content to treat.
-     * @return {string} Treated content.
+     * @param content Content to treat.
+     * @return Treated content.
      */
     protected replaceEditLinks(content: string): string {
         content = content.trim();
@@ -693,9 +693,9 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Sets the selected subwiki for the subwiki picker.
      *
-     * @param {number} subwikiId Subwiki ID to select.
-     * @param {number} userId User ID of the subwiki to select.
-     * @param {number} groupId Group ID of the subwiki to select.
+     * @param subwikiId Subwiki ID to select.
+     * @param userId User ID of the subwiki to select.
+     * @param groupId Group ID of the subwiki to select.
      */
     protected setSelectedWiki(subwikiId: number, userId: number, groupId: number): void {
         this.subwikiData.subwikiSelected = this.wikiOffline.convertToPositiveNumber(subwikiId);
@@ -706,8 +706,8 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Checks if sync has succeed from result sync data.
      *
-     * @param  {any}     result Data returned on the sync function.
-     * @return {boolean}        If suceed or not.
+     * @param result Data returned on the sync function.
+     * @return If suceed or not.
      */
     protected hasSyncSucceed(result: any): boolean {
         result.wikiId = this.wiki.id;
@@ -755,7 +755,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         const promises = [];
@@ -783,8 +783,8 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Compares sync event data with current data to check if refresh content is needed.
      *
-     * @param {any} syncEventData Data receiven on sync observer.
-     * @return {boolean} True if refresh is needed, false otherwise.
+     * @param syncEventData Data receiven on sync observer.
+     * @return True if refresh is needed, false otherwise.
      */
     protected isRefreshSyncNeeded(syncEventData: any): boolean {
         if (this.currentSubwiki && syncEventData.subwikiId == this.currentSubwiki.id &&
@@ -806,7 +806,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Show the TOC.
      *
-     * @param {MouseEvent} event Event.
+     * @param event Event.
      */
     showSubwikiPicker(event: MouseEvent): void {
         const popover = this.popoverCtrl.create(AddonModWikiSubwikiPickerComponent, {
@@ -828,7 +828,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Performs the sync of the activity.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected sync(): Promise<any> {
         return this.wikiSync.syncWiki(this.wiki.id, this.courseId, this.wiki.coursemodule);
@@ -847,8 +847,8 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Create the subwiki list for the selector and store it in the cache.
      *
-     * @param {any[]} userGroups Groups.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param userGroups Groups.
+     * @return Promise resolved when done.
      */
     protected createSubwikiList(userGroups: any[]): Promise<any> {
         const subwikiList = [],
@@ -938,9 +938,9 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Fill the subwiki data.
      *
-     * @param {any[]} subwikiList List of subwikis.
-     * @param {boolean} showMyGroupsLabel Whether subwikis should be grouped in "My groups" and "Other groups".
-     * @param {boolean} multiLevelList Whether it's a multi level list.
+     * @param subwikiList List of subwikis.
+     * @param showMyGroupsLabel Whether subwikis should be grouped in "My groups" and "Other groups".
+     * @param multiLevelList Whether it's a multi level list.
      */
     protected fillSubwikiData(subwikiList: any[], showMyGroupsLabel: boolean, multiLevelList: boolean): void {
         let groupValue = -1,
diff --git a/src/addon/mod/wiki/components/subwiki-picker/subwiki-picker.ts b/src/addon/mod/wiki/components/subwiki-picker/subwiki-picker.ts
index 56a149bd6..858125544 100644
--- a/src/addon/mod/wiki/components/subwiki-picker/subwiki-picker.ts
+++ b/src/addon/mod/wiki/components/subwiki-picker/subwiki-picker.ts
@@ -34,8 +34,8 @@ export class AddonModWikiSubwikiPickerComponent {
     /**
      * Checks if the given subwiki is the one currently selected.
      *
-     * @param {any} subwiki Subwiki to check.
-     * @return {boolean} Whether it's the selected subwiki.
+     * @param subwiki Subwiki to check.
+     * @return Whether it's the selected subwiki.
      */
     protected isSubwikiSelected(subwiki: any): boolean {
         const subwikiId = parseInt(subwiki.id, 10) || 0;
@@ -53,7 +53,7 @@ export class AddonModWikiSubwikiPickerComponent {
     /**
      * Function called when a subwiki is clicked.
      *
-     * @param {any} subwiki The subwiki to open.
+     * @param subwiki The subwiki to open.
      */
     openSubwiki(subwiki: any): void {
         // Check if the subwiki is disabled.
diff --git a/src/addon/mod/wiki/pages/edit/edit.ts b/src/addon/mod/wiki/pages/edit/edit.ts
index 3d56004ff..9bcc6817b 100644
--- a/src/addon/mod/wiki/pages/edit/edit.ts
+++ b/src/addon/mod/wiki/pages/edit/edit.ts
@@ -125,7 +125,7 @@ export class AddonModWikiEditPage implements OnInit, OnDestroy {
     /**
      * Convenience function to get wiki page data.
      *
-     * @return {Promise<boolean>} Promise resolved with boolean: whether it was successful.
+     * @return Promise resolved with boolean: whether it was successful.
      */
     protected fetchWikiPageData(): Promise<boolean> {
         let promise,
@@ -247,7 +247,7 @@ export class AddonModWikiEditPage implements OnInit, OnDestroy {
     /**
      * Navigate to a new offline page.
      *
-     * @param {string} title Page title.
+     * @param title Page title.
      */
     protected goToNewOfflinePage(title: string): void {
         if (this.courseId && (this.module.id || this.wikiId)) {
@@ -274,8 +274,8 @@ export class AddonModWikiEditPage implements OnInit, OnDestroy {
     /**
      * Check if we need to navigate to a new state.
      *
-     * @param {string} title Page title.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param title Page title.
+     * @return Promise resolved when done.
      */
     protected gotoPage(title: string): Promise<any> {
         return this.retrieveModuleInfo(this.wikiId).then(() => {
@@ -316,7 +316,7 @@ export class AddonModWikiEditPage implements OnInit, OnDestroy {
     /**
      * Check if data has changed.
      *
-     * @return {boolean} Whether data has changed.
+     * @return Whether data has changed.
      */
     protected hasDataChanged(): boolean {
         const values = this.pageForm.value;
@@ -327,7 +327,7 @@ export class AddonModWikiEditPage implements OnInit, OnDestroy {
     /**
      * Check if we can leave the page or not.
      *
-     * @return {boolean|Promise<void>} Resolved if we can leave it, rejected if not.
+     * @return Resolved if we can leave it, rejected if not.
      */
     ionViewCanLeave(): boolean | Promise<void> {
         if (this.forceLeave) {
@@ -355,7 +355,7 @@ export class AddonModWikiEditPage implements OnInit, OnDestroy {
     /**
      * In case we are NOT editing an offline page, check if the page loaded in previous view is different than this view.
      *
-     * @return {boolean} Whether previous view wiki page is different than current page.
+     * @return Whether previous view wiki page is different than current page.
      */
     protected previousViewIsDifferentPageOnline(): boolean {
         // We cannot precisely detect when the state is the same but this is close to it.
@@ -368,8 +368,8 @@ export class AddonModWikiEditPage implements OnInit, OnDestroy {
     /**
      * In case we're editing an offline page, check if the page loaded in previous view is different than this view.
      *
-     * @param {string} title The current page title.
-     * @return {boolean} Whether previous view wiki page is different than current page.
+     * @param title The current page title.
+     * @return Whether previous view wiki page is different than current page.
      */
     protected previousViewPageIsDifferentOffline(title: string): boolean {
         // We cannot precisely detect when the state is the same but this is close to it.
@@ -501,8 +501,8 @@ export class AddonModWikiEditPage implements OnInit, OnDestroy {
     /**
      * Fetch module information to redirect when needed.
      *
-     * @param {number} wikiId Wiki ID.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param wikiId Wiki ID.
+     * @return Promise resolved when done.
      */
     protected retrieveModuleInfo(wikiId: number): Promise<any> {
         if (this.module.id && this.courseId) {
diff --git a/src/addon/mod/wiki/pages/index/index.ts b/src/addon/mod/wiki/pages/index/index.ts
index 8acca3028..b3cef20a7 100644
--- a/src/addon/mod/wiki/pages/index/index.ts
+++ b/src/addon/mod/wiki/pages/index/index.ts
@@ -55,7 +55,7 @@ export class AddonModWikiIndexPage {
     /**
      * Update some data based on the data received.
      *
-     * @param {any} data The data received.
+     * @param data The data received.
      */
     updateData(data: any): void {
         if (typeof data == 'string') {
diff --git a/src/addon/mod/wiki/providers/create-link-handler.ts b/src/addon/mod/wiki/providers/create-link-handler.ts
index 7eb5287ab..048d41822 100644
--- a/src/addon/mod/wiki/providers/create-link-handler.ts
+++ b/src/addon/mod/wiki/providers/create-link-handler.ts
@@ -40,10 +40,10 @@ export class AddonModWikiCreateLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Check if the current view is a wiki page of the same wiki.
      *
-     * @param {ViewController} activeView Active view.
-     * @param {number} subwikiId Subwiki ID to check.
-     * @param {string} siteId Site ID.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether current view belongs to the same wiki.
+     * @param activeView Active view.
+     * @param subwikiId Subwiki ID to check.
+     * @param siteId Site ID.
+     * @return Promise resolved with boolean: whether current view belongs to the same wiki.
      */
     protected currentStateIsSameWiki(activeView: ViewController, subwikiId: number, siteId: string): Promise<boolean> {
 
@@ -86,11 +86,11 @@ export class AddonModWikiCreateLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
diff --git a/src/addon/mod/wiki/providers/edit-link-handler.ts b/src/addon/mod/wiki/providers/edit-link-handler.ts
index 512c8c65f..4373bc024 100644
--- a/src/addon/mod/wiki/providers/edit-link-handler.ts
+++ b/src/addon/mod/wiki/providers/edit-link-handler.ts
@@ -34,11 +34,11 @@ export class AddonModWikiEditLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
diff --git a/src/addon/mod/wiki/providers/module-handler.ts b/src/addon/mod/wiki/providers/module-handler.ts
index 20a94af39..1963d5def 100644
--- a/src/addon/mod/wiki/providers/module-handler.ts
+++ b/src/addon/mod/wiki/providers/module-handler.ts
@@ -45,7 +45,7 @@ export class AddonModWikiModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean {
         return true;
@@ -54,10 +54,10 @@ export class AddonModWikiModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         return {
@@ -79,9 +79,9 @@ export class AddonModWikiModuleHandler implements CoreCourseModuleHandler {
      * Get the component to render the module. This is needed to support singleactivity course format.
      * The component returned must implement CoreCourseModuleMainComponent.
      *
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any} The component to use, undefined if not found.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component to use, undefined if not found.
      */
     getMainComponent(course: any, module: any): any {
         return AddonModWikiIndexComponent;
diff --git a/src/addon/mod/wiki/providers/page-or-map-link-handler.ts b/src/addon/mod/wiki/providers/page-or-map-link-handler.ts
index 8a5bf9e23..bcbe26978 100644
--- a/src/addon/mod/wiki/providers/page-or-map-link-handler.ts
+++ b/src/addon/mod/wiki/providers/page-or-map-link-handler.ts
@@ -37,11 +37,11 @@ export class AddonModWikiPageOrMapLinkHandler extends CoreContentLinksHandlerBas
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -89,11 +89,11 @@ export class AddonModWikiPageOrMapLinkHandler extends CoreContentLinksHandlerBas
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         const isMap = url.indexOf('mod/wiki/map.php') != -1;
diff --git a/src/addon/mod/wiki/providers/prefetch-handler.ts b/src/addon/mod/wiki/providers/prefetch-handler.ts
index 5acebea4c..0097af2f6 100644
--- a/src/addon/mod/wiki/providers/prefetch-handler.ts
+++ b/src/addon/mod/wiki/providers/prefetch-handler.ts
@@ -52,12 +52,12 @@ export class AddonModWikiPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Returns a list of pages that can be downloaded.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId The course ID.
-     * @param {boolean} [offline] Whether it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} List of pages.
+     * @param module The module object returned by WS.
+     * @param courseId The course ID.
+     * @param offline Whether it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return List of pages.
      */
     protected getAllPages(module: any, courseId: number, offline?: boolean, ignoreCache?: boolean, siteId?: string)
             : Promise<any[]> {
@@ -75,11 +75,11 @@ export class AddonModWikiPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Get the download size of a module.
      *
-     * @param {any} module Module.
-     * @param {Number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @return {Promise<{size: number, total: boolean}>} Promise resolved with the size and a boolean indicating if it was able
-     *                                                   to calculate the total size.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @return Promise resolved with the size and a boolean indicating if it was able
+     *         to calculate the total size.
      */
     getDownloadSize(module: any, courseId: number, single?: boolean): Promise<{ size: number, total: boolean }> {
         const promises = [],
@@ -112,11 +112,11 @@ export class AddonModWikiPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Get list of files. If not defined, we'll assume they're in module.contents.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the list of files.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of files.
      */
     getFiles(module: any, courseId: number, single?: boolean, siteId?: string): Promise<any[]> {
 
@@ -137,9 +137,9 @@ export class AddonModWikiPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId The course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId The course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         return this.wikiProvider.invalidateContent(moduleId, courseId);
@@ -148,11 +148,11 @@ export class AddonModWikiPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Prefetch a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
      */
     prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string): Promise<any> {
         // Get the download time of the package before starting the download (otherwise we'd always get current time).
@@ -170,12 +170,12 @@ export class AddonModWikiPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Prefetch a wiki.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} single True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} siteId Site ID.
-     * @param {number} downloadTime The previous download time, 0 if no previous download.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param siteId Site ID.
+     * @param downloadTime The previous download time, 0 if no previous download.
+     * @return Promise resolved when done.
      */
     protected prefetchWiki(module: any, courseId: number, single: boolean, siteId: string, downloadTime: number): Promise<any> {
         const userId = this.sitesProvider.getCurrentSiteUserId();
@@ -211,10 +211,10 @@ export class AddonModWikiPrefetchHandler extends CoreCourseActivityPrefetchHandl
     /**
      * Sync a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     sync(module: any, courseId: number, siteId?: any): Promise<any> {
         return this.syncProvider.syncWiki(module.instance, module.course, module.id, siteId);
diff --git a/src/addon/mod/wiki/providers/sync-cron-handler.ts b/src/addon/mod/wiki/providers/sync-cron-handler.ts
index c74a439fe..5d31464c8 100644
--- a/src/addon/mod/wiki/providers/sync-cron-handler.ts
+++ b/src/addon/mod/wiki/providers/sync-cron-handler.ts
@@ -29,9 +29,9 @@ export class AddonModWikiSyncCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         return this.wikiSync.syncAllWikis(siteId, force);
@@ -40,7 +40,7 @@ export class AddonModWikiSyncCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return this.wikiSync.syncInterval;
diff --git a/src/addon/mod/wiki/providers/tag-area-handler.ts b/src/addon/mod/wiki/providers/tag-area-handler.ts
index 0f3cab521..2d06b73b2 100644
--- a/src/addon/mod/wiki/providers/tag-area-handler.ts
+++ b/src/addon/mod/wiki/providers/tag-area-handler.ts
@@ -29,7 +29,7 @@ export class AddonModWikiTagAreaHandler implements CoreTagAreaHandler {
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -38,8 +38,8 @@ export class AddonModWikiTagAreaHandler implements CoreTagAreaHandler {
     /**
      * Parses the rendered content of a tag index and returns the items.
      *
-     * @param {string} content Rendered content.
-     * @return {any[]|Promise<any[]>} Area items (or promise resolved with the items).
+     * @param content Rendered content.
+     * @return Area items (or promise resolved with the items).
      */
     parseContent(content: string): any[] | Promise<any[]> {
         return this.tagHelper.parseFeedContent(content);
@@ -48,8 +48,8 @@ export class AddonModWikiTagAreaHandler implements CoreTagAreaHandler {
     /**
      * Get the component to use to display items.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return CoreTagFeedComponent;
diff --git a/src/addon/mod/wiki/providers/wiki-offline.ts b/src/addon/mod/wiki/providers/wiki-offline.ts
index 003fa3b7a..0c11d14d1 100644
--- a/src/addon/mod/wiki/providers/wiki-offline.ts
+++ b/src/addon/mod/wiki/providers/wiki-offline.ts
@@ -91,8 +91,8 @@ export class AddonModWikiOfflineProvider {
     /**
      * Convert a value to a positive number. If not a number or less than 0, 0 will be returned.
      *
-     * @param {any} value Value to convert.
-     * @return {number} Converted value.
+     * @param value Value to convert.
+     * @return Converted value.
      */
     convertToPositiveNumber(value: any): number {
         value = parseInt(value, 10);
@@ -103,13 +103,13 @@ export class AddonModWikiOfflineProvider {
     /**
      * Delete a new page.
      *
-     * @param {string} title Title of the page.
-     * @param {number} [subwikiId] Subwiki ID. If not defined, wikiId, userId and groupId should be defined.
-     * @param {number} [wikiId] Wiki ID. Optional, will be used create subwiki if not informed.
-     * @param {number} [userId] User ID. Optional, will be used create subwiki if not informed.
-     * @param {number} [groupId] Group ID. Optional, will be used create subwiki if not informed.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if deleted, rejected if failure.
+     * @param title Title of the page.
+     * @param subwikiId Subwiki ID. If not defined, wikiId, userId and groupId should be defined.
+     * @param wikiId Wiki ID. Optional, will be used create subwiki if not informed.
+     * @param userId User ID. Optional, will be used create subwiki if not informed.
+     * @param groupId Group ID. Optional, will be used create subwiki if not informed.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if deleted, rejected if failure.
      */
     deleteNewPage(title: string, subwikiId?: number, wikiId?: number, userId?: number, groupId?: number, siteId?: string)
             : Promise<any> {
@@ -134,8 +134,8 @@ export class AddonModWikiOfflineProvider {
     /**
      * Get all the stored new pages from all the wikis.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with pages.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with pages.
      */
     getAllNewPages(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -146,13 +146,13 @@ export class AddonModWikiOfflineProvider {
     /**
      * Get a stored new page.
      *
-     * @param {string} title Title of the page.
-     * @param {number} [subwikiId] Subwiki ID. If not defined, wikiId, userId and groupId should be defined.
-     * @param {number} [wikiId] Wiki ID. Optional, will be used create subwiki if not informed.
-     * @param {number} [userId] User ID. Optional, will be used create subwiki if not informed.
-     * @param {number} [groupId] Group ID. Optional, will be used create subwiki if not informed.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with page.
+     * @param title Title of the page.
+     * @param subwikiId Subwiki ID. If not defined, wikiId, userId and groupId should be defined.
+     * @param wikiId Wiki ID. Optional, will be used create subwiki if not informed.
+     * @param userId User ID. Optional, will be used create subwiki if not informed.
+     * @param groupId Group ID. Optional, will be used create subwiki if not informed.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with page.
      */
     getNewPage(title: string, subwikiId?: number, wikiId?: number, userId?: number, groupId?: number, siteId?: string)
             : Promise<any> {
@@ -177,12 +177,12 @@ export class AddonModWikiOfflineProvider {
     /**
      * Get all the stored new pages from a certain subwiki.
      *
-     * @param {number} [subwikiId] Subwiki ID. If not defined, wikiId, userId and groupId should be defined.
-     * @param {number} [wikiId] Wiki ID. Optional, will be used create subwiki if not informed.
-     * @param {number} [userId] User ID. Optional, will be used create subwiki if not informed.
-     * @param {number} [groupId] Group ID. Optional, will be used create subwiki if not informed.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with pages.
+     * @param subwikiId Subwiki ID. If not defined, wikiId, userId and groupId should be defined.
+     * @param wikiId Wiki ID. Optional, will be used create subwiki if not informed.
+     * @param userId User ID. Optional, will be used create subwiki if not informed.
+     * @param groupId Group ID. Optional, will be used create subwiki if not informed.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with pages.
      */
     getSubwikiNewPages(subwikiId?: number, wikiId?: number, userId?: number, groupId?: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -204,9 +204,9 @@ export class AddonModWikiOfflineProvider {
     /**
      * Get all the stored new pages from a list of subwikis.
      *
-     * @param {any[]} subwikis List of subwiki.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with pages.
+     * @param subwikis List of subwiki.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with pages.
      */
     getSubwikisNewPages(subwikis: any[], siteId?: string): Promise<any[]> {
         const promises = [];
@@ -227,14 +227,14 @@ export class AddonModWikiOfflineProvider {
     /**
      * Save a new page to be sent later.
      *
-     * @param {string} title Title of the page.
-     * @param {string} content Content of the page.
-     * @param {number} [subwikiId] Subwiki ID. If not defined, wikiId, userId and groupId should be defined.
-     * @param {number} [wikiId] Wiki ID. Optional, will be used create subwiki if not informed.
-     * @param {number} [userId] User ID. Optional, will be used create subwiki if not informed.
-     * @param {number} [groupId] Group ID. Optional, will be used create subwiki if not informed.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if stored, rejected if failure.
+     * @param title Title of the page.
+     * @param content Content of the page.
+     * @param subwikiId Subwiki ID. If not defined, wikiId, userId and groupId should be defined.
+     * @param wikiId Wiki ID. Optional, will be used create subwiki if not informed.
+     * @param userId User ID. Optional, will be used create subwiki if not informed.
+     * @param groupId Group ID. Optional, will be used create subwiki if not informed.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     saveNewPage(title: string, content: string, subwikiId?: number, wikiId?: number, userId?: number, groupId?: number,
             siteId?: string): Promise<any> {
@@ -261,9 +261,9 @@ export class AddonModWikiOfflineProvider {
     /**
      * Check if a list of subwikis have offline data stored.
      *
-     * @param {any[]} subwikis List of subwikis.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return{Promise<boolean>} Promise resolved with boolean: whether it has offline data.
+     * @param subwikis List of subwikis.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether it has offline data.
      */
     subwikisHaveOfflineData(subwikis: any[], siteId?: string): Promise<boolean> {
         return this.getSubwikisNewPages(subwikis, siteId).then((pages) => {
diff --git a/src/addon/mod/wiki/providers/wiki-sync.ts b/src/addon/mod/wiki/providers/wiki-sync.ts
index 9fa0200c9..4bd73581a 100644
--- a/src/addon/mod/wiki/providers/wiki-sync.ts
+++ b/src/addon/mod/wiki/providers/wiki-sync.ts
@@ -35,25 +35,21 @@ import { AddonModWikiOfflineProvider } from './wiki-offline';
 export interface AddonModWikiSyncSubwikiResult {
     /**
      * List of warnings.
-     * @type {string[]}
      */
     warnings: string[];
 
     /**
      * Whether data was updated in the site.
-     * @type {boolean}
      */
     updated: boolean;
 
     /**
      * List of created pages.
-     * @type {{pageId: number, title: string}}
      */
     created: {pageId: number, title: string}[];
 
     /**
      * List of discarded pages.
-     * @type {{title: string, warning: string}}
      */
     discarded: {title: string, warning: string}[];
 }
@@ -64,19 +60,16 @@ export interface AddonModWikiSyncSubwikiResult {
 export interface AddonModWikiSyncWikiResult {
     /**
      * List of warnings.
-     * @type {string[]}
      */
     warnings: string[];
 
     /**
      * Whether data was updated in the site.
-     * @type {boolean}
      */
     updated: boolean;
 
     /**
      * List of subwikis.
-     * @type {{[subwikiId: number]: {created: {pageId: number, title: string}, discarded: {title: string, warning: string}}}}
      */
     subwikis: {[subwikiId: number]: {
         created: {pageId: number, title: string}[],
@@ -85,7 +78,6 @@ export interface AddonModWikiSyncWikiResult {
 
     /**
      * Site ID.
-     * @type {string}
      */
     siteId: string;
 }
@@ -117,11 +109,11 @@ export class AddonModWikiSyncProvider extends CoreSyncBaseProvider {
     /**
      * Get a string to identify a subwiki. If it doesn't have a subwiki ID it will be identified by wiki ID, user ID and group ID.
      *
-     * @param {number} subwikiId Subwiki ID. If not defined, wikiId, userId and groupId should be defined.
-     * @param {number} [wikiId] Wiki ID. Optional, will be used to create the subwiki if subwiki ID not provided.
-     * @param {number} [userId] User ID. Optional, will be used to create the subwiki if subwiki ID not provided.
-     * @param {number} [groupId] Group ID. Optional, will be used to create the subwiki if subwiki ID not provided.
-     * @return {string} Identifier.
+     * @param subwikiId Subwiki ID. If not defined, wikiId, userId and groupId should be defined.
+     * @param wikiId Wiki ID. Optional, will be used to create the subwiki if subwiki ID not provided.
+     * @param userId User ID. Optional, will be used to create the subwiki if subwiki ID not provided.
+     * @param groupId Group ID. Optional, will be used to create the subwiki if subwiki ID not provided.
+     * @return Identifier.
      */
     getSubwikiBlockId(subwikiId: number, wikiId?: number, userId?: number, groupId?: number): string {
         subwikiId = this.wikiOfflineProvider.convertToPositiveNumber(subwikiId);
@@ -142,9 +134,9 @@ export class AddonModWikiSyncProvider extends CoreSyncBaseProvider {
     /**
      * Try to synchronize all the wikis in a certain site or in all sites.
      *
-     * @param {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     syncAllWikis(siteId?: string, force?: boolean): Promise<any> {
         return this.syncOnSites('all wikis', this.syncAllWikisFunc.bind(this), [force], siteId);
@@ -153,9 +145,9 @@ export class AddonModWikiSyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync all wikis on a site.
      *
-     * @param  {string} siteId Site ID to sync.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @param {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync.
+     * @param force Wether to force sync not depending on last execution.
+     * @param Promise resolved if sync is successful, rejected if sync fails.
      */
     protected syncAllWikisFunc(siteId: string, force?: boolean): Promise<any> {
         // Get all the pages created in offline.
@@ -201,12 +193,12 @@ export class AddonModWikiSyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync a subwiki only if a certain time has passed since the last time.
      *
-     * @param {number} subwikiId Subwiki ID. If not defined, wikiId, userId and groupId should be defined.
-     * @param {number} [wikiId] Wiki ID. Optional, will be used to create the subwiki if subwiki ID not provided.
-     * @param {number} [userId] User ID. Optional, will be used to create the subwiki if subwiki ID not provided.
-     * @param {number} [groupId] Group ID. Optional, will be used to create the subwiki if subwiki ID not provided.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<void|AddonModWikiSyncSubwikiResult>} Promise resolved when subwiki is synced or doesn't need to be synced.
+     * @param subwikiId Subwiki ID. If not defined, wikiId, userId and groupId should be defined.
+     * @param wikiId Wiki ID. Optional, will be used to create the subwiki if subwiki ID not provided.
+     * @param userId User ID. Optional, will be used to create the subwiki if subwiki ID not provided.
+     * @param groupId Group ID. Optional, will be used to create the subwiki if subwiki ID not provided.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when subwiki is synced or doesn't need to be synced.
      */
     syncSubwikiIfNeeded(subwikiId: number, wikiId?: number, userId?: number, groupId?: number, siteId?: string)
             : Promise<void | AddonModWikiSyncSubwikiResult> {
@@ -223,12 +215,12 @@ export class AddonModWikiSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize a subwiki.
      *
-     * @param {number} subwikiId Subwiki ID. If not defined, wikiId, userId and groupId should be defined.
-     * @param {number} [wikiId] Wiki ID. Optional, will be used to create the subwiki if subwiki ID not provided.
-     * @param {number} [userId] User ID. Optional, will be used to create the subwiki if subwiki ID not provided.
-     * @param {number} [groupId] Group ID. Optional, will be used to create the subwiki if subwiki ID not provided.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<AddonModWikiSyncSubwikiResult>} Promise resolved if sync is successful, rejected otherwise.
+     * @param subwikiId Subwiki ID. If not defined, wikiId, userId and groupId should be defined.
+     * @param wikiId Wiki ID. Optional, will be used to create the subwiki if subwiki ID not provided.
+     * @param userId User ID. Optional, will be used to create the subwiki if subwiki ID not provided.
+     * @param groupId Group ID. Optional, will be used to create the subwiki if subwiki ID not provided.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     syncSubwiki(subwikiId: number, wikiId?: number, userId?: number, groupId?: number, siteId?: string)
             : Promise<AddonModWikiSyncSubwikiResult> {
@@ -333,11 +325,11 @@ export class AddonModWikiSyncProvider extends CoreSyncBaseProvider {
     /**
      * Tries to synchronize a wiki.
      *
-     * @param {number} wikiId Wiki ID.
-     * @param {number} [courseId] Course ID.
-     * @param {number} [cmId] Wiki course module ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<AddonModWikiSyncWikiResult>} Promise resolved if sync is successful, rejected otherwise.
+     * @param wikiId Wiki ID.
+     * @param courseId Course ID.
+     * @param cmId Wiki course module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     syncWiki(wikiId: number, courseId?: number, cmId?: number, siteId?: string): Promise<AddonModWikiSyncWikiResult> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
diff --git a/src/addon/mod/wiki/providers/wiki.ts b/src/addon/mod/wiki/providers/wiki.ts
index 4523f541b..f4fa688e2 100644
--- a/src/addon/mod/wiki/providers/wiki.ts
+++ b/src/addon/mod/wiki/providers/wiki.ts
@@ -27,31 +27,26 @@ import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 export interface AddonModWikiSubwikiListData {
     /**
      * Number of subwikis.
-     * @type {number}
      */
     count: number;
 
     /**
      * Subwiki ID currently selected.
-     * @type {number}
      */
     subwikiSelected: number;
 
     /**
      * User of the subwiki currently selected.
-     * @type {number}
      */
     userSelected: number;
 
     /**
      * Group of the subwiki currently selected.
-     * @type {number}
      */
     groupSelected: number;
 
     /**
      * List of subwikis.
-     * @type {any[]}
      */
     subwikis: any[];
 }
@@ -84,7 +79,7 @@ export class AddonModWikiProvider {
     /**
      * Clear subwiki list cache for a certain wiki or all of them.
      *
-     * @param {number} [wikiId] wiki Id, if not provided all will be cleared.
+     * @param wikiId wiki Id, if not provided all will be cleared.
      */
     clearSubwikiList(wikiId?: number): void {
         if (typeof wikiId == 'undefined') {
@@ -97,10 +92,10 @@ export class AddonModWikiProvider {
     /**
      * Save wiki contents on a page or section.
      *
-     * @param {number} pageId Page ID.
-     * @param {string} content content to be saved.
-     * @param {string} [section] section to get.
-     * @return {Promise<number>} Promise resolved with the page ID.
+     * @param pageId Page ID.
+     * @param content content to be saved.
+     * @param section section to get.
+     * @return Promise resolved with the page ID.
      */
     editPage(pageId: number, content: string, section?: string, siteId?: string): Promise<number> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -122,11 +117,11 @@ export class AddonModWikiProvider {
     /**
      * Get a wiki page contents.
      *
-     * @param {number} pageId Page ID.
-     * @param {boolean} [offline] Whether it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the page data.
+     * @param pageId Page ID.
+     * @param offline Whether it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the page data.
      */
     getPageContents(pageId: number, offline?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -154,8 +149,8 @@ export class AddonModWikiProvider {
     /**
      * Get cache key for wiki Pages Contents WS calls.
      *
-     * @param {number} pageId Wiki Page ID.
-     * @return {string} Cache key.
+     * @param pageId Wiki Page ID.
+     * @return Cache key.
      */
     protected getPageContentsCacheKey(pageId: number): string {
         return this.ROOT_CACHE_KEY + 'page:' + pageId;
@@ -164,11 +159,11 @@ export class AddonModWikiProvider {
     /**
      * Get a wiki page contents for editing. It does not cache calls.
      *
-     * @param {number} pageId Page ID.
-     * @param {string} [section] Section to get.
-     * @param {boolean} [lockOnly] Just renew lock and not return content.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with page contents.
+     * @param pageId Page ID.
+     * @param section Section to get.
+     * @param lockOnly Just renew lock and not return content.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with page contents.
      */
     getPageForEditing(pageId: number, section?: string, lockOnly?: boolean, siteId?: string): Promise<any> {
 
@@ -195,13 +190,13 @@ export class AddonModWikiProvider {
     /**
      * Gets the list of files from a specific subwiki.
      *
-     * @param {number} wikiId Wiki ID.
-     * @param {number} [groupId] Group to get files from.
-     * @param {number} [userId] User to get files from.
-     * @param {boolean} [offline] Whether it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with subwiki files.
+     * @param wikiId Wiki ID.
+     * @param groupId Group to get files from.
+     * @param userId User to get files from.
+     * @param offline Whether it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with subwiki files.
      */
     getSubwikiFiles(wikiId: number, groupId?: number, userId?: number, offline?: boolean, ignoreCache?: boolean, siteId?: string)
             : Promise<any[]> {
@@ -236,10 +231,10 @@ export class AddonModWikiProvider {
     /**
      * Get cache key for wiki Subwiki Files WS calls.
      *
-     * @param {number} wikiId Wiki ID.
-     * @param {number} groupId Group ID.
-     * @param {number} userId User ID.
-     * @return {string} Cache key.
+     * @param wikiId Wiki ID.
+     * @param groupId Group ID.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getSubwikiFilesCacheKey(wikiId: number, groupId: number, userId: number): string {
         return this.getSubwikiFilesCacheKeyPrefix(wikiId) + ':' + groupId + ':' + userId;
@@ -248,8 +243,8 @@ export class AddonModWikiProvider {
     /**
      * Get cache key for all wiki Subwiki Files WS calls.
      *
-     * @param {number} wikiId Wiki ID.
-     * @return {string} Cache key.
+     * @param wikiId Wiki ID.
+     * @return Cache key.
      */
     protected getSubwikiFilesCacheKeyPrefix(wikiId: number): string {
         return this.ROOT_CACHE_KEY + 'subwikifiles:' + wikiId;
@@ -258,8 +253,8 @@ export class AddonModWikiProvider {
     /**
      * Get a list of subwikis and related data for a certain wiki from the cache.
      *
-     * @param {number} wikiId wiki Id
-     * @return {AddonModWikiSubwikiListData} Subwiki list and related data.
+     * @param wikiId wiki Id
+     * @return Subwiki list and related data.
      */
     getSubwikiList(wikiId: number): AddonModWikiSubwikiListData {
         return this.subwikiListsCache[wikiId];
@@ -268,16 +263,16 @@ export class AddonModWikiProvider {
     /**
      * Get the list of Pages of a SubWiki.
      *
-     * @param {number} wikiId Wiki ID.
-     * @param {number} [groupId] Group to get pages from.
-     * @param {number} [userId] User to get pages from.
-     * @param {string} [sortBy=title] The attribute to sort the returned list.
-     * @param {string} [sortDirection=ASC] Direction to sort the returned list (ASC | DESC).
-     * @param {boolean} [includeContent] Whether the pages have to include its content. Default: false.
-     * @param {boolean} [offline] Whether it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with wiki subwiki pages.
+     * @param wikiId Wiki ID.
+     * @param groupId Group to get pages from.
+     * @param userId User to get pages from.
+     * @param sortBy The attribute to sort the returned list.
+     * @param sortDirection Direction to sort the returned list (ASC | DESC).
+     * @param includeContent Whether the pages have to include its content. Default: false.
+     * @param offline Whether it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with wiki subwiki pages.
      */
     getSubwikiPages(wikiId: number, groupId?: number, userId?: number, sortBy: string = 'title', sortDirection: string = 'ASC',
             includeContent?: boolean, offline?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any[]> {
@@ -321,10 +316,10 @@ export class AddonModWikiProvider {
     /**
      * Get cache key for wiki Subwiki Pages WS calls.
      *
-     * @param {number} wikiId Wiki ID.
-     * @param {number} groupId Group ID.
-     * @param {number} userId User ID.
-     * @return {string} Cache key.
+     * @param wikiId Wiki ID.
+     * @param groupId Group ID.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getSubwikiPagesCacheKey(wikiId: number, groupId: number, userId: number): string {
         return this.getSubwikiPagesCacheKeyPrefix(wikiId) + ':' + groupId + ':' + userId;
@@ -333,8 +328,8 @@ export class AddonModWikiProvider {
     /**
      * Get cache key for all wiki Subwiki Pages WS calls.
      *
-     * @param {number} wikiId Wiki ID.
-     * @return {string} Cache key.
+     * @param wikiId Wiki ID.
+     * @return Cache key.
      */
     protected getSubwikiPagesCacheKeyPrefix(wikiId: number): string {
         return this.ROOT_CACHE_KEY + 'subwikipages:' + wikiId;
@@ -343,11 +338,11 @@ export class AddonModWikiProvider {
     /**
      * Get all the subwikis of a wiki.
      *
-     * @param {number} wikiId Wiki ID.
-     * @param {boolean} [offline] Whether it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with subwikis.
+     * @param wikiId Wiki ID.
+     * @param offline Whether it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with subwikis.
      */
     getSubwikis(wikiId: number, offline?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -375,8 +370,8 @@ export class AddonModWikiProvider {
     /**
      * Get cache key for get wiki subWikis WS calls.
      *
-     * @param {number} wikiId Wiki ID.
-     * @return {string} Cache key.
+     * @param wikiId Wiki ID.
+     * @return Cache key.
      */
     protected getSubwikisCacheKey(wikiId: number): string {
         return this.ROOT_CACHE_KEY + 'subwikis:' + wikiId;
@@ -385,11 +380,11 @@ export class AddonModWikiProvider {
     /**
      * Get a wiki by module ID.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} cmId Course module ID.
-     * @param {boolean} [forceCache] Whether it should always return cached data.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the wiki is retrieved.
+     * @param courseId Course ID.
+     * @param cmId Course module ID.
+     * @param forceCache Whether it should always return cached data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the wiki is retrieved.
      */
     getWiki(courseId: number, cmId: number, forceCache?: boolean, siteId?: string): Promise<any> {
         return this.getWikiByField(courseId, 'coursemodule', cmId, forceCache, siteId);
@@ -398,12 +393,12 @@ export class AddonModWikiProvider {
     /**
      * Get a wiki with key=value. If more than one is found, only the first will be returned.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} key Name of the property to check.
-     * @param {any} value Value to search.
-     * @param {boolean} [forceCache] Whether it should always return cached data.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the wiki is retrieved.
+     * @param courseId Course ID.
+     * @param key Name of the property to check.
+     * @param value Value to search.
+     * @param forceCache Whether it should always return cached data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the wiki is retrieved.
      */
     protected getWikiByField(courseId: number, key: string, value: any, forceCache?: boolean, siteId?: string): Promise<any> {
 
@@ -435,11 +430,11 @@ export class AddonModWikiProvider {
     /**
      * Get a wiki by wiki ID.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} id Wiki ID.
-     * @param {boolean} [forceCache] Whether it should always return cached data.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the wiki is retrieved.
+     * @param courseId Course ID.
+     * @param id Wiki ID.
+     * @param forceCache Whether it should always return cached data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the wiki is retrieved.
      */
     getWikiById(courseId: number, id: number, forceCache?: boolean, siteId?: string): Promise<any> {
         return this.getWikiByField(courseId, 'id', id, forceCache, siteId);
@@ -448,8 +443,8 @@ export class AddonModWikiProvider {
     /**
      * Get cache key for wiki data WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getWikiDataCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'wiki:' + courseId;
@@ -458,11 +453,11 @@ export class AddonModWikiProvider {
     /**
      * Gets a list of files to download for a wiki, using a format similar to module.contents from get_course_contents.
      *
-     * @param {any} wiki Wiki.
-     * @param {boolean} [offline] Whether it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the list of files.
+     * @param wiki Wiki.
+     * @param offline Whether it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of files.
      */
     getWikiFileList(wiki: any, offline?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any[]> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -488,11 +483,11 @@ export class AddonModWikiProvider {
     /**
      * Gets a list of all pages for a Wiki.
      *
-     * @param {any} wiki Wiki.
-     * @param {boolean} [offline] Whether it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Page list.
+     * @param wiki Wiki.
+     * @param offline Whether it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Page list.
      */
     getWikiPageList(wiki: any, offline?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any[]> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -519,10 +514,10 @@ export class AddonModWikiProvider {
      * Invalidate the prefetched content except files.
      * To invalidate files, use invalidateFiles.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param moduleId The module ID.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     invalidateContent(moduleId: number, courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -542,9 +537,9 @@ export class AddonModWikiProvider {
     /**
      * Invalidate the prefetched files.
      *
-     * @param {number} moduleId The module ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the files are invalidated.
+     * @param moduleId The module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the files are invalidated.
      */
     invalidateFiles(moduleId: number, siteId?: string): Promise<any> {
         return this.filepoolProvider.invalidateFilesByComponent(siteId, AddonModWikiProvider.COMPONENT, moduleId);
@@ -553,9 +548,9 @@ export class AddonModWikiProvider {
     /**
      * Invalidates page content WS call for a certain page.
      *
-     * @param {number} pageId Wiki Page ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param pageId Wiki Page ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidatePage(pageId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -566,9 +561,9 @@ export class AddonModWikiProvider {
     /**
      * Invalidates all the subwiki files WS calls for a certain wiki.
      *
-     * @param {number} wikiId Wiki ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param wikiId Wiki ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateSubwikiFiles(wikiId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -579,9 +574,9 @@ export class AddonModWikiProvider {
     /**
      * Invalidates all the subwiki pages WS calls for a certain wiki.
      *
-     * @param {Number} wikiId Wiki ID.
-     * @param  {String} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param wikiId Wiki ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateSubwikiPages(wikiId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -592,9 +587,9 @@ export class AddonModWikiProvider {
     /**
      * Invalidates all the get subwikis WS calls for a certain wiki.
      *
-     * @param {number} wikiId Wiki ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param wikiId Wiki ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateSubwikis(wikiId: number, siteId?: string): Promise<any> {
         this.clearSubwikiList(wikiId);
@@ -607,9 +602,9 @@ export class AddonModWikiProvider {
     /**
      * Invalidates wiki data.
      *
-     * @param {Number} courseId Course ID.
-     * @param  {String} [siteId] Site ID. If not defined, current site.
-     * @return {Promise}        Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateWikiData(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -620,13 +615,13 @@ export class AddonModWikiProvider {
     /**
      * Check if a page title is already used.
      *
-     * @param {number} wikiId Wiki ID.
-     * @param {number} subwikiId Subwiki ID.
-     * @param {string} title Page title.
-     * @param {boolean} [offline] Whether it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if used, resolved with false if not used or cannot determine.
+     * @param wikiId Wiki ID.
+     * @param subwikiId Subwiki ID.
+     * @param title Page title.
+     * @param offline Whether it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if used, resolved with false if not used or cannot determine.
      */
     isTitleUsed(wikiId: number, subwikiId: number, title: string, offline?: boolean, ignoreCache?: boolean, siteId?: string)
             : Promise<boolean> {
@@ -658,11 +653,11 @@ export class AddonModWikiProvider {
     /**
      * Report a wiki page as being viewed.
      *
-     * @param {number} id Page ID.
-     * @param {number} wikiId Wiki ID.
-     * @param {string} [name] Name of the wiki.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the WS call is successful.
+     * @param id Page ID.
+     * @param wikiId Wiki ID.
+     * @param name Name of the wiki.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logPageView(id: number, wikiId: number, name?: string, siteId?: string): Promise<any> {
         const params = {
@@ -676,10 +671,10 @@ export class AddonModWikiProvider {
     /**
      * Report the wiki as being viewed.
      *
-     * @param {number} id Wiki ID.
-     * @param {string} [name] Name of the wiki.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the WS call is successful.
+     * @param id Wiki ID.
+     * @param name Name of the wiki.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(id: number, name?: string, siteId?: string): Promise<any> {
         const params = {
@@ -693,14 +688,14 @@ export class AddonModWikiProvider {
     /**
      * Create a new page on a subwiki.
      *
-     * @param {string} title Title to create the page.
-     * @param {string} content Content to save on the page.
-     * @param {number} [subwikiId] Subwiki ID. If not defined, wikiId, userId and groupId should be defined.
-     * @param {number} [wikiId] Wiki ID. Optional, will be used to create a new subwiki if subwikiId not supplied.
-     * @param {number} [userId] User ID. Optional, will be used to create a new subwiki if subwikiId not supplied.
-     * @param {number} [groupId] Group ID. Optional, will be used to create a new subwiki if subwikiId not supplied.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number>} Promise resolved with page ID if page was created in server, -1 if stored in device.
+     * @param title Title to create the page.
+     * @param content Content to save on the page.
+     * @param subwikiId Subwiki ID. If not defined, wikiId, userId and groupId should be defined.
+     * @param wikiId Wiki ID. Optional, will be used to create a new subwiki if subwikiId not supplied.
+     * @param userId User ID. Optional, will be used to create a new subwiki if subwikiId not supplied.
+     * @param groupId Group ID. Optional, will be used to create a new subwiki if subwikiId not supplied.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with page ID if page was created in server, -1 if stored in device.
      */
     newPage(title: string, content: string, subwikiId?: number, wikiId?: number, userId?: number, groupId?: number,
             siteId?: string): Promise<number> {
@@ -755,14 +750,14 @@ export class AddonModWikiProvider {
     /**
      * Create a new page on a subwiki. It will fail if offline or cannot connect.
      *
-     * @param {string} title Title to create the page.
-     * @param {string} content Content to save on the page.
-     * @param {number} [subwikiId] Subwiki ID. If not defined, wikiId, userId and groupId should be defined.
-     * @param {number} [wikiId] Wiki ID. Optional, will be used create subwiki if not informed.
-     * @param {number} [userId] User ID. Optional, will be used create subwiki if not informed.
-     * @param {number} [groupId] Group ID. Optional, will be used create subwiki if not informed.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number>} Promise resolved with the page ID if created, rejected otherwise.
+     * @param title Title to create the page.
+     * @param content Content to save on the page.
+     * @param subwikiId Subwiki ID. If not defined, wikiId, userId and groupId should be defined.
+     * @param wikiId Wiki ID. Optional, will be used create subwiki if not informed.
+     * @param userId User ID. Optional, will be used create subwiki if not informed.
+     * @param groupId Group ID. Optional, will be used create subwiki if not informed.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the page ID if created, rejected otherwise.
      */
     newPageOnline(title: string, content: string, subwikiId?: number, wikiId?: number, userId?: number, groupId?: number,
             siteId?: string): Promise<number> {
@@ -794,12 +789,12 @@ export class AddonModWikiProvider {
     /**
      * Save subwiki list for a wiki to the cache.
      *
-     * @param {number} wikiId Wiki Id.
-     * @param {any[]} subwikis List of subwikis.
-     * @param {number} count Number of subwikis in the subwikis list.
-     * @param {number} subwikiId Subwiki Id currently selected.
-     * @param {number} userId User Id currently selected.
-     * @param {number} groupId Group Id currently selected.
+     * @param wikiId Wiki Id.
+     * @param subwikis List of subwikis.
+     * @param count Number of subwikis in the subwikis list.
+     * @param subwikiId Subwiki Id currently selected.
+     * @param userId User Id currently selected.
+     * @param groupId Group Id currently selected.
      */
     setSubwikiList(wikiId: number, subwikis: any[], count: number, subwikiId: number, userId: number, groupId: number): void {
         this.subwikiListsCache[wikiId] = {
@@ -814,9 +809,9 @@ export class AddonModWikiProvider {
     /**
      * Sort an array of wiki pages by title.
      *
-     * @param {any[]} pages Pages to sort.
-     * @param {boolean} [desc] True to sort in descendent order, false to sort in ascendent order. Defaults to false.
-     * @return {any[]} Sorted pages.
+     * @param pages Pages to sort.
+     * @param desc True to sort in descendent order, false to sort in ascendent order. Defaults to false.
+     * @return Sorted pages.
      */
     sortPagesByTitle(pages: any[], desc?: boolean): any[] {
         return pages.sort((a, b) => {
@@ -833,12 +828,12 @@ export class AddonModWikiProvider {
     /**
      * Check if a wiki has a certain subwiki.
      *
-     * @param {number} wikiId Wiki ID.
-     * @param {number} subwikiId Subwiki ID to search.
-     * @param {boolean} [offline] Whether it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] Whether it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if it has subwiki, resolved with false otherwise.
+     * @param wikiId Wiki ID.
+     * @param subwikiId Subwiki ID to search.
+     * @param offline Whether it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache Whether it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if it has subwiki, resolved with false otherwise.
      */
     wikiHasSubwiki(wikiId: number, subwikiId: number, offline?: boolean, ignoreCache?: boolean, siteId?: string): Promise<boolean> {
         // Get the subwikis to check if any of them matches the one passed as param.
diff --git a/src/addon/mod/workshop/assessment/accumulative/providers/handler.ts b/src/addon/mod/workshop/assessment/accumulative/providers/handler.ts
index 40505af47..b5b9e0962 100644
--- a/src/addon/mod/workshop/assessment/accumulative/providers/handler.ts
+++ b/src/addon/mod/workshop/assessment/accumulative/providers/handler.ts
@@ -30,7 +30,7 @@ export class AddonModWorkshopAssessmentStrategyAccumulativeHandler implements Ad
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -40,8 +40,8 @@ export class AddonModWorkshopAssessmentStrategyAccumulativeHandler implements Ad
      * Return the Component to render the plugin.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return AddonModWorkshopAssessmentStrategyAccumulativeComponent;
@@ -50,9 +50,9 @@ export class AddonModWorkshopAssessmentStrategyAccumulativeHandler implements Ad
     /**
      * Prepare original values to be shown and compared.
      *
-     * @param  {any}    form       Original data of the form.
-     * @param  {number} workshopId WorkShop Id
-     * @return {Promise<any[]>}    Promise resolved with original values sorted.
+     * @param form Original data of the form.
+     * @param workshopId WorkShop Id
+     * @return Promise resolved with original values sorted.
      */
      getOriginalValues(form: any, workshopId: number): Promise<any[]> {
         const defaultGrade = this.translate.instant('core.choosedots'),
@@ -92,9 +92,9 @@ export class AddonModWorkshopAssessmentStrategyAccumulativeHandler implements Ad
     /**
      * Check if the assessment data has changed for a certain submission and workshop for a this strategy plugin.
      *
-     * @param  {any[]} originalValues Original values of the form.
-     * @param  {any[]} currentValues  Current values of the form.
-     * @return {boolean}              True if data has changed, false otherwise.
+     * @param originalValues Original values of the form.
+     * @param currentValues Current values of the form.
+     * @return True if data has changed, false otherwise.
      */
     hasDataChanged(originalValues: any[], currentValues: any[]): boolean {
         for (const x in originalValues) {
@@ -112,9 +112,9 @@ export class AddonModWorkshopAssessmentStrategyAccumulativeHandler implements Ad
     /**
      * Prepare assessment data to be sent to the server depending on the strategy selected.
      *
-     * @param  {any{}} currentValues Current values of the form.
-     * @param  {any}   form          Assessment form data.
-     * @return {Promise<any>}        Promise resolved with the data to be sent. Or rejected with the input errors object.
+     * @param currentValues Current values of the form.
+     * @param form Assessment form data.
+     * @return Promise resolved with the data to be sent. Or rejected with the input errors object.
      */
     prepareAssessmentData(currentValues: any[], form: any): Promise<any> {
         const data =  {};
diff --git a/src/addon/mod/workshop/assessment/comments/providers/handler.ts b/src/addon/mod/workshop/assessment/comments/providers/handler.ts
index 132e0f38b..83922cc0e 100644
--- a/src/addon/mod/workshop/assessment/comments/providers/handler.ts
+++ b/src/addon/mod/workshop/assessment/comments/providers/handler.ts
@@ -29,7 +29,7 @@ export class AddonModWorkshopAssessmentStrategyCommentsHandler implements AddonW
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -39,8 +39,8 @@ export class AddonModWorkshopAssessmentStrategyCommentsHandler implements AddonW
      * Return the Component to render the plugin.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return AddonModWorkshopAssessmentStrategyCommentsComponent;
@@ -49,9 +49,9 @@ export class AddonModWorkshopAssessmentStrategyCommentsHandler implements AddonW
     /**
      * Prepare original values to be shown and compared.
      *
-     * @param  {any}    form       Original data of the form.
-     * @param  {number} workshopId Workshop Id
-     * @return {Promise<any[]>}    Promise resolved with original values sorted.
+     * @param form Original data of the form.
+     * @param workshopId Workshop Id
+     * @return Promise resolved with original values sorted.
      */
      getOriginalValues(form: any, workshopId: number): Promise<any[]> {
         const originalValues = [];
@@ -75,9 +75,9 @@ export class AddonModWorkshopAssessmentStrategyCommentsHandler implements AddonW
     /**
      * Check if the assessment data has changed for a certain submission and workshop for a this strategy plugin.
      *
-     * @param  {any[]} originalValues Original values of the form.
-     * @param  {any[]} currentValues  Current values of the form.
-     * @return {boolean}              True if data has changed, false otherwise.
+     * @param originalValues Original values of the form.
+     * @param currentValues Current values of the form.
+     * @return True if data has changed, false otherwise.
      */
     hasDataChanged(originalValues: any[], currentValues: any[]): boolean {
         for (const x in originalValues) {
@@ -92,9 +92,9 @@ export class AddonModWorkshopAssessmentStrategyCommentsHandler implements AddonW
     /**
      * Prepare assessment data to be sent to the server depending on the strategy selected.
      *
-     * @param  {any{}} currentValues Current values of the form.
-     * @param  {any}   form          Assessment form data.
-     * @return {Promise<any>}        Promise resolved with the data to be sent. Or rejected with the input errors object.
+     * @param currentValues Current values of the form.
+     * @param form Assessment form data.
+     * @return Promise resolved with the data to be sent. Or rejected with the input errors object.
      */
     prepareAssessmentData(currentValues: any[], form: any): Promise<any> {
         const data = {};
diff --git a/src/addon/mod/workshop/assessment/numerrors/providers/handler.ts b/src/addon/mod/workshop/assessment/numerrors/providers/handler.ts
index 5e77dc7e0..94e361d83 100644
--- a/src/addon/mod/workshop/assessment/numerrors/providers/handler.ts
+++ b/src/addon/mod/workshop/assessment/numerrors/providers/handler.ts
@@ -29,7 +29,7 @@ export class AddonModWorkshopAssessmentStrategyNumErrorsHandler implements Addon
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -39,8 +39,8 @@ export class AddonModWorkshopAssessmentStrategyNumErrorsHandler implements Addon
      * Return the Component to render the plugin.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return AddonModWorkshopAssessmentStrategyNumErrorsComponent;
@@ -49,9 +49,9 @@ export class AddonModWorkshopAssessmentStrategyNumErrorsHandler implements Addon
     /**
      * Prepare original values to be shown and compared.
      *
-     * @param  {any}    form       Original data of the form.
-     * @param  {number} workshopId Workshop Id
-     * @return {Promise<any[]>}    Promise resolved with original values sorted.
+     * @param form Original data of the form.
+     * @param workshopId Workshop Id
+     * @return Promise resolved with original values sorted.
      */
      getOriginalValues(form: any, workshopId: number): Promise<any[]> {
         const originalValues = [];
@@ -76,9 +76,9 @@ export class AddonModWorkshopAssessmentStrategyNumErrorsHandler implements Addon
     /**
      * Check if the assessment data has changed for a certain submission and workshop for a this strategy plugin.
      *
-     * @param  {any[]} originalValues Original values of the form.
-     * @param  {any[]} currentValues  Current values of the form.
-     * @return {boolean}              True if data has changed, false otherwise.
+     * @param originalValues Original values of the form.
+     * @param currentValues Current values of the form.
+     * @return True if data has changed, false otherwise.
      */
     hasDataChanged(originalValues: any[], currentValues: any[]): boolean {
         for (const x in originalValues) {
@@ -96,9 +96,9 @@ export class AddonModWorkshopAssessmentStrategyNumErrorsHandler implements Addon
     /**
      * Prepare assessment data to be sent to the server depending on the strategy selected.
      *
-     * @param  {any{}} currentValues Current values of the form.
-     * @param  {any}   form          Assessment form data.
-     * @return {Promise<any>}        Promise resolved with the data to be sent. Or rejected with the input errors object.
+     * @param currentValues Current values of the form.
+     * @param form Assessment form data.
+     * @return Promise resolved with the data to be sent. Or rejected with the input errors object.
      */
     prepareAssessmentData(currentValues: any[], form: any): Promise<any> {
         const data = {};
diff --git a/src/addon/mod/workshop/assessment/rubric/providers/handler.ts b/src/addon/mod/workshop/assessment/rubric/providers/handler.ts
index d9dc5a38b..41a9eb6b1 100644
--- a/src/addon/mod/workshop/assessment/rubric/providers/handler.ts
+++ b/src/addon/mod/workshop/assessment/rubric/providers/handler.ts
@@ -29,7 +29,7 @@ export class AddonModWorkshopAssessmentStrategyRubricHandler implements AddonWor
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -39,8 +39,8 @@ export class AddonModWorkshopAssessmentStrategyRubricHandler implements AddonWor
      * Return the Component to render the plugin.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return AddonModWorkshopAssessmentStrategyRubricComponent;
@@ -49,9 +49,9 @@ export class AddonModWorkshopAssessmentStrategyRubricHandler implements AddonWor
     /**
      * Prepare original values to be shown and compared.
      *
-     * @param  {any}    form       Original data of the form.
-     * @param  {number} workshopId Workshop Id
-     * @return {Promise<any[]>}    Promise resolved with original values sorted.
+     * @param form Original data of the form.
+     * @param workshopId Workshop Id
+     * @return Promise resolved with original values sorted.
      */
      getOriginalValues(form: any, workshopId: number): Promise<any[]> {
         const originalValues = [];
@@ -75,9 +75,9 @@ export class AddonModWorkshopAssessmentStrategyRubricHandler implements AddonWor
     /**
      * Check if the assessment data has changed for a certain submission and workshop for a this strategy plugin.
      *
-     * @param  {any[]} originalValues Original values of the form.
-     * @param  {any[]} currentValues  Current values of the form.
-     * @return {boolean}              True if data has changed, false otherwise.
+     * @param originalValues Original values of the form.
+     * @param currentValues Current values of the form.
+     * @return True if data has changed, false otherwise.
      */
     hasDataChanged(originalValues: any[], currentValues: any[]): boolean {
         for (const x in originalValues) {
@@ -92,9 +92,9 @@ export class AddonModWorkshopAssessmentStrategyRubricHandler implements AddonWor
     /**
      * Prepare assessment data to be sent to the server depending on the strategy selected.
      *
-     * @param  {any{}} currentValues Current values of the form.
-     * @param  {any}   form          Assessment form data.
-     * @return {Promise<any>}        Promise resolved with the data to be sent. Or rejected with the input errors object.
+     * @param currentValues Current values of the form.
+     * @param form Assessment form data.
+     * @return Promise resolved with the data to be sent. Or rejected with the input errors object.
      */
     prepareAssessmentData(currentValues: any[], form: any): Promise<any> {
         const data = {};
diff --git a/src/addon/mod/workshop/components/assessment-strategy/assessment-strategy.ts b/src/addon/mod/workshop/components/assessment-strategy/assessment-strategy.ts
index 1516b9c60..6fe11499b 100644
--- a/src/addon/mod/workshop/components/assessment-strategy/assessment-strategy.ts
+++ b/src/addon/mod/workshop/components/assessment-strategy/assessment-strategy.ts
@@ -138,7 +138,7 @@ export class AddonModWorkshopAssessmentStrategyComponent implements OnInit {
     /**
      * Convenience function to load the assessment data.
      *
-     * @return {Promise<any>} Promised resvoled when data is loaded.
+     * @return Promised resvoled when data is loaded.
      */
     protected load(): Promise<any> {
         return this.workshopHelper.getReviewerAssessmentById(this.workshop.id, this.assessmentId, this.userId)
@@ -224,7 +224,7 @@ export class AddonModWorkshopAssessmentStrategyComponent implements OnInit {
     /**
      * Check if data has changed.
      *
-     * @return {boolean} True if data has changed.
+     * @return True if data has changed.
      */
     hasDataChanged(): boolean {
         if (!this.assessmentStrategyLoaded) {
@@ -254,7 +254,7 @@ export class AddonModWorkshopAssessmentStrategyComponent implements OnInit {
     /**
      * Save the assessment.
      *
-     * @return {Promise<any>} Promise resolved when done, rejected if assessment could not be saved.
+     * @return Promise resolved when done, rejected if assessment could not be saved.
      */
     saveAssessment(): Promise<any> {
         const files = this.fileSessionProvider.getFiles(AddonModWorkshopProvider.COMPONENT,
@@ -332,7 +332,7 @@ export class AddonModWorkshopAssessmentStrategyComponent implements OnInit {
     /**
      * Feedback text changed.
      *
-     * @param {string} text The new text.
+     * @param text The new text.
      */
     onFeedbackChange(text: string): void {
         this.feedbackText = text;
diff --git a/src/addon/mod/workshop/components/index/index.ts b/src/addon/mod/workshop/components/index/index.ts
index 6e96123a2..b4f88d644 100644
--- a/src/addon/mod/workshop/components/index/index.ts
+++ b/src/addon/mod/workshop/components/index/index.ts
@@ -118,7 +118,7 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Function called when we receive an event of submission changes.
      *
-     * @param {any} data Data received by the event.
+     * @param data Data received by the event.
      */
     protected eventReceived(data: any): void {
         if ((this.workshop && this.workshop.id === data.workshopId) || data.cmId === this.module.id) {
@@ -132,7 +132,7 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         const promises = [];
@@ -161,8 +161,8 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Compares sync event data with current data to check if refresh content is needed.
      *
-     * @param {any} syncEventData Data receiven on sync observer.
-     * @return {boolean}          True if refresh is needed, false otherwise.
+     * @param syncEventData Data receiven on sync observer.
+     * @return True if refresh is needed, false otherwise.
      */
     protected isRefreshSyncNeeded(syncEventData: any): boolean {
         if (this.workshop && syncEventData.workshopId == this.workshop.id) {
@@ -178,10 +178,10 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Download feedback contents.
      *
-     * @param  {boolean}      [refresh=false]    If it's refreshing content.
-     * @param  {boolean}      [sync=false]       If it should try to sync.
-     * @param  {boolean}      [showErrors=false] If show errors to the user of hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh If it's refreshing content.
+     * @param sync If it should try to sync.
+     * @param showErrors If show errors to the user of hide them.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<any> {
         return this.workshopProvider.getWorkshop(this.courseId, this.module.id).then((workshop) => {
@@ -240,8 +240,8 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Retrieves and shows submissions grade page.
      *
-     * @param  {number}       page Page number to be retrieved.
-     * @return {Promise<any>}      Resolved when done.
+     * @param page Page number to be retrieved.
+     * @return Resolved when done.
      */
     gotoSubmissionsPage(page: number): Promise<any> {
         return this.workshopProvider.getGradesReport(this.workshop.id, this.group, page).then((report) => {
@@ -269,7 +269,7 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Open task.
      *
-     * @param {any} task Task to be done.
+     * @param task Task to be done.
      */
     runTask(task: any): void {
         if (task.code == 'submit') {
@@ -315,8 +315,8 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
 
     /**
      * Set group to see the workshop.
-     * @param {number} groupId Group Id.
-     * @return {Promise<any>}  Promise resolved when done.
+     * @param groupId Group Id.
+     * @return Promise resolved when done.
      */
     setGroup(groupId: number): Promise<any> {
         this.group = groupId;
@@ -327,7 +327,7 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Convenience function to set current phase information.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected setPhaseInfo(): Promise<any> {
         this.submission = false;
@@ -417,7 +417,7 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Performs the sync of the activity.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected sync(): Promise<any> {
         return this.workshopSync.syncWorkshop(this.workshop.id);
@@ -426,8 +426,8 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
     /**
      * Checks if sync has succeed from result sync data.
      *
-     * @param  {any}     result Data returned on the sync function.
-     * @return {boolean}        If suceed or not.
+     * @param result Data returned on the sync function.
+     * @return If suceed or not.
      */
     protected hasSyncSucceed(result: any): boolean {
         return result.updated;
diff --git a/src/addon/mod/workshop/pages/assessment/assessment.ts b/src/addon/mod/workshop/pages/assessment/assessment.ts
index 6c1783e35..e49d720a7 100644
--- a/src/addon/mod/workshop/pages/assessment/assessment.ts
+++ b/src/addon/mod/workshop/pages/assessment/assessment.ts
@@ -116,7 +116,7 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy {
     /**
      * Check if we can leave the page or not.
      *
-     * @return {boolean|Promise<void>} Resolved if we can leave it, rejected if not.
+     * @return Resolved if we can leave it, rejected if not.
      */
     ionViewCanLeave(): boolean | Promise<void> {
         if (this.forceLeave || !this.evaluating) {
@@ -134,7 +134,7 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy {
     /**
      * Fetch the assessment data.
      *
-     * @return {Promise<void>} Resolved when done.
+     * @return Resolved when done.
      */
     protected fetchAssessmentData(): Promise<void> {
         return this.workshopProvider.getWorkshopById(this.courseId, this.workshopId).then((workshopData) => {
@@ -247,7 +247,7 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy {
     /**
      * Check if data has changed.
      *
-     * @return {boolean} True if changed, false otherwise.
+     * @return True if changed, false otherwise.
      */
     protected hasEvaluationChanged(): boolean {
         if (!this.loaded || !this.evaluating) {
@@ -276,7 +276,7 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy {
     /**
      * Convenience function to refresh all the data.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected refreshAllData(): Promise<any> {
         const promises = [];
@@ -300,7 +300,7 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy {
     /**
      * Pull to refresh.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshAssessment(refresher: any): void {
         if (this.loaded) {
@@ -328,7 +328,7 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy {
     /**
      * Sends the evaluation to be saved on the server.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected sendEvaluation(): Promise<any> {
         const modal = this.domUtils.showModalLoading('core.sending', true),
diff --git a/src/addon/mod/workshop/pages/edit-submission/edit-submission.ts b/src/addon/mod/workshop/pages/edit-submission/edit-submission.ts
index 3409680a1..5e82ed2fa 100644
--- a/src/addon/mod/workshop/pages/edit-submission/edit-submission.ts
+++ b/src/addon/mod/workshop/pages/edit-submission/edit-submission.ts
@@ -103,7 +103,7 @@ export class AddonModWorkshopEditSubmissionPage implements OnInit, OnDestroy {
     /**
      * Check if we can leave the page or not.
      *
-     * @return {boolean|Promise<void>} Resolved if we can leave it, rejected if not.
+     * @return Resolved if we can leave it, rejected if not.
      */
     ionViewCanLeave(): boolean | Promise<void> {
         if (this.forceLeave) {
@@ -131,7 +131,7 @@ export class AddonModWorkshopEditSubmissionPage implements OnInit, OnDestroy {
     /**
      * Fetch the submission data.
      *
-     * @return {Promise<void>} Resolved when done.
+     * @return Resolved when done.
      */
     protected fetchSubmissionData(): Promise<void> {
         return this.workshopProvider.getWorkshop(this.courseId, this.module.id).then((workshopData) => {
@@ -225,7 +225,7 @@ export class AddonModWorkshopEditSubmissionPage implements OnInit, OnDestroy {
     /**
      * Get the form input data.
      *
-     * @return {any} Object with all the info.
+     * @return Object with all the info.
      */
     protected getInputData(): any {
         const submissionId = this.submission.id || 'newsub';
@@ -250,7 +250,7 @@ export class AddonModWorkshopEditSubmissionPage implements OnInit, OnDestroy {
     /**
      * Check if data has changed.
      *
-     * @return {boolean} True if changed or false if not.
+     * @return True if changed or false if not.
      */
     protected hasDataChanged(): boolean {
         if (!this.loaded) {
@@ -277,7 +277,7 @@ export class AddonModWorkshopEditSubmissionPage implements OnInit, OnDestroy {
     /**
      * Pull to refresh.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshSubmission(refresher: any): void {
         if (this.loaded) {
@@ -315,7 +315,7 @@ export class AddonModWorkshopEditSubmissionPage implements OnInit, OnDestroy {
     /**
      * Send submission and save.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected saveSubmission(): Promise<any> {
         const inputData = this.getInputData();
diff --git a/src/addon/mod/workshop/pages/index/index.ts b/src/addon/mod/workshop/pages/index/index.ts
index db244a7d1..7ad7677da 100644
--- a/src/addon/mod/workshop/pages/index/index.ts
+++ b/src/addon/mod/workshop/pages/index/index.ts
@@ -42,7 +42,7 @@ export class AddonModWorkshopIndexPage {
     /**
      * Update some data based on the workshop instance.
      *
-     * @param {any} workshop Workshop instance.
+     * @param workshop Workshop instance.
      */
     updateData(workshop: any): void {
         this.title = workshop.name || this.title;
diff --git a/src/addon/mod/workshop/pages/phase/phase.ts b/src/addon/mod/workshop/pages/phase/phase.ts
index a0d88a01f..3773fa727 100644
--- a/src/addon/mod/workshop/pages/phase/phase.ts
+++ b/src/addon/mod/workshop/pages/phase/phase.ts
@@ -58,7 +58,7 @@ export class AddonModWorkshopPhaseInfoPage {
     /**
      * Open task.
      *
-     * @param {any} task Task to be done.
+     * @param task Task to be done.
      */
     runTask(task: any): void {
         if (task.code == 'submit') {
diff --git a/src/addon/mod/workshop/pages/submission/submission.ts b/src/addon/mod/workshop/pages/submission/submission.ts
index 1158e5df5..63580cdc8 100644
--- a/src/addon/mod/workshop/pages/submission/submission.ts
+++ b/src/addon/mod/workshop/pages/submission/submission.ts
@@ -141,7 +141,7 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
     /**
      * Check if we can leave the page or not.
      *
-     * @return {boolean|Promise<void>} Resolved if we can leave it, rejected if not.
+     * @return Resolved if we can leave it, rejected if not.
      */
     ionViewCanLeave(): boolean | Promise<void> {
         const assessmentHasChanged = this.assessmentStrategy && this.assessmentStrategy.hasDataChanged();
@@ -170,7 +170,7 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
     /**
      * Function called when we receive an event of submission changes.
      *
-     * @param {any} data Event data received.
+     * @param data Event data received.
      */
     protected eventReceived(data: any): void {
         if (this.workshopId === data.workshopId) {
@@ -184,7 +184,7 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
     /**
      * Fetch the submission data.
      *
-     * @return {Promise<void>} Resolved when done.
+     * @return Resolved when done.
      */
     protected fetchSubmissionData(): Promise<void> {
         return this.workshopHelper.getSubmissionById(this.workshopId, this.submissionId).then((submissionData) => {
@@ -332,7 +332,7 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
     /**
      * Check if data has changed.
      *
-     * @return {boolean} True if changed, false otherwise.
+     * @return True if changed, false otherwise.
      */
     protected hasEvaluationChanged(): boolean {
         if (!this.loaded || !this.access.canoverridegrades) {
@@ -359,7 +359,7 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
     /**
      * Convenience function to refresh all the data.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected refreshAllData(): Promise<any> {
         const promises = [];
@@ -383,7 +383,7 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
     /**
      * Pull to refresh.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshSubmission(refresher: any): void {
         if (this.loaded) {
@@ -427,7 +427,7 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
     /**
      * Sends the evaluation to be saved on the server.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected sendEvaluation(): Promise<any> {
         const modal = this.domUtils.showModalLoading('core.sending', true);
@@ -490,7 +490,7 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
     /**
      * Undo the submission delete action.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     undoDeleteSubmission(): Promise<any> {
         return this.workshopOffline.deleteSubmissionAction(this.workshopId, this.submissionId, 'delete').finally(() => {
diff --git a/src/addon/mod/workshop/providers/assessment-strategy-delegate.ts b/src/addon/mod/workshop/providers/assessment-strategy-delegate.ts
index 3002f6deb..d403d3cb6 100644
--- a/src/addon/mod/workshop/providers/assessment-strategy-delegate.ts
+++ b/src/addon/mod/workshop/providers/assessment-strategy-delegate.ts
@@ -24,7 +24,6 @@ import { CoreSitesProvider } from '@providers/sites';
 export interface AddonWorkshopAssessmentStrategyHandler extends CoreDelegateHandler {
     /**
      * The name of the assessment strategy. E.g. 'accumulative'.
-     * @type {string}
      */
     strategyName: string;
 
@@ -32,35 +31,35 @@ export interface AddonWorkshopAssessmentStrategyHandler extends CoreDelegateHand
      * Return the Component to render the plugin.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent?(injector: Injector): any | Promise<any>;
 
     /**
      * Prepare original values to be shown and compared.
      *
-     * @param  {any}    form       Original data of the form.
-     * @param  {number} workshopId WorkShop Id
-     * @return {Promise<any[]>}    Promise resolved with original values sorted.
+     * @param form Original data of the form.
+     * @param workshopId WorkShop Id
+     * @return Promise resolved with original values sorted.
      */
      getOriginalValues?(form: any, workshopId: number): Promise<any[]>;
 
     /**
      * Check if the assessment data has changed for a certain submission and workshop for a this strategy plugin.
      *
-     * @param  {any[]} originalValues Original values of the form.
-     * @param  {any[]} currentValues  Current values of the form.
-     * @return {boolean}              True if data has changed, false otherwise.
+     * @param originalValues Original values of the form.
+     * @param currentValues Current values of the form.
+     * @return True if data has changed, false otherwise.
      */
     hasDataChanged?(originalValues: any[], currentValues: any[]): boolean;
 
     /**
      * Prepare assessment data to be sent to the server depending on the strategy selected.
      *
-     * @param  {any{}} currentValues Current values of the form.
-     * @param  {any}   form          Assessment form data.
-     * @return {Promise<any>}        Promise resolved with the data to be sent. Or rejected with the input errors object.
+     * @param currentValues Current values of the form.
+     * @param form Assessment form data.
+     * @return Promise resolved with the data to be sent. Or rejected with the input errors object.
      */
     prepareAssessmentData(currentValues: any[], form: any): Promise<any>;
 }
@@ -82,8 +81,8 @@ export interface AddonWorkshopAssessmentStrategyHandler extends CoreDelegateHand
     /**
      * Check if an assessment strategy plugin is supported.
      *
-     * @param  {string} workshopStrategy Assessment strategy name.
-     * @return {boolean}                 True if supported, false otherwise.
+     * @param workshopStrategy Assessment strategy name.
+     * @return True if supported, false otherwise.
      */
     isPluginSupported(workshopStrategy: string): boolean {
         return this.hasHandler(workshopStrategy, true);
@@ -92,9 +91,9 @@ export interface AddonWorkshopAssessmentStrategyHandler extends CoreDelegateHand
     /**
      * Get the directive to use for a certain assessment strategy plugin.
      *
-     * @param {Injector} injector Injector.
-     * @param  {string} workshopStrategy Assessment strategy name.
-     * @return {any}                     The component, undefined if not found.
+     * @param injector Injector.
+     * @param workshopStrategy Assessment strategy name.
+     * @return The component, undefined if not found.
      */
     getComponentForPlugin(injector: Injector, workshopStrategy: string): Promise<any> {
         return this.executeFunctionOnEnabled(workshopStrategy, 'getComponent', [injector]);
@@ -103,10 +102,10 @@ export interface AddonWorkshopAssessmentStrategyHandler extends CoreDelegateHand
     /**
      * Prepare original values to be shown and compared depending on the strategy selected.
      *
-     * @param  {string} workshopStrategy Workshop strategy.
-     * @param  {any}    form             Original data of the form.
-     * @param  {number} workshopId       Workshop ID.
-     * @return {Promise<any[]>}          Resolved with original values sorted.
+     * @param workshopStrategy Workshop strategy.
+     * @param form Original data of the form.
+     * @param workshopId Workshop ID.
+     * @return Resolved with original values sorted.
      */
     getOriginalValues(workshopStrategy: string, form: any, workshopId: number): Promise<any[]> {
         return Promise.resolve(this.executeFunctionOnEnabled(workshopStrategy, 'getOriginalValues', [form, workshopId]) || []);
@@ -115,10 +114,10 @@ export interface AddonWorkshopAssessmentStrategyHandler extends CoreDelegateHand
     /**
      * Check if the assessment data has changed for a certain submission and workshop for a this strategy plugin.
      *
-     * @param  {any}   workshop       Workshop.
-     * @param  {any[]} originalValues Original values of the form.
-     * @param  {any[]} currentValues  Current values of the form.
-     * @return {boolean}              True if data has changed, false otherwise.
+     * @param workshop Workshop.
+     * @param originalValues Original values of the form.
+     * @param currentValues Current values of the form.
+     * @return True if data has changed, false otherwise.
      */
     hasDataChanged(workshop: any, originalValues: any[], currentValues: any[]): boolean {
         return this.executeFunctionOnEnabled(workshop.strategy, 'hasDataChanged', [originalValues, currentValues]) || false;
@@ -127,10 +126,10 @@ export interface AddonWorkshopAssessmentStrategyHandler extends CoreDelegateHand
     /**
      * Prepare assessment data to be sent to the server depending on the strategy selected.
      *
-     * @param  {string} workshopStrategy Workshop strategy to follow.
-     * @param  {any{}}  currentValues    Current values of the form.
-     * @param  {any}    form             Assessment form data.
-     * @return {Promise<any>}            Promise resolved with the data to be sent. Or rejected with the input errors object.
+     * @param workshopStrategy Workshop strategy to follow.
+     * @param currentValues Current values of the form.
+     * @param form Assessment form data.
+     * @return Promise resolved with the data to be sent. Or rejected with the input errors object.
      */
     prepareAssessmentData(workshopStrategy: string, currentValues: any, form: any): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(workshopStrategy, 'prepareAssessmentData', [currentValues, form]));
diff --git a/src/addon/mod/workshop/providers/helper.ts b/src/addon/mod/workshop/providers/helper.ts
index c4d6560b0..9236845b2 100644
--- a/src/addon/mod/workshop/providers/helper.ts
+++ b/src/addon/mod/workshop/providers/helper.ts
@@ -43,9 +43,9 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Get a task by code.
      *
-     * @param  {any[]}  tasks    Array of tasks.
-     * @param  {string} taskCode Unique task code.
-     * @return {any}             Task requested
+     * @param tasks Array of tasks.
+     * @param taskCode Unique task code.
+     * @return Task requested
      */
     getTask(tasks: any[], taskCode: string): any {
         for (const x in tasks) {
@@ -60,9 +60,9 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Check is task code is done.
      *
-     * @param  {any[]}  tasks    Array of tasks.
-     * @param  {string} taskCode Unique task code.
-     * @return {boolean}         True if task is completed.
+     * @param tasks Array of tasks.
+     * @param taskCode Unique task code.
+     * @return True if task is completed.
      */
     isTaskDone(tasks: any[], taskCode: string): boolean {
         const task = this.getTask(tasks, taskCode);
@@ -78,10 +78,10 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Return if a user can submit a workshop.
      *
-     * @param  {any}   workshop Workshop info.
-     * @param  {any}   access   Access information.
-     * @param  {any[]} tasks    Array of tasks.
-     * @return {boolean}        True if the user can submit the workshop.
+     * @param workshop Workshop info.
+     * @param access Access information.
+     * @param tasks Array of tasks.
+     * @return True if the user can submit the workshop.
      */
     canSubmit(workshop: any, access: any, tasks: any[]): boolean {
         const examplesMust = workshop.useexamples && workshop.examplesmode == AddonModWorkshopProvider.EXAMPLES_BEFORE_SUBMISSION;
@@ -94,9 +94,9 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Return if a user can assess a workshop.
      *
-     * @param  {any} workshop Workshop info.
-     * @param  {any} access   Access information.
-     * @return {boolean}      True if the user can assess the workshop.
+     * @param workshop Workshop info.
+     * @param access Access information.
+     * @return True if the user can assess the workshop.
      */
     canAssess(workshop: any, access: any): boolean {
         const examplesMust = workshop.useexamples && workshop.examplesmode == AddonModWorkshopProvider.EXAMPLES_BEFORE_ASSESSMENT;
@@ -108,9 +108,9 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Return a particular user submission from the submission list.
      *
-     * @param  {number} workshopId Workshop ID.
-     * @param  {number} [userId]   User ID. If not defined current user Id.
-     * @return {Promise<any>}      Resolved with the submission, resolved with false if not found.
+     * @param workshopId Workshop ID.
+     * @param userId User ID. If not defined current user Id.
+     * @return Resolved with the submission, resolved with false if not found.
      */
     getUserSubmission(workshopId: number, userId: number = 0): Promise<any> {
         return this.workshopProvider.getSubmissions(workshopId).then((submissions) => {
@@ -129,10 +129,10 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Return a particular submission. It will use prefetched data if fetch fails.
      *
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} submissionId Submission ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Resolved with the submission, resolved with false if not found.
+     * @param workshopId Workshop ID.
+     * @param submissionId Submission ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved with the submission, resolved with false if not found.
      */
     getSubmissionById(workshopId: number, submissionId: number, siteId?: string): Promise<any> {
         return this.workshopProvider.getSubmission(workshopId, submissionId, siteId).catch(() => {
@@ -152,11 +152,11 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Return a particular assesment. It will use prefetched data if fetch fails. It will add assessment form data.
      *
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} assessmentId Assessment ID.
-     * @param  {number} [userId]     User ID. If not defined, current user.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Resolved with the assessment.
+     * @param workshopId Workshop ID.
+     * @param assessmentId Assessment ID.
+     * @param userId User ID. If not defined, current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved with the assessment.
      */
     getReviewerAssessmentById(workshopId: number, assessmentId: number, userId: number = 0, siteId?: string): Promise<any> {
         return this.workshopProvider.getAssessment(workshopId, assessmentId, siteId).catch((error) => {
@@ -184,12 +184,12 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Retrieves the assessment of the given user and all the related data.
      *
-     * @param  {number}  workshopId          Workshop ID.
-     * @param  {number}  [userId=0]          User ID. If not defined, current user.
-     * @param  {boolean} [offline=false]     True if it should return cached data. Has priority over ignoreCache.
-     * @param  {boolean} [ignoreCache=false] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {string}  [siteId]            Site ID. If not defined, current site.
-     * @return {Promise<any[]>}              Promise resolved when the workshop data is retrieved.
+     * @param workshopId Workshop ID.
+     * @param userId User ID. If not defined, current user.
+     * @param offline True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the workshop data is retrieved.
      */
     getReviewerAssessments(workshopId: number, userId: number = 0, offline: boolean = false, ignoreCache: boolean = false,
             siteId?: string): Promise<any[]> {
@@ -212,11 +212,11 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Delete stored attachment files for a submission.
      *
-     * @param  {number}  workshopId   Workshop ID.
-     * @param  {number}  submissionId If not editing, it will refer to timecreated.
-     * @param  {boolean} editing      If the submission is being edited or added otherwise.
-     * @param  {string}  [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved when deleted.
+     * @param workshopId Workshop ID.
+     * @param submissionId If not editing, it will refer to timecreated.
+     * @param editing If the submission is being edited or added otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when deleted.
      */
     deleteSubmissionStoredFiles(workshopId: number, submissionId: number, editing: boolean, siteId?: string): Promise<any> {
         return this.workshopOffline.getSubmissionFolder(workshopId, submissionId, editing, siteId).then((folderPath) => {
@@ -230,12 +230,12 @@ export class AddonModWorkshopHelperProvider {
      * Given a list of files (either online files or local files), store the local files in a local folder
      * to be submitted later.
      *
-     * @param  {number}  workshopId   Workshop ID.
-     * @param  {number}  submissionId If not editing, it will refer to timecreated.
-     * @param  {boolean} editing      If the submission is being edited or added otherwise.
-     * @param  {any[]}   files        List of files.
-     * @param  {string}  [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved if success, rejected otherwise.
+     * @param workshopId Workshop ID.
+     * @param submissionId If not editing, it will refer to timecreated.
+     * @param editing If the submission is being edited or added otherwise.
+     * @param files List of files.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success, rejected otherwise.
      */
     storeSubmissionFiles(workshopId: number, submissionId: number, editing: boolean, files: any[], siteId?: string): Promise<any> {
         // Get the folder where to store the files.
@@ -247,13 +247,13 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Upload or store some files for a submission, depending if the user is offline or not.
      *
-     * @param  {number}  workshopId   Workshop ID.
-     * @param  {number}  submissionId If not editing, it will refer to timecreated.
-     * @param  {any[]}   files        List of files.
-     * @param  {boolean} editing      If the submission is being edited or added otherwise.
-     * @param  {boolean} offline      True if files sould be stored for offline, false to upload them.
-     * @param  {string}  [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved if success.
+     * @param workshopId Workshop ID.
+     * @param submissionId If not editing, it will refer to timecreated.
+     * @param files List of files.
+     * @param editing If the submission is being edited or added otherwise.
+     * @param offline True if files sould be stored for offline, false to upload them.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success.
      */
     uploadOrStoreSubmissionFiles(workshopId: number, submissionId: number, files: any[], editing: boolean, offline: boolean,
             siteId?: string): Promise<any> {
@@ -267,11 +267,11 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Get a list of stored attachment files for a submission. See AddonModWorkshopHelperProvider#storeFiles.
      *
-     * @param  {number}  workshopId   Workshop ID.
-     * @param  {number}  submissionId If not editing, it will refer to timecreated.
-     * @param  {boolean} editing      If the submission is being edited or added otherwise.
-     * @param  {string}  [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any[]>}       Promise resolved with the files.
+     * @param workshopId Workshop ID.
+     * @param submissionId If not editing, it will refer to timecreated.
+     * @param editing If the submission is being edited or added otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the files.
      */
     getStoredSubmissionFiles(workshopId: number, submissionId: number, editing: boolean, siteId?: string): Promise<any[]> {
         return this.workshopOffline.getSubmissionFolder(workshopId, submissionId, editing, siteId).then((folderPath) => {
@@ -285,12 +285,12 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Get a list of stored attachment files for a submission and online files also. See AddonModWorkshopHelperProvider#storeFiles.
      *
-     * @param  {any}     filesObject  Files object combining offline and online information.
-     * @param  {number}  workshopId   Workshop ID.
-     * @param  {number}  submissionId If not editing, it will refer to timecreated.
-     * @param  {boolean} editing      If the submission is being edited or added otherwise.
-     * @param  {string}  [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any[]>}       Promise resolved with the files.
+     * @param filesObject Files object combining offline and online information.
+     * @param workshopId Workshop ID.
+     * @param submissionId If not editing, it will refer to timecreated.
+     * @param editing If the submission is being edited or added otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the files.
      */
     getSubmissionFilesFromOfflineFilesObject(filesObject: any, workshopId: number, submissionId: number, editing: boolean,
             siteId?: string): Promise<any[]> {
@@ -302,10 +302,10 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Delete stored attachment files for an assessment.
      *
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} assessmentId Assessment ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when deleted.
+     * @param workshopId Workshop ID.
+     * @param assessmentId Assessment ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when deleted.
      */
     deleteAssessmentStoredFiles(workshopId: number, assessmentId: number, siteId?: string): Promise<any> {
         return this.workshopOffline.getAssessmentFolder(workshopId, assessmentId, siteId).then((folderPath) => {
@@ -319,11 +319,11 @@ export class AddonModWorkshopHelperProvider {
      * Given a list of files (either online files or local files), store the local files in a local folder
      * to be submitted later.
      *
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} assessmentId Assessment ID.
-     * @param  {any[]}  files        List of files.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved if success, rejected otherwise.
+     * @param workshopId Workshop ID.
+     * @param assessmentId Assessment ID.
+     * @param files List of files.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success, rejected otherwise.
      */
     storeAssessmentFiles(workshopId: number, assessmentId: number, files: any[], siteId?: string): Promise<any> {
         // Get the folder where to store the files.
@@ -335,12 +335,12 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Upload or store some files for an assessment, depending if the user is offline or not.
      *
-     * @param  {number}  workshopId   Workshop ID.
-     * @param  {number}  assessmentId ID.
-     * @param  {any[]}   files        List of files.
-     * @param  {boolean} offline      True if files sould be stored for offline, false to upload them.
-     * @param  {string}  [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved if success.
+     * @param workshopId Workshop ID.
+     * @param assessmentId ID.
+     * @param files List of files.
+     * @param offline True if files sould be stored for offline, false to upload them.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success.
      */
     uploadOrStoreAssessmentFiles(workshopId: number, assessmentId: number, files: any[], offline: boolean, siteId?: string):
             Promise<any> {
@@ -354,10 +354,10 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Get a list of stored attachment files for an assessment. See AddonModWorkshopHelperProvider#storeFiles.
      *
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} assessmentId Assessment ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved with the files.
+     * @param workshopId Workshop ID.
+     * @param assessmentId Assessment ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the files.
      */
     getStoredAssessmentFiles(workshopId: number, assessmentId: number, siteId?: string): Promise<any> {
         return this.workshopOffline.getAssessmentFolder(workshopId, assessmentId, siteId).then((folderPath) => {
@@ -371,11 +371,11 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Get a list of stored attachment files for an assessment and online files also. See AddonModWorkshopHelperProvider#storeFiles.
      *
-     * @param  {object} filesObject  Files object combining offline and online information.
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} assessmentId Assessment ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved with the files.
+     * @param filesObject Files object combining offline and online information.
+     * @param workshopId Workshop ID.
+     * @param assessmentId Assessment ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the files.
      */
     getAssessmentFilesFromOfflineFilesObject(filesObject: any, workshopId: number, assessmentId: number, siteId?: string):
             Promise<any> {
@@ -387,9 +387,9 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Returns the action of a given submission.
      *
-     * @param  {any[]}  actions      Offline actions to be applied to the given submission.
-     * @param  {number} submissionId ID of the submission to filter by or false.
-     * @return {any[]}               Promise resolved with the files.
+     * @param actions Offline actions to be applied to the given submission.
+     * @param submissionId ID of the submission to filter by or false.
+     * @return Promise resolved with the files.
      */
     filterSubmissionActions(actions: any[], submissionId: number): any[] {
         return actions.filter((action) => {
@@ -404,9 +404,9 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Applies offline data to submission.
      *
-     * @param  {any}   submission Submission object to be modified.
-     * @param  {any[]} actions    Offline actions to be applied to the given submission.
-     * @return {Promise<any>}     Promise resolved with the files.
+     * @param submission Submission object to be modified.
+     * @param actions Offline actions to be applied to the given submission.
+     * @return Promise resolved with the files.
      */
     applyOfflineData(submission: any, actions: any[]): Promise<any> {
         if (actions.length && !submission) {
@@ -460,13 +460,13 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Prepare assessment data to be sent to the server.
      *
-     * @param {any}    workshop       Workshop object.
-     * @param {any[]}  selectedValues Assessment current values
-     * @param {string} feedbackText   Feedback text.
-     * @param {any[]}  feedbackFiles  Feedback attachments.
-     * @param {any}    form           Assessment form original data.
-     * @param {number} attachmentsId  The draft file area id for attachments.
-     * @return {Promise<any>}         Promise resolved with the data to be sent. Or rejected with the input errors object.
+     * @param workshop Workshop object.
+     * @param selectedValues Assessment current values
+     * @param feedbackText Feedback text.
+     * @param feedbackFiles Feedback attachments.
+     * @param form Assessment form original data.
+     * @param attachmentsId The draft file area id for attachments.
+     * @return Promise resolved with the data to be sent. Or rejected with the input errors object.
      */
     prepareAssessmentData(workshop: any, selectedValues: any[], feedbackText: string, feedbackFiles: any[], form: any,
             attachmentsId: number): Promise<any> {
@@ -486,10 +486,10 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Calculates the real value of a grade based on real_grade_value.
      *
-     * @param  {number} value    Percentual value from 0 to 100.
-     * @param  {number} max      The maximal grade.
-     * @param  {number} decimals Decimals to show in the formatted grade.
-     * @return {string}          Real grade formatted.
+     * @param value Percentual value from 0 to 100.
+     * @param max The maximal grade.
+     * @param decimals Decimals to show in the formatted grade.
+     * @return Real grade formatted.
      */
     protected realGradeValueHelper(value: number, max: number, decimals: number): string {
         if (value == null) {
@@ -506,9 +506,9 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Calculates the real value of a grades of an assessment.
      *
-     * @param  {any} workshop   Workshop object.
-     * @param  {any} assessment Assessment data.
-     * @return {any}            Assessment with real grades.
+     * @param workshop Workshop object.
+     * @param assessment Assessment data.
+     * @return Assessment with real grades.
      */
     realGradeValue(workshop: any, assessment: any): any {
         assessment.grade = this.realGradeValueHelper(assessment.grade, workshop.grade, workshop.gradedecimals);
@@ -522,8 +522,8 @@ export class AddonModWorkshopHelperProvider {
     /**
      * Check grade should be shown
      *
-     * @param  {any} grade Grade to be shown
-     * @return {boolean}   If grade should be shown or not.
+     * @param grade Grade to be shown
+     * @return If grade should be shown or not.
      */
     showGrade(grade: any): boolean {
         return typeof grade !== 'undefined' && grade !== null;
diff --git a/src/addon/mod/workshop/providers/list-link-handler.ts b/src/addon/mod/workshop/providers/list-link-handler.ts
index db2bfb9cc..3614949ec 100644
--- a/src/addon/mod/workshop/providers/list-link-handler.ts
+++ b/src/addon/mod/workshop/providers/list-link-handler.ts
@@ -33,7 +33,7 @@ export class AddonModWorkshopListLinkHandler extends CoreContentLinksModuleListH
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): Promise<boolean> {
         return this.workshopProvider.isPluginEnabled();
diff --git a/src/addon/mod/workshop/providers/module-handler.ts b/src/addon/mod/workshop/providers/module-handler.ts
index addfe132d..4b25139ec 100644
--- a/src/addon/mod/workshop/providers/module-handler.ts
+++ b/src/addon/mod/workshop/providers/module-handler.ts
@@ -44,7 +44,7 @@ export class AddonModWorkshopModuleHandler implements CoreCourseModuleHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): Promise<boolean> {
         return this.workshopProvider.isPluginEnabled();
@@ -53,10 +53,10 @@ export class AddonModWorkshopModuleHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         return {
@@ -78,9 +78,9 @@ export class AddonModWorkshopModuleHandler implements CoreCourseModuleHandler {
      * Get the component to render the module. This is needed to support singleactivity course format.
      * The component returned must implement CoreCourseModuleMainComponent.
      *
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any} The component to use, undefined if not found.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component to use, undefined if not found.
      */
     getMainComponent(course: any, module: any): any {
         return AddonModWorkshopIndexComponent;
diff --git a/src/addon/mod/workshop/providers/offline.ts b/src/addon/mod/workshop/providers/offline.ts
index dcd7f1adc..734611ae9 100644
--- a/src/addon/mod/workshop/providers/offline.ts
+++ b/src/addon/mod/workshop/providers/offline.ts
@@ -179,8 +179,8 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Get all the workshops ids that have something to be synced.
      *
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<number[]>} Promise resolved with workshops id that have something to be synced.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with workshops id that have something to be synced.
      */
     getAllWorkshops(siteId?: string): Promise<number[]> {
         const promises = [
@@ -207,9 +207,9 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Check if there is an offline data to be synced.
      *
-     * @param  {number} workshopId Workshop ID to remove.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<boolean>}  Promise resolved with boolean: true if has offline data, false otherwise.
+     * @param workshopId Workshop ID to remove.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: true if has offline data, false otherwise.
      */
     hasWorkshopOfflineData(workshopId: number, siteId?: string): Promise<boolean> {
         const promises = [
@@ -230,11 +230,11 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Delete workshop submission action.
      *
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} submissionId Submission ID.
-     * @param  {string} action       Action to be done.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved if stored, rejected if failure.
+     * @param workshopId Workshop ID.
+     * @param submissionId Submission ID.
+     * @param action Action to be done.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     deleteSubmissionAction(workshopId: number, submissionId: number, action: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -251,10 +251,10 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Delete all workshop submission actions.
      *
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} submissionId Submission ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved if stored, rejected if failure.
+     * @param workshopId Workshop ID.
+     * @param submissionId Submission ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     deleteAllSubmissionActions(workshopId: number, submissionId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -270,8 +270,8 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Get the all the submissions to be synced.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>}  Promise resolved with the objects to be synced.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the objects to be synced.
      */
     getAllSubmissions(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -286,9 +286,9 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Get the submissions of a workshop to be synced.
      *
-     * @param  {number} workshopId ID of the workshop.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved with the object to be synced.
+     * @param workshopId ID of the workshop.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the object to be synced.
      */
     getSubmissions(workshopId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -307,10 +307,10 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Get all actions of a submission of a workshop to be synced.
      *
-     * @param  {number} workshopId   ID of the workshop.
-     * @param  {number} submissionId ID of the submission.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any[]>}      Promise resolved with the object to be synced.
+     * @param workshopId ID of the workshop.
+     * @param submissionId ID of the submission.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the object to be synced.
      */
     getSubmissionActions(workshopId: number, submissionId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -330,11 +330,11 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Get an specific action of a submission of a workshop to be synced.
      *
-     * @param  {number} workshopId   ID of the workshop.
-     * @param  {number} submissionId ID of the submission.
-     * @param  {string} action       Action to be done.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved with the object to be synced.
+     * @param workshopId ID of the workshop.
+     * @param submissionId ID of the submission.
+     * @param action Action to be done.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the object to be synced.
      */
     getSubmissionAction(workshopId: number, submissionId: number, action: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -355,16 +355,16 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Offline version for adding a submission action to a workshop.
      *
-     * @param  {number} workshopId    Workshop ID.
-     * @param  {number} courseId      Course ID the workshop belongs to.
-     * @param  {string} title         The submission title.
-     * @param  {string} content       The submission text content.
-     * @param  {any}    attachmentsId Stored attachments.
-     * @param  {number} submissionId  Submission Id, if action is add, the time the submission was created.
-     *                                If set to 0, current time is used.
-     * @param  {string} action        Action to be done. ['add', 'update', 'delete']
-     * @param  {string} [siteId]      Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved when submission action is successfully saved.
+     * @param workshopId Workshop ID.
+     * @param courseId Course ID the workshop belongs to.
+     * @param title The submission title.
+     * @param content The submission text content.
+     * @param attachmentsId Stored attachments.
+     * @param submissionId Submission Id, if action is add, the time the submission was created.
+     *                     If set to 0, current time is used.
+     * @param action Action to be done. ['add', 'update', 'delete']
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when submission action is successfully saved.
      */
     saveSubmission(workshopId: number, courseId: number, title: string, content: string, attachmentsId: any,
             submissionId: number, action: string, siteId?: string): Promise<any> {
@@ -388,7 +388,7 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Parse "attachments" column of a submission record.
      *
-     * @param  {any} record Submission record, modified in place.
+     * @param record Submission record, modified in place.
      */
     protected parseSubmissionRecord(record: any): void {
         record.attachmentsid = this.textUtils.parseJSON(record.attachmentsid);
@@ -397,10 +397,10 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Delete workshop assessment.
      *
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} assessmentId Assessment ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved if stored, rejected if failure.
+     * @param workshopId Workshop ID.
+     * @param assessmentId Assessment ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     deleteAssessment(workshopId: number, assessmentId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -416,8 +416,8 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Get the all the assessments to be synced.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>}  Promise resolved with the objects to be synced.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the objects to be synced.
      */
     getAllAssessments(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -432,9 +432,9 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Get the assessments of a workshop to be synced.
      *
-     * @param  {number} workshopId ID of the workshop.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any[]>}    Promise resolved with the object to be synced.
+     * @param workshopId ID of the workshop.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the object to be synced.
      */
     getAssessments(workshopId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -453,10 +453,10 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Get an specific assessment of a workshop to be synced.
      *
-     * @param  {number} workshopId   ID of the workshop.
-     * @param  {number} assessmentId Assessment ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved with the object to be synced.
+     * @param workshopId ID of the workshop.
+     * @param assessmentId Assessment ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the object to be synced.
      */
     getAssessment(workshopId: number, assessmentId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -476,12 +476,12 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Offline version for adding an assessment to a workshop.
      *
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} assessmentId Assessment ID.
-     * @param  {number} courseId     Course ID the workshop belongs to.
-     * @param  {any}    inputData    Assessment data.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when assessment is successfully saved.
+     * @param workshopId Workshop ID.
+     * @param assessmentId Assessment ID.
+     * @param courseId Course ID the workshop belongs to.
+     * @param inputData Assessment data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when assessment is successfully saved.
      */
     saveAssessment(workshopId: number, assessmentId: number, courseId: number, inputData: any, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -500,7 +500,7 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Parse "inpudata" column of an assessment record.
      *
-     * @param {any} record Assessnent record, modified in place.
+     * @param record Assessnent record, modified in place.
      */
     protected parseAssessmentRecord(record: any): void {
         record.inputdata = this.textUtils.parseJSON(record.inputdata);
@@ -509,10 +509,10 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Delete workshop evaluate submission.
      *
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} submissionId Submission ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved if stored, rejected if failure.
+     * @param workshopId Workshop ID.
+     * @param submissionId Submission ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     deleteEvaluateSubmission(workshopId: number, submissionId: number, siteId?: string): Promise<any> {
         const conditions = {
@@ -528,8 +528,8 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Get the all the evaluate submissions to be synced.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>}  Promise resolved with the objects to be synced.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the objects to be synced.
      */
     getAllEvaluateSubmissions(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -544,9 +544,9 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Get the evaluate submissions of a workshop to be synced.
      *
-     * @param  {number} workshopId ID of the workshop.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any[]>}    Promise resolved with the object to be synced.
+     * @param workshopId ID of the workshop.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the object to be synced.
      */
     getEvaluateSubmissions(workshopId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -566,10 +566,10 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Get an specific evaluate submission of a workshop to be synced.
      *
-     * @param  {number} workshopId   ID of the workshop.
-     * @param  {number} submissionId Submission ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved with the object to be synced.
+     * @param workshopId ID of the workshop.
+     * @param submissionId Submission ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the object to be synced.
      */
     getEvaluateSubmission(workshopId: number, submissionId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -589,14 +589,14 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Offline version for evaluation a submission to a workshop.
      *
-     * @param  {number}  workshopId   Workshop ID.
-     * @param  {number}  submissionId Submission ID.
-     * @param  {number}  courseId     Course ID the workshop belongs to.
-     * @param  {string}  feedbackText The feedback for the author.
-     * @param  {boolean} published    Whether to publish the submission for other users.
-     * @param  {any}     gradeOver    The new submission grade (empty for no overriding the grade).
-     * @param  {string}  [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved when submission evaluation is successfully saved.
+     * @param workshopId Workshop ID.
+     * @param submissionId Submission ID.
+     * @param courseId Course ID the workshop belongs to.
+     * @param feedbackText The feedback for the author.
+     * @param published Whether to publish the submission for other users.
+     * @param gradeOver The new submission grade (empty for no overriding the grade).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when submission evaluation is successfully saved.
      */
     saveEvaluateSubmission(workshopId: number, submissionId: number, courseId: number, feedbackText: string, published: boolean,
             gradeOver: any, siteId?: string): Promise<any> {
@@ -618,7 +618,7 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Parse "published" and "gradeover" columns of an evaluate submission record.
      *
-     * @param  {any} record Evaluate submission record, modified in place.
+     * @param record Evaluate submission record, modified in place.
      */
     protected parseEvaluateSubmissionRecord(record: any): void {
         record.published = Boolean(record.published);
@@ -628,10 +628,10 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Delete workshop evaluate assessment.
      *
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} assessmentId Assessment ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved if stored, rejected if failure.
+     * @param workshopId Workshop ID.
+     * @param assessmentId Assessment ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     deleteEvaluateAssessment(workshopId: number, assessmentId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -647,8 +647,8 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Get the all the evaluate assessments to be synced.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>}  Promise resolved with the objects to be synced.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the objects to be synced.
      */
     getAllEvaluateAssessments(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -663,9 +663,9 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Get the evaluate assessments of a workshop to be synced.
      *
-     * @param  {number} workshopId ID of the workshop.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any[]>}    Promise resolved with the object to be synced.
+     * @param workshopId ID of the workshop.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the object to be synced.
      */
     getEvaluateAssessments(workshopId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -685,10 +685,10 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Get an specific evaluate assessment of a workshop to be synced.
      *
-     * @param  {number} workshopId   ID of the workshop.
-     * @param  {number} assessmentId Assessment ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved with the object to be synced.
+     * @param workshopId ID of the workshop.
+     * @param assessmentId Assessment ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the object to be synced.
      */
     getEvaluateAssessment(workshopId: number, assessmentId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -708,14 +708,14 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Offline version for evaluating an assessment to a workshop.
      *
-     * @param  {number}  workshopId       Workshop ID.
-     * @param  {number}  assessmentId     Assessment ID.
-     * @param  {number}  courseId         Course ID the workshop belongs to.
-     * @param  {string}  feedbackText     The feedback for the reviewer.
-     * @param  {number}  weight           The new weight for the assessment.
-     * @param  {any}     gradingGradeOver The new grading grade (empty for no overriding the grade).
-     * @param  {string}  [siteId]         Site ID. If not defined, current site.
-     * @return {Promise<any>}             Promise resolved when assessment evaluation is successfully saved.
+     * @param workshopId Workshop ID.
+     * @param assessmentId Assessment ID.
+     * @param courseId Course ID the workshop belongs to.
+     * @param feedbackText The feedback for the reviewer.
+     * @param weight The new weight for the assessment.
+     * @param gradingGradeOver The new grading grade (empty for no overriding the grade).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when assessment evaluation is successfully saved.
      */
     saveEvaluateAssessment(workshopId: number, assessmentId: number, courseId: number, feedbackText: string, weight: number,
             gradingGradeOver: any, siteId?: string): Promise<any> {
@@ -737,7 +737,7 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Parse "gradinggradeover" column of an evaluate assessment record.
      *
-     * @param  {any} record Evaluate assessment record, modified in place.
+     * @param record Evaluate assessment record, modified in place.
      */
     protected parseEvaluateAssessmentRecord(record: any): void {
         record.gradinggradeover = this.textUtils.parseJSON(record.gradinggradeover);
@@ -746,9 +746,9 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Get the path to the folder where to store files for offline attachments in a workshop.
      *
-     * @param  {number} workshopId Workshop ID.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<string>}   Promise resolved with the path.
+     * @param workshopId Workshop ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the path.
      */
     getWorkshopFolder(workshopId: number, siteId?: string): Promise<string> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -763,11 +763,11 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Get the path to the folder where to store files for offline submissions.
      *
-     * @param  {number}  workshopId   Workshop ID.
-     * @param  {number}  submissionId If not editing, it will refer to timecreated.
-     * @param  {boolean} editing      If the submission is being edited or added otherwise.
-     * @param  {string}  [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<string>}      Promise resolved with the path.
+     * @param workshopId Workshop ID.
+     * @param submissionId If not editing, it will refer to timecreated.
+     * @param editing If the submission is being edited or added otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the path.
      */
     getSubmissionFolder(workshopId: number, submissionId: number, editing: boolean, siteId?: string): Promise<string> {
         return this.getWorkshopFolder(workshopId, siteId).then((folderPath) => {
@@ -781,10 +781,10 @@ export class AddonModWorkshopOfflineProvider {
     /**
      * Get the path to the folder where to store files for offline assessment.
      *
-     * @param  {number}  workshopId   Workshop ID.
-     * @param  {number}  assessmentId Assessment ID.
-     * @param  {string}  [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<string>}      Promise resolved with the path.
+     * @param workshopId Workshop ID.
+     * @param assessmentId Assessment ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the path.
      */
     getAssessmentFolder(workshopId: number, assessmentId: number, siteId?: string): Promise<string> {
         return this.getWorkshopFolder(workshopId, siteId).then((folderPath) => {
diff --git a/src/addon/mod/workshop/providers/prefetch-handler.ts b/src/addon/mod/workshop/providers/prefetch-handler.ts
index 49cc62055..460923c06 100644
--- a/src/addon/mod/workshop/providers/prefetch-handler.ts
+++ b/src/addon/mod/workshop/providers/prefetch-handler.ts
@@ -57,10 +57,10 @@ export class AddonModWorkshopPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Get list of files. If not defined, we'll assume they're in module.contents.
      *
-     * @param {any} module Module.
-     * @param {Number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @return {Promise<any[]>} Promise resolved with the list of files.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @return Promise resolved with the list of files.
      */
     getFiles(module: any, courseId: number, single?: boolean): Promise<any[]> {
         return this.getWorkshopInfoHelper(module, courseId, true).then((info) => {
@@ -71,13 +71,13 @@ export class AddonModWorkshopPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Helper function to get all workshop info just once.
      *
-     * @param  {any}     module              Module to get the files.
-     * @param  {number}  courseId            Course ID the module belongs to.
-     * @param  {boolean} [omitFail=false]    True to always return even if fails. Default false.
-     * @param  {boolean} [forceCache=false]  True to always get the value from cache, false otherwise. Default false.
-     * @param  {boolean} [ignoreCache=false] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {string}  [siteId]            Site ID. If not defined, current site.
-     * @return {Promise<any>}                Promise resolved with the info fetched.
+     * @param module Module to get the files.
+     * @param courseId Course ID the module belongs to.
+     * @param omitFail True to always return even if fails. Default false.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the info fetched.
      */
     protected getWorkshopInfoHelper(module: any, courseId: number, omitFail: boolean = false, forceCache: boolean = false,
             ignoreCache: boolean = false, siteId?: string): Promise<any> {
@@ -174,9 +174,9 @@ export class AddonModWorkshopPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId The course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId The course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         return this.workshopProvider.invalidateContent(moduleId, courseId);
@@ -185,9 +185,9 @@ export class AddonModWorkshopPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Check if a module can be downloaded. If the function is not defined, we assume that all modules are downloadable.
      *
-     * @param  {any} module Module.
-     * @param  {number} courseId Course ID the module belongs to.
-     * @return {boolean|Promise<boolean>} Whether the module can be downloaded. The promise should never be rejected.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Whether the module can be downloaded. The promise should never be rejected.
      */
     isDownloadable(module: any, courseId: number): boolean | Promise<boolean> {
         return this.workshopProvider.getWorkshop(courseId, module.id, undefined, true).then((workshop) => {
@@ -201,7 +201,7 @@ export class AddonModWorkshopPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
+     * @return A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.workshopProvider.isPluginEnabled();
@@ -210,11 +210,11 @@ export class AddonModWorkshopPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Prefetch a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
      */
     prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string): Promise<any> {
         return this.prefetchPackage(module, courseId, single, this.prefetchWorkshop.bind(this));
@@ -223,10 +223,10 @@ export class AddonModWorkshopPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Retrieves all the grades reports for all the groups and then returns only unique grades.
      *
-     * @param  {number}  workshopId Workshop ID.
-     * @param  {any[]}   groups     Array of groups in the activity.
-     * @param  {string}  siteId     Site ID. If not defined, current site.
-     * @return {Promise<any[]>}       All unique entries.
+     * @param workshopId Workshop ID.
+     * @param groups Array of groups in the activity.
+     * @param siteId Site ID. If not defined, current site.
+     * @return All unique entries.
      */
     protected getAllGradesReport(workshopId: number, groups: any[], siteId: string): Promise<any[]> {
         const promises = [];
@@ -254,11 +254,11 @@ export class AddonModWorkshopPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Prefetch a workshop.
      *
-     * @param  {any}     module   The module object returned by WS.
-     * @param  {number}  courseId Course ID the module belongs to.
-     * @param  {boolean} single   True if we're downloading a single module, false if we're downloading a whole section.
-     * @param  {string}  siteId   Site ID.
-     * @return {Promise<any>}     Promise resolved when done.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
      */
     protected prefetchWorkshop(module: any, courseId: number, single: boolean, siteId: string): Promise<any> {
         const userIds = [];
@@ -379,10 +379,10 @@ export class AddonModWorkshopPrefetchHandler extends CoreCourseActivityPrefetchH
     /**
      * Sync a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     sync(module: any, courseId: number, siteId?: any): Promise<any> {
         return this.syncProvider.syncWorkshop(module.instance, siteId);
diff --git a/src/addon/mod/workshop/providers/sync-cron-handler.ts b/src/addon/mod/workshop/providers/sync-cron-handler.ts
index 3202ff253..94886e298 100644
--- a/src/addon/mod/workshop/providers/sync-cron-handler.ts
+++ b/src/addon/mod/workshop/providers/sync-cron-handler.ts
@@ -29,9 +29,9 @@ export class AddonModWorkshopSyncCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         return this.workshopSync.syncAllWorkshops(siteId, force);
@@ -40,7 +40,7 @@ export class AddonModWorkshopSyncCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return this.workshopSync.syncInterval;
diff --git a/src/addon/mod/workshop/providers/sync.ts b/src/addon/mod/workshop/providers/sync.ts
index e30f6c387..6e3366205 100644
--- a/src/addon/mod/workshop/providers/sync.ts
+++ b/src/addon/mod/workshop/providers/sync.ts
@@ -64,9 +64,9 @@ export class AddonModWorkshopSyncProvider extends CoreSyncBaseProvider {
     /**
      * Check if an workshop has data to synchronize.
      *
-     * @param  {number} workshopId Workshop ID.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved with boolean: true if has data to sync, false otherwise.
+     * @param workshopId Workshop ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: true if has data to sync, false otherwise.
      */
     hasDataToSync(workshopId: number, siteId?: string): Promise<any> {
         return this.workshopOffline.hasWorkshopOfflineData(workshopId, siteId);
@@ -75,9 +75,9 @@ export class AddonModWorkshopSyncProvider extends CoreSyncBaseProvider {
     /**
      * Try to synchronize all workshops that need it and haven't been synchronized in a while.
      *
-     * @param  {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @return {Promise<any>}    Promise resolved when the sync is done.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved when the sync is done.
      */
     syncAllWorkshops(siteId?: string, force?: boolean): Promise<any> {
         return this.syncOnSites('all workshops', this.syncAllWorkshopsFunc.bind(this), [force], siteId);
@@ -86,9 +86,9 @@ export class AddonModWorkshopSyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync all workshops on a site.
      *
-     * @param  {string} siteId Site ID to sync.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @return {Promise<any>}    Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     protected syncAllWorkshopsFunc(siteId: string, force?: boolean): Promise<any> {
         return this.workshopOffline.getAllWorkshops(siteId).then((workshopIds) => {
@@ -114,9 +114,9 @@ export class AddonModWorkshopSyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync a workshop only if a certain time has passed since the last time.
      *
-     * @param  {number} workshopId Workshop ID.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved when the workshop is synced or if it doesn't need to be synced.
+     * @param workshopId Workshop ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the workshop is synced or if it doesn't need to be synced.
      */
     syncWorkshopIfNeeded(workshopId: number, siteId?: string): Promise<any> {
         return this.isSyncNeeded(workshopId, siteId).then((needed) => {
@@ -129,9 +129,9 @@ export class AddonModWorkshopSyncProvider extends CoreSyncBaseProvider {
     /**
      * Try to synchronize a workshop.
      *
-     * @param  {number} workshopId  Workshop ID.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}       Promise resolved if sync is successful, rejected otherwise.
+     * @param workshopId Workshop ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     syncWorkshop(workshopId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -269,11 +269,11 @@ export class AddonModWorkshopSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize a submission.
      *
-     * @param  {any}    workshop          Workshop.
-     * @param  {any[]}  submissionActions Submission actions offline data.
-     * @param  {any}    result            Object with the result of the sync.
-     * @param  {string} siteId            Site ID.
-     * @return {Promise<any>}             Promise resolved if success, rejected otherwise.
+     * @param workshop Workshop.
+     * @param submissionActions Submission actions offline data.
+     * @param result Object with the result of the sync.
+     * @param siteId Site ID.
+     * @return Promise resolved if success, rejected otherwise.
      */
     protected syncSubmission(workshop: any, submissionActions: any, result: any, siteId: string): Promise<any> {
         let discardError;
@@ -393,11 +393,11 @@ export class AddonModWorkshopSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize an assessment.
      *
-     * @param  {any}    workshop   Workshop.
-     * @param  {any}    assessment Assessment offline data.
-     * @param  {any}    result     Object with the result of the sync.
-     * @param  {string} siteId     Site ID.
-     * @return {Promise<any>}      Promise resolved if success, rejected otherwise.
+     * @param workshop Workshop.
+     * @param assessment Assessment offline data.
+     * @param result Object with the result of the sync.
+     * @param siteId Site ID.
+     * @return Promise resolved if success, rejected otherwise.
      */
     protected syncAssessment(workshop: any, assessmentData: any, result: any, siteId: string): Promise<any> {
         let discardError;
@@ -471,11 +471,11 @@ export class AddonModWorkshopSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize a submission evaluation.
      *
-     * @param  {any}    workshop Workshop.
-     * @param  {any}    evaluate Submission evaluation offline data.
-     * @param  {any}    result   Object with the result of the sync.
-     * @param  {string} siteId   Site ID.
-     * @return {Promise<any>}    Promise resolved if success, rejected otherwise.
+     * @param workshop Workshop.
+     * @param evaluate Submission evaluation offline data.
+     * @param result Object with the result of the sync.
+     * @param siteId Site ID.
+     * @return Promise resolved if success, rejected otherwise.
      */
     protected syncEvaluateSubmission(workshop: any, evaluate: any, result: any, siteId: string): Promise<any> {
         let discardError;
@@ -530,11 +530,11 @@ export class AddonModWorkshopSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize a assessment evaluation.
      *
-     * @param  {any}    workshop Workshop.
-     * @param  {any}    evaluate Assessment evaluation offline data.
-     * @param  {any}    result   Object with the result of the sync.
-     * @param  {string} siteId   Site ID.
-     * @return {Promise<any>}    Promise resolved if success, rejected otherwise.
+     * @param workshop Workshop.
+     * @param evaluate Assessment evaluation offline data.
+     * @param result Object with the result of the sync.
+     * @param siteId Site ID.
+     * @return Promise resolved if success, rejected otherwise.
      */
     protected syncEvaluateAssessment(workshop: any, evaluate: any, result: any, siteId: string): Promise<any> {
         let discardError;
diff --git a/src/addon/mod/workshop/providers/workshop.ts b/src/addon/mod/workshop/providers/workshop.ts
index bae7854f0..b356698ce 100644
--- a/src/addon/mod/workshop/providers/workshop.ts
+++ b/src/addon/mod/workshop/providers/workshop.ts
@@ -57,8 +57,8 @@ export class AddonModWorkshopProvider {
     /**
      * Get cache key for workshop data WS calls.
      *
-     * @param  {number} courseId Course ID.
-     * @return {string}          Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getWorkshopDataCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'workshop:' + courseId;
@@ -67,8 +67,8 @@ export class AddonModWorkshopProvider {
     /**
      * Get prefix cache key for all workshop activity data WS calls.
      *
-     * @param  {number} workshopId Workshop ID.
-     * @return {string}            Cache key.
+     * @param workshopId Workshop ID.
+     * @return Cache key.
      */
     protected getWorkshopDataPrefixCacheKey(workshopId: number): string {
         return this.ROOT_CACHE_KEY + workshopId;
@@ -77,8 +77,8 @@ export class AddonModWorkshopProvider {
     /**
      * Get cache key for workshop access information data WS calls.
      *
-     * @param  {number} workshopId Workshop ID.
-     * @return {string}            Cache key.
+     * @param workshopId Workshop ID.
+     * @return Cache key.
      */
     protected getWorkshopAccessInformationDataCacheKey(workshopId: number): string {
         return this.getWorkshopDataPrefixCacheKey(workshopId) + ':access';
@@ -87,8 +87,8 @@ export class AddonModWorkshopProvider {
     /**
      * Get cache key for workshop user plan data WS calls.
      *
-     * @param  {number} workshopId Workshop ID.
-     * @return {string}            Cache key.
+     * @param workshopId Workshop ID.
+     * @return Cache key.
      */
     protected getUserPlanDataCacheKey(workshopId: number): string {
         return this.getWorkshopDataPrefixCacheKey(workshopId) + ':userplan';
@@ -97,10 +97,10 @@ export class AddonModWorkshopProvider {
     /**
      * Get cache key for workshop submissions data WS calls.
      *
-     * @param  {number} workshopId  Workshop ID.
-     * @param  {number} [userId=0]  User ID.
-     * @param  {number} [groupId=0] Group ID.
-     * @return {string}             Cache key.
+     * @param workshopId Workshop ID.
+     * @param userId User ID.
+     * @param groupId Group ID.
+     * @return Cache key.
      */
     protected getSubmissionsDataCacheKey(workshopId: number, userId: number = 0, groupId: number = 0): string {
         return this.getWorkshopDataPrefixCacheKey(workshopId) + ':submissions:' + userId + ':' + groupId;
@@ -109,9 +109,9 @@ export class AddonModWorkshopProvider {
     /**
      * Get cache key for a workshop submission data WS calls.
      *
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} submissionId Submission ID.
-     * @return {string}              Cache key.
+     * @param workshopId Workshop ID.
+     * @param submissionId Submission ID.
+     * @return Cache key.
      */
     protected getSubmissionDataCacheKey(workshopId: number, submissionId: number): string {
         return this.getWorkshopDataPrefixCacheKey(workshopId) + ':submission:' + submissionId;
@@ -120,8 +120,8 @@ export class AddonModWorkshopProvider {
     /**
      * Get cache key for workshop grades data WS calls.
      *
-     * @param  {number} workshopId Workshop ID.
-     * @return {string}            Cache key.
+     * @param workshopId Workshop ID.
+     * @return Cache key.
      */
     protected getGradesDataCacheKey(workshopId: number): string {
         return this.getWorkshopDataPrefixCacheKey(workshopId) + ':grades';
@@ -130,9 +130,9 @@ export class AddonModWorkshopProvider {
     /**
      * Get cache key for workshop grade report data WS calls.
      *
-     * @param  {number} workshopId  Workshop ID.
-     * @param  {number} [groupId=0] Group ID.
-     * @return {string}             Cache key.
+     * @param workshopId Workshop ID.
+     * @param groupId Group ID.
+     * @return Cache key.
      */
     protected getGradesReportDataCacheKey(workshopId: number, groupId: number = 0): string {
         return this.getWorkshopDataPrefixCacheKey(workshopId) + ':report:' + groupId;
@@ -141,9 +141,9 @@ export class AddonModWorkshopProvider {
     /**
      * Get cache key for workshop submission assessments data WS calls.
      *
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} submissionId Submission ID.
-     * @return {string}              Cache key.
+     * @param workshopId Workshop ID.
+     * @param submissionId Submission ID.
+     * @return Cache key.
      */
     protected getSubmissionAssessmentsDataCacheKey(workshopId: number, submissionId: number): string {
         return this.getWorkshopDataPrefixCacheKey(workshopId) + ':assessments:' + submissionId;
@@ -152,9 +152,9 @@ export class AddonModWorkshopProvider {
     /**
      * Get cache key for workshop reviewer assessments data WS calls.
      *
-     * @param  {number} workshopId Workshop ID.
-     * @param  {number} [userId=0] User ID or current user.
-     * @return {string}            Cache key.
+     * @param workshopId Workshop ID.
+     * @param userId User ID or current user.
+     * @return Cache key.
      */
     protected getReviewerAssessmentsDataCacheKey(workshopId: number, userId: number = 0): string {
         return this.getWorkshopDataPrefixCacheKey(workshopId) + ':reviewerassessments:' + userId;
@@ -163,9 +163,9 @@ export class AddonModWorkshopProvider {
     /**
      * Get cache key for a workshop assessment data WS calls.
      *
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} assessmentId Assessment ID.
-     * @return {string}              Cache key.
+     * @param workshopId Workshop ID.
+     * @param assessmentId Assessment ID.
+     * @return Cache key.
      */
     protected getAssessmentDataCacheKey(workshopId: number, assessmentId: number): string {
         return this.getWorkshopDataPrefixCacheKey(workshopId) + ':assessment:' + assessmentId;
@@ -174,10 +174,10 @@ export class AddonModWorkshopProvider {
     /**
      * Get cache key for workshop assessment form data WS calls.
      *
-     * @param  {number} workshopId          Workshop ID.
-     * @param  {number} assessmentId        Assessment ID.
-     * @param  {string} [mode='assessment'] Mode assessment (default) or preview.
-     * @return {string}                     Cache key.
+     * @param workshopId Workshop ID.
+     * @param assessmentId Assessment ID.
+     * @param mode Mode assessment (default) or preview.
+     * @return Cache key.
      */
     protected getAssessmentFormDataCacheKey(workshopId: number, assessmentId: number, mode: string = 'assessment'): string {
         return this.getWorkshopDataPrefixCacheKey(workshopId) + ':assessmentsform:' + assessmentId + ':' + mode;
@@ -186,8 +186,8 @@ export class AddonModWorkshopProvider {
     /**
      * Return whether or not the plugin is enabled in a certain site. Plugin is enabled if the workshop WS are available.
      *
-     * @param  {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
      */
     isPluginEnabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -199,12 +199,12 @@ export class AddonModWorkshopProvider {
     /**
      * Get a workshop with key=value. If more than one is found, only the first will be returned.
      *
-     * @param  {number}  courseId           Course ID.
-     * @param  {string}  key                Name of the property to check.
-     * @param  {any}     value              Value to search.
-     * @param  {string}  [siteId]           Site ID. If not defined, current site.
-     * @param  {boolean} [forceCache=false] True to always get the value from cache, false otherwise. Default false.
-     * @return {Promise<any>}               Promise resolved when the workshop is retrieved.
+     * @param courseId Course ID.
+     * @param key Name of the property to check.
+     * @param value Value to search.
+     * @param siteId Site ID. If not defined, current site.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @return Promise resolved when the workshop is retrieved.
      */
     protected getWorkshopByKey(courseId: number, key: string, value: any, siteId?: string, forceCache: boolean = false):
             Promise<any> {
@@ -250,11 +250,11 @@ export class AddonModWorkshopProvider {
     /**
      * Get a workshop by course module ID.
      *
-     * @param  {number}  courseId           Course ID.
-     * @param  {number}  cmId               Course module ID.
-     * @param  {string}  [siteId]           Site ID. If not defined, current site.
-     * @param  {boolean} [forceCache=false] True to always get the value from cache, false otherwise. Default false.
-     * @return {Promise<any>}               Promise resolved when the workshop is retrieved.
+     * @param courseId Course ID.
+     * @param cmId Course module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @return Promise resolved when the workshop is retrieved.
      */
     getWorkshop(courseId: number, cmId: number, siteId?: string, forceCache: boolean = false): Promise<any> {
         return this.getWorkshopByKey(courseId, 'coursemodule', cmId, siteId, forceCache);
@@ -263,11 +263,11 @@ export class AddonModWorkshopProvider {
     /**
      * Get a workshop by ID.
      *
-     * @param  {number}  courseId           Course ID.
-     * @param  {number}  id                 Workshop ID.
-     * @param  {string}  [siteId]           Site ID. If not defined, current site.
-     * @param  {boolean} [forceCache=false] True to always get the value from cache, false otherwise. Default false.
-     * @return {Promise<any>}               Promise resolved when the workshop is retrieved.
+     * @param courseId Course ID.
+     * @param id Workshop ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @return Promise resolved when the workshop is retrieved.
      */
     getWorkshopById(courseId: number, id: number, siteId?: string, forceCache: boolean = false): Promise<any> {
         return this.getWorkshopByKey(courseId, 'id', id, siteId, forceCache);
@@ -276,9 +276,9 @@ export class AddonModWorkshopProvider {
     /**
      * Invalidates workshop data.
      *
-     * @param  {number} courseId Course ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when the workshop is invalidated.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the workshop is invalidated.
      */
     invalidateWorkshopData(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -289,9 +289,9 @@ export class AddonModWorkshopProvider {
     /**
      * Invalidates workshop data except files and module info.
      *
-     * @param  {number} workshopId Workshop ID.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved when the workshop is invalidated.
+     * @param workshopId Workshop ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the workshop is invalidated.
      */
     invalidateWorkshopWSData(workshopId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -302,11 +302,11 @@ export class AddonModWorkshopProvider {
     /**
      * Get access information for a given workshop.
      *
-     * @param  {number}  workshopId          Workshop ID.
-     * @param  {boolean} [offline=false]     True if it should return cached data. Has priority over ignoreCache.
-     * @param  {boolean} [ignoreCache=false] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {string}  [siteId]             Site ID. If not defined, current site.
-     * @return {Promise<any>}                 Promise resolved when the workshop is retrieved.
+     * @param workshopId Workshop ID.
+     * @param offline True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the workshop is retrieved.
      */
     getWorkshopAccessInformation(workshopId: number, offline: boolean = false, ignoreCache: boolean = false, siteId?: string):
             Promise<any> {
@@ -332,9 +332,9 @@ export class AddonModWorkshopProvider {
     /**
      * Invalidates workshop access information data.
      *
-     * @param  {number} workshopId Workshop ID.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved when the data is invalidated.
+     * @param workshopId Workshop ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateWorkshopAccessInformationData(workshopId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -345,11 +345,11 @@ export class AddonModWorkshopProvider {
     /**
      * Return the planner information for the given user.
      *
-     * @param  {number}  workshopId          Workshop ID.
-     * @param  {boolean} [offline=false]     True if it should return cached data. Has priority over ignoreCache.
-     * @param  {boolean} [ignoreCache=false] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {string}  [siteId]            Site ID. If not defined, current site.
-     * @return {Promise<any>}                Promise resolved when the workshop data is retrieved.
+     * @param workshopId Workshop ID.
+     * @param offline True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the workshop data is retrieved.
      */
     getUserPlanPhases(workshopId: number, offline: boolean = false, ignoreCache: boolean = false, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -381,9 +381,9 @@ export class AddonModWorkshopProvider {
     /**
      * Invalidates workshop user plan data.
      *
-     * @param  {number} workshopId Workshop ID.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved when the data is invalidated.
+     * @param workshopId Workshop ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateUserPlanPhasesData(workshopId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -394,13 +394,13 @@ export class AddonModWorkshopProvider {
     /**
      * Retrieves all the workshop submissions visible by the current user or the one done by the given user.
      *
-     * @param  {number}  workshopId          Workshop ID.
-     * @param  {number}  [userId=0]          User ID, 0 means the current user.
-     * @param  {number}  [groupId=0]         Group id, 0 means that the function will determine the user group.
-     * @param  {boolean} [offline=false]     True if it should return cached data. Has priority over ignoreCache.
-     * @param  {boolean} [ignoreCache=false] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {string}  [siteId]            Site ID. If not defined, current site.
-     * @return {Promise<any[]>}              Promise resolved when the workshop submissions are retrieved.
+     * @param workshopId Workshop ID.
+     * @param userId User ID, 0 means the current user.
+     * @param groupId Group id, 0 means that the function will determine the user group.
+     * @param offline True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the workshop submissions are retrieved.
      */
     getSubmissions(workshopId: number, userId: number = 0, groupId: number = 0, offline: boolean = false,
             ignoreCache: boolean = false, siteId?: string): Promise<any[]> {
@@ -435,11 +435,11 @@ export class AddonModWorkshopProvider {
     /**
      * Invalidates workshop submissions data.
      *
-     * @param  {number} workshopId  Workshop ID.
-     * @param  {number} [userId=0]  User ID.
-     * @param  {number} [groupId=0] Group ID.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}       Promise resolved when the data is invalidated.
+     * @param workshopId Workshop ID.
+     * @param userId User ID.
+     * @param groupId Group ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateSubmissionsData(workshopId: number, userId: number = 0, groupId: number = 0, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -450,10 +450,10 @@ export class AddonModWorkshopProvider {
     /**
      * Retrieves the given submission.
      *
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} submissionId Submission ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the workshop submission data is retrieved.
+     * @param workshopId Workshop ID.
+     * @param submissionId Submission ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the workshop submission data is retrieved.
      */
     getSubmission(workshopId: number, submissionId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -477,10 +477,10 @@ export class AddonModWorkshopProvider {
     /**
      * Invalidates workshop submission data.
      *
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} submissionId Submission ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the data is invalidated.
+     * @param workshopId Workshop ID.
+     * @param submissionId Submission ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateSubmissionData(workshopId: number, submissionId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -491,9 +491,9 @@ export class AddonModWorkshopProvider {
     /**
      * Returns the grades information for the given workshop and user.
      *
-     * @param  {number} workshopId Workshop ID.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved when the workshop grades data is retrieved.
+     * @param workshopId Workshop ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the workshop grades data is retrieved.
      */
     getGrades(workshopId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -511,9 +511,9 @@ export class AddonModWorkshopProvider {
     /**
      * Invalidates workshop grades data.
      *
-     * @param  {number} workshopId Workshop ID.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved when the data is invalidated.
+     * @param workshopId Workshop ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateGradesData(workshopId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -524,14 +524,14 @@ export class AddonModWorkshopProvider {
     /**
      * Retrieves the assessment grades report.
      *
-     * @param  {number}  workshopId          Workshop ID.
-     * @param  {number}  [groupId]           Group id, 0 means that the function will determine the user group.
-     * @param  {number}  [page=0]            Page of records to return. Default 0.
-     * @param  {number}  [perPage=0]         Records per page to return. Default AddonModWorkshopProvider.PER_PAGE.
-     * @param  {boolean} [offline=false]     True if it should return cached data. Has priority over ignoreCache.
-     * @param  {boolean} [ignoreCache=false] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {string}  [siteId]            Site ID. If not defined, current site.
-     * @return {Promise<any>}                Promise resolved when the workshop data is retrieved.
+     * @param workshopId Workshop ID.
+     * @param groupId Group id, 0 means that the function will determine the user group.
+     * @param page Page of records to return. Default 0.
+     * @param perPage Records per page to return. Default AddonModWorkshopProvider.PER_PAGE.
+     * @param offline True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the workshop data is retrieved.
      */
     getGradesReport(workshopId: number, groupId: number = 0, page: number = 0, perPage: number = 0, offline: boolean = false,
             ignoreCache: boolean = false, siteId?: string): Promise<any> {
@@ -567,14 +567,14 @@ export class AddonModWorkshopProvider {
     /**
      * Performs the whole fetch of the grade reports in the workshop.
      *
-     * @param  {number}  workshopId          Workshop ID.
-     * @param  {number}  [groupId=0]         Group ID.
-     * @param  {number}  [perPage=0]         Records per page to fetch. It has to match with the prefetch.
-     *                                       Default on AddonModWorkshopProvider.PER_PAGE.
-     * @param  {boolean} [forceCache=false]  True to always get the value from cache, false otherwise. Default false.
-     * @param  {boolean} [ignoreCache=false] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {string}  [siteId]            Site ID. If not defined, current site.
-     * @return {Promise<any[]>}              Promise resolved when done.
+     * @param workshopId Workshop ID.
+     * @param groupId Group ID.
+     * @param perPage Records per page to fetch. It has to match with the prefetch.
+     *                Default on AddonModWorkshopProvider.PER_PAGE.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     fetchAllGradeReports(workshopId: number, groupId: number = 0, perPage: number = 0, forceCache: boolean = false,
             ignoreCache: boolean = false, siteId?: string): Promise<any> {
@@ -587,15 +587,15 @@ export class AddonModWorkshopProvider {
     /**
      * Recursive call on fetch all grade reports.
      *
-     * @param  {number}  workshopId  Workshop ID.
-     * @param  {number}  groupId     Group ID.
-     * @param  {number}  perPage     Records per page to fetch. It has to match with the prefetch.
-     * @param  {boolean} forceCache  True to always get the value from cache, false otherwise. Default false.
-     * @param  {boolean} ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {any[]}   grades      Grades already fetched (just to concatenate them).
-     * @param  {number}  page        Page of records to return.
-     * @param  {string}  siteId      Site ID.
-     * @return {Promise<any[]>}      Promise resolved when done.
+     * @param workshopId Workshop ID.
+     * @param groupId Group ID.
+     * @param perPage Records per page to fetch. It has to match with the prefetch.
+     * @param forceCache True to always get the value from cache, false otherwise. Default false.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param grades Grades already fetched (just to concatenate them).
+     * @param page Page of records to return.
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
      */
     protected fetchGradeReportsRecursive(workshopId: number, groupId: number, perPage: number, forceCache: boolean,
             ignoreCache: boolean, grades: any[], page: number, siteId: string): Promise<any[]> {
@@ -615,10 +615,10 @@ export class AddonModWorkshopProvider {
     /**
      * Invalidates workshop grade report data.
      *
-     * @param  {number} workshopId  Workshop ID.
-     * @param  {number} [groupId=0] Group ID.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}       Promise resolved when the data is invalidated.
+     * @param workshopId Workshop ID.
+     * @param groupId Group ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateGradeReportData(workshopId: number, groupId: number = 0, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -629,12 +629,12 @@ export class AddonModWorkshopProvider {
     /**
      * Retrieves the given submission assessment.
      *
-     * @param  {number}  workshopId          Workshop ID.
-     * @param  {number}  submissionId        Submission ID.
-     * @param  {boolean} [offline=false]     True if it should return cached data. Has priority over ignoreCache.
-     * @param  {boolean} [ignoreCache=false] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {string}  [siteId]            Site ID. If not defined, current site.
-     * @return {Promise<any[]>}              Promise resolved when the workshop data is retrieved.
+     * @param workshopId Workshop ID.
+     * @param submissionId Submission ID.
+     * @param offline True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the workshop data is retrieved.
      */
     getSubmissionAssessments(workshopId: number, submissionId: number, offline: boolean = false, ignoreCache: boolean = false,
             siteId?: string): Promise<any[]> {
@@ -666,10 +666,10 @@ export class AddonModWorkshopProvider {
     /**
      * Invalidates workshop submission assessments data.
      *
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} submissionId Submission ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the data is invalidated.
+     * @param workshopId Workshop ID.
+     * @param submissionId Submission ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateSubmissionAssesmentsData(workshopId: number, submissionId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -680,15 +680,15 @@ export class AddonModWorkshopProvider {
     /**
      * Add a new submission to a given workshop.
      *
-     * @param  {number}  workshopId           Workshop ID.
-     * @param  {number}  courseId             Course ID the workshop belongs to.
-     * @param  {string}  title                The submission title.
-     * @param  {string}  content              The submission text content.
-     * @param  {number}  [attachmentsId]      The draft file area id for attachments.
-     * @param  {string}  [siteId]             Site ID. If not defined, current site.
-     * @param  {number}  [timecreated]        The time the submission was created. Only used when editing an offline discussion.
-     * @param  {boolean} [allowOffline=false] True if it can be stored in offline, false otherwise.
-     * @return {Promise<any>}                 Promise resolved with submission ID if sent online or false if stored offline.
+     * @param workshopId Workshop ID.
+     * @param courseId Course ID the workshop belongs to.
+     * @param title The submission title.
+     * @param content The submission text content.
+     * @param attachmentsId The draft file area id for attachments.
+     * @param siteId Site ID. If not defined, current site.
+     * @param timecreated The time the submission was created. Only used when editing an offline discussion.
+     * @param allowOffline True if it can be stored in offline, false otherwise.
+     * @return Promise resolved with submission ID if sent online or false if stored offline.
      */
     addSubmission(workshopId: number, courseId: number, title: string, content: string, attachmentsId?: number, siteId?: string,
             timecreated?: number, allowOffline: boolean = false): Promise<any> {
@@ -727,12 +727,12 @@ export class AddonModWorkshopProvider {
     /**
      * Add a new submission to a given workshop. It will fail if offline or cannot connect.
      *
-     * @param  {number} workshopId      Workshop ID.
-     * @param  {string} title           The submission title.
-     * @param  {string} content         The submission text content.
-     * @param  {number} [attachmentsId] The draft file area id for attachments.
-     * @param  {string} [siteId]        Site ID. If not defined, current site.
-     * @return {Promise<any>}           Promise resolved when the submission is created.
+     * @param workshopId Workshop ID.
+     * @param title The submission title.
+     * @param content The submission text content.
+     * @param attachmentsId The draft file area id for attachments.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the submission is created.
      */
     addSubmissionOnline(workshopId: number, title: string, content: string, attachmentsId: number, siteId?: string):
             Promise<any> {
@@ -758,15 +758,15 @@ export class AddonModWorkshopProvider {
     /**
      * Updates the given submission.
      *
-     * @param  {number}  workshopId           Workshop ID.
-     * @param  {number}  submissionId         Submission ID.
-     * @param  {number}  courseId             Course ID the workshop belongs to.
-     * @param  {string}  title                The submission title.
-     * @param  {string}  content              The submission text content.
-     * @param  {number}  [attachmentsId]      The draft file area id for attachments.
-     * @param  {string}  [siteId]             Site ID. If not defined, current site.
-     * @param  {boolean} [allowOffline=false] True if it can be stored in offline, false otherwise.
-     * @return {Promise<any>}                 Promise resolved with submission ID if sent online or false if stored offline.
+     * @param workshopId Workshop ID.
+     * @param submissionId Submission ID.
+     * @param courseId Course ID the workshop belongs to.
+     * @param title The submission title.
+     * @param content The submission text content.
+     * @param attachmentsId The draft file area id for attachments.
+     * @param siteId Site ID. If not defined, current site.
+     * @param allowOffline True if it can be stored in offline, false otherwise.
+     * @return Promise resolved with submission ID if sent online or false if stored offline.
      */
     updateSubmission(workshopId: number, submissionId: number, courseId: number, title: string, content: string,
             attachmentsId?: number, siteId?: string, allowOffline: boolean = false): Promise<any> {
@@ -802,12 +802,12 @@ export class AddonModWorkshopProvider {
     /**
      * Updates the given submission. It will fail if offline or cannot connect.
      *
-     * @param  {number} submissionId    Submission ID.
-     * @param  {string} title           The submission title.
-     * @param  {string} content         The submission text content.
-     * @param  {number} [attachmentsId] The draft file area id for attachments.
-     * @param  {string} [siteId]        Site ID. If not defined, current site.
-     * @return {Promise<any>}           Promise resolved when the submission is updated.
+     * @param submissionId Submission ID.
+     * @param title The submission title.
+     * @param content The submission text content.
+     * @param attachmentsId The draft file area id for attachments.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the submission is updated.
      */
     updateSubmissionOnline(submissionId: number, title: string, content: string, attachmentsId?: number, siteId?: string):
             Promise<any> {
@@ -834,11 +834,11 @@ export class AddonModWorkshopProvider {
     /**
      * Deletes the given submission.
      *
-     * @param  {number}  workshopId  Workshop ID.
-     * @param  {number} submissionId Submission ID.
-     * @param  {number} courseId     Course ID the workshop belongs to.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved with submission ID if sent online, resolved with false if stored offline.
+     * @param workshopId Workshop ID.
+     * @param submissionId Submission ID.
+     * @param courseId Course ID the workshop belongs to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with submission ID if sent online, resolved with false if stored offline.
      */
     deleteSubmission(workshopId: number, submissionId: number, courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -872,9 +872,9 @@ export class AddonModWorkshopProvider {
     /**
      * Deletes the given submission. It will fail if offline or cannot connect.
      *
-     * @param  {number} submissionId Submission ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the submission is deleted.
+     * @param submissionId Submission ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the submission is deleted.
      */
     deleteSubmissionOnline(submissionId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -897,12 +897,12 @@ export class AddonModWorkshopProvider {
     /**
      * Retrieves all the assessments reviewed by the given user.
      *
-     * @param  {number}  workshopId          Workshop ID.
-     * @param  {number}  [userId]            User ID. If not defined, current user.
-     * @param  {boolean} [offline=false]     True if it should return cached data. Has priority over ignoreCache.
-     * @param  {boolean} [ignoreCache=false] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {string}  [siteId]            Site ID. If not defined, current site.
-     * @return {Promise<any[]>}              Promise resolved when the workshop data is retrieved.
+     * @param workshopId Workshop ID.
+     * @param userId User ID. If not defined, current user.
+     * @param offline True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the workshop data is retrieved.
      */
     getReviewerAssessments(workshopId: number, userId?: number, offline: boolean = false, ignoreCache: boolean = false,
             siteId?: string): Promise<any[]> {
@@ -938,10 +938,10 @@ export class AddonModWorkshopProvider {
     /**
      * Invalidates workshop user assessments data.
      *
-     * @param  {number} workshopId Workshop ID.
-     * @param  {number} [userId]   User ID. If not defined, current user.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved when the data is invalidated.
+     * @param workshopId Workshop ID.
+     * @param userId User ID. If not defined, current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateReviewerAssesmentsData(workshopId: number, userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -952,10 +952,10 @@ export class AddonModWorkshopProvider {
     /**
      * Retrieves the given assessment.
      *
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} assessmentId Assessment ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the workshop data is retrieved.
+     * @param workshopId Workshop ID.
+     * @param assessmentId Assessment ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the workshop data is retrieved.
      */
     getAssessment(workshopId: number, assessmentId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -979,10 +979,10 @@ export class AddonModWorkshopProvider {
     /**
      * Invalidates workshop assessment data.
      *
-     * @param  {number} workshopId   Workshop ID.
-     * @param  {number} assessmentId Assessment ID.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when the data is invalidated.
+     * @param workshopId Workshop ID.
+     * @param assessmentId Assessment ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAssessmentData(workshopId: number, assessmentId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -993,13 +993,13 @@ export class AddonModWorkshopProvider {
     /**
      * Retrieves the assessment form definition (data required to be able to display the assessment form).
      *
-     * @param  {number}    workshopId          Workshop ID.
-     * @param  {number}    assessmentId        Assessment ID.
-     * @param  {string}    [mode='assessment'] Mode assessment (default) or preview.
-     * @param  {boolean}   [offline=false]     True if it should return cached data. Has priority over ignoreCache.
-     * @param  {boolean}   [ignoreCache=false] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param  {string}    [siteId]            Site ID. If not defined, current site.
-     * @return {Promise<any>}                  Promise resolved when the workshop data is retrieved.
+     * @param workshopId Workshop ID.
+     * @param assessmentId Assessment ID.
+     * @param mode Mode assessment (default) or preview.
+     * @param offline True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the workshop data is retrieved.
      */
     getAssessmentForm(workshopId: number, assessmentId: number, mode: string = 'assessment', offline: boolean = false,
             ignoreCache: boolean = false, siteId?: string): Promise<any> {
@@ -1037,8 +1037,8 @@ export class AddonModWorkshopProvider {
     /**
      * Parse fieldes into a more handful format.
      *
-     * @param  {any[]} fields Fields to parse
-     * @return {any[]}        Parsed fields
+     * @param fields Fields to parse
+     * @return Parsed fields
      */
     parseFields(fields: any[]): any[] {
         const parsedFields = [];
@@ -1078,11 +1078,11 @@ export class AddonModWorkshopProvider {
     /**
      * Invalidates workshop assessments form data.
      *
-     * @param  {number} workshopId          Workshop ID.
-     * @param  {number} assessmentId        Assessment ID.
-     * @param  {string} [mode='assessment'] Mode assessment (default) or preview.
-     * @param  {string} [siteId]            Site ID. If not defined, current site.
-     * @return {Promise<any>}               Promise resolved when the data is invalidated.
+     * @param workshopId Workshop ID.
+     * @param assessmentId Assessment ID.
+     * @param mode Mode assessment (default) or preview.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAssessmentFormData(workshopId: number, assessmentId: number, mode: string = 'assessment', siteId?: string):
             Promise<any> {
@@ -1094,14 +1094,14 @@ export class AddonModWorkshopProvider {
     /**
      * Updates the given assessment.
      *
-     * @param {number}  workshopId           Workshop ID.
-     * @param {number}  assessmentId         Assessment ID.
-     * @param {number}  courseId             Course ID the workshop belongs to.
-     * @param {any}     inputData            Assessment data.
-     * @param {string}  [siteId]             Site ID. If not defined, current site.
-     * @param {boolean} [allowOffline=false] True if it can be stored in offline, false otherwise.
-     * @return {Promise<any>}                Promise resolved with the grade of the submission if sent online,
-     *                                       resolved with false if stored offline.
+     * @param workshopId Workshop ID.
+     * @param assessmentId Assessment ID.
+     * @param courseId Course ID the workshop belongs to.
+     * @param inputData Assessment data.
+     * @param siteId Site ID. If not defined, current site.
+     * @param allowOffline True if it can be stored in offline, false otherwise.
+     * @return Promise resolved with the grade of the submission if sent online,
+     *         resolved with false if stored offline.
      */
     updateAssessment(workshopId: number, assessmentId: number, courseId: number, inputData: any, siteId?: any,
             allowOffline: boolean = false): Promise<any> {
@@ -1136,10 +1136,10 @@ export class AddonModWorkshopProvider {
     /**
      * Updates the given assessment. It will fail if offline or cannot connect.
      *
-     * @param  {number} assessmentId Assessment ID.
-     * @param  {any}    inputData    Assessment data.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved with the grade of the submission.
+     * @param assessmentId Assessment ID.
+     * @param inputData Assessment data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the grade of the submission.
      */
     updateAssessmentOnline(assessmentId: number, inputData: any, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1163,15 +1163,15 @@ export class AddonModWorkshopProvider {
     /**
      * Evaluates a submission (used by teachers for provide feedback or override the submission grade).
      *
-     * @param  {number}  workshopId   Workshop ID.
-     * @param  {number}  submissionId The submission id.
-     * @param  {number}  courseId     Course ID the workshop belongs to.
-     * @param  {string}  feedbackText The feedback for the author.
-     * @param  {boolean} published    Whether to publish the submission for other users.
-     * @param  {any}     gradeOver    The new submission grade (empty for no overriding the grade).
-     * @param  {string}  [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved when submission is evaluated if sent online,
-     *                                resolved with false if stored offline.
+     * @param workshopId Workshop ID.
+     * @param submissionId The submission id.
+     * @param courseId Course ID the workshop belongs to.
+     * @param feedbackText The feedback for the author.
+     * @param published Whether to publish the submission for other users.
+     * @param gradeOver The new submission grade (empty for no overriding the grade).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when submission is evaluated if sent online,
+     *         resolved with false if stored offline.
      */
     evaluateSubmission(workshopId: number, submissionId: number, courseId: number, feedbackText: string, published: boolean,
             gradeOver: any, siteId?: string): Promise<any> {
@@ -1208,12 +1208,12 @@ export class AddonModWorkshopProvider {
      * Evaluates a submission (used by teachers for provide feedback or override the submission grade).
      * It will fail if offline or cannot connect.
      *
-     * @param  {number}  submissionId The submission id.
-     * @param  {string}  feedbackText The feedback for the author.
-     * @param  {boolean} published    Whether to publish the submission for other users.
-     * @param  {any}     gradeOver    The new submission grade (empty for no overriding the grade).
-     * @param  {string}  [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved when the submission is evaluated.
+     * @param submissionId The submission id.
+     * @param feedbackText The feedback for the author.
+     * @param published Whether to publish the submission for other users.
+     * @param gradeOver The new submission grade (empty for no overriding the grade).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the submission is evaluated.
      */
     evaluateSubmissionOnline(submissionId: number, feedbackText: string, published: boolean, gradeOver: any,
             siteId?: string): Promise<any> {
@@ -1241,15 +1241,15 @@ export class AddonModWorkshopProvider {
     /**
      * Evaluates an assessment (used by teachers for provide feedback to the reviewer).
      *
-     * @param  {number}  workshopId       Workshop ID.
-     * @param  {number}  assessmentId     The assessment id.
-     * @param  {number}  courseId         Course ID the workshop belongs to.
-     * @param  {string}  feedbackText     The feedback for the reviewer.
-     * @param  {boolean} weight           The new weight for the assessment.
-     * @param  {any}     gradingGradeOver The new grading grade (empty for no overriding the grade).
-     * @param  {string}  [siteId]         Site ID. If not defined, current site.
-     * @return {Promise<any>}             Promise resolved when assessment is evaluated if sent online,
-     *                                    resolved with false if stored offline.
+     * @param workshopId Workshop ID.
+     * @param assessmentId The assessment id.
+     * @param courseId Course ID the workshop belongs to.
+     * @param feedbackText The feedback for the reviewer.
+     * @param weight The new weight for the assessment.
+     * @param gradingGradeOver The new grading grade (empty for no overriding the grade).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when assessment is evaluated if sent online,
+     *         resolved with false if stored offline.
      */
     evaluateAssessment(workshopId: number, assessmentId: number, courseId: number, feedbackText: string, weight: number,
             gradingGradeOver: any, siteId?: string): Promise<any> {
@@ -1285,12 +1285,12 @@ export class AddonModWorkshopProvider {
     /**
      * Evaluates an assessment (used by teachers for provide feedback to the reviewer). It will fail if offline or cannot connect.
      *
-     * @param  {number}  assessmentId     The assessment id.
-     * @param  {string}  feedbackText     The feedback for the reviewer.
-     * @param  {number}  weight           The new weight for the assessment.
-     * @param  {any}     gradingGradeOver The new grading grade (empty for no overriding the grade).
-     * @param  {string}  [siteId]         Site ID. If not defined, current site.
-     * @return {Promise<any>}             Promise resolved when the assessment is evaluated.
+     * @param assessmentId The assessment id.
+     * @param feedbackText The feedback for the reviewer.
+     * @param weight The new weight for the assessment.
+     * @param gradingGradeOver The new grading grade (empty for no overriding the grade).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the assessment is evaluated.
      */
     evaluateAssessmentOnline(assessmentId: number, feedbackText: string, weight: number, gradingGradeOver: any, siteId?: string):
             Promise<any> {
@@ -1319,10 +1319,10 @@ export class AddonModWorkshopProvider {
      * Invalidate the prefetched content except files.
      * To invalidate files, use AddonModWorkshopProvider#invalidateFiles.
      *
-     * @param  {number} moduleId The module ID.
-     * @param  {number} courseId Course ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promised resolved when content is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promised resolved when content is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -1336,10 +1336,10 @@ export class AddonModWorkshopProvider {
      * Invalidate the prefetched content except files using the activityId.
      * To invalidate files, use AdddonModWorkshop#invalidateFiles.
      *
-     * @param  {number} workshopId Workshop ID.
-     * @param  {number} courseId   Course ID.
-     * @param  {string} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise<any>}      Promise resolved when content is invalidated.
+     * @param workshopId Workshop ID.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when content is invalidated.
      */
     invalidateContentById(workshopId: number, courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -1356,9 +1356,9 @@ export class AddonModWorkshopProvider {
     /**
      * Invalidate the prefetched files.
      *
-     * @param  {number} moduleId The module ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when the files are invalidated.
+     * @param moduleId The module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the files are invalidated.
      */
     invalidateFiles(moduleId: number, siteId?: string): Promise<any> {
         return this.filepoolProvider.invalidateFilesByComponent(siteId, AddonModWorkshopProvider.COMPONENT, moduleId);
@@ -1367,10 +1367,10 @@ export class AddonModWorkshopProvider {
     /**
      * Report the workshop as being viewed.
      *
-     * @param  {number} id       Workshop ID.
-     * @param {string} [name] Name of the workshop.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when the WS call is successful.
+     * @param id Workshop ID.
+     * @param name Name of the workshop.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(id: number, name?: string, siteId?: string): Promise<any> {
         const params = {
@@ -1384,11 +1384,11 @@ export class AddonModWorkshopProvider {
     /**
      * Report the workshop submission as being viewed.
      *
-     * @param  {number} id          Submission ID.
-     * @param  {number} workshopId  Workshop ID.
-     * @param {string} [name] Name of the workshop.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when the WS call is successful.
+     * @param id Submission ID.
+     * @param workshopId Workshop ID.
+     * @param name Name of the workshop.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logViewSubmission(id: number, workshopId: number, name?: string, siteId?: string): Promise<any> {
         const params = {
diff --git a/src/addon/notes/components/list/list.ts b/src/addon/notes/components/list/list.ts
index cf6f54afa..2011957ed 100644
--- a/src/addon/notes/components/list/list.ts
+++ b/src/addon/notes/components/list/list.ts
@@ -90,9 +90,9 @@ export class AddonNotesListComponent implements OnInit, OnDestroy {
     /**
      * Fetch notes.
      *
-     * @param  {boolean} sync         When to resync notes.
-     * @param  {boolean} [showErrors] When to display errors or not.
-     * @return {Promise<any>}         Promise with the notes.
+     * @param sync When to resync notes.
+     * @param showErrors When to display errors or not.
+     * @return Promise with the notes.
      */
     private fetchNotes(sync: boolean, showErrors?: boolean): Promise<any> {
         const promise = sync ? this.syncNotes(showErrors) : Promise.resolve();
@@ -141,8 +141,8 @@ export class AddonNotesListComponent implements OnInit, OnDestroy {
     /**
      * Refresh notes on PTR.
      *
-     * @param {boolean} showErrors Whether to display errors or not.
-     * @param {any}     refresher  Refresher instance.
+     * @param showErrors Whether to display errors or not.
+     * @param refresher Refresher instance.
      */
     refreshNotes(showErrors: boolean, refresher?: any): void {
         this.refreshIcon = 'spinner';
@@ -173,7 +173,7 @@ export class AddonNotesListComponent implements OnInit, OnDestroy {
     /**
      * Add a new Note to user and course.
      *
-     * @param {Event} e Event.
+     * @param e Event.
      */
     addNote(e: Event): void {
         e.preventDefault();
@@ -198,8 +198,8 @@ export class AddonNotesListComponent implements OnInit, OnDestroy {
     /**
      * Delete a note.
      *
-     * @param {Event} e Click event.
-     * @param {any} note Note to delete.
+     * @param e Click event.
+     * @param note Note to delete.
      */
     deleteNote(e: Event, note: any): void {
         e.preventDefault();
@@ -223,8 +223,8 @@ export class AddonNotesListComponent implements OnInit, OnDestroy {
     /**
      * Restore a note.
      *
-     * @param {Event} e Click event.
-     * @param {any} note Note to delete.
+     * @param e Click event.
+     * @param note Note to delete.
      */
     undoDeleteNote(e: Event, note: any): void {
         e.preventDefault();
@@ -245,8 +245,8 @@ export class AddonNotesListComponent implements OnInit, OnDestroy {
     /**
      * Tries to synchronize course notes.
      *
-     * @param  {boolean} showErrors Whether to display errors or not.
-     * @return {Promise<any>}       Promise resolved if sync is successful, rejected otherwise.
+     * @param showErrors Whether to display errors or not.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     private syncNotes(showErrors: boolean): Promise<any> {
         return this.notesSync.syncNotes(this.courseId).then((warnings) => {
@@ -263,7 +263,7 @@ export class AddonNotesListComponent implements OnInit, OnDestroy {
     /**
      * Show sync warnings if any.
      *
-     * @param {string[]} warnings the warnings
+     * @param warnings the warnings
      */
     private showSyncWarnings(warnings: string[]): void {
         const message = this.textUtils.buildMessage(warnings);
diff --git a/src/addon/notes/pages/add/add.ts b/src/addon/notes/pages/add/add.ts
index 98c770c8f..aed8e5364 100644
--- a/src/addon/notes/pages/add/add.ts
+++ b/src/addon/notes/pages/add/add.ts
@@ -43,7 +43,7 @@ export class AddonNotesAddPage {
     /**
      * Send the note or store it offline.
      *
-     * @param {Event} e Event.
+     * @param e Event.
      */
     addNote(e: Event): void {
         e.preventDefault();
diff --git a/src/addon/notes/providers/course-option-handler.ts b/src/addon/notes/providers/course-option-handler.ts
index f00761ae8..9d5672961 100644
--- a/src/addon/notes/providers/course-option-handler.ts
+++ b/src/addon/notes/providers/course-option-handler.ts
@@ -31,7 +31,7 @@ export class AddonNotesCourseOptionHandler implements CoreCourseOptionsHandler {
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.notesProvider.isPluginEnabled();
@@ -40,11 +40,11 @@ export class AddonNotesCourseOptionHandler implements CoreCourseOptionsHandler {
     /**
      * Whether or not the handler is enabled for a certain course.
      *
-     * @param {number} courseId The course ID.
-     * @param {any} accessData Access type and data. Default, guest, ...
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @param courseId The course ID.
+     * @param accessData Access type and data. Default, guest, ...
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return True or promise resolved with true if enabled.
      */
      isEnabledForCourse(courseId: number, accessData: any, navOptions?: any, admOptions?: any): boolean | Promise<boolean> {
         if (accessData && accessData.type == CoreCourseProvider.ACCESS_GUEST) {
@@ -61,8 +61,8 @@ export class AddonNotesCourseOptionHandler implements CoreCourseOptionsHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @param {number} courseId The course ID.
-     * @return {CoreCourseOptionsHandlerData} Data.
+     * @param courseId The course ID.
+     * @return Data.
      */
     getDisplayData?(injector: Injector, courseId: number): CoreCourseOptionsHandlerData {
         return {
@@ -75,8 +75,8 @@ export class AddonNotesCourseOptionHandler implements CoreCourseOptionsHandler {
     /**
      * Called when a course is downloaded. It should prefetch all the data to be able to see the addon in offline.
      *
-     * @param {any} course The course.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param course The course.
+     * @return Promise resolved when done.
      */
     prefetch(course: any): Promise<any> {
         return this.notesProvider.getNotes(course.id, undefined, true);
diff --git a/src/addon/notes/providers/notes-offline.ts b/src/addon/notes/providers/notes-offline.ts
index 28bae97bf..3b844062c 100644
--- a/src/addon/notes/providers/notes-offline.ts
+++ b/src/addon/notes/providers/notes-offline.ts
@@ -94,11 +94,11 @@ export class AddonNotesOfflineProvider {
     /**
      * Delete an offline note.
      *
-     * @param  {number} userId      User ID the note is about.
-     * @param  {string} content     The note content.
-     * @param  {number} timecreated The time the note was created.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}       Promise resolved if deleted, rejected if failure.
+     * @param userId User ID the note is about.
+     * @param content The note content.
+     * @param timecreated The time the note was created.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if deleted, rejected if failure.
      */
     deleteOfflineNote(userId: number, content: string, timecreated: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -113,8 +113,8 @@ export class AddonNotesOfflineProvider {
     /**
      * Get all offline deleted notes.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved with notes.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with notes.
      */
     getAllDeletedNotes(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -125,9 +125,9 @@ export class AddonNotesOfflineProvider {
     /**
      * Get course offline deleted notes.
      *
-     * @param  {number} courseId Course ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved with notes.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with notes.
      */
     getCourseDeletedNotes(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -138,8 +138,8 @@ export class AddonNotesOfflineProvider {
     /**
      * Get all offline notes.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved with notes.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with notes.
      */
     getAllNotes(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -150,11 +150,11 @@ export class AddonNotesOfflineProvider {
     /**
      * Get an offline note.
      *
-     * @param  {number} userId      User ID the note is about.
-     * @param  {string} content     The note content.
-     * @param  {number} timecreated The time the note was created.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}       Promise resolved with the notes.
+     * @param userId User ID the note is about.
+     * @param content The note content.
+     * @param timecreated The time the note was created.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the notes.
      */
     getNote(userId: number, content: string, timecreated: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -169,10 +169,10 @@ export class AddonNotesOfflineProvider {
     /**
      * Get offline notes for a certain course and user.
      *
-     * @param  {number} courseId Course ID.
-     * @param  {number} [userId] User ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>}  Promise resolved with notes.
+     * @param courseId Course ID.
+     * @param userId User ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with notes.
      */
     getNotesForCourseAndUser(courseId: number, userId?: number, siteId?: string): Promise<any[]> {
         if (!userId) {
@@ -187,9 +187,9 @@ export class AddonNotesOfflineProvider {
     /**
      * Get offline notes for a certain course.
      *
-     * @param  {number} courseId Course ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>}  Promise resolved with notes.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with notes.
      */
     getNotesForCourse(courseId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -200,9 +200,9 @@ export class AddonNotesOfflineProvider {
     /**
      * Get offline notes for a certain user.
      *
-     * @param  {number} userId   User ID the notes are about.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>}  Promise resolved with notes.
+     * @param userId User ID the notes are about.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with notes.
      */
     getNotesForUser(userId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -213,9 +213,9 @@ export class AddonNotesOfflineProvider {
     /**
      * Get offline notes with a certain publish state (Personal, Site or Course).
      *
-     * @param  {string} state    Publish state ('personal', 'site' or 'course').
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>}  Promise resolved with notes.
+     * @param state Publish state ('personal', 'site' or 'course').
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with notes.
      */
     getNotesWithPublishState(state: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -226,9 +226,9 @@ export class AddonNotesOfflineProvider {
     /**
      * Check if there are offline notes for a certain course.
      *
-     * @param  {number} courseId  Course ID.
-     * @param  {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: true if has offline notes, false otherwise.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: true if has offline notes, false otherwise.
      */
     hasNotesForCourse(courseId: number, siteId?: string): Promise<boolean> {
         return this.getNotesForCourse(courseId, siteId).then((notes) => {
@@ -239,9 +239,9 @@ export class AddonNotesOfflineProvider {
     /**
      * Check if there are offline notes for a certain user.
      *
-     * @param  {number} userId    User ID the notes are about.
-     * @param  {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: true if has offline notes, false otherwise.
+     * @param userId User ID the notes are about.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: true if has offline notes, false otherwise.
      */
     hasNotesForUser(userId: number, siteId?: string): Promise<boolean> {
         return this.getNotesForUser(userId, siteId).then((notes) => {
@@ -252,9 +252,9 @@ export class AddonNotesOfflineProvider {
     /**
      * Check if there are offline notes with a certain publish state (Personal, Site or Course).
      *
-     * @param  {string} state     Publish state ('personal', 'site' or 'course').
-     * @param  {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: true if has offline notes, false otherwise.
+     * @param state Publish state ('personal', 'site' or 'course').
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: true if has offline notes, false otherwise.
      */
     hasNotesWithPublishState(state: string, siteId?: string): Promise<boolean> {
         return this.getNotesWithPublishState(state, siteId).then((notes) => {
@@ -265,12 +265,12 @@ export class AddonNotesOfflineProvider {
     /**
      * Save a note to be sent later.
      *
-     * @param  {number} userId   User ID the note is about.
-     * @param  {number} courseId Course ID.
-     * @param  {string} state    Publish state ('personal', 'site' or 'course').
-     * @param  {string} content  The note content.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved if stored, rejected if failure.
+     * @param userId User ID the note is about.
+     * @param courseId Course ID.
+     * @param state Publish state ('personal', 'site' or 'course').
+     * @param content The note content.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     saveNote(userId: number, courseId: number, state: string, content: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -294,10 +294,10 @@ export class AddonNotesOfflineProvider {
     /**
      * Delete a note offline to be sent later.
      *
-     * @param  {number} noteId   Note ID.
-     * @param  {number} courseId Course ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved if stored, rejected if failure.
+     * @param noteId Note ID.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     deleteNote(noteId: number, courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -317,9 +317,9 @@ export class AddonNotesOfflineProvider {
     /**
      * Undo delete a note.
      *
-     * @param  {number} noteId   Note ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved if deleted, rejected if failure.
+     * @param noteId Note ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if deleted, rejected if failure.
      */
     undoDeleteNote(noteId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/addon/notes/providers/notes-sync.ts b/src/addon/notes/providers/notes-sync.ts
index cebf92d73..2cf8538c8 100644
--- a/src/addon/notes/providers/notes-sync.ts
+++ b/src/addon/notes/providers/notes-sync.ts
@@ -47,9 +47,9 @@ export class AddonNotesSyncProvider extends CoreSyncBaseProvider {
     /**
      * Try to synchronize all the notes in a certain site or in all sites.
      *
-     * @param  {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @return {Promise<any>}    Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     syncAllNotes(siteId?: string, force?: boolean): Promise<any> {
         return this.syncOnSites('all notes', this.syncAllNotesFunc.bind(this), [force], siteId);
@@ -58,9 +58,9 @@ export class AddonNotesSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize all the notes in a certain site
      *
-     * @param  {string} siteId Site ID to sync.
-     * @param  {boolean} force Wether to force sync not depending on last execution.
-     * @return {Promise<any>}  Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     private syncAllNotesFunc(siteId: string, force: boolean): Promise<any> {
         const proms = [];
@@ -100,9 +100,9 @@ export class AddonNotesSyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync course notes only if a certain time has passed since the last time.
      *
-     * @param  {number} courseId Course ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when the notes are synced or if they don't need to be synced.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the notes are synced or if they don't need to be synced.
      */
     private syncNotesIfNeeded(courseId: number, siteId?: string): Promise<void> {
         return this.isSyncNeeded(courseId, siteId).then((needed) => {
@@ -115,9 +115,9 @@ export class AddonNotesSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize notes of a course.
      *
-     * @param  {number} courseId Course ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved if sync is successful, rejected otherwise.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     syncNotes(courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
diff --git a/src/addon/notes/providers/notes.ts b/src/addon/notes/providers/notes.ts
index 82f095e41..3753f9404 100644
--- a/src/addon/notes/providers/notes.ts
+++ b/src/addon/notes/providers/notes.ts
@@ -41,12 +41,12 @@ export class AddonNotesProvider {
     /**
      * Add a note.
      *
-     * @param  {number} userId       User ID of the person to add the note.
-     * @param  {number} courseId     Course ID where the note belongs.
-     * @param  {string} publishState Personal, Site or Course.
-     * @param  {string} noteText     The note text.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<boolean>}    Promise resolved with boolean: true if note was sent to server, false if stored in device.
+     * @param userId User ID of the person to add the note.
+     * @param courseId Course ID where the note belongs.
+     * @param publishState Personal, Site or Course.
+     * @param noteText The note text.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: true if note was sent to server, false if stored in device.
      */
     addNote(userId: number, courseId: number, publishState: string, noteText: string, siteId?: string): Promise<boolean> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -80,12 +80,12 @@ export class AddonNotesProvider {
     /**
      * Add a note. It will fail if offline or cannot connect.
      *
-     * @param  {number} userId       User ID of the person to add the note.
-     * @param  {number} courseId     Course ID where the note belongs.
-     * @param  {string} publishState Personal, Site or Course.
-     * @param  {string} noteText     The note text.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when added, rejected otherwise.
+     * @param userId User ID of the person to add the note.
+     * @param courseId Course ID where the note belongs.
+     * @param publishState Personal, Site or Course.
+     * @param noteText The note text.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when added, rejected otherwise.
      */
     addNoteOnline(userId: number, courseId: number, publishState: string, noteText: string, siteId?: string): Promise<any> {
         const notes = [
@@ -114,10 +114,10 @@ export class AddonNotesProvider {
     /**
      * Add several notes. It will fail if offline or cannot connect.
      *
-     * @param  {any[]}  notes    Notes to save.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when added, rejected otherwise. Promise resolved doesn't mean that notes
-     *                           have been added, the resolve param can contain errors for notes not sent.
+     * @param notes Notes to save.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when added, rejected otherwise. Promise resolved doesn't mean that notes
+     *         have been added, the resolve param can contain errors for notes not sent.
      */
     addNotesOnline(notes: any[], siteId?: string): Promise<any> {
         if (!notes || !notes.length) {
@@ -136,11 +136,11 @@ export class AddonNotesProvider {
     /**
      * Delete a note.
      *
-     * @param  {any} note            Note object to delete.
-     * @param  {number} courseId     Course ID where the note belongs.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<void>}       Promise resolved when deleted, rejected otherwise. Promise resolved doesn't mean that notes
-     *                               have been deleted, the resolve param can contain errors for notes not deleted.
+     * @param note Note object to delete.
+     * @param courseId Course ID where the note belongs.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when deleted, rejected otherwise. Promise resolved doesn't mean that notes
+     *         have been deleted, the resolve param can contain errors for notes not deleted.
      */
     deleteNote(note: any, courseId: number, siteId?: string): Promise<void> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -178,11 +178,11 @@ export class AddonNotesProvider {
     /**
      * Delete a note. It will fail if offline or cannot connect.
      *
-     * @param  {number[]} noteIds    Note IDs to delete.
-     * @param  {number} courseId     Course ID where the note belongs.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<void>}       Promise resolved when deleted, rejected otherwise. Promise resolved doesn't mean that notes
-     *                               have been deleted, the resolve param can contain errors for notes not deleted.
+     * @param noteIds Note IDs to delete.
+     * @param courseId Course ID where the note belongs.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when deleted, rejected otherwise. Promise resolved doesn't mean that notes
+     *         have been deleted, the resolve param can contain errors for notes not deleted.
      */
     deleteNotesOnline(noteIds: number[], courseId: number, siteId?: string): Promise<void> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -205,8 +205,8 @@ export class AddonNotesProvider {
      * This method is called quite often and thus should only perform a quick
      * check, we should not be calling WS from here.
      *
-     * @param  {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if enabled, resolved with false or rejected otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if enabled, resolved with false or rejected otherwise.
      */
     isPluginEnabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -217,9 +217,9 @@ export class AddonNotesProvider {
     /**
      * Returns whether or not the add note plugin is enabled for a certain course.
      *
-     * @param  {number} courseId  ID of the course.
-     * @param  {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if enabled, resolved with false or rejected otherwise.
+     * @param courseId ID of the course.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if enabled, resolved with false or rejected otherwise.
      */
     isPluginAddNoteEnabledForCourse(courseId: number, siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -249,9 +249,9 @@ export class AddonNotesProvider {
     /**
      * Returns whether or not the read notes plugin is enabled for a certain course.
      *
-     * @param  {number} courseId  ID of the course.
-     * @param  {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if enabled, resolved with false or rejected otherwise.
+     * @param courseId ID of the course.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if enabled, resolved with false or rejected otherwise.
      */
     isPluginViewNotesEnabledForCourse(courseId: number, siteId?: string): Promise<boolean> {
         return this.utils.promiseWorks(this.getNotes(courseId, undefined, false, true, siteId));
@@ -260,8 +260,8 @@ export class AddonNotesProvider {
     /**
      * Get prefix cache key for course notes.
      *
-     * @param  {number} courseId ID of the course to get the notes from.
-     * @return {string}          Cache key.
+     * @param courseId ID of the course to get the notes from.
+     * @return Cache key.
      */
     getNotesPrefixCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'notes:' + courseId + ':';
@@ -270,9 +270,9 @@ export class AddonNotesProvider {
     /**
      * Get the cache key for the get notes call.
      *
-     * @param  {number} courseId ID of the course to get the notes from.
-     * @param  {number}  [userId]      ID of the user to get the notes from if requested.
-     * @return {string}          Cache key.
+     * @param courseId ID of the course to get the notes from.
+     * @param userId ID of the user to get the notes from if requested.
+     * @return Cache key.
      */
     getNotesCacheKey(courseId: number, userId?: number): string {
         return this.getNotesPrefixCacheKey(courseId) + (userId ? userId : '');
@@ -281,12 +281,12 @@ export class AddonNotesProvider {
     /**
      * Get users notes for a certain site, course and personal notes.
      *
-     * @param  {number}  courseId      ID of the course to get the notes from.
-     * @param  {number}  [userId]      ID of the user to get the notes from if requested.
-     * @param  {boolean} [ignoreCache] True when we should not get the value from the cache.
-     * @param  {boolean} [onlyOnline]  True to return only online notes, false to return both online and offline.
-     * @param  {string}  [siteId]      Site ID. If not defined, current site.
-     * @return {Promise<any>}          Promise to be resolved when the notes are retrieved.
+     * @param courseId ID of the course to get the notes from.
+     * @param userId ID of the user to get the notes from if requested.
+     * @param ignoreCache True when we should not get the value from the cache.
+     * @param onlyOnline True to return only online notes, false to return both online and offline.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise to be resolved when the notes are retrieved.
      */
     getNotes(courseId: number, userId?: number, ignoreCache?: boolean, onlyOnline?: boolean, siteId?: string): Promise<any> {
         this.logger.debug('Get notes for course ' + courseId);
@@ -336,10 +336,10 @@ export class AddonNotesProvider {
     /**
      * Get offline deleted notes and set the state.
      *
-     * @param  {any[]}   notes     Array of notes.
-     * @param  {number} courseId ID of the course the notes belong to.
-     * @param  {string}  [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<any>}       [description]
+     * @param notes Array of notes.
+     * @param courseId ID of the course the notes belong to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return [description]
      */
     setOfflineDeletedNotes(notes: any[], courseId: number, siteId?: string): Promise<any> {
         return this.notesOffline.getCourseDeletedNotes(courseId, siteId).then((deletedNotes) => {
@@ -354,9 +354,9 @@ export class AddonNotesProvider {
     /**
      * Get user data for notes since they only have userid.
      *
-     * @param  {any[]}  notes    Notes to get the data for.
-     * @param  {number} courseId ID of the course the notes belong to.
-     * @return {Promise<any>}    Promise always resolved. Resolve param is the formatted notes.
+     * @param notes Notes to get the data for.
+     * @param courseId ID of the course the notes belong to.
+     * @return Promise always resolved. Resolve param is the formatted notes.
      */
     getNotesUserData(notes: any[], courseId: number): Promise<any> {
         const promises = notes.map((note) => {
@@ -377,10 +377,10 @@ export class AddonNotesProvider {
     /**
      * Invalidate get notes WS call.
      *
-     * @param  {number} courseId Course ID.
-     * @param  {number} [userId] User ID if needed.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}         Promise resolved when data is invalidated.
+     * @param courseId Course ID.
+     * @param userId User ID if needed.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when data is invalidated.
      */
     invalidateNotes(courseId: number, userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -395,10 +395,10 @@ export class AddonNotesProvider {
     /**
      * Report notes as being viewed.
      *
-     * @param {number} courseId  ID of the course.
-     * @param {number} [userId]  User ID if needed.
-     * @param {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when the WS call is successful.
+     * @param courseId ID of the course.
+     * @param userId User ID if needed.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(courseId: number, userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/addon/notes/providers/sync-cron-handler.ts b/src/addon/notes/providers/sync-cron-handler.ts
index dcd1ad5d6..97f50167c 100644
--- a/src/addon/notes/providers/sync-cron-handler.ts
+++ b/src/addon/notes/providers/sync-cron-handler.ts
@@ -29,9 +29,9 @@ export class AddonNotesSyncCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         return this.notesSync.syncAllNotes(siteId, force);
@@ -40,7 +40,7 @@ export class AddonNotesSyncCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return 300000; // 5 minutes.
diff --git a/src/addon/notes/providers/user-handler.ts b/src/addon/notes/providers/user-handler.ts
index cd9ce8015..fe713086d 100644
--- a/src/addon/notes/providers/user-handler.ts
+++ b/src/addon/notes/providers/user-handler.ts
@@ -42,7 +42,7 @@ export class AddonNotesUserHandler implements CoreUserProfileHandler {
      * Clear note cache.
      * If a courseId is specified, it will only delete the entry for that course.
      *
-     * @param {number} [courseId] Course ID.
+     * @param courseId Course ID.
      */
     private clearNoteCache(courseId?: number): void {
         if (courseId) {
@@ -54,7 +54,7 @@ export class AddonNotesUserHandler implements CoreUserProfileHandler {
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.notesProvider.isPluginEnabled();
@@ -63,11 +63,11 @@ export class AddonNotesUserHandler implements CoreUserProfileHandler {
     /**
      * Check if handler is enabled for this user in this context.
      *
-     * @param {any} user User to check.
-     * @param {number} courseId Course ID.
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {boolean|Promise<boolean>} Promise resolved with true if enabled, resolved with false otherwise.
+     * @param user User to check.
+     * @param courseId Course ID.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved with true if enabled, resolved with false otherwise.
      */
     isEnabledForUser(user: any, courseId: number, navOptions?: any, admOptions?: any): boolean | Promise<boolean> {
         // Active course required.
@@ -89,7 +89,7 @@ export class AddonNotesUserHandler implements CoreUserProfileHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreUserProfileHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(user: any, courseId: number): CoreUserProfileHandlerData {
         return {
diff --git a/src/addon/notifications/components/actions/actions.ts b/src/addon/notifications/components/actions/actions.ts
index c2a6f23bb..da5eece16 100644
--- a/src/addon/notifications/components/actions/actions.ts
+++ b/src/addon/notifications/components/actions/actions.ts
@@ -77,8 +77,8 @@ export class AddonNotificationsActionsComponent implements OnInit {
     /**
      * Default action. Open in browser.
      *
-     * @param {string} siteId Site ID to use.
-     * @param {NavController} [navCtrl] NavController.
+     * @param siteId Site ID to use.
+     * @param navCtrl NavController.
      */
     protected defaultAction(siteId: string, navCtrl?: NavController): void {
         const url = (this.data && this.data.appurl) || this.contextUrl;
diff --git a/src/addon/notifications/pages/list/list.ts b/src/addon/notifications/pages/list/list.ts
index 1ab97b2be..db9153bd8 100644
--- a/src/addon/notifications/pages/list/list.ts
+++ b/src/addon/notifications/pages/list/list.ts
@@ -82,8 +82,8 @@ export class AddonNotificationsListPage {
     /**
      * Convenience function to get notifications. Gets unread notifications first.
      *
-     * @param {boolean} refreh Whether we're refreshing data.
-     * @return {Promise<any>} Resolved when done.
+     * @param refreh Whether we're refreshing data.
+     * @return Resolved when done.
      */
     protected fetchNotifications(refresh?: boolean): Promise<any> {
         this.loadMoreError = false;
@@ -128,7 +128,7 @@ export class AddonNotificationsListPage {
     /**
      * Mark notifications as read.
      *
-     * @param {any[]} notifications Array of notification objects.
+     * @param notifications Array of notification objects.
      */
     protected markNotificationsAsRead(notifications: any[]): void {
         let promise;
@@ -173,7 +173,7 @@ export class AddonNotificationsListPage {
     /**
      * Refresh notifications.
      *
-     * @param {any} [refresher] Refresher.
+     * @param refresher Refresher.
      * @return Promise<any> Promise resolved when done.
      */
     refreshNotifications(refresher?: any): Promise<any> {
@@ -189,7 +189,7 @@ export class AddonNotificationsListPage {
     /**
      * Load more results.
      *
-     * @param {any} [infiniteComplete] Infinite scroll complete function. Only used from core-infinite-loading.
+     * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
      */
     loadMoreNotifications(infiniteComplete?: any): void {
         this.fetchNotifications().finally(() => {
@@ -200,7 +200,7 @@ export class AddonNotificationsListPage {
     /**
      * Formats the text of a notification.
      *
-     * @param {any} notification The notification object.
+     * @param notification The notification object.
      */
     protected formatText(notification: any): void {
         const text = notification.mobiletext.replace(/-{4,}/ig, '');
diff --git a/src/addon/notifications/pages/settings/settings.ts b/src/addon/notifications/pages/settings/settings.ts
index 58ab72395..5754f18a2 100644
--- a/src/addon/notifications/pages/settings/settings.ts
+++ b/src/addon/notifications/pages/settings/settings.ts
@@ -78,7 +78,7 @@ export class AddonNotificationsSettingsPage implements OnDestroy {
     /**
      * Fetches preference data.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected fetchPreferences(): Promise<any> {
         return this.notificationsProvider.getNotificationPreferences().then((preferences) => {
@@ -116,7 +116,7 @@ export class AddonNotificationsSettingsPage implements OnDestroy {
     /**
      * Load a processor.
      *
-     * @param {any} processor Processor object.
+     * @param processor Processor object.
      */
     protected loadProcessor(processor: any): void {
         if (!processor) {
@@ -151,7 +151,7 @@ export class AddonNotificationsSettingsPage implements OnDestroy {
     /**
      * The selected processor was changed.
      *
-     * @param {string} name Name of the selected processor.
+     * @param name Name of the selected processor.
      */
     changeProcessor(name: string): void {
         this.preferences.processors.forEach((processor) => {
@@ -164,7 +164,7 @@ export class AddonNotificationsSettingsPage implements OnDestroy {
     /**
      * Refresh the list of preferences.
      *
-     * @param {any} [refresher] Refresher.
+     * @param refresher Refresher.
      */
     refreshPreferences(refresher?: any): void {
         this.notificationsProvider.invalidateNotificationPreferences().finally(() => {
@@ -177,7 +177,7 @@ export class AddonNotificationsSettingsPage implements OnDestroy {
     /**
      * Open extra preferences.
      *
-     * @param {AddonMessageOutputHandlerData} handlerData
+     * @param handlerData
      */
     openExtraPreferences(handlerData: AddonMessageOutputHandlerData): void {
         // Decide which navCtrl to use. If this page is inside a split view, use the split view's master nav.
@@ -188,8 +188,8 @@ export class AddonNotificationsSettingsPage implements OnDestroy {
     /**
      * Change the value of a certain preference.
      *
-     * @param {any} notification Notification object.
-     * @param {string} state State name, ['loggedin', 'loggedoff'].
+     * @param notification Notification object.
+     * @param state State name, ['loggedin', 'loggedoff'].
      */
     changePreference(notification: any, state: string): void {
         const processorState = notification.currentProcessor[state];
@@ -243,7 +243,7 @@ export class AddonNotificationsSettingsPage implements OnDestroy {
     /**
      * Change the notification sound setting.
      *
-     * @param {enabled} enabled True to enable the notification sound, false to disable it.
+     * @param enabled True to enable the notification sound, false to disable it.
      */
     changeNotificationSound(enabled: boolean): void {
         this.configProvider.set(CoreConstants.SETTINGS_NOTIFICATION_SOUND, enabled ? 1 : 0).finally(() => {
diff --git a/src/addon/notifications/providers/cron-handler.ts b/src/addon/notifications/providers/cron-handler.ts
index e7ae59f17..d191985b0 100644
--- a/src/addon/notifications/providers/cron-handler.ts
+++ b/src/addon/notifications/providers/cron-handler.ts
@@ -38,7 +38,7 @@ export class AddonNotificationsCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return this.appProvider.isDesktop() ? 60000 : 600000; // 1 or 10 minutes.
@@ -47,7 +47,7 @@ export class AddonNotificationsCronHandler implements CoreCronHandler {
     /**
      * Check whether it's a synchronization process or not. True if not defined.
      *
-     * @return {boolean} Whether it's a synchronization process or not.
+     * @return Whether it's a synchronization process or not.
      */
     isSync(): boolean {
         // This is done to use only wifi if using the fallback function.
@@ -58,7 +58,7 @@ export class AddonNotificationsCronHandler implements CoreCronHandler {
     /**
      * Check whether the sync can be executed manually. Call isSync if not defined.
      *
-     * @return {boolean} Whether the sync can be executed manually.
+     * @return Whether the sync can be executed manually.
      */
     canManualSync(): boolean {
         return true;
@@ -68,10 +68,10 @@ export class AddonNotificationsCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure. If the promise is rejected, this function
-     *                                will be called again often, it shouldn't be abused.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure. If the promise is rejected, this function
+     *         will be called again often, it shouldn't be abused.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         if (this.sitesProvider.isCurrentSite(siteId)) {
@@ -90,8 +90,8 @@ export class AddonNotificationsCronHandler implements CoreCronHandler {
     /**
      * Get the latest unread notifications from a site.
      *
-     * @param  {string} siteId  Site ID.
-     * @return {Promise<any[]>} Promise resolved with the notifications.
+     * @param siteId Site ID.
+     * @return Promise resolved with the notifications.
      */
     protected fetchNotifications(siteId: string): Promise<any[]> {
         return this.notificationsHelper.getNotifications([], undefined, true, false, true, siteId).then((result) => {
@@ -102,8 +102,8 @@ export class AddonNotificationsCronHandler implements CoreCronHandler {
     /**
      * Given a notification, return the title and the text for the notification.
      *
-     * @param  {any} notification Notification.
-     * @return {Promise<any>} Promise resvoled with an object with title and text.
+     * @param notification Notification.
+     * @return Promise resvoled with an object with title and text.
      */
     protected getTitleAndText(notification: any): Promise<any> {
         const data = {
diff --git a/src/addon/notifications/providers/helper.ts b/src/addon/notifications/providers/helper.ts
index f9c9e80bf..442a0b1e1 100644
--- a/src/addon/notifications/providers/helper.ts
+++ b/src/addon/notifications/providers/helper.ts
@@ -28,13 +28,13 @@ export class AddonNotificationsHelperProvider {
     /**
      * Get some notifications. It will try to use the new WS if available.
      *
-     * @param {any[]} notifications Current list of loaded notifications. It's used to calculate the offset.
-     * @param {number} [limit] Number of notifications to get. Defaults to LIST_LIMIT.
-     * @param {boolean} [toDisplay=true] True if notifications will be displayed to the user, either in view or in a notification.
-     * @param {boolean} [forceCache] True if it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<{notifications: any[], canLoadMore: boolean}>} Promise resolved with notifications and if can load more.
+     * @param notifications Current list of loaded notifications. It's used to calculate the offset.
+     * @param limit Number of notifications to get. Defaults to LIST_LIMIT.
+     * @param toDisplay True if notifications will be displayed to the user, either in view or in a notification.
+     * @param forceCache True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with notifications and if can load more.
      */
     getNotifications(notifications: any[], limit?: number, toDisplay: boolean = true, forceCache?: boolean, ignoreCache?: boolean,
             siteId?: string): Promise<{notifications: any[], canLoadMore: boolean}> {
diff --git a/src/addon/notifications/providers/mainmenu-handler.ts b/src/addon/notifications/providers/mainmenu-handler.ts
index a73fd6065..056ce4650 100644
--- a/src/addon/notifications/providers/mainmenu-handler.ts
+++ b/src/addon/notifications/providers/mainmenu-handler.ts
@@ -73,7 +73,7 @@ export class AddonNotificationsMainMenuHandler implements CoreMainMenuHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -82,7 +82,7 @@ export class AddonNotificationsMainMenuHandler implements CoreMainMenuHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreMainMenuHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(): CoreMainMenuHandlerData {
         if (this.handler.loading) {
@@ -95,7 +95,7 @@ export class AddonNotificationsMainMenuHandler implements CoreMainMenuHandler {
     /**
      * Triggers an update for the badge number and loading status. Mandatory if showBadge is enabled.
      *
-     * @param {string} [siteId] Site ID or current Site if undefined.
+     * @param siteId Site ID or current Site if undefined.
      */
     updateBadge(siteId?: string): void {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
diff --git a/src/addon/notifications/providers/notifications.ts b/src/addon/notifications/providers/notifications.ts
index db8b5b62b..6e0af0129 100644
--- a/src/addon/notifications/providers/notifications.ts
+++ b/src/addon/notifications/providers/notifications.ts
@@ -47,9 +47,9 @@ export class AddonNotificationsProvider {
     /**
      * Function to format notification data.
      *
-     * @param {any[]} notifications List of notifications.
-     * @param {boolean} [read] Whether the notifications are read or unread.
-     * @return {Promise<any[]>} Promise resolved with notifications.
+     * @param notifications List of notifications.
+     * @param read Whether the notifications are read or unread.
+     * @return Promise resolved with notifications.
      */
     protected formatNotificationsData(notifications: any[], read?: boolean): Promise<any> {
         const promises = notifications.map((notification) => {
@@ -105,7 +105,7 @@ export class AddonNotificationsProvider {
     /**
      * Get the cache key for the get notification preferences call.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getNotificationPreferencesCacheKey(): string {
         return this.ROOT_CACHE_KEY + 'notificationPreferences';
@@ -114,8 +114,8 @@ export class AddonNotificationsProvider {
     /**
      * Get notification preferences.
      *
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved with the notification preferences.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with the notification preferences.
      */
     getNotificationPreferences(siteId?: string): Promise<any> {
         this.logger.debug('Get notification preferences');
@@ -135,7 +135,7 @@ export class AddonNotificationsProvider {
     /**
      * Get cache key for notification list WS calls.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getNotificationsCacheKey(): string {
         return this.ROOT_CACHE_KEY + 'list';
@@ -144,14 +144,14 @@ export class AddonNotificationsProvider {
     /**
      * Get notifications from site.
      *
-     * @param {boolean} read True if should get read notifications, false otherwise.
-     * @param {number} limitFrom Position of the first notification to get.
-     * @param {number} limitNumber Number of notifications to get or 0 to use the default limit.
-     * @param {boolean} [toDisplay=true] True if notifications will be displayed to the user, either in view or in a notification.
-     * @param {boolean} [forceCache] True if it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any[]>} Promise resolved with notifications.
+     * @param read True if should get read notifications, false otherwise.
+     * @param limitFrom Position of the first notification to get.
+     * @param limitNumber Number of notifications to get or 0 to use the default limit.
+     * @param toDisplay True if notifications will be displayed to the user, either in view or in a notification.
+     * @param forceCache True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with notifications.
      */
     getNotifications(read: boolean, limitFrom: number, limitNumber: number = 0, toDisplay: boolean = true,
             forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any[]> {
@@ -199,13 +199,13 @@ export class AddonNotificationsProvider {
     /**
      * Get notifications from site using the new WebService.
      *
-     * @param {number} offset Position of the first notification to get.
-     * @param {number} [limit] Number of notifications to get. Defaults to LIST_LIMIT.
-     * @param {boolean} [toDisplay=true] True if notifications will be displayed to the user, either in view or in a notification.
-     * @param {boolean} [forceCache] True if it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<{notifications: any[], canLoadMore: boolean}>} Promise resolved with notifications and if can load more.
+     * @param offset Position of the first notification to get.
+     * @param limit Number of notifications to get. Defaults to LIST_LIMIT.
+     * @param toDisplay True if notifications will be displayed to the user, either in view or in a notification.
+     * @param forceCache True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with notifications and if can load more.
      * @since 3.2
      */
     getPopupNotifications(offset: number, limit?: number, toDisplay: boolean = true, forceCache?: boolean, ignoreCache?: boolean,
@@ -260,13 +260,13 @@ export class AddonNotificationsProvider {
     /**
      * Get read notifications from site.
      *
-     * @param {number} limitFrom Position of the first notification to get.
-     * @param {number} limitNumber Number of notifications to get.
-     * @param {boolean} [toDisplay=true] True if notifications will be displayed to the user, either in view or in a notification.
-     * @param {boolean} [forceCache] True if it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any[]>} Promise resolved with notifications.
+     * @param limitFrom Position of the first notification to get.
+     * @param limitNumber Number of notifications to get.
+     * @param toDisplay True if notifications will be displayed to the user, either in view or in a notification.
+     * @param forceCache True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with notifications.
      */
     getReadNotifications(limitFrom: number, limitNumber: number, toDisplay: boolean = true,
             forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any[]> {
@@ -276,13 +276,13 @@ export class AddonNotificationsProvider {
     /**
      * Get unread notifications from site.
      *
-     * @param {number} limitFrom Position of the first notification to get.
-     * @param {number} limitNumber Number of notifications to get.
-     * @param {boolean} [toDisplay=true] True if notifications will be displayed to the user, either in view or in a notification.
-     * @param {boolean} [forceCache] True if it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any[]>} Promise resolved with notifications.
+     * @param limitFrom Position of the first notification to get.
+     * @param limitNumber Number of notifications to get.
+     * @param toDisplay True if notifications will be displayed to the user, either in view or in a notification.
+     * @param forceCache True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with notifications.
      */
     getUnreadNotifications(limitFrom: number, limitNumber: number, toDisplay: boolean = true,
             forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any[]> {
@@ -292,9 +292,9 @@ export class AddonNotificationsProvider {
     /**
      * Get unread notifications count. Do not cache calls.
      *
-     * @param {number} [userId] The user id who received the notification. If not defined, use current user.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<number>} Promise resolved with the message notifications count.
+     * @param userId The user id who received the notification. If not defined, use current user.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with the message notifications count.
      */
     getUnreadNotificationsCount(userId?: number, siteId?: string): Promise<number> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -334,8 +334,8 @@ export class AddonNotificationsProvider {
     /**
      * Returns whether or not popup WS is available for a certain site.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if available, resolved with false or rejected otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if available, resolved with false or rejected otherwise.
      */
     isPopupAvailable(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -346,7 +346,7 @@ export class AddonNotificationsProvider {
     /**
      * Mark all message notification as read.
      *
-     * @returns {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      * @since 3.2
      */
     markAllNotificationsAsRead(): Promise<any> {
@@ -360,9 +360,9 @@ export class AddonNotificationsProvider {
     /**
      * Mark a single notification as read.
      *
-     * @param {number} notificationId ID of notification to mark as read
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @returns {Promise<any>} Resolved when done.
+     * @param notificationId ID of notification to mark as read
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved when done.
      * @since 3.5
      */
     markNotificationRead(notificationId: number, siteId?: string): Promise<any> {
@@ -385,8 +385,8 @@ export class AddonNotificationsProvider {
     /**
      * Invalidate get notification preferences.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when data is invalidated.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when data is invalidated.
      */
     invalidateNotificationPreferences(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -397,8 +397,8 @@ export class AddonNotificationsProvider {
     /**
      * Invalidates notifications list WS calls.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the list is invalidated.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the list is invalidated.
      */
     invalidateNotificationsList(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -409,7 +409,7 @@ export class AddonNotificationsProvider {
     /**
      * Returns whether or not we can mark all notifications as read.
      *
-     * @return {boolean} True if enabled, false otherwise.
+     * @return True if enabled, false otherwise.
      * @since 3.2
      */
     isMarkAllNotificationsAsReadEnabled(): boolean {
@@ -419,7 +419,7 @@ export class AddonNotificationsProvider {
     /**
      * Returns whether or not we can count unread notifications precisely.
      *
-     * @return {boolean} True if enabled, false otherwise.
+     * @return True if enabled, false otherwise.
      * @since 3.2
      */
     isPreciseNotificationCountEnabled(): boolean {
@@ -429,7 +429,7 @@ export class AddonNotificationsProvider {
     /**
      * Returns whether or not the notification preferences are enabled for the current site.
      *
-     * @return {boolean} True if enabled, false otherwise.
+     * @return True if enabled, false otherwise.
      * @since 3.2
      */
     isNotificationPreferencesEnabled(): boolean {
diff --git a/src/addon/notifications/providers/push-click-handler.ts b/src/addon/notifications/providers/push-click-handler.ts
index ce39f5d17..546d151fb 100644
--- a/src/addon/notifications/providers/push-click-handler.ts
+++ b/src/addon/notifications/providers/push-click-handler.ts
@@ -34,8 +34,8 @@ export class AddonNotificationsPushClickHandler implements CorePushNotifications
     /**
      * Check if a notification click is handled by this handler.
      *
-     * @param {any} notification The notification to check.
-     * @return {boolean} Whether the notification click is handled by this handler
+     * @param notification The notification to check.
+     * @return Whether the notification click is handled by this handler
      */
     handles(notification: any): boolean | Promise<boolean> {
         if (this.utils.isTrueOrOne(notification.notif)) {
@@ -57,8 +57,8 @@ export class AddonNotificationsPushClickHandler implements CorePushNotifications
     /**
      * Handle the notification click.
      *
-     * @param {any} notification The notification to check.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param notification The notification to check.
+     * @return Promise resolved when done.
      */
     handleClick(notification: any): Promise<any> {
         let promise;
diff --git a/src/addon/notifications/providers/settings-handler.ts b/src/addon/notifications/providers/settings-handler.ts
index 1bb8002f7..dea003ab7 100644
--- a/src/addon/notifications/providers/settings-handler.ts
+++ b/src/addon/notifications/providers/settings-handler.ts
@@ -33,7 +33,7 @@ export class AddonNotificationsSettingsHandler implements CoreSettingsHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean | Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         // Preferences or notification sound setting available.
@@ -44,7 +44,7 @@ export class AddonNotificationsSettingsHandler implements CoreSettingsHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreSettingsHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(): CoreSettingsHandlerData {
         return {
diff --git a/src/addon/qbehaviour/adaptive/providers/handler.ts b/src/addon/qbehaviour/adaptive/providers/handler.ts
index 90ad015b8..1d40c1c4f 100644
--- a/src/addon/qbehaviour/adaptive/providers/handler.ts
+++ b/src/addon/qbehaviour/adaptive/providers/handler.ts
@@ -34,10 +34,10 @@ export class AddonQbehaviourAdaptiveHandler implements CoreQuestionBehaviourHand
      * If the behaviour requires a submit button, it should add it to question.behaviourButtons.
      * If the behaviour requires to show some extra data, it should return the components to render it.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question.
-     * @return {any[]|Promise<any[]>} Components (or promise resolved with components) to render some extra data in the question
-     *                                (e.g. certainty options). Don't return anything if no extra data is required.
+     * @param injector Injector.
+     * @param question The question.
+     * @return Components (or promise resolved with components) to render some extra data in the question
+     *         (e.g. certainty options). Don't return anything if no extra data is required.
      */
     handleQuestion(injector: Injector, question: any): any[] | Promise<any[]> {
         // Just extract the button, it doesn't need any specific component.
@@ -49,7 +49,7 @@ export class AddonQbehaviourAdaptiveHandler implements CoreQuestionBehaviourHand
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/qbehaviour/adaptivenopenalty/providers/handler.ts b/src/addon/qbehaviour/adaptivenopenalty/providers/handler.ts
index a8ebebb0b..f8e3ba977 100644
--- a/src/addon/qbehaviour/adaptivenopenalty/providers/handler.ts
+++ b/src/addon/qbehaviour/adaptivenopenalty/providers/handler.ts
@@ -34,10 +34,10 @@ export class AddonQbehaviourAdaptiveNoPenaltyHandler implements CoreQuestionBeha
      * If the behaviour requires a submit button, it should add it to question.behaviourButtons.
      * If the behaviour requires to show some extra data, it should return the components to render it.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question.
-     * @return {any[]|Promise<any[]>} Components (or promise resolved with components) to render some extra data in the question
-     *                                (e.g. certainty options). Don't return anything if no extra data is required.
+     * @param injector Injector.
+     * @param question The question.
+     * @return Components (or promise resolved with components) to render some extra data in the question
+     *         (e.g. certainty options). Don't return anything if no extra data is required.
      */
     handleQuestion(injector: Injector, question: any): any[] | Promise<any[]> {
         // Just extract the button, it doesn't need any specific component.
@@ -49,7 +49,7 @@ export class AddonQbehaviourAdaptiveNoPenaltyHandler implements CoreQuestionBeha
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/qbehaviour/deferredcbm/providers/handler.ts b/src/addon/qbehaviour/deferredcbm/providers/handler.ts
index fb11cb208..fcb15cf3f 100644
--- a/src/addon/qbehaviour/deferredcbm/providers/handler.ts
+++ b/src/addon/qbehaviour/deferredcbm/providers/handler.ts
@@ -37,11 +37,11 @@ export class AddonQbehaviourDeferredCBMHandler implements CoreQuestionBehaviourH
     /**
      * Determine a question new state based on its answer(s).
      *
-     * @param {string} component Component the question belongs to.
-     * @param {number} attemptId Attempt ID the question belongs to.
-     * @param {any} question The question.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {CoreQuestionState|Promise<CoreQuestionState>} New state (or promise resolved with state).
+     * @param component Component the question belongs to.
+     * @param attemptId Attempt ID the question belongs to.
+     * @param question The question.
+     * @param siteId Site ID. If not defined, current site.
+     * @return New state (or promise resolved with state).
      */
     determineNewState(component: string, attemptId: number, question: any, siteId?: string)
             : CoreQuestionState | Promise<CoreQuestionState> {
@@ -55,10 +55,10 @@ export class AddonQbehaviourDeferredCBMHandler implements CoreQuestionBehaviourH
      * If the behaviour requires a submit button, it should add it to question.behaviourButtons.
      * If the behaviour requires to show some extra data, it should return the components to render it.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question.
-     * @return {any[]|Promise<any[]>} Components (or promise resolved with components) to render some extra data in the question
-     *                                (e.g. certainty options). Don't return anything if no extra data is required.
+     * @param injector Injector.
+     * @param question The question.
+     * @return Components (or promise resolved with components) to render some extra data in the question
+     *         (e.g. certainty options). Don't return anything if no extra data is required.
      */
     handleQuestion(injector: Injector, question: any): any[] | Promise<any[]> {
         if (this.questionHelper.extractQbehaviourCBM(question)) {
@@ -69,9 +69,9 @@ export class AddonQbehaviourDeferredCBMHandler implements CoreQuestionBehaviourH
     /**
      * Check if a response is complete.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if complete, 0 if not complete, -1 if cannot determine.
      */
     protected isCompleteResponse(question: any, answers: any): number {
         // First check if the question answer is complete.
@@ -87,7 +87,7 @@ export class AddonQbehaviourDeferredCBMHandler implements CoreQuestionBehaviourH
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -96,12 +96,12 @@ export class AddonQbehaviourDeferredCBMHandler implements CoreQuestionBehaviourH
     /**
      * Check if two responses are the same.
      *
-     * @param {any} question Question.
-     * @param {any} prevAnswers Object with the previous question answers.
-     * @param {any} prevBasicAnswers Object with the previous basic" answers (without sequencecheck, certainty, ...).
-     * @param {any} newAnswers Object with the new question answers.
-     * @param {any} newBasicAnswers Object with the previous basic" answers (without sequencecheck, certainty, ...).
-     * @return {boolean} Whether they're the same.
+     * @param question Question.
+     * @param prevAnswers Object with the previous question answers.
+     * @param prevBasicAnswers Object with the previous basic" answers (without sequencecheck, certainty, ...).
+     * @param newAnswers Object with the new question answers.
+     * @param newBasicAnswers Object with the previous basic" answers (without sequencecheck, certainty, ...).
+     * @return Whether they're the same.
      */
     protected isSameResponse(question: any, prevAnswers: any, prevBasicAnswers: any, newAnswers: any, newBasicAnswers: any)
             : boolean {
diff --git a/src/addon/qbehaviour/deferredfeedback/providers/handler.ts b/src/addon/qbehaviour/deferredfeedback/providers/handler.ts
index da9052a14..e2d39cb2b 100644
--- a/src/addon/qbehaviour/deferredfeedback/providers/handler.ts
+++ b/src/addon/qbehaviour/deferredfeedback/providers/handler.ts
@@ -21,21 +21,21 @@ import { CoreQuestionProvider, CoreQuestionState } from '@core/question/provider
 /**
  * Check if a response is complete.
  *
- * @param {any} question The question.
- * @param {any} answers Object with the question answers (without prefix).
- * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+ * @param question The question.
+ * @param answers Object with the question answers (without prefix).
+ * @return 1 if complete, 0 if not complete, -1 if cannot determine.
  */
 export type isCompleteResponseFunction = (question: any, answers: any) => number;
 
 /**
  * Check if two responses are the same.
  *
- * @param {any} question Question.
- * @param {any} prevAnswers Object with the previous question answers.
- * @param {any} prevBasicAnswers Object with the previous basic" answers (without sequencecheck, certainty, ...).
- * @param {any} newAnswers Object with the new question answers.
- * @param {any} newBasicAnswers Object with the previous basic" answers (without sequencecheck, certainty, ...).
- * @return {boolean} Whether they're the same.
+ * @param question Question.
+ * @param prevAnswers Object with the previous question answers.
+ * @param prevBasicAnswers Object with the previous basic" answers (without sequencecheck, certainty, ...).
+ * @param newAnswers Object with the new question answers.
+ * @param newBasicAnswers Object with the previous basic" answers (without sequencecheck, certainty, ...).
+ * @return Whether they're the same.
  */
 export type isSameResponseFunction = (question: any, prevAnswers: any, prevBasicAnswers: any, newAnswers: any,
         newBasicAnswers: any) => boolean;
@@ -55,11 +55,11 @@ export class AddonQbehaviourDeferredFeedbackHandler implements CoreQuestionBehav
     /**
      * Determine a question new state based on its answer(s).
      *
-     * @param {string} component Component the question belongs to.
-     * @param {number} attemptId Attempt ID the question belongs to.
-     * @param {any} question The question.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {CoreQuestionState|Promise<CoreQuestionState>} New state (or promise resolved with state).
+     * @param component Component the question belongs to.
+     * @param attemptId Attempt ID the question belongs to.
+     * @param question The question.
+     * @param siteId Site ID. If not defined, current site.
+     * @return New state (or promise resolved with state).
      */
     determineNewState(component: string, attemptId: number, question: any, siteId?: string)
             : CoreQuestionState | Promise<CoreQuestionState> {
@@ -69,13 +69,13 @@ export class AddonQbehaviourDeferredFeedbackHandler implements CoreQuestionBehav
     /**
      * Determine a question new state based on its answer(s) for deferred question behaviour.
      *
-     * @param {string} component Component the question belongs to.
-     * @param {number} attemptId Attempt ID the question belongs to.
-     * @param {any} question The question.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {isCompleteResponseFunction} [isCompleteFn] Function to override the default isCompleteResponse check.
-     * @param {isSameResponseFunction} [isSameFn] Function to override the default isSameResponse check.
-     * @return {Promise<CoreQuestionState>} Promise resolved with state.
+     * @param component Component the question belongs to.
+     * @param attemptId Attempt ID the question belongs to.
+     * @param question The question.
+     * @param siteId Site ID. If not defined, current site.
+     * @param isCompleteFn Function to override the default isCompleteResponse check.
+     * @param isSameFn Function to override the default isSameResponse check.
+     * @return Promise resolved with state.
      */
     determineNewStateDeferred(component: string, attemptId: number, question: any, siteId?: string,
             isCompleteFn?: isCompleteResponseFunction, isSameFn?: isSameResponseFunction): Promise<CoreQuestionState> {
@@ -146,7 +146,7 @@ export class AddonQbehaviourDeferredFeedbackHandler implements CoreQuestionBehav
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/qbehaviour/immediatecbm/providers/handler.ts b/src/addon/qbehaviour/immediatecbm/providers/handler.ts
index 4e1aa9ce4..4d26069ed 100644
--- a/src/addon/qbehaviour/immediatecbm/providers/handler.ts
+++ b/src/addon/qbehaviour/immediatecbm/providers/handler.ts
@@ -35,10 +35,10 @@ export class AddonQbehaviourImmediateCBMHandler implements CoreQuestionBehaviour
      * If the behaviour requires a submit button, it should add it to question.behaviourButtons.
      * If the behaviour requires to show some extra data, it should return the components to render it.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question.
-     * @return {any[]|Promise<any[]>} Components (or promise resolved with components) to render some extra data in the question
-     *                                (e.g. certainty options). Don't return anything if no extra data is required.
+     * @param injector Injector.
+     * @param question The question.
+     * @return Components (or promise resolved with components) to render some extra data in the question
+     *         (e.g. certainty options). Don't return anything if no extra data is required.
      */
     handleQuestion(injector: Injector, question: any): any[] | Promise<any[]> {
         // Just extract the button, it doesn't need any specific component.
@@ -52,7 +52,7 @@ export class AddonQbehaviourImmediateCBMHandler implements CoreQuestionBehaviour
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/qbehaviour/immediatefeedback/providers/handler.ts b/src/addon/qbehaviour/immediatefeedback/providers/handler.ts
index 2103bba6c..0040878ea 100644
--- a/src/addon/qbehaviour/immediatefeedback/providers/handler.ts
+++ b/src/addon/qbehaviour/immediatefeedback/providers/handler.ts
@@ -34,10 +34,10 @@ export class AddonQbehaviourImmediateFeedbackHandler implements CoreQuestionBeha
      * If the behaviour requires a submit button, it should add it to question.behaviourButtons.
      * If the behaviour requires to show some extra data, it should return the components to render it.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question.
-     * @return {any[]|Promise<any[]>} Components (or promise resolved with components) to render some extra data in the question
-     *                                (e.g. certainty options). Don't return anything if no extra data is required.
+     * @param injector Injector.
+     * @param question The question.
+     * @return Components (or promise resolved with components) to render some extra data in the question
+     *         (e.g. certainty options). Don't return anything if no extra data is required.
      */
     handleQuestion(injector: Injector, question: any): any[] | Promise<any[]> {
         // Just extract the button, it doesn't need any specific component.
@@ -49,7 +49,7 @@ export class AddonQbehaviourImmediateFeedbackHandler implements CoreQuestionBeha
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/qbehaviour/informationitem/providers/handler.ts b/src/addon/qbehaviour/informationitem/providers/handler.ts
index 21d7181ed..f8f46f6e6 100644
--- a/src/addon/qbehaviour/informationitem/providers/handler.ts
+++ b/src/addon/qbehaviour/informationitem/providers/handler.ts
@@ -32,11 +32,11 @@ export class AddonQbehaviourInformationItemHandler implements CoreQuestionBehavi
     /**
      * Determine a question new state based on its answer(s).
      *
-     * @param {string} component Component the question belongs to.
-     * @param {number} attemptId Attempt ID the question belongs to.
-     * @param {any} question The question.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {CoreQuestionState|Promise<CoreQuestionState>} New state (or promise resolved with state).
+     * @param component Component the question belongs to.
+     * @param attemptId Attempt ID the question belongs to.
+     * @param question The question.
+     * @param siteId Site ID. If not defined, current site.
+     * @return New state (or promise resolved with state).
      */
     determineNewState(component: string, attemptId: number, question: any, siteId?: string)
             : CoreQuestionState | Promise<CoreQuestionState> {
@@ -52,10 +52,10 @@ export class AddonQbehaviourInformationItemHandler implements CoreQuestionBehavi
      * If the behaviour requires a submit button, it should add it to question.behaviourButtons.
      * If the behaviour requires to show some extra data, it should return the components to render it.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question.
-     * @return {any[]|Promise<any[]>} Components (or promise resolved with components) to render some extra data in the question
-     *                                (e.g. certainty options). Don't return anything if no extra data is required.
+     * @param injector Injector.
+     * @param question The question.
+     * @return Components (or promise resolved with components) to render some extra data in the question
+     *         (e.g. certainty options). Don't return anything if no extra data is required.
      */
     handleQuestion(injector: Injector, question: any): any[] | Promise<any[]> {
         if (this.questionHelper.extractQbehaviourSeenInput(question)) {
@@ -66,7 +66,7 @@ export class AddonQbehaviourInformationItemHandler implements CoreQuestionBehavi
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/qbehaviour/interactive/providers/handler.ts b/src/addon/qbehaviour/interactive/providers/handler.ts
index 5504da1cc..6c25c2923 100644
--- a/src/addon/qbehaviour/interactive/providers/handler.ts
+++ b/src/addon/qbehaviour/interactive/providers/handler.ts
@@ -34,10 +34,10 @@ export class AddonQbehaviourInteractiveHandler implements CoreQuestionBehaviourH
      * If the behaviour requires a submit button, it should add it to question.behaviourButtons.
      * If the behaviour requires to show some extra data, it should return the components to render it.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question.
-     * @return {any[]|Promise<any[]>} Components (or promise resolved with components) to render some extra data in the question
-     *                                (e.g. certainty options). Don't return anything if no extra data is required.
+     * @param injector Injector.
+     * @param question The question.
+     * @return Components (or promise resolved with components) to render some extra data in the question
+     *         (e.g. certainty options). Don't return anything if no extra data is required.
      */
     handleQuestion(injector: Injector, question: any): any[] | Promise<any[]> {
         // Just extract the button, it doesn't need any specific component.
@@ -49,7 +49,7 @@ export class AddonQbehaviourInteractiveHandler implements CoreQuestionBehaviourH
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/qbehaviour/interactivecountback/providers/handler.ts b/src/addon/qbehaviour/interactivecountback/providers/handler.ts
index 54646e427..0cebc7103 100644
--- a/src/addon/qbehaviour/interactivecountback/providers/handler.ts
+++ b/src/addon/qbehaviour/interactivecountback/providers/handler.ts
@@ -34,10 +34,10 @@ export class AddonQbehaviourInteractiveCountbackHandler implements CoreQuestionB
      * If the behaviour requires a submit button, it should add it to question.behaviourButtons.
      * If the behaviour requires to show some extra data, it should return the components to render it.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question.
-     * @return {any[]|Promise<any[]>} Components (or promise resolved with components) to render some extra data in the question
-     *                                (e.g. certainty options). Don't return anything if no extra data is required.
+     * @param injector Injector.
+     * @param question The question.
+     * @return Components (or promise resolved with components) to render some extra data in the question
+     *         (e.g. certainty options). Don't return anything if no extra data is required.
      */
     handleQuestion(injector: Injector, question: any): any[] | Promise<any[]> {
         // Just extract the button, it doesn't need any specific component.
@@ -49,7 +49,7 @@ export class AddonQbehaviourInteractiveCountbackHandler implements CoreQuestionB
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/qbehaviour/manualgraded/providers/handler.ts b/src/addon/qbehaviour/manualgraded/providers/handler.ts
index 91d767af4..62c08d2b1 100644
--- a/src/addon/qbehaviour/manualgraded/providers/handler.ts
+++ b/src/addon/qbehaviour/manualgraded/providers/handler.ts
@@ -21,21 +21,21 @@ import { CoreQuestionProvider, CoreQuestionState } from '@core/question/provider
 /**
  * Check if a response is complete.
  *
- * @param {any} question The question.
- * @param {any} answers Object with the question answers (without prefix).
- * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+ * @param question The question.
+ * @param answers Object with the question answers (without prefix).
+ * @return 1 if complete, 0 if not complete, -1 if cannot determine.
  */
 export type isCompleteResponseFunction = (question: any, answers: any) => number;
 
 /**
  * Check if two responses are the same.
  *
- * @param {any} question Question.
- * @param {any} prevAnswers Object with the previous question answers.
- * @param {any} prevBasicAnswers Object with the previous basic" answers (without sequencecheck, certainty, ...).
- * @param {any} newAnswers Object with the new question answers.
- * @param {any} newBasicAnswers Object with the previous basic" answers (without sequencecheck, certainty, ...).
- * @return {boolean} Whether they're the same.
+ * @param question Question.
+ * @param prevAnswers Object with the previous question answers.
+ * @param prevBasicAnswers Object with the previous basic" answers (without sequencecheck, certainty, ...).
+ * @param newAnswers Object with the new question answers.
+ * @param newBasicAnswers Object with the previous basic" answers (without sequencecheck, certainty, ...).
+ * @return Whether they're the same.
  */
 export type isSameResponseFunction = (question: any, prevAnswers: any, prevBasicAnswers: any, newAnswers: any,
         newBasicAnswers: any) => boolean;
@@ -55,11 +55,11 @@ export class AddonQbehaviourManualGradedHandler implements CoreQuestionBehaviour
     /**
      * Determine a question new state based on its answer(s).
      *
-     * @param {string} component Component the question belongs to.
-     * @param {number} attemptId Attempt ID the question belongs to.
-     * @param {any} question The question.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {CoreQuestionState|Promise<CoreQuestionState>} New state (or promise resolved with state).
+     * @param component Component the question belongs to.
+     * @param attemptId Attempt ID the question belongs to.
+     * @param question The question.
+     * @param siteId Site ID. If not defined, current site.
+     * @return New state (or promise resolved with state).
      */
     determineNewState(component: string, attemptId: number, question: any, siteId?: string)
             : CoreQuestionState | Promise<CoreQuestionState> {
@@ -69,13 +69,13 @@ export class AddonQbehaviourManualGradedHandler implements CoreQuestionBehaviour
     /**
      * Determine a question new state based on its answer(s) for manual graded question behaviour.
      *
-     * @param {string} component Component the question belongs to.
-     * @param {number} attemptId Attempt ID the question belongs to.
-     * @param {any} question The question.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {isCompleteResponseFunction} [isCompleteFn] Function to override the default isCompleteResponse check.
-     * @param {isSameResponseFunction} [isSameFn] Function to override the default isSameResponse check.
-     * @return {Promise<CoreQuestionState>} Promise resolved with state.
+     * @param component Component the question belongs to.
+     * @param attemptId Attempt ID the question belongs to.
+     * @param question The question.
+     * @param siteId Site ID. If not defined, current site.
+     * @param isCompleteFn Function to override the default isCompleteResponse check.
+     * @param isSameFn Function to override the default isSameResponse check.
+     * @return Promise resolved with state.
      */
     determineNewStateManualGraded(component: string, attemptId: number, question: any, siteId?: string,
             isCompleteFn?: isCompleteResponseFunction, isSameFn?: isSameResponseFunction): Promise<CoreQuestionState> {
@@ -139,7 +139,7 @@ export class AddonQbehaviourManualGradedHandler implements CoreQuestionBehaviour
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/addon/qtype/calculated/providers/handler.ts b/src/addon/qtype/calculated/providers/handler.ts
index 0874fbc82..12ab450e8 100644
--- a/src/addon/qtype/calculated/providers/handler.ts
+++ b/src/addon/qtype/calculated/providers/handler.ts
@@ -33,9 +33,9 @@ export class AddonQtypeCalculatedHandler implements CoreQuestionHandler {
      * Return the Component to use to display the question.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param question The question to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, question: any): any | Promise<any> {
         return AddonQtypeCalculatedComponent;
@@ -44,9 +44,9 @@ export class AddonQtypeCalculatedHandler implements CoreQuestionHandler {
     /**
      * Check if a response is complete.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if complete, 0 if not complete, -1 if cannot determine.
      */
     isCompleteResponse(question: any, answers: any): number {
         if (this.isGradableResponse(question, answers) === 0 || !this.validateUnits(answers['answer'])) {
@@ -63,7 +63,7 @@ export class AddonQtypeCalculatedHandler implements CoreQuestionHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -73,9 +73,9 @@ export class AddonQtypeCalculatedHandler implements CoreQuestionHandler {
      * Check if a student has provided enough of an answer for the question to be graded automatically,
      * or whether it must be considered aborted.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if gradable, 0 if not gradable, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if gradable, 0 if not gradable, -1 if cannot determine.
      */
     isGradableResponse(question: any, answers: any): number {
         let isGradable = this.isValidValue(answers['answer']);
@@ -90,10 +90,10 @@ export class AddonQtypeCalculatedHandler implements CoreQuestionHandler {
     /**
      * Check if two responses are the same.
      *
-     * @param {any} question Question.
-     * @param {any} prevAnswers Object with the previous question answers.
-     * @param {any} newAnswers Object with the new question answers.
-     * @return {boolean} Whether they're the same.
+     * @param question Question.
+     * @param prevAnswers Object with the previous question answers.
+     * @param newAnswers Object with the new question answers.
+     * @return Whether they're the same.
      */
     isSameResponse(question: any, prevAnswers: any, newAnswers: any): boolean {
         return this.utils.sameAtKeyMissingIsBlank(prevAnswers, newAnswers, 'answer') &&
@@ -103,8 +103,8 @@ export class AddonQtypeCalculatedHandler implements CoreQuestionHandler {
     /**
      * Check if a value is valid (not empty).
      *
-     * @param {string|number} value Value to check.
-     * @return {boolean} Whether the value is valid.
+     * @param value Value to check.
+     * @return Whether the value is valid.
      */
     isValidValue(value: string | number): boolean {
         return !!value || value === '0' || value === 0;
@@ -113,8 +113,8 @@ export class AddonQtypeCalculatedHandler implements CoreQuestionHandler {
     /**
      * Check if a question requires units in a separate input.
      *
-     * @param {any} question The question.
-     * @return {boolean} Whether the question requires units.
+     * @param question The question.
+     * @return Whether the question requires units.
      */
     requiresUnits(question: any): boolean {
         const element = this.domUtils.convertToElement(question.html);
@@ -126,8 +126,8 @@ export class AddonQtypeCalculatedHandler implements CoreQuestionHandler {
      * Validate a number with units. We don't have the list of valid units and conversions, so we can't perform
      * a full validation. If this function returns true it means we can't be sure it's valid.
      *
-     * @param {string} answer Answer.
-     * @return {boolean} False if answer isn't valid, true if we aren't sure if it's valid.
+     * @param answer Answer.
+     * @return False if answer isn't valid, true if we aren't sure if it's valid.
      */
     validateUnits(answer: string): boolean {
         if (!answer) {
diff --git a/src/addon/qtype/calculatedmulti/providers/handler.ts b/src/addon/qtype/calculatedmulti/providers/handler.ts
index 3cbe18057..9baf71fc0 100644
--- a/src/addon/qtype/calculatedmulti/providers/handler.ts
+++ b/src/addon/qtype/calculatedmulti/providers/handler.ts
@@ -32,9 +32,9 @@ export class AddonQtypeCalculatedMultiHandler implements CoreQuestionHandler {
      * Return the Component to use to display the question.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param question The question to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, question: any): any | Promise<any> {
         // Calculated multi behaves like a multichoice, use the same component.
@@ -44,9 +44,9 @@ export class AddonQtypeCalculatedMultiHandler implements CoreQuestionHandler {
     /**
      * Check if a response is complete.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if complete, 0 if not complete, -1 if cannot determine.
      */
     isCompleteResponse(question: any, answers: any): number {
         // This question type depends on multichoice.
@@ -56,7 +56,7 @@ export class AddonQtypeCalculatedMultiHandler implements CoreQuestionHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -66,9 +66,9 @@ export class AddonQtypeCalculatedMultiHandler implements CoreQuestionHandler {
      * Check if a student has provided enough of an answer for the question to be graded automatically,
      * or whether it must be considered aborted.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if gradable, 0 if not gradable, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if gradable, 0 if not gradable, -1 if cannot determine.
      */
     isGradableResponse(question: any, answers: any): number {
         // This question type depends on multichoice.
@@ -78,10 +78,10 @@ export class AddonQtypeCalculatedMultiHandler implements CoreQuestionHandler {
     /**
      * Check if two responses are the same.
      *
-     * @param {any} question Question.
-     * @param {any} prevAnswers Object with the previous question answers.
-     * @param {any} newAnswers Object with the new question answers.
-     * @return {boolean} Whether they're the same.
+     * @param question Question.
+     * @param prevAnswers Object with the previous question answers.
+     * @param newAnswers Object with the new question answers.
+     * @return Whether they're the same.
      */
     isSameResponse(question: any, prevAnswers: any, newAnswers: any): boolean {
         // This question type depends on multichoice.
diff --git a/src/addon/qtype/calculatedsimple/providers/handler.ts b/src/addon/qtype/calculatedsimple/providers/handler.ts
index 2aaaf1c9c..2e9e85062 100644
--- a/src/addon/qtype/calculatedsimple/providers/handler.ts
+++ b/src/addon/qtype/calculatedsimple/providers/handler.ts
@@ -32,9 +32,9 @@ export class AddonQtypeCalculatedSimpleHandler implements CoreQuestionHandler {
      * Return the Component to use to display the question.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param question The question to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, question: any): any | Promise<any> {
         // Calculated simple behaves like a calculated, use the same component.
@@ -44,9 +44,9 @@ export class AddonQtypeCalculatedSimpleHandler implements CoreQuestionHandler {
     /**
      * Check if a response is complete.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if complete, 0 if not complete, -1 if cannot determine.
      */
     isCompleteResponse(question: any, answers: any): number {
         // This question type depends on calculated.
@@ -56,7 +56,7 @@ export class AddonQtypeCalculatedSimpleHandler implements CoreQuestionHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -66,9 +66,9 @@ export class AddonQtypeCalculatedSimpleHandler implements CoreQuestionHandler {
      * Check if a student has provided enough of an answer for the question to be graded automatically,
      * or whether it must be considered aborted.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if gradable, 0 if not gradable, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if gradable, 0 if not gradable, -1 if cannot determine.
      */
     isGradableResponse(question: any, answers: any): number {
         // This question type depends on calculated.
@@ -78,10 +78,10 @@ export class AddonQtypeCalculatedSimpleHandler implements CoreQuestionHandler {
     /**
      * Check if two responses are the same.
      *
-     * @param {any} question Question.
-     * @param {any} prevAnswers Object with the previous question answers.
-     * @param {any} newAnswers Object with the new question answers.
-     * @return {boolean} Whether they're the same.
+     * @param question Question.
+     * @param prevAnswers Object with the previous question answers.
+     * @param newAnswers Object with the new question answers.
+     * @return Whether they're the same.
      */
     isSameResponse(question: any, prevAnswers: any, newAnswers: any): boolean {
         // This question type depends on calculated.
diff --git a/src/addon/qtype/ddimageortext/classes/ddimageortext.ts b/src/addon/qtype/ddimageortext/classes/ddimageortext.ts
index 88f5c9e18..df0b3eb89 100644
--- a/src/addon/qtype/ddimageortext/classes/ddimageortext.ts
+++ b/src/addon/qtype/ddimageortext/classes/ddimageortext.ts
@@ -50,12 +50,12 @@ export class AddonQtypeDdImageOrTextQuestion {
     /**
      * Create the this.
      *
-     * @param {CoreLoggerProvider} logger Logger provider.
-     * @param {CoreDomUtilsProvider} domUtils Dom Utils provider.
-     * @param {HTMLElement} container The container HTMLElement of the question.
-     * @param {any} question The question this.
-     * @param {boolean} readOnly Whether it's read only.
-     * @param {any[]} drops The drop zones received in the init object of the question.
+     * @param logger Logger provider.
+     * @param domUtils Dom Utils provider.
+     * @param container The container HTMLElement of the question.
+     * @param question The question this.
+     * @param readOnly Whether it's read only.
+     * @param drops The drop zones received in the init object of the question.
      */
     constructor(logger: CoreLoggerProvider, protected domUtils: CoreDomUtilsProvider, protected container: HTMLElement,
                 protected question: any, protected readOnly: boolean, protected drops: any[]) {
@@ -80,8 +80,8 @@ export class AddonQtypeDdImageOrTextQuestion {
     /**
      * Convert the X and Y position of the BG IMG to a position relative to the window.
      *
-     * @param {number[]} bgImgXY X and Y of the BG IMG relative position.
-     * @return {number[]} Position relative to the window.
+     * @param bgImgXY X and Y of the BG IMG relative position.
+     * @return Position relative to the window.
      */
     convertToWindowXY(bgImgXY: number[]): number[] {
         const bgImg = this.doc.bgImg(),
@@ -192,8 +192,8 @@ export class AddonQtypeDdImageOrTextQuestion {
     /**
      * Returns an object to encapsulate operations on dd area.
      *
-     * @param {number} slot The question slot.
-     * @return {AddonQtypeDdImageOrTextQuestionDocStructure} The object.
+     * @param slot The question slot.
+     * @return The object.
      */
     docStructure(slot: number): AddonQtypeDdImageOrTextQuestionDocStructure {
         const topNode = <HTMLElement> this.container.querySelector('.addon-qtype-ddimageortext-container'),
@@ -323,9 +323,9 @@ export class AddonQtypeDdImageOrTextQuestion {
     /**
      * Make an element draggable.
      *
-     * @param {HTMLElement} drag Element to make draggable.
-     * @param {number} group Group the element belongs to.
-     * @param {number} choice Choice the element belongs to.
+     * @param drag Element to make draggable.
+     * @param group Group the element belongs to.
+     * @param choice Choice the element belongs to.
      */
     draggableForQuestion(drag: HTMLElement, group: number, choice: number): void {
         // Set attributes.
@@ -348,7 +348,7 @@ export class AddonQtypeDdImageOrTextQuestion {
     /**
      * Function called when a drop zone is clicked.
      *
-     * @param {HTMLElement} dropNode Drop element.
+     * @param dropNode Drop element.
      */
     dropClick(dropNode: HTMLElement): void {
         const drag = this.selected;
@@ -368,9 +368,9 @@ export class AddonQtypeDdImageOrTextQuestion {
     /**
      * Get all the draggable elements for a choice and a drop zone.
      *
-     * @param {number} choice Choice number.
-     * @param {HTMLElement} drop Drop zone.
-     * @return {HTMLElement[]} Draggable elements.
+     * @param choice Choice number.
+     * @param drop Drop zone.
+     * @return Draggable elements.
      */
     getChoicesForDrop(choice: number, drop: HTMLElement): HTMLElement[] {
         return <HTMLElement[]> Array.from(this.doc.topNode().querySelectorAll(
@@ -380,9 +380,9 @@ export class AddonQtypeDdImageOrTextQuestion {
     /**
      * Get an unplaced draggable element that belongs to a certain choice and drop zone.
      *
-     * @param {number} choice Choice number.
-     * @param {HTMLElement} drop Drop zone.
-     * @return {HTMLElement} Unplaced draggable element.
+     * @param choice Choice number.
+     * @param drop Drop zone.
+     * @return Unplaced draggable element.
      */
     getUnplacedChoiceForDrop(choice: number, drop: HTMLElement): HTMLElement {
         const dragItems = this.getChoicesForDrop(choice, drop);
@@ -443,7 +443,7 @@ export class AddonQtypeDdImageOrTextQuestion {
     /**
      * Initialize the question.
      *
-     * @param {any} question Question.
+     * @param question Question.
      */
     initializer(question: any): void {
         this.doc = this.docStructure(question.slot);
@@ -517,8 +517,8 @@ export class AddonQtypeDdImageOrTextQuestion {
     /**
      * Place a draggable element into a certain drop zone.
      *
-     * @param {HTMLElement} drag Draggable element.
-     * @param {HTMLElement} drop Drop zone element.
+     * @param drag Draggable element.
+     * @param drop Drop zone element.
      */
     placeDragInDrop(drag: HTMLElement, drop: HTMLElement): void {
         // Search the input related to the drop zone.
@@ -568,7 +568,7 @@ export class AddonQtypeDdImageOrTextQuestion {
     /**
      * Remove a draggable element from the drop zone where it is.
      *
-     * @param {HTMLElement} drag Draggable element to remove.
+     * @param drag Draggable element to remove.
      */
     removeDragFromDrop(drag: HTMLElement): void {
         // Check if the draggable element is assigned to an input. If so, empty the input's value.
@@ -670,7 +670,7 @@ export class AddonQtypeDdImageOrTextQuestion {
     /**
      * Mark a draggable element as selected.
      *
-     * @param {HTMLElement} drag Element to select.
+     * @param drag Element to select.
      */
     selectDrag(drag: HTMLElement): void {
         // Deselect previous ones.
@@ -690,7 +690,7 @@ export class AddonQtypeDdImageOrTextQuestion {
     /**
      * Update the padding of all items in a group to make them all have the same width and height.
      *
-     * @param {number} groupNo The group number.
+     * @param groupNo The group number.
      */
     updatePaddingSizeForGroup(groupNo: number): void {
 
diff --git a/src/addon/qtype/ddimageortext/providers/handler.ts b/src/addon/qtype/ddimageortext/providers/handler.ts
index 6cdf63057..73b571027 100644
--- a/src/addon/qtype/ddimageortext/providers/handler.ts
+++ b/src/addon/qtype/ddimageortext/providers/handler.ts
@@ -32,9 +32,9 @@ export class AddonQtypeDdImageOrTextHandler implements CoreQuestionHandler {
      * Return the name of the behaviour to use for the question.
      * If the question should use the default behaviour you shouldn't implement this function.
      *
-     * @param {any} question The question.
-     * @param {string} behaviour The default behaviour.
-     * @return {string} The behaviour to use.
+     * @param question The question.
+     * @param behaviour The default behaviour.
+     * @return The behaviour to use.
      */
     getBehaviour(question: any, behaviour: string): string {
         if (behaviour === 'interactive') {
@@ -48,9 +48,9 @@ export class AddonQtypeDdImageOrTextHandler implements CoreQuestionHandler {
      * Return the Component to use to display the question.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param question The question to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, question: any): any | Promise<any> {
         return AddonQtypeDdImageOrTextComponent;
@@ -59,9 +59,9 @@ export class AddonQtypeDdImageOrTextHandler implements CoreQuestionHandler {
     /**
      * Check if a response is complete.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if complete, 0 if not complete, -1 if cannot determine.
      */
     isCompleteResponse(question: any, answers: any): number {
         // An answer is complete if all drop zones have an answer.
@@ -79,7 +79,7 @@ export class AddonQtypeDdImageOrTextHandler implements CoreQuestionHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -89,9 +89,9 @@ export class AddonQtypeDdImageOrTextHandler implements CoreQuestionHandler {
      * Check if a student has provided enough of an answer for the question to be graded automatically,
      * or whether it must be considered aborted.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if gradable, 0 if not gradable, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if gradable, 0 if not gradable, -1 if cannot determine.
      */
     isGradableResponse(question: any, answers: any): number {
         for (const name in answers) {
@@ -107,10 +107,10 @@ export class AddonQtypeDdImageOrTextHandler implements CoreQuestionHandler {
     /**
      * Check if two responses are the same.
      *
-     * @param {any} question Question.
-     * @param {any} prevAnswers Object with the previous question answers.
-     * @param {any} newAnswers Object with the new question answers.
-     * @return {boolean} Whether they're the same.
+     * @param question Question.
+     * @param prevAnswers Object with the previous question answers.
+     * @param newAnswers Object with the new question answers.
+     * @return Whether they're the same.
      */
     isSameResponse(question: any, prevAnswers: any, newAnswers: any): boolean {
         return this.questionProvider.compareAllAnswers(prevAnswers, newAnswers);
diff --git a/src/addon/qtype/ddmarker/classes/ddmarker.ts b/src/addon/qtype/ddmarker/classes/ddmarker.ts
index f303d5c1b..2e279a5fb 100644
--- a/src/addon/qtype/ddmarker/classes/ddmarker.ts
+++ b/src/addon/qtype/ddmarker/classes/ddmarker.ts
@@ -58,14 +58,14 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Create the instance.
      *
-     * @param {CoreLoggerProvider} logger Logger provider.
-     * @param {CoreDomUtilsProvider} domUtils Dom Utils provider.
-     * @param {CoreTextUtilsProvider} textUtils Text Utils provider.
-     * @param {HTMLElement} container The container HTMLElement of the question.
-     * @param {any} question The question instance.
-     * @param {boolean} readOnly Whether it's read only.
-     * @param {any[]} dropZones The drop zones received in the init object of the question.
-     * @param {string} [imgSrc] Background image source (3.6+ sites).
+     * @param logger Logger provider.
+     * @param domUtils Dom Utils provider.
+     * @param textUtils Text Utils provider.
+     * @param container The container HTMLElement of the question.
+     * @param question The question instance.
+     * @param readOnly Whether it's read only.
+     * @param dropZones The drop zones received in the init object of the question.
+     * @param imgSrc Background image source (3.6+ sites).
      */
     constructor(logger: CoreLoggerProvider, protected domUtils: CoreDomUtilsProvider, protected textUtils: CoreTextUtilsProvider,
             protected container: HTMLElement, protected question: any, protected readOnly: boolean, protected dropZones: any[],
@@ -93,9 +93,9 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Create a new draggable element cloning a certain element.
      *
-     * @param {HTMLElement} dragHome The element to clone.
-     * @param {number} itemNo The number of the new item.
-     * @return {HTMLElement} The new element.
+     * @param dragHome The element to clone.
+     * @param itemNo The number of the new item.
+     * @return The new element.
      */
     cloneNewDragItem(dragHome: HTMLElement, itemNo: number): HTMLElement {
         const marker = <HTMLElement> dragHome.querySelector('span.markertext');
@@ -119,8 +119,8 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Convert the X and Y position of the BG IMG to a position relative to the window.
      *
-     * @param {number[]} bgImgXY X and Y of the BG IMG relative position.
-     * @return {number[]} Position relative to the window.
+     * @param bgImgXY X and Y of the BG IMG relative position.
+     * @return Position relative to the window.
      */
     convertToWindowXY(bgImgXY: number[]): number[] {
         const bgImg = this.doc.bgImg(),
@@ -136,8 +136,8 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Check if some coordinates (X, Y) are inside the background image.
      *
-     * @param {number[]} coords Coordinates to check.
-     * @return {boolean} Whether they're inside the background image.
+     * @param coords Coordinates to check.
+     * @return Whether they're inside the background image.
      */
     coordsInImg(coords: number[]): boolean {
         const bgImg = this.doc.bgImg();
@@ -168,8 +168,8 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Returns an object to encapsulate operations on dd area.
      *
-     * @param {number} slot The question slot.
-     * @return {AddonQtypeDdMarkerQuestionDocStructure} The object.
+     * @param slot The question slot.
+     * @return The object.
      */
     docStructure(slot: number): AddonQtypeDdMarkerQuestionDocStructure {
         const topNode = <HTMLElement> this.container.querySelector('.addon-qtype-ddmarker-container'),
@@ -235,7 +235,7 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Make an element "draggable". In the mobile app, items are "dragged" using tap and drop.
      *
-     * @param {HTMLElement} drag Element.
+     * @param drag Element.
      */
     draggable(drag: HTMLElement): void {
         drag.addEventListener('click', (e) => {
@@ -272,8 +272,8 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Get the coordinates of the drag home of a certain choice.
      *
-     * @param {number} choiceNo Choice number.
-     * @return {number[]} Coordinates.
+     * @param choiceNo Choice number.
+     * @return Coordinates.
      */
     dragHomeXY(choiceNo: number): number[] {
         const dragItemHome = this.doc.dragItemHome(choiceNo),
@@ -285,11 +285,11 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Draw a drop zone.
      *
-     * @param {number} dropZoneNo Number of the drop zone.
-     * @param {string} markerText The marker text to set.
-     * @param {string} shape Name of the shape of the drop zone (circle, rectangle, polygon).
-     * @param {string} coords Coordinates of the shape.
-     * @param {string} colour Colour of the shape.
+     * @param dropZoneNo Number of the drop zone.
+     * @param markerText The marker text to set.
+     * @param shape Name of the shape of the drop zone (circle, rectangle, polygon).
+     * @param coords Coordinates of the shape.
+     * @param colour Colour of the shape.
      */
     drawDropZone(dropZoneNo: number, markerText: string, shape: string, coords: string, colour: string): void {
         let existingMarkerText: HTMLElement;
@@ -363,10 +363,10 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Draw a circle in a drop zone.
      *
-     * @param {number} dropZoneNo Number of the drop zone.
-     * @param {string} coords Coordinates of the circle.
-     * @param {string} colour Colour of the circle.
-     * @return {number[]} X and Y position of the center of the circle.
+     * @param dropZoneNo Number of the drop zone.
+     * @param coords Coordinates of the circle.
+     * @param colour Colour of the circle.
+     * @return X and Y position of the center of the circle.
      */
     drawShapeCircle(dropZoneNo: number, coords: string, colour: string): number[] {
         // Extract the numbers in the coordinates.
@@ -404,10 +404,10 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Draw a rectangle in a drop zone.
      *
-     * @param {number} dropZoneNo Number of the drop zone.
-     * @param {string} coords Coordinates of the rectangle.
-     * @param {string} colour Colour of the rectangle.
-     * @return {number[]} X and Y position of the center of the rectangle.
+     * @param dropZoneNo Number of the drop zone.
+     * @param coords Coordinates of the rectangle.
+     * @param colour Colour of the rectangle.
+     * @return X and Y position of the center of the rectangle.
      */
     drawShapeRectangle(dropZoneNo: number, coords: string, colour: string): number[] {
         // Extract the numbers in the coordinates.
@@ -446,10 +446,10 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Draw a polygon in a drop zone.
      *
-     * @param {number} dropZoneNo Number of the drop zone.
-     * @param {string} coords Coordinates of the polygon.
-     * @param {string} colour Colour of the polygon.
-     * @return {number[]} X and Y position of the center of the polygon.
+     * @param dropZoneNo Number of the drop zone.
+     * @param coords Coordinates of the polygon.
+     * @param colour Colour of the polygon.
+     * @return X and Y position of the center of the polygon.
      */
     drawShapePolygon(dropZoneNo: number, coords: string, colour: string): number[] {
         const coordsParts = coords.split(';'),
@@ -497,8 +497,8 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Drop a drag element into a certain position.
      *
-     * @param {HTMLElement} drag The element to drop.
-     * @param {number[]} position Position to drop to (X, Y).
+     * @param drag The element to drop.
+     * @param position Position to drop to (X, Y).
      */
     dropDrag(drag: HTMLElement, position: number[]): void {
         const choiceNo = this.getChoiceNoForNode(drag);
@@ -522,8 +522,8 @@ export class AddonQtypeDdMarkerQuestion {
      * Determine which drag items need to be shown and return coords of all drag items except any that are currently being
      * dragged based on contents of hidden inputs and whether drags are 'infinite' or how many drags should be shown.
      *
-     * @param {HTMLElement} input The input element.
-     * @return {number[][]} List of coordinates.
+     * @param input The input element.
+     * @return List of coordinates.
      */
     getCoords(input: HTMLElement): number[][] {
         const choiceNo = this.getChoiceNoForNode(input),
@@ -557,8 +557,8 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Get the choice number from an HTML element.
      *
-     * @param {HTMLElement} node Element to check.
-     * @return {number} Choice number.
+     * @param node Element to check.
+     * @return Choice number.
      */
     getChoiceNoForNode(node: HTMLElement): number {
         return Number(this.doc.getClassnameNumericSuffix(node, 'choice'));
@@ -567,8 +567,8 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Get the coordinates (X, Y) of a draggable element.
      *
-     * @param {HTMLElement} dragItem The draggable item.
-     * @return {number[]} Coordinates.
+     * @param dragItem The draggable item.
+     * @return Coordinates.
      */
     getDragXY(dragItem: HTMLElement): number[] {
         const position = this.domUtils.getElementXY(dragItem, null, 'ddarea'),
@@ -593,8 +593,8 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Get the item number from an HTML element.
      *
-     * @param {HTMLElement} node Element to check.
-     * @return {number} Choice number.
+     * @param node Element to check.
+     * @return Choice number.
      */
     getItemNoForNode(node: HTMLElement): number {
         return Number(this.doc.getClassnameNumericSuffix(node, 'item'));
@@ -603,7 +603,7 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Get the next colour.
      *
-     * @return {string} Colour.
+     * @return Colour.
      */
     getNextColour(): string {
         const colour = this.COLOURS[this.nextColourIndex];
@@ -620,8 +620,8 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Get the number of drags from an HTML element.
      *
-     * @param {HTMLElement} node Element to check.
-     * @return {number} Choice number.
+     * @param node Element to check.
+     * @return Choice number.
      */
     getNoOfDragsForNode(node: HTMLElement): number {
         return Number(this.doc.getClassnameNumericSuffix(node, 'noofdrags'));
@@ -630,7 +630,7 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Initialize the question.
      *
-     * @param {any} question Question.
+     * @param question Question.
      */
     initializer(question: any): void {
         this.doc = this.docStructure(question.slot);
@@ -800,7 +800,7 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Reset the coordinates stored for a choice.
      *
-     * @param {number} choiceNo Choice number.
+     * @param choiceNo Choice number.
      */
     resetDragXY(choiceNo: number): void {
         this.setFormValue(choiceNo, '');
@@ -816,9 +816,9 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Save all the coordinates of a choice into the right input.
      *
-     * @param {number} choiceNo Number of the choice.
-     * @param {HTMLElement} dropped Element being dropped.
-     * @param {number[]} position Position where the element is dropped.
+     * @param choiceNo Number of the choice.
+     * @param dropped Element being dropped.
+     * @param position Position where the element is dropped.
      */
     saveAllXYForChoice(choiceNo: number, dropped: HTMLElement, position: number[]): void {
         const coords = [];
@@ -860,8 +860,8 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Save a certain value in the input of a choice.
      *
-     * @param {number} choiceNo Choice number.
-     * @param {string} value The value to set.
+     * @param choiceNo Choice number.
+     * @param value The value to set.
      */
     setFormValue(choiceNo: number, value: string): void {
         this.doc.inputForChoice(choiceNo).setAttribute('value', value);
@@ -870,7 +870,7 @@ export class AddonQtypeDdMarkerQuestion {
     /**
      * Select a draggable element.
      *
-     * @param {HTMLElement} drag Element.
+     * @param drag Element.
      */
     selectDrag(drag: HTMLElement): void {
         // Deselect previous drags.
diff --git a/src/addon/qtype/ddmarker/classes/graphics_api.ts b/src/addon/qtype/ddmarker/classes/graphics_api.ts
index a03df9a76..ae75138fc 100644
--- a/src/addon/qtype/ddmarker/classes/graphics_api.ts
+++ b/src/addon/qtype/ddmarker/classes/graphics_api.ts
@@ -26,17 +26,17 @@ export class AddonQtypeDdMarkerGraphicsApi {
     /**
      * Create the instance.
      *
-     * @param {AddonQtypeDdMarkerQuestion} instance Question instance.
-     * @param {CoreDomUtilsProvider} domUtils Dom Utils provider.
+     * @param instance Question instance.
+     * @param domUtils Dom Utils provider.
      */
     constructor(protected instance: AddonQtypeDdMarkerQuestion, protected domUtils: CoreDomUtilsProvider) { }
 
     /**
      * Add a shape.
      *
-     * @param {{type: string, color: string}} shapeAttribs Attributes for the shape: type and color.
-     * @param {{[name: string]: number|string} styles Object with the styles for the shape (name -> value).
-     * @return {Element} The new shape.
+     * @param shapeAttribs Attributes for the shape: type and color.
+     * @param styles Object with the styles for the shape (name -> value).
+     * @return The new shape.
      */
     addShape(shapeAttribs: {type: string, color: string}, styles: {[name: string]: number | string}): Element {
         const shape = document.createElementNS(this.NS, shapeAttribs.type);
diff --git a/src/addon/qtype/ddmarker/providers/handler.ts b/src/addon/qtype/ddmarker/providers/handler.ts
index 38ecfd1ba..c2220a45e 100644
--- a/src/addon/qtype/ddmarker/providers/handler.ts
+++ b/src/addon/qtype/ddmarker/providers/handler.ts
@@ -33,9 +33,9 @@ export class AddonQtypeDdMarkerHandler implements CoreQuestionHandler {
      * Return the name of the behaviour to use for the question.
      * If the question should use the default behaviour you shouldn't implement this function.
      *
-     * @param {any} question The question.
-     * @param {string} behaviour The default behaviour.
-     * @return {string} The behaviour to use.
+     * @param question The question.
+     * @param behaviour The default behaviour.
+     * @return The behaviour to use.
      */
     getBehaviour(question: any, behaviour: string): string {
         if (behaviour === 'interactive') {
@@ -49,9 +49,9 @@ export class AddonQtypeDdMarkerHandler implements CoreQuestionHandler {
      * Return the Component to use to display the question.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param question The question to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, question: any): any | Promise<any> {
         return AddonQtypeDdMarkerComponent;
@@ -60,9 +60,9 @@ export class AddonQtypeDdMarkerHandler implements CoreQuestionHandler {
     /**
      * Check if a response is complete.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if complete, 0 if not complete, -1 if cannot determine.
      */
     isCompleteResponse(question: any, answers: any): number {
         // If 1 dragitem is set we assume the answer is complete (like Moodle does).
@@ -78,7 +78,7 @@ export class AddonQtypeDdMarkerHandler implements CoreQuestionHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -88,9 +88,9 @@ export class AddonQtypeDdMarkerHandler implements CoreQuestionHandler {
      * Check if a student has provided enough of an answer for the question to be graded automatically,
      * or whether it must be considered aborted.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if gradable, 0 if not gradable, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if gradable, 0 if not gradable, -1 if cannot determine.
      */
     isGradableResponse(question: any, answers: any): number {
         return this.isCompleteResponse(question, answers);
@@ -99,10 +99,10 @@ export class AddonQtypeDdMarkerHandler implements CoreQuestionHandler {
     /**
      * Check if two responses are the same.
      *
-     * @param {any} question Question.
-     * @param {any} prevAnswers Object with the previous question answers.
-     * @param {any} newAnswers Object with the new question answers.
-     * @return {boolean} Whether they're the same.
+     * @param question Question.
+     * @param prevAnswers Object with the previous question answers.
+     * @param newAnswers Object with the new question answers.
+     * @return Whether they're the same.
      */
     isSameResponse(question: any, prevAnswers: any, newAnswers: any): boolean {
         return this.questionProvider.compareAllAnswers(prevAnswers, newAnswers);
@@ -111,9 +111,9 @@ export class AddonQtypeDdMarkerHandler implements CoreQuestionHandler {
     /**
      * Get the list of files that needs to be downloaded in addition to the files embedded in the HTML.
      *
-     * @param {any} question Question.
-     * @param {number} usageId Usage ID.
-     * @return {string[]} List of URLs.
+     * @param question Question.
+     * @param usageId Usage ID.
+     * @return List of URLs.
      */
     getAdditionalDownloadableFiles(question: any, usageId: number): string[] {
         this.questionHelper.extractQuestionScripts(question, usageId);
diff --git a/src/addon/qtype/ddwtos/classes/ddwtos.ts b/src/addon/qtype/ddwtos/classes/ddwtos.ts
index 14928b681..48f869ec3 100644
--- a/src/addon/qtype/ddwtos/classes/ddwtos.ts
+++ b/src/addon/qtype/ddwtos/classes/ddwtos.ts
@@ -52,12 +52,12 @@ export class AddonQtypeDdwtosQuestion {
     /**
      * Create the instance.
      *
-     * @param {CoreLoggerProvider} logger Logger provider.
-     * @param {CoreDomUtilsProvider} domUtils Dom Utils provider.
-     * @param {HTMLElement} container The container HTMLElement of the question.
-     * @param {any} question The question instance.
-     * @param {boolean} readOnly Whether it's read only.
-     * @param {string[]} inputIds Ids of the inputs of the question (where the answers will be stored).
+     * @param logger Logger provider.
+     * @param domUtils Dom Utils provider.
+     * @param container The container HTMLElement of the question.
+     * @param question The question instance.
+     * @param readOnly Whether it's read only.
+     * @param inputIds Ids of the inputs of the question (where the answers will be stored).
      */
     constructor(logger: CoreLoggerProvider, protected domUtils: CoreDomUtilsProvider, protected container: HTMLElement,
             protected question: any, protected readOnly: boolean, protected inputIds: string[],
@@ -70,7 +70,7 @@ export class AddonQtypeDdwtosQuestion {
     /**
      * Clone a drag item and add it to the drag container.
      *
-     * @param {HTMLElement} dragHome Item to clone
+     * @param dragHome Item to clone
      */
     cloneDragItem(dragHome: HTMLElement): void {
         const drag = <HTMLElement> dragHome.cloneNode(true);
@@ -106,7 +106,7 @@ export class AddonQtypeDdwtosQuestion {
     /**
      * Clone a certain 'drag home'. If it's an "infinite" drag, clone it several times.
      *
-     * @param {HTMLElement} dragHome Element to clone.
+     * @param dragHome Element to clone.
      */
     cloneDragItemsForOneChoice(dragHome: HTMLElement): void {
         if (dragHome.classList.contains('infinite')) {
@@ -124,8 +124,8 @@ export class AddonQtypeDdwtosQuestion {
     /**
      * Get an object with a set of functions to get the CSS selectors.
      *
-     * @param {number} slot Question slot.
-     * @return {AddonQtypeDdwtosQuestionCSSSelectors} Object with the functions to get the selectors.
+     * @param slot Question slot.
+     * @return Object with the functions to get the selectors.
      */
     cssSelectors(slot: number): AddonQtypeDdwtosQuestionCSSSelectors {
         const topNode = '.addon-qtype-ddwtos-container',
@@ -204,8 +204,8 @@ export class AddonQtypeDdwtosQuestion {
     /**
      * Get the choice number of an element. It is extracted from the classes.
      *
-     * @param {HTMLElement} node Element to check.
-     * @return {number} Choice number.
+     * @param node Element to check.
+     * @return Choice number.
      */
     getChoice(node: HTMLElement): number {
         return this.getClassnameNumericSuffix(node, 'choice');
@@ -214,9 +214,9 @@ export class AddonQtypeDdwtosQuestion {
     /**
      * Get the number in a certain class name of an element.
      *
-     * @param {HTMLElement} node The element to check.
-     * @param {string} prefix Prefix of the class to check.
-     * @return {number} The number in the class.
+     * @param node The element to check.
+     * @param prefix Prefix of the class to check.
+     * @return The number in the class.
      */
     getClassnameNumericSuffix(node: HTMLElement, prefix: string): number {
         if (node.classList && node.classList.length) {
@@ -238,8 +238,8 @@ export class AddonQtypeDdwtosQuestion {
     /**
      * Get the group number of an element. It is extracted from the classes.
      *
-     * @param {HTMLElement} node Element to check.
-     * @return {number} Group number.
+     * @param node Element to check.
+     * @return Group number.
      */
     getGroup(node: HTMLElement): number {
         return this.getClassnameNumericSuffix(node, 'group');
@@ -248,8 +248,8 @@ export class AddonQtypeDdwtosQuestion {
     /**
      * Get the number of an element ('no'). It is extracted from the classes.
      *
-     * @param {HTMLElement} node Element to check.
-     * @return {number} Number.
+     * @param node Element to check.
+     * @return Number.
      */
     getNo(node: HTMLElement): number {
         return this.getClassnameNumericSuffix(node, 'no');
@@ -258,8 +258,8 @@ export class AddonQtypeDdwtosQuestion {
     /**
      * Get the place number of an element. It is extracted from the classes.
      *
-     * @param {HTMLElement} node Element to check.
-     * @return {number} Place number.
+     * @param node Element to check.
+     * @return Place number.
      */
     getPlace(node: HTMLElement): number {
         return this.getClassnameNumericSuffix(node, 'place');
@@ -268,7 +268,7 @@ export class AddonQtypeDdwtosQuestion {
     /**
      * Initialize the question.
      *
-     * @param {any} question Question.
+     * @param question Question.
      */
     initializer(question: any): void {
         this.selectors = this.cssSelectors(question.slot);
@@ -326,7 +326,7 @@ export class AddonQtypeDdwtosQuestion {
     /**
      * Make an element "draggable". In the mobile app, items are "dragged" using tap and drop.
      *
-     * @param {HTMLElement} drag Element.
+     * @param drag Element.
      */
     makeDraggable(drag: HTMLElement): void {
         drag.addEventListener('click', () => {
@@ -341,7 +341,7 @@ export class AddonQtypeDdwtosQuestion {
     /**
      * Convert an element into a drop zone.
      *
-     * @param {HTMLElement} drop Element.
+     * @param drop Element.
      */
     makeDropZone(drop: HTMLElement): void {
         drop.addEventListener('click', () => {
@@ -401,9 +401,9 @@ export class AddonQtypeDdwtosQuestion {
     /**
      * Set the width and height of an element.
      *
-     * @param {HTMLElement} node Element.
-     * @param {number} width Width to set.
-     * @param {number} height Height to set.
+     * @param node Element.
+     * @param width Width to set.
+     * @param height Height to set.
      */
     protected padToWidthHeight(node: HTMLElement, width: number, height: number): void {
         node.style.width = width + 'px';
@@ -414,8 +414,8 @@ export class AddonQtypeDdwtosQuestion {
     /**
      * Place a draggable element inside a drop zone.
      *
-     * @param {HTMLElement} drag Draggable element.
-     * @param {HTMLElement} drop Drop zone.
+     * @param drag Draggable element.
+     * @param drop Drop zone.
      */
     placeDragInDrop(drag: HTMLElement, drop: HTMLElement): void {
 
@@ -446,7 +446,7 @@ export class AddonQtypeDdwtosQuestion {
     /**
      * Position a drag element in the right drop zone or in the home zone.
      *
-     * @param {HTMLElement} drag Drag element.
+     * @param drag Drag element.
      */
     positionDragItem(drag: HTMLElement): void {
         let position;
@@ -485,7 +485,7 @@ export class AddonQtypeDdwtosQuestion {
     /**
      * Remove a draggable element from a drop zone.
      *
-     * @param {HTMLElement} drag The draggable element.
+     * @param drag The draggable element.
      */
     removeDragFromDrop(drag: HTMLElement): void {
         const placeNo = this.placed[this.getNo(drag)],
@@ -497,7 +497,7 @@ export class AddonQtypeDdwtosQuestion {
     /**
      * Select a certain element as being "dragged".
      *
-     * @param {HTMLElement} drag Element.
+     * @param drag Element.
      */
     selectDrag(drag: HTMLElement): void {
         // Deselect previous drags, only 1 can be selected.
@@ -519,7 +519,7 @@ export class AddonQtypeDdwtosQuestion {
     /**
      * Set the padding size for a certain group.
      *
-     * @param {number} groupNo Group number.
+     * @param groupNo Group number.
      */
     setPaddingSizeForGroup(groupNo: number): void {
         const groupItems = <HTMLElement[]> Array.from(this.container.querySelectorAll(this.selectors.dragHomesGroup(groupNo)));
diff --git a/src/addon/qtype/ddwtos/providers/handler.ts b/src/addon/qtype/ddwtos/providers/handler.ts
index 6a8a6eae4..2f1a9ded0 100644
--- a/src/addon/qtype/ddwtos/providers/handler.ts
+++ b/src/addon/qtype/ddwtos/providers/handler.ts
@@ -32,9 +32,9 @@ export class AddonQtypeDdwtosHandler implements CoreQuestionHandler {
      * Return the name of the behaviour to use for the question.
      * If the question should use the default behaviour you shouldn't implement this function.
      *
-     * @param {any} question The question.
-     * @param {string} behaviour The default behaviour.
-     * @return {string} The behaviour to use.
+     * @param question The question.
+     * @param behaviour The default behaviour.
+     * @return The behaviour to use.
      */
     getBehaviour(question: any, behaviour: string): string {
         if (behaviour === 'interactive') {
@@ -48,9 +48,9 @@ export class AddonQtypeDdwtosHandler implements CoreQuestionHandler {
      * Return the Component to use to display the question.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param question The question to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, question: any): any | Promise<any> {
         return AddonQtypeDdwtosComponent;
@@ -59,9 +59,9 @@ export class AddonQtypeDdwtosHandler implements CoreQuestionHandler {
     /**
      * Check if a response is complete.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if complete, 0 if not complete, -1 if cannot determine.
      */
     isCompleteResponse(question: any, answers: any): number {
         for (const name in answers) {
@@ -77,7 +77,7 @@ export class AddonQtypeDdwtosHandler implements CoreQuestionHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -87,9 +87,9 @@ export class AddonQtypeDdwtosHandler implements CoreQuestionHandler {
      * Check if a student has provided enough of an answer for the question to be graded automatically,
      * or whether it must be considered aborted.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if gradable, 0 if not gradable, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if gradable, 0 if not gradable, -1 if cannot determine.
      */
     isGradableResponse(question: any, answers: any): number {
         for (const name in answers) {
@@ -105,10 +105,10 @@ export class AddonQtypeDdwtosHandler implements CoreQuestionHandler {
     /**
      * Check if two responses are the same.
      *
-     * @param {any} question Question.
-     * @param {any} prevAnswers Object with the previous question answers.
-     * @param {any} newAnswers Object with the new question answers.
-     * @return {boolean} Whether they're the same.
+     * @param question Question.
+     * @param prevAnswers Object with the previous question answers.
+     * @param newAnswers Object with the new question answers.
+     * @return Whether they're the same.
      */
     isSameResponse(question: any, prevAnswers: any, newAnswers: any): boolean {
         return this.questionProvider.compareAllAnswers(prevAnswers, newAnswers);
diff --git a/src/addon/qtype/description/providers/handler.ts b/src/addon/qtype/description/providers/handler.ts
index 49bba134c..fbb98071c 100644
--- a/src/addon/qtype/description/providers/handler.ts
+++ b/src/addon/qtype/description/providers/handler.ts
@@ -33,9 +33,9 @@ export class AddonQtypeDescriptionHandler implements CoreQuestionHandler {
      * Return the name of the behaviour to use for the question.
      * If the question should use the default behaviour you shouldn't implement this function.
      *
-     * @param {any} question The question.
-     * @param {string} behaviour The default behaviour.
-     * @return {string} The behaviour to use.
+     * @param question The question.
+     * @param behaviour The default behaviour.
+     * @return The behaviour to use.
      */
     getBehaviour(question: any, behaviour: string): string {
         return 'informationitem';
@@ -45,9 +45,9 @@ export class AddonQtypeDescriptionHandler implements CoreQuestionHandler {
      * Return the Component to use to display the question.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param question The question to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, question: any): any | Promise<any> {
         return AddonQtypeDescriptionComponent;
@@ -56,7 +56,7 @@ export class AddonQtypeDescriptionHandler implements CoreQuestionHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -66,9 +66,9 @@ export class AddonQtypeDescriptionHandler implements CoreQuestionHandler {
      * Validate if an offline sequencecheck is valid compared with the online one.
      * This function only needs to be implemented if a specific compare is required.
      *
-     * @param {any} question The question.
-     * @param {string} offlineSequenceCheck Sequence check stored in offline.
-     * @return {boolean} Whether sequencecheck is valid.
+     * @param question The question.
+     * @param offlineSequenceCheck Sequence check stored in offline.
+     * @return Whether sequencecheck is valid.
      */
     validateSequenceCheck(question: any, offlineSequenceCheck: string): boolean {
         // Descriptions don't have any answer so we'll always treat them as valid.
diff --git a/src/addon/qtype/essay/providers/handler.ts b/src/addon/qtype/essay/providers/handler.ts
index 3babbd6e1..61aa89c44 100644
--- a/src/addon/qtype/essay/providers/handler.ts
+++ b/src/addon/qtype/essay/providers/handler.ts
@@ -36,9 +36,9 @@ export class AddonQtypeEssayHandler implements CoreQuestionHandler {
      * Return the name of the behaviour to use for the question.
      * If the question should use the default behaviour you shouldn't implement this function.
      *
-     * @param {any} question The question.
-     * @param {string} behaviour The default behaviour.
-     * @return {string} The behaviour to use.
+     * @param question The question.
+     * @param behaviour The default behaviour.
+     * @return The behaviour to use.
      */
     getBehaviour(question: any, behaviour: string): string {
         return 'manualgraded';
@@ -48,9 +48,9 @@ export class AddonQtypeEssayHandler implements CoreQuestionHandler {
      * Return the Component to use to display the question.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param question The question to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, question: any): any | Promise<any> {
         return AddonQtypeEssayComponent;
@@ -60,8 +60,8 @@ export class AddonQtypeEssayHandler implements CoreQuestionHandler {
      * Check if a question can be submitted.
      * If a question cannot be submitted it should return a message explaining why (translated or not).
      *
-     * @param {any} question The question.
-     * @return {string} Prevent submit message. Undefined or empty if can be submitted.
+     * @param question The question.
+     * @return Prevent submit message. Undefined or empty if can be submitted.
      */
     getPreventSubmitMessage(question: any): string {
         const element = this.domUtils.convertToElement(question.html);
@@ -79,9 +79,9 @@ export class AddonQtypeEssayHandler implements CoreQuestionHandler {
     /**
      * Check if a response is complete.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if complete, 0 if not complete, -1 if cannot determine.
      */
     isCompleteResponse(question: any, answers: any): number {
         const element = this.domUtils.convertToElement(question.html);
@@ -100,7 +100,7 @@ export class AddonQtypeEssayHandler implements CoreQuestionHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -110,9 +110,9 @@ export class AddonQtypeEssayHandler implements CoreQuestionHandler {
      * Check if a student has provided enough of an answer for the question to be graded automatically,
      * or whether it must be considered aborted.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if gradable, 0 if not gradable, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if gradable, 0 if not gradable, -1 if cannot determine.
      */
     isGradableResponse(question: any, answers: any): number {
         return 0;
@@ -121,10 +121,10 @@ export class AddonQtypeEssayHandler implements CoreQuestionHandler {
     /**
      * Check if two responses are the same.
      *
-     * @param {any} question Question.
-     * @param {any} prevAnswers Object with the previous question answers.
-     * @param {any} newAnswers Object with the new question answers.
-     * @return {boolean} Whether they're the same.
+     * @param question Question.
+     * @param prevAnswers Object with the previous question answers.
+     * @param newAnswers Object with the new question answers.
+     * @return Whether they're the same.
      */
     isSameResponse(question: any, prevAnswers: any, newAnswers: any): boolean {
         return this.utils.sameAtKeyMissingIsBlank(prevAnswers, newAnswers, 'answer');
@@ -133,11 +133,11 @@ export class AddonQtypeEssayHandler implements CoreQuestionHandler {
     /**
      * Prepare and add to answers the data to send to server based in the input. Return promise if async.
      *
-     * @param {any} question Question.
-     * @param {any} answers The answers retrieved from the form. Prepared answers must be stored in this object.
-     * @param {boolean} [offline] Whether the data should be saved in offline.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} Return a promise resolved when done if async, void if sync.
+     * @param question Question.
+     * @param answers The answers retrieved from the form. Prepared answers must be stored in this object.
+     * @param offline Whether the data should be saved in offline.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Return a promise resolved when done if async, void if sync.
      */
     prepareAnswers(question: any, answers: any, offline: boolean, siteId?: string): void | Promise<any> {
         const element = this.domUtils.convertToElement(question.html);
diff --git a/src/addon/qtype/gapselect/providers/handler.ts b/src/addon/qtype/gapselect/providers/handler.ts
index e18b357cd..c0afd80b1 100644
--- a/src/addon/qtype/gapselect/providers/handler.ts
+++ b/src/addon/qtype/gapselect/providers/handler.ts
@@ -32,9 +32,9 @@ export class AddonQtypeGapSelectHandler implements CoreQuestionHandler {
      * Return the name of the behaviour to use for the question.
      * If the question should use the default behaviour you shouldn't implement this function.
      *
-     * @param {any} question The question.
-     * @param {string} behaviour The default behaviour.
-     * @return {string} The behaviour to use.
+     * @param question The question.
+     * @param behaviour The default behaviour.
+     * @return The behaviour to use.
      */
     getBehaviour(question: any, behaviour: string): string {
         if (behaviour === 'interactive') {
@@ -48,9 +48,9 @@ export class AddonQtypeGapSelectHandler implements CoreQuestionHandler {
      * Return the Component to use to display the question.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param question The question to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, question: any): any | Promise<any> {
         return AddonQtypeGapSelectComponent;
@@ -59,9 +59,9 @@ export class AddonQtypeGapSelectHandler implements CoreQuestionHandler {
     /**
      * Check if a response is complete.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if complete, 0 if not complete, -1 if cannot determine.
      */
     isCompleteResponse(question: any, answers: any): number {
         // We should always get a value for each select so we can assume we receive all the possible answers.
@@ -78,7 +78,7 @@ export class AddonQtypeGapSelectHandler implements CoreQuestionHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -88,9 +88,9 @@ export class AddonQtypeGapSelectHandler implements CoreQuestionHandler {
      * Check if a student has provided enough of an answer for the question to be graded automatically,
      * or whether it must be considered aborted.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if gradable, 0 if not gradable, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if gradable, 0 if not gradable, -1 if cannot determine.
      */
     isGradableResponse(question: any, answers: any): number {
         // We should always get a value for each select so we can assume we receive all the possible answers.
@@ -107,10 +107,10 @@ export class AddonQtypeGapSelectHandler implements CoreQuestionHandler {
     /**
      * Check if two responses are the same.
      *
-     * @param {any} question Question.
-     * @param {any} prevAnswers Object with the previous question answers.
-     * @param {any} newAnswers Object with the new question answers.
-     * @return {boolean} Whether they're the same.
+     * @param question Question.
+     * @param prevAnswers Object with the previous question answers.
+     * @param newAnswers Object with the new question answers.
+     * @return Whether they're the same.
      */
     isSameResponse(question: any, prevAnswers: any, newAnswers: any): boolean {
         return this.questionProvider.compareAllAnswers(prevAnswers, newAnswers);
diff --git a/src/addon/qtype/match/providers/handler.ts b/src/addon/qtype/match/providers/handler.ts
index d9519ad04..9b52e4979 100644
--- a/src/addon/qtype/match/providers/handler.ts
+++ b/src/addon/qtype/match/providers/handler.ts
@@ -32,9 +32,9 @@ export class AddonQtypeMatchHandler implements CoreQuestionHandler {
      * Return the name of the behaviour to use for the question.
      * If the question should use the default behaviour you shouldn't implement this function.
      *
-     * @param {any} question The question.
-     * @param {string} behaviour The default behaviour.
-     * @return {string} The behaviour to use.
+     * @param question The question.
+     * @param behaviour The default behaviour.
+     * @return The behaviour to use.
      */
     getBehaviour(question: any, behaviour: string): string {
         if (behaviour === 'interactive') {
@@ -48,9 +48,9 @@ export class AddonQtypeMatchHandler implements CoreQuestionHandler {
      * Return the Component to use to display the question.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param question The question to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, question: any): any | Promise<any> {
         return AddonQtypeMatchComponent;
@@ -59,9 +59,9 @@ export class AddonQtypeMatchHandler implements CoreQuestionHandler {
     /**
      * Check if a response is complete.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if complete, 0 if not complete, -1 if cannot determine.
      */
     isCompleteResponse(question: any, answers: any): number {
         // We should always get a value for each select so we can assume we receive all the possible answers.
@@ -78,7 +78,7 @@ export class AddonQtypeMatchHandler implements CoreQuestionHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -88,9 +88,9 @@ export class AddonQtypeMatchHandler implements CoreQuestionHandler {
      * Check if a student has provided enough of an answer for the question to be graded automatically,
      * or whether it must be considered aborted.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if gradable, 0 if not gradable, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if gradable, 0 if not gradable, -1 if cannot determine.
      */
     isGradableResponse(question: any, answers: any): number {
         // We should always get a value for each select so we can assume we receive all the possible answers.
@@ -107,10 +107,10 @@ export class AddonQtypeMatchHandler implements CoreQuestionHandler {
     /**
      * Check if two responses are the same.
      *
-     * @param {any} question Question.
-     * @param {any} prevAnswers Object with the previous question answers.
-     * @param {any} newAnswers Object with the new question answers.
-     * @return {boolean} Whether they're the same.
+     * @param question Question.
+     * @param prevAnswers Object with the previous question answers.
+     * @param newAnswers Object with the new question answers.
+     * @return Whether they're the same.
      */
     isSameResponse(question: any, prevAnswers: any, newAnswers: any): boolean {
         return this.questionProvider.compareAllAnswers(prevAnswers, newAnswers);
diff --git a/src/addon/qtype/multianswer/providers/handler.ts b/src/addon/qtype/multianswer/providers/handler.ts
index b02a4eb70..a05fdbc59 100644
--- a/src/addon/qtype/multianswer/providers/handler.ts
+++ b/src/addon/qtype/multianswer/providers/handler.ts
@@ -33,9 +33,9 @@ export class AddonQtypeMultiAnswerHandler implements CoreQuestionHandler {
      * Return the name of the behaviour to use for the question.
      * If the question should use the default behaviour you shouldn't implement this function.
      *
-     * @param {any} question The question.
-     * @param {string} behaviour The default behaviour.
-     * @return {string} The behaviour to use.
+     * @param question The question.
+     * @param behaviour The default behaviour.
+     * @return The behaviour to use.
      */
     getBehaviour(question: any, behaviour: string): string {
         if (behaviour === 'interactive') {
@@ -49,9 +49,9 @@ export class AddonQtypeMultiAnswerHandler implements CoreQuestionHandler {
      * Return the Component to use to display the question.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param question The question to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, question: any): any | Promise<any> {
         return AddonQtypeMultiAnswerComponent;
@@ -60,9 +60,9 @@ export class AddonQtypeMultiAnswerHandler implements CoreQuestionHandler {
     /**
      * Check if a response is complete.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if complete, 0 if not complete, -1 if cannot determine.
      */
     isCompleteResponse(question: any, answers: any): number {
         // Get all the inputs in the question to check if they've all been answered.
@@ -80,7 +80,7 @@ export class AddonQtypeMultiAnswerHandler implements CoreQuestionHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -90,9 +90,9 @@ export class AddonQtypeMultiAnswerHandler implements CoreQuestionHandler {
      * Check if a student has provided enough of an answer for the question to be graded automatically,
      * or whether it must be considered aborted.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if gradable, 0 if not gradable, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if gradable, 0 if not gradable, -1 if cannot determine.
      */
     isGradableResponse(question: any, answers: any): number {
         // We should always get a value for each select so we can assume we receive all the possible answers.
@@ -109,10 +109,10 @@ export class AddonQtypeMultiAnswerHandler implements CoreQuestionHandler {
     /**
      * Check if two responses are the same.
      *
-     * @param {any} question Question.
-     * @param {any} prevAnswers Object with the previous question answers.
-     * @param {any} newAnswers Object with the new question answers.
-     * @return {boolean} Whether they're the same.
+     * @param question Question.
+     * @param prevAnswers Object with the previous question answers.
+     * @param newAnswers Object with the new question answers.
+     * @return Whether they're the same.
      */
     isSameResponse(question: any, prevAnswers: any, newAnswers: any): boolean {
         return this.questionProvider.compareAllAnswers(prevAnswers, newAnswers);
@@ -122,9 +122,9 @@ export class AddonQtypeMultiAnswerHandler implements CoreQuestionHandler {
      * Validate if an offline sequencecheck is valid compared with the online one.
      * This function only needs to be implemented if a specific compare is required.
      *
-     * @param {any} question The question.
-     * @param {string} offlineSequenceCheck Sequence check stored in offline.
-     * @return {boolean} Whether sequencecheck is valid.
+     * @param question The question.
+     * @param offlineSequenceCheck Sequence check stored in offline.
+     * @return Whether sequencecheck is valid.
      */
     validateSequenceCheck(question: any, offlineSequenceCheck: string): boolean {
         if (question.sequencecheck == offlineSequenceCheck) {
diff --git a/src/addon/qtype/multichoice/providers/handler.ts b/src/addon/qtype/multichoice/providers/handler.ts
index 440ab80e8..ca4d0f413 100644
--- a/src/addon/qtype/multichoice/providers/handler.ts
+++ b/src/addon/qtype/multichoice/providers/handler.ts
@@ -32,9 +32,9 @@ export class AddonQtypeMultichoiceHandler implements CoreQuestionHandler {
      * Return the Component to use to display the question.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param question The question to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, question: any): any | Promise<any> {
         return AddonQtypeMultichoiceComponent;
@@ -43,9 +43,9 @@ export class AddonQtypeMultichoiceHandler implements CoreQuestionHandler {
     /**
      * Check if a response is complete.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if complete, 0 if not complete, -1 if cannot determine.
      */
     isCompleteResponse(question: any, answers: any): number {
         let isSingle = true,
@@ -73,8 +73,8 @@ export class AddonQtypeMultichoiceHandler implements CoreQuestionHandler {
     /**
      * Check if a response is complete. Only for single answer.
      *
-     * @param {any} question The question.uestion answers (without prefix).
-     * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+     * @param question The question.uestion answers (without prefix).
+     * @return 1 if complete, 0 if not complete, -1 if cannot determine.
      */
     isCompleteResponseSingle(answers: any): number {
         return (answers['answer'] && answers['answer'] !== '') ? 1 : 0;
@@ -83,7 +83,7 @@ export class AddonQtypeMultichoiceHandler implements CoreQuestionHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -93,9 +93,9 @@ export class AddonQtypeMultichoiceHandler implements CoreQuestionHandler {
      * Check if a student has provided enough of an answer for the question to be graded automatically,
      * or whether it must be considered aborted.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if gradable, 0 if not gradable, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if gradable, 0 if not gradable, -1 if cannot determine.
      */
     isGradableResponse(question: any, answers: any): number {
         return this.isCompleteResponse(question, answers);
@@ -105,8 +105,8 @@ export class AddonQtypeMultichoiceHandler implements CoreQuestionHandler {
      * Check if a student has provided enough of an answer for the question to be graded automatically,
      * or whether it must be considered aborted. Only for single answer.
      *
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if gradable, 0 if not gradable, -1 if cannot determine.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if gradable, 0 if not gradable, -1 if cannot determine.
      */
     isGradableResponseSingle(answers: any): number {
         return this.isCompleteResponseSingle(answers);
@@ -115,10 +115,10 @@ export class AddonQtypeMultichoiceHandler implements CoreQuestionHandler {
     /**
      * Check if two responses are the same.
      *
-     * @param {any} question Question.
-     * @param {any} prevAnswers Object with the previous question answers.
-     * @param {any} newAnswers Object with the new question answers.
-     * @return {boolean} Whether they're the same.
+     * @param question Question.
+     * @param prevAnswers Object with the previous question answers.
+     * @param newAnswers Object with the new question answers.
+     * @return Whether they're the same.
      */
     isSameResponse(question: any, prevAnswers: any, newAnswers: any): boolean {
         let isSingle = true,
@@ -144,9 +144,9 @@ export class AddonQtypeMultichoiceHandler implements CoreQuestionHandler {
     /**
      * Check if two responses are the same. Only for single answer.
      *
-     * @param {any} prevAnswers Object with the previous question answers.
-     * @param {any} newAnswers Object with the new question answers.
-     * @return {boolean} Whether they're the same.
+     * @param prevAnswers Object with the previous question answers.
+     * @param newAnswers Object with the new question answers.
+     * @return Whether they're the same.
      */
     isSameResponseSingle(prevAnswers: any, newAnswers: any): boolean {
         return this.utils.sameAtKeyMissingIsBlank(prevAnswers, newAnswers, 'answer');
@@ -155,11 +155,11 @@ export class AddonQtypeMultichoiceHandler implements CoreQuestionHandler {
     /**
      * Prepare and add to answers the data to send to server based in the input. Return promise if async.
      *
-     * @param {any} question Question.
-     * @param {any} answers The answers retrieved from the form. Prepared answers must be stored in this object.
-     * @param {boolean} [offline] Whether the data should be saved in offline.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} Return a promise resolved when done if async, void if sync.
+     * @param question Question.
+     * @param answers The answers retrieved from the form. Prepared answers must be stored in this object.
+     * @param offline Whether the data should be saved in offline.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Return a promise resolved when done if async, void if sync.
      */
     prepareAnswers(question: any, answers: any, offline: boolean, siteId?: string): void | Promise<any> {
         if (question && !question.multi && typeof answers[question.optionsName] != 'undefined' && !answers[question.optionsName]) {
diff --git a/src/addon/qtype/randomsamatch/providers/handler.ts b/src/addon/qtype/randomsamatch/providers/handler.ts
index eca943805..67d8d23ae 100644
--- a/src/addon/qtype/randomsamatch/providers/handler.ts
+++ b/src/addon/qtype/randomsamatch/providers/handler.ts
@@ -32,9 +32,9 @@ export class AddonQtypeRandomSaMatchHandler implements CoreQuestionHandler {
      * Return the Component to use to display the question.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param question The question to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, question: any): any | Promise<any> {
         // Random behaves like a match question, use the same component.
@@ -44,9 +44,9 @@ export class AddonQtypeRandomSaMatchHandler implements CoreQuestionHandler {
     /**
      * Check if a response is complete.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if complete, 0 if not complete, -1 if cannot determine.
      */
     isCompleteResponse(question: any, answers: any): number {
         // This question behaves like a match question.
@@ -56,7 +56,7 @@ export class AddonQtypeRandomSaMatchHandler implements CoreQuestionHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -66,9 +66,9 @@ export class AddonQtypeRandomSaMatchHandler implements CoreQuestionHandler {
      * Check if a student has provided enough of an answer for the question to be graded automatically,
      * or whether it must be considered aborted.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if gradable, 0 if not gradable, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if gradable, 0 if not gradable, -1 if cannot determine.
      */
     isGradableResponse(question: any, answers: any): number {
         // This question behaves like a match question.
@@ -78,10 +78,10 @@ export class AddonQtypeRandomSaMatchHandler implements CoreQuestionHandler {
     /**
      * Check if two responses are the same.
      *
-     * @param {any} question Question.
-     * @param {any} prevAnswers Object with the previous question answers.
-     * @param {any} newAnswers Object with the new question answers.
-     * @return {boolean} Whether they're the same.
+     * @param question Question.
+     * @param prevAnswers Object with the previous question answers.
+     * @param newAnswers Object with the new question answers.
+     * @return Whether they're the same.
      */
     isSameResponse(question: any, prevAnswers: any, newAnswers: any): boolean {
         // This question behaves like a match question.
diff --git a/src/addon/qtype/shortanswer/providers/handler.ts b/src/addon/qtype/shortanswer/providers/handler.ts
index abbb694dc..a4daa2823 100644
--- a/src/addon/qtype/shortanswer/providers/handler.ts
+++ b/src/addon/qtype/shortanswer/providers/handler.ts
@@ -32,9 +32,9 @@ export class AddonQtypeShortAnswerHandler implements CoreQuestionHandler {
      * Return the Component to use to display the question.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param question The question to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, question: any): any | Promise<any> {
         return AddonQtypeShortAnswerComponent;
@@ -43,9 +43,9 @@ export class AddonQtypeShortAnswerHandler implements CoreQuestionHandler {
     /**
      * Check if a response is complete.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if complete, 0 if not complete, -1 if cannot determine.
      */
     isCompleteResponse(question: any, answers: any): number {
         return (answers['answer'] || answers['answer'] === 0) ? 1 : 0;
@@ -54,7 +54,7 @@ export class AddonQtypeShortAnswerHandler implements CoreQuestionHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -64,9 +64,9 @@ export class AddonQtypeShortAnswerHandler implements CoreQuestionHandler {
      * Check if a student has provided enough of an answer for the question to be graded automatically,
      * or whether it must be considered aborted.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if gradable, 0 if not gradable, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if gradable, 0 if not gradable, -1 if cannot determine.
      */
     isGradableResponse(question: any, answers: any): number {
         return this.isCompleteResponse(question, answers);
@@ -75,10 +75,10 @@ export class AddonQtypeShortAnswerHandler implements CoreQuestionHandler {
     /**
      * Check if two responses are the same.
      *
-     * @param {any} question Question.
-     * @param {any} prevAnswers Object with the previous question answers.
-     * @param {any} newAnswers Object with the new question answers.
-     * @return {boolean} Whether they're the same.
+     * @param question Question.
+     * @param prevAnswers Object with the previous question answers.
+     * @param newAnswers Object with the new question answers.
+     * @return Whether they're the same.
      */
     isSameResponse(question: any, prevAnswers: any, newAnswers: any): boolean {
         return this.utils.sameAtKeyMissingIsBlank(prevAnswers, newAnswers, 'answer');
diff --git a/src/addon/qtype/truefalse/providers/handler.ts b/src/addon/qtype/truefalse/providers/handler.ts
index 3be03abde..24f2efdfe 100644
--- a/src/addon/qtype/truefalse/providers/handler.ts
+++ b/src/addon/qtype/truefalse/providers/handler.ts
@@ -32,9 +32,9 @@ export class AddonQtypeTrueFalseHandler implements CoreQuestionHandler {
      * Return the Component to use to display the question.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param question The question to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, question: any): any | Promise<any> {
         // True/false behaves like a multichoice, use the same component.
@@ -44,9 +44,9 @@ export class AddonQtypeTrueFalseHandler implements CoreQuestionHandler {
     /**
      * Check if a response is complete.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if complete, 0 if not complete, -1 if cannot determine.
      */
     isCompleteResponse(question: any, answers: any): number {
         return answers['answer'] ? 1 : 0;
@@ -55,7 +55,7 @@ export class AddonQtypeTrueFalseHandler implements CoreQuestionHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -65,9 +65,9 @@ export class AddonQtypeTrueFalseHandler implements CoreQuestionHandler {
      * Check if a student has provided enough of an answer for the question to be graded automatically,
      * or whether it must be considered aborted.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if gradable, 0 if not gradable, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if gradable, 0 if not gradable, -1 if cannot determine.
      */
     isGradableResponse(question: any, answers: any): number {
         return this.isCompleteResponse(question, answers);
@@ -76,10 +76,10 @@ export class AddonQtypeTrueFalseHandler implements CoreQuestionHandler {
     /**
      * Check if two responses are the same.
      *
-     * @param {any} question Question.
-     * @param {any} prevAnswers Object with the previous question answers.
-     * @param {any} newAnswers Object with the new question answers.
-     * @return {boolean} Whether they're the same.
+     * @param question Question.
+     * @param prevAnswers Object with the previous question answers.
+     * @param newAnswers Object with the new question answers.
+     * @return Whether they're the same.
      */
     isSameResponse(question: any, prevAnswers: any, newAnswers: any): boolean {
         return this.utils.sameAtKeyMissingIsBlank(prevAnswers, newAnswers, 'answer');
@@ -88,11 +88,11 @@ export class AddonQtypeTrueFalseHandler implements CoreQuestionHandler {
     /**
      * Prepare and add to answers the data to send to server based in the input. Return promise if async.
      *
-     * @param {any} question Question.
-     * @param {any} answers The answers retrieved from the form. Prepared answers must be stored in this object.
-     * @param {boolean} [offline] Whether the data should be saved in offline.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} Return a promise resolved when done if async, void if sync.
+     * @param question Question.
+     * @param answers The answers retrieved from the form. Prepared answers must be stored in this object.
+     * @param offline Whether the data should be saved in offline.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Return a promise resolved when done if async, void if sync.
      */
     prepareAnswers(question: any, answers: any, offline: boolean, siteId?: string): void | Promise<any> {
         if (question && typeof answers[question.optionsName] != 'undefined' && !answers[question.optionsName]) {
diff --git a/src/addon/remotethemes/providers/remotethemes.ts b/src/addon/remotethemes/providers/remotethemes.ts
index 7b30b31ce..f4d863740 100644
--- a/src/addon/remotethemes/providers/remotethemes.ts
+++ b/src/addon/remotethemes/providers/remotethemes.ts
@@ -43,8 +43,8 @@ export class AddonRemoteThemesProvider {
     /**
      * Add a style element for a site and load the styles for that element. The style will be disabled.
      *
-     * @param {string} siteId Site ID.
-     * @return {Promise<any>} Promise resolved when added and loaded.
+     * @param siteId Site ID.
+     * @return Promise resolved when added and loaded.
      */
     addSite(siteId: string): Promise<any> {
         if (!siteId || this.stylesEls[siteId]) {
@@ -85,8 +85,8 @@ export class AddonRemoteThemesProvider {
     /**
      * Enabled or disable a certain style element.
      *
-     * @param {HTMLStyleElement} element The element to enable or disable.
-     * @param {boolean} disable Whether to disable or enable the element.
+     * @param element The element to enable or disable.
+     * @param disable Whether to disable or enable the element.
      */
     disableElement(element: HTMLStyleElement, disable: boolean): void {
         // Setting disabled should be enough, but we also set the attribute so it can be seen in the DOM which ones are disabled.
@@ -106,9 +106,9 @@ export class AddonRemoteThemesProvider {
     /**
      * Downloads a CSS file and remove old files if needed.
      *
-     * @param {string} siteId Site ID.
-     * @param {string} url File URL.
-     * @return {Promise<any>} Promise resolved when the file is downloaded.
+     * @param siteId Site ID.
+     * @param url File URL.
+     * @return Promise resolved when the file is downloaded.
      */
     protected downloadFileAndRemoveOld(siteId: string, url: string): Promise<any> {
         // Check if the file is downloaded.
@@ -130,7 +130,7 @@ export class AddonRemoteThemesProvider {
     /**
      * Enable the styles of a certain site.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
+     * @param siteId Site ID. If not defined, current site.
      */
     enable(siteId?: string): void {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -143,9 +143,9 @@ export class AddonRemoteThemesProvider {
     /**
      * Get remote styles of a certain site.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<{fileUrl: string, styles: string}>} Promise resolved with the styles and the URL of the CSS file,
-     *                                                      resolved with undefined if no styles to load.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the styles and the URL of the CSS file,
+     *         resolved with undefined if no styles to load.
      */
     get(siteId?: string): Promise<{fileUrl: string, styles: string}> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -193,8 +193,8 @@ export class AddonRemoteThemesProvider {
     /**
      * Check if the CSS code has a separator for 3.5 styles. If it does, get only the styles after the separator.
      *
-     * @param {string} cssCode The CSS code to check.
-     * @return {string} The filtered styles.
+     * @param cssCode The CSS code to check.
+     * @return The filtered styles.
      */
     protected get35Styles(cssCode: string): string {
         const separatorPos = cssCode.search(this.SEPARATOR_35);
@@ -208,9 +208,9 @@ export class AddonRemoteThemesProvider {
     /**
      * Load styles for a certain site.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {boolean} [disabled] Whether loaded styles should be disabled.
-     * @return {Promise<any>} Promise resolved when styles are loaded.
+     * @param siteId Site ID. If not defined, current site.
+     * @param disabled Whether loaded styles should be disabled.
+     * @return Promise resolved when styles are loaded.
      */
     load(siteId?: string, disabled?: boolean): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -255,8 +255,8 @@ export class AddonRemoteThemesProvider {
     /**
      * Load styles for a temporary site. These styles aren't prefetched.
      *
-     * @param {string} url URL to get the styles from.
-     * @return {Promise<any>} Promise resolved when loaded.
+     * @param url URL to get the styles from.
+     * @return Promise resolved when loaded.
      */
     loadTmpStyles(url: string): Promise<any> {
         if (!url) {
@@ -286,7 +286,7 @@ export class AddonRemoteThemesProvider {
     /**
      * Preload the styles of the current site (stored in DB).
      *
-     * @return {Promise<any>} Promise resolved when loaded.
+     * @return Promise resolved when loaded.
      */
     preloadCurrentSite(): Promise<any> {
         return this.sitesProvider.getStoredCurrentSiteId().then((siteId) => {
@@ -299,7 +299,7 @@ export class AddonRemoteThemesProvider {
     /**
      * Preload the styles of all the stored sites.
      *
-     * @return {Promise<any>} Promise resolved when loaded.
+     * @return Promise resolved when loaded.
      */
     preloadSites(): Promise<any> {
         return this.sitesProvider.getSitesIds().then((ids) => {
@@ -315,7 +315,7 @@ export class AddonRemoteThemesProvider {
     /**
      * Remove the styles of a certain site.
      *
-     * @param {string} siteId Site ID.
+     * @param siteId Site ID.
      */
     removeSite(siteId: string): void {
         if (siteId && this.stylesEls[siteId]) {
diff --git a/src/addon/storagemanager/pages/course-storage/course-storage.ts b/src/addon/storagemanager/pages/course-storage/course-storage.ts
index 18769c1c9..800ac1edf 100644
--- a/src/addon/storagemanager/pages/course-storage/course-storage.ts
+++ b/src/addon/storagemanager/pages/course-storage/course-storage.ts
@@ -111,7 +111,7 @@ export class AddonStorageManagerCourseStoragePage {
      *
      * (This works by deleting data for each module in the section that has data.)
      *
-     * @param {any} section Section object with information about section and modules
+     * @param section Section object with information about section and modules
      */
     deleteForSection(section: any): void {
         const modules = [];
@@ -127,7 +127,7 @@ export class AddonStorageManagerCourseStoragePage {
     /**
      * The user has requested a delete for a module's data
      *
-     * @param {any} module Module details
+     * @param module Module details
      */
     deleteForModule(module: any): void {
         if (module.totalSize > 0) {
@@ -138,7 +138,7 @@ export class AddonStorageManagerCourseStoragePage {
     /**
      * Deletes the specified modules, showing the loading overlay while it happens.
      *
-     * @param {any[]} modules Modules to delete
+     * @param modules Modules to delete
      * @return Promise<void> Once deleting has finished
      */
     protected deleteModules(modules: any[]): Promise<void> {
diff --git a/src/addon/storagemanager/providers/coursemenu-handler.ts b/src/addon/storagemanager/providers/coursemenu-handler.ts
index 69a578fe0..b3e0f6b57 100644
--- a/src/addon/storagemanager/providers/coursemenu-handler.ts
+++ b/src/addon/storagemanager/providers/coursemenu-handler.ts
@@ -27,11 +27,11 @@ export class AddonStorageManagerCourseMenuHandler implements CoreCourseOptionsMe
     /**
      * Checks if the handler is enabled for specified course. This handler is always available.
      *
-     * @param {number} courseId Course id
-     * @param {any} accessData Access data
-     * @param {any} [navOptions] Navigation options if any
-     * @param {any} [admOptions] Admin options if any
-     * @return {boolean | Promise<boolean>} True
+     * @param courseId Course id
+     * @param accessData Access data
+     * @param navOptions Navigation options if any
+     * @param admOptions Admin options if any
+     * @return True
      */
     isEnabledForCourse(courseId: number, accessData: any, navOptions?: any, admOptions?: any): boolean | Promise<boolean> {
         return true;
@@ -40,7 +40,7 @@ export class AddonStorageManagerCourseMenuHandler implements CoreCourseOptionsMe
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean | Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -49,9 +49,9 @@ export class AddonStorageManagerCourseMenuHandler implements CoreCourseOptionsMe
     /**
      * Returns the data needed to render the handler.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course.
-     * @return {CoreCourseOptionsMenuHandlerData} Data needed to render the handler.
+     * @param injector Injector.
+     * @param course The course.
+     * @return Data needed to render the handler.
      */
     getMenuDisplayData(injector: Injector, course: any): CoreCourseOptionsMenuHandlerData {
         return {
diff --git a/src/addon/userprofilefield/checkbox/providers/handler.ts b/src/addon/userprofilefield/checkbox/providers/handler.ts
index 42297a1a2..5981f6f95 100644
--- a/src/addon/userprofilefield/checkbox/providers/handler.ts
+++ b/src/addon/userprofilefield/checkbox/providers/handler.ts
@@ -31,7 +31,7 @@ export class AddonUserProfileFieldCheckboxHandler implements CoreUserProfileFiel
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -40,11 +40,11 @@ export class AddonUserProfileFieldCheckboxHandler implements CoreUserProfileFiel
     /**
      * Get the data to send for the field based on the input data.
      *
-     * @param  {any}     field          User field to get the data for.
-     * @param  {boolean} signup         True if user is in signup page.
-     * @param  {string}  [registerAuth] Register auth method. E.g. 'email'.
-     * @param  {any}     formValues     Form Values.
-     * @return {CoreUserProfileFieldHandlerData}  Data to send for the field.
+     * @param field User field to get the data for.
+     * @param signup True if user is in signup page.
+     * @param registerAuth Register auth method. E.g. 'email'.
+     * @param formValues Form Values.
+     * @return Data to send for the field.
      */
     getData(field: any, signup: boolean, registerAuth: string, formValues: any): CoreUserProfileFieldHandlerData {
         const name = 'profile_field_' + field.shortname;
@@ -62,8 +62,8 @@ export class AddonUserProfileFieldCheckboxHandler implements CoreUserProfileFiel
      * Return the Component to use to display the user profile field.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return AddonUserProfileFieldCheckboxComponent;
diff --git a/src/addon/userprofilefield/datetime/providers/handler.ts b/src/addon/userprofilefield/datetime/providers/handler.ts
index 29d3d321e..6076dd63c 100644
--- a/src/addon/userprofilefield/datetime/providers/handler.ts
+++ b/src/addon/userprofilefield/datetime/providers/handler.ts
@@ -32,7 +32,7 @@ export class AddonUserProfileFieldDatetimeHandler implements CoreUserProfileFiel
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -41,11 +41,11 @@ export class AddonUserProfileFieldDatetimeHandler implements CoreUserProfileFiel
     /**
      * Get the data to send for the field based on the input data.
      *
-     * @param  {any}     field          User field to get the data for.
-     * @param  {boolean} signup         True if user is in signup page.
-     * @param  {string}  [registerAuth] Register auth method. E.g. 'email'.
-     * @param  {any}     formValues     Form Values.
-     * @return {CoreUserProfileFieldHandlerData}  Data to send for the field.
+     * @param field User field to get the data for.
+     * @param signup True if user is in signup page.
+     * @param registerAuth Register auth method. E.g. 'email'.
+     * @param formValues Form Values.
+     * @return Data to send for the field.
      */
     getData(field: any, signup: boolean, registerAuth: string, formValues: any): CoreUserProfileFieldHandlerData {
         const name = 'profile_field_' + field.shortname;
@@ -63,8 +63,8 @@ export class AddonUserProfileFieldDatetimeHandler implements CoreUserProfileFiel
      * Return the Component to use to display the user profile field.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return AddonUserProfileFieldDatetimeComponent;
diff --git a/src/addon/userprofilefield/menu/providers/handler.ts b/src/addon/userprofilefield/menu/providers/handler.ts
index 6516c0559..928d84db7 100644
--- a/src/addon/userprofilefield/menu/providers/handler.ts
+++ b/src/addon/userprofilefield/menu/providers/handler.ts
@@ -31,7 +31,7 @@ export class AddonUserProfileFieldMenuHandler implements CoreUserProfileFieldHan
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -40,11 +40,11 @@ export class AddonUserProfileFieldMenuHandler implements CoreUserProfileFieldHan
     /**
      * Get the data to send for the field based on the input data.
      *
-     * @param  {any}     field          User field to get the data for.
-     * @param  {boolean} signup         True if user is in signup page.
-     * @param  {string}  [registerAuth] Register auth method. E.g. 'email'.
-     * @param  {any}     formValues     Form Values.
-     * @return {CoreUserProfileFieldHandlerData}  Data to send for the field.
+     * @param field User field to get the data for.
+     * @param signup True if user is in signup page.
+     * @param registerAuth Register auth method. E.g. 'email'.
+     * @param formValues Form Values.
+     * @return Data to send for the field.
      */
     getData(field: any, signup: boolean, registerAuth: string, formValues: any): CoreUserProfileFieldHandlerData {
         const name = 'profile_field_' + field.shortname;
@@ -62,8 +62,8 @@ export class AddonUserProfileFieldMenuHandler implements CoreUserProfileFieldHan
      * Return the Component to use to display the user profile field.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return AddonUserProfileFieldMenuComponent;
diff --git a/src/addon/userprofilefield/text/providers/handler.ts b/src/addon/userprofilefield/text/providers/handler.ts
index 2cdcac9ee..644faf0df 100644
--- a/src/addon/userprofilefield/text/providers/handler.ts
+++ b/src/addon/userprofilefield/text/providers/handler.ts
@@ -30,7 +30,7 @@ export class AddonUserProfileFieldTextHandler implements CoreUserProfileFieldHan
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -39,11 +39,11 @@ export class AddonUserProfileFieldTextHandler implements CoreUserProfileFieldHan
     /**
      * Get the data to send for the field based on the input data.
      *
-     * @param  {any}     field          User field to get the data for.
-     * @param  {boolean} signup         True if user is in signup page.
-     * @param  {string}  [registerAuth] Register auth method. E.g. 'email'.
-     * @param  {any}     formValues     Form Values.
-     * @return {CoreUserProfileFieldHandlerData}  Data to send for the field.
+     * @param field User field to get the data for.
+     * @param signup True if user is in signup page.
+     * @param registerAuth Register auth method. E.g. 'email'.
+     * @param formValues Form Values.
+     * @return Data to send for the field.
      */
     getData(field: any, signup: boolean, registerAuth: string, formValues: any): CoreUserProfileFieldHandlerData {
         const name = 'profile_field_' + field.shortname;
@@ -59,8 +59,8 @@ export class AddonUserProfileFieldTextHandler implements CoreUserProfileFieldHan
      * Return the Component to use to display the user profile field.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return AddonUserProfileFieldTextComponent;
diff --git a/src/addon/userprofilefield/textarea/providers/handler.ts b/src/addon/userprofilefield/textarea/providers/handler.ts
index fc079ffb7..a3ae461ce 100644
--- a/src/addon/userprofilefield/textarea/providers/handler.ts
+++ b/src/addon/userprofilefield/textarea/providers/handler.ts
@@ -30,7 +30,7 @@ export class AddonUserProfileFieldTextareaHandler implements CoreUserProfileFiel
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -39,11 +39,11 @@ export class AddonUserProfileFieldTextareaHandler implements CoreUserProfileFiel
     /**
      * Get the data to send for the field based on the input data.
      *
-     * @param  {any}     field          User field to get the data for.
-     * @param  {boolean} signup         True if user is in signup page.
-     * @param  {string}  [registerAuth] Register auth method. E.g. 'email'.
-     * @param  {any}     formValues     Form Values.
-     * @return {CoreUserProfileFieldHandlerData}  Data to send for the field.
+     * @param field User field to get the data for.
+     * @param signup True if user is in signup page.
+     * @param registerAuth Register auth method. E.g. 'email'.
+     * @param formValues Form Values.
+     * @return Data to send for the field.
      */
     getData(field: any, signup: boolean, registerAuth: string, formValues: any): CoreUserProfileFieldHandlerData {
         const name = 'profile_field_' + field.shortname;
@@ -68,8 +68,8 @@ export class AddonUserProfileFieldTextareaHandler implements CoreUserProfileFiel
      * Return the Component to use to display the user profile field.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return AddonUserProfileFieldTextareaComponent;
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 7df4951b2..e9bd35add 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -266,7 +266,7 @@ export class MoodleMobileApp implements OnInit {
     /**
      * Convenience function to add version to body classes.
      *
-     * @param {string} release Current release number of the site.
+     * @param release Current release number of the site.
      */
     protected addVersionClass(release: string): void {
         const parts = release.split('.');
@@ -298,7 +298,7 @@ export class MoodleMobileApp implements OnInit {
     /**
      * Close one modal if any.
      *
-     * @return {boolean} True if one modal was present.
+     * @return True if one modal was present.
      */
     closeModal(): boolean {
         // Following function is hidden in Ionic Code, however there's no solution for that.
diff --git a/src/classes/base-sync.ts b/src/classes/base-sync.ts
index d247783da..dbf8358bf 100644
--- a/src/classes/base-sync.ts
+++ b/src/classes/base-sync.ts
@@ -27,19 +27,16 @@ export class CoreSyncBaseProvider {
 
     /**
      * Logger instance get from CoreLoggerProvider.
-     * @type {any}
      */
     protected logger;
 
     /**
      * Component of the sync provider.
-     * @type {string}
      */
     component = 'core';
 
     /**
      * Sync provider's interval.
-     * @type {number}
      */
     syncInterval = 300000;
 
@@ -58,10 +55,10 @@ export class CoreSyncBaseProvider {
     /**
      * Add an ongoing sync to the syncPromises list. On finish the promise will be removed.
      *
-     * @param {string | number} id Unique sync identifier per component.
-     * @param {Promise<any>} promise The promise of the sync to add.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} The sync promise.
+     * @param id Unique sync identifier per component.
+     * @param promise The promise of the sync to add.
+     * @param siteId Site ID. If not defined, current site.
+     * @return The sync promise.
      */
     addOngoingSync(id: string | number, promise: Promise<any>, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -82,9 +79,9 @@ export class CoreSyncBaseProvider {
     /**
      * If there's an ongoing sync for a certain identifier return it.
      *
-     * @param {string | number} id Unique sync identifier per component.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise of the current sync or undefined if there isn't any.
+     * @param id Unique sync identifier per component.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise of the current sync or undefined if there isn't any.
      */
     getOngoingSync(id: string | number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -100,9 +97,9 @@ export class CoreSyncBaseProvider {
     /**
      * Get the synchronization time in a human readable format.
      *
-     * @param {string | number} id Unique sync identifier per component.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the readable time.
+     * @param id Unique sync identifier per component.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the readable time.
      */
     getReadableSyncTime(id: string | number, siteId?: string): Promise<string> {
         return this.getSyncTime(id, siteId).then((time) => {
@@ -113,8 +110,8 @@ export class CoreSyncBaseProvider {
     /**
      * Given a timestamp return it in a human readable format.
      *
-     * @param {number} timestamp Timestamp
-     * @return {string} Human readable time.
+     * @param timestamp Timestamp
+     * @return Human readable time.
      */
     getReadableTimeFromTimestamp(timestamp: number): string {
         if (!timestamp) {
@@ -127,9 +124,9 @@ export class CoreSyncBaseProvider {
     /**
      * Get the synchronization time. Returns 0 if no time stored.
      *
-     * @param {string | number} id Unique sync identifier per component.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number>} Promise resolved with the time.
+     * @param id Unique sync identifier per component.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the time.
      */
     getSyncTime(id: string | number, siteId?: string): Promise<number> {
         return this.syncProvider.getSyncRecord(this.component, id, siteId).then((entry) => {
@@ -142,9 +139,9 @@ export class CoreSyncBaseProvider {
     /**
      * Get the synchronization warnings of an instance.
      *
-     * @param {string | number} id Unique sync identifier per component.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<string[]>} Promise resolved with the warnings.
+     * @param id Unique sync identifier per component.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the warnings.
      */
     getSyncWarnings(id: string | number, siteId?: string): Promise<string[]> {
         return this.syncProvider.getSyncRecord(this.component, id, siteId).then((entry) => {
@@ -157,8 +154,8 @@ export class CoreSyncBaseProvider {
     /**
      * Create a unique identifier from component and id.
      *
-     * @param {string | number} id Unique sync identifier per component.
-     * @return {string} Unique identifier from component and id.
+     * @param id Unique sync identifier per component.
+     * @return Unique identifier from component and id.
      */
     protected getUniqueSyncId(id: string | number): string {
         return this.component + '#' + id;
@@ -167,9 +164,9 @@ export class CoreSyncBaseProvider {
     /**
      * Check if a there's an ongoing syncronization for the given id.
      *
-     * @param {string | number} id Unique sync identifier per component.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean} Whether it's synchronizing.
+     * @param id Unique sync identifier per component.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Whether it's synchronizing.
      */
     isSyncing(id: string | number, siteId?: string): boolean {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -182,9 +179,9 @@ export class CoreSyncBaseProvider {
     /**
      * Check if a sync is needed: if a certain time has passed since the last time.
      *
-     * @param {string | number} id Unique sync identifier per component.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether sync is needed.
+     * @param id Unique sync identifier per component.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether sync is needed.
      */
     isSyncNeeded(id: string | number, siteId?: string): Promise<boolean> {
         return this.getSyncTime(id, siteId).then((time) => {
@@ -195,10 +192,10 @@ export class CoreSyncBaseProvider {
     /**
      * Set the synchronization time.
      *
-     * @param {string | number} id Unique sync identifier per component.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [time] Time to set. If not defined, current time.
-     * @return {Promise<any>} Promise resolved when the time is set.
+     * @param id Unique sync identifier per component.
+     * @param siteId Site ID. If not defined, current site.
+     * @param time Time to set. If not defined, current time.
+     * @return Promise resolved when the time is set.
      */
     setSyncTime(id: string | number, siteId?: string, time?: number): Promise<any> {
         time = typeof time != 'undefined' ? time : Date.now();
@@ -209,10 +206,10 @@ export class CoreSyncBaseProvider {
     /**
      * Set the synchronization warnings.
      *
-     * @param {string | number} id Unique sync identifier per component.
-     * @param {string[]} warnings Warnings to set.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param id Unique sync identifier per component.
+     * @param warnings Warnings to set.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     setSyncWarnings(id: string | number, warnings: string[], siteId?: string): Promise<any> {
         const warningsText = JSON.stringify(warnings || []);
@@ -223,11 +220,11 @@ export class CoreSyncBaseProvider {
     /**
      * Execute a sync function on selected sites.
      *
-     * @param  {string} syncFunctionLog Log message to explain the sync function purpose.
-     * @param  {Function} syncFunction  Sync function to execute.
-     * @param  {any[]}    [params]      Array that defines the params that admit the funcion.
-     * @param  {string} [siteId]        Site ID to sync. If not defined, sync all sites.
-     * @return {Promise<any>}           Resolved with siteIds selected. Rejected if offline.
+     * @param syncFunctionLog Log message to explain the sync function purpose.
+     * @param syncFunction Sync function to execute.
+     * @param params Array that defines the params that admit the funcion.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @return Resolved with siteIds selected. Rejected if offline.
      */
     syncOnSites(syncFunctionLog: string, syncFunction: Function, params?: any[], siteId?: string): Promise<any> {
         if (!this.appProvider.isOnline()) {
@@ -263,9 +260,9 @@ export class CoreSyncBaseProvider {
      * If there's an ongoing sync for a certain identifier, wait for it to end.
      * If there's no sync ongoing the promise will be resolved right away.
      *
-     * @param {string | number} id Unique sync identifier per component.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when there's no sync going on for the identifier.
+     * @param id Unique sync identifier per component.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when there's no sync going on for the identifier.
      */
     waitForSync(id: string | number, siteId?: string): Promise<any> {
         const promise = this.getOngoingSync(id, siteId);
diff --git a/src/classes/cache.ts b/src/classes/cache.ts
index 38ba1f3c8..f4989b2d6 100644
--- a/src/classes/cache.ts
+++ b/src/classes/cache.ts
@@ -37,8 +37,8 @@ export class CoreCache {
     /**
      * Get all the data stored in the cache for a certain id.
      *
-     * @param {any} id The ID to identify the entry.
-     * @return {any} The data from the cache. Undefined if not found.
+     * @param id The ID to identify the entry.
+     * @return The data from the cache. Undefined if not found.
      */
     getEntry(id: any): any {
         if (!this.cacheStore[id]) {
@@ -51,10 +51,10 @@ export class CoreCache {
     /**
      * Get the status of a module from the "cache".
      *
-     * @param {any} id The ID to identify the entry.
-     * @param {string} name Name of the value to get.
-     * @param {boolean} [ignoreInvalidate] Whether it should always return the cached data, even if it's expired.
-     * @return {any} Cached value. Undefined if not cached or expired.
+     * @param id The ID to identify the entry.
+     * @param name Name of the value to get.
+     * @param ignoreInvalidate Whether it should always return the cached data, even if it's expired.
+     * @return Cached value. Undefined if not cached or expired.
      */
     getValue(id: any, name: string, ignoreInvalidate?: boolean): any {
         const entry = this.getEntry(id);
@@ -73,7 +73,7 @@ export class CoreCache {
     /**
      * Invalidate all the cached data for a certain entry.
      *
-     * @param {any} id The ID to identify the entry.
+     * @param id The ID to identify the entry.
      */
     invalidate(id: any): void {
         const entry = this.getEntry(id);
@@ -85,10 +85,10 @@ export class CoreCache {
     /**
      * Update the status of a module in the "cache".
      *
-     * @param {any} id The ID to identify the entry.
-     * @param {string} name Name of the value to set.
-     * @param {any} value Value to set.
-     * @return {any} The set value.
+     * @param id The ID to identify the entry.
+     * @param name Name of the value to set.
+     * @param value Value to set.
+     * @return The set value.
      */
     setValue(id: any, name: string, value: any): any {
         const entry = this.getEntry(id);
diff --git a/src/classes/delegate.ts b/src/classes/delegate.ts
index 5710cbdd9..560e81645 100644
--- a/src/classes/delegate.ts
+++ b/src/classes/delegate.ts
@@ -21,13 +21,12 @@ export interface CoreDelegateHandler {
     /**
      * Name of the handler, or name and sub context (AddonMessages, AddonMessages:blockContact, ...).
      * This name will be used to check if the feature is disabled.
-     * @type {string}
      */
     name: string;
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean>;
 }
@@ -39,38 +38,32 @@ export class CoreDelegate {
 
     /**
      * Logger instance get from CoreLoggerProvider.
-     * @type {any}
      */
     protected logger;
 
     /**
      * List of registered handlers.
-     * @type {any}
      */
     protected handlers: { [s: string]: CoreDelegateHandler } = {};
 
     /**
      * List of registered handlers enabled for the current site.
-     * @type {any}
      */
     protected enabledHandlers: { [s: string]: CoreDelegateHandler } = {};
 
     /**
      * Default handler
-     * @type {CoreDelegateHandler}
      */
     protected defaultHandler: CoreDelegateHandler;
 
     /**
      * Time when last updateHandler functions started.
-     * @type {number}
      */
     protected lastUpdateHandlersStart: number;
 
     /**
      * Feature prefix to check is feature is enabled or disabled in site.
      * This check is only made if not false. Override on the subclass or override isFeatureDisabled function.
-     * @type {string}
      */
     protected featurePrefix: string;
 
@@ -78,24 +71,22 @@ export class CoreDelegate {
      * Name of the property to be used to index the handlers. By default, the handler's name will be used.
      * If your delegate uses a Moodle component name to identify the handlers, please override this property.
      * E.g. CoreCourseModuleDelegate uses 'modName' to index the handlers.
-     * @type {string}
      */
     protected handlerNameProperty = 'name';
 
     /**
      * Set of promises to update a handler, to prevent doing the same operation twice.
-     * @type {{[siteId: string]: {[name: string]: Promise<any>}}}
      */
     protected updatePromises: {[siteId: string]: {[name: string]: Promise<any>}} = {};
 
     /**
      * Constructor of the Delegate.
      *
-     * @param {string} delegateName Delegate name used for logging purposes.
-     * @param {CoreLoggerProvider}   loggerProvider CoreLoggerProvider instance, cannot be directly injected.
-     * @param {CoreSitesProvider}    sitesProvider  CoreSitesProvider instance, cannot be directly injected.
-     * @param {CoreEventsProvider}   [eventsProvider]  CoreEventsProvider instance, cannot be directly injected.
-     *                                                  If not set, no events will be fired.
+     * @param delegateName Delegate name used for logging purposes.
+     * @param loggerProvider CoreLoggerProvider instance, cannot be directly injected.
+     * @param sitesProvider CoreSitesProvider instance, cannot be directly injected.
+     * @param eventsProvider CoreEventsProvider instance, cannot be directly injected.
+     *                       If not set, no events will be fired.
      */
     constructor(delegateName: string, protected loggerProvider: CoreLoggerProvider, protected sitesProvider: CoreSitesProvider,
             protected eventsProvider?: CoreEventsProvider) {
@@ -113,10 +104,10 @@ export class CoreDelegate {
      * Execute a certain function in a enabled handler.
      * If the handler isn't found or function isn't defined, call the same function in the default handler.
      *
-     * @param {string} handlerName The handler name.
-     * @param {string} fnName Name of the function to execute.
-     * @param {any[]} params Parameters to pass to the function.
-     * @return {any} Function returned value or default value.
+     * @param handlerName The handler name.
+     * @param fnName Name of the function to execute.
+     * @param params Parameters to pass to the function.
+     * @return Function returned value or default value.
      */
     protected executeFunctionOnEnabled(handlerName: string, fnName: string, params?: any[]): any {
         return this.execute(this.enabledHandlers[handlerName], fnName, params);
@@ -126,10 +117,10 @@ export class CoreDelegate {
      * Execute a certain function in a handler.
      * If the handler isn't found or function isn't defined, call the same function in the default handler.
      *
-     * @param {string} handlerName The handler name.
-     * @param {string} fnName Name of the function to execute.
-     * @param {any[]} params Parameters to pass to the function.
-     * @return {any} Function returned value or default value.
+     * @param handlerName The handler name.
+     * @param fnName Name of the function to execute.
+     * @param params Parameters to pass to the function.
+     * @return Function returned value or default value.
      */
     protected executeFunction(handlerName: string, fnName: string, params?: any[]): any {
         return this.execute(this.handlers[handlerName], fnName, params);
@@ -139,10 +130,10 @@ export class CoreDelegate {
      * Execute a certain function in a handler.
      * If the handler isn't found or function isn't defined, call the same function in the default handler.
      *
-     * @param {any} handler The handler.
-     * @param {string} fnName Name of the function to execute.
-     * @param {any[]} params Parameters to pass to the function.
-     * @return {any} Function returned value or default value.
+     * @param handler The handler.
+     * @param fnName Name of the function to execute.
+     * @param params Parameters to pass to the function.
+     * @return Function returned value or default value.
      */
     private execute(handler: any, fnName: string, params?: any[]): any {
         if (handler && handler[fnName]) {
@@ -155,9 +146,9 @@ export class CoreDelegate {
     /**
      * Get a handler.
      *
-     * @param  {string} handlerName The handler name.
-     * @param  {boolean} [enabled]  Only enabled, or any.
-     * @return {CoreDelegateHandler} Handler.
+     * @param handlerName The handler name.
+     * @param enabled Only enabled, or any.
+     * @return Handler.
      */
     protected getHandler(handlerName: string, enabled: boolean = false): CoreDelegateHandler {
         return enabled ? this.enabledHandlers[handlerName] : this.handlers[handlerName];
@@ -167,8 +158,8 @@ export class CoreDelegate {
      * Gets the handler full name for a given name. This is useful when the handlerNameProperty is different than "name".
      * E.g. blocks are indexed by blockName. If you call this function passing the blockName it will return the name.
      *
-     * @param {string} name Name used to indentify the handler.
-     * @return {string} Full name of corresponding handler.
+     * @param name Name used to indentify the handler.
+     * @return Full name of corresponding handler.
      */
     getHandlerName(name: string): string {
         const handler = this.getHandler(name, true);
@@ -183,10 +174,10 @@ export class CoreDelegate {
     /**
      * Check if function exists on a handler.
      *
-     * @param {string} handlerName         The handler name.
-     * @param {string} fnName              Name of the function to execute.
-     * @param {booealn} [onlyEnabled=true] If check only enabled handlers or all.
-     * @return {any} Function returned value or default value.
+     * @param handlerName The handler name.
+     * @param fnName Name of the function to execute.
+     * @param onlyEnabled If check only enabled handlers or all.
+     * @return Function returned value or default value.
      */
     protected hasFunction(handlerName: string, fnName: string, onlyEnabled: boolean = true): any {
         const handler = onlyEnabled ? this.enabledHandlers[handlerName] : this.handlers[handlerName];
@@ -197,9 +188,9 @@ export class CoreDelegate {
     /**
      * Check if a handler name has a registered handler (not necessarily enabled).
      *
-     * @param {string} name The handler name.
-     * @param  {boolean} [enabled]  Only enabled, or any.
-     * @return {boolean} If the handler is registered or not.
+     * @param name The handler name.
+     * @param enabled Only enabled, or any.
+     * @return If the handler is registered or not.
      */
     hasHandler(name: string, enabled: boolean = false): boolean {
         return enabled ? typeof this.enabledHandlers[name] !== 'undefined' : typeof this.handlers[name] !== 'undefined';
@@ -209,8 +200,8 @@ export class CoreDelegate {
      * Check if a time belongs to the last update handlers call.
      * This is to handle the cases where updateHandlers don't finish in the same order as they're called.
      *
-     * @param {number} time Time to check.
-     * @return {boolean} Whether it's the last call.
+     * @param time Time to check.
+     * @return Whether it's the last call.
      */
     isLastUpdateCall(time: number): boolean {
         if (!this.lastUpdateHandlersStart) {
@@ -223,8 +214,8 @@ export class CoreDelegate {
     /**
      * Register a handler.
      *
-     * @param {CoreDelegateHandler} handler The handler delegate object to register.
-     * @return {boolean} True when registered, false if already registered.
+     * @param handler The handler delegate object to register.
+     * @return True when registered, false if already registered.
      */
     registerHandler(handler: CoreDelegateHandler): boolean {
         if (typeof this.handlers[handler[this.handlerNameProperty]] !== 'undefined') {
@@ -242,9 +233,9 @@ export class CoreDelegate {
     /**
      * Update the handler for the current site.
      *
-     * @param {CoreDelegateHandler} handler The handler to check.
-     * @param {number} time Time this update process started.
-     * @return {Promise<void>} Resolved when done.
+     * @param handler The handler to check.
+     * @param time Time this update process started.
+     * @return Resolved when done.
      */
     protected updateHandler(handler: CoreDelegateHandler, time: number): Promise<void> {
         const siteId = this.sitesProvider.getCurrentSiteId(),
@@ -289,9 +280,9 @@ export class CoreDelegate {
     /**
      * Check if feature is enabled or disabled in the site, depending on the feature prefix and the handler name.
      *
-     * @param  {CoreDelegateHandler} handler Handler to check.
-     * @param  {CoreSite} site Site to check.
-     * @return {boolean} Whether is enabled or disabled in site.
+     * @param handler Handler to check.
+     * @param site Site to check.
+     * @return Whether is enabled or disabled in site.
      */
     protected isFeatureDisabled(handler: CoreDelegateHandler, site: CoreSite): boolean {
         return typeof this.featurePrefix != 'undefined' && site.isFeatureDisabled(this.featurePrefix + handler.name);
@@ -300,7 +291,7 @@ export class CoreDelegate {
     /**
      * Update the handlers for the current site.
      *
-     * @return {Promise<void>} Resolved when done.
+     * @return Resolved when done.
      */
     protected updateHandlers(): Promise<void> {
         const promises = [],
diff --git a/src/classes/interceptor.ts b/src/classes/interceptor.ts
index 35e5c4597..9399c0a76 100644
--- a/src/classes/interceptor.ts
+++ b/src/classes/interceptor.ts
@@ -42,9 +42,9 @@ export class CoreInterceptor implements HttpInterceptor {
     /**
      * Serialize an object to be used in a request.
      *
-     * @param {any} obj Object to serialize.
-     * @param {boolean} [addNull] Add null values to the serialized as empty parameters.
-     * @return {string} Serialization of the object.
+     * @param obj Object to serialize.
+     * @param addNull Add null values to the serialized as empty parameters.
+     * @return Serialization of the object.
      */
     static serialize(obj: any, addNull?: boolean): string {
         let query = '',
diff --git a/src/classes/site.ts b/src/classes/site.ts
index 4f885fe93..f3c2ff9b8 100644
--- a/src/classes/site.ts
+++ b/src/classes/site.ts
@@ -38,98 +38,82 @@ import { InAppBrowserObject } from '@ionic-native/in-app-browser';
 export interface CoreSiteWSPreSets {
     /**
      * Get the value from the cache if it's still valid.
-     * @type {boolean}
      */
     getFromCache?: boolean;
 
     /**
      * Save the result to the cache.
-     * @type {boolean}
      */
     saveToCache?: boolean;
 
     /**
      * Ignore cache expiration.
-     * @type {boolean}
      */
     omitExpires?: boolean;
 
     /**
      * Use the cache when a request fails. Defaults to true.
-     * @type {boolean}
      */
     emergencyCache?: boolean;
 
     /**
      * If true, the app won't call the WS. If the data isn't cached, the call will fail.
-     * @type {boolean}
      */
     forceOffline?: boolean;
 
     /**
      * Extra key to add to the cache when storing this call, to identify the entry.
-     * @type {string}
      */
     cacheKey?: string;
 
     /**
      * Whether it should use cache key to retrieve the cached data instead of the request params.
-     * @type {boolean}
      */
     getCacheUsingCacheKey?: boolean;
 
     /**
      * Same as getCacheUsingCacheKey, but for emergency cache.
-     * @type {boolean}
      */
     getEmergencyCacheUsingCacheKey?: boolean;
 
     /**
      * If true, the cache entry will be deleted if the WS call returns an exception.
-     * @type {boolean}
      */
     deleteCacheIfWSError?: boolean;
 
     /**
      * Whether it should only be 1 entry for this cache key (all entries with same key will be deleted).
-     * @type {boolean}
      */
     uniqueCacheKey?: boolean;
 
     /**
      * Whether to filter WS response (moodlewssettingfilter). Defaults to true.
-     * @type {boolean}
      */
     filter?: boolean;
 
     /**
      * Whether to rewrite URLs (moodlewssettingfileurl). Defaults to true.
-     * @type {boolean}
      */
     rewriteurls?: boolean;
 
     /**
      * Defaults to true. Set to false when the expected response is null.
-     * @type {boolean}
      */
     responseExpected?: boolean;
 
     /**
      * Defaults to 'object'. Use it when you expect a type that's not an object|array.
-     * @type {string}
      */
     typeExpected?: string;
 
     /**
      * Wehther a pending request in the queue matching the same function and arguments can be reused instead of adding
      * a new request to the queue. Defaults to true for read requests.
-     * @type {boolean}
      */
     reusePending?: boolean;
 
     /**
      * Whether the request will be be sent immediately as a single request. Defaults to false.
-     * @type {boolean}
      */
     skipQueue?: boolean;
 
@@ -142,7 +126,6 @@ export interface CoreSiteWSPreSets {
      * Update frequency. This value determines how often the cached data will be updated. Possible values:
      * CoreSite.FREQUENCY_USUALLY, CoreSite.FREQUENCY_OFTEN, CoreSite.FREQUENCY_SOMETIMES, CoreSite.FREQUENCY_RARELY.
      * Defaults to CoreSite.FREQUENCY_USUALLY.
-     * @type {number}
      */
     updateFrequency?: number;
 }
@@ -153,25 +136,21 @@ export interface CoreSiteWSPreSets {
 export interface LocalMobileResponse {
     /**
      * Code to identify the authentication method to use.
-     * @type {number}
      */
     code: number;
 
     /**
      * Name of the service to use.
-     * @type {string}
      */
     service?: string;
 
     /**
      * Code of the warning message.
-     * @type {string}
      */
     warning?: string;
 
     /**
      * Whether core SSO is supported.
-     * @type {boolean}
      */
     coreSupported?: boolean;
 }
@@ -255,14 +234,14 @@ export class CoreSite {
     /**
      * Create a site.
      *
-     * @param {Injector} injector Angular injector to prevent having to pass all the required services.
-     * @param {string} id Site ID.
-     * @param {string} siteUrl Site URL.
-     * @param {string} [token] Site's WS token.
-     * @param {any} [info] Site info.
-     * @param {string} [privateToken] Private token.
-     * @param {any} [config] Site public config.
-     * @param {boolean} [loggedOut] Whether user is logged out.
+     * @param injector Angular injector to prevent having to pass all the required services.
+     * @param id Site ID.
+     * @param siteUrl Site URL.
+     * @param token Site's WS token.
+     * @param info Site info.
+     * @param privateToken Private token.
+     * @param config Site public config.
+     * @param loggedOut Whether user is logged out.
      */
     constructor(injector: Injector, public id: string, public siteUrl: string, public token?: string, public infos?: any,
             public privateToken?: string, public config?: any, public loggedOut?: boolean) {
@@ -300,7 +279,7 @@ export class CoreSite {
     /**
      * Get site ID.
      *
-     * @return {string} Site ID.
+     * @return Site ID.
      */
     getId(): string {
         return this.id;
@@ -309,7 +288,7 @@ export class CoreSite {
     /**
      * Get site URL.
      *
-     * @return {string} Site URL.
+     * @return Site URL.
      */
     getURL(): string {
         return this.siteUrl;
@@ -318,7 +297,7 @@ export class CoreSite {
     /**
      * Get site token.
      *
-     * @return {string} Site token.
+     * @return Site token.
      */
     getToken(): string {
         return this.token;
@@ -327,7 +306,7 @@ export class CoreSite {
     /**
      * Get site info.
      *
-     * @return {any} Site info.
+     * @return Site info.
      */
     getInfo(): any {
         return this.infos;
@@ -336,7 +315,7 @@ export class CoreSite {
     /**
      * Get site private token.
      *
-     * @return {string} Site private token.
+     * @return Site private token.
      */
     getPrivateToken(): string {
         return this.privateToken;
@@ -345,7 +324,7 @@ export class CoreSite {
     /**
      * Get site DB.
      *
-     * @return {SQLiteDB} Site DB.
+     * @return Site DB.
      */
     getDb(): SQLiteDB {
         return this.db;
@@ -354,7 +333,7 @@ export class CoreSite {
     /**
      * Get site user's ID.
      *
-     * @return {number} User's ID.
+     * @return User's ID.
      */
     getUserId(): number {
         if (typeof this.infos != 'undefined' && typeof this.infos.userid != 'undefined') {
@@ -365,7 +344,7 @@ export class CoreSite {
     /**
      * Get site Course ID for frontpage course. If not declared it will return 1 as default.
      *
-     * @return {number} Site Home ID.
+     * @return Site Home ID.
      */
     getSiteHomeId(): number {
         return this.infos && this.infos.siteid || 1;
@@ -374,7 +353,7 @@ export class CoreSite {
     /**
      * Get site name.
      *
-     * @return {string} Site name.
+     * @return Site name.
      */
     getSiteName(): string {
         if (CoreConfigConstants.sitename) {
@@ -388,7 +367,7 @@ export class CoreSite {
     /**
      * Set site ID.
      *
-     * @param {string} New ID.
+     * @param New ID.
      */
     setId(id: string): void {
         this.id = id;
@@ -398,7 +377,7 @@ export class CoreSite {
     /**
      * Set site token.
      *
-     * @param {string} New token.
+     * @param New token.
      */
     setToken(token: string): void {
         this.token = token;
@@ -407,7 +386,7 @@ export class CoreSite {
     /**
      * Set site private token.
      *
-     * @param {string} privateToken New private token.
+     * @param privateToken New private token.
      */
     setPrivateToken(privateToken: string): void {
         this.privateToken = privateToken;
@@ -416,7 +395,7 @@ export class CoreSite {
     /**
      * Check if user logged out from the site and needs to authenticate again.
      *
-     * @return {boolean} Whether is logged out.
+     * @return Whether is logged out.
      */
     isLoggedOut(): boolean {
         return !!this.loggedOut;
@@ -425,7 +404,7 @@ export class CoreSite {
     /**
      * Set site info.
      *
-     * @param {any} New info.
+     * @param New info.
      */
     setInfo(infos: any): void {
         this.infos = infos;
@@ -442,7 +421,7 @@ export class CoreSite {
     /**
      * Set site config.
      *
-     * @param {any} Config.
+     * @param Config.
      */
     setConfig(config: any): void {
         if (config) {
@@ -456,7 +435,7 @@ export class CoreSite {
     /**
      * Set site logged out.
      *
-     * @param {boolean} loggedOut True if logged out and needs to authenticate again, false otherwise.
+     * @param loggedOut True if logged out and needs to authenticate again, false otherwise.
      */
     setLoggedOut(loggedOut: boolean): void {
         this.loggedOut = !!loggedOut;
@@ -465,7 +444,7 @@ export class CoreSite {
     /**
      * Can the user access their private files?
      *
-     * @return {boolean} Whether can access my files.
+     * @return Whether can access my files.
      */
     canAccessMyFiles(): boolean {
         const infos = this.getInfo();
@@ -476,7 +455,7 @@ export class CoreSite {
     /**
      * Can the user download files?
      *
-     * @return {boolean} Whether can download files.
+     * @return Whether can download files.
      */
     canDownloadFiles(): boolean {
         const infos = this.getInfo();
@@ -487,9 +466,9 @@ export class CoreSite {
     /**
      * Can the user use an advanced feature?
      *
-     * @param {string} feature The name of the feature.
-     * @param {boolean} [whenUndefined=true] The value to return when the parameter is undefined.
-     * @return {boolean} Whether can use advanced feature.
+     * @param feature The name of the feature.
+     * @param whenUndefined The value to return when the parameter is undefined.
+     * @return Whether can use advanced feature.
      */
     canUseAdvancedFeature(feature: string, whenUndefined: boolean = true): boolean {
         const infos = this.getInfo();
@@ -513,7 +492,7 @@ export class CoreSite {
     /**
      * Can the user upload files?
      *
-     * @return {boolean} Whether can upload files.
+     * @return Whether can upload files.
      */
     canUploadFiles(): boolean {
         const infos = this.getInfo();
@@ -524,7 +503,7 @@ export class CoreSite {
     /**
      * Fetch site info from the Moodle site.
      *
-     * @return {Promise<any>} A promise to be resolved when the site info is retrieved.
+     * @return A promise to be resolved when the site info is retrieved.
      */
     fetchSiteInfo(): Promise<any> {
         // The get_site_info WS call won't be cached.
@@ -543,10 +522,10 @@ export class CoreSite {
     /**
      * Read some data from the Moodle site using WS. Requests are cached by default.
      *
-     * @param {string} method WS method to use.
-     * @param {any} data Data to send to the WS.
-     * @param {CoreSiteWSPreSets} [preSets] Extra options.
-     * @return {Promise<any>} Promise resolved with the response, rejected with CoreWSError if it fails.
+     * @param method WS method to use.
+     * @param data Data to send to the WS.
+     * @param preSets Extra options.
+     * @return Promise resolved with the response, rejected with CoreWSError if it fails.
      */
     read(method: string, data: any, preSets?: CoreSiteWSPreSets): Promise<any> {
         preSets = preSets || {};
@@ -566,10 +545,10 @@ export class CoreSite {
     /**
      * Sends some data to the Moodle site using WS. Requests are NOT cached by default.
      *
-     * @param {string} method  WS method to use.
-     * @param {any} data Data to send to the WS.
-     * @param {CoreSiteWSPreSets} [preSets] Extra options.
-     * @return {Promise<any>} Promise resolved with the response, rejected with CoreWSError if it fails.
+     * @param method WS method to use.
+     * @param data Data to send to the WS.
+     * @param preSets Extra options.
+     * @return Promise resolved with the response, rejected with CoreWSError if it fails.
      */
     write(method: string, data: any, preSets?: CoreSiteWSPreSets): Promise<any> {
         preSets = preSets || {};
@@ -589,11 +568,11 @@ export class CoreSite {
     /**
      * WS request to the site.
      *
-     * @param {string} method The WebService method to be called.
-     * @param {any} data Arguments to pass to the method.
-     * @param {CoreSiteWSPreSets} preSets Extra options.
-     * @param {boolean} [retrying] True if we're retrying the call for some reason. This is to prevent infinite loops.
-     * @return {Promise<any>} Promise resolved with the response, rejected with CoreWSError if it fails.
+     * @param method The WebService method to be called.
+     * @param data Arguments to pass to the method.
+     * @param preSets Extra options.
+     * @param retrying True if we're retrying the call for some reason. This is to prevent infinite loops.
+     * @return Promise resolved with the response, rejected with CoreWSError if it fails.
      * @description
      *
      * Sends a webservice request to the site. This method will automatically add the
@@ -805,11 +784,11 @@ export class CoreSite {
     /**
      * Adds a request to the queue or calls it immediately when not using the queue.
      *
-     * @param {string} method The WebService method to be called.
-     * @param {any} data Arguments to pass to the method.
-     * @param {CoreSiteWSPreSets} preSets Extra options related to the site.
-     * @param {CoreWSPreSets} wsPreSets Extra options related to the WS call.
-     * @returns {Promise<any>} Promise resolved with the response when the WS is called.
+     * @param method The WebService method to be called.
+     * @param data Arguments to pass to the method.
+     * @param preSets Extra options related to the site.
+     * @param wsPreSets Extra options related to the WS call.
+     * @return Promise resolved with the response when the WS is called.
      */
     protected callOrEnqueueRequest(method: string, data: any, preSets: CoreSiteWSPreSets, wsPreSets: CoreWSPreSets): Promise<any> {
         if (preSets.skipQueue || !this.wsAvailable('tool_mobile_call_external_functions')) {
@@ -846,8 +825,8 @@ export class CoreSite {
     /**
      * Adds a request to the queue.
      *
-     * @param {RequestQueueItem} request The request to enqueue.
-     * @returns {Promise<any>} Promise resolved with the response when the WS is called.
+     * @param request The request to enqueue.
+     * @return Promise resolved with the response when the WS is called.
      */
     protected enqueueRequest(request: RequestQueueItem): Promise<any> {
 
@@ -957,9 +936,9 @@ export class CoreSite {
     /**
      * Check if a WS is available in this site.
      *
-     * @param {string} method WS name.
-     * @param {boolean} [checkPrefix=true] When true also checks with the compatibility prefix.
-     * @return {boolean} Whether the WS is available.
+     * @param method WS name.
+     * @param checkPrefix When true also checks with the compatibility prefix.
+     * @return Whether the WS is available.
      */
     wsAvailable(method: string, checkPrefix: boolean = true): boolean {
         if (typeof this.infos == 'undefined') {
@@ -981,9 +960,9 @@ export class CoreSite {
     /**
      * Get cache ID.
      *
-     * @param {string} method The WebService method.
-     * @param {any} data Arguments to pass to the method.
-     * @return {string} Cache ID.
+     * @param method The WebService method.
+     * @param data Arguments to pass to the method.
+     * @return Cache ID.
      */
     protected getCacheId(method: string, data: any): string {
         return <string> Md5.hashAsciiStr(method + ':' + this.utils.sortAndStringify(data));
@@ -992,9 +971,9 @@ export class CoreSite {
     /**
      * Get the cache ID used in Ionic 1 version of the app.
      *
-     * @param {string} method The WebService method.
-     * @param {any} data Arguments to pass to the method.
-     * @return {string} Cache ID.
+     * @param method The WebService method.
+     * @param data Arguments to pass to the method.
+     * @return Cache ID.
      */
     protected getCacheOldId(method: string, data: any): string {
         return <string> Md5.hashAsciiStr(method + ':' +  JSON.stringify(data));
@@ -1003,12 +982,12 @@ export class CoreSite {
     /**
      * Get a WS response from cache.
      *
-     * @param {string} method The WebService method to be called.
-     * @param {any} data Arguments to pass to the method.
-     * @param {CoreSiteWSPreSets} preSets Extra options.
-     * @param {boolean} [emergency] Whether it's an "emergency" cache call (WS call failed).
-     * @param {any} [originalData] Arguments to pass to the method before being converted to strings.
-     * @return {Promise<any>} Promise resolved with the WS response.
+     * @param method The WebService method to be called.
+     * @param data Arguments to pass to the method.
+     * @param preSets Extra options.
+     * @param emergency Whether it's an "emergency" cache call (WS call failed).
+     * @param originalData Arguments to pass to the method before being converted to strings.
+     * @return Promise resolved with the WS response.
      */
     protected getFromCache(method: string, data: any, preSets: CoreSiteWSPreSets, emergency?: boolean, originalData?: any)
             : Promise<any> {
@@ -1092,11 +1071,11 @@ export class CoreSite {
     /**
      * Save a WS response to cache.
      *
-     * @param {string} method The WebService method.
-     * @param {any} data Arguments to pass to the method.
-     * @param {any} response The WS response.
-     * @param {CoreSiteWSPreSets} preSets Extra options.
-     * @return {Promise<any>} Promise resolved when the response is saved.
+     * @param method The WebService method.
+     * @param data Arguments to pass to the method.
+     * @param response The WS response.
+     * @param preSets Extra options.
+     * @return Promise resolved when the response is saved.
      */
     protected saveToCache(method: string, data: any, response: any, preSets: CoreSiteWSPreSets): Promise<any> {
         if (!this.db) {
@@ -1135,11 +1114,11 @@ export class CoreSite {
     /**
      * Delete a WS cache entry or entries.
      *
-     * @param {string} method The WebService method to be called.
-     * @param {any} data Arguments to pass to the method.
-     * @param {CoreSiteWSPreSets} preSets Extra options.
-     * @param {boolean} [allCacheKey] True to delete all entries with the cache key, false to delete only by ID.
-     * @return {Promise<any>} Promise resolved when the entries are deleted.
+     * @param method The WebService method to be called.
+     * @param data Arguments to pass to the method.
+     * @param preSets Extra options.
+     * @param allCacheKey True to delete all entries with the cache key, false to delete only by ID.
+     * @return Promise resolved when the entries are deleted.
      */
     protected deleteFromCache(method: string, data: any, preSets: CoreSiteWSPreSets, allCacheKey?: boolean): Promise<any> {
         if (!this.db) {
@@ -1158,10 +1137,10 @@ export class CoreSite {
     /*
      * Uploads a file using Cordova File API.
      *
-     * @param {string} filePath File path.
-     * @param {CoreWSFileUploadOptions} options File upload options.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @return {Promise<any>} Promise resolved when uploaded.
+     * @param filePath File path.
+     * @param options File upload options.
+     * @param onProgress Function to call on progress.
+     * @return Promise resolved when uploaded.
      */
     uploadFile(filePath: string, options: CoreWSFileUploadOptions, onProgress?: (event: ProgressEvent) => any): Promise<any> {
         if (!options.fileArea) {
@@ -1177,7 +1156,7 @@ export class CoreSite {
     /**
      * Invalidates all the cache entries.
      *
-     * @return {Promise<any>} Promise resolved when the cache entries are invalidated.
+     * @return Promise resolved when the cache entries are invalidated.
      */
     invalidateWsCache(): Promise<any> {
         if (!this.db) {
@@ -1192,8 +1171,8 @@ export class CoreSite {
     /**
      * Invalidates all the cache entries with a certain key.
      *
-     * @param {string} key Key to search.
-     * @return {Promise<any>} Promise resolved when the cache entries are invalidated.
+     * @param key Key to search.
+     * @return Promise resolved when the cache entries are invalidated.
      */
     invalidateWsCacheForKey(key: string): Promise<any> {
         if (!this.db) {
@@ -1211,8 +1190,8 @@ export class CoreSite {
     /**
      * Invalidates all the cache entries in an array of keys.
      *
-     * @param {string[]} keys Keys to search.
-     * @return {Promise<any>} Promise resolved when the cache entries are invalidated.
+     * @param keys Keys to search.
+     * @return Promise resolved when the cache entries are invalidated.
      */
     invalidateMultipleWsCacheForKey(keys: string[]): Promise<any> {
         if (!this.db) {
@@ -1235,8 +1214,8 @@ export class CoreSite {
     /**
      * Invalidates all the cache entries whose key starts with a certain value.
      *
-     * @param {string} key Key to search.
-     * @return {Promise}    Promise resolved when the cache entries are invalidated.
+     * @param key Key to search.
+     * @return Promise resolved when the cache entries are invalidated.
      */
     invalidateWsCacheForKeyStartingWith(key: string): Promise<any> {
         if (!this.db) {
@@ -1257,8 +1236,8 @@ export class CoreSite {
      * Generic function for adding the wstoken to Moodle urls and for pointing to the correct script.
      * Uses CoreUtilsProvider.fixPluginfileURL, passing site's token.
      *
-     * @param {string} url The url to be fixed.
-     * @return {string} Fixed URL.
+     * @param url The url to be fixed.
+     * @return Fixed URL.
      */
     fixPluginfileURL(url: string): string {
         return this.urlUtils.fixPluginfileURL(url, this.token, this.siteUrl);
@@ -1267,7 +1246,7 @@ export class CoreSite {
     /**
      * Deletes site's DB.
      *
-     * @return {Promise<any>} Promise to be resolved when the DB is deleted.
+     * @return Promise to be resolved when the DB is deleted.
      */
     deleteDB(): Promise<any> {
         return this.dbProvider.deleteDB('Site-' + this.id);
@@ -1276,7 +1255,7 @@ export class CoreSite {
     /**
      * Deletes site's folder.
      *
-     * @return {Promise<any>} Promise to be resolved when the DB is deleted.
+     * @return Promise to be resolved when the DB is deleted.
      */
     deleteFolder(): Promise<any> {
         if (this.fileProvider.isAvailable()) {
@@ -1293,7 +1272,7 @@ export class CoreSite {
     /**
      * Get space usage of the site.
      *
-     * @return {Promise<number>} Promise resolved with the site space usage (size).
+     * @return Promise resolved with the site space usage (size).
      */
     getSpaceUsage(): Promise<number> {
         if (this.fileProvider.isAvailable()) {
@@ -1310,8 +1289,8 @@ export class CoreSite {
     /**
      * Returns the URL to the documentation of the app, based on Moodle version and current language.
      *
-     * @param {string} [page] Docs page to go to.
-     * @return {Promise<string>} Promise resolved with the Moodle docs URL.
+     * @param page Docs page to go to.
+     * @return Promise resolved with the Moodle docs URL.
      */
     getDocsUrl(page?: string): Promise<string> {
         const release = this.infos.release ? this.infos.release : undefined;
@@ -1322,8 +1301,8 @@ export class CoreSite {
     /**
      * Check if the local_mobile plugin is installed in the Moodle site.
      *
-     * @param {boolean} [retrying] True if we're retrying the check.
-     * @return {Promise<LocalMobileResponse>} Promise resolved when the check is done.
+     * @param retrying True if we're retrying the check.
+     * @return Promise resolved when the check is done.
      */
     checkLocalMobilePlugin(retrying?: boolean): Promise<LocalMobileResponse> {
         const checkUrl = this.siteUrl + '/local/mobile/check.php',
@@ -1379,7 +1358,7 @@ export class CoreSite {
     /**
      * Check if local_mobile has been installed in Moodle.
      *
-     * @return {boolean} Whether the App is able to use local_mobile plugin for this site.
+     * @return Whether the App is able to use local_mobile plugin for this site.
      */
     checkIfAppUsesLocalMobile(): boolean {
         let appUsesLocalMobile = false;
@@ -1400,7 +1379,7 @@ export class CoreSite {
     /**
      * Check if local_mobile has been installed in Moodle but the app is not using it.
      *
-     * @return {Promise<any>} Promise resolved it local_mobile was added, rejected otherwise.
+     * @return Promise resolved it local_mobile was added, rejected otherwise.
      */
     checkIfLocalMobileInstalledAndNotUsed(): Promise<any> {
         const appUsesLocalMobile = this.checkIfAppUsesLocalMobile();
@@ -1423,8 +1402,8 @@ export class CoreSite {
     /**
      * Check if a URL belongs to this site.
      *
-     * @param {string} url URL to check.
-     * @return {boolean} Whether the URL belongs to this site.
+     * @param url URL to check.
+     * @return Whether the URL belongs to this site.
      */
     containsUrl(url: string): boolean {
         if (!url) {
@@ -1440,7 +1419,7 @@ export class CoreSite {
     /**
      * Get the public config of this site.
      *
-     * @return {Promise<any>} Promise resolved with public config. Rejected with an object if error, see CoreWSProvider.callAjax.
+     * @return Promise resolved with public config. Rejected with an object if error, see CoreWSProvider.callAjax.
      */
     getPublicConfig(): Promise<any> {
         const preSets: CoreWSAjaxPreSets = {
@@ -1479,9 +1458,9 @@ export class CoreSite {
     /**
      * Open a URL in browser using auto-login in the Moodle site if available.
      *
-     * @param {string} url The URL to open.
-     * @param {string} [alertMessage] If defined, an alert will be shown before opening the browser.
-     * @return {Promise<any>} Promise resolved when done, rejected otherwise.
+     * @param url The URL to open.
+     * @param alertMessage If defined, an alert will be shown before opening the browser.
+     * @return Promise resolved when done, rejected otherwise.
      */
     openInBrowserWithAutoLogin(url: string, alertMessage?: string): Promise<any> {
         return this.openWithAutoLogin(false, url, undefined, alertMessage);
@@ -1490,9 +1469,9 @@ export class CoreSite {
     /**
      * Open a URL in browser using auto-login in the Moodle site if available and the URL belongs to the site.
      *
-     * @param {string} url The URL to open.
-     * @param {string} [alertMessage] If defined, an alert will be shown before opening the browser.
-     * @return {Promise<any>} Promise resolved when done, rejected otherwise.
+     * @param url The URL to open.
+     * @param alertMessage If defined, an alert will be shown before opening the browser.
+     * @return Promise resolved when done, rejected otherwise.
      */
     openInBrowserWithAutoLoginIfSameSite(url: string, alertMessage?: string): Promise<any> {
         return this.openWithAutoLoginIfSameSite(false, url, undefined, alertMessage);
@@ -1501,10 +1480,10 @@ export class CoreSite {
     /**
      * Open a URL in inappbrowser using auto-login in the Moodle site if available.
      *
-     * @param {string} url The URL to open.
-     * @param {any} [options] Override default options passed to InAppBrowser.
-     * @param {string} [alertMessage] If defined, an alert will be shown before opening the inappbrowser.
-     * @return {Promise<InAppBrowserObject|void>} Promise resolved when done.
+     * @param url The URL to open.
+     * @param options Override default options passed to InAppBrowser.
+     * @param alertMessage If defined, an alert will be shown before opening the inappbrowser.
+     * @return Promise resolved when done.
      */
     openInAppWithAutoLogin(url: string, options?: any, alertMessage?: string): Promise<InAppBrowserObject | void> {
         return this.openWithAutoLogin(true, url, options, alertMessage);
@@ -1513,10 +1492,10 @@ export class CoreSite {
     /**
      * Open a URL in inappbrowser using auto-login in the Moodle site if available and the URL belongs to the site.
      *
-     * @param {string} url The URL to open.
-     * @param {object} [options] Override default options passed to inappbrowser.
-     * @param {string} [alertMessage] If defined, an alert will be shown before opening the inappbrowser.
-     * @return {Promise<InAppBrowserObject|void>} Promise resolved when done.
+     * @param url The URL to open.
+     * @param options Override default options passed to inappbrowser.
+     * @param alertMessage If defined, an alert will be shown before opening the inappbrowser.
+     * @return Promise resolved when done.
      */
     openInAppWithAutoLoginIfSameSite(url: string, options?: any, alertMessage?: string): Promise<InAppBrowserObject | void> {
         return this.openWithAutoLoginIfSameSite(true, url, options, alertMessage);
@@ -1525,11 +1504,11 @@ export class CoreSite {
     /**
      * Open a URL in browser or InAppBrowser using auto-login in the Moodle site if available.
      *
-     * @param {boolean} inApp True to open it in InAppBrowser, false to open in browser.
-     * @param {string} url The URL to open.
-     * @param {object} [options] Override default options passed to $cordovaInAppBrowser#open.
-     * @param {string} [alertMessage] If defined, an alert will be shown before opening the browser/inappbrowser.
-     * @return {Promise<InAppBrowserObject|void>} Promise resolved when done. Resolve param is returned only if inApp=true.
+     * @param inApp True to open it in InAppBrowser, false to open in browser.
+     * @param url The URL to open.
+     * @param options Override default options passed to $cordovaInAppBrowser#open.
+     * @param alertMessage If defined, an alert will be shown before opening the browser/inappbrowser.
+     * @return Promise resolved when done. Resolve param is returned only if inApp=true.
      */
     openWithAutoLogin(inApp: boolean, url: string, options?: any, alertMessage?: string): Promise<InAppBrowserObject | void> {
         // Get the URL to open.
@@ -1564,11 +1543,11 @@ export class CoreSite {
     /**
      * Open a URL in browser or InAppBrowser using auto-login in the Moodle site if available and the URL belongs to the site.
      *
-     * @param {boolean} inApp True to open it in InAppBrowser, false to open in browser.
-     * @param {string} url The URL to open.
-     * @param {object} [options] Override default options passed to inappbrowser.
-     * @param {string} [alertMessage] If defined, an alert will be shown before opening the browser/inappbrowser.
-     * @return {Promise<InAppBrowserObject|void>} Promise resolved when done. Resolve param is returned only if inApp=true.
+     * @param inApp True to open it in InAppBrowser, false to open in browser.
+     * @param url The URL to open.
+     * @param options Override default options passed to inappbrowser.
+     * @param alertMessage If defined, an alert will be shown before opening the browser/inappbrowser.
+     * @return Promise resolved when done. Resolve param is returned only if inApp=true.
      */
     openWithAutoLoginIfSameSite(inApp: boolean, url: string, options?: any, alertMessage?: string)
             : Promise<InAppBrowserObject | void> {
@@ -1589,9 +1568,9 @@ export class CoreSite {
      * Get the config of this site.
      * It is recommended to use getStoredConfig instead since it's faster and doesn't use network.
      *
-     * @param {string} [name] Name of the setting to get. If not set or false, all settings will be returned.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data.
-     * @return {Promise<any>} Promise resolved with site config.
+     * @param name Name of the setting to get. If not set or false, all settings will be returned.
+     * @param ignoreCache True if it should ignore cached data.
+     * @return Promise resolved with site config.
      */
     getConfig(name?: string, ignoreCache?: boolean): Promise<any> {
         const preSets: CoreSiteWSPreSets = {
@@ -1628,7 +1607,7 @@ export class CoreSite {
     /**
      * Invalidates config WS call.
      *
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateConfig(): Promise<any> {
         return this.invalidateWsCacheForKey(this.getConfigCacheKey());
@@ -1637,7 +1616,7 @@ export class CoreSite {
     /**
      * Get cache key for getConfig WS calls.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getConfigCacheKey(): string {
         return 'tool_mobile_get_config';
@@ -1646,8 +1625,8 @@ export class CoreSite {
     /**
      * Get the stored config of this site.
      *
-     * @param {string} [name] Name of the setting to get. If not set, all settings will be returned.
-     * @return {any} Site config or a specific setting.
+     * @param name Name of the setting to get. If not set, all settings will be returned.
+     * @return Site config or a specific setting.
      */
     getStoredConfig(name?: string): any {
         if (!this.config) {
@@ -1664,8 +1643,8 @@ export class CoreSite {
     /**
      * Check if a certain feature is disabled in the site.
      *
-     * @param {string} name Name of the feature to check.
-     * @return {boolean} Whether it's disabled.
+     * @param name Name of the feature to check.
+     * @return Whether it's disabled.
      */
     isFeatureDisabled(name: string): boolean {
         const disabledFeatures = this.getStoredConfig('tool_mobile_disabledfeatures');
@@ -1688,7 +1667,7 @@ export class CoreSite {
     /**
      * Get whether offline is disabled in the site.
      *
-     * @return {boolean} Whether it's disabled.
+     * @return Whether it's disabled.
      */
     isOfflineDisabled(): boolean {
         return this.offlineDisabled;
@@ -1698,8 +1677,8 @@ export class CoreSite {
      * Check if the site version is greater than one or several versions.
      * This function accepts a string or an array of strings. If array, the last version must be the highest.
      *
-     * @param {string | string[]} versions Version or list of versions to check.
-     * @return {boolean} Whether it's greater or equal, false otherwise.
+     * @param versions Version or list of versions to check.
+     * @return Whether it's greater or equal, false otherwise.
      * @description
      * If a string is supplied (e.g. '3.2.1'), it will check if the site version is greater or equal than this version.
      *
@@ -1746,9 +1725,9 @@ export class CoreSite {
     /**
      * Given a URL, convert it to a URL that will auto-login if supported.
      *
-     * @param {string} url The URL to convert.
-     * @param {boolean} [showModal=true] Whether to show a loading modal.
-     * @return {Promise<string>} Promise resolved with the converted URL.
+     * @param url The URL to convert.
+     * @param showModal Whether to show a loading modal.
+     * @return Promise resolved with the converted URL.
      */
     getAutoLoginUrl(url: string, showModal: boolean = true): Promise<string> {
 
@@ -1793,8 +1772,8 @@ export class CoreSite {
      * Get a version number from a release version.
      * If release version is valid but not found in the list of Moodle releases, it will use the last released major version.
      *
-     * @param {string} version Release version to convert to version number.
-     * @return {number} Version number, 0 if invalid.
+     * @param version Release version to convert to version number.
+     * @return Version number, 0 if invalid.
      */
     protected getVersionNumber(version: string): number {
         const data = this.getMajorAndMinor(version);
@@ -1815,8 +1794,8 @@ export class CoreSite {
     /**
      * Given a release version, return the major and minor versions.
      *
-     * @param {string} version Release version (e.g. '3.1.0').
-     * @return {object} Object with major and minor. Returns false if invalid version.
+     * @param version Release version (e.g. '3.1.0').
+     * @return Object with major and minor. Returns false if invalid version.
      */
     protected getMajorAndMinor(version: string): any {
         const match = version.match(/(\d)+(?:\.(\d)+)?(?:\.(\d)+)?/);
@@ -1834,8 +1813,8 @@ export class CoreSite {
     /**
      * Given a release version, return the next major version number.
      *
-     * @param {string} version Release version (e.g. '3.1.0').
-     * @return {number} Next major version number.
+     * @param version Release version (e.g. '3.1.0').
+     * @return Next major version number.
      */
     protected getNextMajorVersionNumber(version: string): number {
         const data = this.getMajorAndMinor(version),
@@ -1860,8 +1839,8 @@ export class CoreSite {
     /**
      * Deletes a site setting.
      *
-     * @param {string} name The config name.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param name The config name.
+     * @return Promise resolved when done.
      */
     deleteSiteConfig(name: string): Promise<any> {
         return this.db.deleteRecords(CoreSite.CONFIG_TABLE, { name: name });
@@ -1870,9 +1849,9 @@ export class CoreSite {
     /**
      * Get a site setting on local device.
      *
-     * @param {string} name The config name.
-     * @param {any} [defaultValue] Default value to use if the entry is not found.
-     * @return {Promise<any>} Resolves upon success along with the config data. Reject on failure.
+     * @param name The config name.
+     * @param defaultValue Default value to use if the entry is not found.
+     * @return Resolves upon success along with the config data. Reject on failure.
      */
     getLocalSiteConfig(name: string, defaultValue?: any): Promise<any> {
         return this.db.getRecord(CoreSite.CONFIG_TABLE, { name: name }).then((entry) => {
@@ -1889,9 +1868,9 @@ export class CoreSite {
     /**
      * Set a site setting on local device.
      *
-     * @param {string} name The config name.
-     * @param {number|string} value The config value. Can only store number or strings.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param name The config name.
+     * @param value The config value. Can only store number or strings.
+     * @return Promise resolved when done.
      */
     setLocalSiteConfig(name: string, value: number | string): Promise<any> {
         return this.db.insertRecord(CoreSite.CONFIG_TABLE, { name: name, value: value });
diff --git a/src/classes/sqlitedb.ts b/src/classes/sqlitedb.ts
index 9bc24272b..011690982 100644
--- a/src/classes/sqlitedb.ts
+++ b/src/classes/sqlitedb.ts
@@ -21,37 +21,31 @@ import { Platform } from 'ionic-angular';
 export interface SQLiteDBTableSchema {
     /**
      * The table name.
-     * @type {string}
      */
     name: string;
 
     /**
      * The columns to create in the table.
-     * @type {SQLiteDBColumnSchema[]}
      */
     columns: SQLiteDBColumnSchema[];
 
     /**
      * Names of columns that are primary key. Use it for compound primary keys.
-     * @type {string[]}
      */
     primaryKeys?: string[];
 
     /**
      * List of sets of unique columns. E.g: [['section', 'title'], ['author', 'title']].
-     * @type {string[][]}
      */
     uniqueKeys?: string[][];
 
     /**
      * List of foreign keys.
-     * @type {SQLiteDBForeignKeySchema[]}
      */
     foreignKeys?: SQLiteDBForeignKeySchema[];
 
     /**
      * Check constraint for the table.
-     * @type {string}
      */
     tableCheck?: string;
 }
@@ -62,49 +56,41 @@ export interface SQLiteDBTableSchema {
 export interface SQLiteDBColumnSchema {
     /**
      * Column's name.
-     * @type {string}
      */
     name: string;
 
     /**
      * Column's type.
-     * @type {string}
      */
     type?: 'INTEGER' | 'REAL' | 'TEXT' | 'BLOB';
 
     /**
      * Whether the column is a primary key. Use it only if primary key is a single column.
-     * @type {boolean}
      */
     primaryKey?: boolean;
 
     /**
      * Whether it should be autoincremented. Only if primaryKey is true.
-     * @type {boolean}
      */
     autoIncrement?: boolean;
 
     /**
      * True if column shouldn't be null.
-     * @type {boolean}
      */
     notNull?: boolean;
 
     /**
      * WWhether the column is unique.
-     * @type {boolean}
      */
     unique?: boolean;
 
     /**
      * Check constraint for the column.
-     * @type {string}
      */
     check?: string;
 
     /**
      * Default value for the column.
-     * @type {string}
      */
     default?: string;
 }
@@ -115,25 +101,21 @@ export interface SQLiteDBColumnSchema {
 export interface SQLiteDBForeignKeySchema {
     /**
      * Columns to include in this foreign key.
-     * @type {string[]}
      */
     columns: string[];
 
     /**
      * The external table referenced by this key.
-     * @type {string}
      */
     table: string;
 
     /**
      * List of referenced columns from the referenced table.
-     * @type {string[]}
      */
     foreignColumns?: string[];
 
     /**
      * Text with the actions to apply to the foreign key.
-     * @type {string}
      */
     actions?: string;
 }
@@ -154,9 +136,9 @@ export class SQLiteDB {
     /**
      * Create and open the database.
      *
-     * @param {string} name Database name.
-     * @param {SQLite} sqlite SQLite library.
-     * @param {Platform} platform Ionic platform.
+     * @param name Database name.
+     * @param sqlite SQLite library.
+     * @param platform Ionic platform.
      */
     constructor(public name: string, private sqlite: SQLite, private platform: Platform) {
         this.init();
@@ -165,12 +147,12 @@ export class SQLiteDB {
     /**
      * Helper function to create a table if it doesn't exist.
      *
-     * @param {string} name The table name.
-     * @param {SQLiteDBColumnSchema[]} columns The columns to create in the table.
-     * @param {string[]} [primaryKeys] Names of columns that are primary key. Use it for compound primary keys.
-     * @param {string[][]} [uniqueKeys] List of sets of unique columns. E.g: [['section', 'title'], ['author', 'title']].
-     * @param {SQLiteDBForeignKeySchema[]} [foreignKeys] List of foreign keys.
-     * @param {string} [tableCheck] Check constraint for the table.
+     * @param name The table name.
+     * @param columns The columns to create in the table.
+     * @param primaryKeys Names of columns that are primary key. Use it for compound primary keys.
+     * @param uniqueKeys List of sets of unique columns. E.g: [['section', 'title'], ['author', 'title']].
+     * @param foreignKeys List of foreign keys.
+     * @param tableCheck Check constraint for the table.
      * @return SQL query.
      */
     buildCreateTableSql(name: string, columns: SQLiteDBColumnSchema[], primaryKeys?: string[], uniqueKeys?: string[][],
@@ -257,7 +239,7 @@ export class SQLiteDB {
     /**
      * Close the database.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     close(): Promise<any> {
         return this.ready().then(() => {
@@ -268,9 +250,9 @@ export class SQLiteDB {
     /**
      * Count the records in a table where all the given conditions met.
      *
-     * @param {string} table The table to query.
-     * @param {object} [conditions] The conditions to build the where clause. Must not contain numeric indexes.
-     * @return {Promise<number>} Promise resolved with the count of records returned from the specified criteria.
+     * @param table The table to query.
+     * @param conditions The conditions to build the where clause. Must not contain numeric indexes.
+     * @return Promise resolved with the count of records returned from the specified criteria.
      */
     countRecords(table: string, conditions?: object): Promise<number> {
         const selectAndParams = this.whereClause(conditions);
@@ -281,11 +263,11 @@ export class SQLiteDB {
     /**
      * Count the records in a table which match a particular WHERE clause.
      *
-     * @param {string} table The table to query.
-     * @param {string} [select] A fragment of SQL to be used in a where clause in the SQL call.
-     * @param {any} [params] An array of sql parameters.
-     * @param {string} [countItem] The count string to be used in the SQL call. Default is COUNT('x').
-     * @return {Promise<number>} Promise resolved with the count of records returned from the specified criteria.
+     * @param table The table to query.
+     * @param select A fragment of SQL to be used in a where clause in the SQL call.
+     * @param params An array of sql parameters.
+     * @param countItem The count string to be used in the SQL call. Default is COUNT('x').
+     * @return Promise resolved with the count of records returned from the specified criteria.
      */
     countRecordsSelect(table: string, select: string = '', params?: any, countItem: string = 'COUNT(\'x\')'): Promise<number> {
         if (select) {
@@ -300,9 +282,9 @@ export class SQLiteDB {
      *
      * Given a query that counts rows, return that count.
      *
-     * @param {string} sql The SQL string you wish to be executed.
-     * @param {any} [params] An array of sql parameters.
-     * @return {Promise<number>} Promise resolved with the count.
+     * @param sql The SQL string you wish to be executed.
+     * @param params An array of sql parameters.
+     * @return Promise resolved with the count.
      */
     countRecordsSql(sql: string, params?: any): Promise<number> {
         return this.getFieldSql(sql, params).then((count) => {
@@ -317,13 +299,13 @@ export class SQLiteDB {
     /**
      * Create a table if it doesn't exist.
      *
-     * @param {string} name The table name.
-     * @param {SQLiteDBColumnSchema[]} columns The columns to create in the table.
-     * @param {string[]} [primaryKeys] Names of columns that are primary key. Use it for compound primary keys.
-     * @param {string[][]} [uniqueKeys] List of sets of unique columns. E.g: [['section', 'title'], ['author', 'title']].
-     * @param {SQLiteDBForeignKeySchema[]} [foreignKeys] List of foreign keys.
-     * @param {string} [tableCheck] Check constraint for the table.
-     * @return {Promise<any>} Promise resolved when success.
+     * @param name The table name.
+     * @param columns The columns to create in the table.
+     * @param primaryKeys Names of columns that are primary key. Use it for compound primary keys.
+     * @param uniqueKeys List of sets of unique columns. E.g: [['section', 'title'], ['author', 'title']].
+     * @param foreignKeys List of foreign keys.
+     * @param tableCheck Check constraint for the table.
+     * @return Promise resolved when success.
      */
     createTable(name: string, columns: SQLiteDBColumnSchema[], primaryKeys?: string[], uniqueKeys?: string[][],
             foreignKeys?: SQLiteDBForeignKeySchema[], tableCheck?: string): Promise<any> {
@@ -335,8 +317,8 @@ export class SQLiteDB {
     /**
      * Create a table if it doesn't exist from a schema.
      *
-     * @param {SQLiteDBTableSchema} table Table schema.
-     * @return {Promise<any>} Promise resolved when success.
+     * @param table Table schema.
+     * @return Promise resolved when success.
      */
     createTableFromSchema(table: SQLiteDBTableSchema): Promise<any> {
         return this.createTable(table.name, table.columns, table.primaryKeys, table.uniqueKeys,
@@ -346,8 +328,8 @@ export class SQLiteDB {
     /**
      * Create several tables if they don't exist from a list of schemas.
      *
-     * @param {SQLiteDBTableSchema[]} tables List of table schema.
-     * @return {Promise<any>} Promise resolved when success.
+     * @param tables List of table schema.
+     * @return Promise resolved when success.
      */
     createTablesFromSchema(tables: SQLiteDBTableSchema[]): Promise<any> {
         const promises = [];
@@ -362,9 +344,9 @@ export class SQLiteDB {
      * Delete the records from a table where all the given conditions met.
      * If conditions not specified, table is truncated.
      *
-     * @param {string} table The table to delete from.
-     * @param {object} [conditions] The conditions to build the where clause. Must not contain numeric indexes.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param table The table to delete from.
+     * @param conditions The conditions to build the where clause. Must not contain numeric indexes.
+     * @return Promise resolved when done.
      */
     deleteRecords(table: string, conditions?: object): Promise<any> {
         if (conditions === null || typeof conditions == 'undefined') {
@@ -380,10 +362,10 @@ export class SQLiteDB {
     /**
      * Delete the records from a table where one field match one list of values.
      *
-     * @param {string} table The table to delete from.
-     * @param {string} field The name of a field.
-     * @param {any[]} values The values field might take.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param table The table to delete from.
+     * @param field The name of a field.
+     * @param values The values field might take.
+     * @return Promise resolved when done.
      */
     deleteRecordsList(table: string, field: string, values: any[]): Promise<any> {
         const selectAndParams = this.whereClauseList(field, values);
@@ -394,10 +376,10 @@ export class SQLiteDB {
     /**
      * Delete one or more records from a table which match a particular WHERE clause.
      *
-     * @param {string} table The table to delete from.
-     * @param {string} [select] A fragment of SQL to be used in a where clause in the SQL call.
-     * @param {any[]} [params] Array of sql parameters.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param table The table to delete from.
+     * @param select A fragment of SQL to be used in a where clause in the SQL call.
+     * @param params Array of sql parameters.
+     * @return Promise resolved when done.
      */
     deleteRecordsSelect(table: string, select: string = '', params?: any[]): Promise<any> {
         if (select) {
@@ -410,8 +392,8 @@ export class SQLiteDB {
     /**
      * Drop a table if it exists.
      *
-     * @param {string} name The table name.
-     * @return {Promise<any>} Promise resolved when success.
+     * @param name The table name.
+     * @return Promise resolved when success.
      */
     dropTable(name: string): Promise<any> {
         return this.execute(`DROP TABLE IF EXISTS ${name}`);
@@ -422,9 +404,9 @@ export class SQLiteDB {
      * IMPORTANT: Use this function only if you cannot use any of the other functions in this API. Please take into account that
      * these query will be run in SQLite (Mobile) and Web SQL (desktop), so your query should work in both environments.
      *
-     * @param {string} sql SQL query to execute.
-     * @param {any[]} params Query parameters.
-     * @return {Promise<any>} Promise resolved with the result.
+     * @param sql SQL query to execute.
+     * @param params Query parameters.
+     * @return Promise resolved with the result.
      */
     execute(sql: string, params?: any[]): Promise<any> {
         return this.ready().then(() => {
@@ -437,8 +419,8 @@ export class SQLiteDB {
      * IMPORTANT: Use this function only if you cannot use any of the other functions in this API. Please take into account that
      * these query will be run in SQLite (Mobile) and Web SQL (desktop), so your query should work in both environments.
      *
-     * @param {any[]} sqlStatements SQL statements to execute.
-     * @return {Promise<any>} Promise resolved with the result.
+     * @param sqlStatements SQL statements to execute.
+     * @return Promise resolved with the result.
      */
     executeBatch(sqlStatements: any[]): Promise<any> {
         return this.ready().then(() => {
@@ -449,7 +431,7 @@ export class SQLiteDB {
     /**
      * Format the data to insert in the database. Removes undefined entries so they are stored as null instead of 'undefined'.
      *
-     * @param {object} data Data to insert.
+     * @param data Data to insert.
      */
     protected formatDataToInsert(data: object): void {
         if (!data) {
@@ -468,8 +450,8 @@ export class SQLiteDB {
     /**
      * Get all the records from a table.
      *
-     * @param {string} table The table to query.
-     * @return {Promise<any>} Promise resolved with the records.
+     * @param table The table to query.
+     * @return Promise resolved with the records.
      */
     getAllRecords(table: string): Promise<any> {
         return this.getRecords(table);
@@ -478,10 +460,10 @@ export class SQLiteDB {
     /**
      * Get a single field value from a table record where all the given conditions met.
      *
-     * @param {string} table The table to query.
-     * @param {string} field The field to return the value of.
-     * @param {object} [conditions] The conditions to build the where clause. Must not contain numeric indexes.
-     * @return {Promise<any>} Promise resolved with the field's value.
+     * @param table The table to query.
+     * @param field The field to return the value of.
+     * @param conditions The conditions to build the where clause. Must not contain numeric indexes.
+     * @return Promise resolved with the field's value.
      */
     getField(table: string, field: string, conditions?: object): Promise<any> {
         const selectAndParams = this.whereClause(conditions);
@@ -492,11 +474,11 @@ export class SQLiteDB {
     /**
      * Get a single field value from a table record which match a particular WHERE clause.
      *
-     * @param {string} table The table to query.
-     * @param {string} field The field to return the value of.
-     * @param {string} [select=''] A fragment of SQL to be used in a where clause returning one row with one column.
-     * @param {any[]} [params] Array of sql parameters.
-     * @return {Promise<any>} Promise resolved with the field's value.
+     * @param table The table to query.
+     * @param field The field to return the value of.
+     * @param select A fragment of SQL to be used in a where clause returning one row with one column.
+     * @param params Array of sql parameters.
+     * @return Promise resolved with the field's value.
      */
     getFieldSelect(table: string, field: string, select: string = '', params?: any[]): Promise<any> {
         if (select) {
@@ -509,9 +491,9 @@ export class SQLiteDB {
     /**
      * Get a single field value (first field) using a SQL statement.
      *
-     * @param {string} sql The SQL query returning one row with one column.
-     * @param {any[]} [params] An array of sql parameters.
-     * @return {Promise<any>} Promise resolved with the field's value.
+     * @param sql The SQL query returning one row with one column.
+     * @param params An array of sql parameters.
+     * @return Promise resolved with the field's value.
      */
     getFieldSql(sql: string, params?: any[]): Promise<any> {
         return this.getRecordSql(sql, params).then((record) => {
@@ -527,11 +509,11 @@ export class SQLiteDB {
     /**
      * Constructs 'IN()' or '=' sql fragment
      *
-     * @param {any} items A single value or array of values for the expression. It doesn't accept objects.
-     * @param {boolean} [equal=true] True means we want to equate to the constructed expression.
-     * @param {any} [onEmptyItems] This defines the behavior when the array of items provided is empty. Defaults to false,
-     *              meaning return empty. Other values will become part of the returned SQL fragment.
-     * @return {any[]} A list containing the constructed sql fragment and an array of parameters.
+     * @param items A single value or array of values for the expression. It doesn't accept objects.
+     * @param equal True means we want to equate to the constructed expression.
+     * @param onEmptyItems This defines the behavior when the array of items provided is empty. Defaults to false,
+     *                     meaning return empty. Other values will become part of the returned SQL fragment.
+     * @return A list containing the constructed sql fragment and an array of parameters.
      */
     getInOrEqual(items: any, equal: boolean = true, onEmptyItems?: any): any[] {
         let sql,
@@ -571,7 +553,7 @@ export class SQLiteDB {
     /**
      * Get the database name.
      *
-     * @return {string} Database name.
+     * @return Database name.
      */
     getName(): string {
         return this.name;
@@ -580,10 +562,10 @@ export class SQLiteDB {
     /**
      * Get a single database record where all the given conditions met.
      *
-     * @param {string} table The table to query.
-     * @param {object} [conditions] The conditions to build the where clause. Must not contain numeric indexes.
-     * @param {string} [fields='*'] A comma separated list of fields to return.
-     * @return {Promise<any>} Promise resolved with the record, rejected if not found.
+     * @param table The table to query.
+     * @param conditions The conditions to build the where clause. Must not contain numeric indexes.
+     * @param fields A comma separated list of fields to return.
+     * @return Promise resolved with the record, rejected if not found.
      */
     getRecord(table: string, conditions?: object, fields: string = '*'): Promise<any> {
         const selectAndParams = this.whereClause(conditions);
@@ -594,11 +576,11 @@ export class SQLiteDB {
     /**
      * Get a single database record as an object which match a particular WHERE clause.
      *
-     * @param {string} table The table to query.
-     * @param {string} [select] A fragment of SQL to be used in a where clause in the SQL call.
-     * @param {any[]} [params] An array of sql parameters.
-     * @param {string} [fields='*'] A comma separated list of fields to return.
-     * @return {Promise<any>} Promise resolved with the record, rejected if not found.
+     * @param table The table to query.
+     * @param select A fragment of SQL to be used in a where clause in the SQL call.
+     * @param params An array of sql parameters.
+     * @param fields A comma separated list of fields to return.
+     * @return Promise resolved with the record, rejected if not found.
      */
     getRecordSelect(table: string, select: string = '', params: any[] = [], fields: string = '*'): Promise<any> {
         if (select) {
@@ -614,9 +596,9 @@ export class SQLiteDB {
      * The SQL statement should normally only return one record.
      * It is recommended to use getRecordsSql() if more matches possible!
      *
-     * @param {string} sql The SQL string you wish to be executed, should normally only return one record.
-     * @param {any[]} [params] List of sql parameters
-     * @return {Promise<any>} Promise resolved with the records.
+     * @param sql The SQL string you wish to be executed, should normally only return one record.
+     * @param params List of sql parameters
+     * @return Promise resolved with the records.
      */
     getRecordSql(sql: string, params?: any[]): Promise<any> {
         return this.getRecordsSql(sql, params, 0, 1).then((result) => {
@@ -633,13 +615,13 @@ export class SQLiteDB {
     /**
      * Get a number of records where all the given conditions met.
      *
-     * @param {string} table The table to query.
-     * @param {object} [conditions] The conditions to build the where clause. Must not contain numeric indexes.
-     * @param {string} [sort=''] An order to sort the results in.
-     * @param {string} [fields='*'] A comma separated list of fields to return.
-     * @param {number} [limitFrom=0] Return a subset of records, starting at this point.
-     * @param {number} [limitNum=0] Return a subset comprising this many records in total.
-     * @return {Promise<any>} Promise resolved with the records.
+     * @param table The table to query.
+     * @param conditions The conditions to build the where clause. Must not contain numeric indexes.
+     * @param sort An order to sort the results in.
+     * @param fields A comma separated list of fields to return.
+     * @param limitFrom Return a subset of records, starting at this point.
+     * @param limitNum Return a subset comprising this many records in total.
+     * @return Promise resolved with the records.
      */
     getRecords(table: string, conditions?: object, sort: string = '', fields: string = '*', limitFrom: number = 0,
             limitNum: number = 0): Promise<any> {
@@ -651,14 +633,14 @@ export class SQLiteDB {
     /**
      * Get a number of records where one field match one list of values.
      *
-     * @param {string} table The database table to be checked against.
-     * @param {string} field The name of a field.
-     * @param {any[]} values The values field might take.
-     * @param {string} [sort=''] An order to sort the results in.
-     * @param {string} [fields='*'] A comma separated list of fields to return.
-     * @param {number} [limitFrom=0] Return a subset of records, starting at this point.
-     * @param {number} [limitNum=0] Return a subset comprising this many records in total.
-     * @return {Promise<any>} Promise resolved with the records.
+     * @param table The database table to be checked against.
+     * @param field The name of a field.
+     * @param values The values field might take.
+     * @param sort An order to sort the results in.
+     * @param fields A comma separated list of fields to return.
+     * @param limitFrom Return a subset of records, starting at this point.
+     * @param limitNum Return a subset comprising this many records in total.
+     * @return Promise resolved with the records.
      */
     getRecordsList(table: string, field: string, values: any[], sort: string = '', fields: string = '*', limitFrom: number = 0,
             limitNum: number = 0): Promise<any> {
@@ -670,14 +652,14 @@ export class SQLiteDB {
     /**
      * Get a number of records which match a particular WHERE clause.
      *
-     * @param {string} table The table to query.
-     * @param {string} [select] A fragment of SQL to be used in a where clause in the SQL call.
-     * @param {any[]} [params] An array of sql parameters.
-     * @param {string} [sort=''] An order to sort the results in.
-     * @param {string} [fields='*'] A comma separated list of fields to return.
-     * @param {number} [limitFrom=0] Return a subset of records, starting at this point.
-     * @param {number} [limitNum=0] Return a subset comprising this many records in total.
-     * @return {Promise<any>} Promise resolved with the records.
+     * @param table The table to query.
+     * @param select A fragment of SQL to be used in a where clause in the SQL call.
+     * @param params An array of sql parameters.
+     * @param sort An order to sort the results in.
+     * @param fields A comma separated list of fields to return.
+     * @param limitFrom Return a subset of records, starting at this point.
+     * @param limitNum Return a subset comprising this many records in total.
+     * @return Promise resolved with the records.
      */
     getRecordsSelect(table: string, select: string = '', params: any[] = [], sort: string = '', fields: string = '*',
             limitFrom: number = 0, limitNum: number = 0): Promise<any> {
@@ -696,11 +678,11 @@ export class SQLiteDB {
     /**
      * Get a number of records using a SQL statement.
      *
-     * @param {string} sql The SQL select query to execute.
-     * @param {any[]} [params] List of sql parameters
-     * @param {number} [limitFrom] Return a subset of records, starting at this point.
-     * @param {number} [limitNum] Return a subset comprising this many records.
-     * @return {Promise<any>} Promise resolved with the records.
+     * @param sql The SQL select query to execute.
+     * @param params List of sql parameters
+     * @param limitFrom Return a subset of records, starting at this point.
+     * @param limitNum Return a subset comprising this many records.
+     * @return Promise resolved with the records.
      */
     getRecordsSql(sql: string, params?: any[], limitFrom?: number, limitNum?: number): Promise<any> {
         const limits = this.normaliseLimitFromNum(limitFrom, limitNum);
@@ -726,9 +708,9 @@ export class SQLiteDB {
     /**
      * Given a data object, returns the SQL query and the params to insert that record.
      *
-     * @param {string} table The database table.
-     * @param {object} data A data object with values for one or more fields in the record.
-     * @return {any[]} Array with the SQL query and the params.
+     * @param table The database table.
+     * @param data A data object with values for one or more fields in the record.
+     * @return Array with the SQL query and the params.
      */
     protected getSqlInsertQuery(table: string, data: object): any[] {
         this.formatDataToInsert(data);
@@ -760,9 +742,9 @@ export class SQLiteDB {
     /**
      * Insert a record into a table and return the "rowId" field.
      *
-     * @param {string} table The database table to be inserted into.
-     * @param {object} data A data object with values for one or more fields in the record.
-     * @return {Promise<number>} Promise resolved with new rowId. Please notice this rowId is internal from SQLite.
+     * @param table The database table to be inserted into.
+     * @param data A data object with values for one or more fields in the record.
+     * @return Promise resolved with new rowId. Please notice this rowId is internal from SQLite.
      */
     insertRecord(table: string, data: object): Promise<number> {
         const sqlAndParams = this.getSqlInsertQuery(table, data);
@@ -775,9 +757,9 @@ export class SQLiteDB {
     /**
      * Insert multiple records into database as fast as possible.
      *
-     * @param {string} table The database table to be inserted into.
-     * @param {object[]} dataObjects List of objects to be inserted.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param table The database table to be inserted into.
+     * @param dataObjects List of objects to be inserted.
+     * @return Promise resolved when done.
      */
     insertRecords(table: string, dataObjects: object[]): Promise<any> {
         if (!Array.isArray(dataObjects)) {
@@ -796,11 +778,11 @@ export class SQLiteDB {
     /**
      * Insert multiple records into database from another table.
      *
-     * @param {string} table The database table to be inserted into.
-     * @param {string} source The database table to get the records from.
-     * @param {object} [conditions] The conditions to build the where clause. Must not contain numeric indexes.
-     * @param {string} [fields='*'] A comma separated list of fields to return.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param table The database table to be inserted into.
+     * @param source The database table to get the records from.
+     * @param conditions The conditions to build the where clause. Must not contain numeric indexes.
+     * @param fields A comma separated list of fields to return.
+     * @return Promise resolved when done.
      */
     insertRecordsFrom(table: string, source: string, conditions?: object, fields: string = '*'): Promise<any> {
         const selectAndParams = this.whereClause(conditions);
@@ -815,9 +797,9 @@ export class SQLiteDB {
      * We explicitly treat null, '' and -1 as 0 in order to provide compatibility with how limit
      * values have been passed historically.
      *
-     * @param {any} limitFrom Where to start results from.
-     * @param {any} limitNum How many results to return.
-     * @return {number[]} Normalised limit params in array: [limitFrom, limitNum].
+     * @param limitFrom Where to start results from.
+     * @param limitNum How many results to return.
+     * @return Normalised limit params in array: [limitFrom, limitNum].
      */
     normaliseLimitFromNum(limitFrom: any, limitNum: any): number[] {
         // We explicilty treat these cases as 0.
@@ -839,7 +821,7 @@ export class SQLiteDB {
     /**
      * Open the database. Only needed if it was closed before, a database is automatically opened when created.
      *
-     * @return {Promise<void>} Promise resolved when open.
+     * @return Promise resolved when open.
      */
     open(): Promise<any> {
         return this.ready().then(() => {
@@ -850,7 +832,7 @@ export class SQLiteDB {
     /**
      * Wait for the DB to be ready.
      *
-     * @return {Promise<void>} Promise resolved when ready.
+     * @return Promise resolved when ready.
      */
     ready(): Promise<void> {
         return this.promise;
@@ -859,9 +841,9 @@ export class SQLiteDB {
     /**
      * Test whether a record exists in a table where all the given conditions met.
      *
-     * @param {string} table The table to check.
-     * @param {object} [conditions] The conditions to build the where clause. Must not contain numeric indexes.
-     * @return {Promise<void>} Promise resolved if exists, rejected otherwise.
+     * @param table The table to check.
+     * @param conditions The conditions to build the where clause. Must not contain numeric indexes.
+     * @return Promise resolved if exists, rejected otherwise.
      */
     recordExists(table: string, conditions?: object): Promise<void> {
         return this.getRecord(table, conditions).then((record) => {
@@ -874,10 +856,10 @@ export class SQLiteDB {
     /**
      * Test whether any records exists in a table which match a particular WHERE clause.
      *
-     * @param {string} table The table to query.
-     * @param {string} [select] A fragment of SQL to be used in a where clause in the SQL call.
-     * @param {any[]} [params] An array of sql parameters.
-     * @return {Promise<any>} Promise resolved if exists, rejected otherwise.
+     * @param table The table to query.
+     * @param select A fragment of SQL to be used in a where clause in the SQL call.
+     * @param params An array of sql parameters.
+     * @return Promise resolved if exists, rejected otherwise.
      */
     recordExistsSelect(table: string, select: string = '', params: any[] = []): Promise<any> {
         return this.getRecordSelect(table, select, params).then((record) => {
@@ -890,9 +872,9 @@ export class SQLiteDB {
     /**
      * Test whether a SQL SELECT statement returns any records.
      *
-     * @param {string} sql The SQL query returning one row with one column.
-     * @param {any[]} [params] An array of sql parameters.
-     * @return {Promise<any>} Promise resolved if exists, rejected otherwise.
+     * @param sql The SQL query returning one row with one column.
+     * @param params An array of sql parameters.
+     * @return Promise resolved if exists, rejected otherwise.
      */
     recordExistsSql(sql: string, params?: any[]): Promise<any> {
         return this.getRecordSql(sql, params).then((record) => {
@@ -905,8 +887,8 @@ export class SQLiteDB {
     /**
      * Test whether a table exists..
      *
-     * @param {string} name The table name.
-     * @return {Promise<void>} Promise resolved if exists, rejected otherwise.
+     * @param name The table name.
+     * @return Promise resolved if exists, rejected otherwise.
      */
     tableExists(name: string): Promise<void> {
         return this.recordExists('sqlite_master', {type: 'table', tbl_name: name});
@@ -915,10 +897,10 @@ export class SQLiteDB {
     /**
      * Update one or more records in a table.
      *
-     * @param {string} string table The database table to update.
-     * @param {any} data An object with the fields to update: fieldname=>fieldvalue.
-     * @param {any} [conditions] The conditions to build the where clause. Must not contain numeric indexes.
-     * @return {Promise<any>} Promise resolved when updated.
+     * @param string table The database table to update.
+     * @param data An object with the fields to update: fieldname=>fieldvalue.
+     * @param conditions The conditions to build the where clause. Must not contain numeric indexes.
+     * @return Promise resolved when updated.
      */
     updateRecords(table: string, data: any, conditions?: any): Promise<any> {
 
@@ -948,11 +930,11 @@ export class SQLiteDB {
     /**
      * Update one or more records in a table. It accepts a WHERE clause as a string.
      *
-     * @param {string} string table The database table to update.
-     * @param {any} data An object with the fields to update: fieldname=>fieldvalue.
-     * @param {string} [where] Where clause. Must not include the "WHERE" word.
-     * @param {any[]} [whereParams] Params for the where clause.
-     * @return {Promise<any>} Promise resolved when updated.
+     * @param string table The database table to update.
+     * @param data An object with the fields to update: fieldname=>fieldvalue.
+     * @param where Where clause. Must not include the "WHERE" word.
+     * @param whereParams Params for the where clause.
+     * @return Promise resolved when updated.
      */
     updateRecordsWhere(table: string, data: any, where?: string, whereParams?: any[]): Promise<any> {
         if (!data || !Object.keys(data).length) {
@@ -985,8 +967,8 @@ export class SQLiteDB {
     /**
      * Returns the SQL WHERE conditions.
      *
-     * @param {object} [conditions] The conditions to build the where clause. Must not contain numeric indexes.
-     * @return {any[]} An array list containing sql 'where' part and 'params'.
+     * @param conditions The conditions to build the where clause. Must not contain numeric indexes.
+     * @return An array list containing sql 'where' part and 'params'.
      */
     whereClause(conditions: any = {}): any[] {
         if (!conditions || !Object.keys(conditions).length) {
@@ -1013,9 +995,9 @@ export class SQLiteDB {
     /**
      * Returns SQL WHERE conditions for the ..._list group of methods.
      *
-     * @param {string} field The name of a field.
-     * @param {any[]} values The values field might take.
-     * @return {any[]} An array containing sql 'where' part and 'params'.
+     * @param field The name of a field.
+     * @param values The values field might take.
+     * @return An array containing sql 'where' part and 'params'.
      */
     whereClauseList(field: string, values: any[]): any[] {
         if (!values || !values.length) {
diff --git a/src/components/attachments/attachments.ts b/src/components/attachments/attachments.ts
index 03ada9d5d..6f5f2ea16 100644
--- a/src/components/attachments/attachments.ts
+++ b/src/components/attachments/attachments.ts
@@ -106,8 +106,8 @@ export class CoreAttachmentsComponent implements OnInit {
     /**
      * Delete a file from the list.
      *
-     * @param {number} index The index of the file.
-     * @param {boolean} [askConfirm] Whether to ask confirm.
+     * @param index The index of the file.
+     * @param askConfirm Whether to ask confirm.
      */
     delete(index: number, askConfirm?: boolean): void {
         let promise;
@@ -129,8 +129,8 @@ export class CoreAttachmentsComponent implements OnInit {
     /**
      * A file was renamed.
      *
-     * @param {number} index Index of the file.
-     * @param {any} data The data received.
+     * @param index Index of the file.
+     * @param data The data received.
      */
     renamed(index: number, data: any): void {
         this.files[index] = data.file;
diff --git a/src/components/chart/chart.ts b/src/components/chart/chart.ts
index 55ec191ca..f34d43242 100644
--- a/src/components/chart/chart.ts
+++ b/src/components/chart/chart.ts
@@ -117,8 +117,8 @@ export class CoreChartComponent implements OnDestroy, OnInit, OnChanges {
     /**
      * Generate random colors if needed.
      *
-     * @param  {number} n Number of colors needed.
-     * @return {any[]}    Array with the number of background colors requested.
+     * @param n Number of colors needed.
+     * @return Array with the number of background colors requested.
      */
     protected getRandomColors(n: number): any[] {
         while (CoreChartComponent.backgroundColors.length < n) {
diff --git a/src/components/context-menu/context-menu-item.ts b/src/components/context-menu/context-menu-item.ts
index 0870cbcd3..9c9b6c182 100644
--- a/src/components/context-menu/context-menu-item.ts
+++ b/src/components/context-menu/context-menu-item.ts
@@ -85,9 +85,9 @@ export class CoreContextMenuItemComponent implements OnInit, OnDestroy, OnChange
     /**
      * Get a boolean value from item.
      *
-     * @param {any} value Value to check.
-     * @param {boolean} defaultValue Value to use if undefined.
-     * @return {boolean} Boolean value.
+     * @param value Value to check.
+     * @param defaultValue Value to use if undefined.
+     * @return Boolean value.
      */
     protected getBooleanValue(value: any, defaultValue: boolean): boolean {
         if (typeof value == 'undefined') {
diff --git a/src/components/context-menu/context-menu-popover.ts b/src/components/context-menu/context-menu-popover.ts
index aa468f189..070e4362d 100644
--- a/src/components/context-menu/context-menu-popover.ts
+++ b/src/components/context-menu/context-menu-popover.ts
@@ -47,9 +47,9 @@ export class CoreContextMenuPopoverComponent {
     /**
      * Function called when an item is clicked.
      *
-     * @param {Event} event Click event.
-     * @param {CoreContextMenuItemComponent} item Item clicked.
-     * @return {boolean} Return true if success, false if error.
+     * @param event Click event.
+     * @param item Item clicked.
+     * @return Return true if success, false if error.
      */
     itemClicked(event: Event, item: CoreContextMenuItemComponent): boolean {
         if (item.action.observers.length > 0) {
diff --git a/src/components/context-menu/context-menu.ts b/src/components/context-menu/context-menu.ts
index 42fca4504..3a8daf25c 100644
--- a/src/components/context-menu/context-menu.ts
+++ b/src/components/context-menu/context-menu.ts
@@ -76,7 +76,7 @@ export class CoreContextMenuComponent implements OnInit, OnDestroy {
     /**
      * Add a context menu item.
      *
-     * @param {CoreContextMenuItemComponent} item The item to add.
+     * @param item The item to add.
      */
     addItem(item: CoreContextMenuItemComponent): void {
         if (this.parentContextMenu) {
@@ -108,7 +108,7 @@ export class CoreContextMenuComponent implements OnInit, OnDestroy {
      * Merge the current context menu with the one passed as parameter. All the items in this menu will be moved to the
      * one passed as parameter.
      *
-     * @param {CoreContextMenuComponent} contextMenu The context menu where to move the items.
+     * @param contextMenu The context menu where to move the items.
      */
     mergeContextMenus(contextMenu: CoreContextMenuComponent): void {
         this.parentContextMenu = contextMenu;
@@ -128,7 +128,7 @@ export class CoreContextMenuComponent implements OnInit, OnDestroy {
     /**
      * Remove an item from the context menu.
      *
-     * @param {CoreContextMenuItemComponent} item The item to remove.
+     * @param item The item to remove.
      */
     removeItem(item: CoreContextMenuItemComponent): void {
         if (this.parentContextMenu) {
@@ -173,7 +173,7 @@ export class CoreContextMenuComponent implements OnInit, OnDestroy {
     /**
      * Show the context menu.
      *
-     * @param {MouseEvent} event Event.
+     * @param event Event.
      */
     showContextMenu(event: MouseEvent): void {
         if (!this.expanded) {
diff --git a/src/components/course-picker-menu/course-picker-menu-popover.ts b/src/components/course-picker-menu/course-picker-menu-popover.ts
index 2e53d9f61..8a6fd955a 100644
--- a/src/components/course-picker-menu/course-picker-menu-popover.ts
+++ b/src/components/course-picker-menu/course-picker-menu-popover.ts
@@ -34,9 +34,9 @@ export class CoreCoursePickerMenuPopoverComponent {
     /**
      * Function called when a course is clicked.
      *
-     * @param {Event} event Click event.
-     * @param {any} course Course object clicked.
-     * @return {boolean} Return true if success, false if error.
+     * @param event Click event.
+     * @param course Course object clicked.
+     * @return Return true if success, false if error.
      */
     coursePicked(event: Event, course: any): boolean {
         this.viewCtrl.dismiss(course);
diff --git a/src/components/download-refresh/download-refresh.ts b/src/components/download-refresh/download-refresh.ts
index 87d964c9b..b231514ca 100644
--- a/src/components/download-refresh/download-refresh.ts
+++ b/src/components/download-refresh/download-refresh.ts
@@ -44,8 +44,8 @@ export class CoreDownloadRefreshComponent {
     /**
      * Download clicked.
      *
-     * @param {Event} e Click event.
-     * @param {boolean} refresh Whether it's refreshing.
+     * @param e Click event.
+     * @param refresh Whether it's refreshing.
      */
     download(e: Event, refresh: boolean): void {
         e.preventDefault();
diff --git a/src/components/dynamic-component/dynamic-component.ts b/src/components/dynamic-component/dynamic-component.ts
index 36fe69cdc..58bb372ac 100644
--- a/src/components/dynamic-component/dynamic-component.ts
+++ b/src/components/dynamic-component/dynamic-component.ts
@@ -118,9 +118,9 @@ export class CoreDynamicComponent implements OnInit, OnChanges, DoCheck {
     /**
      * Call a certain function on the component.
      *
-     * @param {string} name Name of the function to call.
-     * @param {any[]} params List of params to send to the function.
-     * @return {any} Result of the call. Undefined if no component instance or the function doesn't exist.
+     * @param name Name of the function to call.
+     * @param params List of params to send to the function.
+     * @return Result of the call. Undefined if no component instance or the function doesn't exist.
      */
     callComponentFunction(name: string, params?: any[]): any {
         if (this.instance && typeof this.instance[name] == 'function') {
@@ -131,7 +131,7 @@ export class CoreDynamicComponent implements OnInit, OnChanges, DoCheck {
     /**
      * Create a component, add it to a container and set the input data.
      *
-     * @return {boolean} Whether the component was successfully created.
+     * @return Whether the component was successfully created.
      */
     protected createComponent(): boolean {
         this.lastComponent = this.component;
diff --git a/src/components/file/file.ts b/src/components/file/file.ts
index 22d0c98af..30aa5b588 100644
--- a/src/components/file/file.ts
+++ b/src/components/file/file.ts
@@ -104,7 +104,7 @@ export class CoreFileComponent implements OnInit, OnDestroy {
     /**
      * Convenience function to get the file state and set variables based on it.
      *
-     * @return {Promise<void>} Promise resolved when state has been calculated.
+     * @return Promise resolved when state has been calculated.
      */
     protected calculateState(): Promise<void> {
         return this.filepoolProvider.getFileStateByUrl(this.siteId, this.fileUrl, this.timemodified).then((state) => {
@@ -118,7 +118,7 @@ export class CoreFileComponent implements OnInit, OnDestroy {
     /**
      * Convenience function to open a file, downloading it if needed.
      *
-     * @return {Promise<string>} Promise resolved when file is opened.
+     * @return Promise resolved when file is opened.
      */
     protected openFile(): Promise<any> {
         return this.fileHelper.downloadAndOpenFile(this.file, this.component, this.componentId, this.state, (event) => {
@@ -134,8 +134,8 @@ export class CoreFileComponent implements OnInit, OnDestroy {
     /**
      * Download a file and, optionally, open it afterwards.
      *
-     * @param {Event} [e] Click event.
-     * @param {boolean} openAfterDownload Whether the file should be opened after download.
+     * @param e Click event.
+     * @param openAfterDownload Whether the file should be opened after download.
      */
     download(e?: Event, openAfterDownload: boolean = false): void {
         e && e.preventDefault();
@@ -198,7 +198,7 @@ export class CoreFileComponent implements OnInit, OnDestroy {
     /**
      * Delete the file.
      *
-     * @param {Event} e Click event.
+     * @param e Click event.
      */
     delete(e: Event): void {
         e.preventDefault();
diff --git a/src/components/icon/icon.ts b/src/components/icon/icon.ts
index 82e53d165..38c96f1fb 100644
--- a/src/components/icon/icon.ts
+++ b/src/components/icon/icon.ts
@@ -111,8 +111,8 @@ export class CoreIconComponent implements OnChanges, OnDestroy {
     /**
      * Check if the value is true or on.
      *
-     * @param  {any}     val value to be checked.
-     * @return {boolean}     If has a value equivalent to true.
+     * @param val value to be checked.
+     * @return If has a value equivalent to true.
      */
     isTrueProperty(val: any): boolean {
         if (typeof val === 'string') {
diff --git a/src/components/iframe/iframe.ts b/src/components/iframe/iframe.ts
index 722d9eae6..aa7584337 100644
--- a/src/components/iframe/iframe.ts
+++ b/src/components/iframe/iframe.ts
@@ -22,8 +22,6 @@ import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreIframeUtilsProvider } from '@providers/utils/iframe';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 
-/**
- */
 @Component({
     selector: 'core-iframe',
     templateUrl: 'core-iframe.html'
diff --git a/src/components/infinite-loading/infinite-loading.ts b/src/components/infinite-loading/infinite-loading.ts
index 977eba6b7..5c5a3ff18 100644
--- a/src/components/infinite-loading/infinite-loading.ts
+++ b/src/components/infinite-loading/infinite-loading.ts
@@ -48,7 +48,7 @@ export class CoreInfiniteLoadingComponent implements OnChanges {
     /**
      * Detect changes on input properties.
      *
-     * @param {SimpleChange}} changes Changes.
+     * @param } changes Changes.
      */
     ngOnChanges(changes: {[name: string]: SimpleChange}): void {
         if (changes.enabled && this.enabled && this.position == 'bottom') {
@@ -64,7 +64,7 @@ export class CoreInfiniteLoadingComponent implements OnChanges {
     /**
      * Load More items calling the action provided.
      *
-     * @param {InfiniteScroll} [infiniteScroll] Infinite scroll object only if triggered from the scroll.
+     * @param infiniteScroll Infinite scroll object only if triggered from the scroll.
      */
     loadMore(infiniteScroll?: InfiniteScroll): void {
         if (this.loadingMore) {
@@ -110,7 +110,7 @@ export class CoreInfiniteLoadingComponent implements OnChanges {
     /**
      * Get the height of the element.
      *
-     * @return {number} Height.
+     * @return Height.
      */
     getHeight(): number {
         return this.getElementHeight(this.topButton) + this.getElementHeight(this.infiniteEl) +
@@ -120,8 +120,8 @@ export class CoreInfiniteLoadingComponent implements OnChanges {
     /**
      * Get the height of an element.
      *
-     * @param {ElementRef} element Element ref.
-     * @return {number} Height.
+     * @param element Element ref.
+     * @return Height.
      */
     protected getElementHeight(element: ElementRef): number {
         if (element && element.nativeElement) {
diff --git a/src/components/ion-tabs/ion-tabs.ts b/src/components/ion-tabs/ion-tabs.ts
index 914d97ab6..f410ad3fe 100644
--- a/src/components/ion-tabs/ion-tabs.ts
+++ b/src/components/ion-tabs/ion-tabs.ts
@@ -61,7 +61,6 @@ export class CoreIonTabsComponent extends Tabs implements OnDestroy {
     /**
      * List of tabs that haven't been initialized yet. This is required because IonTab calls add() on the constructor,
      * but we need it to be called in OnInit to be able to determine the tab position.
-     * @type {CoreIonTabComponent[]}
      */
     protected tabsNotInit: CoreIonTabComponent[] = [];
 
@@ -95,9 +94,9 @@ export class CoreIonTabsComponent extends Tabs implements OnDestroy {
     /**
      * Add a new tab if it isn't already in the list of tabs.
      *
-     * @param {CoreIonTabComponent} tab The tab to add.
-     * @param {boolean} [isInit] Whether the tab has been initialized.
-     * @return {string} The tab ID.
+     * @param tab The tab to add.
+     * @param isInit Whether the tab has been initialized.
+     * @return The tab ID.
      */
     add(tab: CoreIonTabComponent, isInit?: boolean): string {
         // Check if tab is already in the list of initialized tabs.
@@ -146,7 +145,7 @@ export class CoreIonTabsComponent extends Tabs implements OnDestroy {
     /**
      * Initialize the tabs.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     initTabs(): Promise<any> {
         if (!this.initialized && (this._loaded || typeof this._loaded == 'undefined')) {
@@ -224,7 +223,7 @@ export class CoreIonTabsComponent extends Tabs implements OnDestroy {
     /**
      * Remove a tab from the list of tabs.
      *
-     * @param {CoreIonTabComponent} tab The tab to remove.
+     * @param tab The tab to remove.
      */
     remove(tab: CoreIonTabComponent): void {
         // First search in the list of initialized tabs.
@@ -274,11 +273,11 @@ export class CoreIonTabsComponent extends Tabs implements OnDestroy {
     /**
      * Select a tab.
      *
-     * @param {number|Tab} tabOrIndex Index, or the Tab instance, of the tab to select.
-     * @param {NavOptions} Nav options.
-     * @param {boolean} [fromUrl] Whether to load from a URL.
-     * @param {boolean} [manualClick] Whether the user manually clicked the tab.
-     * @return {Promise<any>} Promise resolved when selected.
+     * @param tabOrIndex Index, or the Tab instance, of the tab to select.
+     * @param Nav options.
+     * @param fromUrl Whether to load from a URL.
+     * @param manualClick Whether the user manually clicked the tab.
+     * @return Promise resolved when selected.
      */
     select(tabOrIndex: number | Tab, opts: NavOptions = {}, fromUrl?: boolean, manualClick?: boolean): Promise<any> {
 
@@ -314,8 +313,8 @@ export class CoreIonTabsComponent extends Tabs implements OnDestroy {
     /**
      * Select a tab by Index. First it will reset the status of the tab.
      *
-     * @param {number} index Index of the tab.
-     * @return {Promise<any>} Promise resolved when selected.
+     * @param index Index of the tab.
+     * @return Promise resolved when selected.
      */
     selectTabRootByIndex(index: number): Promise<any> {
         if (this.initialized) {
@@ -350,7 +349,7 @@ export class CoreIonTabsComponent extends Tabs implements OnDestroy {
     /**
      * Change tabs visibility to show/hide them from the view.
      *
-     * @param {boolean} visible If show or hide the tabs.
+     * @param visible If show or hide the tabs.
      */
     changeVisibility(visible: boolean): void {
         if (this.hidden == visible) {
@@ -374,8 +373,8 @@ export class CoreIonTabsComponent extends Tabs implements OnDestroy {
     /**
      * Confirm if the user wants to go to the root of the current tab.
      *
-     * @param {Tab} tab Tab to go to root.
-     * @return {Promise<any>} Promise resolved when confirmed.
+     * @param tab Tab to go to root.
+     * @return Promise resolved when confirmed.
      */
     confirmGoToRoot(tab: Tab): Promise<any> {
         if (!tab || !tab.isSelected || (tab.getActive() && tab.getActive().isFirst())) {
diff --git a/src/components/local-file/local-file.ts b/src/components/local-file/local-file.ts
index b5f3140ec..025ffe751 100644
--- a/src/components/local-file/local-file.ts
+++ b/src/components/local-file/local-file.ts
@@ -93,7 +93,7 @@ export class CoreLocalFileComponent implements OnInit {
     /**
      * File clicked.
      *
-     * @param {Event} e Click event.
+     * @param e Click event.
      */
     fileClicked(e: Event): void {
         if (this.editMode) {
@@ -113,7 +113,7 @@ export class CoreLocalFileComponent implements OnInit {
     /**
      * Activate the edit mode.
      *
-     * @param {Event} e Click event.
+     * @param e Click event.
      */
     activateEdit(e: Event): void {
         e.preventDefault();
@@ -125,8 +125,8 @@ export class CoreLocalFileComponent implements OnInit {
     /**
      * Rename the file.
      *
-     * @param {string} newName New name.
-     * @param {Event}  e       Click event.
+     * @param newName New name.
+     * @param e Click event.
      */
     changeName(newName: string, e: Event): void {
         e.preventDefault();
@@ -165,7 +165,7 @@ export class CoreLocalFileComponent implements OnInit {
     /**
      * Delete the file.
      *
-     * @param {Event} e Click event.
+     * @param e Click event.
      */
     deleteFile(e: Event): void {
         e.preventDefault();
diff --git a/src/components/navbar-buttons/navbar-buttons.ts b/src/components/navbar-buttons/navbar-buttons.ts
index c38931322..c3332006e 100644
--- a/src/components/navbar-buttons/navbar-buttons.ts
+++ b/src/components/navbar-buttons/navbar-buttons.ts
@@ -111,7 +111,7 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
     /**
      * Force or unforce hiding all buttons. If this is true, it will override the "hidden" input.
      *
-     * @param {boolean} value The value to set.
+     * @param value The value to set.
      */
     forceHide(value: boolean): void {
         this.forceHidden = value;
@@ -122,7 +122,7 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
     /**
      * If both button containers have a context menu, merge them into a single one.
      *
-     * @param {HTMLElement} buttonsContainer The container where the buttons will be moved.
+     * @param buttonsContainer The container where the buttons will be moved.
      */
     protected mergeContextMenus(buttonsContainer: HTMLElement): void {
         // Check if both button containers have a context menu.
@@ -155,8 +155,8 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
     /**
      * Search the ion-header where the buttons should be added.
      *
-     * @param {number} [retries] Number of retries so far.
-     * @return {Promise<HTMLElement>} Promise resolved with the header element.
+     * @param retries Number of retries so far.
+     * @return Promise resolved with the header element.
      */
     protected searchHeader(retries: number = 0): Promise<HTMLElement> {
         let parentPage: HTMLElement = this.element;
@@ -196,8 +196,8 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
     /**
      * Search ion-header inside a page. The header should be a direct child.
      *
-     * @param  {HTMLElement} page Page to search in.
-     * @return {HTMLElement} Header element. Undefined if not found.
+     * @param page Page to search in.
+     * @return Header element. Undefined if not found.
      */
     protected searchHeaderInPage(page: HTMLElement): HTMLElement {
         for (let i = 0; i < page.children.length; i++) {
@@ -232,7 +232,7 @@ export class CoreNavBarButtonsComponent implements OnInit, OnDestroy {
     /**
      * Show or hide an element.
      *
-     * @param {Node} element Element to show or hide.
+     * @param element Element to show or hide.
      */
     protected showHideElement(element: Node): void {
         // Check if it's an HTML Element
diff --git a/src/components/recaptcha/recaptchamodal.ts b/src/components/recaptcha/recaptchamodal.ts
index 3739a74b5..b84e98f70 100644
--- a/src/components/recaptcha/recaptchamodal.ts
+++ b/src/components/recaptcha/recaptchamodal.ts
@@ -44,7 +44,7 @@ export class CoreRecaptchaModalComponent {
     /**
      * The iframe with the recaptcha was loaded.
      *
-     * @param {HTMLIFrameElement} iframe Iframe element.
+     * @param iframe Iframe element.
      */
     loaded(iframe: HTMLIFrameElement): void {
         // Search the iframe content.
diff --git a/src/components/rich-text-editor/rich-text-editor.ts b/src/components/rich-text-editor/rich-text-editor.ts
index e9c8bc2b5..68c4651e0 100644
--- a/src/components/rich-text-editor/rich-text-editor.ts
+++ b/src/components/rich-text-editor/rich-text-editor.ts
@@ -153,7 +153,7 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
     /**
      * Resize editor to maximize the space occupied.
      *
-     * @return {Promise<number>} Resolved with calculated editor size.
+     * @return Resolved with calculated editor size.
      */
     protected maximizeEditorSize = (): Promise<number> => {
         this.content.resize();
@@ -210,8 +210,8 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
     /**
      * Get the height of the surrounding elements from the current to the top element.
      *
-     * @param  {any} element Directive DOM element to get surroundings elements from.
-     * @return {number}      Surrounding height in px.
+     * @param element Directive DOM element to get surroundings elements from.
+     * @return Surrounding height in px.
      */
     protected getSurroundingHeight(element: any): number {
         let height = 0;
@@ -246,7 +246,7 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
     /**
      * On change function to sync with form data.
      *
-     * @param {Event} $event The event.
+     * @param $event The event.
      */
     onChange($event: Event): void {
         if (this.rteEnabled) {
@@ -279,7 +279,7 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
      * On key down function to move the cursor.
      * https://stackoverflow.com/questions/6249095/how-to-set-caretcursor-position-in-contenteditable-element-div
      *
-     * @param {Event} $event The event.
+     * @param $event The event.
      */
     moveCursor($event: Event): void {
         if (!this.rteEnabled) {
@@ -302,8 +302,8 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
     /**
      * Returns the number of chars from the beggining where is placed the cursor.
      *
-     * @param  {Node}   parent Parent where to get the position from.
-     * @return {number}        Position in chars.
+     * @param parent Parent where to get the position from.
+     * @return Position in chars.
      */
     protected getCurrentCursorPosition(parent: Node): number {
         const selection = window.getSelection();
@@ -340,18 +340,18 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
     /**
      * Set the caret position on the character number.
      *
-     * @param {Node}   parent   Parent where to set the position.
-     * @param {number} [chars]  Number of chars where to place the caret. If not defined it will go to the end.
+     * @param parent Parent where to set the position.
+     * @param chars Number of chars where to place the caret. If not defined it will go to the end.
      */
     protected setCurrentCursorPosition(parent: Node, chars?: number): void {
         /**
          * Loops round all the child text nodes within the supplied node and sets a range from the start of the initial node to
          * the characters.
          *
-         * @param  {Node}  node  Node where to start.
-         * @param  {Range} range Previous calculated range.
-         * @param  {any}   chars Object with counting of characters (input-output param).
-         * @return {Range}       Selection range.
+         * @param node Node where to start.
+         * @param range Previous calculated range.
+         * @param chars Object with counting of characters (input-output param).
+         * @return Selection range.
          */
         const setRange = (node: Node, range: Range, chars: any): Range => {
             if (chars.count === 0) {
@@ -404,7 +404,7 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
     /**
      * Toggle from rte editor to textarea syncing values.
      *
-     * @param {Event} $event The event.
+     * @param $event The event.
      */
     toggleEditor($event: Event): void {
         $event.preventDefault();
@@ -481,7 +481,7 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
 
     /**
      * Check if text is empty.
-     * @param {string} value text
+     * @param value text
      */
     protected isNullOrWhiteSpace(value: string): boolean {
         if (value == null || typeof value == 'undefined') {
@@ -497,7 +497,7 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
     /**
      * Set the content of the textarea and the editor element.
      *
-     * @param {string} value New content.
+     * @param value New content.
      */
     protected setContent(value: string): void {
         if (this.isNullOrWhiteSpace(value)) {
@@ -530,8 +530,8 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
      * Execute an action over the selected text.
      *  API docs: https://developer.mozilla.org/en-US/docs/Web/API/Document/execCommand
      *
-     * @param {any} $event Event data
-     * @param {string} command Command to execute.
+     * @param $event Event data
+     * @param command Command to execute.
      */
     buttonAction($event: any, command: string): void {
         this.stopBubble($event);
@@ -568,7 +568,7 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
     /**
      * Stop event default and propagation.
      *
-     * @param {Event} event Event.
+     * @param event Event.
      */
     stopBubble(event: Event): void {
         event.preventDefault();
diff --git a/src/components/search-box/search-box.ts b/src/components/search-box/search-box.ts
index e978908d1..36a42cb0d 100644
--- a/src/components/search-box/search-box.ts
+++ b/src/components/search-box/search-box.ts
@@ -62,7 +62,7 @@ export class CoreSearchBoxComponent implements OnInit {
     /**
      * Form submitted.
      *
-     * @param {Event} e Event.
+     * @param e Event.
      */
     submitForm(e: Event): void {
         e.preventDefault();
diff --git a/src/components/send-message-form/send-message-form.ts b/src/components/send-message-form/send-message-form.ts
index ae7a25ff9..48a7a87c6 100644
--- a/src/components/send-message-form/send-message-form.ts
+++ b/src/components/send-message-form/send-message-form.ts
@@ -66,7 +66,7 @@ export class CoreSendMessageFormComponent implements OnInit {
     /**
      * Form submitted.
      *
-     * @param {Event} $event Mouse event.
+     * @param $event Mouse event.
      */
     submitForm($event: Event): void {
         $event.preventDefault();
@@ -95,8 +95,8 @@ export class CoreSendMessageFormComponent implements OnInit {
     /**
      * Enter key clicked.
      *
-     * @param {Event} e Event.
-     * @param {string} other The name of the other key that was clicked, undefined if no other key.
+     * @param e Event.
+     * @param other The name of the other key that was clicked, undefined if no other key.
      */
     enterClicked(e: Event, other: string): void {
         if (this.sendOnEnter && !other) {
diff --git a/src/components/show-password/show-password.ts b/src/components/show-password/show-password.ts
index 68abdbf70..61dea32ef 100644
--- a/src/components/show-password/show-password.ts
+++ b/src/components/show-password/show-password.ts
@@ -103,7 +103,7 @@ export class CoreShowPasswordComponent implements OnInit, AfterViewInit {
     /**
      * Toggle show/hide password.
      *
-     * @param {Event} event The mouse event.
+     * @param event The mouse event.
      */
     toggle(event: Event): void {
         event.preventDefault();
diff --git a/src/components/split-view/split-view.ts b/src/components/split-view/split-view.ts
index ca807f10d..4a63bfe72 100644
--- a/src/components/split-view/split-view.ts
+++ b/src/components/split-view/split-view.ts
@@ -30,8 +30,8 @@ import { Subscription } from 'rxjs';
  *
  * Accepts the following params:
  *
- * @param {string|boolean} [when] When the split-pane should be shown. Can be a CSS media query expression, or a shortcut
- * expression. Can also be a boolean expression. Check split-pane component documentation for more information.
+ * @param when When the split-pane should be shown. Can be a CSS media query expression, or a shortcut
+ *             expression. Can also be a boolean expression. Check split-pane component documentation for more information.
  *
  * Example:
  *
@@ -98,7 +98,7 @@ export class CoreSplitViewComponent implements OnInit, OnDestroy {
     /**
      * Get the details NavController. If split view is not enabled, it will return the master nav.
      *
-     * @return {NavController} Details NavController.
+     * @return Details NavController.
      */
     getDetailsNav(): NavController {
         if (this.isEnabled) {
@@ -111,7 +111,7 @@ export class CoreSplitViewComponent implements OnInit, OnDestroy {
     /**
      * Get the master NavController.
      *
-     * @return {NavController} Master NavController.
+     * @return Master NavController.
      */
     getMasterNav(): NavController {
         return this.masterNav;
@@ -172,7 +172,7 @@ export class CoreSplitViewComponent implements OnInit, OnDestroy {
     /**
      * Check if both panels are shown. It depends on screen width.
      *
-     * @return {boolean} If split view is enabled.
+     * @return If split view is enabled.
      */
     isOn(): boolean {
         return !!this.isEnabled;
@@ -181,9 +181,9 @@ export class CoreSplitViewComponent implements OnInit, OnDestroy {
     /**
      * Push a page to the navigation stack. It will decide where to load it depending on the size of the screen.
      *
-     * @param {any} page   The component class or deeplink name you want to push onto the navigation stack.
-     * @param {any} params Any NavParams you want to pass along to the next view.
-     * @param {boolean} [retrying] Whether it's retrying.
+     * @param page The component class or deeplink name you want to push onto the navigation stack.
+     * @param params Any NavParams you want to pass along to the next view.
+     * @param retrying Whether it's retrying.
      */
     push(page: any, params?: any, retrying?: boolean): void {
         // Check there's no ongoing push.
@@ -224,7 +224,7 @@ export class CoreSplitViewComponent implements OnInit, OnDestroy {
     /**
      * Splitpanel visibility has changed.
      *
-     * @param {Boolean} isOn If it fits both panels at the same time.
+     * @param isOn If it fits both panels at the same time.
      */
     onSplitPaneChanged(isOn: boolean): void {
         if (this.ignoreSplitChanged) {
diff --git a/src/components/style/style.ts b/src/components/style/style.ts
index b0790ca96..344327cd0 100644
--- a/src/components/style/style.ts
+++ b/src/components/style/style.ts
@@ -50,9 +50,9 @@ export class CoreStyleComponent implements OnChanges {
     /**
      * Add a prefix to all rules in a CSS string.
      *
-     * @param {string} css CSS code to be prefixed.
-     * @param {string} prefix Prefix css selector.
-     * @return {string} Prefixed CSS.
+     * @param css CSS code to be prefixed.
+     * @param prefix Prefix css selector.
+     * @return Prefixed CSS.
      */
     protected prefixCSS(css: string, prefix: string): string {
         if (!css) {
diff --git a/src/components/tabs/tab.ts b/src/components/tabs/tab.ts
index fc4aaf2fc..763376374 100644
--- a/src/components/tabs/tab.ts
+++ b/src/components/tabs/tab.ts
@@ -148,7 +148,7 @@ export class CoreTabComponent implements OnInit, OnDestroy {
      * Get all child core-navbar-buttons. We need to use querySelectorAll because ContentChildren doesn't work with ng-template.
      * https://github.com/angular/angular/issues/14842
      *
-     * @return {CoreNavBarButtonsComponent[]} List of component instances.
+     * @return List of component instances.
      */
     protected getChildrenNavBarButtons(): CoreNavBarButtonsComponent[] {
         const elements = this.element.querySelectorAll('core-navbar-buttons'),
@@ -167,7 +167,7 @@ export class CoreTabComponent implements OnInit, OnDestroy {
     /**
      * Show all hide all children navbar buttons.
      *
-     * @param {boolean} show Whether to show or hide the buttons.
+     * @param show Whether to show or hide the buttons.
      */
     protected showHideNavBarButtons(show: boolean): void {
         const instances = this.getChildrenNavBarButtons();
diff --git a/src/components/tabs/tabs.ts b/src/components/tabs/tabs.ts
index ba7b9fdb1..e60ea9b10 100644
--- a/src/components/tabs/tabs.ts
+++ b/src/components/tabs/tabs.ts
@@ -194,7 +194,7 @@ export class CoreTabsComponent implements OnInit, AfterViewInit, OnChanges, OnDe
     /**
      * Add a new tab if it isn't already in the list of tabs.
      *
-     * @param {CoreTabComponent} tab The tab to add.
+     * @param tab The tab to add.
      */
     addTab(tab: CoreTabComponent): void {
         // Check if tab is already in the list.
@@ -248,8 +248,8 @@ export class CoreTabsComponent implements OnInit, AfterViewInit, OnChanges, OnDe
     /**
      * Get the index of tab.
      *
-     * @param  {any}    tab Tab object to check.
-     * @return {number}     Index number on the tabs array or -1 if not found.
+     * @param tab Tab object to check.
+     * @return Index number on the tabs array or -1 if not found.
      */
     getIndex(tab: any): number {
         for (let i = 0; i < this.tabs.length; i++) {
@@ -265,7 +265,7 @@ export class CoreTabsComponent implements OnInit, AfterViewInit, OnChanges, OnDe
     /**
      * Get the current selected tab.
      *
-     * @return {CoreTabComponent} Selected tab.
+     * @return Selected tab.
      */
     getSelected(): CoreTabComponent {
         return this.tabs[this.selected];
@@ -415,7 +415,7 @@ export class CoreTabsComponent implements OnInit, AfterViewInit, OnChanges, OnDe
     /**
      * Show or hide the tabs. This is used when the user is scrolling inside a tab.
      *
-     * @param {any} scrollElement Scroll element to check scroll position.
+     * @param scrollElement Scroll element to check scroll position.
      */
     showHideTabs(scrollElement: any): void {
         if (!this.tabBarHeight) {
@@ -460,7 +460,7 @@ export class CoreTabsComponent implements OnInit, AfterViewInit, OnChanges, OnDe
     /**
      * Remove a tab from the list of tabs.
      *
-     * @param {CoreTabComponent} tab The tab to remove.
+     * @param tab The tab to remove.
      */
     removeTab(tab: CoreTabComponent): void {
         const index = this.getIndex(tab);
@@ -472,7 +472,7 @@ export class CoreTabsComponent implements OnInit, AfterViewInit, OnChanges, OnDe
     /**
      * Select a certain tab.
      *
-     * @param {number} index The index of the tab to select.
+     * @param index The index of the tab to select.
      */
     selectTab(index: number): void {
         if (index == this.selected) {
diff --git a/src/core/block/classes/base-block-component.ts b/src/core/block/classes/base-block-component.ts
index 46dc2c33b..e3c7e75f6 100644
--- a/src/core/block/classes/base-block-component.ts
+++ b/src/core/block/classes/base-block-component.ts
@@ -49,10 +49,10 @@ export class CoreBlockBaseComponent implements OnInit {
     /**
      * Refresh the data.
      *
-     * @param {any}       [refresher] Refresher.
-     * @param {Function}  [done] Function to call when done.
-     * @param {boolean}   [showErrors=false] If show errors to the user of hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @param done Function to call when done.
+     * @param showErrors If show errors to the user of hide them.
+     * @return Promise resolved when done.
      */
     doRefresh(refresher?: any, done?: () => void, showErrors: boolean = false): Promise<any> {
         if (this.loaded) {
@@ -68,8 +68,8 @@ export class CoreBlockBaseComponent implements OnInit {
     /**
      * Perform the refresh content function.
      *
-     * @param  {boolean}      [showErrors=false] Wether to show errors to the user or hide them.
-     * @return {Promise<any>} Resolved when done.
+     * @param showErrors Wether to show errors to the user or hide them.
+     * @return Resolved when done.
      */
     protected refreshContent(showErrors: boolean = false): Promise<any> {
         // Wrap the call in a try/catch so the workflow isn't interrupted if an error occurs.
@@ -94,7 +94,7 @@ export class CoreBlockBaseComponent implements OnInit {
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         return Promise.resolve();
@@ -103,9 +103,9 @@ export class CoreBlockBaseComponent implements OnInit {
     /**
      * Loads the component contents and shows the corresponding error.
      *
-     * @param {boolean}       [refresh=false] Whether we're refreshing data.
-     * @param  {boolean}      [showErrors=false] Wether to show errors to the user or hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Whether we're refreshing data.
+     * @param showErrors Wether to show errors to the user or hide them.
+     * @return Promise resolved when done.
      */
     protected loadContent(refresh?: boolean, showErrors: boolean = false): Promise<any> {
         // Wrap the call in a try/catch so the workflow isn't interrupted if an error occurs.
@@ -131,8 +131,8 @@ export class CoreBlockBaseComponent implements OnInit {
     /**
      * Download the component contents.
      *
-     * @param {boolean} [refresh] Whether we're refreshing data.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Whether we're refreshing data.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh?: boolean): Promise<any> {
         return Promise.resolve();
diff --git a/src/core/block/classes/base-block-handler.ts b/src/core/block/classes/base-block-handler.ts
index 695d8182e..8e5447d79 100644
--- a/src/core/block/classes/base-block-handler.ts
+++ b/src/core/block/classes/base-block-handler.ts
@@ -32,7 +32,7 @@ export class CoreBlockBaseHandler implements CoreBlockHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -41,11 +41,11 @@ export class CoreBlockBaseHandler implements CoreBlockHandler {
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/core/block/components/block/block.ts b/src/core/block/components/block/block.ts
index eebf4fd4d..3632c972f 100644
--- a/src/core/block/components/block/block.ts
+++ b/src/core/block/components/block/block.ts
@@ -128,10 +128,10 @@ export class CoreBlockComponent implements OnInit, OnDestroy, DoCheck {
     /**
      * Refresh the data.
      *
-     * @param {any} [refresher] Refresher. Please pass this only if the refresher should finish when this function finishes.
-     * @param {Function} [done] Function to call when done.
-     * @param {boolean} [showErrors=false] If show errors to the user of hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher. Please pass this only if the refresher should finish when this function finishes.
+     * @param done Function to call when done.
+     * @param showErrors If show errors to the user of hide them.
+     * @return Promise resolved when done.
      */
     doRefresh(refresher?: any, done?: () => void, showErrors: boolean = false): Promise<any> {
         if (this.dynamicComponent) {
@@ -144,7 +144,7 @@ export class CoreBlockComponent implements OnInit, OnDestroy, DoCheck {
     /**
      * Invalidate some data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     invalidate(): Promise<any> {
         if (this.dynamicComponent) {
diff --git a/src/core/block/components/course-blocks/course-blocks.ts b/src/core/block/components/course-blocks/course-blocks.ts
index c1b849c56..e973eac72 100644
--- a/src/core/block/components/course-blocks/course-blocks.ts
+++ b/src/core/block/components/course-blocks/course-blocks.ts
@@ -57,7 +57,7 @@ export class CoreBlockCourseBlocksComponent implements OnInit {
     /**
      * Invalidate blocks data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     invalidateBlocks(): Promise<any> {
         const promises = [];
@@ -79,7 +79,7 @@ export class CoreBlockCourseBlocksComponent implements OnInit {
     /**
      * Convenience function to fetch the data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     loadContent(): Promise<any> {
         return this.blockHelper.getCourseBlocks(this.courseId).then((blocks) => {
diff --git a/src/core/block/providers/delegate.ts b/src/core/block/providers/delegate.ts
index 7f0f245f3..2f9d96fdc 100644
--- a/src/core/block/providers/delegate.ts
+++ b/src/core/block/providers/delegate.ts
@@ -28,18 +28,17 @@ import { Subject } from 'rxjs';
 export interface CoreBlockHandler extends CoreDelegateHandler {
     /**
      * Name of the block the handler supports. E.g. 'activity_modules'.
-     * @type {string}
      */
     blockName: string;
 
     /**
      * Returns the data needed to render the block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData?(injector: Injector, block: any, contextLevel: string, instanceId: number)
             : CoreBlockHandlerData | Promise<CoreBlockHandlerData>;
@@ -51,38 +50,32 @@ export interface CoreBlockHandler extends CoreDelegateHandler {
 export interface CoreBlockHandlerData {
     /**
      * Title to display for the block.
-     * @type {string}
      */
     title: string;
 
     /**
      * Class to add to the displayed block.
-     * @type {string}
      */
     class?: string;
 
     /**
      * The component to render the contents of the block.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
-     * @type {any}
      */
     component: any;
 
     /**
      * Data to pass to the component. All the properties in this object will be passed to the component as inputs.
-     * @type {any}
      */
     componentData?: any;
 
     /**
      * Link to go when showing only title.
-     * @type {string}
      */
     link?: string;
 
     /**
      * Params of the link.
-     * @type {[type]}
      */
     linkParams?: any;
 }
@@ -108,8 +101,8 @@ export class CoreBlockDelegate extends CoreDelegate {
     /**
      * Check if blocks are disabled in a certain site.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether it's disabled.
+     * @param site Site. If not defined, use current site.
+     * @return Whether it's disabled.
      */
     areBlocksDisabledInSite(site?: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
@@ -120,8 +113,8 @@ export class CoreBlockDelegate extends CoreDelegate {
     /**
      * Check if blocks are disabled in a certain site for courses.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether it's disabled.
+     * @param site Site. If not defined, use current site.
+     * @return Whether it's disabled.
      */
     areBlocksDisabledInCourses(site?: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
@@ -132,8 +125,8 @@ export class CoreBlockDelegate extends CoreDelegate {
     /**
      * Check if blocks are disabled in a certain site.
      *
-     * @param  {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>}     Promise resolved with true if disabled, rejected or resolved with false otherwise.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if disabled, rejected or resolved with false otherwise.
      */
     areBlocksDisabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -144,11 +137,11 @@ export class CoreBlockDelegate extends CoreDelegate {
     /**
      * Get the display data for a certain block.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} block The block to render.
-     * @param {string} contextLevel The context where the block will be used.
-     * @param {number} instanceId The instance ID associated with the context level.
-     * @return {Promise<CoreBlockHandlerData>} Promise resolved with the display data.
+     * @param injector Injector.
+     * @param block The block to render.
+     * @param contextLevel The context where the block will be used.
+     * @param instanceId The instance ID associated with the context level.
+     * @return Promise resolved with the display data.
      */
     getBlockDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number): Promise<CoreBlockHandlerData> {
         return Promise.resolve(this.executeFunctionOnEnabled(block.name, 'getDisplayData',
@@ -158,8 +151,8 @@ export class CoreBlockDelegate extends CoreDelegate {
     /**
      * Check if any of the blocks in a list is supported.
      *
-     * @param {any[]} blocks The list of blocks.
-     * @return {boolean} Whether any of the blocks is supported.
+     * @param blocks The list of blocks.
+     * @return Whether any of the blocks is supported.
      */
     hasSupportedBlock(blocks: any[]): boolean {
         blocks = blocks || [];
@@ -170,8 +163,8 @@ export class CoreBlockDelegate extends CoreDelegate {
     /**
      * Check if a block is supported.
      *
-     * @param {string} name Block "name". E.g. 'activity_modules'.
-     * @return {boolean} Whether it's supported.
+     * @param name Block "name". E.g. 'activity_modules'.
+     * @return Whether it's supported.
      */
     isBlockSupported(name: string): boolean {
         return this.hasHandler(name, true);
@@ -180,9 +173,9 @@ export class CoreBlockDelegate extends CoreDelegate {
     /**
      * Check if feature is enabled or disabled in the site, depending on the feature prefix and the handler name.
      *
-     * @param  {CoreDelegateHandler} handler Handler to check.
-     * @param  {CoreSite} site Site to check.
-     * @return {boolean} Whether is enabled or disabled in site.
+     * @param handler Handler to check.
+     * @param site Site to check.
+     * @return Whether is enabled or disabled in site.
      */
     protected isFeatureDisabled(handler: CoreDelegateHandler, site: CoreSite): boolean {
         return this.areBlocksDisabledInSite(site) || super.isFeatureDisabled(handler, site);
diff --git a/src/core/block/providers/helper.ts b/src/core/block/providers/helper.ts
index 14473f757..9272bca16 100644
--- a/src/core/block/providers/helper.ts
+++ b/src/core/block/providers/helper.ts
@@ -27,7 +27,7 @@ export class CoreBlockHelperProvider {
     /**
      * Return if it get course blocks options is enabled for the current site.
      *
-     * @return {boolean} true if enabled, false otherwise.
+     * @return true if enabled, false otherwise.
      */
     canGetCourseBlocks(): boolean {
         return this.courseProvider.canGetCourseBlocks() && !this.blockDelegate.areBlocksDisabledInCourses();
@@ -36,8 +36,8 @@ export class CoreBlockHelperProvider {
     /**
      * Returns the list of blocks for the selected course.
      *
-     * @param  {number}       courseId Course ID.
-     * @return {Promise<any>}          List of supported blocks.
+     * @param courseId Course ID.
+     * @return List of supported blocks.
      */
     getCourseBlocks(courseId: number): Promise<any> {
         const canGetBlocks = this.canGetCourseBlocks();
diff --git a/src/core/comments/components/comments/comments.ts b/src/core/comments/components/comments/comments.ts
index 6bbe34fc4..d37e325c8 100644
--- a/src/core/comments/components/comments/comments.ts
+++ b/src/core/comments/components/comments/comments.ts
@@ -117,7 +117,7 @@ export class CoreCommentsCommentsComponent implements OnChanges, OnDestroy {
     /**
      * Refresh comments.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     doRefresh(): Promise<any> {
         return this.invalidateComments().then(() => {
@@ -128,7 +128,7 @@ export class CoreCommentsCommentsComponent implements OnChanges, OnDestroy {
     /**
      * Invalidate comments data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     invalidateComments(): Promise<any> {
         return this.commentsProvider.invalidateCommentsData(this.contextLevel, this.instanceId, this.component, this.itemId,
@@ -170,9 +170,9 @@ export class CoreCommentsCommentsComponent implements OnChanges, OnDestroy {
     /**
      * Check if a certain value in data is undefined or equal to this instance value.
      *
-     * @param {any} data Data object.
-     * @param {string} name Name of the property to check.
-     * @return {boolean} Whether it's undefined or equal.
+     * @param data Data object.
+     * @param name Name of the property to check.
+     * @return Whether it's undefined or equal.
      */
     protected undefinedOrEqual(data: any, name: string): boolean {
         return typeof data[name] == 'undefined' || data[name] == this[name];
diff --git a/src/core/comments/pages/add/add.ts b/src/core/comments/pages/add/add.ts
index 66510fb79..bfabd4535 100644
--- a/src/core/comments/pages/add/add.ts
+++ b/src/core/comments/pages/add/add.ts
@@ -49,7 +49,7 @@ export class CoreCommentsAddPage {
     /**
      * Send the comment or store it offline.
      *
-     * @param {Event} e Event.
+     * @param e Event.
      */
     addComment(e: Event): void {
         e.preventDefault();
diff --git a/src/core/comments/pages/viewer/viewer.ts b/src/core/comments/pages/viewer/viewer.ts
index e84d27e0c..b1925c26d 100644
--- a/src/core/comments/pages/viewer/viewer.ts
+++ b/src/core/comments/pages/viewer/viewer.ts
@@ -113,9 +113,9 @@ export class CoreCommentsViewerPage implements OnDestroy {
     /**
      * Fetches the comments.
      *
-     * @param  {boolean} sync         When to resync comments.
-     * @param  {boolean} [showErrors] When to display errors or not.
-     * @return {Promise<any>} Resolved when done.
+     * @param sync When to resync comments.
+     * @param showErrors When to display errors or not.
+     * @return Resolved when done.
      */
     protected fetchComments(sync: boolean, showErrors?: boolean): Promise<any> {
         this.loadMoreError = false;
@@ -204,8 +204,8 @@ export class CoreCommentsViewerPage implements OnDestroy {
     /**
      * Function to load more commemts.
      *
-     * @param {any} [infiniteComplete] Infinite scroll complete function. Only used from core-infinite-loading.
-     * @return {Promise<any>} Resolved when done.
+     * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
+     * @return Resolved when done.
      */
     loadMore(infiniteComplete?: any): Promise<any> {
         this.page++;
@@ -219,9 +219,9 @@ export class CoreCommentsViewerPage implements OnDestroy {
     /**
      * Refresh the comments.
      *
-     * @param {boolean} showErrors Whether to display errors or not.
-     * @param {any} [refresher] Refresher.
-     * @return {Promise<any>} Resolved when done.
+     * @param showErrors Whether to display errors or not.
+     * @param refresher Refresher.
+     * @return Resolved when done.
      */
     refreshComments(showErrors: boolean, refresher?: any): Promise<any> {
         this.refreshIcon = 'spinner';
@@ -241,7 +241,7 @@ export class CoreCommentsViewerPage implements OnDestroy {
     /**
      * Show sync warnings if any.
      *
-     * @param {string[]} warnings the warnings
+     * @param warnings the warnings
      */
     private showSyncWarnings(warnings: string[]): void {
         const message = this.textUtils.buildMessage(warnings);
@@ -253,8 +253,8 @@ export class CoreCommentsViewerPage implements OnDestroy {
     /**
      * Tries to synchronize comments.
      *
-     * @param  {boolean} showErrors Whether to display errors or not.
-     * @return {Promise<any>}       Promise resolved if sync is successful, rejected otherwise.
+     * @param showErrors Whether to display errors or not.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     private syncComments(showErrors: boolean): Promise<any> {
         return this.commentsSync.syncComments(this.contextLevel, this.instanceId, this.componentName, this.itemId,
@@ -272,7 +272,7 @@ export class CoreCommentsViewerPage implements OnDestroy {
     /**
      * Add a new comment to the list.
      *
-     * @param {Event} e Event.
+     * @param e Event.
      */
     addComment(e: Event): void {
         e.preventDefault();
@@ -302,8 +302,8 @@ export class CoreCommentsViewerPage implements OnDestroy {
     /**
      * Delete a comment.
      *
-     * @param {Event} e     Click event.
-     * @param {any} comment Comment to delete.
+     * @param e Click event.
+     * @param comment Comment to delete.
      */
     deleteComment(e: Event, comment: any): void {
         e.preventDefault();
@@ -336,8 +336,8 @@ export class CoreCommentsViewerPage implements OnDestroy {
     /**
      * Restore a comment.
      *
-     * @param {Event} e Click event.
-     * @param {any} comment Comment to delete.
+     * @param e Click event.
+     * @param comment Comment to delete.
      */
     undoDeleteComment(e: Event, comment: any): void {
         e.preventDefault();
diff --git a/src/core/comments/providers/comments.ts b/src/core/comments/providers/comments.ts
index 16d7c8f95..24475b69a 100644
--- a/src/core/comments/providers/comments.ts
+++ b/src/core/comments/providers/comments.ts
@@ -37,14 +37,14 @@ export class CoreCommentsProvider {
     /**
      * Add a comment.
      *
-     * @param  {string} content      Comment text.
-     * @param  {string} contextLevel Contextlevel system, course, user...
-     * @param  {number} instanceId   The Instance id of item associated with the context level.
-     * @param  {string} component    Component name.
-     * @param  {number} itemId       Associated id.
-     * @param  {string} [area='']    String comment area. Default empty.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<boolean>}    Promise resolved with boolean: true if comment was sent to server, false if stored in device.
+     * @param content Comment text.
+     * @param contextLevel Contextlevel system, course, user...
+     * @param instanceId The Instance id of item associated with the context level.
+     * @param component Component name.
+     * @param itemId Associated id.
+     * @param area String comment area. Default empty.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: true if comment was sent to server, false if stored in device.
      */
     addComment(content: string, contextLevel: string, instanceId: number, component: string, itemId: number, area: string = '',
             siteId?: string): Promise<boolean> {
@@ -79,14 +79,14 @@ export class CoreCommentsProvider {
     /**
      * Add a comment. It will fail if offline or cannot connect.
      *
-     * @param  {string} content      Comment text.
-     * @param  {string} contextLevel Contextlevel system, course, user...
-     * @param  {number} instanceId   The Instance id of item associated with the context level.
-     * @param  {string} component    Component name.
-     * @param  {number} itemId       Associated id.
-     * @param  {string} [area='']    String comment area. Default empty.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved when added, rejected otherwise.
+     * @param content Comment text.
+     * @param contextLevel Contextlevel system, course, user...
+     * @param instanceId The Instance id of item associated with the context level.
+     * @param component Component name.
+     * @param itemId Associated id.
+     * @param area String comment area. Default empty.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when added, rejected otherwise.
      */
     addCommentOnline(content: string, contextLevel: string, instanceId: number, component: string, itemId: number,
             area: string = '', siteId?: string): Promise<any> {
@@ -114,10 +114,10 @@ export class CoreCommentsProvider {
     /**
      * Add several comments. It will fail if offline or cannot connect.
      *
-     * @param  {any[]}  comments Comments to save.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when added, rejected otherwise. Promise resolved doesn't mean that comments
-     *                           have been added, the resolve param can contain errors for comments not sent.
+     * @param comments Comments to save.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when added, rejected otherwise. Promise resolved doesn't mean that comments
+     *         have been added, the resolve param can contain errors for comments not sent.
      */
     addCommentsOnline(comments: any[], siteId?: string): Promise<any> {
         if (!comments || !comments.length) {
@@ -136,8 +136,8 @@ export class CoreCommentsProvider {
     /**
      * Check if Calendar is disabled in a certain site.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether it's disabled.
+     * @param site Site. If not defined, use current site.
+     * @return Whether it's disabled.
      */
     areCommentsDisabledInSite(site?: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
@@ -148,8 +148,8 @@ export class CoreCommentsProvider {
     /**
      * Check if comments are disabled in a certain site.
      *
-     * @param  {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>} Promise resolved with true if disabled, rejected or resolved with false otherwise.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if disabled, rejected or resolved with false otherwise.
      */
     areCommentsDisabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -160,10 +160,10 @@ export class CoreCommentsProvider {
     /**
      * Delete a comment.
      *
-     * @param  {any} comment         Comment object to delete.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<void>}       Promise resolved when deleted, rejected otherwise. Promise resolved doesn't mean that comments
-     *                               have been deleted, the resolve param can contain errors for comments not deleted.
+     * @param comment Comment object to delete.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when deleted, rejected otherwise. Promise resolved doesn't mean that comments
+     *         have been deleted, the resolve param can contain errors for comments not deleted.
      */
     deleteComment(comment: any, siteId?: string): Promise<void> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -204,15 +204,15 @@ export class CoreCommentsProvider {
     /**
      * Delete a comment. It will fail if offline or cannot connect.
      *
-     * @param  {number[]} commentIds Comment IDs to delete.
-     * @param  {string} contextLevel Contextlevel system, course, user...
-     * @param  {number} instanceId   The Instance id of item associated with the context level.
-     * @param  {string} component    Component name.
-     * @param  {number} itemId       Associated id.
-     * @param  {string} [area='']    String comment area. Default empty.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<void>}       Promise resolved when deleted, rejected otherwise. Promise resolved doesn't mean that comments
-     *                               have been deleted, the resolve param can contain errors for comments not deleted.
+     * @param commentIds Comment IDs to delete.
+     * @param contextLevel Contextlevel system, course, user...
+     * @param instanceId The Instance id of item associated with the context level.
+     * @param component Component name.
+     * @param itemId Associated id.
+     * @param area String comment area. Default empty.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when deleted, rejected otherwise. Promise resolved doesn't mean that comments
+     *         have been deleted, the resolve param can contain errors for comments not deleted.
      */
     deleteCommentsOnline(commentIds: number[], contextLevel: string, instanceId: number, component: string, itemId: number,
             area: string = '', siteId?: string): Promise<void> {
@@ -233,8 +233,8 @@ export class CoreCommentsProvider {
     /**
      * Returns whether WS to add/delete comments are available in site.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if available, resolved with false or rejected otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if available, resolved with false or rejected otherwise.
      * @since 3.8
      */
     isAddCommentsAvailable(siteId?: string): Promise<boolean> {
@@ -251,12 +251,12 @@ export class CoreCommentsProvider {
     /**
      * Get cache key for get comments data WS calls.
      *
-     * @param  {string} contextLevel Contextlevel system, course, user...
-     * @param  {number} instanceId   The Instance id of item associated with the context level.
-     * @param  {string} component    Component name.
-     * @param  {number} itemId       Associated id.
-     * @param  {string} [area='']    String comment area. Default empty.
-     * @return {string} Cache key.
+     * @param contextLevel Contextlevel system, course, user...
+     * @param instanceId The Instance id of item associated with the context level.
+     * @param component Component name.
+     * @param itemId Associated id.
+     * @param area String comment area. Default empty.
+     * @return Cache key.
      */
     protected getCommentsCacheKey(contextLevel: string, instanceId: number, component: string, itemId: number,
             area: string = ''): string {
@@ -266,9 +266,9 @@ export class CoreCommentsProvider {
     /**
      * Get cache key for get comments instance data WS calls.
      *
-     * @param  {string} contextLevel Contextlevel system, course, user...
-     * @param  {number} instanceId   The Instance id of item associated with the context level.
-     * @return {string} Cache key.
+     * @param contextLevel Contextlevel system, course, user...
+     * @param instanceId The Instance id of item associated with the context level.
+     * @return Cache key.
      */
     protected getCommentsPrefixCacheKey(contextLevel: string, instanceId: number): string {
         return this.ROOT_CACHE_KEY + 'comments:' + contextLevel + ':' + instanceId;
@@ -277,14 +277,14 @@ export class CoreCommentsProvider {
     /**
      * Retrieve a list of comments.
      *
-     * @param  {string} contextLevel Contextlevel system, course, user...
-     * @param  {number} instanceId   The Instance id of item associated with the context level.
-     * @param  {string} component    Component name.
-     * @param  {number} itemId       Associated id.
-     * @param  {string} [area='']    String comment area. Default empty.
-     * @param  {number} [page=0]     Page number (0 based). Default 0.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the comments.
+     * @param contextLevel Contextlevel system, course, user...
+     * @param instanceId The Instance id of item associated with the context level.
+     * @param component Component name.
+     * @param itemId Associated id.
+     * @param area String comment area. Default empty.
+     * @param page Page number (0 based). Default 0.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the comments.
      */
     getComments(contextLevel: string, instanceId: number, component: string, itemId: number, area: string = '', page: number = 0,
             siteId?: string): Promise<any> {
@@ -316,13 +316,13 @@ export class CoreCommentsProvider {
     /**
      * Get comments count number to show on the comments component.
      *
-     * @param  {string} contextLevel Contextlevel system, course, user...
-     * @param  {number} instanceId   The Instance id of item associated with the context level.
-     * @param  {string} component    Component name.
-     * @param  {number} itemId       Associated id.
-     * @param  {string} [area='']    String comment area. Default empty.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<string>}     Comments count with plus sign if needed.
+     * @param contextLevel Contextlevel system, course, user...
+     * @param instanceId The Instance id of item associated with the context level.
+     * @param component Component name.
+     * @param itemId Associated id.
+     * @param area String comment area. Default empty.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Comments count with plus sign if needed.
      */
     getCommentsCount(contextLevel: string, instanceId: number, component: string, itemId: number, area: string = '',
             siteId?: string): Promise<string> {
@@ -371,13 +371,13 @@ export class CoreCommentsProvider {
     /**
      * Invalidates comments data.
      *
-     * @param  {string} contextLevel Contextlevel system, course, user...
-     * @param  {number} instanceId   The Instance id of item associated with the context level.
-     * @param  {string} component    Component name.
-     * @param  {number} itemId       Associated id.
-     * @param  {string} [area='']    String comment area. Default empty.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param contextLevel Contextlevel system, course, user...
+     * @param instanceId The Instance id of item associated with the context level.
+     * @param component Component name.
+     * @param itemId Associated id.
+     * @param area String comment area. Default empty.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCommentsData(contextLevel: string, instanceId: number, component: string, itemId: number,
             area: string = '', siteId?: string): Promise<any> {
@@ -396,10 +396,10 @@ export class CoreCommentsProvider {
     /**
      * Invalidates all comments data for an instance.
      *
-     * @param  {string} contextLevel Contextlevel system, course, user...
-     * @param  {number} instanceId   The Instance id of item associated with the context level.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param contextLevel Contextlevel system, course, user...
+     * @param instanceId The Instance id of item associated with the context level.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCommentsByInstance(contextLevel: string, instanceId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/core/comments/providers/offline.ts b/src/core/comments/providers/offline.ts
index 94caf9fb3..3979c9cb7 100644
--- a/src/core/comments/providers/offline.ts
+++ b/src/core/comments/providers/offline.ts
@@ -107,8 +107,8 @@ export class CoreCommentsOfflineProvider {
     /**
      * Get all offline comments.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved with comments.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with comments.
      */
     getAllComments(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -122,13 +122,13 @@ export class CoreCommentsOfflineProvider {
     /**
      * Get an offline comment.
      *
-     * @param  {string} contextLevel Contextlevel system, course, user...
-     * @param  {number} instanceId   The Instance id of item associated with the context level.
-     * @param  {string} component    Component name.
-     * @param  {number} itemId       Associated id.
-     * @param  {string} [area='']    String comment area. Default empty.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}       Promise resolved with the comments.
+     * @param contextLevel Contextlevel system, course, user...
+     * @param instanceId The Instance id of item associated with the context level.
+     * @param component Component name.
+     * @param itemId Associated id.
+     * @param area String comment area. Default empty.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the comments.
      */
     getComment(contextLevel: string, instanceId: number, component: string, itemId: number, area: string = '',
             siteId?: string): Promise<any> {
@@ -148,13 +148,13 @@ export class CoreCommentsOfflineProvider {
     /**
      * Get all offline comments added or deleted of a special area.
      *
-     * @param  {string} contextLevel Contextlevel system, course, user...
-     * @param  {number} instanceId   The Instance id of item associated with the context level.
-     * @param  {string} component    Component name.
-     * @param  {number} itemId       Associated id.
-     * @param  {string} [area='']    String comment area. Default empty.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}       Promise resolved with the comments.
+     * @param contextLevel Contextlevel system, course, user...
+     * @param instanceId The Instance id of item associated with the context level.
+     * @param component Component name.
+     * @param itemId Associated id.
+     * @param area String comment area. Default empty.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the comments.
      */
     getComments(contextLevel: string, instanceId: number, component: string, itemId: number, area: string = '',
             siteId?: string): Promise<any> {
@@ -176,8 +176,8 @@ export class CoreCommentsOfflineProvider {
     /**
      * Get all offline deleted comments.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved with comments.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with comments.
      */
     getAllDeletedComments(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -188,13 +188,13 @@ export class CoreCommentsOfflineProvider {
     /**
      * Get an offline comment.
      *
-     * @param  {string} contextLevel Contextlevel system, course, user...
-     * @param  {number} instanceId   The Instance id of item associated with the context level.
-     * @param  {string} component    Component name.
-     * @param  {number} itemId       Associated id.
-     * @param  {string} [area='']    String comment area. Default empty.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}       Promise resolved with the comments.
+     * @param contextLevel Contextlevel system, course, user...
+     * @param instanceId The Instance id of item associated with the context level.
+     * @param component Component name.
+     * @param itemId Associated id.
+     * @param area String comment area. Default empty.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the comments.
      */
     getDeletedComments(contextLevel: string, instanceId: number, component: string, itemId: number, area: string = '',
             siteId?: string): Promise<any> {
@@ -214,13 +214,13 @@ export class CoreCommentsOfflineProvider {
     /**
      * Remove an offline comment.
      *
-     * @param  {string} contextLevel Contextlevel system, course, user...
-     * @param  {number} instanceId   The Instance id of item associated with the context level.
-     * @param  {string} component    Component name.
-     * @param  {number} itemId       Associated id.
-     * @param  {string} [area='']    String comment area. Default empty.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}       Promise resolved if deleted, rejected if failure.
+     * @param contextLevel Contextlevel system, course, user...
+     * @param instanceId The Instance id of item associated with the context level.
+     * @param component Component name.
+     * @param itemId Associated id.
+     * @param area String comment area. Default empty.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if deleted, rejected if failure.
      */
     removeComment(contextLevel: string, instanceId: number, component: string, itemId: number, area: string = '',
             siteId?: string): Promise<any> {
@@ -238,13 +238,13 @@ export class CoreCommentsOfflineProvider {
     /**
      * Remove an offline deleted comment.
      *
-     * @param  {string} contextLevel Contextlevel system, course, user...
-     * @param  {number} instanceId   The Instance id of item associated with the context level.
-     * @param  {string} component    Component name.
-     * @param  {number} itemId       Associated id.
-     * @param  {string} [area='']    String comment area. Default empty.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}       Promise resolved if deleted, rejected if failure.
+     * @param contextLevel Contextlevel system, course, user...
+     * @param instanceId The Instance id of item associated with the context level.
+     * @param component Component name.
+     * @param itemId Associated id.
+     * @param area String comment area. Default empty.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if deleted, rejected if failure.
      */
     removeDeletedComments(contextLevel: string, instanceId: number, component: string, itemId: number, area: string = '',
             siteId?: string): Promise<any> {
@@ -262,14 +262,14 @@ export class CoreCommentsOfflineProvider {
     /**
      * Save a comment to be sent later.
      *
-     * @param  {string} content      Comment text.
-     * @param  {string} contextLevel Contextlevel system, course, user...
-     * @param  {number} instanceId   The Instance id of item associated with the context level.
-     * @param  {string} component    Component name.
-     * @param  {number} itemId       Associated id.
-     * @param  {string} [area='']    String comment area. Default empty.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved if stored, rejected if failure.
+     * @param content Comment text.
+     * @param contextLevel Contextlevel system, course, user...
+     * @param instanceId The Instance id of item associated with the context level.
+     * @param component Component name.
+     * @param itemId Associated id.
+     * @param area String comment area. Default empty.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     saveComment(content: string, contextLevel: string, instanceId: number, component: string, itemId: number,
             area: string = '', siteId?: string): Promise<any> {
@@ -294,14 +294,14 @@ export class CoreCommentsOfflineProvider {
     /**
      * Delete a comment offline to be sent later.
      *
-     * @param  {number} commentId    Comment ID.
-     * @param  {string} contextLevel Contextlevel system, course, user...
-     * @param  {number} instanceId   The Instance id of item associated with the context level.
-     * @param  {string} component    Component name.
-     * @param  {number} itemId       Associated id.
-     * @param  {string} [area='']    String comment area. Default empty.
-     * @param  {string} [siteId]     Site ID. If not defined, current site.
-     * @return {Promise<any>}        Promise resolved if stored, rejected if failure.
+     * @param commentId Comment ID.
+     * @param contextLevel Contextlevel system, course, user...
+     * @param instanceId The Instance id of item associated with the context level.
+     * @param component Component name.
+     * @param itemId Associated id.
+     * @param area String comment area. Default empty.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if stored, rejected if failure.
      */
     deleteComment(commentId: number, contextLevel: string, instanceId: number, component: string, itemId: number,
             area: string = '', siteId?: string): Promise<any> {
@@ -326,9 +326,9 @@ export class CoreCommentsOfflineProvider {
     /**
      * Undo delete a comment.
      *
-     * @param  {number} commentId   Comment ID.
-     * @param  {string} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}       Promise resolved if deleted, rejected if failure.
+     * @param commentId Comment ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if deleted, rejected if failure.
      */
     undoDeleteComment(commentId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/core/comments/providers/sync-cron-handler.ts b/src/core/comments/providers/sync-cron-handler.ts
index 5803f936e..76d9e1529 100644
--- a/src/core/comments/providers/sync-cron-handler.ts
+++ b/src/core/comments/providers/sync-cron-handler.ts
@@ -29,9 +29,9 @@ export class CoreCommentsSyncCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         return this.commentsSync.syncAllComments(siteId, force);
@@ -40,7 +40,7 @@ export class CoreCommentsSyncCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return 300000; // 5 minutes.
diff --git a/src/core/comments/providers/sync.ts b/src/core/comments/providers/sync.ts
index c8466cac7..6e1003e98 100644
--- a/src/core/comments/providers/sync.ts
+++ b/src/core/comments/providers/sync.ts
@@ -46,9 +46,9 @@ export class CoreCommentsSyncProvider extends CoreSyncBaseProvider {
     /**
      * Try to synchronize all the comments in a certain site or in all sites.
      *
-     * @param  {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @return {Promise<any>}    Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     syncAllComments(siteId?: string, force?: boolean): Promise<any> {
         return this.syncOnSites('all comments', this.syncAllCommentsFunc.bind(this), [force], siteId);
@@ -57,9 +57,9 @@ export class CoreCommentsSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize all the comments in a certain site
      *
-     * @param  {string} siteId Site ID to sync.
-     * @param  {boolean} force Wether to force sync not depending on last execution.
-     * @return {Promise<any>}  Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync.
+     * @param force Wether to force sync not depending on last execution.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     private syncAllCommentsFunc(siteId: string, force: boolean): Promise<any> {
         return this.commentsOffline.getAllComments(siteId).then((comments) => {
@@ -100,13 +100,13 @@ export class CoreCommentsSyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync course comments only if a certain time has passed since the last time.
      *
-     * @param  {string} contextLevel Contextlevel system, course, user...
-     * @param  {number} instanceId   The Instance id of item associated with the context level.
-     * @param  {string} component    Component name.
-     * @param  {number} itemId       Associated id.
-     * @param  {string} [area='']    String comment area. Default empty.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved when the comments are synced or if they don't need to be synced.
+     * @param contextLevel Contextlevel system, course, user...
+     * @param instanceId The Instance id of item associated with the context level.
+     * @param component Component name.
+     * @param itemId Associated id.
+     * @param area String comment area. Default empty.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the comments are synced or if they don't need to be synced.
      */
     private syncCommentsIfNeeded(contextLevel: string, instanceId: number, component: string, itemId: number, area: string = '',
             siteId?: string): Promise<void> {
@@ -122,13 +122,13 @@ export class CoreCommentsSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize comments in a particular area.
      *
-     * @param  {string} contextLevel Contextlevel system, course, user...
-     * @param  {number} instanceId   The Instance id of item associated with the context level.
-     * @param  {string} component    Component name.
-     * @param  {number} itemId       Associated id.
-     * @param  {string} [area='']    String comment area. Default empty.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved if sync is successful, rejected otherwise.
+     * @param contextLevel Contextlevel system, course, user...
+     * @param instanceId The Instance id of item associated with the context level.
+     * @param component Component name.
+     * @param itemId Associated id.
+     * @param area String comment area. Default empty.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     syncComments(contextLevel: string, instanceId: number, component: string, itemId: number, area: string = '',
             siteId?: string): Promise<any> {
@@ -216,12 +216,12 @@ export class CoreCommentsSyncProvider extends CoreSyncBaseProvider {
     /**
      * Get the ID of a comments sync.
      *
-     * @param  {string} contextLevel Contextlevel system, course, user...
-     * @param  {number} instanceId   The Instance id of item associated with the context level.
-     * @param  {string} component    Component name.
-     * @param  {number} itemId       Associated id.
-     * @param  {string} [area='']    String comment area. Default empty.
-     * @return {string} Sync ID.
+     * @param contextLevel Contextlevel system, course, user...
+     * @param instanceId The Instance id of item associated with the context level.
+     * @param component Component name.
+     * @param itemId Associated id.
+     * @param area String comment area. Default empty.
+     * @return Sync ID.
      */
     protected getSyncId(contextLevel: string, instanceId: number, component: string, itemId: number, area: string = ''): string {
         return contextLevel + '#' + instanceId + '#' + component + '#' + itemId + '#' + area;
diff --git a/src/core/compile/components/compile-html/compile-html.ts b/src/core/compile/components/compile-html/compile-html.ts
index 82c52cd8e..cf0bb0863 100644
--- a/src/core/compile/components/compile-html/compile-html.ts
+++ b/src/core/compile/components/compile-html/compile-html.ts
@@ -129,7 +129,7 @@ export class CoreCompileHtmlComponent implements OnChanges, OnDestroy, DoCheck {
     /**
      * Get a class that defines the dynamic component.
      *
-     * @return {any} The component class.
+     * @return The component class.
      */
     protected getComponentClass(): any {
         // tslint:disable: no-this-assignment
@@ -221,11 +221,11 @@ export class CoreCompileHtmlComponent implements OnChanges, OnDestroy, DoCheck {
     /**
      * Call a certain function on the component instance.
      *
-     * @param {string} name Name of the function to call.
-     * @param {any[]} params List of params to send to the function.
-     * @param {boolean} [callWhenCreated=true] If this param is true and the component hasn't been created yet, call the function
-     *                                         once the component has been created.
-     * @return {any} Result of the call. Undefined if no component instance or the function doesn't exist.
+     * @param name Name of the function to call.
+     * @param params List of params to send to the function.
+     * @param callWhenCreated If this param is true and the component hasn't been created yet, call the function
+     *                        once the component has been created.
+     * @return Result of the call. Undefined if no component instance or the function doesn't exist.
      */
     callComponentFunction(name: string, params?: any[], callWhenCreated: boolean = true): any {
         if (this.componentInstance) {
diff --git a/src/core/compile/providers/compile.ts b/src/core/compile/providers/compile.ts
index 7b76555ce..1cb152a84 100644
--- a/src/core/compile/providers/compile.ts
+++ b/src/core/compile/providers/compile.ts
@@ -154,10 +154,10 @@ export class CoreCompileProvider {
     /**
      * Create and compile a dynamic component.
      *
-     * @param {string} template The template of the component.
-     * @param {any} componentClass The JS class of the component.
-     * @param {any[]} [extraImports] Extra imported modules if needed and not imported by this class.
-     * @return {Promise<ComponentFactory<any>>} Promise resolved with the factory to instantiate the component.
+     * @param template The template of the component.
+     * @param componentClass The JS class of the component.
+     * @param extraImports Extra imported modules if needed and not imported by this class.
+     * @return Promise resolved with the factory to instantiate the component.
      */
     createAndCompileComponent(template: string, componentClass: any, extraImports: any[] = []): Promise<ComponentFactory<any>> {
         // Create the component using the template and the class.
@@ -190,8 +190,8 @@ export class CoreCompileProvider {
     /**
      * Eval some javascript using the context of the function.
      *
-     * @param {string} javascript The javascript to eval.
-     * @return {any} Result of the eval.
+     * @param javascript The javascript to eval.
+     * @return Result of the eval.
      */
     protected evalInContext(javascript: string): any {
         // tslint:disable: no-eval
@@ -201,9 +201,9 @@ export class CoreCompileProvider {
     /**
      * Execute some javascript code, using a certain instance as the context.
      *
-     * @param {any} instance Instance to use as the context. In the JS code, "this" will be this instance.
-     * @param {string} javascript The javascript code to eval.
-     * @return {any} Result of the javascript execution.
+     * @param instance Instance to use as the context. In the JS code, "this" will be this instance.
+     * @param javascript The javascript code to eval.
+     * @return Result of the javascript execution.
      */
     executeJavascript(instance: any, javascript: string): any {
         try {
@@ -216,8 +216,8 @@ export class CoreCompileProvider {
     /**
      * Inject all the core libraries in a certain object.
      *
-     * @param {any} instance The instance where to inject the libraries.
-     * @param {any[]} [extraProviders] Extra imported providers if needed and not imported by this class.
+     * @param instance The instance where to inject the libraries.
+     * @param extraProviders Extra imported providers if needed and not imported by this class.
      */
     injectLibraries(instance: any, extraProviders: any[] = []): void {
         const providers = (<any[]> CORE_PROVIDERS).concat(CORE_CONTENTLINKS_PROVIDERS).concat(CORE_COURSE_PROVIDERS)
@@ -284,10 +284,10 @@ export class CoreCompileProvider {
     /**
      * Instantiate a dynamic component.
      *
-     * @param {string} template The template of the component.
-     * @param {any} componentClass The JS class of the component.
-     * @param {Injector} [injector] The injector to use. It's recommended to pass it so NavController and similar can be injected.
-     * @return {Promise<ComponentRef<any>>} Promise resolved with the component instance.
+     * @param template The template of the component.
+     * @param componentClass The JS class of the component.
+     * @param injector The injector to use. It's recommended to pass it so NavController and similar can be injected.
+     * @return Promise resolved with the component instance.
      */
     instantiateDynamicComponent(template: string, componentClass: any, injector?: Injector): Promise<ComponentRef<any>> {
         injector = injector || this.injector;
diff --git a/src/core/contentlinks/classes/base-handler.ts b/src/core/contentlinks/classes/base-handler.ts
index 9f79ddbda..ca23fd706 100644
--- a/src/core/contentlinks/classes/base-handler.ts
+++ b/src/core/contentlinks/classes/base-handler.ts
@@ -23,34 +23,29 @@ import { CoreContentLinksHandler, CoreContentLinksAction } from '../providers/de
 export class CoreContentLinksHandlerBase implements CoreContentLinksHandler {
     /**
      * A name to identify the handler.
-     * @type {string}
      */
     name = 'CoreContentLinksHandlerBase';
 
     /**
      * Handler's priority. The highest priority is treated first.
-     * @type {number}
      */
     priority = 0;
 
     /**
      * Whether the isEnabled function should be called for all the users in a site. It should be true only if the isEnabled call
      * can return different values for different users in same site.
-     * @type {boolean}
      */
     checkAllUsers = false;
 
     /**
      * Name of the feature this handler is related to.
      * It will be used to check if the feature is disabled (@see CoreSite.isFeatureDisabled).
-     * @type {string}
      */
     featureName = '';
 
     /**
      * A pattern to use to detect if the handler handles a URL and to get its site URL. Required if "handles" and
      * "getSiteUrl" functions aren't overridden.
-     * @type {RexExp}
      */
     pattern?: RegExp;
 
@@ -61,11 +56,11 @@ export class CoreContentLinksHandlerBase implements CoreContentLinksHandler {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -75,8 +70,8 @@ export class CoreContentLinksHandlerBase implements CoreContentLinksHandler {
     /**
      * Check if a URL is handled by this handler.
      *
-     * @param {string} url The URL to check.
-     * @return {boolean} Whether the URL is handled by this handler
+     * @param url The URL to check.
+     * @return Whether the URL is handled by this handler
      */
     handles(url: string): boolean {
         return this.pattern && url.search(this.pattern) >= 0;
@@ -85,8 +80,8 @@ export class CoreContentLinksHandlerBase implements CoreContentLinksHandler {
     /**
      * If the URL is handled by this handler, return the site URL.
      *
-     * @param {string} url The URL to check.
-     * @return {string} Site URL if it is handled, undefined otherwise.
+     * @param url The URL to check.
+     * @return Site URL if it is handled, undefined otherwise.
      */
     getSiteUrl(url: string): string {
         if (this.pattern) {
@@ -101,11 +96,11 @@ export class CoreContentLinksHandlerBase implements CoreContentLinksHandler {
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return true;
diff --git a/src/core/contentlinks/classes/module-grade-handler.ts b/src/core/contentlinks/classes/module-grade-handler.ts
index c1a5124e4..865a32d9e 100644
--- a/src/core/contentlinks/classes/module-grade-handler.ts
+++ b/src/core/contentlinks/classes/module-grade-handler.ts
@@ -26,25 +26,23 @@ export class CoreContentLinksModuleGradeHandler extends CoreContentLinksHandlerB
 
     /**
      * Whether the module can be reviewed in the app. If true, the handler needs to implement the goToReview function.
-     * @type {boolean}
      */
     canReview: boolean;
 
     /**
      * If this boolean is set to true, the app will retrieve all modules with this modName with a single WS call.
      * This reduces the number of WS calls, but it isn't recommended for modules that can return a lot of contents.
-     * @type {boolean}
      */
     protected useModNameToGetModule = false;
 
     /**
      * Construct the handler.
      *
-     * @param {CoreCourseHelperProvider} courseHelper The CoreCourseHelperProvider instance.
-     * @param {CoreDomUtilsProvider} domUtils The CoreDomUtilsProvider instance.
-     * @param {CoreSitesProvider} sitesProvider The CoreSitesProvider instance.
-     * @param {string} addon Name of the addon as it's registered in course delegate. It'll be used to check if it's disabled.
-     * @param {string} modName Name of the module (assign, book, ...).
+     * @param courseHelper The CoreCourseHelperProvider instance.
+     * @param domUtils The CoreDomUtilsProvider instance.
+     * @param sitesProvider The CoreSitesProvider instance.
+     * @param addon Name of the addon as it's registered in course delegate. It'll be used to check if it's disabled.
+     * @param modName Name of the module (assign, book, ...).
      */
     constructor(protected courseHelper: CoreCourseHelperProvider, protected domUtils: CoreDomUtilsProvider,
             protected sitesProvider: CoreSitesProvider, public addon: string, public modName: string) {
@@ -58,11 +56,11 @@ export class CoreContentLinksModuleGradeHandler extends CoreContentLinksHandlerB
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -95,12 +93,12 @@ export class CoreContentLinksModuleGradeHandler extends CoreContentLinksHandlerB
     /**
      * Go to the page to review.
      *
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} courseId Course ID related to the URL.
-     * @param {string} siteId Site to use.
-     * @param {NavController} [navCtrl] Nav Controller to use to navigate.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL.
+     * @param siteId Site to use.
+     * @param navCtrl Nav Controller to use to navigate.
+     * @return Promise resolved when done.
      */
     protected goToReview(url: string, params: any, courseId: number, siteId: string, navCtrl?: NavController): Promise<any> {
         // This function should be overridden.
diff --git a/src/core/contentlinks/classes/module-index-handler.ts b/src/core/contentlinks/classes/module-index-handler.ts
index 67159b012..2ada678f5 100644
--- a/src/core/contentlinks/classes/module-index-handler.ts
+++ b/src/core/contentlinks/classes/module-index-handler.ts
@@ -24,16 +24,15 @@ export class CoreContentLinksModuleIndexHandler extends CoreContentLinksHandlerB
     /**
      * If this boolean is set to true, the app will retrieve all modules with this modName with a single WS call.
      * This reduces the number of WS calls, but it isn't recommended for modules that can return a lot of contents.
-     * @type {boolean}
      */
     protected useModNameToGetModule = false;
 
     /**
      * Construct the handler.
      *
-     * @param {CoreCourseHelperProvider} courseHelper The CoreCourseHelperProvider instance.
-     * @param {string} addon Name of the addon as it's registered in course delegate. It'll be used to check if it's disabled.
-     * @param {string} modName Name of the module (assign, book, ...).
+     * @param courseHelper The CoreCourseHelperProvider instance.
+     * @param addon Name of the addon as it's registered in course delegate. It'll be used to check if it's disabled.
+     * @param modName Name of the module (assign, book, ...).
      */
     constructor(protected courseHelper: CoreCourseHelperProvider, public addon: string, public modName: string) {
         super();
@@ -46,11 +45,11 @@ export class CoreContentLinksModuleIndexHandler extends CoreContentLinksHandlerB
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
diff --git a/src/core/contentlinks/classes/module-list-handler.ts b/src/core/contentlinks/classes/module-list-handler.ts
index 37e44e7d7..6365a1ad9 100644
--- a/src/core/contentlinks/classes/module-list-handler.ts
+++ b/src/core/contentlinks/classes/module-list-handler.ts
@@ -24,17 +24,16 @@ export class CoreContentLinksModuleListHandler extends CoreContentLinksHandlerBa
 
     /**
      * The title to use in the new page. If not defined, the app will try to calculate it.
-     * @type {string}
      */
     protected title: string;
 
     /**
      * Construct the handler.
      *
-     * @param {CoreContentLinksHelperProvider} linkHelper The CoreContentLinksHelperProvider instance.
-     * @param {TranslateService} translate The TranslateService instance.
-     * @param {string} addon Name of the addon as it's registered in course delegate. It'll be used to check if it's disabled.
-     * @param {string} modName Name of the module (assign, book, ...).
+     * @param linkHelper The CoreContentLinksHelperProvider instance.
+     * @param translate The TranslateService instance.
+     * @param addon Name of the addon as it's registered in course delegate. It'll be used to check if it's disabled.
+     * @param modName Name of the module (assign, book, ...).
      */
     constructor(protected linkHelper: CoreContentLinksHelperProvider, protected translate: TranslateService, public addon: string,
             public modName: string) {
@@ -48,10 +47,10 @@ export class CoreContentLinksModuleListHandler extends CoreContentLinksHandlerBa
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any): CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
 
diff --git a/src/core/contentlinks/pages/choose-site/choose-site.ts b/src/core/contentlinks/pages/choose-site/choose-site.ts
index b10a36bc7..0808e130d 100644
--- a/src/core/contentlinks/pages/choose-site/choose-site.ts
+++ b/src/core/contentlinks/pages/choose-site/choose-site.ts
@@ -96,7 +96,7 @@ export class CoreContentLinksChooseSitePage implements OnInit {
     /**
      * Perform the action on a certain site.
      *
-     * @param {string} siteId Site ID.
+     * @param siteId Site ID.
      */
     siteClicked(siteId: string): void {
         if (this.isRootURL) {
diff --git a/src/core/contentlinks/providers/delegate.ts b/src/core/contentlinks/providers/delegate.ts
index b753ac02e..340f1eb17 100644
--- a/src/core/contentlinks/providers/delegate.ts
+++ b/src/core/contentlinks/providers/delegate.ts
@@ -25,39 +25,35 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
 export interface CoreContentLinksHandler {
     /**
      * A name to identify the handler.
-     * @type {string}
      */
     name: string;
 
     /**
      * Handler's priority. The highest priority is treated first.
-     * @type {number}
      */
     priority?: number;
 
     /**
      * Whether the isEnabled function should be called for all the users in a site. It should be true only if the isEnabled call
      * can return different values for different users in same site.
-     * @type {boolean}
      */
     checkAllUsers?: boolean;
 
     /**
      * Name of the feature this handler is related to.
      * It will be used to check if the feature is disabled (@see CoreSite.isFeatureDisabled).
-     * @type {string}
      */
     featureName?: string;
 
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @param {any} [data] Extra data to handle the URL.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @param data Extra data to handle the URL.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number, data?: any):
         CoreContentLinksAction[] | Promise<CoreContentLinksAction[]>;
@@ -65,16 +61,16 @@ export interface CoreContentLinksHandler {
     /**
      * Check if a URL is handled by this handler.
      *
-     * @param {string} url The URL to check.
-     * @return {boolean} Whether the URL is handled by this handler
+     * @param url The URL to check.
+     * @return Whether the URL is handled by this handler
      */
     handles(url: string): boolean;
 
     /**
      * If the URL is handled by this handler, return the site URL.
      *
-     * @param {string} url The URL to check.
-     * @return {string} Site URL if it is handled, undefined otherwise.
+     * @param url The URL to check.
+     * @return Site URL if it is handled, undefined otherwise.
      */
     getSiteUrl(url: string): string;
 
@@ -82,11 +78,11 @@ export interface CoreContentLinksHandler {
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled?(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean>;
 }
@@ -97,27 +93,24 @@ export interface CoreContentLinksHandler {
 export interface CoreContentLinksAction {
     /**
      * A message to identify the action. Default: 'core.view'.
-     * @type {string}
      */
     message?: string;
 
     /**
      * Name of the icon of the action. Default: 'eye'.
-     * @type {string}
      */
     icon?: string;
 
     /**
      * IDs of the sites that support the action.
-     * @type {string[]}
      */
     sites?: string[];
 
     /**
      * Action to perform when the link is clicked.
      *
-     * @param {string} siteId The site ID.
-     * @param {NavController} [navCtrl] Nav Controller to use to navigate.
+     * @param siteId The site ID.
+     * @param navCtrl Nav Controller to use to navigate.
      */
     action(siteId: string, navCtrl?: NavController): void;
 }
@@ -128,13 +121,11 @@ export interface CoreContentLinksAction {
 export interface CoreContentLinksHandlerActions {
     /**
      * Handler's priority.
-     * @type {number}
      */
     priority: number;
 
     /**
      * List of actions.
-     * @type {CoreContentLinksAction[]}
      */
     actions: CoreContentLinksAction[];
 }
@@ -155,11 +146,11 @@ export class CoreContentLinksDelegate {
     /**
      * Get the list of possible actions to do for a URL.
      *
-     * @param {string} url URL to handle.
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @param {string} [username] Username to use to filter sites.
-     * @param {any} [data] Extra data to handle the URL.
-     * @return {Promise<CoreContentLinksAction[]>}  Promise resolved with the actions.
+     * @param url URL to handle.
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @param username Username to use to filter sites.
+     * @param data Extra data to handle the URL.
+     * @return Promise resolved with the actions.
      */
     getActionsFor(url: string, courseId?: number, username?: string, data?: any): Promise<CoreContentLinksAction[]> {
         if (!url) {
@@ -220,8 +211,8 @@ export class CoreContentLinksDelegate {
     /**
      * Get the site URL if the URL is supported by any handler.
      *
-     * @param {string} url URL to handle.
-     * @return {string} Site URL if the URL is supported by any handler, undefined otherwise.
+     * @param url URL to handle.
+     * @return Site URL if the URL is supported by any handler, undefined otherwise.
      */
     getSiteUrl(url: string): string {
         if (!url) {
@@ -242,12 +233,12 @@ export class CoreContentLinksDelegate {
     /**
      * Check if a handler is enabled for a certain site and URL.
      *
-     * @param {CoreContentLinksHandler} handler Handler to check.
-     * @param {string} url The URL to check.
-     * @param {any} params The params of the URL
-     * @param {number} courseId Course ID the URL belongs to (can be undefined).
-     * @param {string} siteId The site ID to check.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether the handler is enabled.
+     * @param handler Handler to check.
+     * @param url The URL to check.
+     * @param params The params of the URL
+     * @param courseId Course ID the URL belongs to (can be undefined).
+     * @param siteId The site ID to check.
+     * @return Promise resolved with boolean: whether the handler is enabled.
      */
     protected isHandlerEnabled(handler: CoreContentLinksHandler, url: string, params: any, courseId: number, siteId: string)
             : Promise<boolean> {
@@ -277,8 +268,8 @@ export class CoreContentLinksDelegate {
     /**
      * Register a handler.
      *
-     * @param {CoreContentLinksHandler} handler The handler to register.
-     * @return {boolean} True if registered successfully, false otherwise.
+     * @param handler The handler to register.
+     * @return True if registered successfully, false otherwise.
      */
     registerHandler(handler: CoreContentLinksHandler): boolean {
         if (typeof this.handlers[handler.name] !== 'undefined') {
@@ -295,8 +286,8 @@ export class CoreContentLinksDelegate {
     /**
      * Sort actions by priority.
      *
-     * @param {CoreContentLinksHandlerActions[]} actions Actions to sort.
-     * @return {CoreContentLinksAction[]} Sorted actions.
+     * @param actions Actions to sort.
+     * @return Sorted actions.
      */
     protected sortActionsByPriority(actions: CoreContentLinksHandlerActions[]): CoreContentLinksAction[] {
         let sorted: CoreContentLinksAction[] = [];
diff --git a/src/core/contentlinks/providers/helper.ts b/src/core/contentlinks/providers/helper.ts
index 6e9f77e91..dd2f6e35b 100644
--- a/src/core/contentlinks/providers/helper.ts
+++ b/src/core/contentlinks/providers/helper.ts
@@ -51,11 +51,11 @@ export class CoreContentLinksHelperProvider {
     /**
      * Check whether a link can be handled by the app.
      *
-     * @param {string} url URL to handle.
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @param {string} [username] Username to use to filter sites.
-     * @param {boolean} [checkRoot] Whether to check if the URL is the root URL of a site.
-     * @return {Promise<boolean>} Promise resolved with a boolean: whether the URL can be handled.
+     * @param url URL to handle.
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @param username Username to use to filter sites.
+     * @param checkRoot Whether to check if the URL is the root URL of a site.
+     * @return Promise resolved with a boolean: whether the URL can be handled.
      */
     canHandleLink(url: string, courseId?: number, username?: string, checkRoot?: boolean): Promise<boolean> {
         let promise;
@@ -83,8 +83,8 @@ export class CoreContentLinksHelperProvider {
     /**
      * Get the first valid action in a list of actions.
      *
-     * @param {CoreContentLinksAction[]} actions List of actions.
-     * @return {CoreContentLinksAction} First valid action. Returns undefined if no valid action found.
+     * @param actions List of actions.
+     * @return First valid action. Returns undefined if no valid action found.
      */
     getFirstValidAction(actions: CoreContentLinksAction[]): CoreContentLinksAction {
         if (actions) {
@@ -101,12 +101,12 @@ export class CoreContentLinksHelperProvider {
      * Goes to a certain page in a certain site. If the site is current site it will perform a regular navigation,
      * otherwise it will 'redirect' to the other site.
      *
-     * @param {NavController} navCtrl The NavController instance to use.
-     * @param {string} pageName Name of the page to go.
-     * @param {any} [pageParams] Params to send to the page.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {boolean} [checkMenu] If true, check if the root page of a main menu tab. Only the page name will be checked.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param navCtrl The NavController instance to use.
+     * @param pageName Name of the page to go.
+     * @param pageParams Params to send to the page.
+     * @param siteId Site ID. If not defined, current site.
+     * @param checkMenu If true, check if the root page of a main menu tab. Only the page name will be checked.
+     * @return Promise resolved when done.
      */
     goInSite(navCtrl: NavController, pageName: string, pageParams: any, siteId?: string, checkMenu?: boolean): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -144,7 +144,7 @@ export class CoreContentLinksHelperProvider {
     /**
      * Go to the page to choose a site.
      *
-     * @param {string} url URL to treat.
+     * @param url URL to treat.
      */
     goToChooseSite(url: string): void {
         this.appProvider.getRootNavController().setRoot('CoreContentLinksChooseSitePage', { url: url });
@@ -153,8 +153,8 @@ export class CoreContentLinksHelperProvider {
     /**
      * Handle a URL received by Custom URL Scheme.
      *
-     * @param {string} url URL to handle.
-     * @return {boolean} True if the URL should be handled by this component, false otherwise.
+     * @param url URL to handle.
+     * @return True if the URL should be handled by this component, false otherwise.
      * @deprecated Please use CoreCustomURLSchemesProvider.handleCustomURL instead.
      */
     handleCustomUrl(url: string): boolean {
@@ -270,13 +270,13 @@ export class CoreContentLinksHelperProvider {
     /**
      * Handle a link.
      *
-     * @param {string} url URL to handle.
-     * @param {string} [username] Username related with the URL. E.g. in 'http://myuser@m.com', url would be 'http://m.com' and
-     *                            the username 'myuser'. Don't use it if you don't want to filter by username.
-     * @param {NavController} [navCtrl] Nav Controller to use to navigate.
-     * @param {boolean} [checkRoot] Whether to check if the URL is the root URL of a site.
-     * @param {boolean} [openBrowserRoot] Whether to open in browser if it's root URL and it belongs to current site.
-     * @return {Promise<boolean>} Promise resolved with a boolean: true if URL was treated, false otherwise.
+     * @param url URL to handle.
+     * @param username Username related with the URL. E.g. in 'http://myuser@m.com', url would be 'http://m.com' and
+     *                 the username 'myuser'. Don't use it if you don't want to filter by username.
+     * @param navCtrl Nav Controller to use to navigate.
+     * @param checkRoot Whether to check if the URL is the root URL of a site.
+     * @param openBrowserRoot Whether to open in browser if it's root URL and it belongs to current site.
+     * @return Promise resolved with a boolean: true if URL was treated, false otherwise.
      */
     handleLink(url: string, username?: string, navCtrl?: NavController, checkRoot?: boolean, openBrowserRoot?: boolean)
             : Promise<boolean> {
@@ -336,11 +336,11 @@ export class CoreContentLinksHelperProvider {
     /**
      * Handle a root URL of a site.
      *
-     * @param {CoreSite} site Site to handle.
-     * @param {boolean} [openBrowserRoot] Whether to open in browser if it's root URL and it belongs to current site.
-     * @param {boolean} [checkToken] Whether to check that token is the same to verify it's current site. If false or not defined,
-     *                               only the URL will be checked.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param site Site to handle.
+     * @param openBrowserRoot Whether to open in browser if it's root URL and it belongs to current site.
+     * @param checkToken Whether to check that token is the same to verify it's current site. If false or not defined,
+     *                   only the URL will be checked.
+     * @return Promise resolved when done.
      */
     handleRootURL(site: CoreSite, openBrowserRoot?: boolean, checkToken?: boolean): Promise<any> {
         const currentSite = this.sitesProvider.getCurrentSite();
diff --git a/src/core/course/classes/activity-prefetch-handler.ts b/src/core/course/classes/activity-prefetch-handler.ts
index 3c0294a93..54f19c06b 100644
--- a/src/core/course/classes/activity-prefetch-handler.ts
+++ b/src/core/course/classes/activity-prefetch-handler.ts
@@ -22,12 +22,12 @@ import { CoreCourseModulePrefetchHandlerBase } from './module-prefetch-handler';
  * The string returned by this function will be stored as "extra" data in the filepool package. If you don't need to store
  * extra data, don't return anything.
  *
- * @param {any} module Module.
- * @param {number} courseId Course ID the module belongs to.
- * @param {boolean} single True if we're downloading a single module, false if we're downloading a whole section.
- * @param {string} siteId Site ID. If not defined, current site.
- * @return {Promise<string>} Promise resolved when the prefetch finishes. The string returned will be stored as "extra" data in the
- *                           filepool package. If you don't need to store extra data, don't return anything.
+ * @param module Module.
+ * @param courseId Course ID the module belongs to.
+ * @param single True if we're downloading a single module, false if we're downloading a whole section.
+ * @param siteId Site ID. If not defined, current site.
+ * @return Promise resolved when the prefetch finishes. The string returned will be stored as "extra" data in the
+ *         filepool package. If you don't need to store extra data, don't return anything.
  */
 export type prefetchFunction = (module: any, courseId: number, single: boolean, siteId: string, ...args: any[]) => Promise<string>;
 
@@ -46,10 +46,10 @@ export class CoreCourseActivityPrefetchHandlerBase extends CoreCourseModulePrefe
     /**
      * Download the module.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when all content is downloaded.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when all content is downloaded.
      */
     download(module: any, courseId: number, dirPath?: string): Promise<any> {
         // Same implementation for download and prefetch.
@@ -59,11 +59,11 @@ export class CoreCourseActivityPrefetchHandlerBase extends CoreCourseModulePrefe
     /**
      * Prefetch a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
      */
     prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string): Promise<any> {
         // To be overridden. It should call prefetchPackage
@@ -79,12 +79,12 @@ export class CoreCourseActivityPrefetchHandlerBase extends CoreCourseModulePrefe
      * Then the function "prefetchModule" will receive params:
      *     prefetchModule(module, courseId, single, siteId, someParam, anotherParam)
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {prefetchFunction} downloadFn Function to perform the prefetch. Please check the documentation of prefetchFunction.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the module has been downloaded. Data returned is not reliable.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param downloadFn Function to perform the prefetch. Please check the documentation of prefetchFunction.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the module has been downloaded. Data returned is not reliable.
      */
     prefetchPackage(module: any, courseId: number, single: boolean, downloadFn: prefetchFunction, siteId?: string, ...args: any[])
             : Promise<any> {
@@ -128,10 +128,10 @@ export class CoreCourseActivityPrefetchHandlerBase extends CoreCourseModulePrefe
     /**
      * Mark the module as downloaded.
      *
-     * @param {number} id Unique identifier per component.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {string} [extra] Extra data to store.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param id Unique identifier per component.
+     * @param siteId Site ID. If not defined, current site.
+     * @param extra Extra data to store.
+     * @return Promise resolved when done.
      */
     setDownloaded(id: number, siteId?: string, extra?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -142,9 +142,9 @@ export class CoreCourseActivityPrefetchHandlerBase extends CoreCourseModulePrefe
     /**
      * Mark the module as downloading.
      *
-     * @param {number} id Unique identifier per component.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param id Unique identifier per component.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     setDownloading(id: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -155,10 +155,10 @@ export class CoreCourseActivityPrefetchHandlerBase extends CoreCourseModulePrefe
     /**
      * Set previous status and return a rejected promise.
      *
-     * @param {number} id Unique identifier per component.
-     * @param {any} [error] Error to return.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<never>} Rejected promise.
+     * @param id Unique identifier per component.
+     * @param error Error to return.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Rejected promise.
      */
     setPreviousStatusAndReject(id: number, error?: any, siteId?: string): Promise<never> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
diff --git a/src/core/course/classes/activity-sync.ts b/src/core/course/classes/activity-sync.ts
index 8d7333963..ae076f069 100644
--- a/src/core/course/classes/activity-sync.ts
+++ b/src/core/course/classes/activity-sync.ts
@@ -40,11 +40,11 @@ export class CoreCourseActivitySyncBaseProvider extends CoreSyncBaseProvider {
     /**
      * Conveniece function to prefetch data after an update.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID.
-     * @param {RegExp} [regex] If regex matches, don't download the data. Defaults to check files.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID.
+     * @param regex If regex matches, don't download the data. Defaults to check files.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     prefetchAfterUpdate(module: any, courseId: number, regex?: RegExp, siteId?: string): Promise<any> {
         regex = regex || /^.*files$/;
diff --git a/src/core/course/classes/main-activity-component.ts b/src/core/course/classes/main-activity-component.ts
index 752a140e2..6e1f0b23c 100644
--- a/src/core/course/classes/main-activity-component.ts
+++ b/src/core/course/classes/main-activity-component.ts
@@ -93,8 +93,8 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
     /**
      * Compares sync event data with current data to check if refresh content is needed.
      *
-     * @param {any} syncEventData Data received on sync observer.
-     * @return {boolean}          True if refresh is needed, false otherwise.
+     * @param syncEventData Data received on sync observer.
+     * @return True if refresh is needed, false otherwise.
      */
     protected isRefreshSyncNeeded(syncEventData: any): boolean {
         return false;
@@ -103,7 +103,7 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
     /**
      * An autosync event has been received, check if refresh is needed and update the view.
      *
-     * @param {any} syncEventData Data receiven on sync observer.
+     * @param syncEventData Data receiven on sync observer.
      */
     protected autoSyncEventReceived(syncEventData: any): void {
         if (this.isRefreshSyncNeeded(syncEventData)) {
@@ -115,9 +115,9 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
     /**
      * Perform the refresh content function.
      *
-     * @param  {boolean}      [sync=false]       If the refresh needs syncing.
-     * @param  {boolean}      [showErrors=false] Wether to show errors to the user or hide them.
-     * @return {Promise<any>} Resolved when done.
+     * @param sync If the refresh needs syncing.
+     * @param showErrors Wether to show errors to the user or hide them.
+     * @return Resolved when done.
      */
     protected refreshContent(sync: boolean = false, showErrors: boolean = false): Promise<any> {
         if (!this.module) {
@@ -154,9 +154,9 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
     /**
      * Show loading and perform the load content function.
      *
-     * @param  {boolean}      [sync=false]       If the fetch needs syncing.
-     * @param  {boolean}      [showErrors=false] Wether to show errors to the user or hide them.
-     * @return {Promise<any>} Resolved when done.
+     * @param sync If the fetch needs syncing.
+     * @param showErrors Wether to show errors to the user or hide them.
+     * @return Resolved when done.
      */
     protected showLoadingAndFetch(sync: boolean = false, showErrors: boolean = false): Promise<any> {
         this.refreshIcon = 'spinner';
@@ -173,9 +173,9 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
     /**
      * Show loading and perform the refresh content function.
      *
-     * @param  {boolean}      [sync=false]       If the refresh needs syncing.
-     * @param  {boolean}      [showErrors=false] Wether to show errors to the user or hide them.
-     * @return {Promise<any>} Resolved when done.
+     * @param sync If the refresh needs syncing.
+     * @param showErrors Wether to show errors to the user or hide them.
+     * @return Resolved when done.
      */
     protected showLoadingAndRefresh(sync: boolean = false, showErrors: boolean = false): Promise<any> {
         this.refreshIcon = 'spinner';
@@ -189,10 +189,10 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
     /**
      * Download the component contents.
      *
-     * @param {boolean}       [refresh=false] Whether we're refreshing data.
-     * @param  {boolean}      [sync=false]       If the refresh needs syncing.
-     * @param  {boolean}      [showErrors=false] Wether to show errors to the user or hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Whether we're refreshing data.
+     * @param sync If the refresh needs syncing.
+     * @param showErrors Wether to show errors to the user or hide them.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<any> {
         return Promise.resolve();
@@ -201,10 +201,10 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
     /**
      * Loads the component contents and shows the corresponding error.
      *
-     * @param {boolean}       [refresh=false] Whether we're refreshing data.
-     * @param  {boolean}      [sync=false]       If the refresh needs syncing.
-     * @param  {boolean}      [showErrors=false] Wether to show errors to the user or hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Whether we're refreshing data.
+     * @param sync If the refresh needs syncing.
+     * @param showErrors Wether to show errors to the user or hide them.
+     * @return Promise resolved when done.
      */
     protected loadContent(refresh?: boolean, sync: boolean = false, showErrors: boolean = false): Promise<any> {
         this.isOnline = this.appProvider.isOnline();
@@ -245,8 +245,8 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
     /**
      * Displays some data based on the current status.
      *
-     * @param {string} status The current status.
-     * @param {string} [previousStatus] The previous status. If not defined, there is no previous status.
+     * @param status The current status.
+     * @param previousStatus The previous status. If not defined, there is no previous status.
      */
     protected showStatus(status: string, previousStatus?: string): void {
         // To be overridden.
@@ -255,7 +255,7 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
     /**
      * Watch for changes on the status.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected setStatusListener(): Promise<any> {
         if (typeof this.statusObserver == 'undefined') {
@@ -283,7 +283,7 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
     /**
      * Performs the sync of the activity.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected sync(): Promise<any> {
         return Promise.resolve(true);
@@ -292,8 +292,8 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
     /**
      * Checks if sync has succeed from result sync data.
      *
-     * @param  {any}     result Data returned on the sync function.
-     * @return {boolean}        If suceed or not.
+     * @param result Data returned on the sync function.
+     * @return If suceed or not.
      */
     protected hasSyncSucceed(result: any): boolean {
         return true;
@@ -302,8 +302,8 @@ export class CoreCourseModuleMainActivityComponent extends CoreCourseModuleMainR
     /**
      * Tries to synchronize the activity.
      *
-     * @param  {boolean}      [showErrors=false] If show errors to the user of hide them.
-     * @return {Promise<boolean>} Promise resolved with true if sync succeed, or false if failed.
+     * @param showErrors If show errors to the user of hide them.
+     * @return Promise resolved with true if sync succeed, or false if failed.
      */
     protected syncActivity(showErrors: boolean = false): Promise<boolean> {
         return this.sync().then((result) => {
diff --git a/src/core/course/classes/main-resource-component.ts b/src/core/course/classes/main-resource-component.ts
index e357d0888..854d194f6 100644
--- a/src/core/course/classes/main-resource-component.ts
+++ b/src/core/course/classes/main-resource-component.ts
@@ -99,10 +99,10 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     /**
      * Refresh the data.
      *
-     * @param {any}       [refresher] Refresher.
-     * @param {Function}  [done] Function to call when done.
-     * @param {boolean}   [showErrors=false] If show errors to the user of hide them.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @param done Function to call when done.
+     * @param showErrors If show errors to the user of hide them.
+     * @return Promise resolved when done.
      */
     doRefresh(refresher?: any, done?: () => void, showErrors: boolean = false): Promise<any> {
         if (this.loaded && this.module) {
@@ -129,9 +129,9 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     /**
      * Perform the refresh content function.
      *
-     * @param  {boolean}      [sync=false]       If the refresh needs syncing.
-     * @param  {boolean}      [showErrors=false] Wether to show errors to the user or hide them.
-     * @return {Promise<any>} Resolved when done.
+     * @param sync If the refresh needs syncing.
+     * @param showErrors Wether to show errors to the user or hide them.
+     * @return Resolved when done.
      */
      protected refreshContent(sync: boolean = false, showErrors: boolean = false): Promise<any> {
         if (!this.module) {
@@ -166,7 +166,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     /**
      * Perform the invalidate content function.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected invalidateContent(): Promise<any> {
         return Promise.resolve();
@@ -175,8 +175,8 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     /**
      * Download the component contents.
      *
-     * @param {boolean} [refresh] Whether we're refreshing data.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Whether we're refreshing data.
+     * @return Promise resolved when done.
      */
     protected fetchContent(refresh?: boolean): Promise<any> {
         return Promise.resolve();
@@ -185,8 +185,8 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     /**
      * Loads the component contents and shows the corresponding error.
      *
-     * @param {boolean} [refresh] Whether we're refreshing data.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Whether we're refreshing data.
+     * @return Promise resolved when done.
      */
     protected loadContent(refresh?: boolean): Promise<any> {
         if (!this.module) {
@@ -242,7 +242,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     /**
      * Go to blog posts.
      *
-     * @param {any} event Event.
+     * @param event Event.
      */
     gotoBlog(event: any): void {
         this.linkHelper.goInSite(this.navCtrl, 'AddonBlogEntriesPage', { cmId: this.module.id });
@@ -251,7 +251,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
     /**
      * Prefetch the module.
      *
-     * @param {Function}  [done] Function to call when done.
+     * @param done Function to call when done.
      */
     prefetch(done?: () => void): void {
         this.courseHelper.contextMenuPrefetch(this, this.module, this.courseId, done);
diff --git a/src/core/course/classes/module-prefetch-handler.ts b/src/core/course/classes/module-prefetch-handler.ts
index e079055ed..0bae87e2b 100644
--- a/src/core/course/classes/module-prefetch-handler.ts
+++ b/src/core/course/classes/module-prefetch-handler.ts
@@ -29,39 +29,33 @@ import { CoreCourseModulePrefetchHandler } from '../providers/module-prefetch-de
 export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePrefetchHandler {
     /**
      * Name of the handler.
-     * @type {string}
      */
     name = 'CoreCourseModulePrefetchHandler';
 
     /**
      * Name of the module. It should match the "modname" of the module returned in core_course_get_contents.
-     * @type {string}
      */
     modName = 'default';
 
     /**
      * The handler's component.
-     * @type {string}
      */
     component = 'core_module';
 
     /**
      * The RegExp to check updates. If a module has an update whose name matches this RegExp, the module will be marked
      * as outdated. This RegExp is ignored if hasUpdates function is defined.
-     * @type {RegExp}
      */
     updatesNames = /^.*files$/;
 
     /**
      * If true, this module will be ignored when determining the status of a list of modules. The module will
      * still be downloaded when downloading the section/course, it only affects whether the button should be displayed.
-     * @type {boolean}
      */
     skipListStatus = false;
 
     /**
      * List of download promises to prevent downloading the module twice at the same time.
-     * @type {{[s: string]: {[s: string]: Promise<any>}}}
      */
     protected downloadPromises: { [s: string]: { [s: string]: Promise<any> } } = {};
 
@@ -72,10 +66,10 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
     /**
      * Add an ongoing download to the downloadPromises list. When the promise finishes it will be removed.
      *
-     * @param {number} id Unique identifier per component.
-     * @param {Promise<any>} promise Promise to add.
-     * @param {String} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise of the current download.
+     * @param id Unique identifier per component.
+     * @param promise Promise to add.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise of the current download.
      */
     addOngoingDownload(id: number, promise: Promise<any>, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -96,10 +90,10 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
     /**
      * Download the module.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when all content is downloaded.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when all content is downloaded.
      */
     download(module: any, courseId: number, dirPath?: string): Promise<any> {
         // To be overridden.
@@ -109,8 +103,8 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
     /**
      * Returns a list of content files that can be downloaded.
      *
-     * @param {any} module The module object returned by WS.
-     * @return {any[]} List of files.
+     * @param module The module object returned by WS.
+     * @return List of files.
      */
     getContentDownloadableFiles(module: any): any[] {
         const files = [];
@@ -129,11 +123,11 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
     /**
      * Get the download size of a module.
      *
-     * @param {any} module Module.
-     * @param {Number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @return {Promise<{size: number, total: boolean}>} Promise resolved with the size and a boolean indicating if it was able
-     *                                                   to calculate the total size.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @return Promise resolved with the size and a boolean indicating if it was able
+     *         to calculate the total size.
      */
     getDownloadSize(module: any, courseId: number, single?: boolean): Promise<{ size: number, total: boolean }> {
         return this.getFiles(module, courseId).then((files) => {
@@ -146,9 +140,9 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
     /**
      * Get the downloaded size of a module. If not defined, we'll use getFiles to calculate it (it can be slow).
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {number|Promise<number>} Size, or promise resolved with the size.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Size, or promise resolved with the size.
      */
     getDownloadedSize(module: any, courseId: number): number | Promise<number> {
         const siteId = this.sitesProvider.getCurrentSiteId();
@@ -159,10 +153,10 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
     /**
      * Get list of files. If not defined, we'll assume they're in module.contents.
      *
-     * @param {any} module Module.
-     * @param {Number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @return {Promise<any[]>} Promise resolved with the list of files.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @return Promise resolved with the list of files.
      */
     getFiles(module: any, courseId: number, single?: boolean): Promise<any[]> {
         // To be overridden.
@@ -172,10 +166,10 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
     /**
      * Returns module intro files.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<any[]>} Promise resolved with list of intro files.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise resolved with list of intro files.
      */
     getIntroFiles(module: any, courseId: number, ignoreCache?: boolean): Promise<any[]> {
         return Promise.resolve(this.getIntroFilesFromInstance(module));
@@ -184,9 +178,9 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
     /**
      * Returns module intro files from instance.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {any} [instance] The instance to get the intro files (book, assign, ...). If not defined, module will be used.
-     * @return {any[]} List of intro files.
+     * @param module The module object returned by WS.
+     * @param instance The instance to get the intro files (book, assign, ...). If not defined, module will be used.
+     * @return List of intro files.
      */
     getIntroFilesFromInstance(module: any, instance?: any): any[] {
         if (instance) {
@@ -207,9 +201,9 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
     /**
      * If there's an ongoing download for a certain identifier return it.
      *
-     * @param {number} id Unique identifier per component.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise of the current download.
+     * @param id Unique identifier per component.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise of the current download.
      */
     getOngoingDownload(id: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -225,8 +219,8 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
     /**
      * Create unique identifier using component and id.
      *
-     * @param {number} id Unique ID inside component.
-     * @return {string} Unique ID.
+     * @param id Unique ID inside component.
+     * @return Unique ID.
      */
     getUniqueId(id: number): string {
         return this.component + '#' + id;
@@ -235,9 +229,9 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId The course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId The course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         // To be overridden.
@@ -248,9 +242,9 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
      * Invalidate WS calls needed to determine module status (usually, to check if module is downloadable).
      * It doesn't need to invalidate check updates. It should NOT invalidate files nor all the prefetched data.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when invalidated.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when invalidated.
      */
     invalidateModule(module: any, courseId: number): Promise<any> {
         return this.courseProvider.invalidateModule(module.id);
@@ -259,9 +253,9 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
     /**
      * Check if a module can be downloaded. If the function is not defined, we assume that all modules are downloadable.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {boolean|Promise<boolean>} Whether the module can be downloaded. The promise should never be rejected.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Whether the module can be downloaded. The promise should never be rejected.
      */
     isDownloadable(module: any, courseId: number): boolean | Promise<boolean> {
         // By default, mark all instances as downloadable.
@@ -271,9 +265,9 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
     /**
      * Check if a there's an ongoing download for the given identifier.
      *
-     * @param {number} id Unique identifier per component.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean} True if downloading, false otherwise.
+     * @param id Unique identifier per component.
+     * @param siteId Site ID. If not defined, current site.
+     * @return True if downloading, false otherwise.
      */
     isDownloading(id: number, siteId?: string): boolean {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -284,7 +278,7 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
+     * @return A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -293,8 +287,8 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
     /**
      * Check if a file is downloadable.
      *
-     * @param {any} file File to check.
-     * @return {boolean} Whether the file is downloadable.
+     * @param file File to check.
+     * @return Whether the file is downloadable.
      */
     isFileDownloadable(file: any): boolean {
         return file.type === 'file';
@@ -303,10 +297,10 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
     /**
      * Load module contents into module.contents if they aren't loaded already.
      *
-     * @param {any} module Module to load the contents.
-     * @param {number} [courseId] The course ID. Recommended to speed up the process and minimize data usage.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise}           Promise resolved when loaded.
+     * @param module Module to load the contents.
+     * @param courseId The course ID. Recommended to speed up the process and minimize data usage.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise resolved when loaded.
      */
     loadContents(module: any, courseId: number, ignoreCache?: boolean): Promise<void> {
         // To be overridden.
@@ -316,11 +310,11 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
     /**
      * Prefetch a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
      */
     prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string): Promise<any> {
         // To be overridden.
@@ -330,9 +324,9 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
     /**
      * Remove module downloaded files. If not defined, we'll use getFiles to remove them (slow).
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when done.
      */
     removeFiles(module: any, courseId: number): Promise<any> {
         return this.filepoolProvider.removeFilesByComponent(this.sitesProvider.getCurrentSiteId(), this.component, module.id);
diff --git a/src/core/course/classes/resource-prefetch-handler.ts b/src/core/course/classes/resource-prefetch-handler.ts
index f7e7386d3..f3ce201e1 100644
--- a/src/core/course/classes/resource-prefetch-handler.ts
+++ b/src/core/course/classes/resource-prefetch-handler.ts
@@ -28,10 +28,10 @@ export class CoreCourseResourcePrefetchHandlerBase extends CoreCourseModulePrefe
     /**
      * Download the module.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when all content is downloaded.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when all content is downloaded.
      */
     download(module: any, courseId: number, dirPath?: string): Promise<any> {
         return this.downloadOrPrefetch(module, courseId, false, dirPath);
@@ -40,13 +40,13 @@ export class CoreCourseResourcePrefetchHandlerBase extends CoreCourseModulePrefe
     /**
      * Download or prefetch the content.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @param {boolean} [prefetch] True to prefetch, false to download right away.
-     * @param {string} [dirPath] Path of the directory where to store all the content files. This is to keep the files
-     *                           relative paths and make the package work in an iframe. Undefined to download the files
-     *                           in the filepool root folder.
-     * @return {Promise<any>} Promise resolved when all content is downloaded. Data returned is not reliable.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @param prefetch True to prefetch, false to download right away.
+     * @param dirPath Path of the directory where to store all the content files. This is to keep the files
+     *                relative paths and make the package work in an iframe. Undefined to download the files
+     *                in the filepool root folder.
+     * @return Promise resolved when all content is downloaded. Data returned is not reliable.
      */
     downloadOrPrefetch(module: any, courseId: number, prefetch?: boolean, dirPath?: string): Promise<any> {
         if (!this.appProvider.isOnline()) {
@@ -96,10 +96,10 @@ export class CoreCourseResourcePrefetchHandlerBase extends CoreCourseModulePrefe
     /**
      * Get list of files. If not defined, we'll assume they're in module.contents.
      *
-     * @param {any} module Module.
-     * @param {Number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @return {Promise<any[]>} Promise resolved with the list of files.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @return Promise resolved with the list of files.
      */
     getFiles(module: any, courseId: number, single?: boolean): Promise<any[]> {
         // Load module contents if needed.
@@ -113,9 +113,9 @@ export class CoreCourseResourcePrefetchHandlerBase extends CoreCourseModulePrefe
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId The course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId The course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         const promises = [],
@@ -130,10 +130,10 @@ export class CoreCourseResourcePrefetchHandlerBase extends CoreCourseModulePrefe
     /**
      * Load module contents into module.contents if they aren't loaded already.
      *
-     * @param {any} module Module to load the contents.
-     * @param {number} [courseId] The course ID. Recommended to speed up the process and minimize data usage.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise}           Promise resolved when loaded.
+     * @param module Module to load the contents.
+     * @param courseId The course ID. Recommended to speed up the process and minimize data usage.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise resolved when loaded.
      */
     loadContents(module: any, courseId: number, ignoreCache?: boolean): Promise<void> {
         return this.courseProvider.loadModuleContents(module, courseId, undefined, false, ignoreCache);
@@ -142,11 +142,11 @@ export class CoreCourseResourcePrefetchHandlerBase extends CoreCourseModulePrefe
     /**
      * Prefetch a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
      */
     prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string): Promise<any> {
         return this.downloadOrPrefetch(module, courseId, true, dirPath);
diff --git a/src/core/course/components/format/format.ts b/src/core/course/components/format/format.ts
index 8455d4487..f15589083 100644
--- a/src/core/course/components/format/format.ts
+++ b/src/core/course/components/format/format.ts
@@ -271,7 +271,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     /**
      * Display the section selector modal.
      *
-     * @param {MouseEvent} event Event.
+     * @param event Event.
      */
     showSectionSelector(event: MouseEvent): void {
         if (!this.sectionSelectorExpanded) {
@@ -296,7 +296,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     /**
      * Function called when selected section changes.
      *
-     * @param {any} newSection The new selected section.
+     * @param newSection The new selected section.
      */
     sectionChanged(newSection: any): void {
         const previousValue = this.selectedSection;
@@ -351,9 +351,9 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     /**
      * Compare if two sections are equal.
      *
-     * @param {any} s1 First section.
-     * @param {any} s2 Second section.
-     * @return {boolean} Whether they're equal.
+     * @param s1 First section.
+     * @param s2 Second section.
+     * @return Whether they're equal.
      */
     compareSections(s1: any, s2: any): boolean {
         return s1 && s2 ? s1.id === s2.id : s1 === s2;
@@ -362,7 +362,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     /**
      * Calculate the status of sections.
      *
-     * @param {boolean} refresh If refresh or not.
+     * @param refresh If refresh or not.
      */
     protected calculateSectionsStatus(refresh?: boolean): void {
         this.courseHelper.calculateSectionsStatus(this.sections, this.course.id, refresh).catch(() => {
@@ -373,8 +373,8 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     /**
      * Confirm and prefetch a section. If the section is "all sections", prefetch all the sections.
      *
-     * @param {any} section Section to download.
-     * @param {boolean} refresh Refresh clicked (not used).
+     * @param section Section to download.
+     * @param refresh Refresh clicked (not used).
      */
     prefetch(section: any, refresh: boolean = false): void {
         section.isCalculating = true;
@@ -393,9 +393,9 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     /**
      * Prefetch a section.
      *
-     * @param {any} section The section to download.
-     * @param {boolean} [manual] Whether the prefetch was started manually or it was automatically started because all modules
-     *                           are being downloaded.
+     * @param section The section to download.
+     * @param manual Whether the prefetch was started manually or it was automatically started because all modules
+     *               are being downloaded.
      */
     protected prefetchSection(section: any, manual?: boolean): void {
         this.courseHelper.prefetchSection(section, this.course.id, this.sections).catch((error) => {
@@ -411,10 +411,10 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     /**
      * Refresh the data.
      *
-     * @param {any} [refresher] Refresher.
-     * @param {Function} [done] Function to call when done.
-     * @param {boolean} [afterCompletionChange] Whether the refresh is due to a completion change.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @param done Function to call when done.
+     * @param afterCompletionChange Whether the refresh is due to a completion change.
+     * @return Promise resolved when done.
      */
     doRefresh(refresher?: any, done?: () => void, afterCompletionChange?: boolean): Promise<any> {
         const promises = [];
@@ -433,7 +433,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     /**
      * Show more activities (only used when showing all the sections at the same time).
      *
-     * @param {any} [infiniteComplete] Infinite scroll complete function. Only used from core-infinite-loading.
+     * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
      */
     showMoreActivities(infiniteComplete?: any): void {
         this.canLoadMore = false;
@@ -508,8 +508,8 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     /**
      * Check whether a section can be viewed.
      *
-     * @param {any} section The section to check.
-     * @return {boolean} Whether the section can be viewed.
+     * @param section The section to check.
+     * @return Whether the section can be viewed.
      */
     canViewSection(section: any): boolean {
         return section.uservisible !== false && !section.hiddenbynumsections &&
@@ -543,7 +543,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
     /**
      * Recalculate the download status of each section, in response to a module being downloaded.
      *
-     * @param {any} eventData
+     * @param eventData
      */
     onModuleStatusChange(eventData: any): void {
         this.courseHelper.calculateSectionsStatus(this.sections, this.course.id, false, false);
diff --git a/src/core/course/components/module-completion/module-completion.ts b/src/core/course/components/module-completion/module-completion.ts
index 73efcc86f..7d4141d43 100644
--- a/src/core/course/components/module-completion/module-completion.ts
+++ b/src/core/course/components/module-completion/module-completion.ts
@@ -58,7 +58,7 @@ export class CoreCourseModuleCompletionComponent implements OnChanges {
     /**
      * Completion clicked.
      *
-     * @param {Event} e The click event.
+     * @param e The click event.
      */
     completionClicked(e: Event): void {
         if (this.completion) {
diff --git a/src/core/course/components/module/module.ts b/src/core/course/components/module/module.ts
index 3bdb1a898..8acfd8dc2 100644
--- a/src/core/course/components/module/module.ts
+++ b/src/core/course/components/module/module.ts
@@ -111,7 +111,7 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
     /**
      * Function called when the module is clicked.
      *
-     * @param {Event} event Click event.
+     * @param event Click event.
      */
     moduleClicked(event: Event): void {
         if (this.module.uservisible !== false && this.module.handlerData.action) {
@@ -122,8 +122,8 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
     /**
      * Function called when a button is clicked.
      *
-     * @param {Event} event Click event.
-     * @param {CoreCourseModuleHandlerButton} button The clicked button.
+     * @param event Click event.
+     * @param button The clicked button.
      */
     buttonClicked(event: Event, button: CoreCourseModuleHandlerButton): void {
         if (button && button.action) {
@@ -137,7 +137,7 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
     /**
      * Download the module.
      *
-     * @param {boolean} refresh Whether it's refreshing.
+     * @param refresh Whether it's refreshing.
      */
     download(refresh: boolean): void {
         if (!this.prefetchHandler) {
@@ -169,7 +169,7 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
     /**
      * Show download buttons according to module status.
      *
-     * @param {string} status Module status.
+     * @param status Module status.
      */
     protected showStatus(status: string): void {
         if (status) {
diff --git a/src/core/course/components/tag-area/tag-area.ts b/src/core/course/components/tag-area/tag-area.ts
index 07d34c21c..fa37a678e 100644
--- a/src/core/course/components/tag-area/tag-area.ts
+++ b/src/core/course/components/tag-area/tag-area.ts
@@ -33,7 +33,7 @@ export class CoreCourseTagAreaComponent {
     /**
      * Open a course.
      *
-     * @param {number} courseId The course to open.
+     * @param courseId The course to open.
      */
     openCourse(courseId: number): void {
         // If this component is inside a split view, use the master nav to open it.
diff --git a/src/core/course/formats/singleactivity/components/singleactivity.ts b/src/core/course/formats/singleactivity/components/singleactivity.ts
index fb2a21924..946b9ea8d 100644
--- a/src/core/course/formats/singleactivity/components/singleactivity.ts
+++ b/src/core/course/formats/singleactivity/components/singleactivity.ts
@@ -64,10 +64,10 @@ export class CoreCourseFormatSingleActivityComponent implements OnChanges {
     /**
      * Refresh the data.
      *
-     * @param {any} [refresher] Refresher.
-     * @param {Function} [done] Function to call when done.
-     * @param {boolean} [afterCompletionChange] Whether the refresh is due to a completion change.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @param done Function to call when done.
+     * @param afterCompletionChange Whether the refresh is due to a completion change.
+     * @return Promise resolved when done.
      */
     doRefresh(refresher?: any, done?: () => void, afterCompletionChange?: boolean): Promise<any> {
         if (afterCompletionChange) {
diff --git a/src/core/course/formats/singleactivity/providers/handler.ts b/src/core/course/formats/singleactivity/providers/handler.ts
index 328ae5ee6..d85d68ed7 100644
--- a/src/core/course/formats/singleactivity/providers/handler.ts
+++ b/src/core/course/formats/singleactivity/providers/handler.ts
@@ -32,7 +32,7 @@ export class CoreCourseFormatSingleActivityHandler implements CoreCourseFormatHa
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -41,8 +41,8 @@ export class CoreCourseFormatSingleActivityHandler implements CoreCourseFormatHa
     /**
      * Whether it allows seeing all sections at the same time. Defaults to true.
      *
-     * @param {any} course The course to check.
-     * @type {boolean} Whether it can view all sections.
+     * @param course The course to check.
+     * @return Whether it can view all sections.
      */
     canViewAllSections(course: any): boolean {
         return false;
@@ -52,9 +52,9 @@ export class CoreCourseFormatSingleActivityHandler implements CoreCourseFormatHa
      * Get the title to use in course page. If not defined, course displayname or fullname.
      * This function will be called without sections first, and then call it again when the sections are retrieved.
      *
-     * @param {any} course The course.
-     * @param {any[]} [sections] List of sections.
-     * @return {string} Title.
+     * @param course The course.
+     * @param sections List of sections.
+     * @return Title.
      */
     getCourseTitle(course: any, sections?: any[]): string {
         if (sections && sections[0] && sections[0].modules && sections[0].modules[0]) {
@@ -73,8 +73,8 @@ export class CoreCourseFormatSingleActivityHandler implements CoreCourseFormatHa
     /**
      * Whether the option to enable section/module download should be displayed. Defaults to true.
      *
-     * @param {any} course The course to check.
-     * @return {boolean} Whether the option to enable section/module download should be displayed
+     * @param course The course to check.
+     * @return Whether the option to enable section/module download should be displayed
      */
     displayEnableDownload(course: any): boolean {
         return false;
@@ -83,8 +83,8 @@ export class CoreCourseFormatSingleActivityHandler implements CoreCourseFormatHa
     /**
      * Whether the default section selector should be displayed. Defaults to true.
      *
-     * @param {any} course The course to check.
-     * @type {boolean} Whether the default section selector should be displayed.
+     * @param course The course to check.
+     * @return Whether the default section selector should be displayed.
      */
     displaySectionSelector(course: any): boolean {
         return false;
@@ -94,9 +94,9 @@ export class CoreCourseFormatSingleActivityHandler implements CoreCourseFormatHa
      * Whether the course refresher should be displayed. If it returns false, a refresher must be included in the course format,
      * and the doRefresh method of CoreCourseSectionPage must be called on refresh. Defaults to true.
      *
-     * @param {any} course The course to check.
-     * @param {any[]} sections List of course sections.
-     * @return {boolean} Whether the refresher should be displayed.
+     * @param course The course to check.
+     * @param sections List of course sections.
+     * @return Whether the refresher should be displayed.
      */
     displayRefresher(course: any, sections: any[]): boolean {
         if (sections && sections[0] && sections[0].modules && sections[0].modules[0]) {
@@ -112,9 +112,9 @@ export class CoreCourseFormatSingleActivityHandler implements CoreCourseFormatHa
      * If you want to customize the default format there are several methods to customize parts of it.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param course The course to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getCourseFormatComponent(injector: Injector, course: any): any | Promise<any> {
         return CoreCourseFormatSingleActivityComponent;
@@ -124,8 +124,8 @@ export class CoreCourseFormatSingleActivityHandler implements CoreCourseFormatHa
      * Whether the view should be refreshed when completion changes. If your course format doesn't display
      * activity completion then you should return false.
      *
-     * @param {any} course The course.
-     * @return {boolean|Promise<boolean>} Whether course view should be refreshed when an activity completion changes.
+     * @param course The course.
+     * @return Whether course view should be refreshed when an activity completion changes.
      */
     shouldRefreshWhenCompletionChanges(course: any): boolean | Promise<boolean> {
         return false;
diff --git a/src/core/course/formats/topics/providers/handler.ts b/src/core/course/formats/topics/providers/handler.ts
index 0f6d49e3c..d4a3c4457 100644
--- a/src/core/course/formats/topics/providers/handler.ts
+++ b/src/core/course/formats/topics/providers/handler.ts
@@ -30,7 +30,7 @@ export class CoreCourseFormatTopicsHandler implements CoreCourseFormatHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/core/course/formats/weeks/providers/handler.ts b/src/core/course/formats/weeks/providers/handler.ts
index ccaef9d44..66245bbbe 100644
--- a/src/core/course/formats/weeks/providers/handler.ts
+++ b/src/core/course/formats/weeks/providers/handler.ts
@@ -30,7 +30,7 @@ export class CoreCourseFormatWeeksHandler implements CoreCourseFormatHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -39,9 +39,9 @@ export class CoreCourseFormatWeeksHandler implements CoreCourseFormatHandler {
     /**
      * Given a list of sections, get the "current" section that should be displayed first.
      *
-     * @param {any} course The course to get the title.
-     * @param {any[]} sections List of sections.
-     * @return {any|Promise<any>} Current section (or promise resolved with current section).
+     * @param course The course to get the title.
+     * @param sections List of sections.
+     * @return Current section (or promise resolved with current section).
      */
     getCurrentSection(course: any, sections: any[]): any | Promise<any> {
         const now = this.timeUtils.timestamp();
@@ -70,9 +70,9 @@ export class CoreCourseFormatWeeksHandler implements CoreCourseFormatHandler {
     /**
      * Return the start and end date of a section.
      *
-     * @param {any} section The section to treat.
-     * @param {number} startDate The course start date (in seconds).
-     * @return {{start: number, end: number}} An object with the start and end date of the section.
+     * @param section The section to treat.
+     * @param startDate The course start date (in seconds).
+     * @return An object with the start and end date of the section.
      */
     protected getSectionDates(section: any, startDate: number): { start: number, end: number } {
         // Hack alert. We add 2 hours to avoid possible DST problems. (e.g. we go into daylight savings and the date changes).
diff --git a/src/core/course/pages/list-mod-type/list-mod-type.ts b/src/core/course/pages/list-mod-type/list-mod-type.ts
index 37220ae4a..759c3d47d 100644
--- a/src/core/course/pages/list-mod-type/list-mod-type.ts
+++ b/src/core/course/pages/list-mod-type/list-mod-type.ts
@@ -63,7 +63,7 @@ export class CoreCourseListModTypePage {
     /**
      * Fetches the data.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected fetchData(): Promise<any> {
         // Get all the modules in the course.
@@ -113,7 +113,7 @@ export class CoreCourseListModTypePage {
     /**
      * Refresh the data.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshData(refresher: any): void {
         this.courseProvider.invalidateSections(this.courseId).finally(() => {
diff --git a/src/core/course/pages/section-selector/section-selector.ts b/src/core/course/pages/section-selector/section-selector.ts
index 6186fe8ca..381132fba 100644
--- a/src/core/course/pages/section-selector/section-selector.ts
+++ b/src/core/course/pages/section-selector/section-selector.ts
@@ -69,7 +69,7 @@ export class CoreCourseSectionSelectorPage {
     /**
      * Select a section.
      *
-     * @param {any} section Selected section object.
+     * @param section Selected section object.
      */
     selectSection(section: any): void {
         if (section.uservisible !== false) {
diff --git a/src/core/course/pages/section/section.ts b/src/core/course/pages/section/section.ts
index 85f3ab89e..f5e61c060 100644
--- a/src/core/course/pages/section/section.ts
+++ b/src/core/course/pages/section/section.ts
@@ -187,9 +187,9 @@ export class CoreCourseSectionPage implements OnDestroy {
     /**
      * Fetch and load all the data required for the view.
      *
-     * @param {boolean} [refresh] If it's refreshing content.
-     * @param {boolean} [sync] If it should try to sync.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh If it's refreshing content.
+     * @param sync If it should try to sync.
+     * @return Promise resolved when done.
      */
     protected loadData(refresh?: boolean, sync?: boolean): Promise<any> {
         // First of all, get the course because the data might have changed.
@@ -348,8 +348,8 @@ export class CoreCourseSectionPage implements OnDestroy {
     /**
      * Refresh the data.
      *
-     * @param  {any} [refresher] Refresher.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @return Promise resolved when done.
      */
     doRefresh(refresher?: any): Promise<any> {
         return this.invalidateData().finally(() => {
@@ -402,7 +402,7 @@ export class CoreCourseSectionPage implements OnDestroy {
     /**
      * Refresh list after a completion change since there could be new activities.
      *
-     * @param {boolean} [sync] If it should try to sync.
+     * @param sync If it should try to sync.
      */
     protected refreshAfterCompletionChange(sync?: boolean): void {
         // Save scroll position to restore it once done.
@@ -428,7 +428,7 @@ export class CoreCourseSectionPage implements OnDestroy {
     /**
      * Determines the prefetch icon of the course.
      *
-     * @return {Promise<void>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected determineCoursePrefetchIcon(): Promise<void> {
         return this.courseHelper.getCourseStatusIconAndTitle(this.course.id).then((data) => {
@@ -460,7 +460,7 @@ export class CoreCourseSectionPage implements OnDestroy {
     /**
      * Update the course status icon and title.
      *
-     * @param {string} status Status to show.
+     * @param status Status to show.
      */
     protected updateCourseStatus(status: string): void {
         const statusData = this.courseHelper.getCourseStatusIconAndTitleFromStatus(status);
@@ -479,7 +479,7 @@ export class CoreCourseSectionPage implements OnDestroy {
     /**
      * Opens a menu item registered to the delegate.
      *
-     * @param {CoreCourseMenuHandlerToDisplay} item Item to open
+     * @param item Item to open
      */
     openMenuItem(item: CoreCourseOptionsMenuHandlerToDisplay): void {
         const params = Object.assign({ course: this.course}, item.data.pageParams);
diff --git a/src/core/course/providers/course-offline.ts b/src/core/course/providers/course-offline.ts
index 4de3ac671..4a5db05af 100644
--- a/src/core/course/providers/course-offline.ts
+++ b/src/core/course/providers/course-offline.ts
@@ -63,9 +63,9 @@ export class CoreCourseOfflineProvider {
     /**
      * Delete a manual completion stored.
      *
-     * @param {number} cmId The module ID to remove the completion.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when deleted, rejected if failure.
+     * @param cmId The module ID to remove the completion.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when deleted, rejected if failure.
      */
     deleteManualCompletion(cmId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -77,8 +77,8 @@ export class CoreCourseOfflineProvider {
     /**
      * Get all offline manual completions for a certain course.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the list of completions.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of completions.
      */
     getAllManualCompletions(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -90,9 +90,9 @@ export class CoreCourseOfflineProvider {
     /**
      * Get all offline manual completions for a certain course.
      *
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the list of completions.
+     * @param courseId Course ID the module belongs to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of completions.
      */
     getCourseManualCompletions(courseId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -104,9 +104,9 @@ export class CoreCourseOfflineProvider {
     /**
      * Get the offline manual completion for a certain module.
      *
-     * @param {number} cmId The module ID to remove the completion.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the completion, rejected if failure or not found.
+     * @param cmId The module ID to remove the completion.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the completion, rejected if failure or not found.
      */
     getManualCompletion(cmId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -118,12 +118,12 @@ export class CoreCourseOfflineProvider {
     /**
      * Offline version for manually marking a module as completed.
      *
-     * @param {number} cmId The module ID to store the completion.
-     * @param {number} completed Whether the module is completed or not.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {string} [courseName] Course name. Recommended, it is used to display a better warning message.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<{status: boolean, offline: boolean}>} Promise resolved when completion is successfully stored.
+     * @param cmId The module ID to store the completion.
+     * @param completed Whether the module is completed or not.
+     * @param courseId Course ID the module belongs to.
+     * @param courseName Course name. Recommended, it is used to display a better warning message.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when completion is successfully stored.
      */
     markCompletedManually(cmId: number, completed: number, courseId: number, courseName?: string, siteId?: string)
             : Promise<{status: boolean, offline: boolean}> {
diff --git a/src/core/course/providers/course-tag-area-handler.ts b/src/core/course/providers/course-tag-area-handler.ts
index 066754de6..6a40f6371 100644
--- a/src/core/course/providers/course-tag-area-handler.ts
+++ b/src/core/course/providers/course-tag-area-handler.ts
@@ -29,7 +29,7 @@ export class CoreCourseTagAreaHandler implements CoreTagAreaHandler {
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -38,8 +38,8 @@ export class CoreCourseTagAreaHandler implements CoreTagAreaHandler {
     /**
      * Parses the rendered content of a tag index and returns the items.
      *
-     * @param {string} content Rendered content.
-     * @return {any[]|Promise<any[]>} Area items (or promise resolved with the items).
+     * @param content Rendered content.
+     * @return Area items (or promise resolved with the items).
      */
     parseContent(content: string): any[] | Promise<any[]> {
         const items = [];
@@ -65,8 +65,8 @@ export class CoreCourseTagAreaHandler implements CoreTagAreaHandler {
     /**
      * Get the component to use to display items.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return CoreCourseTagAreaComponent;
diff --git a/src/core/course/providers/course.ts b/src/core/course/providers/course.ts
index d15793574..1b1af7c17 100644
--- a/src/core/course/providers/course.ts
+++ b/src/core/course/providers/course.ts
@@ -113,7 +113,7 @@ export class CoreCourseProvider {
     /**
      * Check if the get course blocks WS is available in current site.
      *
-     * @return {boolean} Whether it's available.
+     * @return Whether it's available.
      * @since 3.7
      */
     canGetCourseBlocks(): boolean {
@@ -124,8 +124,8 @@ export class CoreCourseProvider {
     /**
      * Check whether the site supports requesting stealth modules.
      *
-     * @param {CoreSite} [site] Site. If not defined, current site.
-     * @return {boolean} Whether the site supports requesting stealth modules.
+     * @param site Site. If not defined, current site.
+     * @return Whether the site supports requesting stealth modules.
      * @since 3.4.6, 3.5.3, 3.6
      */
     canRequestStealthModules(site?: CoreSite): boolean {
@@ -138,8 +138,8 @@ export class CoreCourseProvider {
      * Check if module completion could have changed. If it could have, trigger event. This function must be used,
      * for example, after calling a "module_view" WS since it can change the module completion.
      *
-     * @param {number} courseId Course ID.
-     * @param {any} completion Completion status of the module.
+     * @param courseId Course ID.
+     * @param completion Completion status of the module.
      */
     checkModuleCompletion(courseId: number, completion: any): void {
         if (completion && completion.tracking === 2 && completion.state === 0) {
@@ -152,8 +152,8 @@ export class CoreCourseProvider {
     /**
      * Clear all courses status in a site.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<void>} Promise resolved when all status are cleared.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when all status are cleared.
      */
     clearAllCoursesStatus(siteId?: string): Promise<void> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -168,9 +168,9 @@ export class CoreCourseProvider {
     /**
      * Check if the current view in a NavController is a certain course initial page.
      *
-     * @param {NavController} navCtrl NavController.
-     * @param {number} courseId Course ID.
-     * @return {boolean} Whether the current view is a certain course.
+     * @param navCtrl NavController.
+     * @param courseId Course ID.
+     * @return Whether the current view is a certain course.
      */
     currentViewIsCourse(navCtrl: NavController, courseId: number): boolean {
         if (navCtrl) {
@@ -185,13 +185,13 @@ export class CoreCourseProvider {
     /**
      * Get completion status of all the activities in a course for a certain user.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined, current user.
-     * @param {boolean} [forceCache] True if it should return cached data. Has priority over ignoreCache.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {boolean} [includeOffline=true] True if it should load offline data in the completion status.
-     * @return {Promise<any>} Promise resolved with the completion statuses: object where the key is module ID.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined, current user.
+     * @param forceCache True if it should return cached data. Has priority over ignoreCache.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param includeOffline True if it should load offline data in the completion status.
+     * @return Promise resolved with the completion statuses: object where the key is module ID.
      */
     getActivitiesCompletionStatus(courseId: number, siteId?: string, userId?: number, forceCache: boolean = false,
             ignoreCache: boolean = false, includeOffline: boolean = true): Promise<any> {
@@ -254,9 +254,9 @@ export class CoreCourseProvider {
     /**
      * Get cache key for activities completion WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} userId User ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getActivitiesCompletionCacheKey(courseId: number, userId: number): string {
         return this.ROOT_CACHE_KEY + 'activitiescompletion:' + courseId + ':' + userId;
@@ -265,9 +265,9 @@ export class CoreCourseProvider {
     /**
      * Get course blocks.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the list of blocks.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of blocks.
      * @since 3.7
      */
     getCourseBlocks(courseId: number, siteId?: string): Promise<any[]> {
@@ -290,8 +290,8 @@ export class CoreCourseProvider {
     /**
      * Get cache key for course blocks WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getCourseBlocksCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'courseblocks:' + courseId;
@@ -300,9 +300,9 @@ export class CoreCourseProvider {
     /**
      * Get the data stored for a course.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the data.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the data.
      */
     getCourseStatusData(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -319,9 +319,9 @@ export class CoreCourseProvider {
     /**
      * Get a course status.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<string>} Promise resolved with the status.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the status.
      */
     getCourseStatus(courseId: number, siteId?: string): Promise<string> {
         return this.getCourseStatusData(courseId, siteId).then((entry) => {
@@ -334,15 +334,15 @@ export class CoreCourseProvider {
     /**
      * Get a module from Moodle.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} [courseId] The course ID. Recommended to speed up the process and minimize data usage.
-     * @param {number} [sectionId] The section ID.
-     * @param {boolean} [preferCache] True if shouldn't call WS if data is cached, false otherwise.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {string} [modName] If set, the app will retrieve all modules of this type with a single WS call. This reduces the
-     *                           number of WS calls, but it isn't recommended for modules that can return a lot of contents.
-     * @return {Promise<any>} Promise resolved with the module.
+     * @param moduleId The module ID.
+     * @param courseId The course ID. Recommended to speed up the process and minimize data usage.
+     * @param sectionId The section ID.
+     * @param preferCache True if shouldn't call WS if data is cached, false otherwise.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @param modName If set, the app will retrieve all modules of this type with a single WS call. This reduces the
+     *                number of WS calls, but it isn't recommended for modules that can return a lot of contents.
+     * @return Promise resolved with the module.
      */
     getModule(moduleId: number, courseId?: number, sectionId?: number, preferCache?: boolean, ignoreCache?: boolean,
             siteId?: string, modName?: string): Promise<any> {
@@ -457,9 +457,9 @@ export class CoreCourseProvider {
     /**
      * Gets a module basic info by module ID.
      *
-     * @param {number} moduleId Module ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the module's info.
+     * @param moduleId Module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the module's info.
      */
     getModuleBasicInfo(moduleId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -488,9 +488,9 @@ export class CoreCourseProvider {
      *
      * If the user does not have permision to manage the activity false is returned.
      *
-     * @param {number} moduleId Module ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the module's grade info.
+     * @param moduleId Module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the module's grade info.
      */
     getModuleBasicGradeInfo(moduleId: number, siteId?: string): Promise<any> {
         return this.getModuleBasicInfo(moduleId, siteId).then((info) => {
@@ -514,10 +514,10 @@ export class CoreCourseProvider {
     /**
      * Gets a module basic info by instance.
      *
-     * @param {number} id Instance ID.
-     * @param {string} module Name of the module. E.g. 'glossary'.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the module's info.
+     * @param id Instance ID.
+     * @param module Name of the module. E.g. 'glossary'.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the module's info.
      */
     getModuleBasicInfoByInstance(id: number, module: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -545,9 +545,9 @@ export class CoreCourseProvider {
     /**
      * Get cache key for get module by instance WS calls.
      *
-     * @param {number} id Instance ID.
-     * @param {string} module Name of the module. E.g. 'glossary'.
-     * @return {string} Cache key.
+     * @param id Instance ID.
+     * @param module Name of the module. E.g. 'glossary'.
+     * @return Cache key.
      */
     protected getModuleBasicInfoByInstanceCacheKey(id: number, module: string): string {
         return this.ROOT_CACHE_KEY + 'moduleByInstance:' + module + ':' + id;
@@ -556,8 +556,8 @@ export class CoreCourseProvider {
     /**
      * Get cache key for module WS calls.
      *
-     * @param {number} moduleId Module ID.
-     * @return {string} Cache key.
+     * @param moduleId Module ID.
+     * @return Cache key.
      */
     protected getModuleCacheKey(moduleId: number): string {
         return this.ROOT_CACHE_KEY + 'module:' + moduleId;
@@ -566,8 +566,8 @@ export class CoreCourseProvider {
     /**
      * Get cache key for module by modname WS calls.
      *
-     * @param {string} modName Name of the module.
-     * @return {string} Cache key.
+     * @param modName Name of the module.
+     * @return Cache key.
      */
     protected getModuleByModNameCacheKey(modName: string): string {
         return this.ROOT_CACHE_KEY + 'module:modName:' + modName;
@@ -576,9 +576,9 @@ export class CoreCourseProvider {
     /**
      * Returns the source to a module icon.
      *
-     * @param {string} moduleName The module name.
-     * @param {string} [modicon] The mod icon string to use in case we are not using a core activity.
-     * @return {string} The IMG src.
+     * @param moduleName The module name.
+     * @param modicon The mod icon string to use in case we are not using a core activity.
+     * @return The IMG src.
      */
     getModuleIconSrc(moduleName: string, modicon?: string): string {
         // @TODO: Check modicon url theme to apply other theme icons.
@@ -598,9 +598,9 @@ export class CoreCourseProvider {
     /**
      * Get the section ID a module belongs to.
      *
-     * @param {number} moduleId The module ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number>} Promise resolved with the section ID.
+     * @param moduleId The module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the section ID.
      */
     getModuleSectionId(moduleId: number, siteId?: string): Promise<number> {
         // Try to get the section using getModuleBasicInfo.
@@ -612,12 +612,12 @@ export class CoreCourseProvider {
     /**
      * Return a specific section.
      *
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @param {boolean} [excludeModules] Do not return modules, return only the sections structure.
-     * @param {boolean} [excludeContents] Do not return module contents (i.e: files inside a resource).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the section.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @param excludeModules Do not return modules, return only the sections structure.
+     * @param excludeContents Do not return module contents (i.e: files inside a resource).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the section.
      */
     getSection(courseId: number, sectionId?: number, excludeModules?: boolean, excludeContents?: boolean, siteId?: string)
         : Promise<any> {
@@ -640,13 +640,13 @@ export class CoreCourseProvider {
     /**
      * Get the course sections.
      *
-     * @param {number} courseId The course ID.
-     * @param {boolean} [excludeModules] Do not return modules, return only the sections structure.
-     * @param {boolean} [excludeContents] Do not return module contents (i.e: files inside a resource).
-     * @param {CoreSiteWSPreSets} [preSets] Presets to use.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {boolean} [includeStealthModules] Whether to include stealth modules. Defaults to true.
-     * @return {Promise}                The reject contains the error message, else contains the sections.
+     * @param courseId The course ID.
+     * @param excludeModules Do not return modules, return only the sections structure.
+     * @param excludeContents Do not return module contents (i.e: files inside a resource).
+     * @param preSets Presets to use.
+     * @param siteId Site ID. If not defined, current site.
+     * @param includeStealthModules Whether to include stealth modules. Defaults to true.
+     * @return The reject contains the error message, else contains the sections.
      */
     getSections(courseId?: number, excludeModules?: boolean, excludeContents?: boolean, preSets?: CoreSiteWSPreSets,
         siteId?: string, includeStealthModules: boolean = true): Promise<any[]> {
@@ -705,8 +705,8 @@ export class CoreCourseProvider {
     /**
      * Get cache key for section WS call.
      *
-     * @param {number} courseId Course ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getSectionsCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'sections:' + courseId;
@@ -715,8 +715,8 @@ export class CoreCourseProvider {
     /**
      * Given a list of sections, returns the list of modules in the sections.
      *
-     * @param {any[]} sections Sections.
-     * @return {any[]} Modules.
+     * @param sections Sections.
+     * @return Modules.
      */
     getSectionsModules(sections: any[]): any[] {
         if (!sections || !sections.length) {
@@ -736,9 +736,9 @@ export class CoreCourseProvider {
     /**
      * Invalidates course blocks WS call.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCourseBlocks(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -749,10 +749,10 @@ export class CoreCourseProvider {
     /**
      * Invalidates module WS call.
      *
-     * @param {number} moduleId Module ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {string} [modName] Module name. E.g. 'label', 'url', ...
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId Module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param modName Module name. E.g. 'label', 'url', ...
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateModule(moduleId: number, siteId?: string, modName?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -771,10 +771,10 @@ export class CoreCourseProvider {
     /**
      * Invalidates module WS call.
      *
-     * @param {number} id Instance ID.
-     * @param {string} module Name of the module. E.g. 'glossary'.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param id Instance ID.
+     * @param module Name of the module. E.g. 'glossary'.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateModuleByInstance(id: number, module: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -785,10 +785,10 @@ export class CoreCourseProvider {
     /**
      * Invalidates sections WS call.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined, current user.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined, current user.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateSections(courseId: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -810,15 +810,15 @@ export class CoreCourseProvider {
     /**
      * Load module contents into module.contents if they aren't loaded already.
      *
-     * @param {any} module Module to load the contents.
-     * @param {number} [courseId] The course ID. Recommended to speed up the process and minimize data usage.
-     * @param {number} [sectionId] The section ID.
-     * @param {boolean} [preferCache] True if shouldn't call WS if data is cached, false otherwise.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {string} [modName] If set, the app will retrieve all modules of this type with a single WS call. This reduces the
-     *                           number of WS calls, but it isn't recommended for modules that can return a lot of contents.
-     * @return {Promise<void>} Promise resolved when loaded.
+     * @param module Module to load the contents.
+     * @param courseId The course ID. Recommended to speed up the process and minimize data usage.
+     * @param sectionId The section ID.
+     * @param preferCache True if shouldn't call WS if data is cached, false otherwise.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @param modName If set, the app will retrieve all modules of this type with a single WS call. This reduces the
+     *                number of WS calls, but it isn't recommended for modules that can return a lot of contents.
+     * @return Promise resolved when loaded.
      */
     loadModuleContents(module: any, courseId?: number, sectionId?: number, preferCache?: boolean, ignoreCache?: boolean,
             siteId?: string, modName?: string): Promise<void> {
@@ -836,11 +836,11 @@ export class CoreCourseProvider {
     /**
      * Report a course and section as being viewed.
      *
-     * @param {number} courseId  Course ID.
-     * @param {number} [sectionNumber] Section number.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {string} [name] Name of the course.
-     * @return {Promise<void>} Promise resolved when the WS call is successful.
+     * @param courseId Course ID.
+     * @param sectionNumber Section number.
+     * @param siteId Site ID. If not defined, current site.
+     * @param name Name of the course.
+     * @return Promise resolved when the WS call is successful.
      */
     logView(courseId: number, sectionNumber?: number, siteId?: string, name?: string): Promise<void> {
         const params: any = {
@@ -866,12 +866,12 @@ export class CoreCourseProvider {
     /**
      * Offline version for manually marking a module as completed.
      *
-     * @param {number} cmId The module ID.
-     * @param {number} completed Whether the module is completed or not.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {string} [courseName] Course name. Recommended, it is used to display a better warning message.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when completion is successfully sent or stored.
+     * @param cmId The module ID.
+     * @param completed Whether the module is completed or not.
+     * @param courseId Course ID the module belongs to.
+     * @param courseName Course name. Recommended, it is used to display a better warning message.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when completion is successfully sent or stored.
      */
     markCompletedManually(cmId: number, completed: number, courseId: number, courseName?: string, siteId?: string)
             : Promise<any> {
@@ -911,10 +911,10 @@ export class CoreCourseProvider {
     /**
      * Offline version for manually marking a module as completed.
      *
-     * @param {number} cmId The module ID.
-     * @param {number} completed Whether the module is completed or not.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when completion is successfully sent.
+     * @param cmId The module ID.
+     * @param completed Whether the module is completed or not.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when completion is successfully sent.
      */
     markCompletedManuallyOnline(cmId: number, completed: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -930,8 +930,8 @@ export class CoreCourseProvider {
     /**
      * Check if a module has a view page. E.g. labels don't have a view page.
      *
-     * @param {any} module The module object.
-     * @return {boolean} Whether the module has a view page.
+     * @param module The module object.
+     * @return Whether the module has a view page.
      */
     moduleHasView(module: any): boolean {
         return !!module.url;
@@ -947,10 +947,10 @@ export class CoreCourseProvider {
      *
      * This function must be in here instead of course helper to prevent circular dependencies.
      *
-     * @param {NavController} navCtrl The nav controller to use. If not defined, the course will be opened in main menu.
-     * @param {any} course Course to open
-     * @param {any} [params] Other params to pass to the course page.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param navCtrl The nav controller to use. If not defined, the course will be opened in main menu.
+     * @param course Course to open
+     * @param params Other params to pass to the course page.
+     * @return Promise resolved when done.
      */
     openCourse(navCtrl: NavController, course: any, params?: any): Promise<any> {
         const loading = this.domUtils.showModalLoading();
@@ -1000,8 +1000,8 @@ export class CoreCourseProvider {
     /**
      * Select a certain tab in the course. Please use currentViewIsCourse() first to verify user is viewing the course.
      *
-     * @param {string} [name] Name of the tab. If not provided, course contents.
-     * @param {any} [params] Other params.
+     * @param name Name of the tab. If not provided, course contents.
+     * @param params Other params.
      */
     selectCourseTab(name?: string, params?: any): void {
         params = params || {};
@@ -1013,9 +1013,9 @@ export class CoreCourseProvider {
     /**
      * Change the course status, setting it to the previous status.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<string>} Promise resolved when the status is changed. Resolve param: new status.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the status is changed. Resolve param: new status.
      */
     setCoursePreviousStatus(courseId: number, siteId?: string): Promise<string> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -1050,10 +1050,10 @@ export class CoreCourseProvider {
     /**
      * Store course status.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} status New course status.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<void>} Promise resolved when the status is stored.
+     * @param courseId Course ID.
+     * @param status New course status.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the status is stored.
      */
     setCourseStatus(courseId: number, status: string, siteId?: string): Promise<void> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -1107,8 +1107,8 @@ export class CoreCourseProvider {
     /**
      * Translate a module name to current language.
      *
-     * @param {string} moduleName The module name.
-     * @return {string} Translated name.
+     * @param moduleName The module name.
+     * @return Translated name.
      */
     translateModuleName(moduleName: string): string {
         if (this.CORE_MODULES.indexOf(moduleName) < 0) {
@@ -1124,9 +1124,9 @@ export class CoreCourseProvider {
     /**
      * Trigger COURSE_STATUS_CHANGED with the right data.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} status New course status.
-     * @param {string} [siteId] Site ID. If not defined, current site.
+     * @param courseId Course ID.
+     * @param status New course status.
+     * @param siteId Site ID. If not defined, current site.
      */
     protected triggerCourseStatusChanged(courseId: number, status: string, siteId?: string): void {
         this.eventsProvider.trigger(CoreEventsProvider.COURSE_STATUS_CHANGED, {
diff --git a/src/core/course/providers/default-format.ts b/src/core/course/providers/default-format.ts
index e03341376..56a0c2840 100644
--- a/src/core/course/providers/default-format.ts
+++ b/src/core/course/providers/default-format.ts
@@ -33,7 +33,7 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -42,8 +42,8 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
     /**
      * Get the title to use in course page.
      *
-     * @param {any} course The course.
-     * @return {string} Title.
+     * @param course The course.
+     * @return Title.
      */
     getCourseTitle(course: any): string {
         if (course.displayname) {
@@ -58,8 +58,8 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
     /**
      * Whether it allows seeing all sections at the same time. Defaults to true.
      *
-     * @param {any} course The course to check.
-     * @type {boolean} Whether it can view all sections.
+     * @param course The course to check.
+     * @return Whether it can view all sections.
      */
     canViewAllSections(course: any): boolean {
         return true;
@@ -68,8 +68,8 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
     /**
      * Whether the option to enable section/module download should be displayed. Defaults to true.
      *
-     * @param {any} course The course to check.
-     * @return {boolean} Whether the option to enable section/module download should be displayed
+     * @param course The course to check.
+     * @return Whether the option to enable section/module download should be displayed
      */
     displayEnableDownload(course: any): boolean {
         return true;
@@ -78,8 +78,8 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
     /**
      * Whether the default section selector should be displayed. Defaults to true.
      *
-     * @param {any} course The course to check.
-     * @type {boolean} Whether the default section selector should be displayed.
+     * @param course The course to check.
+     * @return Whether the default section selector should be displayed.
      */
     displaySectionSelector(course: any): boolean {
         return true;
@@ -89,9 +89,9 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
      * Whether the course refresher should be displayed. If it returns false, a refresher must be included in the course format,
      * and the doRefresh method of CoreCourseSectionPage must be called on refresh. Defaults to true.
      *
-     * @param {any} course The course to check.
-     * @param {any[]} sections List of course sections.
-     * @return {boolean} Whether the refresher should be displayed.
+     * @param course The course to check.
+     * @param sections List of course sections.
+     * @return Whether the refresher should be displayed.
      */
     displayRefresher?(course: any, sections: any[]): boolean {
         return true;
@@ -100,9 +100,9 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
     /**
      * Given a list of sections, get the "current" section that should be displayed first.
      *
-     * @param {any} course The course to get the title.
-     * @param {any[]} sections List of sections.
-     * @return {any|Promise<any>} Current section (or promise resolved with current section).
+     * @param course The course to get the title.
+     * @param sections List of sections.
+     * @return Current section (or promise resolved with current section).
      */
     getCurrentSection(course: any, sections: any[]): any | Promise<any> {
         let promise;
@@ -143,9 +143,9 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
     /**
      * Invalidate the data required to load the course format.
      *
-     * @param {any} course The course to get the title.
-     * @param {any[]} sections List of sections.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param course The course to get the title.
+     * @param sections List of sections.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateData(course: any, sections: any[]): Promise<any> {
         return this.coursesProvider.invalidateCoursesByField('id', course.id);
@@ -157,10 +157,10 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
      * getCourseFormatComponent because it will display the course handlers at the top.
      * Your page should include the course handlers using CoreCoursesDelegate.
      *
-     * @param {NavController} navCtrl The NavController instance to use. If not defined, please use loginHelper.redirect.
-     * @param {any} course The course to open. It should contain a "format" attribute.
-     * @param {any} [params] Params to pass to the course page.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param navCtrl The NavController instance to use. If not defined, please use loginHelper.redirect.
+     * @param course The course to open. It should contain a "format" attribute.
+     * @param params Params to pass to the course page.
+     * @return Promise resolved when done.
      */
     openCourse(navCtrl: NavController, course: any, params?: any): Promise<any> {
         params = params || {};
@@ -183,8 +183,8 @@ export class CoreCourseFormatDefaultHandler implements CoreCourseFormatHandler {
      * Whether the view should be refreshed when completion changes. If your course format doesn't display
      * activity completion then you should return false.
      *
-     * @param {any} course The course.
-     * @return {boolean|Promise<boolean>} Whether course view should be refreshed when an activity completion changes.
+     * @param course The course.
+     * @return Whether course view should be refreshed when an activity completion changes.
      */
     shouldRefreshWhenCompletionChanges(course: any): boolean | Promise<boolean> {
         return true;
diff --git a/src/core/course/providers/default-module.ts b/src/core/course/providers/default-module.ts
index f82e1b2d9..1e5af3d8d 100644
--- a/src/core/course/providers/default-module.ts
+++ b/src/core/course/providers/default-module.ts
@@ -31,7 +31,7 @@ export class CoreCourseModuleDefaultHandler implements CoreCourseModuleHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -40,10 +40,10 @@ export class CoreCourseModuleDefaultHandler implements CoreCourseModuleHandler {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         // Return the default data.
@@ -80,10 +80,10 @@ export class CoreCourseModuleDefaultHandler implements CoreCourseModuleHandler {
      * The component returned must implement CoreCourseModuleMainComponent.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getMainComponent(injector: Injector, course: any, module: any): any | Promise<any> {
         // We can't inject CoreCourseUnsupportedModuleComponent here due to circular dependencies.
@@ -94,7 +94,7 @@ export class CoreCourseModuleDefaultHandler implements CoreCourseModuleHandler {
      * Whether to display the course refresher in single activity course format. If it returns false, a refresher must be
      * included in the template that calls the doRefresh method of the component. Defaults to true.
      *
-     * @return {boolean} Whether the refresher should be displayed.
+     * @return Whether the refresher should be displayed.
      */
     displayRefresherInSingleActivity(): boolean {
         return true;
diff --git a/src/core/course/providers/format-delegate.ts b/src/core/course/providers/format-delegate.ts
index b65560ced..9fecdf9a3 100644
--- a/src/core/course/providers/format-delegate.ts
+++ b/src/core/course/providers/format-delegate.ts
@@ -26,7 +26,6 @@ import { CoreDelegate, CoreDelegateHandler } from '@classes/delegate';
 export interface CoreCourseFormatHandler extends CoreDelegateHandler {
     /**
      * Name of the format the handler supports. E.g. 'singleactivity'.
-     * @type {string}
      */
     format: string;
 
@@ -34,33 +33,33 @@ export interface CoreCourseFormatHandler extends CoreDelegateHandler {
      * Get the title to use in course page. If not defined, course fullname.
      * This function will be called without sections first, and then call it again when the sections are retrieved.
      *
-     * @param {any} course The course.
-     * @param {any[]} [sections] List of sections.
-     * @return {string} Title.
+     * @param course The course.
+     * @param sections List of sections.
+     * @return Title.
      */
     getCourseTitle?(course: any, sections?: any[]): string;
 
     /**
      * Whether it allows seeing all sections at the same time. Defaults to true.
      *
-     * @param {any} course The course to check.
-     * @type {boolean} Whether it can view all sections.
+     * @param course The course to check.
+     * @return Whether it can view all sections.
      */
     canViewAllSections?(course: any): boolean;
 
     /**
      * Whether the option to enable section/module download should be displayed. Defaults to true.
      *
-     * @param {any} course The course to check.
-     * @type {boolean} Whether the option to enable section/module download should be displayed.
+     * @param course The course to check.
+     * @return Whether the option to enable section/module download should be displayed.
      */
     displayEnableDownload?(course: any): boolean;
 
     /**
      * Whether the default section selector should be displayed. Defaults to true.
      *
-     * @param {any} course The course to check.
-     * @type {boolean} Whether the default section selector should be displayed.
+     * @param course The course to check.
+     * @return Whether the default section selector should be displayed.
      */
     displaySectionSelector?(course: any): boolean;
 
@@ -68,19 +67,19 @@ export interface CoreCourseFormatHandler extends CoreDelegateHandler {
      * Whether the course refresher should be displayed. If it returns false, a refresher must be included in the course format,
      * and the doRefresh method of CoreCourseSectionPage must be called on refresh. Defaults to true.
      *
-     * @param {any} course The course to check.
-     * @param {any[]} sections List of course sections.
-     * @type {boolean} Whether the refresher should be displayed.
+     * @param course The course to check.
+     * @param sections List of course sections.
+     * @return Whether the refresher should be displayed.
      */
     displayRefresher?(course: any, sections: any[]): boolean;
 
     /**
      * Given a list of sections, get the "current" section that should be displayed first. Defaults to first section.
      *
-     * @param {any} course The course to get the title.
-     * @param {any[]} sections List of sections.
-     * @return {any|Promise<any>} Current section (or promise resolved with current section). If a promise is returned, it should
-     *                            never fail.
+     * @param course The course to get the title.
+     * @param sections List of sections.
+     * @return Current section (or promise resolved with current section). If a promise is returned, it should
+     *         never fail.
      */
     getCurrentSection?(course: any, sections: any[]): any | Promise<any>;
 
@@ -90,10 +89,10 @@ export interface CoreCourseFormatHandler extends CoreDelegateHandler {
      * getCourseFormatComponent because it will display the course handlers at the top.
      * Your page should include the course handlers using CoreCoursesDelegate.
      *
-     * @param {NavController} navCtrl The NavController instance to use.
-     * @param {any} course The course to open. It should contain a "format" attribute.
-     * @param {any} [params] Params to pass to the course page.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param navCtrl The NavController instance to use.
+     * @param course The course to open. It should contain a "format" attribute.
+     * @param params Params to pass to the course page.
+     * @return Promise resolved when done.
      */
     openCourse?(navCtrl: NavController, course: any, params?: any): Promise<any>;
 
@@ -103,9 +102,9 @@ export interface CoreCourseFormatHandler extends CoreDelegateHandler {
      * If you want to customize the default format there are several methods to customize parts of it.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param course The course to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getCourseFormatComponent?(injector: Injector, course: any): any | Promise<any>;
 
@@ -113,9 +112,9 @@ export interface CoreCourseFormatHandler extends CoreDelegateHandler {
      * Return the Component to use to display the course summary inside the default course format.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param course The course to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getCourseSummaryComponent?(injector: Injector, course: any): any | Promise<any>;
 
@@ -123,9 +122,9 @@ export interface CoreCourseFormatHandler extends CoreDelegateHandler {
      * Return the Component to use to display the section selector inside the default course format.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param course The course to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getSectionSelectorComponent?(injector: Injector, course: any): any | Promise<any>;
 
@@ -134,9 +133,9 @@ export interface CoreCourseFormatHandler extends CoreDelegateHandler {
      * single section. If all the sections are displayed at once then it won't be used.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param course The course to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getSingleSectionComponent?(injector: Injector, course: any): any | Promise<any>;
 
@@ -144,18 +143,18 @@ export interface CoreCourseFormatHandler extends CoreDelegateHandler {
      * Return the Component to use to display all sections in a course.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param course The course to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getAllSectionsComponent?(injector: Injector, course: any): any | Promise<any>;
 
     /**
      * Invalidate the data required to load the course format.
      *
-     * @param {any} course The course to get the title.
-     * @param {any[]} sections List of sections.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param course The course to get the title.
+     * @param sections List of sections.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateData?(course: any, sections: any[]): Promise<any>;
 
@@ -163,8 +162,8 @@ export interface CoreCourseFormatHandler extends CoreDelegateHandler {
      * Whether the view should be refreshed when completion changes. If your course format doesn't display
      * activity completion then you should return false.
      *
-     * @param {any} course The course.
-     * @return {boolean|Promise<boolean>} Whether course view should be refreshed when an activity completion changes.
+     * @param course The course.
+     * @return Whether course view should be refreshed when an activity completion changes.
      */
     shouldRefreshWhenCompletionChanges?(course: any): boolean | Promise<boolean>;
 }
@@ -185,8 +184,8 @@ export class CoreCourseFormatDelegate extends CoreDelegate {
     /**
      * Whether it allows seeing all sections at the same time. Defaults to true.
      *
-     * @param {any} course The course to check.
-     * @return {boolean} Whether it allows seeing all sections at the same time.
+     * @param course The course to check.
+     * @return Whether it allows seeing all sections at the same time.
      */
     canViewAllSections(course: any): boolean {
         return this.executeFunctionOnEnabled(course.format, 'canViewAllSections', [course]);
@@ -195,8 +194,8 @@ export class CoreCourseFormatDelegate extends CoreDelegate {
     /**
      * Whether the option to enable section/module download should be displayed. Defaults to true.
      *
-     * @param {any} course The course to check.
-     * @return {boolean} Whether the option to enable section/module download should be displayed
+     * @param course The course to check.
+     * @return Whether the option to enable section/module download should be displayed
      */
     displayEnableDownload(course: any): boolean {
         return this.executeFunctionOnEnabled(course.format, 'displayEnableDownload', [course]);
@@ -206,9 +205,9 @@ export class CoreCourseFormatDelegate extends CoreDelegate {
      * Whether the course refresher should be displayed. If it returns false, a refresher must be included in the course format,
      * and the doRefresh method of CoreCourseSectionPage must be called on refresh. Defaults to true.
      *
-     * @param {any} course The course to check.
-     * @param {any[]} sections List of course sections.
-     * @return {boolean} Whether the refresher should be displayed.
+     * @param course The course to check.
+     * @param sections List of course sections.
+     * @return Whether the refresher should be displayed.
      */
     displayRefresher(course: any, sections: any[]): boolean {
         return this.executeFunctionOnEnabled(course.format, 'displayRefresher', [course, sections]);
@@ -217,8 +216,8 @@ export class CoreCourseFormatDelegate extends CoreDelegate {
     /**
      * Whether the default section selector should be displayed. Defaults to true.
      *
-     * @param {any} course The course to check.
-     * @return {boolean} Whether the section selector should be displayed.
+     * @param course The course to check.
+     * @return Whether the section selector should be displayed.
      */
     displaySectionSelector(course: any): boolean {
         return this.executeFunctionOnEnabled(course.format, 'displaySectionSelector', [course]);
@@ -227,9 +226,9 @@ export class CoreCourseFormatDelegate extends CoreDelegate {
     /**
      * Get the component to use to display all sections in a course.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course to render.
-     * @return {Promise<any>} Promise resolved with component to use, undefined if not found.
+     * @param injector Injector.
+     * @param course The course to render.
+     * @return Promise resolved with component to use, undefined if not found.
      */
     getAllSectionsComponent(injector: Injector, course: any): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(course.format, 'getAllSectionsComponent', [injector, course]))
@@ -241,9 +240,9 @@ export class CoreCourseFormatDelegate extends CoreDelegate {
     /**
      * Get the component to use to display a course format.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course to render.
-     * @return {Promise<any>} Promise resolved with component to use, undefined if not found.
+     * @param injector Injector.
+     * @param course The course to render.
+     * @return Promise resolved with component to use, undefined if not found.
      */
     getCourseFormatComponent(injector: Injector, course: any): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(course.format, 'getCourseFormatComponent', [injector, course]))
@@ -255,9 +254,9 @@ export class CoreCourseFormatDelegate extends CoreDelegate {
     /**
      * Get the component to use to display the course summary in the default course format.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course to render.
-     * @return {Promise<any>} Promise resolved with component to use, undefined if not found.
+     * @param injector Injector.
+     * @param course The course to render.
+     * @return Promise resolved with component to use, undefined if not found.
      */
     getCourseSummaryComponent(injector: Injector, course: any): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(course.format, 'getCourseSummaryComponent', [injector, course]))
@@ -269,9 +268,9 @@ export class CoreCourseFormatDelegate extends CoreDelegate {
     /**
      * Given a course, return the title to use in the course page.
      *
-     * @param {any} course The course to get the title.
-     * @param {any[]} [sections] List of sections.
-     * @return {string} Course title.
+     * @param course The course to get the title.
+     * @param sections List of sections.
+     * @return Course title.
      */
     getCourseTitle(course: any, sections?: any[]): string {
         return this.executeFunctionOnEnabled(course.format, 'getCourseTitle', [course, sections]);
@@ -280,9 +279,9 @@ export class CoreCourseFormatDelegate extends CoreDelegate {
     /**
      * Given a course and a list of sections, return the current section that should be displayed first.
      *
-     * @param {any} course The course to get the title.
-     * @param {any[]} sections List of sections.
-     * @return {Promise<any>} Promise resolved with current section.
+     * @param course The course to get the title.
+     * @param sections List of sections.
+     * @return Promise resolved with current section.
      */
     getCurrentSection(course: any, sections: any[]): Promise<any> {
 
@@ -296,9 +295,9 @@ export class CoreCourseFormatDelegate extends CoreDelegate {
     /**
      * Get the component to use to display the section selector inside the default course format.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course to render.
-     * @return {Promise<any>} Promise resolved with component to use, undefined if not found.
+     * @param injector Injector.
+     * @param course The course to render.
+     * @return Promise resolved with component to use, undefined if not found.
      */
     getSectionSelectorComponent(injector: Injector, course: any): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(course.format, 'getSectionSelectorComponent', [injector, course]))
@@ -311,9 +310,9 @@ export class CoreCourseFormatDelegate extends CoreDelegate {
      * Get the component to use to display a single section. This component will only be used if the user is viewing
      * a single section. If all the sections are displayed at once then it won't be used.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course to render.
-     * @return {Promise<any>} Promise resolved with component to use, undefined if not found.
+     * @param injector Injector.
+     * @param course The course to render.
+     * @return Promise resolved with component to use, undefined if not found.
      */
     getSingleSectionComponent(injector: Injector, course: any): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(course.format, 'getSingleSectionComponent', [injector, course]))
@@ -325,9 +324,9 @@ export class CoreCourseFormatDelegate extends CoreDelegate {
     /**
      * Invalidate the data required to load the course format.
      *
-     * @param {any} course The course to get the title.
-     * @param {any[]} sections List of sections.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param course The course to get the title.
+     * @param sections List of sections.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateData(course: any, sections: any[]): Promise<any> {
         return this.executeFunctionOnEnabled(course.format, 'invalidateData', [course, sections]);
@@ -336,10 +335,10 @@ export class CoreCourseFormatDelegate extends CoreDelegate {
     /**
      * Open a course.
      *
-     * @param {NavController} navCtrl The NavController instance to use.
-     * @param {any} course The course to open. It should contain a "format" attribute.
-     * @param {any} [params] Params to pass to the course page.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param navCtrl The NavController instance to use.
+     * @param course The course to open. It should contain a "format" attribute.
+     * @param params Params to pass to the course page.
+     * @return Promise resolved when done.
      */
     openCourse(navCtrl: NavController, course: any, params?: any): Promise<any> {
         return this.executeFunctionOnEnabled(course.format, 'openCourse', [navCtrl, course, params]);
@@ -349,8 +348,8 @@ export class CoreCourseFormatDelegate extends CoreDelegate {
      * Whether the view should be refreshed when completion changes. If your course format doesn't display
      * activity completion then you should return false.
      *
-     * @param {any} course The course.
-     * @return {Promise<boolean>} Whether course view should be refreshed when an activity completion changes.
+     * @param course The course.
+     * @return Whether course view should be refreshed when an activity completion changes.
      */
     shouldRefreshWhenCompletionChanges(course: any): Promise<boolean> {
         return Promise.resolve(this.executeFunctionOnEnabled(course.format, 'shouldRefreshWhenCompletionChanges', [course]));
diff --git a/src/core/course/providers/helper.ts b/src/core/course/providers/helper.ts
index 73d30973c..a82b1508b 100644
--- a/src/core/course/providers/helper.ts
+++ b/src/core/course/providers/helper.ts
@@ -45,37 +45,31 @@ import * as moment from 'moment';
 export type CoreCourseModulePrefetchInfo = {
     /**
      * Downloaded size.
-     * @type {number}
      */
     size?: number;
 
     /**
      * Downloadable size in a readable format.
-     * @type {string}
      */
     sizeReadable?: string;
 
     /**
      * Module status.
-     * @type {string}
      */
     status?: string;
 
     /**
      * Icon's name of the module status.
-     * @type {string}
      */
     statusIcon?: string;
 
     /**
      * Time when the module was last downloaded.
-     * @type {number}
      */
     downloadTime?: number;
 
     /**
      * Download time in a readable format.
-     * @type {string}
      */
     downloadTimeReadable?: string;
 };
@@ -86,25 +80,21 @@ export type CoreCourseModulePrefetchInfo = {
 export type CoreCourseCoursesProgress = {
     /**
      * Number of courses downloaded so far.
-     * @type {number}
      */
     count: number;
 
     /**
      * Toal of courses to download.
-     * @type {number}
      */
     total: number;
 
     /**
      * Whether the download has been successful so far.
-     * @type {boolean}
      */
     success: boolean;
 
     /**
      * Last downloaded course.
-     * @type {number}
      */
     courseId?: number;
 };
@@ -136,11 +126,11 @@ export class CoreCourseHelperProvider {
      * This function treats every module on the sections provided to load the handler data, treat completion
      * and navigate to a module page if required. It also returns if sections has content.
      *
-     * @param {any[]} sections List of sections to treat modules.
-     * @param {number} courseId Course ID of the modules.
-     * @param {any[]} [completionStatus] List of completion status.
-     * @param {string} [courseName] Course name. Recommended if completionStatus is supplied.
-     * @return {boolean} Whether the sections have content.
+     * @param sections List of sections to treat modules.
+     * @param courseId Course ID of the modules.
+     * @param completionStatus List of completion status.
+     * @param courseName Course name. Recommended if completionStatus is supplied.
+     * @return Whether the sections have content.
      */
     addHandlerDataForModules(sections: any[], courseId: number, completionStatus?: any, courseName?: string): boolean {
         let hasContent = false;
@@ -184,11 +174,11 @@ export class CoreCourseHelperProvider {
     /**
      * Calculate the status of a section.
      *
-     * @param {any} section Section to calculate its status. It can't be "All sections".
-     * @param {number} courseId Course ID the section belongs to.
-     * @param {boolean} [refresh] True if it shouldn't use module status cache (slower).
-     * @param {boolean} [checkUpdates=true] Whether to use the WS to check updates. Defaults to true.
-     * @return {Promise<any>} Promise resolved when the status is calculated.
+     * @param section Section to calculate its status. It can't be "All sections".
+     * @param courseId Course ID the section belongs to.
+     * @param refresh True if it shouldn't use module status cache (slower).
+     * @param checkUpdates Whether to use the WS to check updates. Defaults to true.
+     * @return Promise resolved when the status is calculated.
      */
     calculateSectionStatus(section: any, courseId: number, refresh?: boolean, checkUpdates: boolean = true): Promise<any> {
 
@@ -228,11 +218,11 @@ export class CoreCourseHelperProvider {
     /**
      * Calculate the status of a list of sections, setting attributes to determine the icons/data to be shown.
      *
-     * @param {any[]} sections Sections to calculate their status.
-     * @param {number} courseId Course ID the sections belong to.
-     * @param {boolean} [refresh] True if it shouldn't use module status cache (slower).
-     * @param {boolean} [checkUpdates=true] Whether to use the WS to check updates. Defaults to true.
-     * @return {Promise<void>} Promise resolved when the states are calculated.
+     * @param sections Sections to calculate their status.
+     * @param courseId Course ID the sections belong to.
+     * @param refresh True if it shouldn't use module status cache (slower).
+     * @param checkUpdates Whether to use the WS to check updates. Defaults to true.
+     * @return Promise resolved when the states are calculated.
      */
     calculateSectionsStatus(sections: any[], courseId: number, refresh?: boolean, checkUpdates: boolean = true): Promise<void> {
         const promises = [];
@@ -274,12 +264,12 @@ export class CoreCourseHelperProvider {
      * This function will set the icon to "spinner" when starting and it will also set it back to the initial icon if the
      * user cancels. All the other updates of the icon should be made when CoreEventsProvider.COURSE_STATUS_CHANGED is received.
      *
-     * @param {any} data An object where to store the course icon and title: "prefetchCourseIcon", "title" and "downloadSucceeded".
-     * @param {any} course Course to prefetch.
-     * @param {any[]} [sections] List of course sections.
-     * @param {CoreCourseOptionsHandlerToDisplay[]} courseHandlers List of course handlers.
-     * @param {CoreCourseOptionsMenuHandlerToDisplay[]} menuHandlers List of course menu handlers.
-     * @return {Promise<boolean>} Promise resolved when the download finishes, rejected if an error occurs or the user cancels.
+     * @param data An object where to store the course icon and title: "prefetchCourseIcon", "title" and "downloadSucceeded".
+     * @param course Course to prefetch.
+     * @param sections List of course sections.
+     * @param courseHandlers List of course handlers.
+     * @param menuHandlers List of course menu handlers.
+     * @return Promise resolved when the download finishes, rejected if an error occurs or the user cancels.
      */
     confirmAndPrefetchCourse(data: any, course: any, sections?: any[], courseHandlers?: CoreCourseOptionsHandlerToDisplay[],
             menuHandlers?: CoreCourseOptionsMenuHandlerToDisplay[]): Promise<boolean> {
@@ -341,9 +331,9 @@ export class CoreCourseHelperProvider {
     /**
      * Confirm and prefetches a list of courses.
      *
-     * @param {any[]} courses List of courses to download.
-     * @param {Function} [onProgress] Function to call everytime a course is downloaded.
-     * @return {Promise<boolean>} Resolved when downloaded, rejected if error or canceled.
+     * @param courses List of courses to download.
+     * @param onProgress Function to call everytime a course is downloaded.
+     * @return Resolved when downloaded, rejected if error or canceled.
      */
     confirmAndPrefetchCourses(courses: any[], onProgress?: (data: CoreCourseCoursesProgress) => void): Promise<any> {
         const siteId = this.sitesProvider.getCurrentSiteId();
@@ -399,9 +389,9 @@ export class CoreCourseHelperProvider {
     /**
      * Show confirmation dialog and then remove a module files.
      *
-     * @param {any} module Module to remove the files.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module to remove the files.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when done.
      */
     confirmAndRemoveFiles(module: any, courseId: number): Promise<any> {
         return this.domUtils.showConfirm(this.translate.instant('core.course.confirmdeletemodulefiles')).then(() => {
@@ -416,11 +406,11 @@ export class CoreCourseHelperProvider {
     /**
      * Calculate the size to download a section and show a confirm modal if needed.
      *
-     * @param {number} courseId Course ID the section belongs to.
-     * @param {any} [section] Section. If not provided, all sections.
-     * @param {any[]} [sections] List of sections. Used when downloading all the sections.
-     * @param {boolean} [alwaysConfirm] True to show a confirm even if the size isn't high, false otherwise.
-     * @return {Promise<any>} Promise resolved if the user confirms or there's no need to confirm.
+     * @param courseId Course ID the section belongs to.
+     * @param section Section. If not provided, all sections.
+     * @param sections List of sections. Used when downloading all the sections.
+     * @param alwaysConfirm True to show a confirm even if the size isn't high, false otherwise.
+     * @return Promise resolved if the user confirms or there's no need to confirm.
      */
     confirmDownloadSizeSection(courseId: number, section?: any, sections?: any[], alwaysConfirm?: boolean): Promise<any> {
         let sizePromise,
@@ -472,11 +462,11 @@ export class CoreCourseHelperProvider {
      * Helper function to prefetch a module, showing a confirmation modal if the size is big.
      * This function is meant to be called from a context menu option. It will also modify some data like the prefetch icon.
      *
-     * @param {any} instance The component instance that has the context menu. It should have prefetchStatusIcon and isDestroyed.
-     * @param {any} module Module to be prefetched
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {Function} [done] Function to call when done. It will close the context menu.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param instance The component instance that has the context menu. It should have prefetchStatusIcon and isDestroyed.
+     * @param module Module to be prefetched
+     * @param courseId Course ID the module belongs to.
+     * @param done Function to call when done. It will close the context menu.
+     * @return Promise resolved when done.
      */
     contextMenuPrefetch(instance: any, module: any, courseId: number, done?: () => void): Promise<any> {
         const initialIcon = instance.prefetchStatusIcon;
@@ -503,8 +493,8 @@ export class CoreCourseHelperProvider {
     /**
      * Determine the status of a list of courses.
      *
-     * @param {any[]} courses Courses
-     * @return {Promise<string>} Promise resolved with the status.
+     * @param courses Courses
+     * @return Promise resolved with the status.
      */
     determineCoursesStatus(courses: any[]): Promise<string> {
         // Get the status of each course.
@@ -530,13 +520,13 @@ export class CoreCourseHelperProvider {
      * Convenience function to open a module main file, downloading the package if needed.
      * This is meant for modules like mod_resource.
      *
-     * @param {any} module The module to download.
-     * @param {number} courseId The course ID of the module.
-     * @param {string} [component] The component to link the files to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @param {any[]} [files] List of files of the module. If not provided, use module.contents.
-     * @param {string} [siteId] The site ID. If not defined, current site.
-     * @return {Promise<any>} Resolved on success.
+     * @param module The module to download.
+     * @param courseId The course ID of the module.
+     * @param component The component to link the files to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param files List of files of the module. If not provided, use module.contents.
+     * @param siteId The site ID. If not defined, current site.
+     * @return Resolved on success.
      */
     downloadModuleAndOpenFile(module: any, courseId: number, component?: string, componentId?: string | number, files?: any[],
             siteId?: string): Promise<any> {
@@ -633,13 +623,13 @@ export class CoreCourseHelperProvider {
      * Convenience function to download a module that has a main file and return the local file's path and other info.
      * This is meant for modules like mod_resource.
      *
-     * @param {any} module The module to download.
-     * @param {number} courseId The course ID of the module.
-     * @param {string} [component] The component to link the files to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @param {any[]} [files] List of files of the module. If not provided, use module.contents.
-     * @param {string} [siteId] The site ID. If not defined, current site.
-     * @return {Promise<{fixedUrl: string, path: string, status: string}>} Promise resolved when done.
+     * @param module The module to download.
+     * @param courseId The course ID of the module.
+     * @param component The component to link the files to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param files List of files of the module. If not provided, use module.contents.
+     * @param siteId The site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     downloadModuleWithMainFileIfNeeded(module: any, courseId: number, component?: string, componentId?: string | number,
             files?: any[], siteId?: string): Promise<{fixedUrl: string, path: string, status: string}> {
@@ -729,13 +719,13 @@ export class CoreCourseHelperProvider {
     /**
      * Convenience function to download a module.
      *
-     * @param {any} module The module to download.
-     * @param {number} courseId The course ID of the module.
-     * @param {string} [component] The component to link the files to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @param {any[]} [files] List of files of the module. If not provided, use module.contents.
-     * @param {string} [siteId] The site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module The module to download.
+     * @param courseId The course ID of the module.
+     * @param component The component to link the files to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param files List of files of the module. If not provided, use module.contents.
+     * @param siteId The site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     downloadModule(module: any, courseId: number, component?: string, componentId?: string | number, files?: any[], siteId?: string)
             : Promise<any> {
@@ -760,12 +750,12 @@ export class CoreCourseHelperProvider {
     /**
      * Fill the Context Menu for a certain module.
      *
-     * @param {any} instance The component instance that has the context menu.
-     * @param {any} module Module to be prefetched
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [invalidateCache] Invalidates the cache first.
-     * @param {string} [component] Component of the module.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param instance The component instance that has the context menu.
+     * @param module Module to be prefetched
+     * @param courseId Course ID the module belongs to.
+     * @param invalidateCache Invalidates the cache first.
+     * @param component Component of the module.
+     * @return Promise resolved when done.
      */
     fillContextMenu(instance: any, module: any, courseId: number, invalidateCache?: boolean, component?: string): Promise<any> {
         return this.getModulePrefetchInfo(module, courseId, invalidateCache, component).then((moduleInfo) => {
@@ -796,9 +786,9 @@ export class CoreCourseHelperProvider {
     /**
      * Get a course. It will first check the user courses, and fallback to another WS if not enrolled.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<{enrolled: boolean, course: any}>} Promise resolved with the course.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the course.
      */
     getCourse(courseId: number, siteId?: string): Promise<{enrolled: boolean, course: any}> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -824,10 +814,10 @@ export class CoreCourseHelperProvider {
      * Get a course, wait for any course format plugin to load, and open the course page. It basically chains the functions
      * getCourse and openCourse.
      *
-     * @param {NavController} navCtrl The nav controller to use. If not defined, the course will be opened in main menu.
-     * @param {number} courseId Course ID.
-     * @param {any} [params] Other params to pass to the course page.
-     * @param {string} [siteId] Site ID. If not defined, current site.
+     * @param navCtrl The nav controller to use. If not defined, the course will be opened in main menu.
+     * @param courseId Course ID.
+     * @param params Other params to pass to the course page.
+     * @param siteId Site ID. If not defined, current site.
      */
     getAndOpenCourse(navCtrl: NavController, courseId: number, params?: any, siteId?: string): Promise<any> {
         const modal = this.domUtils.showModalLoading();
@@ -847,10 +837,10 @@ export class CoreCourseHelperProvider {
     /**
      * Check if the course has a block with that name.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} name     Block name to search.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if the block exists or false otherwise.
+     * @param courseId Course ID.
+     * @param name Block name to search.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if the block exists or false otherwise.
      * @since 3.3
      */
     hasABlockNamed(courseId: number, name: string, siteId?: string): Promise<boolean> {
@@ -866,10 +856,10 @@ export class CoreCourseHelperProvider {
     /**
      * Initialize the prefetch icon for selected courses.
      *
-     * @param  {any[]}        courses  Courses array to get info from.
-     * @param  {any}          prefetch Prefetch information.
-     * @param  {number}       [minCourses=2] Min course to show icon.
-     * @return {Promise<any>}          Resolved with the prefetch information updated when done.
+     * @param courses Courses array to get info from.
+     * @param prefetch Prefetch information.
+     * @param minCourses Min course to show icon.
+     * @return Resolved with the prefetch information updated when done.
      */
     initPrefetchCoursesIcons(courses: any[], prefetch: any, minCourses: number = 2): Promise<any> {
         if (!courses || courses.length < minCourses) {
@@ -895,10 +885,10 @@ export class CoreCourseHelperProvider {
      * Load offline completion into a list of sections.
      * This should be used in 3.6 sites or higher, where the course contents already include the completion.
      *
-     * @param {number} courseId The course to get the completion.
-     * @param {any[]} sections List of sections of the course.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param courseId The course to get the completion.
+     * @param sections List of sections of the course.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     loadOfflineCompletion(courseId: number, sections: any[], siteId?: string): Promise<any> {
         return this.courseOffline.getCourseManualCompletions(courseId, siteId).then((offlineCompletions) => {
@@ -944,9 +934,9 @@ export class CoreCourseHelperProvider {
     /**
      * Prefetch all the courses in the array.
      *
-     * @param  {any[]}        courses  Courses array to prefetch.
-     * @param  {any}          prefetch Prefetch information to be updated.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param courses Courses array to prefetch.
+     * @param prefetch Prefetch information to be updated.
+     * @return Promise resolved when done.
      */
     prefetchCourses(courses: any[], prefetch: any): Promise<any> {
         prefetch.icon = 'spinner';
@@ -964,9 +954,9 @@ export class CoreCourseHelperProvider {
     /**
      * Get a course download promise (if any).
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Download promise, undefined if not found.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Download promise, undefined if not found.
      */
     getCourseDownloadPromise(courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -977,9 +967,9 @@ export class CoreCourseHelperProvider {
     /**
      * Get a course status icon and the langkey to use as a title.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<{icon: string, title: string}>} Promise resolved with the icon name and the title key.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the icon name and the title key.
      */
     getCourseStatusIconAndTitle(courseId: number, siteId?: string): Promise<{icon: string, title: string}> {
         return this.courseProvider.getCourseStatus(courseId, siteId).then((status) => {
@@ -990,8 +980,8 @@ export class CoreCourseHelperProvider {
     /**
      * Get a course status icon and the langkey to use as a title from status.
      *
-     * @param {string} status Course status.
-     * @return {{icon: string, title: string}} Title and icon name.
+     * @param status Course status.
+     * @return Title and icon name.
      */
     getCourseStatusIconAndTitleFromStatus(status: string): {icon: string, title: string} {
         if (status == CoreConstants.DOWNLOADED) {
@@ -1016,10 +1006,10 @@ export class CoreCourseHelperProvider {
     /**
      * Get the course ID from a module instance ID, showing an error message if it can't be retrieved.
      *
-     * @param {number} id Instance ID.
-     * @param {string} module Name of the module. E.g. 'glossary'.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number>} Promise resolved with the module's course ID.
+     * @param id Instance ID.
+     * @param module Name of the module. E.g. 'glossary'.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the module's course ID.
      */
     getModuleCourseIdByInstance(id: number, module: any, siteId?: string): Promise<number> {
         return this.courseProvider.getModuleBasicInfoByInstance(id, module, siteId).then((cm) => {
@@ -1034,11 +1024,11 @@ export class CoreCourseHelperProvider {
     /**
      * Get prefetch info for a module.
      *
-     * @param {any} module Module to get the info from.
-     * @param {number} courseId Course ID the section belongs to.
-     * @param {boolean} [invalidateCache] Invalidates the cache first.
-     * @param {string} [component] Component of the module.
-     * @return {Promise<CoreCourseModulePrefetchInfo>} Promise resolved with the info.
+     * @param module Module to get the info from.
+     * @param courseId Course ID the section belongs to.
+     * @param invalidateCache Invalidates the cache first.
+     * @param component Component of the module.
+     * @return Promise resolved with the info.
      */
     getModulePrefetchInfo(module: any, courseId: number, invalidateCache?: boolean, component?: string)
             : Promise<CoreCourseModulePrefetchInfo> {
@@ -1102,8 +1092,8 @@ export class CoreCourseHelperProvider {
     /**
      * Get the download ID of a section. It's used to interact with CoreCourseModulePrefetchDelegate.
      *
-     * @param {any} section Section.
-     * @return {string} Section download ID.
+     * @param section Section.
+     * @return Section download ID.
      */
     getSectionDownloadId(section: any): string {
         return 'Section-' + section.id;
@@ -1112,16 +1102,16 @@ export class CoreCourseHelperProvider {
     /**
      * Navigate to a module.
      *
-     * @param {number} moduleId Module's ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [courseId] Course ID. If not defined we'll try to retrieve it from the site.
-     * @param {number} [sectionId] Section the module belongs to. If not defined we'll try to retrieve it from the site.
-     * @param {string} [modName] If set, the app will retrieve all modules of this type with a single WS call. This reduces the
-     *                           number of WS calls, but it isn't recommended for modules that can return a lot of contents.
-     * @param {any} [modParams] Params to pass to the module
-     * @param {NavController} [navCtrl] NavController for adding new pages to the current history. Optional for legacy support, but
-     *                                  generates a warning if omitted.
-     * @return {Promise<void>} Promise resolved when done.
+     * @param moduleId Module's ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param courseId Course ID. If not defined we'll try to retrieve it from the site.
+     * @param sectionId Section the module belongs to. If not defined we'll try to retrieve it from the site.
+     * @param modName If set, the app will retrieve all modules of this type with a single WS call. This reduces the
+     *                number of WS calls, but it isn't recommended for modules that can return a lot of contents.
+     * @param modParams Params to pass to the module
+     * @param navCtrl NavController for adding new pages to the current history. Optional for legacy support, but
+     *                generates a warning if omitted.
+     * @return Promise resolved when done.
      */
     navigateToModule(moduleId: number, siteId?: string, courseId?: number, sectionId?: number, modName?: string, modParams?: any,
                      navCtrl?: NavController)
@@ -1201,12 +1191,12 @@ export class CoreCourseHelperProvider {
     /**
      * Open a module.
      *
-     * @param {NavController} navCtrl The NavController to use.
-     * @param {any} module The module to open.
-     * @param {number} courseId The course ID of the module.
-     * @param {number} [sectionId] The section ID of the module.
-     * @param {any} [modParams] Params to pass to the module
-     * @param {boolean} True if module can be opened, false otherwise.
+     * @param navCtrl The NavController to use.
+     * @param module The module to open.
+     * @param courseId The course ID of the module.
+     * @param sectionId The section ID of the module.
+     * @param modParams Params to pass to the module
+     * @param True if module can be opened, false otherwise.
      */
     openModule(navCtrl: NavController, module: any, courseId: number, sectionId?: number, modParams?: any): boolean {
         if (!module.handlerData) {
@@ -1225,12 +1215,12 @@ export class CoreCourseHelperProvider {
     /**
      * Prefetch all the activities in a course and also the course addons.
      *
-     * @param {any} course The course to prefetch.
-     * @param {any[]} sections List of course sections.
-     * @param {CoreCourseOptionsHandlerToDisplay[]} courseHandlers List of course options handlers.
-     * @param {CoreCourseOptionsMenuHandlerToDisplay[]} courseMenuHandlers List of course menu handlers.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise}                Promise resolved when the download finishes.
+     * @param course The course to prefetch.
+     * @param sections List of course sections.
+     * @param courseHandlers List of course options handlers.
+     * @param courseMenuHandlers List of course menu handlers.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the download finishes.
      */
     prefetchCourse(course: any, sections: any[], courseHandlers: CoreCourseOptionsHandlerToDisplay[],
            courseMenuHandlers: CoreCourseOptionsMenuHandlerToDisplay[], siteId?: string): Promise<any> {
@@ -1300,12 +1290,12 @@ export class CoreCourseHelperProvider {
      * Helper function to prefetch a module, showing a confirmation modal if the size is big
      * and invalidating contents if refreshing.
      *
-     * @param {handler} handler Prefetch handler to use. Must implement 'prefetch' and 'invalidateContent'.
-     * @param {any} module Module to download.
-     * @param {any} size Object containing size to download (in bytes) and a boolean to indicate if its totally calculated.
-     * @param {number} courseId Course ID of the module.
-     * @param {boolean} [refresh] True if refreshing, false otherwise.
-     * @return {Promise<any>} Promise resolved when downloaded.
+     * @param handler Prefetch handler to use. Must implement 'prefetch' and 'invalidateContent'.
+     * @param module Module to download.
+     * @param size Object containing size to download (in bytes) and a boolean to indicate if its totally calculated.
+     * @param courseId Course ID of the module.
+     * @param refresh True if refreshing, false otherwise.
+     * @return Promise resolved when downloaded.
      */
     prefetchModule(handler: any, module: any, size: any, courseId: number, refresh?: boolean): Promise<any> {
         // Show confirmation if needed.
@@ -1325,10 +1315,10 @@ export class CoreCourseHelperProvider {
      * Prefetch one section or all the sections.
      * If the section is "All sections" it will prefetch all the sections.
      *
-     * @param {any} section Section.
-     * @param {number} courseId Course ID the section belongs to.
-     * @param {any[]} [sections] List of sections. Used when downloading all the sections.
-     * @return {Promise<any>} Promise resolved when the prefetch is finished.
+     * @param section Section.
+     * @param courseId Course ID the section belongs to.
+     * @param sections List of sections. Used when downloading all the sections.
+     * @return Promise resolved when the prefetch is finished.
      */
     prefetchSection(section: any, courseId: number, sections?: any[]): Promise<any> {
         if (section.id != CoreCourseProvider.ALL_SECTIONS_ID) {
@@ -1370,9 +1360,9 @@ export class CoreCourseHelperProvider {
      * Prefetch a certain section if it needs to be prefetched.
      * If the section is "All sections" it will be ignored.
      *
-     * @param {any} section Section to prefetch.
-     * @param {number} courseId Course ID the section belongs to.
-     * @return {Promise<any>} Promise resolved when the section is prefetched.
+     * @param section Section to prefetch.
+     * @param courseId Course ID the section belongs to.
+     * @return Promise resolved when the section is prefetched.
      */
     protected prefetchSingleSectionIfNeeded(section: any, courseId: number): Promise<any> {
         if (section.id == CoreCourseProvider.ALL_SECTIONS_ID) {
@@ -1422,10 +1412,10 @@ export class CoreCourseHelperProvider {
      * Start or restore the prefetch of a section.
      * If the section is "All sections" it will be ignored.
      *
-     * @param {any} section Section to download.
-     * @param {any} result Result of CoreCourseModulePrefetchDelegate.getModulesStatus for this section.
-     * @param {number} courseId Course ID the section belongs to.
-     * @return {Promise<any>} Promise resolved when the section has been prefetched.
+     * @param section Section to download.
+     * @param result Result of CoreCourseModulePrefetchDelegate.getModulesStatus for this section.
+     * @param courseId Course ID the section belongs to.
+     * @return Promise resolved when the section has been prefetched.
      */
     protected prefetchSingleSection(section: any, result: any, courseId: number): Promise<any> {
         if (section.id == CoreCourseProvider.ALL_SECTIONS_ID) {
@@ -1454,8 +1444,8 @@ export class CoreCourseHelperProvider {
     /**
      * Check if a section has content.
      *
-     * @param {any} section Section to check.
-     * @return {boolean} Whether the section has content.
+     * @param section Section to check.
+     * @return Whether the section has content.
      */
     sectionHasContent(section: any): boolean {
         if (section.hiddenbynumsections) {
@@ -1474,11 +1464,11 @@ export class CoreCourseHelperProvider {
      * will be displayed until it is complete, before the course page is opened.  If the promise is already complete,
      * they will see the result immediately.
      *
-     * @param {NavController} navCtrl The nav controller to use. If not defined, the course will be opened in main menu.
-     * @param {any} course Course to open
-     * @param {any} [params] Params to pass to the course page.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param navCtrl The nav controller to use. If not defined, the course will be opened in main menu.
+     * @param course Course to open
+     * @param params Params to pass to the course page.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     openCourse(navCtrl: NavController, course: any, params?: any, siteId?: string): Promise<any> {
         if (!siteId || siteId == this.sitesProvider.getCurrentSiteId()) {
diff --git a/src/core/course/providers/log-cron-handler.ts b/src/core/course/providers/log-cron-handler.ts
index e708cf056..deb0a7474 100644
--- a/src/core/course/providers/log-cron-handler.ts
+++ b/src/core/course/providers/log-cron-handler.ts
@@ -30,9 +30,9 @@ export class CoreCourseLogCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -43,7 +43,7 @@ export class CoreCourseLogCronHandler implements CoreCronHandler {
     /**
      * Check whether it's a synchronization process or not.
      *
-     * @return {boolean} Whether it's a synchronization process or not.
+     * @return Whether it's a synchronization process or not.
      */
     isSync(): boolean {
         return false;
@@ -52,7 +52,7 @@ export class CoreCourseLogCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return 240000; // 4 minutes. By default platform will see the user as online if lastaccess is less than 5 minutes.
diff --git a/src/core/course/providers/log-helper.ts b/src/core/course/providers/log-helper.ts
index 36ccf4ab8..8e69c34c3 100644
--- a/src/core/course/providers/log-helper.ts
+++ b/src/core/course/providers/log-helper.ts
@@ -70,10 +70,10 @@ export class CoreCourseLogHelperProvider {
     /**
      * Delete the offline saved activity logs.
      *
-     * @param  {string}         component   Component name.
-     * @param  {number}         componentId Component ID.
-     * @param  {string}         [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when deleted, rejected if failure.
+     * @param component Component name.
+     * @param componentId Component ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when deleted, rejected if failure.
      */
     protected deleteLogs(component: string, componentId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -86,11 +86,11 @@ export class CoreCourseLogHelperProvider {
     /**
      * Delete a WS based log.
      *
-     * @param  {string}         component   Component name.
-     * @param  {number}         componentId Component ID.
-     * @param  {string}         ws          WS name.
-     * @param  {string}         [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when deleted, rejected if failure.
+     * @param component Component name.
+     * @param componentId Component ID.
+     * @param ws WS name.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when deleted, rejected if failure.
      */
     protected deleteWSLogsByComponent(component: string, componentId: number, ws: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -103,10 +103,10 @@ export class CoreCourseLogHelperProvider {
     /**
      * Delete the offline saved activity logs using call data.
      *
-     * @param  {string}         ws          WS name.
-     * @param  {any}            data        Data to send to the WS.
-     * @param  {string}         [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when deleted, rejected if failure.
+     * @param ws WS name.
+     * @param data Data to send to the WS.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when deleted, rejected if failure.
      */
     protected deleteWSLogs(ws: string, data: any, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -119,8 +119,8 @@ export class CoreCourseLogHelperProvider {
     /**
      * Get all the offline saved activity logs.
      *
-     * @param  {string}         [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the list of offline logs.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of offline logs.
      */
     protected getAllLogs(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -132,10 +132,10 @@ export class CoreCourseLogHelperProvider {
     /**
      * Get the offline saved activity logs.
      *
-     * @param  {string}         component   Component name.
-     * @param  {number}         componentId Component ID.
-     * @param  {string}         [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the list of offline logs.
+     * @param component Component name.
+     * @param componentId Component ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of offline logs.
      */
     protected getLogs(component: string, componentId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -148,12 +148,12 @@ export class CoreCourseLogHelperProvider {
     /**
      * Perform log online. Data will be saved offline for syncing.
      *
-     * @param  {string}         ws          WS name.
-     * @param  {any}            data        Data to send to the WS.
-     * @param  {string}         component   Component name.
-     * @param  {number}         componentId Component ID.
-     * @param  {string}         [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param ws WS name.
+     * @param data Data to send to the WS.
+     * @param component Component name.
+     * @param componentId Component ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     log(ws: string, data: any, component: string, componentId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -177,11 +177,11 @@ export class CoreCourseLogHelperProvider {
     /**
      * Perform the log online.
      *
-     * @param  {string}       ws       WS name.
-     * @param  {any}          data     Data to send to the WS.
-     * @param  {string}       [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}  Promise resolved when log is successfully submitted. Rejected with object containing
-     *                            the error message (if any) and a boolean indicating if the error was returned by WS.
+     * @param ws WS name.
+     * @param data Data to send to the WS.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when log is successfully submitted. Rejected with object containing
+     *         the error message (if any) and a boolean indicating if the error was returned by WS.
      */
     protected logOnline(ws: string, data: any, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -201,15 +201,15 @@ export class CoreCourseLogHelperProvider {
      * Perform log online. Data will be saved offline for syncing.
      * It also triggers a Firebase view_item event.
      *
-     * @param  {string}         ws          WS name.
-     * @param  {any}            data        Data to send to the WS.
-     * @param  {string}         component   Component name.
-     * @param  {number}         componentId Component ID.
-     * @param  {string}         [name] Name of the viewed item.
-     * @param  {string}         [category] Category of the viewed item.
-     * @param  {string}         [eventData] Data to pass to the Firebase event.
-     * @param  {string}         [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param ws WS name.
+     * @param data Data to send to the WS.
+     * @param component Component name.
+     * @param componentId Component ID.
+     * @param name Name of the viewed item.
+     * @param category Category of the viewed item.
+     * @param eventData Data to pass to the Firebase event.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     logSingle(ws: string, data: any, component: string, componentId: number, name?: string, category?: string, eventData?: any,
             siteId?: string): Promise<any> {
@@ -222,14 +222,14 @@ export class CoreCourseLogHelperProvider {
      * Perform log online. Data will be saved offline for syncing.
      * It also triggers a Firebase view_item_list event.
      *
-     * @param  {string}         ws          WS name.
-     * @param  {any}            data        Data to send to the WS.
-     * @param  {string}         component   Component name.
-     * @param  {number}         componentId Component ID.
-     * @param  {string}         category    Category of the viewed item.
-     * @param  {string}         [eventData] Data to pass to the Firebase event.
-     * @param  {string}         [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param ws WS name.
+     * @param data Data to send to the WS.
+     * @param component Component name.
+     * @param componentId Component ID.
+     * @param category Category of the viewed item.
+     * @param eventData Data to pass to the Firebase event.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     logList(ws: string, data: any, component: string, componentId: number, category: string, eventData?: any, siteId?: string)
             : Promise<any> {
@@ -241,12 +241,12 @@ export class CoreCourseLogHelperProvider {
     /**
      * Save activity log for offline sync.
      *
-     * @param  {string}         ws          WS name.
-     * @param  {any}            data        Data to send to the WS.
-     * @param  {string}         component   Component name.
-     * @param  {number}         componentId Component ID.
-     * @param  {string}         [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<number>} Resolved with the inserted rowId field.
+     * @param ws WS name.
+     * @param data Data to send to the WS.
+     * @param component Component name.
+     * @param componentId Component ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolved with the inserted rowId field.
      */
     protected storeOffline(ws: string, data: any, component: string, componentId: number, siteId?: string):
             Promise<number> {
@@ -266,8 +266,8 @@ export class CoreCourseLogHelperProvider {
     /**
      * Sync all the offline saved activity logs.
      *
-     * @param  {string}         [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}   Promise resolved when done.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     syncSite(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -297,10 +297,10 @@ export class CoreCourseLogHelperProvider {
     /**
      * Sync the offline saved activity logs.
      *
-     * @param  {string}         component   Component name.
-     * @param  {number}         componentId Component ID.
-     * @param  {string}         [siteId]    Site ID. If not defined, current site.
-     * @return {Promise<any>}   Promise resolved when done.
+     * @param component Component name.
+     * @param componentId Component ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     syncIfNeeded(component: string, componentId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -329,9 +329,9 @@ export class CoreCourseLogHelperProvider {
     /**
      * Sync and delete given logs.
      *
-     * @param  {any[]}        logs   Array of log objects.
-     * @param  {string}       siteId Site Id.
-     * @return {Promise<any>}        Promise resolved when done.
+     * @param logs Array of log objects.
+     * @param siteId Site Id.
+     * @return Promise resolved when done.
      */
     protected syncLogs(logs: any[], siteId: string): Promise<any> {
         return Promise.all(logs.map((log) => {
diff --git a/src/core/course/providers/module-delegate.ts b/src/core/course/providers/module-delegate.ts
index 4a3824784..eacadec21 100644
--- a/src/core/course/providers/module-delegate.ts
+++ b/src/core/course/providers/module-delegate.ts
@@ -29,7 +29,6 @@ import { CoreDelegate, CoreDelegateHandler } from '@classes/delegate';
 export interface CoreCourseModuleHandler extends CoreDelegateHandler {
     /**
      * Name of the module. It should match the "modname" of the module returned in core_course_get_contents.
-     * @type {string}
      */
     modName: string;
 
@@ -37,17 +36,16 @@ export interface CoreCourseModuleHandler extends CoreDelegateHandler {
      * List of supported features. The keys should be the name of the feature.
      * This is to replicate the "plugin_supports" function of Moodle.
      * If you need some dynamic checks please implement the supportsFeature function.
-     * @type {{[name: string]: any}}
      */
     supportedFeatures?: {[name: string]: any};
 
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData;
 
@@ -56,10 +54,10 @@ export interface CoreCourseModuleHandler extends CoreDelegateHandler {
      * The component returned must implement CoreCourseModuleMainComponent.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getMainComponent(injector: Injector, course: any, module: any): any | Promise<any>;
 
@@ -67,14 +65,14 @@ export interface CoreCourseModuleHandler extends CoreDelegateHandler {
      * Whether to display the course refresher in single activity course format. If it returns false, a refresher must be
      * included in the template that calls the doRefresh method of the component. Defaults to true.
      *
-     * @return {boolean} Whether the refresher should be displayed.
+     * @return Whether the refresher should be displayed.
      */
     displayRefresherInSingleActivity?(): boolean;
 
     /**
      * Get the icon src for the module.
      *
-     * @return {string} The icon src.
+     * @return The icon src.
      */
     getIconSrc?(): string;
 
@@ -82,8 +80,8 @@ export interface CoreCourseModuleHandler extends CoreDelegateHandler {
      * Check if this type of module supports a certain feature.
      * If this function is implemented, the supportedFeatures object will be ignored.
      *
-     * @param {string} feature The feature to check.
-     * @return {any} The result of the supports check.
+     * @param feature The feature to check.
+     * @return The result of the supports check.
      */
     supportsFeature?(feature: string): any;
 }
@@ -94,37 +92,31 @@ export interface CoreCourseModuleHandler extends CoreDelegateHandler {
 export interface CoreCourseModuleHandlerData {
     /**
      * The title to display in the module.
-     * @type {string}
      */
     title: string;
 
     /**
      * The accessibility title to use in the module. If not provided, title will be used.
-     * @type {string}
      */
     a11yTitle?: string;
 
     /**
      * The image to use as icon (path to the image).
-     * @type {string}
      */
     icon?: string | SafeUrl;
 
     /**
      * The class to assign to the item.
-     * @type {string}
      */
     class?: string;
 
     /**
      * The text to show in an extra badge.
-     * @type {string}
      */
     extraBadge?: string;
 
     /**
      * The color of the extra badge. Default: primary.
-     * @type {string}
      */
     extraBadgeColor?: string;
 
@@ -132,38 +124,35 @@ export interface CoreCourseModuleHandlerData {
      * Whether to display a button to download/refresh the module if it's downloadable.
      * If it's set to true, the app will show a download/refresh button when needed and will handle the download of the
      * module using CoreCourseModulePrefetchDelegate.
-     * @type {boolean}
      */
     showDownloadButton?: boolean;
 
     /**
      * The buttons to display in the module item.
-     * @type {CoreCourseModuleHandlerButton[]}
      */
     buttons?: CoreCourseModuleHandlerButton[];
 
     /**
      * Whether to display a spinner in the module item.
-     * @type {boolean}
      */
     spinner?: boolean;
 
     /**
      * Action to perform when the module is clicked.
      *
-     * @param {Event} event The click event.
-     * @param {NavController} navCtrl NavController instance.
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {NavOptions} [options] Options for the navigation.
-     * @param {any} [params] Params for the new page.
+     * @param event The click event.
+     * @param navCtrl NavController instance.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param options Options for the navigation.
+     * @param params Params for the new page.
      */
     action?(event: Event, navCtrl: NavController, module: any, courseId: number, options?: NavOptions, params?: any): void;
 
     /**
      * Updates the status of the module.
      *
-     * @param {string} status Module status.
+     * @param status Module status.
      */
     updateStatus?(status: string): void;
 
@@ -180,9 +169,9 @@ export interface CoreCourseModuleMainComponent {
     /**
      * Refresh the data.
      *
-     * @param {any} [refresher] Refresher.
-     * @param {Function} [done] Function to call when done.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @param done Function to call when done.
+     * @return Promise resolved when done.
      */
     doRefresh(refresher?: any, done?: () => void): Promise<any>;
 }
@@ -193,41 +182,36 @@ export interface CoreCourseModuleMainComponent {
 export interface CoreCourseModuleHandlerButton {
     /**
      * The label to add to the button.
-     * @type {string}
      */
     label: string;
 
     /**
      * The name of the button icon.
-     * @type {string}
      */
     icon: string;
 
     /**
      * Whether the button should be hidden.
-     * @type {boolean}
      */
     hidden?: boolean;
 
     /**
      * The name of the button icon to use in iOS instead of "icon".
-     * @type {string}
      */
     iosIcon?: string;
 
     /**
      * The name of the button icon to use in MaterialDesign instead of "icon".
-     * @type {string}
      */
     mdIcon?: string;
 
     /**
      * Action to perform when the button is clicked.
      *
-     * @param {Event} event The click event.
-     * @param {NavController} navCtrl NavController instance.
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
+     * @param event The click event.
+     * @param navCtrl NavController instance.
+     * @param module The module object.
+     * @param courseId The course ID.
      */
     action(event: Event, navCtrl: NavController, module: any, courseId: number): void;
 }
@@ -248,10 +232,10 @@ export class CoreCourseModuleDelegate extends CoreDelegate {
     /**
      * Get the component to render the module.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {Promise<any>} Promise resolved with component to use, undefined if not found.
+     * @param injector Injector.
+     * @param course The course object.
+     * @param module The module object.
+     * @return Promise resolved with component to use, undefined if not found.
      */
     getMainComponent(injector: Injector, course: any, module: any): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(module.modname, 'getMainComponent', [injector, course, module]))
@@ -263,11 +247,11 @@ export class CoreCourseModuleDelegate extends CoreDelegate {
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {string} modname The name of the module type.
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param modname The name of the module type.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getModuleDataFor(modname: string, module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         return this.executeFunctionOnEnabled(modname, 'getData', [module, courseId, sectionId]);
@@ -276,9 +260,9 @@ export class CoreCourseModuleDelegate extends CoreDelegate {
     /**
      * Check if a certain module type is disabled in a site.
      *
-     * @param {string} modname The name of the module type.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether module is disabled.
+     * @param modname The name of the module type.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether module is disabled.
      */
     isModuleDisabled(modname: string, siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -289,9 +273,9 @@ export class CoreCourseModuleDelegate extends CoreDelegate {
     /**
      * Check if a certain module type is disabled in a site.
      *
-     * @param {string} modname The name of the module type.
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether module is disabled.
+     * @param modname The name of the module type.
+     * @param site Site. If not defined, use current site.
+     * @return Whether module is disabled.
      */
     isModuleDisabledInSite(modname: string, site?: CoreSite): boolean {
         const handler = this.getHandler(modname, true);
@@ -309,8 +293,8 @@ export class CoreCourseModuleDelegate extends CoreDelegate {
      * Whether to display the course refresher in single activity course format. If it returns false, a refresher must be
      * included in the template that calls the doRefresh method of the component. Defaults to true.
      *
-     * @param {any} modname The name of the module type.
-     * @return {boolean} Whether the refresher should be displayed.
+     * @param modname The name of the module type.
+     * @return Whether the refresher should be displayed.
      */
     displayRefresherInSingleActivity(modname: string): boolean {
         return this.executeFunctionOnEnabled(modname, 'displayRefresherInSingleActivity');
@@ -319,9 +303,9 @@ export class CoreCourseModuleDelegate extends CoreDelegate {
     /**
      * Get the icon src for a certain type of module.
      *
-     * @param {any} modname The name of the module type.
-     * @param {string} [modicon] The mod icon string.
-     * @return {string} The icon src.
+     * @param modname The name of the module type.
+     * @param modicon The mod icon string.
+     * @return The icon src.
      */
     getModuleIconSrc(modname: string, modicon?: string): string {
         return this.executeFunctionOnEnabled(modname, 'getIconSrc') || this.courseProvider.getModuleIconSrc(modname, modicon);
@@ -330,10 +314,10 @@ export class CoreCourseModuleDelegate extends CoreDelegate {
     /**
      * Check if a certain type of module supports a certain feature.
      *
-     * @param {string} modname The modname.
-     * @param {string} feature The feature to check.
-     * @param {any} defaultValue Value to return if the module is not supported or doesn't know if it's supported.
-     * @return {any} The result of the supports check.
+     * @param modname The modname.
+     * @param feature The feature to check.
+     * @param defaultValue Value to return if the module is not supported or doesn't know if it's supported.
+     * @return The result of the supports check.
      */
     supportsFeature(modname: string, feature: string, defaultValue: any): any {
         const handler = this.enabledHandlers[modname];
diff --git a/src/core/course/providers/module-prefetch-delegate.ts b/src/core/course/providers/module-prefetch-delegate.ts
index 267027d84..65278fe82 100644
--- a/src/core/course/providers/module-prefetch-delegate.ts
+++ b/src/core/course/providers/module-prefetch-delegate.ts
@@ -34,13 +34,11 @@ import { CoreDelegate, CoreDelegateHandler } from '@classes/delegate';
 export type CoreCourseModulesProgress = {
     /**
      * Number of modules downloaded so far.
-     * @type {number}
      */
     count: number;
 
     /**
      * Toal of modules to download.
-     * @type {number}
      */
     total: number;
 };
@@ -48,7 +46,7 @@ export type CoreCourseModulesProgress = {
 /**
  * Progress function for downloading a list of modules.
  *
- * @param {CoreCourseModulesProgress} data Progress data.
+ * @param data Progress data.
  */
 export type CoreCourseModulesProgressFunction = (data: CoreCourseModulesProgress) => void;
 
@@ -58,65 +56,60 @@ export type CoreCourseModulesProgressFunction = (data: CoreCourseModulesProgress
 export interface CoreCourseModulePrefetchHandler extends CoreDelegateHandler {
     /**
      * Name of the handler.
-     * @type {string}
      */
     name: string;
 
     /**
      * Name of the module. It should match the "modname" of the module returned in core_course_get_contents.
-     * @type {string}
      */
     modName: string;
 
     /**
      * The handler's component.
-     * @type {string}
      */
     component: string;
 
     /**
      * The RegExp to check updates. If a module has an update whose name matches this RegExp, the module will be marked
      * as outdated. This RegExp is ignored if hasUpdates function is defined.
-     * @type {RegExp}
      */
     updatesNames?: RegExp;
 
     /**
      * If true, this module will be treated as not downloadable when determining the status of a list of modules. The module will
      * still be downloaded when downloading the section/course, it only affects whether the button should be displayed.
-     * @type {boolean}
      */
     skipListStatus: boolean;
 
     /**
      * Get the download size of a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @return {Promise<{size: number, total: boolean}>} Promise resolved with the size and a boolean indicating if it was able
-     *                                                   to calculate the total size.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @return Promise resolved with the size and a boolean indicating if it was able
+     *         to calculate the total size.
      */
     getDownloadSize(module: any, courseId: number, single?: boolean): Promise<{ size: number, total: boolean }>;
 
     /**
      * Prefetch a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
      */
     prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string): Promise<any>;
 
     /**
      * Download the module.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when all content is downloaded.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when all content is downloaded.
      */
     download?(module: any, courseId: number, dirPath?: string): Promise<any>;
 
@@ -125,9 +118,9 @@ export interface CoreCourseModulePrefetchHandler extends CoreDelegateHandler {
      * If not defined, it will assume all modules can be checked.
      * The modules that return false will always be shown as outdated when they're downloaded.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {boolean|Promise<boolean>} Whether the module can use check_updates. The promise should never be rejected.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Whether the module can use check_updates. The promise should never be rejected.
      */
     canUseCheckUpdates?(module: any, courseId: number): boolean | Promise<boolean>;
 
@@ -135,38 +128,38 @@ export interface CoreCourseModulePrefetchHandler extends CoreDelegateHandler {
      * Return the status to show based on current status. E.g. a module might want to show outdated instead of downloaded.
      * If not implemented, the original status will be returned.
      *
-     * @param {any} module Module.
-     * @param {string} status The current status.
-     * @param {boolean} canCheck Whether the site allows checking for updates.
-     * @return {string} Status to display.
+     * @param module Module.
+     * @param status The current status.
+     * @param canCheck Whether the site allows checking for updates.
+     * @return Status to display.
      */
     determineStatus?(module: any, status: string, canCheck: boolean): string;
 
     /**
      * Get the downloaded size of a module. If not defined, we'll use getFiles to calculate it (it can be slow).
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {number|Promise<number>} Size, or promise resolved with the size.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Size, or promise resolved with the size.
      */
     getDownloadedSize?(module: any, courseId: number): number | Promise<number>;
 
     /**
      * Get the list of files of the module. If not defined, we'll assume they are in module.contents.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {any[]|Promise<any[]>} List of files, or promise resolved with the files.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return List of files, or promise resolved with the files.
      */
     getFiles?(module: any, courseId: number): any[] | Promise<any[]>;
 
     /**
      * Check if a certain module has updates based on the result of check updates.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {any[]} moduleUpdates List of updates for the module.
-     * @return {boolean|Promise<boolean>} Whether the module has updates. The promise should never be rejected.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param moduleUpdates List of updates for the module.
+     * @return Whether the module has updates. The promise should never be rejected.
      */
     hasUpdates?(module: any, courseId: number, moduleUpdates: any[]): boolean | Promise<boolean>;
 
@@ -174,46 +167,46 @@ export interface CoreCourseModulePrefetchHandler extends CoreDelegateHandler {
      * Invalidate WS calls needed to determine module status (usually, to check if module is downloadable).
      * It doesn't need to invalidate check updates. It should NOT invalidate files nor all the prefetched data.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when invalidated.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when invalidated.
      */
     invalidateModule?(module: any, courseId: number): Promise<any>;
 
     /**
      * Check if a module can be downloaded. If the function is not defined, we assume that all modules are downloadable.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {boolean|Promise<boolean>} Whether the module can be downloaded. The promise should never be rejected.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Whether the module can be downloaded. The promise should never be rejected.
      */
     isDownloadable?(module: any, courseId: number): boolean | Promise<boolean>;
 
     /**
      * Load module contents in module.contents if they aren't loaded already. This is meant for resources.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when done.
      */
     loadContents?(module: any, courseId: number): Promise<any>;
 
     /**
      * Remove module downloaded files. If not defined, we'll use getFiles to remove them (slow).
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when done.
      */
     removeFiles?(module: any, courseId: number): Promise<any>;
 
     /**
      * Sync a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     sync?(module: any, courseId: number, siteId?: any): Promise<any>;
 }
@@ -282,7 +275,7 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Check if current site can check updates using core_course_check_updates.
      *
-     * @return {boolean} True if can check updates, false otherwise.
+     * @return True if can check updates, false otherwise.
      */
     canCheckUpdates(): boolean {
         return this.sitesProvider.wsAvailableInCurrentSite('core_course_check_updates');
@@ -291,9 +284,9 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Check if a certain module can use core_course_check_updates.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether the module can use check updates WS.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved with boolean: whether the module can use check updates WS.
      */
     canModuleUseCheckUpdates(module: any, courseId: number): Promise<boolean> {
         const handler = this.getPrefetchHandlerFor(module);
@@ -321,9 +314,9 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Creates the list of modules to check for get course updates.
      *
-     * @param {any[]} modules List of modules.
-     * @param {number} courseId Course ID the modules belong to.
-     * @return {Promise<{toCheck: any[], cannotUse: any[]}>} Promise resolved with the lists.
+     * @param modules List of modules.
+     * @param courseId Course ID the modules belong to.
+     * @return Promise resolved with the lists.
      */
     protected createToCheckList(modules: any[], courseId: number): Promise<{ toCheck: any[], cannotUse: any[] }> {
         const result = {
@@ -368,10 +361,10 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Determines a module status based on current status, restoring downloads if needed.
      *
-     * @param {any} module Module.
-     * @param {string} status Current status.
-     * @param {boolean} [canCheck] True if updates can be checked using core_course_check_updates.
-     * @return {string} Module status.
+     * @param module Module.
+     * @param status Current status.
+     * @param canCheck True if updates can be checked using core_course_check_updates.
+     * @return Module status.
      */
     determineModuleStatus(module: any, status: string, canCheck?: boolean): string {
         const handler = this.getPrefetchHandlerFor(module),
@@ -399,10 +392,10 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Check for updates in a course.
      *
-     * @param {any[]} modules List of modules.
-     * @param {number} courseId  Course ID the modules belong to.
-     * @return {Promise<any>} Promise resolved with the updates. If a module is set to false, it means updates cannot be
-     *                        checked for that module in the current site.
+     * @param modules List of modules.
+     * @param courseId Course ID the modules belong to.
+     * @return Promise resolved with the updates. If a module is set to false, it means updates cannot be
+     *         checked for that module in the current site.
      */
     getCourseUpdates(modules: any[], courseId: number): Promise<any> {
         if (!this.canCheckUpdates()) {
@@ -491,8 +484,8 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Check for updates in a course.
      *
-     * @param {number} courseId Course ID the modules belong to.
-     * @return {Promise<any>} Promise resolved with the updates.
+     * @param courseId Course ID the modules belong to.
+     * @return Promise resolved with the updates.
      */
     getCourseUpdatesByCourseId(courseId: number): Promise<any> {
         if (!this.canCheckUpdates()) {
@@ -508,8 +501,8 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Get cache key for course updates WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getCourseUpdatesCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'courseUpdates:' + courseId;
@@ -518,10 +511,10 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Get modules download size. Only treat the modules with status not downloaded or outdated.
      *
-     * @param {any[]} modules List of modules.
-     * @param {number} courseId Course ID the modules belong to.
-     * @return {Promise<{size: number, total: boolean}>} Promise resolved with the size and a boolean indicating if it was able
-     *                                                   to calculate the total size.
+     * @param modules List of modules.
+     * @param courseId Course ID the modules belong to.
+     * @return Promise resolved with the size and a boolean indicating if it was able
+     *         to calculate the total size.
      */
     getDownloadSize(modules: any[], courseId: number): Promise<{ size: number, total: boolean }> {
         // Get the status of each module.
@@ -549,11 +542,11 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Get the download size of a module.
      *
-     * @param {any} module Module to get size.
-     * @param {Number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @return {Promise<{size: number, total: boolean}>} Promise resolved with the size and a boolean indicating if it was able
-     *                                                   to calculate the total size.
+     * @param module Module to get size.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @return Promise resolved with the size and a boolean indicating if it was able
+     *         to calculate the total size.
      */
     getModuleDownloadSize(module: any, courseId: number, single?: boolean): Promise<{ size: number, total: boolean }> {
         const handler = this.getPrefetchHandlerFor(module);
@@ -592,9 +585,9 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Get the download size of a module.
      *
-     * @param {any} module Module to get size.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<number>} Promise resolved with the size.
+     * @param module Module to get size.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved with the size.
      */
     getModuleDownloadedSize(module: any, courseId: number): Promise<number> {
         const handler = this.getPrefetchHandlerFor(module);
@@ -664,9 +657,9 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Get module files.
      *
-     * @param {any} module Module to get the files.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any[]>} Promise resolved with the list of files.
+     * @param module Module to get the files.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved with the list of files.
      */
     getModuleFiles(module: any, courseId: number): Promise<any[]> {
         const handler = this.getPrefetchHandlerFor(module);
@@ -687,13 +680,13 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Get the module status.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {any} [updates] Result of getCourseUpdates for all modules in the course. If not provided, it will be
-     *                        calculated (slower). If it's false it means the site doesn't support check updates.
-     * @param {boolean} [refresh] True if it should ignore the cache.
-     * @param {number} [sectionId] ID of the section the module belongs to.
-     * @return {Promise<string>} Promise resolved with the status.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param updates Result of getCourseUpdates for all modules in the course. If not provided, it will be
+     *                calculated (slower). If it's false it means the site doesn't support check updates.
+     * @param refresh True if it should ignore the cache.
+     * @param sectionId ID of the section the module belongs to.
+     * @return Promise resolved with the status.
      */
     getModuleStatus(module: any, courseId: number, updates?: any, refresh?: boolean, sectionId?: number): Promise<string> {
         const handler = this.getPrefetchHandlerFor(module),
@@ -790,19 +783,19 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
      * Get the status of a list of modules, along with the lists of modules for each status.
      * @see {@link CoreFilepoolProvider.determinePackagesStatus}
      *
-     * @param {any[]} modules List of modules to prefetch.
-     * @param {number} courseId Course ID the modules belong to.
-     * @param {number} [sectionId] ID of the section the modules belong to.
-     * @param {boolean} [refresh] True if it should always check the DB (slower).
-     * @param {boolean} [onlyToDisplay] True if the status will only be used to determine which button should be displayed.
-     * @param {boolean} [checkUpdates=true] Whether to use the WS to check updates. Defaults to true.
-     * @return {Promise<any>} Promise resolved with an object with the following properties:
-     *                                - status (string) Status of the module.
-     *                                - total (number) Number of modules.
-     *                                - CoreConstants.NOT_DOWNLOADED (any[]) Modules with state NOT_DOWNLOADED.
-     *                                - CoreConstants.DOWNLOADED (any[]) Modules with state DOWNLOADED.
-     *                                - CoreConstants.DOWNLOADING (any[]) Modules with state DOWNLOADING.
-     *                                - CoreConstants.OUTDATED (any[]) Modules with state OUTDATED.
+     * @param modules List of modules to prefetch.
+     * @param courseId Course ID the modules belong to.
+     * @param sectionId ID of the section the modules belong to.
+     * @param refresh True if it should always check the DB (slower).
+     * @param onlyToDisplay True if the status will only be used to determine which button should be displayed.
+     * @param checkUpdates Whether to use the WS to check updates. Defaults to true.
+     * @return Promise resolved with an object with the following properties:
+     *         - status (string) Status of the module.
+     *         - total (number) Number of modules.
+     *         - CoreConstants.NOT_DOWNLOADED (any[]) Modules with state NOT_DOWNLOADED.
+     *         - CoreConstants.DOWNLOADED (any[]) Modules with state DOWNLOADED.
+     *         - CoreConstants.DOWNLOADING (any[]) Modules with state DOWNLOADING.
+     *         - CoreConstants.OUTDATED (any[]) Modules with state OUTDATED.
      */
     getModulesStatus(modules: any[], courseId: number, sectionId?: number, refresh?: boolean, onlyToDisplay?: boolean,
             checkUpdates: boolean = true): any {
@@ -875,9 +868,9 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Get a module status and download time. It will only return the download time if the module is downloaded or outdated.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<{status: string, downloadTime?: number}>} Promise resolved with the data.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved with the data.
      */
     protected getModuleStatusAndDownloadTime(module: any, courseId: number): Promise<{ status: string, downloadTime?: number }> {
         const handler = this.getPrefetchHandlerFor(module),
@@ -923,11 +916,11 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
      * Get updates for a certain module.
      * It will only return the updates if the module can use check updates and it's downloaded or outdated.
      *
-     * @param {any} module Module to check.
-     * @param {number} courseId Course the module belongs to.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the updates.
+     * @param module Module to check.
+     * @param courseId Course the module belongs to.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the updates.
      */
     getModuleUpdates(module: any, courseId: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
 
@@ -980,9 +973,9 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Get cache key for module updates WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} moduleId Module ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @param moduleId Module ID.
+     * @return Cache key.
      */
     protected getModuleUpdatesCacheKey(courseId: number, moduleId: number): string {
         return this.getCourseUpdatesCacheKey(courseId) + ':' + moduleId;
@@ -991,8 +984,8 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Get a prefetch handler.
      *
-     * @param {any} module The module to work on.
-     * @return {CoreCourseModulePrefetchHandler} Prefetch handler.
+     * @param module The module to work on.
+     * @return Prefetch handler.
      */
     getPrefetchHandlerFor(module: any): CoreCourseModulePrefetchHandler {
         return <CoreCourseModulePrefetchHandler> this.getHandler(module.modname, true);
@@ -1001,8 +994,8 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Invalidate check updates WS call.
      *
-     * @param {number} courseId Course ID.
-     * @return {Promise<any>} Promise resolved when data is invalidated.
+     * @param courseId Course ID.
+     * @return Promise resolved when data is invalidated.
      */
     invalidateCourseUpdates(courseId: number): Promise<any> {
         return this.sitesProvider.getCurrentSite().invalidateWsCacheForKey(this.getCourseUpdatesCacheKey(courseId));
@@ -1011,9 +1004,9 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Invalidate a list of modules in a course. This should only invalidate WS calls, not downloaded files.
      *
-     * @param {any[]} modules List of modules.
-     * @param {number} courseId Course ID.
-     * @return {Promise<any>} Promise resolved when modules are invalidated.
+     * @param modules List of modules.
+     * @param courseId Course ID.
+     * @return Promise resolved when modules are invalidated.
      */
     invalidateModules(modules: any[], courseId: number): Promise<any> {
         const promises = [];
@@ -1040,7 +1033,7 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Invalidates the cache for a given module.
      *
-     * @param {any} module Module to be invalidated.
+     * @param module Module to be invalidated.
      */
     invalidateModuleStatusCache(module: any): void {
         const handler = this.getPrefetchHandlerFor(module);
@@ -1052,10 +1045,10 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Invalidate check updates WS call for a certain module.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} moduleId Module ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when data is invalidated.
+     * @param courseId Course ID.
+     * @param moduleId Module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when data is invalidated.
      */
     invalidateModuleUpdates(courseId: number, moduleId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1066,8 +1059,8 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Check if a list of modules is being downloaded.
      *
-     * @param {string} id An ID to identify the download.
-     * @return {boolean} True if it's being downloaded, false otherwise.
+     * @param id An ID to identify the download.
+     * @return True if it's being downloaded, false otherwise.
      */
     isBeingDownloaded(id: string): boolean {
         const siteId = this.sitesProvider.getCurrentSiteId();
@@ -1078,9 +1071,9 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Check if a module is downloadable.
      *
-     * @param {any} module Module.
-     * @param {Number} courseId Course ID the module belongs to.
-     * @return {Promise<boolean>} Promise resolved with true if downloadable, false otherwise.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved with true if downloadable, false otherwise.
      */
     isModuleDownloadable(module: any, courseId: number): Promise<boolean> {
         if (module.uservisible === false) {
@@ -1118,10 +1111,10 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Check if a module has updates based on the result of getCourseUpdates.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {any} updates Result of getCourseUpdates.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether the module has updates.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param updates Result of getCourseUpdates.
+     * @return Promise resolved with boolean: whether the module has updates.
      */
     moduleHasUpdates(module: any, courseId: number, updates: any): Promise<boolean> {
         const handler = this.getPrefetchHandlerFor(module),
@@ -1151,10 +1144,10 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Prefetch a module.
      *
-     * @param {any} module Module to prefetch.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @return {Promise<any>} Promise resolved when finished.
+     * @param module Module to prefetch.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @return Promise resolved when finished.
      */
     prefetchModule(module: any, courseId: number, single?: boolean): Promise<any> {
         const handler = this.getPrefetchHandlerFor(module);
@@ -1172,9 +1165,9 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Sync a group of modules.
      *
-     * @param  {any[]}        modules Array of modules to sync.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>}         Promise resolved when finished.
+     * @param modules Array of modules to sync.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when finished.
      */
     syncModules(modules: any[], courseId: number): Promise<any> {
         return Promise.all(modules.map((module) => {
@@ -1190,9 +1183,9 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Sync a module.
      *
-     * @param {any} module Module to sync.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when finished.
+     * @param module Module to sync.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when finished.
      */
     syncModule(module: any, courseId: number): Promise<any> {
         const handler = this.getPrefetchHandlerFor(module);
@@ -1215,11 +1208,11 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
      * Prefetches a list of modules using their prefetch handlers.
      * If a prefetch already exists for this site and id, returns the current promise.
      *
-     * @param {string} id An ID to identify the download. It can be used to retrieve the download promise.
-     * @param {any[]} modules List of modules to prefetch.
-     * @param {number} courseId Course ID the modules belong to.
-     * @param {CoreCourseModulesProgressFunction} [onProgress] Function to call everytime a module is downloaded.
-     * @return {Promise<any>} Promise resolved when all modules have been prefetched.
+     * @param id An ID to identify the download. It can be used to retrieve the download promise.
+     * @param modules List of modules to prefetch.
+     * @param courseId Course ID the modules belong to.
+     * @param onProgress Function to call everytime a module is downloaded.
+     * @return Promise resolved when all modules have been prefetched.
      */
     prefetchModules(id: string, modules: any[], courseId: number, onProgress?: CoreCourseModulesProgressFunction): Promise<any> {
 
@@ -1294,9 +1287,9 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Remove module Files from handler.
      *
-     * @param {any} module Module to remove the files.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<void>} Promise resolved when done.
+     * @param module Module to remove the files.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when done.
      */
     removeModuleFiles(module: any, courseId: number): Promise<void> {
         const handler = this.getPrefetchHandlerFor(module),
@@ -1334,8 +1327,8 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Set an on progress function for the download of a list of modules.
      *
-     * @param {string} id An ID to identify the download.
-     * @param {CoreCourseModulesProgressFunction} onProgress Function to call everytime a module is downloaded.
+     * @param id An ID to identify the download.
+     * @param onProgress Function to call everytime a module is downloaded.
      */
     setOnProgress(id: string, onProgress: CoreCourseModulesProgressFunction): void {
         const siteId = this.sitesProvider.getCurrentSiteId(),
@@ -1350,9 +1343,9 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * If courseId or sectionId is set, save them in the cache.
      *
-     * @param {string} packageId The package ID.
-     * @param {number} [courseId] Course ID.
-     * @param {number} [sectionId] Section ID.
+     * @param packageId The package ID.
+     * @param courseId Course ID.
+     * @param sectionId Section ID.
      */
     storeCourseAndSection(packageId: string, courseId?: number, sectionId?: number): void {
         if (courseId) {
@@ -1366,12 +1359,12 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Treat the result of the check updates WS call.
      *
-     * @param {any[]} toCheckList List of modules to check (from createToCheckList).
-     * @param {any} response WS call response.
-     * @param {any} result Object where to store the result.
-     * @param {number} [previousTime] Time of the previous check updates execution. If set, modules downloaded
-     *                                after this time will be ignored.
-     * @return {any} Result.
+     * @param toCheckList List of modules to check (from createToCheckList).
+     * @param response WS call response.
+     * @param result Object where to store the result.
+     * @param previousTime Time of the previous check updates execution. If set, modules downloaded
+     *                     after this time will be ignored.
+     * @return Result.
      */
     protected treatCheckUpdatesResult(toCheckList: any[], response: any, result: any, previousTime?: number): any {
         // Format the response to index it by module ID.
@@ -1399,11 +1392,11 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
     /**
      * Update the status of a module in the "cache".
      *
-     * @param {string} status New status.
-     * @param {string} component Package's component.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @param {number} [courseId] Course ID of the module.
-     * @param {number} [sectionId] Section ID of the module.
+     * @param status New status.
+     * @param component Package's component.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param courseId Course ID of the module.
+     * @param sectionId Section ID of the module.
      */
     updateStatusCache(status: string, component: string, componentId?: string | number, courseId?: number, sectionId?: number)
             : void {
diff --git a/src/core/course/providers/modules-tag-area-handler.ts b/src/core/course/providers/modules-tag-area-handler.ts
index 4b7dcfc0a..a3285e10e 100644
--- a/src/core/course/providers/modules-tag-area-handler.ts
+++ b/src/core/course/providers/modules-tag-area-handler.ts
@@ -29,7 +29,7 @@ export class CoreCourseModulesTagAreaHandler implements CoreTagAreaHandler {
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -38,8 +38,8 @@ export class CoreCourseModulesTagAreaHandler implements CoreTagAreaHandler {
     /**
      * Parses the rendered content of a tag index and returns the items.
      *
-     * @param {string} content Rendered content.
-     * @return {any[]|Promise<any[]>} Area items (or promise resolved with the items).
+     * @param content Rendered content.
+     * @return Area items (or promise resolved with the items).
      */
     parseContent(content: string): any[] | Promise<any[]> {
         return this.tagHelper.parseFeedContent(content);
@@ -48,8 +48,8 @@ export class CoreCourseModulesTagAreaHandler implements CoreTagAreaHandler {
     /**
      * Get the component to use to display items.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return CoreTagFeedComponent;
diff --git a/src/core/course/providers/options-delegate.ts b/src/core/course/providers/options-delegate.ts
index 8f0ac6124..0fb67a195 100644
--- a/src/core/course/providers/options-delegate.ts
+++ b/src/core/course/providers/options-delegate.ts
@@ -27,51 +27,49 @@ import { CoreCourseProvider } from './course';
 export interface CoreCourseOptionsHandler extends CoreDelegateHandler {
     /**
      * The highest priority is displayed first.
-     * @type {number}
      */
     priority: number;
 
     /**
      * True if this handler should appear in menu rather than as a tab.
-     * @type {boolean}
      */
     isMenuHandler?: boolean;
 
     /**
      * Whether or not the handler is enabled for a certain course.
      *
-     * @param {number} courseId The course ID.
-     * @param {any} accessData Access type and data. Default, guest, ...
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @param courseId The course ID.
+     * @param accessData Access type and data. Default, guest, ...
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabledForCourse(courseId: number, accessData: any, navOptions?: any, admOptions?: any): boolean | Promise<boolean>;
 
     /**
      * Returns the data needed to render the handler.
      *
-     * @param {Injector} injector Injector.
-     * @param {number} course The course.
-     * @return {CoreCourseOptionsHandlerData|Promise<CoreCourseOptionsHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param course The course.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData?(injector: Injector, course: any): CoreCourseOptionsHandlerData | Promise<CoreCourseOptionsHandlerData>;
 
     /**
      * Should invalidate the data to determine if the handler is enabled for a certain course.
      *
-     * @param {number} courseId The course ID.
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param courseId The course ID.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved when done.
      */
     invalidateEnabledForCourse?(courseId: number, navOptions?: any, admOptions?: any): Promise<any>;
 
     /**
      * Called when a course is downloaded. It should prefetch all the data to be able to see the addon in offline.
      *
-     * @param {any} course The course.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param course The course.
+     * @return Promise resolved when done.
      */
     prefetch?(course: any): Promise<any>;
 }
@@ -83,9 +81,9 @@ export interface CoreCourseOptionsMenuHandler extends CoreCourseOptionsHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @param {Injector} injector Injector.
-     * @param {number} course The course.
-     * @return {CoreCourseOptionsMenuHandlerData|Promise<CoreCourseOptionsMenuHandlerData>} Data or promise resolved with data.
+     * @param injector Injector.
+     * @param course The course.
+     * @return Data or promise resolved with data.
      */
     getMenuDisplayData(injector: Injector, course: any):
         CoreCourseOptionsMenuHandlerData | Promise<CoreCourseOptionsMenuHandlerData>;
@@ -97,13 +95,11 @@ export interface CoreCourseOptionsMenuHandler extends CoreCourseOptionsHandler {
 export interface CoreCourseOptionsHandlerData {
     /**
      * Title to display for the handler.
-     * @type {string}
      */
     title: string;
 
     /**
      * Class to add to the displayed handler.
-     * @type {string}
      */
     class?: string;
 
@@ -115,7 +111,6 @@ export interface CoreCourseOptionsHandlerData {
 
     /**
      * Data to pass to the component. All the properties in this object will be passed to the component as inputs.
-     * @type {any}
      */
     componentData?: any;
 }
@@ -126,31 +121,26 @@ export interface CoreCourseOptionsHandlerData {
 export interface CoreCourseOptionsMenuHandlerData {
     /**
      * Title to display for the handler.
-     * @type {string}
      */
     title: string;
 
     /**
      * Class to add to the displayed handler.
-     * @type {string}
      */
     class?: string;
 
     /**
      * Name of the page to load for the handler.
-     * @type {string}
      */
     page: string;
 
     /**
      * Params to pass to the page (other than 'course' which is always sent).
-     * @type {any}
      */
     pageParams?: any;
 
     /**
      * Name of the icon to display for the handler.
-     * @type {string}
      */
     icon: string; // Name of the icon to display in the tab.
 }
@@ -161,27 +151,24 @@ export interface CoreCourseOptionsMenuHandlerData {
 export interface CoreCourseOptionsHandlerToDisplay {
     /**
      * Data to display.
-     * @type {CoreCourseOptionsHandlerData}
      */
     data: CoreCourseOptionsHandlerData;
 
     /**
      * Name of the handler, or name and sub context (AddonMessages, AddonMessages:blockContact, ...).
-     * @type {string}
      */
     name: string;
 
     /**
      * The highest priority is displayed first.
-     * @type {number}
      */
     priority?: number;
 
     /**
      * Called when a course is downloaded. It should prefetch all the data to be able to see the addon in offline.
      *
-     * @param {any} course The course.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param course The course.
+     * @return Promise resolved when done.
      */
     prefetch?(course: any): Promise<any>;
 }
@@ -192,27 +179,24 @@ export interface CoreCourseOptionsHandlerToDisplay {
 export interface CoreCourseOptionsMenuHandlerToDisplay {
     /**
      * Data to display.
-     * @type {CoreCourseOptionsMenuHandlerData}
      */
     data: CoreCourseOptionsMenuHandlerData;
 
     /**
      * Name of the handler, or name and sub context (AddonMessages, AddonMessages:blockContact, ...).
-     * @type {string}
      */
     name: string;
 
     /**
      * The highest priority is displayed first.
-     * @type {number}
      */
     priority?: number;
 
     /**
      * Called when a course is downloaded. It should prefetch all the data to be able to see the addon in offline.
      *
-     * @param {any} course The course.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param course The course.
+     * @return Promise resolved when done.
      */
     prefetch?(course: any): Promise<any>;
 }
@@ -245,8 +229,8 @@ export class CoreCourseOptionsDelegate extends CoreDelegate {
     /**
      * Check if handlers are loaded for a certain course.
      *
-     * @param {number} courseId The course ID to check.
-     * @return {boolean} True if handlers are loaded, false otherwise.
+     * @param courseId The course ID to check.
+     * @return True if handlers are loaded, false otherwise.
      */
     areHandlersLoaded(courseId: number): boolean {
         return !!this.loaded[courseId];
@@ -255,7 +239,7 @@ export class CoreCourseOptionsDelegate extends CoreDelegate {
     /**
      * Clear all course options handlers.
      *
-     * @param {number} [courseId] The course ID. If not defined, all handlers will be cleared.
+     * @param courseId The course ID. If not defined, all handlers will be cleared.
      */
     protected clearCoursesHandlers(courseId?: number): void {
         if (courseId) {
@@ -270,8 +254,8 @@ export class CoreCourseOptionsDelegate extends CoreDelegate {
     /**
      * Clear all courses handlers and invalidate its options.
      *
-     * @param {number} [courseId] The course ID. If not defined, all handlers will be cleared.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param courseId The course ID. If not defined, all handlers will be cleared.
+     * @return Promise resolved when done.
      */
     clearAndInvalidateCoursesOptions(courseId?: number): Promise<any> {
         const promises = [];
@@ -301,12 +285,12 @@ export class CoreCourseOptionsDelegate extends CoreDelegate {
     /**
      * Get the handlers for a course using a certain access type.
      *
-     * @param {number} courseId The course ID.
-     * @param {boolean} refresh True if it should refresh the list.
-     * @param {any} accessData Access type and data. Default, guest, ...
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {Promise<CoreCourseOptionsHandler[]>} Promise resolved with array of handlers.
+     * @param courseId The course ID.
+     * @param refresh True if it should refresh the list.
+     * @param accessData Access type and data. Default, guest, ...
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved with array of handlers.
      */
     protected getHandlersForAccess(courseId: number, refresh: boolean, accessData: any, navOptions?: any,
             admOptions?: any): Promise<CoreCourseOptionsHandler[]> {
@@ -336,13 +320,13 @@ export class CoreCourseOptionsDelegate extends CoreDelegate {
      * Get the list of handlers that should be displayed for a course.
      * This function should be called only when the handlers need to be displayed, since it can call several WebServices.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course object.
-     * @param {boolean} [refresh] True if it should refresh the list.
-     * @param {boolean} [isGuest] Whether it's guest.
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {Promise<CoreCourseOptionsHandlerToDisplay[]>} Promise resolved with array of handlers.
+     * @param injector Injector.
+     * @param course The course object.
+     * @param refresh True if it should refresh the list.
+     * @param isGuest Whether it's guest.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved with array of handlers.
      */
     getHandlersToDisplay(injector: Injector, course: any, refresh?: boolean, isGuest?: boolean, navOptions?: any, admOptions?: any):
             Promise<CoreCourseOptionsHandlerToDisplay[]> {
@@ -354,13 +338,13 @@ export class CoreCourseOptionsDelegate extends CoreDelegate {
      * Get the list of menu handlers that should be displayed for a course.
      * This function should be called only when the handlers need to be displayed, since it can call several WebServices.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course object.
-     * @param {boolean} [refresh] True if it should refresh the list.
-     * @param {boolean} [isGuest] Whether it's guest.
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {Promise<CoreCourseOptionsMenuHandlerToDisplay[]>} Promise resolved with array of handlers.
+     * @param injector Injector.
+     * @param course The course object.
+     * @param refresh True if it should refresh the list.
+     * @param isGuest Whether it's guest.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved with array of handlers.
      */
     getMenuHandlersToDisplay(injector: Injector, course: any, refresh?: boolean, isGuest?: boolean,
             navOptions?: any, admOptions?: any): Promise<CoreCourseOptionsMenuHandlerToDisplay[]> {
@@ -372,14 +356,14 @@ export class CoreCourseOptionsDelegate extends CoreDelegate {
      * Get the list of menu handlers that should be displayed for a course.
      * This function should be called only when the handlers need to be displayed, since it can call several WebServices.
      *
-     * @param {boolean} menu If true, gets menu handlers; false, gets tab handlers
-     * @param {Injector} injector Injector.
-     * @param {any} course The course object.
-     * @param {boolean} refresh True if it should refresh the list.
-     * @param {boolean} isGuest Whether it's guest.
-     * @param {any} navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {Promise<any[]>} Promise resolved with array of handlers.
+     * @param menu If true, gets menu handlers; false, gets tab handlers
+     * @param injector Injector.
+     * @param course The course object.
+     * @param refresh True if it should refresh the list.
+     * @param isGuest Whether it's guest.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved with array of handlers.
      */
     protected getHandlersToDisplayInternal(menu: boolean, injector: Injector, course: any, refresh: boolean, isGuest: boolean,
             navOptions: any, admOptions: any): Promise<any[]> {
@@ -439,9 +423,9 @@ export class CoreCourseOptionsDelegate extends CoreDelegate {
     /**
      * Check if a course has any handler enabled for default access, using course object.
      *
-     * @param {any} course The course object.
-     * @param {boolean} [refresh] True if it should refresh the list.
-     * @return {Promise<boolean>} Promise resolved with boolean: true if it has handlers, false otherwise.
+     * @param course The course object.
+     * @param refresh True if it should refresh the list.
+     * @return Promise resolved with boolean: true if it has handlers, false otherwise.
      */
     hasHandlersForCourse(course: any, refresh?: boolean): Promise<boolean> {
         // Load course options if missing.
@@ -453,11 +437,11 @@ export class CoreCourseOptionsDelegate extends CoreDelegate {
     /**
      * Check if a course has any handler enabled for default access.
      *
-     * @param {number} courseId The course ID.
-     * @param {boolean} [refresh] True if it should refresh the list.
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {Promise<boolean>} Promise resolved with boolean: true if it has handlers, false otherwise.
+     * @param courseId The course ID.
+     * @param refresh True if it should refresh the list.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved with boolean: true if it has handlers, false otherwise.
      */
     hasHandlersForDefault(courseId: number, refresh?: boolean, navOptions?: any, admOptions?: any): Promise<boolean> {
         // Default access.
@@ -473,11 +457,11 @@ export class CoreCourseOptionsDelegate extends CoreDelegate {
     /**
      * Check if a course has any handler enabled for guest access.
      *
-     * @param {number} courseId The course ID.
-     * @param {boolean} [refresh] True if it should refresh the list.
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {Promise<boolean>} Promise resolved with boolean: true if it has handlers, false otherwise.
+     * @param courseId The course ID.
+     * @param refresh True if it should refresh the list.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved with boolean: true if it has handlers, false otherwise.
      */
     hasHandlersForGuest(courseId: number, refresh?: boolean, navOptions?: any, admOptions?: any): Promise<boolean> {
         // Guest access.
@@ -493,8 +477,8 @@ export class CoreCourseOptionsDelegate extends CoreDelegate {
     /**
      * Invalidate the data to be able to determine if handlers are enabled for a certain course.
      *
-     * @param {number} courseId Course ID.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param courseId Course ID.
+     * @return Promise resolved when done.
      */
     invalidateCourseHandlers(courseId: number): Promise<any> {
         const promises = [],
@@ -518,9 +502,9 @@ export class CoreCourseOptionsDelegate extends CoreDelegate {
      * Check if a time belongs to the last update handlers for course call.
      * This is to handle the cases where updateHandlersForCourse don't finish in the same order as they're called.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} time Time to check.
-     * @return {boolean} Whether it's the last call.
+     * @param courseId Course ID.
+     * @param time Time to check.
+     * @return Whether it's the last call.
      */
     isLastUpdateCourseCall(courseId: number, time: number): boolean {
         if (!this.lastUpdateHandlersForCoursesStart[courseId]) {
@@ -533,9 +517,9 @@ export class CoreCourseOptionsDelegate extends CoreDelegate {
     /**
      * Load course options if missing.
      *
-     * @param {any} course The course object.
-     * @param {boolean} [refresh] True if it should refresh the list.
-     * @return {Promise<void>} Promise resolved when done.
+     * @param course The course object.
+     * @param refresh True if it should refresh the list.
+     * @return Promise resolved when done.
      */
     protected loadCourseOptions(course: any, refresh?: boolean): Promise<void> {
         if (this.coursesProvider.canGetAdminAndNavOptions() &&
@@ -564,11 +548,11 @@ export class CoreCourseOptionsDelegate extends CoreDelegate {
     /**
      * Update the handlers for a certain course.
      *
-     * @param {number} courseId The course ID.
-     * @param {any} accessData Access type and data. Default, guest, ...
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {Promise<any>} Resolved when updated.
+     * @param courseId The course ID.
+     * @param accessData Access type and data. Default, guest, ...
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Resolved when updated.
      */
     updateHandlersForCourse(courseId: number, accessData: any, navOptions?: any, admOptions?: any): Promise<any> {
         const promises = [],
diff --git a/src/core/course/providers/sync-cron-handler.ts b/src/core/course/providers/sync-cron-handler.ts
index 8f3adc3a6..4b07c449e 100644
--- a/src/core/course/providers/sync-cron-handler.ts
+++ b/src/core/course/providers/sync-cron-handler.ts
@@ -29,9 +29,9 @@ export class CoreCourseSyncCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         return this.courseSync.syncAllCourses(siteId);
@@ -40,7 +40,7 @@ export class CoreCourseSyncCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return this.courseSync.syncInterval;
diff --git a/src/core/course/providers/sync.ts b/src/core/course/providers/sync.ts
index 2c091a863..c7cb473ce 100644
--- a/src/core/course/providers/sync.ts
+++ b/src/core/course/providers/sync.ts
@@ -48,9 +48,9 @@ export class CoreCourseSyncProvider extends CoreSyncBaseProvider {
     /**
      * Try to synchronize all the courses in a certain site or in all sites.
      *
-     * @param {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     syncAllCourses(siteId?: string, force?: boolean): Promise<any> {
         return this.syncOnSites('courses', this.syncAllCoursesFunc.bind(this), [force], siteId);
@@ -59,9 +59,9 @@ export class CoreCourseSyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync all courses on a site.
      *
-     * @param {string} siteId Site ID to sync. If not defined, sync all sites.
-     * @param {boolean} force Wether the execution is forced (manual sync).
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     protected syncAllCoursesFunc(siteId: string, force: boolean): Promise<any> {
         const p1 = [];
@@ -94,9 +94,9 @@ export class CoreCourseSyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync a course if it's needed.
      *
-     * @param {number} courseId Course ID to be synced.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the course is synced or it doesn't need to be synced.
+     * @param courseId Course ID to be synced.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the course is synced or it doesn't need to be synced.
      */
     syncCourseIfNeeded(courseId: number, siteId?: string): Promise<any> {
         // Usually we call isSyncNeeded to check if a certain time has passed.
@@ -107,9 +107,9 @@ export class CoreCourseSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize a course.
      *
-     * @param {number} courseId Course ID to be synced.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected otherwise.
+     * @param courseId Course ID to be synced.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     syncCourse(courseId: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
diff --git a/src/core/courses/components/course-list-item/course-list-item.ts b/src/core/courses/components/course-list-item/course-list-item.ts
index c11f17f69..7c5e34f62 100644
--- a/src/core/courses/components/course-list-item/course-list-item.ts
+++ b/src/core/courses/components/course-list-item/course-list-item.ts
@@ -78,7 +78,7 @@ export class CoreCoursesCourseListItemComponent implements OnInit {
     /**
      * Open a course.
      *
-     * @param {any} course The course to open.
+     * @param course The course to open.
      */
     openCourse(course: any): void {
         if (course.isEnrolled) {
diff --git a/src/core/courses/components/course-options-menu/course-options-menu.ts b/src/core/courses/components/course-options-menu/course-options-menu.ts
index a63dbedf5..99abb36a9 100644
--- a/src/core/courses/components/course-options-menu/course-options-menu.ts
+++ b/src/core/courses/components/course-options-menu/course-options-menu.ts
@@ -43,7 +43,7 @@ export class CoreCoursesCourseOptionsMenuComponent implements OnInit {
 
     /**
      * Do an action over the course.
-     * @param {string} action Action name to take.
+     * @param action Action name to take.
      */
     action(action: string): void {
         this.viewCtrl.dismiss(action);
diff --git a/src/core/courses/components/course-progress/course-progress.ts b/src/core/courses/components/course-progress/course-progress.ts
index 814b00c55..1db3c9098 100644
--- a/src/core/courses/components/course-progress/course-progress.ts
+++ b/src/core/courses/components/course-progress/course-progress.ts
@@ -130,7 +130,7 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy {
     /**
      * Open a course.
      *
-     * @param {any} course The course to open.
+     * @param course The course to open.
      */
     openCourse(course: any): void {
         this.courseHelper.openCourse(this.navCtrl, course);
@@ -139,7 +139,7 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy {
     /**
      * Prefetch the course.
      *
-     * @param {Event} e Click event.
+     * @param e Click event.
      */
     prefetchCourse(e: Event): void {
         e.preventDefault();
@@ -155,7 +155,7 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy {
     /**
      * Update the course status icon and title.
      *
-     * @param {string} status Status to show.
+     * @param status Status to show.
      */
     protected updateCourseStatus(status: string): void {
         const statusData = this.courseHelper.getCourseStatusIconAndTitleFromStatus(status);
@@ -167,7 +167,7 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy {
     /**
      * Show the context menu.
      *
-     * @param {Event} e Click Event.
+     * @param e Click Event.
      */
     showCourseOptionsMenu(e: Event): void {
         e.preventDefault();
@@ -210,7 +210,7 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy {
     /**
      * Hide/Unhide the course from the course list.
      *
-     * @param {boolean} hide True to hide and false to show.
+     * @param hide True to hide and false to show.
      */
     protected setCourseHidden(hide: boolean): void {
         this.showSpinner = true;
@@ -232,7 +232,7 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy {
     /**
      * Favourite/Unfavourite the course from the course list.
      *
-     * @param {boolean} favourite True to favourite and false to unfavourite.
+     * @param favourite True to favourite and false to unfavourite.
      */
     protected setCourseFavourite(favourite: boolean): void {
         this.showSpinner = true;
diff --git a/src/core/courses/components/my-courses/my-courses.ts b/src/core/courses/components/my-courses/my-courses.ts
index fc0817350..3135892c8 100644
--- a/src/core/courses/components/my-courses/my-courses.ts
+++ b/src/core/courses/components/my-courses/my-courses.ts
@@ -84,7 +84,7 @@ export class CoreCoursesMyCoursesComponent implements OnInit, OnDestroy {
     /**
      * Fetch the user courses.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchCourses(): Promise<any> {
         return this.coursesProvider.getUserCourses().then((courses) => {
@@ -121,7 +121,7 @@ export class CoreCoursesMyCoursesComponent implements OnInit, OnDestroy {
     /**
      * Refresh the courses.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshCourses(refresher: any): void {
         const promises = [];
@@ -158,7 +158,7 @@ export class CoreCoursesMyCoursesComponent implements OnInit, OnDestroy {
     /**
      * The filter has changed.
      *
-     * @param {any} Received Event.
+     * @param Received Event.
      */
     filterChanged(event: any): void {
         const newValue = event.target.value && event.target.value.trim().toLowerCase();
@@ -181,7 +181,7 @@ export class CoreCoursesMyCoursesComponent implements OnInit, OnDestroy {
     /**
      * Prefetch all the courses.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     prefetchCourses(): Promise<any> {
         const initialIcon = this.prefetchCoursesData.icon;
diff --git a/src/core/courses/pages/available-courses/available-courses.ts b/src/core/courses/pages/available-courses/available-courses.ts
index 5e244e7cb..9a69fe49b 100644
--- a/src/core/courses/pages/available-courses/available-courses.ts
+++ b/src/core/courses/pages/available-courses/available-courses.ts
@@ -45,7 +45,7 @@ export class CoreCoursesAvailableCoursesPage {
     /**
      * Load the courses.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected loadCourses(): Promise<any> {
         const frontpageCourseId = this.sitesProvider.getCurrentSite().getSiteHomeId();
@@ -62,7 +62,7 @@ export class CoreCoursesAvailableCoursesPage {
     /**
      * Refresh the courses.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshCourses(refresher: any): void {
         const promises = [];
diff --git a/src/core/courses/pages/categories/categories.ts b/src/core/courses/pages/categories/categories.ts
index ab9a35cb1..10b84803e 100644
--- a/src/core/courses/pages/categories/categories.ts
+++ b/src/core/courses/pages/categories/categories.ts
@@ -56,7 +56,7 @@ export class CoreCoursesCategoriesPage {
     /**
      * Fetch the categories.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchCategories(): Promise<any> {
         return this.coursesProvider.getCategories(this.categoryId, true).then((cats) => {
@@ -98,7 +98,7 @@ export class CoreCoursesCategoriesPage {
     /**
      * Refresh the categories.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshCategories(refresher: any): void {
         const promises = [];
@@ -117,7 +117,7 @@ export class CoreCoursesCategoriesPage {
     /**
      * Open a category.
      *
-     * @param {number} categoryId The category ID.
+     * @param categoryId The category ID.
      */
     openCategory(categoryId: number): void {
         this.navCtrl.push('CoreCoursesCategoriesPage', { categoryId: categoryId });
diff --git a/src/core/courses/pages/course-preview/course-preview.ts b/src/core/courses/pages/course-preview/course-preview.ts
index 6e1569c2d..0be65494d 100644
--- a/src/core/courses/pages/course-preview/course-preview.ts
+++ b/src/core/courses/pages/course-preview/course-preview.ts
@@ -157,8 +157,8 @@ export class CoreCoursesCoursePreviewPage implements OnDestroy {
     /**
      * Check if the user can access as guest.
      *
-     * @return {Promise<boolean>} Promise resolved if can access as guest, rejected otherwise. Resolve param indicates if
-     *                            password is required for guest access.
+     * @return Promise resolved if can access as guest, rejected otherwise. Resolve param indicates if
+     *         password is required for guest access.
      */
     protected canAccessAsGuest(): Promise<boolean> {
         if (!this.isGuestEnabled) {
@@ -192,7 +192,7 @@ export class CoreCoursesCoursePreviewPage implements OnDestroy {
     /**
      * Convenience function to get course. We use this to determine if a user can see the course or not.
      *
-     * @param {boolean} refresh Whether the user is refreshing the data.
+     * @param refresh Whether the user is refreshing the data.
      */
     protected getCourse(refresh?: boolean): Promise<any> {
         // Get course enrolment methods.
@@ -336,7 +336,7 @@ export class CoreCoursesCoursePreviewPage implements OnDestroy {
     /**
      * User clicked in a self enrol button.
      *
-     * @param {number} instanceId The instance ID of the enrolment method.
+     * @param instanceId The instance ID of the enrolment method.
      */
     selfEnrolClicked(instanceId: number): void {
         this.domUtils.showConfirm(this.translate.instant('core.courses.confirmselfenrol')).then(() => {
@@ -349,9 +349,9 @@ export class CoreCoursesCoursePreviewPage implements OnDestroy {
     /**
      * Self enrol in a course.
      *
-     * @param {string} password Password to use.
-     * @param {number} instanceId The instance ID.
-     * @return {Promise<any>} Promise resolved when self enrolled.
+     * @param password Password to use.
+     * @param instanceId The instance ID.
+     * @return Promise resolved when self enrolled.
      */
     selfEnrolInCourse(password: string, instanceId: number): Promise<any> {
         const modal = this.domUtils.showModalLoading('core.loading', true);
@@ -390,7 +390,7 @@ export class CoreCoursesCoursePreviewPage implements OnDestroy {
     /**
      * Refresh the data.
      *
-     * @param {any} [refresher] The refresher if this was triggered by a Pull To Refresh.
+     * @param refresher The refresher if this was triggered by a Pull To Refresh.
      */
     refreshData(refresher?: any): Promise<any> {
         const promises = [];
@@ -418,7 +418,7 @@ export class CoreCoursesCoursePreviewPage implements OnDestroy {
     /**
      * Update the course status icon and title.
      *
-     * @param {string} status Status to show.
+     * @param status Status to show.
      */
     protected updateCourseStatus(status: string): void {
         const statusData = this.courseHelper.getCourseStatusIconAndTitleFromStatus(status);
@@ -430,8 +430,8 @@ export class CoreCoursesCoursePreviewPage implements OnDestroy {
     /**
      * Wait for the user to be enrolled in the course.
      *
-     * @param {boolean} first If it's the first call (true) or it's a recursive call (false).
-     * @return {Promise<any>} Promise resolved when enrolled or timeout.
+     * @param first If it's the first call (true) or it's a recursive call (false).
+     * @return Promise resolved when enrolled or timeout.
      */
     protected waitForEnrolled(first?: boolean): Promise<any> {
         if (first) {
diff --git a/src/core/courses/pages/dashboard/dashboard.ts b/src/core/courses/pages/dashboard/dashboard.ts
index 94bd5243a..2c2ccd993 100644
--- a/src/core/courses/pages/dashboard/dashboard.ts
+++ b/src/core/courses/pages/dashboard/dashboard.ts
@@ -139,7 +139,7 @@ export class CoreCoursesDashboardPage implements OnDestroy {
     /**
      * Convenience function to fetch the dashboard data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected loadDashboardContent(): Promise<any> {
         return this.dashboardProvider.isAvailable().then((available) => {
@@ -171,7 +171,7 @@ export class CoreCoursesDashboardPage implements OnDestroy {
     /**
      * Refresh the dashboard data.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshDashboard(refresher: any): void {
         const promises = [];
@@ -195,7 +195,7 @@ export class CoreCoursesDashboardPage implements OnDestroy {
     /**
      * Refresh the dashboard data and My Courses.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshMyCourses(refresher: any): void {
         // First of all, refresh dashboard blocks, maybe a new block was added and now we can display the dashboard.
@@ -222,7 +222,7 @@ export class CoreCoursesDashboardPage implements OnDestroy {
     /**
      * Convenience function to switch download enabled.
      *
-     * @param {boolean} enable If enable or disable.
+     * @param enable If enable or disable.
      */
     protected switchDownload(enable: boolean): void {
         this.downloadEnabled = (this.downloadCourseEnabled || this.downloadCoursesEnabled) && enable;
diff --git a/src/core/courses/pages/search/search.ts b/src/core/courses/pages/search/search.ts
index e73c88b90..c64795460 100644
--- a/src/core/courses/pages/search/search.ts
+++ b/src/core/courses/pages/search/search.ts
@@ -39,7 +39,7 @@ export class CoreCoursesSearchPage {
     /**
      * Search a new text.
      *
-     * @param {string} text The text to search.
+     * @param text The text to search.
      */
     search(text: string): void {
         this.currentSearch = text;
@@ -55,7 +55,7 @@ export class CoreCoursesSearchPage {
     /**
      * Load more results.
      *
-     * @param {any} [infiniteComplete] Infinite scroll complete function. Only used from core-infinite-loading.
+     * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
      */
     loadMoreResults(infiniteComplete?: any): void {
         this.searchCourses().finally(() => {
@@ -66,7 +66,7 @@ export class CoreCoursesSearchPage {
     /**
      * Search courses or load the next page of current search.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected searchCourses(): Promise<any> {
         this.loadMoreError = false;
diff --git a/src/core/courses/pages/self-enrol-password/self-enrol-password.ts b/src/core/courses/pages/self-enrol-password/self-enrol-password.ts
index 276cf7718..e304ad8b5 100644
--- a/src/core/courses/pages/self-enrol-password/self-enrol-password.ts
+++ b/src/core/courses/pages/self-enrol-password/self-enrol-password.ts
@@ -36,8 +36,8 @@ export class CoreCoursesSelfEnrolPasswordPage {
     /**
      * Submit password.
      *
-     * @param {Event} e Event.
-     * @param {string} password Password to submit.
+     * @param e Event.
+     * @param password Password to submit.
      */
     submitPassword(e: Event, password: string): void {
         e.preventDefault();
diff --git a/src/core/courses/providers/course-link-handler.ts b/src/core/courses/providers/course-link-handler.ts
index 5ffe35cb6..249ef5594 100644
--- a/src/core/courses/providers/course-link-handler.ts
+++ b/src/core/courses/providers/course-link-handler.ts
@@ -49,11 +49,11 @@ export class CoreCoursesCourseLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -104,11 +104,11 @@ export class CoreCoursesCourseLinkHandler extends CoreContentLinksHandlerBase {
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         courseId = parseInt(params.id, 10);
@@ -126,12 +126,12 @@ export class CoreCoursesCourseLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Action to perform when an enrol link is clicked.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} url Treated URL.
-     * @param {any} pageParams Params to send to the new page.
-     * @param {NavController} [navCtrl] NavController for adding new pages to the current history. Optional for legacy support, but
-     *                                  generates a warning if omitted.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param courseId Course ID.
+     * @param url Treated URL.
+     * @param pageParams Params to send to the new page.
+     * @param navCtrl NavController for adding new pages to the current history. Optional for legacy support, but
+     *                generates a warning if omitted.
+     * @return Promise resolved when done.
      */
     protected actionEnrol(courseId: number, url: string, pageParams: any, navCtrl?: NavController): Promise<any> {
         const modal = this.domUtils.showModalLoading(),
@@ -216,8 +216,8 @@ export class CoreCoursesCourseLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Check if a user can be "automatically" self enrolled in a course.
      *
-     * @param {number} courseId Course ID.
-     * @return {Promise<any>} Promise resolved if user can be enrolled in a course, rejected otherwise.
+     * @param courseId Course ID.
+     * @return Promise resolved if user can be enrolled in a course, rejected otherwise.
      */
     protected canSelfEnrol(courseId: number): Promise<any> {
         // Check that the course has self enrolment enabled.
@@ -242,9 +242,9 @@ export class CoreCoursesCourseLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Try to self enrol a user in a course.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [password] Password.
-     * @return {Promise<any>} Promise resolved when the user is enrolled, rejected otherwise.
+     * @param courseId Course ID.
+     * @param password Password.
+     * @return Promise resolved when the user is enrolled, rejected otherwise.
      */
     protected selfEnrol(courseId: number, password?: string): Promise<any> {
         const modal = this.domUtils.showModalLoading();
@@ -285,9 +285,9 @@ export class CoreCoursesCourseLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Wait for the user to be enrolled in a course.
      *
-     * @param {number} courseId The course ID.
-     * @param {boolean} first If it's the first call (true) or it's a recursive call (false).
-     * @return {Promise<any>} Promise resolved when enrolled or timeout.
+     * @param courseId The course ID.
+     * @param first If it's the first call (true) or it's a recursive call (false).
+     * @return Promise resolved when enrolled or timeout.
      */
     protected waitForEnrolled(courseId: number, first?: boolean): Promise<any> {
         if (first) {
diff --git a/src/core/courses/providers/courses-index-link-handler.ts b/src/core/courses/providers/courses-index-link-handler.ts
index bbea7ec34..150fb9421 100644
--- a/src/core/courses/providers/courses-index-link-handler.ts
+++ b/src/core/courses/providers/courses-index-link-handler.ts
@@ -34,11 +34,11 @@ export class CoreCoursesIndexLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[] | Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
diff --git a/src/core/courses/providers/courses.ts b/src/core/courses/providers/courses.ts
index c63780c5c..160fe5b5d 100644
--- a/src/core/courses/providers/courses.ts
+++ b/src/core/courses/providers/courses.ts
@@ -41,7 +41,7 @@ export class CoreCoursesProvider {
     /**
      * Whether current site supports getting course options.
      *
-     * @return {boolean} Whether current site supports getting course options.
+     * @return Whether current site supports getting course options.
      */
     canGetAdminAndNavOptions(): boolean {
         return this.sitesProvider.wsAvailableInCurrentSite('core_course_get_user_navigation_options') &&
@@ -51,10 +51,10 @@ export class CoreCoursesProvider {
     /**
      * Get categories. They can be filtered by id.
      *
-     * @param {number} categoryId Category ID to get.
-     * @param {boolean} [addSubcategories] If it should add subcategories to the list.
-     * @param {string} [siteId] Site to get the courses from. If not defined, use current site.
-     * @return {Promise<any[]>} Promise resolved with the categories.
+     * @param categoryId Category ID to get.
+     * @param addSubcategories If it should add subcategories to the list.
+     * @param siteId Site to get the courses from. If not defined, use current site.
+     * @return Promise resolved with the categories.
      */
     getCategories(categoryId: number, addSubcategories?: boolean, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -78,9 +78,9 @@ export class CoreCoursesProvider {
     /**
      * Get cache key for get categories methods WS call.
      *
-     * @param {number} categoryId Category ID to get.
-     * @param {boolean} [addSubcategories] If add subcategories to the list.
-     * @return {string} Cache key.
+     * @param categoryId Category ID to get.
+     * @param addSubcategories If add subcategories to the list.
+     * @return Cache key.
      */
     protected getCategoriesCacheKey(categoryId: number, addSubcategories?: boolean): string {
         return this.ROOT_CACHE_KEY + 'categories:' + categoryId + ':' + !!addSubcategories;
@@ -89,9 +89,9 @@ export class CoreCoursesProvider {
     /**
      * Given a list of course IDs to get course admin and nav options, return the list of courseIds to use.
      *
-     * @param {number[]} courseIds Course IDs.
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise}            Promise resolved with the list of course IDs.
+     * @param courseIds Course IDs.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with the list of course IDs.
      */
     protected getCourseIdsForAdminAndNavOptions(courseIds: number[], siteId?: string): Promise<number[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -153,8 +153,8 @@ export class CoreCoursesProvider {
     /**
      * Check if download a whole course is disabled in a certain site.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>} Promise resolved with true if disabled, rejected or resolved with false otherwise.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if disabled, rejected or resolved with false otherwise.
      */
     isDownloadCourseDisabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -165,8 +165,8 @@ export class CoreCoursesProvider {
     /**
      * Check if download a whole course is disabled in a certain site.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether it's disabled.
+     * @param site Site. If not defined, use current site.
+     * @return Whether it's disabled.
      */
     isDownloadCourseDisabledInSite(site?: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
@@ -177,8 +177,8 @@ export class CoreCoursesProvider {
     /**
      * Check if download all courses is disabled in a certain site.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>} Promise resolved with true if disabled, rejected or resolved with false otherwise.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if disabled, rejected or resolved with false otherwise.
      */
     isDownloadCoursesDisabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -189,8 +189,8 @@ export class CoreCoursesProvider {
     /**
      * Check if download all courses is disabled in a certain site.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether it's disabled.
+     * @param site Site. If not defined, use current site.
+     * @return Whether it's disabled.
      */
     isDownloadCoursesDisabledInSite(site?: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
@@ -201,8 +201,8 @@ export class CoreCoursesProvider {
     /**
      * Check if My Courses is disabled in a certain site.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>} Promise resolved with true if disabled, rejected or resolved with false otherwise.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if disabled, rejected or resolved with false otherwise.
      */
     isMyCoursesDisabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -213,8 +213,8 @@ export class CoreCoursesProvider {
     /**
      * Check if My Courses is disabled in a certain site.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether it's disabled.
+     * @param site Site. If not defined, use current site.
+     * @return Whether it's disabled.
      */
     isMyCoursesDisabledInSite(site?: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
@@ -225,8 +225,8 @@ export class CoreCoursesProvider {
     /**
      * Check if Search Courses is disabled in a certain site.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>} Promise resolved with true if disabled, rejected or resolved with false otherwise.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if disabled, rejected or resolved with false otherwise.
      */
     isSearchCoursesDisabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -237,8 +237,8 @@ export class CoreCoursesProvider {
     /**
      * Check if Search Courses is disabled in a certain site.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether it's disabled.
+     * @param site Site. If not defined, use current site.
+     * @return Whether it's disabled.
      */
     isSearchCoursesDisabledInSite(site?: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
@@ -249,9 +249,9 @@ export class CoreCoursesProvider {
     /**
      * Get course.
      *
-     * @param {number} id ID of the course to get.
-     * @param {string} [siteId] Site to get the courses from. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved with the course.
+     * @param id ID of the course to get.
+     * @param siteId Site to get the courses from. If not defined, use current site.
+     * @return Promise resolved with the course.
      */
     getCourse(id: number, siteId?: string): Promise<any> {
         return this.getCourses([id], siteId).then((courses) => {
@@ -266,9 +266,9 @@ export class CoreCoursesProvider {
     /**
      * Get the enrolment methods from a course.
      *
-     * @param {number} id ID of the course.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any[]} Promise resolved with the methods.
+     * @param id ID of the course.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with the methods.
      */
     getCourseEnrolmentMethods(id: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -287,8 +287,8 @@ export class CoreCoursesProvider {
     /**
      * Get cache key for get course enrolment methods WS call.
      *
-     * @param {number} id Course ID.
-     * @return {string} Cache key.
+     * @param id Course ID.
+     * @return Cache key.
      */
     protected getCourseEnrolmentMethodsCacheKey(id: number): string {
         return this.ROOT_CACHE_KEY + 'enrolmentmethods:' + id;
@@ -297,9 +297,9 @@ export class CoreCoursesProvider {
     /**
      * Get info from a course guest enrolment method.
      *
-     * @param {number} instanceId Guest instance ID.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the info is retrieved.
+     * @param instanceId Guest instance ID.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved when the info is retrieved.
      */
     getCourseGuestEnrolmentInfo(instanceId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -320,8 +320,8 @@ export class CoreCoursesProvider {
     /**
      * Get cache key for get course guest enrolment methods WS call.
      *
-     * @param {number} instanceId Guest instance ID.
-     * @return {string} Cache key.
+     * @param instanceId Guest instance ID.
+     * @return Cache key.
      */
     protected getCourseGuestEnrolmentInfoCacheKey(instanceId: number): string {
         return this.ROOT_CACHE_KEY + 'guestinfo:' + instanceId;
@@ -332,9 +332,9 @@ export class CoreCoursesProvider {
      * Warning: if the user doesn't have permissions to view some of the courses passed the WS call will fail.
      * The user must be able to view ALL the courses passed.
      *
-     * @param {number[]} ids List of IDs of the courses to get.
-     * @param {string} [siteId] Site to get the courses from. If not defined, use current site.
-     * @return {Promise<any[]>}  Promise resolved with the courses.
+     * @param ids List of IDs of the courses to get.
+     * @param siteId Site to get the courses from. If not defined, use current site.
+     * @return Promise resolved with the courses.
      */
     getCourses(ids: number[], siteId?: string): Promise<any[]> {
         if (!Array.isArray(ids)) {
@@ -361,8 +361,8 @@ export class CoreCoursesProvider {
     /**
      * Get cache key for get courses WS call.
      *
-     * @param {number[]} ids Courses IDs.
-     * @return {string} Cache key.
+     * @param ids Courses IDs.
+     * @return Cache key.
      */
     protected getCoursesCacheKey(ids: number[]): string {
         return this.ROOT_CACHE_KEY + 'course:' + JSON.stringify(ids);
@@ -373,10 +373,10 @@ export class CoreCoursesProvider {
      * When requesting a single course that belongs to enrolled courses, request all enrolled courses because
      * the WS call is probably cached.
      *
-     * @param {string} [field] The field to search.
-     * @param {any} [value] The value to match.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<{field: string, value: any}>} Promise resolved with the field and value to use.
+     * @param field The field to search.
+     * @param value The value to match.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with the field and value to use.
      */
     protected fixCoursesByFieldParams(field?: string, value?: any, siteId?: string): Promise<{field: string, value: any}> {
 
@@ -400,15 +400,15 @@ export class CoreCoursesProvider {
     /**
      * Get the first course returned by getCoursesByField.
      *
-     * @param {string} [field] The field to search. Can be left empty for all courses or:
-     *                             id: course id.
-     *                             ids: comma separated course ids.
-     *                             shortname: course short name.
-     *                             idnumber: course id number.
-     *                             category: category id the course belongs to.
-     * @param {any} [value] The value to match.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved with the first course.
+     * @param field The field to search. Can be left empty for all courses or:
+     *              id: course id.
+     *              ids: comma separated course ids.
+     *              shortname: course short name.
+     *              idnumber: course id number.
+     *              category: category id the course belongs to.
+     * @param value The value to match.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with the first course.
      * @since 3.2
      */
     getCourseByField(field?: string, value?: any, siteId?: string): Promise<any> {
@@ -424,15 +424,15 @@ export class CoreCoursesProvider {
     /**
      * Get courses. They can be filtered by field.
      *
-     * @param {string} [field] The field to search. Can be left empty for all courses or:
-     *                             id: course id.
-     *                             ids: comma separated course ids.
-     *                             shortname: course short name.
-     *                             idnumber: course id number.
-     *                             category: category id the course belongs to.
-     * @param {any} [value] The value to match.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any[]>} Promise resolved with the courses.
+     * @param field The field to search. Can be left empty for all courses or:
+     *              id: course id.
+     *              ids: comma separated course ids.
+     *              shortname: course short name.
+     *              idnumber: course id number.
+     *              category: category id the course belongs to.
+     * @param value The value to match.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with the courses.
      * @since 3.2
      */
     getCoursesByField(field?: string, value?: any, siteId?: string): Promise<any[]> {
@@ -503,9 +503,9 @@ export class CoreCoursesProvider {
     /**
      * Get cache key for get courses WS call.
      *
-     * @param {string} [field] The field to search.
-     * @param {any} [value] The value to match.
-     * @return {string} Cache key.
+     * @param field The field to search.
+     * @param value The value to match.
+     * @return Cache key.
      */
     protected getCoursesByFieldCacheKey(field?: string, value?: any): string {
         field = field || '';
@@ -517,8 +517,8 @@ export class CoreCoursesProvider {
     /**
      * Check if get courses by field WS is available in a certain site.
      *
-     * @param {CoreSite} [site] Site to check.
-     * @return {boolean} Whether get courses by field is available.
+     * @param site Site to check.
+     * @return Whether get courses by field is available.
      * @since 3.2
      */
     isGetCoursesByFieldAvailable(site?: CoreSite): boolean {
@@ -530,8 +530,8 @@ export class CoreCoursesProvider {
     /**
      * Check if get courses by field WS is available in a certain site, by site ID.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether get courses by field is available.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether get courses by field is available.
      * @since 3.2
      */
     isGetCoursesByFieldAvailableInSite(siteId?: string): Promise<boolean> {
@@ -543,9 +543,9 @@ export class CoreCoursesProvider {
     /**
      * Get the navigation and administration options for the given courses.
      *
-     * @param {number[]} courseIds IDs of courses to get.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<{navOptions: any, admOptions: any}>} Promise resolved with the options for each course.
+     * @param courseIds IDs of courses to get.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the options for each course.
      */
     getCoursesAdminAndNavOptions(courseIds: number[], siteId?: string): Promise<{ navOptions: any, admOptions: any }> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -580,7 +580,7 @@ export class CoreCoursesProvider {
     /**
      * Get the common part of the cache keys for user administration options WS calls.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getUserAdministrationOptionsCommonCacheKey(): string {
         return this.ROOT_CACHE_KEY + 'administrationOptions:';
@@ -589,8 +589,8 @@ export class CoreCoursesProvider {
     /**
      * Get cache key for get user administration options WS call.
      *
-     * @param {number[]} courseIds IDs of courses to get.
-     * @return {string} Cache key.
+     * @param courseIds IDs of courses to get.
+     * @return Cache key.
      */
     protected getUserAdministrationOptionsCacheKey(courseIds: number[]): string {
         return this.getUserAdministrationOptionsCommonCacheKey() + courseIds.join(',');
@@ -599,9 +599,9 @@ export class CoreCoursesProvider {
     /**
      * Get user administration options for a set of courses.
      *
-     * @param {number[]} courseIds IDs of courses to get.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with administration options for each course.
+     * @param courseIds IDs of courses to get.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with administration options for each course.
      */
     getUserAdministrationOptions(courseIds: number[], siteId?: string): Promise<any> {
         if (!courseIds || courseIds.length == 0) {
@@ -627,8 +627,8 @@ export class CoreCoursesProvider {
     /**
      * Get the common part of the cache keys for user navigation options WS calls.
      *
-     * @param {number[]} courseIds IDs of courses to get.
-     * @return {string} Cache key.
+     * @param courseIds IDs of courses to get.
+     * @return Cache key.
      */
     protected getUserNavigationOptionsCommonCacheKey(): string {
         return this.ROOT_CACHE_KEY + 'navigationOptions:';
@@ -637,7 +637,7 @@ export class CoreCoursesProvider {
     /**
      * Get cache key for get user navigation options WS call.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getUserNavigationOptionsCacheKey(courseIds: number[]): string {
         return this.getUserNavigationOptionsCommonCacheKey() + courseIds.join(',');
@@ -646,9 +646,9 @@ export class CoreCoursesProvider {
     /**
      * Get user navigation options for a set of courses.
      *
-     * @param {number[]} courseIds IDs of courses to get.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with navigation options for each course.
+     * @param courseIds IDs of courses to get.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with navigation options for each course.
      */
     getUserNavigationOptions(courseIds: number[], siteId?: string): Promise<any> {
         if (!courseIds || courseIds.length == 0) {
@@ -674,8 +674,8 @@ export class CoreCoursesProvider {
     /**
      * Format user navigation or administration options.
      *
-     * @param {any[]} courses Navigation or administration options for each course.
-     * @return {any} Formatted options.
+     * @param courses Navigation or administration options for each course.
+     * @return Formatted options.
      */
     protected formatUserAdminOrNavOptions(courses: any[]): any {
         const result = {};
@@ -699,10 +699,10 @@ export class CoreCoursesProvider {
      * Get a course the user is enrolled in. This function relies on getUserCourses.
      * preferCache=true will try to speed up the response, but the data returned might not be updated.
      *
-     * @param {number} id ID of the course to get.
-     * @param {boolean} [preferCache] True if shouldn't call WS if data is cached, false otherwise.
-     * @param {string} [siteId] Site to get the courses from. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved with the course.
+     * @param id ID of the course to get.
+     * @param preferCache True if shouldn't call WS if data is cached, false otherwise.
+     * @param siteId Site to get the courses from. If not defined, use current site.
+     * @return Promise resolved with the course.
      */
     getUserCourse(id: number, preferCache?: boolean, siteId?: string): Promise<any> {
         if (!id) {
@@ -725,9 +725,9 @@ export class CoreCoursesProvider {
     /**
      * Get user courses.
      *
-     * @param {boolean} [preferCache] True if shouldn't call WS if data is cached, false otherwise.
-     * @param {string} [siteId] Site to get the courses from. If not defined, use current site.
-     * @return {Promise<any[]>} Promise resolved with the courses.
+     * @param preferCache True if shouldn't call WS if data is cached, false otherwise.
+     * @param siteId Site to get the courses from. If not defined, use current site.
+     * @return Promise resolved with the courses.
      */
     getUserCourses(preferCache?: boolean, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -800,7 +800,7 @@ export class CoreCoursesProvider {
     /**
      * Get cache key for get user courses WS call.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getUserCoursesCacheKey(): string {
         return this.ROOT_CACHE_KEY + 'usercourses';
@@ -809,10 +809,10 @@ export class CoreCoursesProvider {
     /**
      * Invalidates get categories WS call.
      *
-     * @param {number} categoryId Category ID to get.
-     * @param {boolean} [addSubcategories] If it should add subcategories to the list.
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param categoryId Category ID to get.
+     * @param addSubcategories If it should add subcategories to the list.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCategories(categoryId: number, addSubcategories?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -823,9 +823,9 @@ export class CoreCoursesProvider {
     /**
      * Invalidates get course WS call.
      *
-     * @param {number} id Course ID.
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param id Course ID.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCourse(id: number, siteId?: string): Promise<any> {
         return this.invalidateCourses([id], siteId);
@@ -834,9 +834,9 @@ export class CoreCoursesProvider {
     /**
      * Invalidates get course enrolment methods WS call.
      *
-     * @param {number} id Course ID.
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param id Course ID.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCourseEnrolmentMethods(id: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -847,9 +847,9 @@ export class CoreCoursesProvider {
     /**
      * Invalidates get course guest enrolment info WS call.
      *
-     * @param {number} instanceId Guest instance ID.
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param instanceId Guest instance ID.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCourseGuestEnrolmentInfo(instanceId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -860,9 +860,9 @@ export class CoreCoursesProvider {
     /**
      * Invalidates the navigation and administration options for the given courses.
      *
-     * @param {number[]} courseIds IDs of courses to get.
-     * @param {string} [siteId] Site ID to invalidate. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courseIds IDs of courses to get.
+     * @param siteId Site ID to invalidate. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCoursesAdminAndNavOptions(courseIds: number[], siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -880,9 +880,9 @@ export class CoreCoursesProvider {
     /**
      * Invalidates get courses WS call.
      *
-     * @param {number[]} ids Courses IDs.
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param ids Courses IDs.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCourses(ids: number[], siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -893,10 +893,10 @@ export class CoreCoursesProvider {
     /**
      * Invalidates get courses by field WS call.
      *
-     * @param {string} [field] See getCoursesByField for info.
-     * @param {any} [value] The value to match.
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param field See getCoursesByField for info.
+     * @param value The value to match.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCoursesByField(field?: string, value?: any, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -914,8 +914,8 @@ export class CoreCoursesProvider {
     /**
      * Invalidates all user administration options.
      *
-     * @param {string} [siteId] Site ID to invalidate. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param siteId Site ID to invalidate. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateUserAdministrationOptions(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -926,9 +926,9 @@ export class CoreCoursesProvider {
     /**
      * Invalidates user administration options for certain courses.
      *
-     * @param {number[]} courseIds IDs of courses.
-     * @param {string} [siteId] Site ID to invalidate. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courseIds IDs of courses.
+     * @param siteId Site ID to invalidate. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateUserAdministrationOptionsForCourses(courseIds: number[], siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -939,8 +939,8 @@ export class CoreCoursesProvider {
     /**
      * Invalidates get user courses WS call.
      *
-     * @param {string} [siteId] Site ID to invalidate. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param siteId Site ID to invalidate. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateUserCourses(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -951,8 +951,8 @@ export class CoreCoursesProvider {
     /**
      * Invalidates all user navigation options.
      *
-     * @param {string} [siteId] Site ID to invalidate. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param siteId Site ID to invalidate. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateUserNavigationOptions(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -963,9 +963,9 @@ export class CoreCoursesProvider {
     /**
      * Invalidates user navigation options for certain courses.
      *
-     * @param {number[]} courseIds IDs of courses.
-     * @param {string} [siteId] Site ID to invalidate. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courseIds IDs of courses.
+     * @param siteId Site ID to invalidate. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateUserNavigationOptionsForCourses(courseIds: number[], siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -976,7 +976,7 @@ export class CoreCoursesProvider {
     /**
      * Check if WS to retrieve guest enrolment data is available.
      *
-     * @return {boolean} Whether guest WS is available.
+     * @return Whether guest WS is available.
      */
     isGuestWSAvailable(): boolean {
         const currentSite = this.sitesProvider.getCurrentSite();
@@ -987,11 +987,11 @@ export class CoreCoursesProvider {
     /**
      * Search courses.
      *
-     * @param {string} text Text to search.
-     * @param {number} [page=0] Page to get.
-     * @param {number} [perPage] Number of courses per page. Defaults to CoreCoursesProvider.SEARCH_PER_PAGE.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<{total: number, courses: any[]}>} Promise resolved with the courses and the total of matches.
+     * @param text Text to search.
+     * @param page Page to get.
+     * @param perPage Number of courses per page. Defaults to CoreCoursesProvider.SEARCH_PER_PAGE.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with the courses and the total of matches.
      */
     search(text: string, page: number = 0, perPage?: number, siteId?: string): Promise<{ total: number, courses: any[] }> {
         perPage = perPage || CoreCoursesProvider.SEARCH_PER_PAGE;
@@ -1016,12 +1016,12 @@ export class CoreCoursesProvider {
     /**
      * Self enrol current user in a certain course.
      *
-     * @param {number} courseId Course ID.
-     * @param {string} [password] Password to use.
-     * @param {number} [instanceId] Enrol instance ID.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved if the user is enrolled. If the password is invalid, the promise is rejected
-     *                        with an object with code = CoreCoursesProvider.ENROL_INVALID_KEY.
+     * @param courseId Course ID.
+     * @param password Password to use.
+     * @param instanceId Enrol instance ID.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved if the user is enrolled. If the password is invalid, the promise is rejected
+     *         with an object with code = CoreCoursesProvider.ENROL_INVALID_KEY.
      */
     selfEnrol(courseId: number, password: string = '', instanceId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1064,10 +1064,10 @@ export class CoreCoursesProvider {
     /**
      * Set favourite property on a course.
      *
-     * @param {number} courseId   Course ID.
-     * @param {boolean} favourite If favourite or unfavourite.
-     * @param {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param courseId Course ID.
+     * @param favourite If favourite or unfavourite.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved when done.
      */
     setFavouriteCourse(courseId: number, favourite: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/core/courses/providers/dashboard-link-handler.ts b/src/core/courses/providers/dashboard-link-handler.ts
index aaa0d7ab5..32c25891b 100644
--- a/src/core/courses/providers/dashboard-link-handler.ts
+++ b/src/core/courses/providers/dashboard-link-handler.ts
@@ -33,11 +33,11 @@ export class CoreCoursesDashboardLinkHandler extends CoreContentLinksHandlerBase
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -52,11 +52,11 @@ export class CoreCoursesDashboardLinkHandler extends CoreContentLinksHandlerBase
     /**
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return this.mainMenuHandler.isEnabledForSite(siteId);
diff --git a/src/core/courses/providers/dashboard.ts b/src/core/courses/providers/dashboard.ts
index beb6204d0..ebf5c538b 100644
--- a/src/core/courses/providers/dashboard.ts
+++ b/src/core/courses/providers/dashboard.ts
@@ -29,8 +29,8 @@ export class CoreCoursesDashboardProvider {
     /**
      * Get cache key for dashboard blocks WS calls.
      *
-     * @param {number} [userId] User ID. Default, 0 means current user.
-     * @return {string} Cache key.
+     * @param userId User ID. Default, 0 means current user.
+     * @return Cache key.
      */
     protected getDashboardBlocksCacheKey(userId: number = 0): string {
         return this.ROOT_CACHE_KEY + 'blocks:' + userId;
@@ -39,9 +39,9 @@ export class CoreCoursesDashboardProvider {
     /**
      * Get dashboard blocks.
      *
-     * @param {number} [userId] User ID. Default, current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the list of blocks.
+     * @param userId User ID. Default, current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of blocks.
      * @since 3.6
      */
     getDashboardBlocks(userId?: number, siteId?: string): Promise<any[]> {
@@ -67,9 +67,9 @@ export class CoreCoursesDashboardProvider {
     /**
      * Invalidates dashboard blocks WS call.
      *
-     * @param {number} [userId] User ID. Default, current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param userId User ID. Default, current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateDashboardBlocks(userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -80,8 +80,8 @@ export class CoreCoursesDashboardProvider {
     /**
      * Returns whether or not block based Dashboard is available for a certain site.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true if available, resolved with false or rejected otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if available, resolved with false or rejected otherwise.
      * @since 3.6
      */
     isAvailable(siteId?: string): Promise<boolean> {
@@ -98,8 +98,8 @@ export class CoreCoursesDashboardProvider {
     /**
      * Check if Site Home is disabled in a certain site.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>} Promise resolved with true if disabled, rejected or resolved with false otherwise.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if disabled, rejected or resolved with false otherwise.
      */
     isDisabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -110,8 +110,8 @@ export class CoreCoursesDashboardProvider {
     /**
      * Check if Site Home is disabled in a certain site.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether it's disabled.
+     * @param site Site. If not defined, use current site.
+     * @return Whether it's disabled.
      */
     isDisabledInSite(site?: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
diff --git a/src/core/courses/providers/enrol-push-click-handler.ts b/src/core/courses/providers/enrol-push-click-handler.ts
index 795b0c603..93016330f 100644
--- a/src/core/courses/providers/enrol-push-click-handler.ts
+++ b/src/core/courses/providers/enrol-push-click-handler.ts
@@ -33,8 +33,8 @@ export class CoreCoursesEnrolPushClickHandler implements CorePushNotificationsCl
     /**
      * Check if a notification click is handled by this handler.
      *
-     * @param {any} notification The notification to check.
-     * @return {boolean} Whether the notification click is handled by this handler
+     * @param notification The notification to check.
+     * @return Whether the notification click is handled by this handler
      */
     handles(notification: any): boolean | Promise<boolean> {
         return this.utils.isTrueOrOne(notification.notif) && notification.moodlecomponent.indexOf('enrol_') === 0 &&
@@ -44,8 +44,8 @@ export class CoreCoursesEnrolPushClickHandler implements CorePushNotificationsCl
     /**
      * Handle the notification click.
      *
-     * @param {any} notification The notification to check.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param notification The notification to check.
+     * @return Promise resolved when done.
      */
     handleClick(notification: any): Promise<any> {
         const courseId = Number(notification.courseid),
diff --git a/src/core/courses/providers/helper.ts b/src/core/courses/providers/helper.ts
index abd9634fe..7289734d3 100644
--- a/src/core/courses/providers/helper.ts
+++ b/src/core/courses/providers/helper.ts
@@ -35,8 +35,8 @@ export class CoreCoursesHelperProvider {
     /**
      * Get the courses to display the course picker popover. If a courseId is specified, it will also return its categoryId.
      *
-     * @param {number} [courseId] Course ID to get the category.
-     * @return {Promise<{courses: any[], categoryId: number}>} Promise resolved with the list of courses and the category.
+     * @param courseId Course ID to get the category.
+     * @return Promise resolved with the list of courses and the category.
      */
     getCoursesForPopover(courseId?: number): Promise<{courses: any[], categoryId: number}> {
         return this.coursesProvider.getUserCourses(false).then((courses) => {
@@ -71,8 +71,8 @@ export class CoreCoursesHelperProvider {
      * Given a course object returned by core_enrol_get_users_courses and another one returned by core_course_get_courses_by_field,
      * load some extra data to the first one.
      *
-     * @param {any} course Course returned by core_enrol_get_users_courses.
-     * @param {any} courseByField Course returned by core_course_get_courses_by_field.
+     * @param course Course returned by core_enrol_get_users_courses.
+     * @param courseByField Course returned by core_course_get_courses_by_field.
      */
     loadCourseExtraInfo(course: any, courseByField: any): void {
         if (courseByField) {
@@ -93,8 +93,8 @@ export class CoreCoursesHelperProvider {
      * Given a list of courses returned by core_enrol_get_users_courses, load some extra data using the WebService
      * core_course_get_courses_by_field if available.
      *
-     * @param {any[]} courses List of courses.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param courses List of courses.
+     * @return Promise resolved when done.
      */
     loadCoursesExtraInfo(courses: any[]): Promise<any> {
         if (courses[0] && typeof courses[0].overviewfiles != 'undefined' && typeof courses[0].displayname != 'undefined') {
@@ -128,10 +128,10 @@ export class CoreCoursesHelperProvider {
     /**
      * Get user courses with admin and nav options.
      *
-     * @param  {string}  [sort=fullname] Sort courses after get them. If sort is not defined it won't be sorted.
-     * @param  {number}  [slice=0]    Slice results to get the X first one. If slice > 0 it will be done after sorting.
-     * @param  {string}  [filter]    Filter using some field.
-     * @return {Promise<any[]>} Courses filled with options.
+     * @param sort Sort courses after get them. If sort is not defined it won't be sorted.
+     * @param slice Slice results to get the X first one. If slice > 0 it will be done after sorting.
+     * @param filter Filter using some field.
+     * @return Courses filled with options.
      */
     getUserCoursesWithOptions(sort: string = 'fullname', slice: number = 0, filter?: string): Promise<any[]> {
         return this.coursesProvider.getUserCourses().then((courses) => {
@@ -220,10 +220,10 @@ export class CoreCoursesHelperProvider {
      * Show a context menu to select a course, and return the courseId and categoryId of the selected course (-1 for all courses).
      * Returns an empty object if popover closed without picking a course.
      *
-     * @param {MouseEvent} event Click event.
-     * @param {any[]} courses List of courses, from CoreCoursesHelperProvider.getCoursesForPopover.
-     * @param {number} courseId The course to select at start.
-     * @return {Promise<{courseId?: number, categoryId?: number}>} Promise resolved with the course ID and category ID.
+     * @param event Click event.
+     * @param courses List of courses, from CoreCoursesHelperProvider.getCoursesForPopover.
+     * @param courseId The course to select at start.
+     * @return Promise resolved with the course ID and category ID.
      */
     selectCourse(event: MouseEvent, courses: any[], courseId: number): Promise<{courseId?: number, categoryId?: number}> {
         return new Promise((resolve, reject): any => {
diff --git a/src/core/courses/providers/mainmenu-handler.ts b/src/core/courses/providers/mainmenu-handler.ts
index 4b32ced23..81f5f3e01 100644
--- a/src/core/courses/providers/mainmenu-handler.ts
+++ b/src/core/courses/providers/mainmenu-handler.ts
@@ -36,7 +36,7 @@ export class CoreDashboardMainMenuHandler implements CoreMainMenuHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean | Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.isEnabledForSite();
@@ -45,8 +45,8 @@ export class CoreDashboardMainMenuHandler implements CoreMainMenuHandler {
     /**
      * Check if the handler is enabled on a certain site.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean | Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabledForSite(siteId?: string): Promise<boolean> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -92,7 +92,7 @@ export class CoreDashboardMainMenuHandler implements CoreMainMenuHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreMainMenuHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(): CoreMainMenuHandlerData {
         return {
diff --git a/src/core/courses/providers/request-push-click-handler.ts b/src/core/courses/providers/request-push-click-handler.ts
index af8688605..4f9246595 100644
--- a/src/core/courses/providers/request-push-click-handler.ts
+++ b/src/core/courses/providers/request-push-click-handler.ts
@@ -39,8 +39,8 @@ export class CoreCoursesRequestPushClickHandler implements CorePushNotifications
     /**
      * Check if a notification click is handled by this handler.
      *
-     * @param {any} notification The notification to check.
-     * @return {boolean} Whether the notification click is handled by this handler
+     * @param notification The notification to check.
+     * @return Whether the notification click is handled by this handler
      */
     handles(notification: any): boolean | Promise<boolean> {
         // Don't support 'courserequestrejected', that way the app will open the notifications page.
@@ -51,8 +51,8 @@ export class CoreCoursesRequestPushClickHandler implements CorePushNotifications
     /**
      * Handle the notification click.
      *
-     * @param {any} notification The notification to check.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param notification The notification to check.
+     * @return Promise resolved when done.
      */
     handleClick(notification: any): Promise<any> {
         const courseId = Number(notification.courseid);
diff --git a/src/core/emulator/classes/filesystem.ts b/src/core/emulator/classes/filesystem.ts
index d750073dc..8aa3333dc 100644
--- a/src/core/emulator/classes/filesystem.ts
+++ b/src/core/emulator/classes/filesystem.ts
@@ -34,10 +34,10 @@ export class EntryMock {
     /**
      * Copy the file or directory.
      *
-     * @param {Entry} parent The folder where to move the file to.
-     * @param {string} newName The new name for the file.
-     * @param {Function} successCallback Success callback.
-     * @param {Function} errorCallback Error callback.
+     * @param parent The folder where to move the file to.
+     * @param newName The new name for the file.
+     * @param successCallback Success callback.
+     * @param errorCallback Error callback.
      */
     copyTo(parent: Entry, newName: string, successCallback: Function, errorCallback: Function): void {
         newName = newName || this.name;
@@ -69,8 +69,8 @@ export class EntryMock {
     /**
      * Get the entry's metadata.
      *
-     * @param {Function} successCallback Success callback.
-     * @param {Function} errorCallback Error callback.
+     * @param successCallback Success callback.
+     * @param errorCallback Error callback.
      */
     getMetadata(successCallback: Function, errorCallback: Function): void {
         this.fs.stat(this.fullPath, (err, stats) => {
@@ -88,8 +88,8 @@ export class EntryMock {
     /**
      * Get the parent directory.
      *
-     * @param {Function} successCallback Success callback.
-     * @param {Function} errorCallback Error callback.
+     * @param successCallback Success callback.
+     * @param errorCallback Error callback.
      */
     getParent(successCallback: Function, errorCallback: Function): void {
         // Remove last slash if present and get the path of the parent.
@@ -111,10 +111,10 @@ export class EntryMock {
     /**
      * Move the file or directory.
      *
-     * @param {Entry} parent The folder where to move the file to.
-     * @param {string} newName The new name for the file.
-     * @param {Function} successCallback Success callback.
-     * @param {Function} errorCallback Error callback.
+     * @param parent The folder where to move the file to.
+     * @param newName The new name for the file.
+     * @param successCallback Success callback.
+     * @param errorCallback Error callback.
      */
     moveTo(parent: Entry, newName: string, successCallback: Function, errorCallback: Function): void {
         newName = newName || this.name;
@@ -136,8 +136,8 @@ export class EntryMock {
     /**
      * Remove the entry.
      *
-     * @param {Function} successCallback Success callback.
-     * @param {Function} errorCallback Error callback.
+     * @param successCallback Success callback.
+     * @param errorCallback Error callback.
      */
     remove(successCallback: Function, errorCallback: Function): void {
         const removeFn = this.isDirectory ? this.fs.rmdir : this.fs.unlink;
@@ -153,9 +153,9 @@ export class EntryMock {
     /**
      * Set the entry's metadata.
      *
-     * @param {Function} successCallback Success callback.
-     * @param {Function} errorCallback Error callback.
-     * @param {any} metadataObject The metadata to set.
+     * @param successCallback Success callback.
+     * @param errorCallback Error callback.
+     * @param metadataObject The metadata to set.
      */
     setMetadata(successCallback: Function, errorCallback: Function, metadataObject: any): void {
         // Not supported.
@@ -165,7 +165,7 @@ export class EntryMock {
     /**
      * Get the internal URL of the Entry.
      *
-     * @return {string} Internal URL.
+     * @return Internal URL.
      */
     toInternalURL(): string {
         return 'file://' + this.fullPath;
@@ -174,7 +174,7 @@ export class EntryMock {
     /**
      * Get the URL of the Entry.
      *
-     * @return {string} URL.
+     * @return URL.
      */
     toURL(): string {
         return this.fullPath;
@@ -203,7 +203,7 @@ export class DirectoryEntryMock extends EntryMock {
     /**
      * Create reader.
      *
-     * @return {DirectoryReader} Reader.
+     * @return Reader.
      */
     createReader(): DirectoryReader {
         return new DirectoryReaderMock(this.textUtils, this.mimeUtils, this.fullPath);
@@ -212,9 +212,9 @@ export class DirectoryEntryMock extends EntryMock {
     /**
      * Delete an empty folder.
      *
-     * @param {string} path Path of the folder.
-     * @param {Function} successCallback Success callback.
-     * @param {Function} errorCallback Error callback.
+     * @param path Path of the folder.
+     * @param successCallback Success callback.
+     * @param errorCallback Error callback.
      */
     protected deleteEmptyFolder(path: string, successCallback: Function, errorCallback: Function): void {
         this.fs.rmdir(path, (err) => {
@@ -230,10 +230,10 @@ export class DirectoryEntryMock extends EntryMock {
     /**
      * Get a directory inside this directory entry.
      *
-     * @param {string} path Path of the dir.
-     * @param {any} options Options.
-     * @param {Function} successCallback Success callback.
-     * @param {Function} errorCallback Error callback.
+     * @param path Path of the dir.
+     * @param options Options.
+     * @param successCallback Success callback.
+     * @param errorCallback Error callback.
      */
     getDirectory(path: string, options: any, successCallback: Function, errorCallback: Function): void {
         this.getDirOrFile(true, path, options, successCallback, errorCallback);
@@ -242,11 +242,11 @@ export class DirectoryEntryMock extends EntryMock {
     /**
      * Helper function for getDirectory and getFile.
      *
-     * @param {boolean} isDir True if getting a directory, false if getting a file.
-     * @param {string} path Path of the file or dir.
-     * @param {any} options Options.
-     * @param {Function} successCallback Success callback.
-     * @param {Function} errorCallback Error callback.
+     * @param isDir True if getting a directory, false if getting a file.
+     * @param path Path of the file or dir.
+     * @param options Options.
+     * @param successCallback Success callback.
+     * @param errorCallback Error callback.
      */
     protected getDirOrFile(isDir: boolean, path: string, options: any, successCallback: Function, errorCallback: Function): void {
 
@@ -315,10 +315,10 @@ export class DirectoryEntryMock extends EntryMock {
     /**
      * Get a file inside this directory entry.
      *
-     * @param {string} path Path of the dir.
-     * @param {any} options Options.
-     * @param {Function} successCallback Success callback.
-     * @param {Function} errorCallback Error callback.
+     * @param path Path of the dir.
+     * @param options Options.
+     * @param successCallback Success callback.
+     * @param errorCallback Error callback.
      */
     getFile(path: string, options: any, successCallback: Function, errorCallback: Function): void {
         this.getDirOrFile(false, path, options, successCallback, errorCallback);
@@ -327,8 +327,8 @@ export class DirectoryEntryMock extends EntryMock {
     /**
      * Remove the directory and all its contents.
      *
-     * @param {Function} successCallback Success callback.
-     * @param {Function} errorCallback Error callback.
+     * @param successCallback Success callback.
+     * @param errorCallback Error callback.
      */
     removeRecursively(successCallback: Function, errorCallback: Function): void {
         // Use a promise to make sure only one callback is called.
@@ -344,9 +344,9 @@ export class DirectoryEntryMock extends EntryMock {
     /**
      * Delete a file or folder recursively.
      *
-     * @param {string} path Path of the folder.
-     * @param {Function} successCallback Success callback.
-     * @param {Function} errorCallback Error callback.
+     * @param path Path of the folder.
+     * @param successCallback Success callback.
+     * @param errorCallback Error callback.
      */
     protected removeRecursiveFn(path: string, successCallback: Function, errorCallback: Function): void {
         // Check if it exists.
@@ -415,8 +415,8 @@ export class FileEntryMock extends EntryMock {
     /**
      * Create writer.
      *
-     * @param {Function} successCallback Success callback.
-     * @param {Function} errorCallback Error callback.
+     * @param successCallback Success callback.
+     * @param errorCallback Error callback.
      */
     createWriter(successCallback: Function, errorCallback: Function): void {
         this.file((file) => {
@@ -427,8 +427,8 @@ export class FileEntryMock extends EntryMock {
     /**
      * Get the file data.
      *
-     * @param {Function} successCallback Success callback.
-     * @param {Function} errorCallback Error callback.
+     * @param successCallback Success callback.
+     * @param errorCallback Error callback.
      */
     file(successCallback: Function, errorCallback: Function): void {
         // Get the metadata to know the time modified.
@@ -469,8 +469,8 @@ export class DirectoryReaderMock implements DirectoryReader {
     /**
      * Read entries inside a folder.
      *
-     * @param {Function} successCallback Success callback.
-     * @param {Function} errorCallback Error callback.
+     * @param successCallback Success callback.
+     * @param errorCallback Error callback.
      */
     readEntries(successCallback: Function, errorCallback: Function): void {
         this.fs.readdir(this.localURL, (err, files) => {
@@ -545,8 +545,8 @@ export class FileWriterMock {
     /**
      * The file position at which the next write will occur.
      *
-     * @param {number} offset If nonnegative, an absolute byte offset into the file.
-     *                        If negative, an offset back from the end of the file.
+     * @param offset If nonnegative, an absolute byte offset into the file.
+     *               If negative, an offset back from the end of the file.
      */
     seek(offset: number): void {
         this.position = offset;
@@ -556,7 +556,7 @@ export class FileWriterMock {
      * Changes the length of the file to that specified. If shortening the file, data beyond the new length
      * will be discarded. If extending the file, the existing data will be zero-padded up to the new length.
      *
-     * @param {number} size The size to which the length of the file is to be adjusted, measured in bytes.
+     * @param size The size to which the length of the file is to be adjusted, measured in bytes.
      */
     truncate(size: number): void {
         this.size = size;
@@ -565,7 +565,7 @@ export class FileWriterMock {
     /**
      * Write some data into the file.
      *
-     * @param {any} data The data to write.
+     * @param data The data to write.
      */
     write(data: any): void {
         if (data && data.toString() == '[object Blob]') {
@@ -589,7 +589,7 @@ export class FileWriterMock {
     /**
      * Write some data into the file.
      *
-     * @param {Buffer} data The data to write.
+     * @param data The data to write.
      */
     protected writeFile(data: Buffer): void {
         /* Create a write stream so we can specify where to start writing. Node's Writable stream doesn't allow specifying the
diff --git a/src/core/emulator/classes/inappbrowserobject.ts b/src/core/emulator/classes/inappbrowserobject.ts
index 1f45c7ba1..513061406 100644
--- a/src/core/emulator/classes/inappbrowserobject.ts
+++ b/src/core/emulator/classes/inappbrowserobject.ts
@@ -109,8 +109,8 @@ export class InAppBrowserObjectMock {
     /**
      * Execute a JS script.
      *
-     * @param {any} details Details of the script to run, specifying either a file or code key.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param details Details of the script to run, specifying either a file or code key.
+     * @return Promise resolved when done.
      */
     executeScript(details: any): Promise<any> {
         return new Promise((resolve, reject): void => {
@@ -129,8 +129,8 @@ export class InAppBrowserObjectMock {
     /**
      * Recursive function to get the launch URL from the contents of a BrowserWindow.
      *
-     * @param {number} [retry=0] Retry number.
-     * @return {Promise<string>} Promise resolved with the launch URL.
+     * @param retry Retry number.
+     * @return Promise resolved with the launch URL.
      */
     protected getLaunchUrl(retry: number = 0): Promise<string> {
 
@@ -172,8 +172,8 @@ export class InAppBrowserObjectMock {
     /**
      * Insert CSS.
      *
-     * @param {any} details Details of the CSS to insert, specifying either a file or code key.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param details Details of the CSS to insert, specifying either a file or code key.
+     * @return Promise resolved when done.
      */
     insertCSS(details: any): Promise<any> {
         return new Promise((resolve, reject): void => {
@@ -194,9 +194,9 @@ export class InAppBrowserObjectMock {
     /**
      * Listen to events happening.
      *
-     * @param {string} name Name of the event.
-     * @return {Observable<InAppBrowserEvent>} Observable that will listen to the event on subscribe, and will stop listening
-     *                                         to the event on unsubscribe.
+     * @param name Name of the event.
+     * @return Observable that will listen to the event on subscribe, and will stop listening
+     *         to the event on unsubscribe.
      */
     on(name: string): Observable<InAppBrowserEvent> {
         // Create the observable.
diff --git a/src/core/emulator/classes/sqlitedb.ts b/src/core/emulator/classes/sqlitedb.ts
index 5aedfcfe3..fd39efa59 100644
--- a/src/core/emulator/classes/sqlitedb.ts
+++ b/src/core/emulator/classes/sqlitedb.ts
@@ -25,7 +25,7 @@ export class SQLiteDBMock extends SQLiteDB {
     /**
      * Create and open the database.
      *
-     * @param {string} name Database name.
+     * @param name Database name.
      */
     constructor(public name: string) {
         super(name, null, null);
@@ -34,7 +34,7 @@ export class SQLiteDBMock extends SQLiteDB {
     /**
      * Close the database.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     close(): Promise<any> {
         // WebSQL databases aren't closed.
@@ -44,7 +44,7 @@ export class SQLiteDBMock extends SQLiteDB {
     /**
      * Drop all the data in the database.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     emptyDatabase(): Promise<any> {
         return new Promise((resolve, reject): void => {
@@ -84,9 +84,9 @@ export class SQLiteDBMock extends SQLiteDB {
      * IMPORTANT: Use this function only if you cannot use any of the other functions in this API. Please take into account that
      * these query will be run in SQLite (Mobile) and Web SQL (desktop), so your query should work in both environments.
      *
-     * @param {string} sql SQL query to execute.
-     * @param {any[]} params Query parameters.
-     * @return {Promise<any>} Promise resolved with the result.
+     * @param sql SQL query to execute.
+     * @param params Query parameters.
+     * @return Promise resolved with the result.
      */
     execute(sql: string, params?: any[]): Promise<any> {
         return new Promise((resolve, reject): void => {
@@ -107,8 +107,8 @@ export class SQLiteDBMock extends SQLiteDB {
      * IMPORTANT: Use this function only if you cannot use any of the other functions in this API. Please take into account that
      * these query will be run in SQLite (Mobile) and Web SQL (desktop), so your query should work in both environments.
      *
-     * @param {any[]} sqlStatements SQL statements to execute.
-     * @return {Promise<any>} Promise resolved with the result.
+     * @param sqlStatements SQL statements to execute.
+     * @return Promise resolved with the result.
      */
     executeBatch(sqlStatements: any[]): Promise<any> {
         return new Promise((resolve, reject): void => {
@@ -156,7 +156,7 @@ export class SQLiteDBMock extends SQLiteDB {
     /**
      * Open the database. Only needed if it was closed before, a database is automatically opened when created.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     open(): Promise<any> {
         // WebSQL databases can't closed, so the open method isn't needed.
diff --git a/src/core/emulator/pages/capture-media/capture-media.ts b/src/core/emulator/pages/capture-media/capture-media.ts
index 360183441..5c9377569 100644
--- a/src/core/emulator/pages/capture-media/capture-media.ts
+++ b/src/core/emulator/pages/capture-media/capture-media.ts
@@ -157,7 +157,7 @@ export class CoreEmulatorCaptureMediaPage implements OnInit, OnDestroy {
      * Initialize the audio drawer. This code has been extracted from MDN's example on MediaStream Recording:
      * https://github.com/mdn/web-dictaphone
      *
-     * @param {MediaStream} stream Stream returned by getUserMedia.
+     * @param stream Stream returned by getUserMedia.
      */
     protected initAudioDrawer(stream: MediaStream): void {
         let skip = true,
@@ -318,7 +318,7 @@ export class CoreEmulatorCaptureMediaPage implements OnInit, OnDestroy {
     /**
      * Close the modal, returning some data (success).
      *
-     * @param {any} data Data to return.
+     * @param data Data to return.
      */
     dismissWithData(data: any): void {
         this.viewCtrl.dismiss(data, 'success');
@@ -327,9 +327,9 @@ export class CoreEmulatorCaptureMediaPage implements OnInit, OnDestroy {
     /**
      * Close the modal, returning an error.
      *
-     * @param {number} code Error code. Will not be used if it's a Camera capture.
-     * @param {string} message Error message.
-     * @param {string} [cameraMessage] A specific message to use if it's a Camera capture. If not set, message will be used.
+     * @param code Error code. Will not be used if it's a Camera capture.
+     * @param message Error message.
+     * @param cameraMessage A specific message to use if it's a Camera capture. If not set, message will be used.
      */
     dismissWithError(code: number, message: string, cameraMessage?: string): void {
         const isCamera = this.isImage && !this.isCaptureImage,
diff --git a/src/core/emulator/providers/badge.ts b/src/core/emulator/providers/badge.ts
index 713ef67a1..f3d843c9f 100644
--- a/src/core/emulator/providers/badge.ts
+++ b/src/core/emulator/providers/badge.ts
@@ -26,8 +26,6 @@ export class BadgeMock implements Badge {
 
     /**
      * Clear the badge of the app icon.
-     *
-     * @returns {Promise<boolean>}
      */
     clear(): Promise<boolean> {
         return Promise.reject('clear is only supported in mobile devices');
@@ -35,8 +33,7 @@ export class BadgeMock implements Badge {
 
     /**
      * Set the badge of the app icon.
-     * @param {number} badgeNumber  The new badge number.
-     * @returns {Promise<any>}
+     * @param badgeNumber The new badge number.
      */
     set(badgeNumber: number): Promise<any> {
         if (!this.appProvider.isDesktop()) {
@@ -57,8 +54,6 @@ export class BadgeMock implements Badge {
 
     /**
      * Get the badge of the app icon.
-     *
-     * @returns {Promise<any>}
      */
     get(): Promise<any> {
         if (!this.appProvider.isDesktop()) {
@@ -77,8 +72,7 @@ export class BadgeMock implements Badge {
     /**
      * Increase the badge number.
      *
-     * @param {number} increaseBy  Count to add to the current badge number
-     * @returns {Promise<any>}
+     * @param increaseBy Count to add to the current badge number
      */
     increase(increaseBy: number): Promise<any> {
         return Promise.reject('increase is only supported in mobile devices');
@@ -87,8 +81,7 @@ export class BadgeMock implements Badge {
     /**
      * Decrease the badge number.
      *
-     * @param {number} decreaseBy  Count to subtract from the current badge number
-     * @returns {Promise<any>}
+     * @param decreaseBy Count to subtract from the current badge number
      */
     decrease(decreaseBy: number): Promise<any> {
         return Promise.reject('decrease is only supported in mobile devices');
@@ -96,8 +89,6 @@ export class BadgeMock implements Badge {
 
     /**
      * Check support to show badges.
-     *
-     * @returns {Promise<any>}
      */
     isSupported(): Promise<any> {
         return Promise.reject('isSupported is only supported in mobile devices');
@@ -105,8 +96,6 @@ export class BadgeMock implements Badge {
 
     /**
      * Determine if the app has permission to show badges.
-     *
-     * @returns {Promise<any>}
      */
     hasPermission(): Promise<any> {
         return Promise.reject('hasPermission is only supported in mobile devices');
@@ -114,8 +103,6 @@ export class BadgeMock implements Badge {
 
     /**
      * Register permission to set badge notifications
-     *
-     * @returns {Promise<any>}
      */
     requestPermission(): Promise<any> {
         return Promise.reject('requestPermission is only supported in mobile devices');
diff --git a/src/core/emulator/providers/camera.ts b/src/core/emulator/providers/camera.ts
index 323b6d7fe..4fe7eaa00 100644
--- a/src/core/emulator/providers/camera.ts
+++ b/src/core/emulator/providers/camera.ts
@@ -29,7 +29,7 @@ export class CameraMock extends Camera {
     /**
      * Remove intermediate image files that are kept in temporary storage after calling camera.getPicture.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     cleanup(): Promise<any> {
         // This function is iOS only, nothing to do.
@@ -39,8 +39,8 @@ export class CameraMock extends Camera {
     /**
      * Take a picture.
      *
-     * @param {CameraOptions} options Options that you want to pass to the camera.
-     * @return {Promise<any>} Promise resolved when captured.
+     * @param options Options that you want to pass to the camera.
+     * @return Promise resolved when captured.
      */
     getPicture(options: CameraOptions): Promise<any> {
         return this.captureHelper.captureMedia('image', options);
diff --git a/src/core/emulator/providers/capture-helper.ts b/src/core/emulator/providers/capture-helper.ts
index cf66fbf92..33d174d09 100644
--- a/src/core/emulator/providers/capture-helper.ts
+++ b/src/core/emulator/providers/capture-helper.ts
@@ -44,9 +44,9 @@ export class CoreEmulatorCaptureHelperProvider {
     /**
      * Capture media (image, audio, video).
      *
-     * @param {string} type Type of media: image, audio, video.
-     * @param {any} [options] Optional options.
-     * @return {Promise<any>} Promise resolved when captured, rejected if error.
+     * @param type Type of media: image, audio, video.
+     * @param options Optional options.
+     * @return Promise resolved when captured, rejected if error.
      */
     captureMedia(type: string, options: any): Promise<any> {
         options = options || {};
@@ -118,9 +118,9 @@ export class CoreEmulatorCaptureHelperProvider {
     /**
      * Get the mimetype and extension to capture media.
      *
-     * @param {string} type Type of media: image, audio, video.
-     * @param {string[]} [mimetypes] List of supported mimetypes. If undefined, all mimetypes supported.
-     * @return {{extension: string, mimetype: string}} An object with mimetype and extension to use.
+     * @param type Type of media: image, audio, video.
+     * @param mimetypes List of supported mimetypes. If undefined, all mimetypes supported.
+     * @return An object with mimetype and extension to use.
      */
     protected getMimeTypeAndExtension(type: string, mimetypes: string[]): { extension: string, mimetype: string } {
         const result: any = {};
@@ -157,7 +157,7 @@ export class CoreEmulatorCaptureHelperProvider {
     /**
      * Init the getUserMedia function, using a deprecated function as fallback if the new one doesn't exist.
      *
-     * @return {boolean} Whether the function is supported.
+     * @return Whether the function is supported.
      */
     protected initGetUserMedia(): boolean {
         const nav = <any> navigator;
@@ -209,7 +209,7 @@ export class CoreEmulatorCaptureHelperProvider {
     /**
      * Load the Mocks that need it.
      *
-     * @return {Promise<void>} Promise resolved when loaded.
+     * @return Promise resolved when loaded.
      */
     load(): Promise<void> {
         if (typeof this.win.MediaRecorder != 'undefined' && this.initGetUserMedia()) {
diff --git a/src/core/emulator/providers/clipboard.ts b/src/core/emulator/providers/clipboard.ts
index 40390a883..bf3a8e081 100644
--- a/src/core/emulator/providers/clipboard.ts
+++ b/src/core/emulator/providers/clipboard.ts
@@ -43,8 +43,8 @@ export class ClipboardMock extends Clipboard {
     /**
      * Copy some text to the clipboard.
      *
-     * @param {string} text The text to copy.
-     * @return {Promise<any>} Promise resolved when copied.
+     * @param text The text to copy.
+     * @return Promise resolved when copied.
      */
     copy(text: string): Promise<any> {
         return new Promise((resolve, reject): void => {
@@ -74,7 +74,7 @@ export class ClipboardMock extends Clipboard {
     /*
      * Get the text stored in the clipboard.
      *
-     * @return {Promise<any>} Promise resolved with the text.
+     * @return Promise resolved with the text.
      */
     paste(): Promise<any> {
         return new Promise((resolve, reject): void => {
diff --git a/src/core/emulator/providers/file-opener.ts b/src/core/emulator/providers/file-opener.ts
index e5ae16579..d739950c5 100644
--- a/src/core/emulator/providers/file-opener.ts
+++ b/src/core/emulator/providers/file-opener.ts
@@ -29,8 +29,8 @@ export class FileOpenerMock extends FileOpener {
     /**
      * Check if an app is already installed.
      *
-     * @param {string} packageId Package ID.
-     * @returns {Promise<any>} Promise resolved when done.
+     * @param packageId Package ID.
+     * @return Promise resolved when done.
      */
     appIsInstalled(packageId: string): Promise<any> {
         return Promise.reject('appIsInstalled not supported in browser or dekstop.');
@@ -39,9 +39,9 @@ export class FileOpenerMock extends FileOpener {
     /**
      * Open an file.
      *
-     * @param {string} filePath File path.
-     * @param {string} fileMIMEType File MIME type.
-     * @returns {Promise<any>} Promise resolved when done.
+     * @param filePath File path.
+     * @param fileMIMEType File MIME type.
+     * @return Promise resolved when done.
      */
     open(filePath: string, fileMIMEType: string): Promise<any> {
         if (this.appProvider.isDesktop()) {
@@ -61,8 +61,8 @@ export class FileOpenerMock extends FileOpener {
     /**
      * Uninstalls a package.
      *
-     * @param {string} packageId Package ID.
-     * @returns {Promise<any>} Promise resolved when done.
+     * @param packageId Package ID.
+     * @return Promise resolved when done.
      */
     uninstall(packageId: string): Promise<any> {
         return Promise.reject('uninstall not supported in browser or dekstop.');
diff --git a/src/core/emulator/providers/file-transfer.ts b/src/core/emulator/providers/file-transfer.ts
index f8ab362c9..c3b250c9c 100644
--- a/src/core/emulator/providers/file-transfer.ts
+++ b/src/core/emulator/providers/file-transfer.ts
@@ -44,8 +44,6 @@ export class FileTransferMock extends FileTransfer {
 
     /**
      * Creates a new FileTransferObjectMock object.
-     *
-     * @return {FileTransferObjectMock}
      */
     create(): FileTransferObjectMock {
         return new FileTransferObjectMock(this.appProvider, this.fileProvider);
@@ -80,11 +78,11 @@ export class FileTransferObjectMock extends FileTransferObject {
     /**
      * Downloads a file from server.
      *
-     * @param {string} source URL of the server to download the file, as encoded by encodeURI().
-     * @param {string} target Filesystem url representing the file on the device.
-     * @param {boolean} [trustAllHosts] If set to true, it accepts all security certificates.
-     * @param {object} [options] Optional parameters, currently only supports headers.
-     * @returns {Promise<any>} Returns a Promise that resolves to a FileEntry object.
+     * @param source URL of the server to download the file, as encoded by encodeURI().
+     * @param target Filesystem url representing the file on the device.
+     * @param trustAllHosts If set to true, it accepts all security certificates.
+     * @param options Optional parameters, currently only supports headers.
+     * @return Returns a Promise that resolves to a FileEntry object.
      */
     download(source: string, target: string, trustAllHosts?: boolean, options?: { [s: string]: any; }): Promise<any> {
         return new Promise((resolve, reject): void => {
@@ -165,8 +163,8 @@ export class FileTransferObjectMock extends FileTransferObject {
      * Given a URL, check if it has a credentials in it and, if so, return them in a header object.
      * This code is extracted from Cordova FileTransfer plugin.
      *
-     * @param {string} urlString The URL to get the credentials from.
-     * @return {any} The header with the credentials, null if no credentials.
+     * @param urlString The URL to get the credentials from.
+     * @return The header with the credentials, null if no credentials.
      */
     protected getBasicAuthHeader(urlString: string): any {
         let header = null;
@@ -191,8 +189,8 @@ export class FileTransferObjectMock extends FileTransferObject {
     /**
      * Given an instance of XMLHttpRequest, get the response headers as an object.
      *
-     * @param {XMLHttpRequest} xhr XMLHttpRequest instance.
-     * @return {{[s: string]: any}} Object with the headers.
+     * @param xhr XMLHttpRequest instance.
+     * @return Object with the headers.
      */
     protected getHeadersAsObject(xhr: XMLHttpRequest): { [s: string]: any } {
         const headersString = xhr.getAllResponseHeaders(),
@@ -216,8 +214,8 @@ export class FileTransferObjectMock extends FileTransferObject {
      * Get the credentials from a URL.
      * This code is extracted from Cordova FileTransfer plugin.
      *
-     * @param {string} urlString The URL to get the credentials from.
-     * @return {string} Retrieved credentials.
+     * @param urlString The URL to get the credentials from.
+     * @return Retrieved credentials.
      */
     protected getUrlCredentials(urlString: string): string {
         const credentialsPattern = /^https?\:\/\/(?:(?:(([^:@\/]*)(?::([^@\/]*))?)?@)?([^:\/?#]*)(?::(\d*))?).*$/,
@@ -229,7 +227,7 @@ export class FileTransferObjectMock extends FileTransferObject {
     /**
      * Registers a listener that gets called whenever a new chunk of data is transferred.
      *
-     * @param {Function} listener Listener that takes a progress event.
+     * @param listener Listener that takes a progress event.
      */
     onProgress(listener: (event: ProgressEvent) => any): void {
         this.progressListener = listener;
@@ -238,8 +236,8 @@ export class FileTransferObjectMock extends FileTransferObject {
     /**
      * Same as Javascript's JSON.parse, but it will handle errors.
      *
-     * @param {string} json JSON text.
-     * @return {any} JSON parsed as object or what it gets.
+     * @param json JSON text.
+     * @return JSON parsed as object or what it gets.
      */
     protected parseJSON(json: string): any {
         try {
@@ -254,8 +252,8 @@ export class FileTransferObjectMock extends FileTransferObject {
     /**
      * Parse a response, converting it into text and the into an object if needed.
      *
-     * @param {any} response The response to parse.
-     * @return {Promise<any>} Promise resolved with the parsed response.
+     * @param response The response to parse.
+     * @return Promise resolved with the parsed response.
      */
     protected parseResponse(response: any): Promise<any> {
         return new Promise((resolve, reject): void => {
@@ -283,11 +281,11 @@ export class FileTransferObjectMock extends FileTransferObject {
     /**
      * Sends a file to a server.
      *
-     * @param {string} fileUrl Filesystem URL representing the file on the device or a data URI.
-     * @param {string} url URL of the server to receive the file, as encoded by encodeURI().
-     * @param {FileUploadOptions} [options] Optional parameters.
-     * @param {boolean} [trustAllHosts] If set to true, it accepts all security certificates.
-     * @returns {Promise<FileUploadResult>} Promise that resolves to a FileUploadResult and rejects with FileTransferError.
+     * @param fileUrl Filesystem URL representing the file on the device or a data URI.
+     * @param url URL of the server to receive the file, as encoded by encodeURI().
+     * @param options Optional parameters.
+     * @param trustAllHosts If set to true, it accepts all security certificates.
+     * @return Promise that resolves to a FileUploadResult and rejects with FileTransferError.
      */
     upload(fileUrl: string, url: string, options?: FileUploadOptions, trustAllHosts?: boolean): Promise<FileUploadResult> {
         return new Promise((resolve, reject): void => {
diff --git a/src/core/emulator/providers/file.ts b/src/core/emulator/providers/file.ts
index 891d983be..46c1b89e9 100644
--- a/src/core/emulator/providers/file.ts
+++ b/src/core/emulator/providers/file.ts
@@ -35,9 +35,9 @@ export class FileMock extends File {
     /**
      * Check if a directory exists in a certain path, directory.
      *
-     * @param {string} path Base FileSystem.
-     * @param {string} dir Name of directory to check
-     * @returns {Promise<boolean>} Returns a Promise that resolves to true if the directory exists or rejects with an error.
+     * @param path Base FileSystem.
+     * @param dir Name of directory to check
+     * @return Returns a Promise that resolves to true if the directory exists or rejects with an error.
      */
     checkDir(path: string, dir: string): Promise<boolean> {
         const fullPath = this.textUtils.concatenatePaths(path, dir);
@@ -50,9 +50,9 @@ export class FileMock extends File {
     /**
      * Check if a file exists in a certain path, directory.
      *
-     * @param {string} path Base FileSystem.
-     * @param {string} file Name of file to check.
-     * @returns {Promise<boolean>} Returns a Promise that resolves with a boolean or rejects with an error.
+     * @param path Base FileSystem.
+     * @param file Name of file to check.
+     * @return Returns a Promise that resolves with a boolean or rejects with an error.
      */
     checkFile(path: string, file: string): Promise<boolean> {
         return this.resolveLocalFilesystemUrl(this.textUtils.concatenatePaths(path, file)).then((fse) => {
@@ -70,10 +70,10 @@ export class FileMock extends File {
     /**
      * Copy a file or directory.
      *
-     * @param {Entry} srce The Entry to copy.
-     * @param {DirectoryEntry} destDir The directory where to put the copy.
-     * @param {string} newName New name of the file/dir.
-     * @returns {Promise<Entry>} Returns a Promise that resolves to the new Entry object or rejects with an error.
+     * @param srce The Entry to copy.
+     * @param destDir The directory where to put the copy.
+     * @param newName New name of the file/dir.
+     * @return Returns a Promise that resolves to the new Entry object or rejects with an error.
      */
     private copyMock(srce: Entry, destDir: DirectoryEntry, newName: string): Promise<Entry> {
         return new Promise<Entry>((resolve, reject): void => {
@@ -91,11 +91,11 @@ export class FileMock extends File {
     /**
      * Copy a directory in various methods. If destination directory exists, will fail to copy.
      *
-     * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above.
-     * @param {string} dirName Name of directory to copy.
-     * @param {string} newPath Base FileSystem of new location.
-     * @param {string} newDirName New name of directory to copy to (leave blank to remain the same).
-     * @returns {Promise<Entry>} Returns a Promise that resolves to the new Entry object or rejects with an error.
+     * @param path Base FileSystem. Please refer to the iOS and Android filesystems above.
+     * @param dirName Name of directory to copy.
+     * @param newPath Base FileSystem of new location.
+     * @param newDirName New name of directory to copy to (leave blank to remain the same).
+     * @return Returns a Promise that resolves to the new Entry object or rejects with an error.
      */
     copyDir(path: string, dirName: string, newPath: string, newDirName: string): Promise<Entry> {
         return this.resolveDirectoryUrl(path).then((fse) => {
@@ -110,11 +110,11 @@ export class FileMock extends File {
     /**
      * Copy a file in various methods. If file exists, will fail to copy.
      *
-     * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above
-     * @param {string} fileName Name of file to copy
-     * @param {string} newPath Base FileSystem of new location
-     * @param {string} newFileName New name of file to copy to (leave blank to remain the same)
-     * @returns {Promise<Entry>} Returns a Promise that resolves to an Entry or rejects with an error.
+     * @param path Base FileSystem. Please refer to the iOS and Android filesystems above
+     * @param fileName Name of file to copy
+     * @param newPath Base FileSystem of new location
+     * @param newFileName New name of file to copy to (leave blank to remain the same)
+     * @return Returns a Promise that resolves to an Entry or rejects with an error.
      */
     copyFile(path: string, fileName: string, newPath: string, newFileName: string): Promise<Entry> {
         newFileName = newFileName || fileName;
@@ -133,10 +133,10 @@ export class FileMock extends File {
      * The replace boolean value determines whether to replace an existing directory with the same name.
      * If an existing directory exists and the replace value is false, the promise will fail and return an error.
      *
-     * @param {string} path Base FileSystem.
-     * @param {string} dirName Name of directory to create
-     * @param {boolean} replace If true, replaces file with same name. If false returns error
-     * @returns {Promise<DirectoryEntry>} Returns a Promise that resolves with a DirectoryEntry or rejects with an error.
+     * @param path Base FileSystem.
+     * @param dirName Name of directory to create
+     * @param replace If true, replaces file with same name. If false returns error
+     * @return Returns a Promise that resolves with a DirectoryEntry or rejects with an error.
      */
     createDir(path: string, dirName: string, replace: boolean): Promise<DirectoryEntry> {
         const options: any = {
@@ -157,10 +157,10 @@ export class FileMock extends File {
      * The replace boolean value determines whether to replace an existing file with the same name.
      * If an existing file exists and the replace value is false, the promise will fail and return an error.
      *
-     * @param {string} path  Base FileSystem.
-     * @param {string} fileName Name of file to create.
-     * @param {boolean} replace If true, replaces file with same name. If false returns error.
-     * @returns {Promise<FileEntry>} Returns a Promise that resolves to a FileEntry or rejects with an error.
+     * @param path Base FileSystem.
+     * @param fileName Name of file to create.
+     * @param replace If true, replaces file with same name. If false returns error.
+     * @return Returns a Promise that resolves to a FileEntry or rejects with an error.
      */
     createFile(path: string, fileName: string, replace: boolean): Promise<FileEntry> {
         const options: any = {
@@ -179,8 +179,8 @@ export class FileMock extends File {
     /**
      * Create a file writer for a certain file.
      *
-     * @param {FileEntry} fe File entry object.
-     * @returns {Promise<FileWriter>} Promise resolved with the FileWriter.
+     * @param fe File entry object.
+     * @return Promise resolved with the FileWriter.
      */
     private createWriterMock(fe: FileEntry): Promise<FileWriter> {
         return new Promise<FileWriter>((resolve, reject): void => {
@@ -197,7 +197,7 @@ export class FileMock extends File {
      * Emulate Cordova file plugin using NodeJS functions. This is only for NodeJS environments,
      * browser works with the default resolveLocalFileSystemURL.
      *
-     * @param {any} fs Node module 'fs'.
+     * @param fs Node module 'fs'.
      */
     protected emulateCordovaFileForDesktop(fs: any): void {
         if (!this.appProvider.isDesktop()) {
@@ -224,7 +224,7 @@ export class FileMock extends File {
     /**
      * Fill the message for an error.
      *
-     * @param {any} err Error.
+     * @param err Error.
      */
     private fillErrorMessageMock(err: any): void {
         try {
@@ -237,10 +237,9 @@ export class FileMock extends File {
     /**
      * Get a directory.
      *
-     * @param directoryEntry {DirectoryEntry} Directory entry, obtained by resolveDirectoryUrl method
-     * @param directoryName {string} Directory name
-     * @param flags {Flags} Options
-     * @returns {Promise<DirectoryEntry>}
+     * @param directoryEntry Directory entry, obtained by resolveDirectoryUrl method
+     * @param directoryName Directory name
+     * @param flags Options
      */
     getDirectory(directoryEntry: DirectoryEntry, directoryName: string, flags: Flags): Promise<DirectoryEntry> {
         return new Promise<DirectoryEntry>((resolve, reject): void => {
@@ -262,10 +261,9 @@ export class FileMock extends File {
 
     /**
      * Get a file
-     * @param directoryEntry {DirectoryEntry} Directory entry, obtained by resolveDirectoryUrl method
-     * @param fileName {string} File name
-     * @param flags {Flags} Options
-     * @returns {Promise<FileEntry>}
+     * @param directoryEntry Directory entry, obtained by resolveDirectoryUrl method
+     * @param fileName File name
+     * @param flags Options
      */
     getFile(directoryEntry: DirectoryEntry, fileName: string, flags: Flags): Promise<FileEntry> {
         return new Promise<FileEntry>((resolve, reject): void => {
@@ -286,7 +284,7 @@ export class FileMock extends File {
     /**
      * Get free disk space.
      *
-     * @return {Promise<number>} Promise resolved with the free space.
+     * @return Promise resolved with the free space.
      */
     getFreeDiskSpace(): Promise<number> {
         // FRequest a file system instance with a minimum size until we get an error.
@@ -329,9 +327,9 @@ export class FileMock extends File {
     /**
      * List files and directory from a given path.
      *
-     * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above
-     * @param {string} dirName Name of directory
-     * @returns {Promise<Entry[]>} Returns a Promise that resolves to an array of Entry objects or rejects with an error.
+     * @param path Base FileSystem. Please refer to the iOS and Android filesystems above
+     * @param dirName Name of directory
+     * @return Returns a Promise that resolves to an array of Entry objects or rejects with an error.
      */
     listDir(path: string, dirName: string): Promise<Entry[]> {
         return this.resolveDirectoryUrl(path).then((fse) => {
@@ -346,7 +344,7 @@ export class FileMock extends File {
     /**
      * Loads an initialize the API for browser and desktop.
      *
-     * @return {Promise<any>} Promise resolved when loaded.
+     * @return Promise resolved when loaded.
      */
     load(): Promise<any> {
         return new Promise((resolve, reject): void => {
@@ -404,10 +402,10 @@ export class FileMock extends File {
     /**
      * Move a file or directory.
      *
-     * @param {Entry} srce The Entry to copy.
-     * @param {DirectoryEntry} destDir The directory where to move the file/dir.
-     * @param {string} newName New name of the file/dir.
-     * @returns {Promise<Entry>} Returns a Promise that resolves to the new Entry object or rejects with an error.
+     * @param srce The Entry to copy.
+     * @param destDir The directory where to move the file/dir.
+     * @param newName New name of the file/dir.
+     * @return Returns a Promise that resolves to the new Entry object or rejects with an error.
      */
     private moveMock(srce: Entry, destDir: DirectoryEntry, newName: string): Promise<Entry> {
         return new Promise<Entry>((resolve, reject): void => {
@@ -425,12 +423,12 @@ export class FileMock extends File {
     /**
      * Move a directory to a given path.
      *
-     * @param {string} path The source path to the directory.
-     * @param {string} dirName The source directory name.
-     * @param {string} newPath The destionation path to the directory.
-     * @param {string} newDirName The destination directory name.
-     * @returns {Promise<DirectoryEntry|Entry>} Returns a Promise that resolves to the new DirectoryEntry object or rejects with
-     *                                          an error.
+     * @param path The source path to the directory.
+     * @param dirName The source directory name.
+     * @param newPath The destionation path to the directory.
+     * @param newDirName The destination directory name.
+     * @return Returns a Promise that resolves to the new DirectoryEntry object or rejects with
+     *         an error.
      */
     moveDir(path: string, dirName: string, newPath: string, newDirName: string): Promise<DirectoryEntry | Entry> {
         return this.resolveDirectoryUrl(path).then((fse) => {
@@ -445,11 +443,11 @@ export class FileMock extends File {
     /**
      * Move a file to a given path.
      *
-     * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above
-     * @param {string} fileName Name of file to move
-     * @param {string} newPath Base FileSystem of new location
-     * @param {string} newFileName New name of file to move to (leave blank to remain the same)
-     * @returns {Promise<Entry>} Returns a Promise that resolves to the new Entry or rejects with an error.
+     * @param path Base FileSystem. Please refer to the iOS and Android filesystems above
+     * @param fileName Name of file to move
+     * @param newPath Base FileSystem of new location
+     * @param newFileName New name of file to move to (leave blank to remain the same)
+     * @return Returns a Promise that resolves to the new Entry or rejects with an error.
      */
     moveFile(path: string, fileName: string, newPath: string, newFileName: string): Promise<Entry> {
         newFileName = newFileName || fileName;
@@ -465,10 +463,10 @@ export class FileMock extends File {
 
     /**
      * Read file and return data as an ArrayBuffer.
-     * @param {string} path Base FileSystem.
-     * @param {string} file Name of file, relative to path.
-     * @returns {Promise<ArrayBuffer>} Returns a Promise that resolves with the contents of the file as ArrayBuffer or rejects
-     *                                 with an error.
+     * @param path Base FileSystem.
+     * @param file Name of file, relative to path.
+     * @return Returns a Promise that resolves with the contents of the file as ArrayBuffer or rejects
+     *         with an error.
      */
     readAsArrayBuffer(path: string, file: string): Promise<ArrayBuffer> {
         return this.readFileMock<ArrayBuffer>(path, file, 'ArrayBuffer');
@@ -476,9 +474,9 @@ export class FileMock extends File {
 
     /**
      * Read file and return data as a binary data.
-     * @param {string} path Base FileSystem.
-     * @param {string} file Name of file, relative to path.
-     * @returns {Promise<string>} Returns a Promise that resolves with the contents of the file as string rejects with an error.
+     * @param path Base FileSystem.
+     * @param file Name of file, relative to path.
+     * @return Returns a Promise that resolves with the contents of the file as string rejects with an error.
      */
     readAsBinaryString(path: string, file: string): Promise<string> {
         return this.readFileMock<string>(path, file, 'BinaryString');
@@ -488,10 +486,10 @@ export class FileMock extends File {
      * Read file and return data as a base64 encoded data url.
      * A data url is of the form:
      *      data: [<mediatype>][;base64],<data>
-     * @param {string} path Base FileSystem.
-     * @param {string} file Name of file, relative to path.
-     * @returns {Promise<string>} Returns a Promise that resolves with the contents of the file as data URL or rejects
-     *                            with an error.
+     * @param path Base FileSystem.
+     * @param file Name of file, relative to path.
+     * @return Returns a Promise that resolves with the contents of the file as data URL or rejects
+     *         with an error.
      */
     readAsDataURL(path: string, file: string): Promise<string> {
         return this.readFileMock<string>(path, file, 'DataURL');
@@ -500,9 +498,9 @@ export class FileMock extends File {
     /**
      * Read the contents of a file as text.
      *
-     * @param {string} path Base FileSystem.
-     * @param {string} file Name of file, relative to path.
-     * @returns {Promise<string>} Returns a Promise that resolves with the contents of the file as string or rejects with an error.
+     * @param path Base FileSystem.
+     * @param file Name of file, relative to path.
+     * @return Returns a Promise that resolves with the contents of the file as string or rejects with an error.
      */
     readAsText(path: string, file: string): Promise<string> {
         return this.readFileMock<string>(path, file, 'Text');
@@ -511,8 +509,8 @@ export class FileMock extends File {
     /**
      * Read all the files and directories inside a directory.
      *
-     * @param {DirectoryReader} dr The directory reader.
-     * @return {Promise<Entry[]>} Promise resolved with the list of files/dirs.
+     * @param dr The directory reader.
+     * @return Promise resolved with the list of files/dirs.
      */
     private readEntriesMock(dr: DirectoryReader): Promise<Entry[]> {
         return new Promise<Entry[]>((resolve, reject): void => {
@@ -528,10 +526,10 @@ export class FileMock extends File {
     /**
      * Read the contents of a file.
      *
-     * @param {string} path Base FileSystem.
-     * @param {string} file Name of file, relative to path.
-     * @param {string} readAs Format to read as.
-     * @returns {Promise<string>} Returns a Promise that resolves with the contents of the file or rejects with an error.
+     * @param path Base FileSystem.
+     * @param file Name of file, relative to path.
+     * @param readAs Format to read as.
+     * @return Returns a Promise that resolves with the contents of the file or rejects with an error.
      */
     private readFileMock<T>(path: string, file: string, readAs: 'ArrayBuffer' | 'BinaryString' | 'DataURL' | 'Text'): Promise<T> {
         return this.resolveDirectoryUrl(path).then((directoryEntry: DirectoryEntry) => {
@@ -562,8 +560,8 @@ export class FileMock extends File {
     /**
      * Delete a file.
      *
-     * @param {Entry} fe The file to remove.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param fe The file to remove.
+     * @return Promise resolved when done.
      */
     private removeMock(fe: Entry): Promise<any> {
         return new Promise<any>((resolve, reject): void => {
@@ -579,9 +577,9 @@ export class FileMock extends File {
     /**
      * Remove a directory at a given path.
      *
-     * @param {string} path The path to the directory.
-     * @param {string} dirName The directory name.
-     * @returns {Promise<RemoveResult>} Returns a Promise that resolves to a RemoveResult or rejects with an error.
+     * @param path The path to the directory.
+     * @param dirName The directory name.
+     * @return Returns a Promise that resolves to a RemoveResult or rejects with an error.
      */
     removeDir(path: string, dirName: string): Promise<any> {
         return this.resolveDirectoryUrl(path).then((fse) => {
@@ -594,9 +592,9 @@ export class FileMock extends File {
     /**
      * Removes a file from a desired location.
      *
-     * @param {string} path  Base FileSystem.
-     * @param {string} fileName Name of file to remove.
-     * @returns {Promise<RemoveResult>} Returns a Promise that resolves to a RemoveResult or rejects with an error.
+     * @param path Base FileSystem.
+     * @param fileName Name of file to remove.
+     * @return Returns a Promise that resolves to a RemoveResult or rejects with an error.
      */
     removeFile(path: string, fileName: string): Promise<any> {
         return this.resolveDirectoryUrl(path).then((fse) => {
@@ -609,9 +607,9 @@ export class FileMock extends File {
     /**
      * Removes all files and the directory from a desired location.
      *
-     * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above
-     * @param {string} dirName Name of directory
-     * @returns {Promise<RemoveResult>} Returns a Promise that resolves with a RemoveResult or rejects with an error.
+     * @param path Base FileSystem. Please refer to the iOS and Android filesystems above
+     * @param dirName Name of directory
+     * @return Returns a Promise that resolves with a RemoveResult or rejects with an error.
      */
     removeRecursively(path: string, dirName: string): Promise<any> {
         return this.resolveDirectoryUrl(path).then((fse) => {
@@ -623,8 +621,7 @@ export class FileMock extends File {
 
     /**
      * Resolves a local directory url
-     * @param directoryUrl {string} directory system url
-     * @returns {Promise<DirectoryEntry>}
+     * @param directoryUrl directory system url
      */
     resolveDirectoryUrl(directoryUrl: string): Promise<DirectoryEntry> {
         return this.resolveLocalFilesystemUrl(directoryUrl).then((de) => {
@@ -641,8 +638,7 @@ export class FileMock extends File {
 
     /**
      * Resolves a local file system URL
-     * @param fileUrl {string} file system url
-     * @returns {Promise<Entry>}
+     * @param fileUrl file system url
      */
     resolveLocalFilesystemUrl(fileUrl: string): Promise<Entry> {
         return new Promise<Entry>((resolve, reject): void => {
@@ -663,8 +659,8 @@ export class FileMock extends File {
     /**
      * Remove a directory and all its contents.
      *
-     * @param {DirectoryEntry} de Directory to remove.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param de Directory to remove.
+     * @return Promise resolved when done.
      */
     private rimrafMock(de: DirectoryEntry): Promise<any> {
         return new Promise<any>((resolve, reject): void => {
@@ -680,9 +676,9 @@ export class FileMock extends File {
     /**
      * Write some data in a file.
      *
-     * @param {FileWriter} writer File writer.
-     * @param {any} data The data to write.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param writer File writer.
+     * @param data The data to write.
+     * @return Promise resolved when done.
      */
     private writeMock(writer: FileWriter, data: any): Promise<any> {
         if (data instanceof Blob) {
@@ -704,10 +700,10 @@ export class FileMock extends File {
     /**
      * Write to an existing file.
      *
-     * @param {string} path Base FileSystem.
-     * @param {string} fileName path relative to base path.
-     * @param {string | Blob} text content or blob to write.
-     * @returns {Promise<void>} Returns a Promise that resolves or rejects with an error.
+     * @param path Base FileSystem.
+     * @param fileName path relative to base path.
+     * @param text content or blob to write.
+     * @return Returns a Promise that resolves or rejects with an error.
      */
     writeExistingFile(path: string, fileName: string, text: string | Blob): Promise<void> {
         return this.writeFile(path, fileName, text, { replace: true });
@@ -716,11 +712,11 @@ export class FileMock extends File {
     /**
      * Write a new file to the desired location.
      *
-     * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above
-     * @param {string} fileName path relative to base path
-     * @param {string | Blob} text content or blob to write
-     * @param {any} options replace file if set to true. See WriteOptions for more information.
-     * @returns {Promise<any>} Returns a Promise that resolves to updated file entry or rejects with an error.
+     * @param path Base FileSystem. Please refer to the iOS and Android filesystems above
+     * @param fileName path relative to base path
+     * @param text content or blob to write
+     * @param options replace file if set to true. See WriteOptions for more information.
+     * @return Returns a Promise that resolves to updated file entry or rejects with an error.
      */
     writeFile(path: string, fileName: string, text: string | Blob | ArrayBuffer, options: IWriteOptions = {}): Promise<any> {
         const getFileOpts: any = {
@@ -738,10 +734,10 @@ export class FileMock extends File {
     /**
      * Write content to FileEntry.
      *
-     * @param {FileEntry} fe File entry object.
-     * @param {string | Blob} text Content or blob to write.
-     * @param {IWriteOptions} options replace file if set to true. See WriteOptions for more information.
-     * @returns {Promise<FileEntry>} Returns a Promise that resolves to updated file entry or rejects with an error.
+     * @param fe File entry object.
+     * @param text Content or blob to write.
+     * @param options replace file if set to true. See WriteOptions for more information.
+     * @return Returns a Promise that resolves to updated file entry or rejects with an error.
      */
     private writeFileEntryMock(fe: FileEntry, text: string | Blob | ArrayBuffer, options: IWriteOptions): Promise<FileEntry> {
         return this.createWriterMock(fe).then((writer) => {
@@ -760,9 +756,9 @@ export class FileMock extends File {
     /**
      * Write a file in chunks.
      *
-     * @param {FileWriter} writer File writer.
-     * @param {Blob} data Data to write.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param writer File writer.
+     * @param data Data to write.
+     * @return Promise resolved when done.
      */
     private writeFileInChunksMock(writer: FileWriter, data: Blob): Promise<any> {
         let writtenSize = 0;
diff --git a/src/core/emulator/providers/globalization.ts b/src/core/emulator/providers/globalization.ts
index 9cd70aa17..c5b902c54 100644
--- a/src/core/emulator/providers/globalization.ts
+++ b/src/core/emulator/providers/globalization.ts
@@ -41,9 +41,9 @@ export class GlobalizationMock extends Globalization {
     /**
      * Converts date to string.
      *
-     * @param {Date} date Date you wish to convert
+     * @param date Date you wish to convert
      * @param options Options for the converted date. Length, selector.
-     * @returns {Promise<{value: string}>} Returns a promise when the date has been converted.
+     * @return Returns a promise when the date has been converted.
      */
     dateToString(date: Date, options: GlobalizationOptions): Promise<{ value: string; }> {
         return Promise.reject(new GlobalizationErrorMock(GlobalizationErrorMock.UNKNOWN_ERROR, 'Not supported.'));
@@ -53,8 +53,7 @@ export class GlobalizationMock extends Globalization {
      * Returns a pattern string to format and parse currency values according to the client's user preferences and ISO 4217
      * currency code.
      *
-     * @param {string} currencyCode Currency Code.
-     * @returns {Promise<any>}
+     * @param currencyCode Currency Code.
      */
     getCurrencyPattern(currencyCode: string): Promise<any> {
         return Promise.reject(new GlobalizationErrorMock(GlobalizationErrorMock.UNKNOWN_ERROR, 'Not supported.'));
@@ -63,7 +62,7 @@ export class GlobalizationMock extends Globalization {
     /**
      * Get the current locale.
      *
-     * @return {string} Locale name.
+     * @return Locale name.
      */
     private getCurrentlocale(): string {
         // Get browser language.
@@ -85,7 +84,7 @@ export class GlobalizationMock extends Globalization {
      * Returns an array of the names of the months or days of the week, depending on the client's user preferences and calendar.
      *
      * @param options Object with type (narrow or wide) and item (month or days).
-     * @returns {Promise<{value: Array<string>}>} Returns a promise.
+     * @return Returns a promise.
      */
     getDateNames(options: { type: string; item: string; }): Promise<{ value: Array<string>; }> {
         return Promise.reject(new GlobalizationErrorMock(GlobalizationErrorMock.UNKNOWN_ERROR, 'Not supported.'));
@@ -95,7 +94,7 @@ export class GlobalizationMock extends Globalization {
      * Returns a pattern string to format and parse dates according to the client's user preferences.
      *
      * @param options Object with the format length and selector
-     * @returns {Promise<any>} Returns a promise.
+     * @return Returns a promise.
      */
     getDatePattern(options: GlobalizationOptions): Promise<any> {
         return Promise.reject(new GlobalizationErrorMock(GlobalizationErrorMock.UNKNOWN_ERROR, 'Not supported.'));
@@ -104,7 +103,7 @@ export class GlobalizationMock extends Globalization {
     /**
      * Returns the first day of the week according to the client's user preferences and calendar.
      *
-     * @returns {Promise<{value: string}>} returns a promise with the value
+     * @return returns a promise with the value
      */
     getFirstDayOfWeek(): Promise<{ value: string; }> {
         return Promise.reject(new GlobalizationErrorMock(GlobalizationErrorMock.UNKNOWN_ERROR, 'Not supported.'));
@@ -113,7 +112,7 @@ export class GlobalizationMock extends Globalization {
     /**
      * Get the current locale name.
      *
-     * @return {Promise<{value: string}>} Promise resolved with an object with the language string.
+     * @return Promise resolved with an object with the language string.
      */
     getLocaleName(): Promise<{ value: string }> {
         const locale = this.getCurrentlocale();
@@ -129,7 +128,6 @@ export class GlobalizationMock extends Globalization {
     /**
      * Returns a pattern string to format and parse numbers according to the client's user preferences.
      * @param options Can be decimal, percent, or currency.
-     * @returns {Promise<any>}
      */
     getNumberPattern(options: { type: string; }): Promise<any> {
         return Promise.reject(new GlobalizationErrorMock(GlobalizationErrorMock.UNKNOWN_ERROR, 'Not supported.'));
@@ -138,7 +136,7 @@ export class GlobalizationMock extends Globalization {
     /*
      * Get the current preferred language.
      *
-     * @return {Promise<{value: string}>} Promise resolved with an object with the language string.
+     * @return Promise resolved with an object with the language string.
      */
     getPreferredLanguage(): Promise<{ value: string }> {
         return this.getLocaleName();
@@ -147,8 +145,8 @@ export class GlobalizationMock extends Globalization {
     /**
      * Indicates whether daylight savings time is in effect for a given date using the client's time zone and calendar.
      *
-     * @param {data} date Date to process.
-     * @returns {Promise<{dst: string}>} reutrns a promise with the value
+     * @param date Date to process.
+     * @return reutrns a promise with the value
      */
     isDayLightSavingsTime(date: Date): Promise<{ dst: string; }> {
         return Promise.reject(new GlobalizationErrorMock(GlobalizationErrorMock.UNKNOWN_ERROR, 'Not supported.'));
@@ -156,8 +154,8 @@ export class GlobalizationMock extends Globalization {
 
     /**
      * Returns a number formatted as a string according to the client's user preferences.
-     * @param numberToConvert {Number} The number to convert
-     * @param options {Object} Object with property `type` that can be set to: decimal, percent, or currency.
+     * @param numberToConvert The number to convert
+     * @param options Object with property `type` that can be set to: decimal, percent, or currency.
      */
     numberToString(numberToConvert: number, options: { type: string; }): Promise<{ value: string; }> {
         return Promise.reject(new GlobalizationErrorMock(GlobalizationErrorMock.UNKNOWN_ERROR, 'Not supported.'));
@@ -167,9 +165,9 @@ export class GlobalizationMock extends Globalization {
      * Parses a date formatted as a string, according to the client's user preferences and calendar using the time zone of the
      * client, and returns the corresponding date object.
      *
-     * @param {string} dateString Date as a string to be converted
+     * @param dateString Date as a string to be converted
      * @param options Options for the converted date. Length, selector.
-     * @returns {Promise<any>} Returns a promise when the date has been converted.
+     * @return Returns a promise when the date has been converted.
      */
     stringToDate(dateString: string, options: GlobalizationOptions): Promise<any> {
         return Promise.reject(new GlobalizationErrorMock(GlobalizationErrorMock.UNKNOWN_ERROR, 'Not supported.'));
@@ -177,10 +175,10 @@ export class GlobalizationMock extends Globalization {
 
     /**
      *
-     * @param {string} stringToConvert String you want to conver to a number.
+     * @param stringToConvert String you want to conver to a number.
      *
      * @param options The type of number you want to return. Can be decimal, percent, or currency.
-     * @returns {Promise<{ value: number | string }>} Returns a promise with the value.
+     * @return Returns a promise with the value.
      */
     stringToNumber(stringToConvert: string, options: { type: string; }): Promise<{ value: number | string; }> {
         return Promise.reject(new GlobalizationErrorMock(GlobalizationErrorMock.UNKNOWN_ERROR, 'Not supported.'));
diff --git a/src/core/emulator/providers/helper.ts b/src/core/emulator/providers/helper.ts
index fc64ed0eb..f389d3458 100644
--- a/src/core/emulator/providers/helper.ts
+++ b/src/core/emulator/providers/helper.ts
@@ -76,7 +76,7 @@ export class CoreEmulatorHelperProvider implements CoreInitHandler {
     /**
      * Load the Mocks that need it.
      *
-     * @return {Promise<void>} Promise resolved when loaded.
+     * @return Promise resolved when loaded.
      */
     load(): Promise<void> {
         const promises = [];
@@ -96,11 +96,11 @@ export class CoreEmulatorHelperProvider implements CoreInitHandler {
      * Check if there are new notifications, triggering a local notification if found.
      * Only for desktop apps since they don't support push notifications.
      *
-     * @param  {string}   component Component to check.
-     * @param  {Function} fetchFn   Function that receives a site ID and returns a Promise resolved with an array of notifications.
-     * @param  {Function} getDataFn Function that receives a notification and returns a promise resolved with the title and text.
-     * @param  {string}   [siteId]  Site ID to check. If not defined, check all sites.
-     * @return {Promise<any>}       Promise resolved when done.
+     * @param component Component to check.
+     * @param fetchFn Function that receives a site ID and returns a Promise resolved with an array of notifications.
+     * @param getDataFn Function that receives a notification and returns a promise resolved with the title and text.
+     * @param siteId Site ID to check. If not defined, check all sites.
+     * @return Promise resolved when done.
      */
     checkNewNotifications(component: string, fetchFn: Function, getDataFn: Function, siteId?: string): Promise<any> {
         if (!this.appProvider.isDesktop() || !this.localNotifProvider.isAvailable()) {
@@ -134,11 +134,11 @@ export class CoreEmulatorHelperProvider implements CoreInitHandler {
     /**
      * Check if there are new notifications for a certain site, triggering a local notification if found.
      *
-     * @param  {string}   component Component to check.
-     * @param  {Function} fetchFn   Function that receives a site ID and returns a Promise resolved with an array of notifications.
-     * @param  {Function} getDataFn Function that receives a notification and returns a promise resolved with the title and text.
-     * @param  {string}   siteId    Site ID to check.
-     * @return {Promise<any>}       Promise resolved when done.
+     * @param component Component to check.
+     * @param fetchFn Function that receives a site ID and returns a Promise resolved with an array of notifications.
+     * @param getDataFn Function that receives a notification and returns a promise resolved with the title and text.
+     * @param siteId Site ID to check.
+     * @return Promise resolved when done.
      */
     protected checkNewNotificationsForSite(component: string, fetchFn: Function, getDataFn: Function, siteId: string)
             : Promise<any> {
@@ -181,9 +181,9 @@ export class CoreEmulatorHelperProvider implements CoreInitHandler {
     /**
      * Get the last notification received in a certain site for a certain component.
      *
-     * @param  {string} component Component of the notification to get.
-     * @param  {string} siteId    Site ID of the notification.
-     * @return {Promise<any>}     Promise resolved with the notification or false if not found.
+     * @param component Component of the notification to get.
+     * @param siteId Site ID of the notification.
+     * @return Promise resolved with the notification or false if not found.
      */
     getLastReceivedNotification(component: string, siteId: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -196,10 +196,10 @@ export class CoreEmulatorHelperProvider implements CoreInitHandler {
     /**
      * Store the last notification received in a certain site.
      *
-     * @param  {string} component    Component of the notification to store.
-     * @param  {any}    notification Notification to store.
-     * @param  {string} siteId       Site ID of the notification.
-     * @return {Promise<any>}        Promise resolved when done.
+     * @param component Component of the notification to store.
+     * @param notification Notification to store.
+     * @param siteId Site ID of the notification.
+     * @return Promise resolved when done.
      */
     storeLastReceivedNotification(component: string, notification: any, siteId: string): Promise<any> {
         if (!notification) {
diff --git a/src/core/emulator/providers/inappbrowser.ts b/src/core/emulator/providers/inappbrowser.ts
index e991e6a90..3c151cebb 100644
--- a/src/core/emulator/providers/inappbrowser.ts
+++ b/src/core/emulator/providers/inappbrowser.ts
@@ -33,10 +33,10 @@ export class InAppBrowserMock extends InAppBrowser {
     /**
      * Opens a URL in a new InAppBrowser instance, the current browser instance, or the system browser.
      *
-     * @param {string} url The URL to load.
-     * @param {string} [target] The target in which to load the URL, an optional parameter that defaults to _self.
-     * @param {string} [options] Options for the InAppBrowser.
-     * @return {any} The new instance.
+     * @param url The URL to load.
+     * @param target The target in which to load the URL, an optional parameter that defaults to _self.
+     * @param options Options for the InAppBrowser.
+     * @return The new instance.
      */
     create(url: string, target?: string, options: string = 'location=yes'): any {
         if (options && typeof options !== 'string') {
diff --git a/src/core/emulator/providers/local-notifications.ts b/src/core/emulator/providers/local-notifications.ts
index 73d6ebfc4..e8f506255 100644
--- a/src/core/emulator/providers/local-notifications.ts
+++ b/src/core/emulator/providers/local-notifications.ts
@@ -135,9 +135,8 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Adds a group of actions.
      *
-     * @param {any} groupId The id of the action group
-     * @param {ILocalNotificationAction[]} actions The actions of this group
-     * @returns {Promise<any>}
+     * @param groupId The id of the action group
+     * @param actions The actions of this group
      */
     addActions(groupId: any, actions: ILocalNotificationAction[]): Promise<any> {
         return Promise.reject('Not supported in desktop apps.');
@@ -146,8 +145,8 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Cancels single or multiple notifications.
      *
-     * @param {any} notificationId A single notification id, or an array of notification ids.
-     * @returns {Promise<any>} Returns a promise when the notification is canceled
+     * @param notificationId A single notification id, or an array of notification ids.
+     * @return Returns a promise when the notification is canceled
      */
     cancel(notificationId: any): Promise<any> {
         const promises = [];
@@ -168,7 +167,7 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Cancels all notifications.
      *
-     * @returns {Promise<any>} Returns a promise when all notifications are canceled.
+     * @return Returns a promise when all notifications are canceled.
      */
     cancelAll(): Promise<any> {
         return this.cancel(Object.keys(this.scheduled)).then(() => {
@@ -183,10 +182,9 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Cancel a local notification.
      *
-     * @param {number} id Notification ID.
-     * @param {boolean} omitEvent If true, the clear/cancel event won't be triggered.
-     * @param {string} eventName Name of the event to trigger.
-     * @return {Void}
+     * @param id Notification ID.
+     * @param omitEvent If true, the clear/cancel event won't be triggered.
+     * @param eventName Name of the event to trigger.
      */
     protected cancelNotification(id: number, omitEvent: boolean, eventName: string): void {
         if (!this.scheduled[id]) {
@@ -210,8 +208,8 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Clears single or multiple notifications.
      *
-     * @param {any} notificationId A single notification id, or an array of notification ids.
-     * @returns {Promise<any>} Returns a promise when the notification had been cleared.
+     * @param notificationId A single notification id, or an array of notification ids.
+     * @return Returns a promise when the notification had been cleared.
      */
     clear(notificationId: any): Promise<any> {
         const promises = [];
@@ -233,7 +231,7 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Clears all notifications.
      *
-     * @returns {Promise<any>} Returns a promise when all notifications have cleared
+     * @return Returns a promise when all notifications have cleared
      */
     clearAll(): Promise<any> {
         return this.clear(Object.keys(this.scheduled)).then(() => {
@@ -249,8 +247,8 @@ export class LocalNotificationsMock extends LocalNotifications {
      * Convert a list of IDs to numbers.
      * Code extracted from the Cordova plugin.
      *
-     * @param {any[]} ids List of IDs.
-     * @return {number[]} List of IDs as numbers.
+     * @param ids List of IDs.
+     * @return List of IDs as numbers.
      */
     protected convertIds(ids: any[]): number[] {
         const convertedIds = [];
@@ -266,8 +264,8 @@ export class LocalNotificationsMock extends LocalNotifications {
      * Convert the notification options to their required type.
      * Code extracted from the Cordova plugin.
      *
-     * @param {ILocalNotification} notification Notification.
-     * @return {ILocalNotification} Converted notification.
+     * @param notification Notification.
+     * @return Converted notification.
      */
     protected convertProperties(notification: ILocalNotification): ILocalNotification {
         if (notification.id) {
@@ -306,9 +304,9 @@ export class LocalNotificationsMock extends LocalNotifications {
      * Parse a property to number, returning the default value if not valid.
      * Code extracted from the Cordova plugin.
      *
-     * @param {string} prop Name of property to convert.
-     * @param {any} notification Notification where to search the property.
-     * @return {number} Converted number or default value.
+     * @param prop Name of property to convert.
+     * @param notification Notification where to search the property.
+     * @return Converted number or default value.
      */
     protected parseToInt(prop: string, notification: any): number {
         if (isNaN(notification[prop])) {
@@ -322,8 +320,8 @@ export class LocalNotificationsMock extends LocalNotifications {
      * Convert the priority of a notification.
      * Code extracted from the Cordova plugin.
      *
-     * @param {any} notification Notification.
-     * @return {any} Notification.
+     * @param notification Notification.
+     * @return Notification.
      */
     protected convertPriority(notification: any): any {
         let prio = notification.priority || notification.prio || 0;
@@ -349,8 +347,8 @@ export class LocalNotificationsMock extends LocalNotifications {
      * Convert the actions of a notification.
      * Code extracted from the Cordova plugin.
      *
-     * @param {any} notification Notification.
-     * @return {any} Notification.
+     * @param notification Notification.
+     * @return Notification.
      */
     protected convertActions(notification: any): any {
         const actions = [];
@@ -381,8 +379,8 @@ export class LocalNotificationsMock extends LocalNotifications {
      * Convert the trigger of a notification.
      * Code extracted from the Cordova plugin.
      *
-     * @param {any} notification Notification.
-     * @return {any} Notification.
+     * @param notification Notification.
+     * @return Notification.
      */
     protected convertTrigger(notification: any): any {
         const trigger = notification.trigger || {};
@@ -461,8 +459,8 @@ export class LocalNotificationsMock extends LocalNotifications {
      * Convert the progress bar of a notification.
      * Code extracted from the Cordova plugin.
      *
-     * @param {any} notification Notification.
-     * @return {any} Notification.
+     * @param notification Notification.
+     * @return Notification.
      */
     protected convertProgressBar(notification: any): any {
         let cfg = notification.progressBar;
@@ -493,9 +491,9 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Not an official interface, however its possible to manually fire events.
      *
-     * @param {string} eventName The name of the event. Available events: schedule, trigger, click, update, clear, clearall, cancel,
+     * @param eventName The name of the event. Available events: schedule, trigger, click, update, clear, clearall, cancel,
      *                  cancelall. Custom event names are possible for actions
-     * @param {any} args Optional arguments
+     * @param args Optional arguments
      */
     fireEvent(eventName: string, args: any): void {
         if (this.observers[eventName]) {
@@ -505,8 +503,6 @@ export class LocalNotificationsMock extends LocalNotifications {
 
     /**
      * Fire queued events once the device is ready and all listeners are registered.
-     *
-     * @returns {Promise<any>}
      */
     fireQueuedEvents(): Promise<any> {
         return Promise.resolve();
@@ -515,8 +511,7 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Get a notification object.
      *
-     * @param {any} notificationId The id of the notification to get.
-     * @returns {Promise<ILocalNotification>}
+     * @param notificationId The id of the notification to get.
      */
     get(notificationId: any): Promise<ILocalNotification> {
         return Promise.resolve(this.getNotifications([Number(notificationId)], true, true)[0]);
@@ -524,8 +519,6 @@ export class LocalNotificationsMock extends LocalNotifications {
 
     /**
      * Get all notification objects.
-     *
-     * @returns {Promise<Array<ILocalNotification>>}
      */
     getAll(): Promise<Array<ILocalNotification>> {
         return Promise.resolve(this.getNotifications(undefined, true, true));
@@ -534,7 +527,7 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Gets the (platform specific) default settings.
      *
-     * @returns {Promise<any>} An object with all default settings
+     * @return An object with all default settings
      */
     getDefaults(): Promise<any> {
         return Promise.resolve(this.defaults);
@@ -542,8 +535,6 @@ export class LocalNotificationsMock extends LocalNotifications {
 
     /**
      * Get all the notification ids.
-     *
-     * @returns {Promise<Array<number>>}
      */
     getIds(): Promise<Array<number>> {
         let ids = this.utils.mergeArraysWithoutDuplicates(Object.keys(this.scheduled), Object.keys(this.triggered));
@@ -557,7 +548,7 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Get all the notification stored in local DB.
      *
-     * @return {Promise<any>} Promise resolved with the notifications.
+     * @return Promise resolved with the notifications.
      */
     protected getAllNotifications(): Promise<any> {
         return this.appDB.getAllRecords(this.DESKTOP_NOTIFS_TABLE).then((notifications) => {
@@ -577,8 +568,6 @@ export class LocalNotificationsMock extends LocalNotifications {
 
     /**
      * Get all scheduled notification objects.
-     *
-     * @returns {Promise<Array<ILocalNotification>>}
      */
     getScheduled(): Promise<Array<ILocalNotification>> {
         return Promise.resolve(this.getNotifications(undefined, true, false));
@@ -586,8 +575,6 @@ export class LocalNotificationsMock extends LocalNotifications {
 
     /**
      * Get all triggered notification objects.
-     *
-     * @returns {Promise<Array<ILocalNotification>>}
      */
     getTriggered(): Promise<Array<ILocalNotification>> {
         return Promise.resolve(this.getNotifications(undefined, false, true));
@@ -596,10 +583,10 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Get a set of notifications. If ids isn't specified, return all the notifications.
      *
-     * @param {number[]} [ids] Ids of notifications to get. If not specified, get all notifications.
-     * @param {boolean} [getScheduled] Get scheduled notifications.
-     * @param {boolean} [getTriggered] Get triggered notifications.
-     * @return {ILocalNotification[]} List of notifications.
+     * @param ids Ids of notifications to get. If not specified, get all notifications.
+     * @param getScheduled Get scheduled notifications.
+     * @param getTriggered Get triggered notifications.
+     * @return List of notifications.
      */
     protected getNotifications(ids?: number[], getScheduled?: boolean, getTriggered?: boolean): ILocalNotification[] {
         const notifications = [];
@@ -626,8 +613,8 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Get the trigger "at" in milliseconds.
      *
-     * @param {ILocalNotification} notification Notification to get the trigger from.
-     * @return {number} Trigger time.
+     * @param notification Notification to get the trigger from.
+     * @return Trigger time.
      */
     protected getNotificationTriggerAt(notification: ILocalNotification): number {
         const triggerAt = (notification.trigger && notification.trigger.at) || new Date();
@@ -642,7 +629,7 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Get the ids of scheduled notifications.
      *
-     * @returns {Promise<Array<number>>} Returns a promise
+     * @return Returns a promise
      */
     getScheduledIds(): Promise<Array<number>> {
         const ids = Object.keys(this.scheduled).map((id) => {
@@ -654,8 +641,6 @@ export class LocalNotificationsMock extends LocalNotifications {
 
     /**
      * Get the ids of triggered notifications.
-     *
-     * @returns {Promise<Array<number>>}
      */
     getTriggeredIds(): Promise<Array<number>> {
         const ids = Object.keys(this.triggered).map((id) => {
@@ -668,8 +653,7 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Get the type (triggered, scheduled) for the notification.
      *
-     * @param {number} id The ID of the notification.
-     * @return {Promise<boolean>}
+     * @param id The ID of the notification.
      */
     getType(id: number): Promise<any> {
         if (this.scheduled[id]) {
@@ -685,9 +669,9 @@ export class LocalNotificationsMock extends LocalNotifications {
      * Given an object of options and a list of properties, return the first property that exists.
      * Code extracted from the Cordova plugin.
      *
-     * @param {ILocalNotification} notification Notification.
-     * @param {any[]} ...args List of keys to check.
-     * @return {any} First value found.
+     * @param notification Notification.
+     * @param ...args List of keys to check.
+     * @return First value found.
      */
     protected getValueFor(notification: ILocalNotification, ...args: any[]): any {
         for (const i in args) {
@@ -701,8 +685,8 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Checks if a group of actions is defined.
      *
-     * @param {any} groupId The id of the action group
-     * @returns {Promise<boolean>} Whether the group is defined.
+     * @param groupId The id of the action group
+     * @return Whether the group is defined.
      */
     hasActions(groupId: any): Promise<boolean> {
         return Promise.resolve(false);
@@ -710,8 +694,6 @@ export class LocalNotificationsMock extends LocalNotifications {
 
     /**
      * Informs if the app has the permission to show notifications.
-     *
-     * @returns {Promise<boolean>}
      */
     hasPermission(): Promise<boolean> {
         return Promise.resolve(true);
@@ -720,9 +702,9 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Check if a notification has a given type.
      *
-     * @param {number} id The ID of the notification.
-     * @param {string} type  The type of the notification.
-     * @returns {Promise<boolean>} Promise resolved with boolean: whether it has the type.
+     * @param id The ID of the notification.
+     * @param type The type of the notification.
+     * @return Promise resolved with boolean: whether it has the type.
      */
     hasType(id: number, type: string): Promise<boolean> {
         return this.getType(id).then((notifType) => {
@@ -733,8 +715,7 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Checks presence of a notification.
      *
-     * @param {number} notificationId Notification ID.
-     * @returns {Promise<boolean>}
+     * @param notificationId Notification ID.
      */
     isPresent(notificationId: number): Promise<boolean> {
         return Promise.resolve(!!this.scheduled[notificationId] || !!this.triggered[notificationId]);
@@ -743,8 +724,7 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Checks is a notification is scheduled.
      *
-     * @param {number} notificationId Notification ID.
-     * @returns {Promise<boolean>}
+     * @param notificationId Notification ID.
      */
     isScheduled(notificationId: number): Promise<boolean> {
         return Promise.resolve(!!this.scheduled[notificationId]);
@@ -752,8 +732,7 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Checks if a notification is triggered.
      *
-     * @param {number} notificationId Notification ID.
-     * @returns {Promise<boolean>}
+     * @param notificationId Notification ID.
      */
     isTriggered(notificationId: number): Promise<boolean> {
         return Promise.resolve(!!this.triggered[notificationId]);
@@ -762,7 +741,7 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Loads an initialize the API for desktop.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     load(): Promise<any> {
         if (!this.appProvider.isDesktop()) {
@@ -805,8 +784,8 @@ export class LocalNotificationsMock extends LocalNotifications {
      * Merge notification options with default values.
      * Code extracted from the Cordova plugin.
      *
-     * @param {ILocalNotification} notification Notification.
-     * @return {ILocalNotification} Treated notification.
+     * @param notification Notification.
+     * @return Treated notification.
      */
     protected mergeWithDefaults(notification: ILocalNotification): ILocalNotification {
         const values = this.getDefaults();
@@ -835,7 +814,7 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Function called when a notification is clicked.
      *
-     * @param {ILocalNotification} notification Clicked notification.
+     * @param notification Clicked notification.
      */
     protected notificationClicked(notification: ILocalNotification): void {
         this.fireEvent('click', notification);
@@ -846,9 +825,9 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Sets a callback for a specific event.
      *
-     * @param {string} eventName The name of the event. Events: schedule, trigger, click, update, clear, clearall, cancel,
-     *                           cancelall. Custom event names are possible for actions.
-     * @return {Observable<any>} Observable
+     * @param eventName The name of the event. Events: schedule, trigger, click, update, clear, clearall, cancel,
+     *                  cancelall. Custom event names are possible for actions.
+     * @return Observable
      */
     on(eventName: string): Observable<any> {
         return this.observers[eventName];
@@ -857,8 +836,8 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Parse a interval and convert it to a number of milliseconds (0 if not valid).
      *
-     * @param {string} every Interval to convert.
-     * @return {number} Number of milliseconds of the interval-
+     * @param every Interval to convert.
+     * @return Number of milliseconds of the interval-
      */
     protected parseInterval(every: string): number {
         let interval;
@@ -898,8 +877,7 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Removes a group of actions.
      *
-     * @param {any} groupId The id of the action group
-     * @returns {Promise<any>}
+     * @param groupId The id of the action group
      */
     removeActions(groupId: any): Promise<any> {
         return Promise.reject('Not supported in desktop apps.');
@@ -908,8 +886,8 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Remove a notification from local DB.
      *
-     * @param {number} id ID of the notification.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param id ID of the notification.
+     * @return Promise resolved when done.
      */
     protected removeNotification(id: number): Promise<any> {
         return this.appDB.deleteRecords(this.DESKTOP_NOTIFS_TABLE, { id: id });
@@ -917,8 +895,6 @@ export class LocalNotificationsMock extends LocalNotifications {
 
     /**
      * Request permission to show notifications if not already granted.
-     *
-     * @returns {Promise<boolean>}
      */
     requestPermission(): Promise<boolean> {
         return Promise.resolve(true);
@@ -927,7 +903,7 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Schedules a single or multiple notifications.
      *
-     * @param {ILocalNotification | Array<ILocalNotification>} [options] Notification or notifications.
+     * @param options Notification or notifications.
      */
     schedule(options?: ILocalNotification | Array<ILocalNotification>): void {
         this.scheduleOrUpdate(options);
@@ -938,8 +914,8 @@ export class LocalNotificationsMock extends LocalNotifications {
      * We only support using the "at" property to trigger the notification. Other properties like "in" or "every"
      * aren't supported yet.
      *
-     * @param {ILocalNotification | Array<ILocalNotification>} [options] Notification or notifications.
-     * @param {string} [eventName] Name of the event: schedule or update.
+     * @param options Notification or notifications.
+     * @param eventName Name of the event: schedule or update.
      */
     protected scheduleOrUpdate(options?: ILocalNotification | Array<ILocalNotification>, eventName: string = 'schedule'): void {
         options = Array.isArray(options) ? options : [options];
@@ -988,8 +964,7 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Overwrites the (platform specific) default settings.
      *
-     * @param {any} defaults The defaults to set.
-     * @returns {Promise<any>}
+     * @param defaults The defaults to set.
      */
     setDefaults(defaults: any): Promise<any> {
         this.defaults = defaults;
@@ -1000,9 +975,9 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Store a notification in local DB.
      *
-     * @param {ILocalNotification} notification Notification to store.
-     * @param {boolean} triggered Whether the notification has been triggered.
-     * @return {Promise<any>} Promise resolved when stored.
+     * @param notification Notification to store.
+     * @param triggered Whether the notification has been triggered.
+     * @return Promise resolved when stored.
      */
     protected storeNotification(notification: ILocalNotification, triggered: boolean): Promise<any> {
         // Only store some of the properties.
@@ -1021,7 +996,7 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Trigger a notification, using the best method depending on the OS.
      *
-     * @param {ILocalNotification} notification Notification to trigger.
+     * @param notification Notification to trigger.
      */
     protected triggerNotification(notification: ILocalNotification): void {
         if (this.winNotif) {
@@ -1070,7 +1045,7 @@ export class LocalNotificationsMock extends LocalNotifications {
     /**
      * Updates a previously scheduled notification. Must include the id in the options parameter.
      *
-     * @param {ILocalNotification} [options] Notification.
+     * @param options Notification.
      */
     update(options?: ILocalNotification): void {
         return this.scheduleOrUpdate(options, 'update');
diff --git a/src/core/emulator/providers/media-capture.ts b/src/core/emulator/providers/media-capture.ts
index 568cd4beb..9abd354d2 100644
--- a/src/core/emulator/providers/media-capture.ts
+++ b/src/core/emulator/providers/media-capture.ts
@@ -29,8 +29,8 @@ export class MediaCaptureMock extends MediaCapture {
     /**
      * Start the audio recorder application and return information about captured audio clip files.
      *
-     * @param {CaptureAudioOptions} options Options.
-     * @return {Promise<any>} Promise resolved when captured.
+     * @param options Options.
+     * @return Promise resolved when captured.
      */
     captureAudio(options: CaptureAudioOptions): Promise<any> {
         return this.captureHelper.captureMedia('audio', options);
@@ -39,8 +39,8 @@ export class MediaCaptureMock extends MediaCapture {
     /**
      * Start the camera application and return information about captured image files.
      *
-     * @param {CaptureImageOptions} options Options.
-     * @return {Promise<any>} Promise resolved when captured.
+     * @param options Options.
+     * @return Promise resolved when captured.
      */
     captureImage(options: CaptureImageOptions): Promise<any> {
         return this.captureHelper.captureMedia('captureimage', options);
@@ -49,8 +49,8 @@ export class MediaCaptureMock extends MediaCapture {
     /**
      * Start the video recorder application and return information about captured video clip files.
      *
-     * @param {CaptureVideoOptions} options Options.
-     * @return {Promise<any>} Promise resolved when captured.
+     * @param options Options.
+     * @return Promise resolved when captured.
      */
     captureVideo(options: CaptureVideoOptions): Promise<any> {
         return this.captureHelper.captureMedia('video', options);
diff --git a/src/core/emulator/providers/network.ts b/src/core/emulator/providers/network.ts
index 39f8b91c0..df4c523f4 100644
--- a/src/core/emulator/providers/network.ts
+++ b/src/core/emulator/providers/network.ts
@@ -41,7 +41,7 @@ export class NetworkMock extends Network {
     /**
      * Returns an observable to watch connection changes.
      *
-     * @return {Observable<any>} Observable.
+     * @return Observable.
      */
     onchange(): Observable<any> {
         return Observable.merge(this.onConnect(), this.onDisconnect());
@@ -50,7 +50,7 @@ export class NetworkMock extends Network {
     /**
      * Returns an observable to notify when the app is connected.
      *
-     * @return {Observable<any>} Observable.
+     * @return Observable.
      */
     onConnect(): Observable<any> {
         const observable = new Subject<any>();
@@ -65,7 +65,7 @@ export class NetworkMock extends Network {
     /**
      * Returns an observable to notify when the app is disconnected.
      *
-     * @return {Observable<any>} Observable.
+     * @return Observable.
      */
     onDisconnect(): Observable<any> {
         const observable = new Subject<any>();
diff --git a/src/core/emulator/providers/push.ts b/src/core/emulator/providers/push.ts
index e801b01bf..6ae083d5f 100644
--- a/src/core/emulator/providers/push.ts
+++ b/src/core/emulator/providers/push.ts
@@ -29,8 +29,7 @@ export class PushMock implements Push {
     /**
      * Init push notifications
      *
-     * @param {PushOptions} options
-     * @return {PushObject}
+     * @param options
      */
     init(options: PushOptions): PushObject {
         return new PushObjectMock(this.appProvider);
@@ -39,8 +38,8 @@ export class PushMock implements Push {
     /**
      * Check whether the push notification permission has been granted.
      *
-     * @return {Promise<{isEnabled: boolean}>} Returns a Promise that resolves with an object with one property: isEnabled, a
-     *                                         boolean that indicates if permission has been granted.
+     * @return Returns a Promise that resolves with an object with one property: isEnabled, a
+     *         boolean that indicates if permission has been granted.
      */
     hasPermission(): Promise<{isEnabled: boolean}> {
         return Promise.reject('hasPermission is only supported in mobile devices');
@@ -49,7 +48,7 @@ export class PushMock implements Push {
     /**
      * Create a new notification channel for Android O and above.
      *
-     * @param {Channel} channel
+     * @param channel
      */
     createChannel(channel?: Channel): Promise<any> {
         return Promise.reject('createChannel is only supported in mobile devices');
@@ -58,7 +57,7 @@ export class PushMock implements Push {
     /**
      * Delete a notification channel for Android O and above.
      *
-     * @param {string} id
+     * @param id
      */
     deleteChannel(id?: string): Promise<any> {
         return Promise.reject('deleteChannel is only supported in mobile devices');
@@ -66,8 +65,6 @@ export class PushMock implements Push {
 
     /**
      * Returns a list of currently configured channels.
-     *
-     * @return {Promise<Channel[]>}
      */
     listChannels(): Promise<Channel[]> {
         return Promise.reject('listChannels is only supported in mobile devices');
@@ -85,8 +82,7 @@ export class PushObjectMock extends PushObject {
 
     /**
      * Adds an event listener
-     * @param event {string}
-     * @return {Observable<EventResponse>}
+     * @param event
      */
     on(event: PushEvent): Observable<EventResponse> {
         return Observable.empty();
@@ -164,8 +160,7 @@ export class PushObjectMock extends PushObject {
 
     /**
      * The subscribe method is used when the application wants to subscribe a new topic to receive push notifications.
-     * @param topic {string} Topic to subscribe to.
-     * @return {Promise<any>}
+     * @param topic Topic to subscribe to.
      */
     subscribe(topic: string): Promise<any> {
         return Promise.reject('subscribe is only supported in mobile devices');
@@ -175,8 +170,7 @@ export class PushObjectMock extends PushObject {
      * The unsubscribe method is used when the application no longer wants to receive push notifications from a specific topic but
      * continue to receive other push messages.
      *
-     * @param topic {string} Topic to unsubscribe from.
-     * @return {Promise<any>}
+     * @param topic Topic to unsubscribe from.
      */
     unsubscribe(topic: string): Promise<any> {
         return Promise.reject('unsubscribe is only supported in mobile devices');
diff --git a/src/core/emulator/providers/zip.ts b/src/core/emulator/providers/zip.ts
index f7d93f4c1..ae5fdc204 100644
--- a/src/core/emulator/providers/zip.ts
+++ b/src/core/emulator/providers/zip.ts
@@ -31,9 +31,9 @@ export class ZipMock extends Zip {
     /**
      * Create a directory. It creates all the foldes in dirPath 1 by 1 to prevent errors.
      *
-     * @param {string} destination Destination parent folder.
-     * @param {string} dirPath Relative path to the folder.
-     * @return {Promise<void>} Promise resolved when done.
+     * @param destination Destination parent folder.
+     * @param dirPath Relative path to the folder.
+     * @return Promise resolved when done.
      */
     protected createDir(destination: string, dirPath: string): Promise<void> {
         // Create all the folders 1 by 1 in order, otherwise it fails.
@@ -57,10 +57,10 @@ export class ZipMock extends Zip {
     /**
      * Extracts files from a ZIP archive.
      *
-     * @param {string} source Path to the source ZIP file.
-     * @param {string} destination Destination folder.
-     * @param {Function} [onProgress] Optional callback to be called on progress update
-     * @return {Promise<number>} Promise that resolves with a number. 0 is success, -1 is error.
+     * @param source Path to the source ZIP file.
+     * @param destination Destination folder.
+     * @param onProgress Optional callback to be called on progress update
+     * @return Promise that resolves with a number. 0 is success, -1 is error.
      */
     unzip(source: string, destination: string, onProgress?: Function): Promise<number> {
 
diff --git a/src/core/fileuploader/providers/album-handler.ts b/src/core/fileuploader/providers/album-handler.ts
index 729539db1..c1e7ca08f 100644
--- a/src/core/fileuploader/providers/album-handler.ts
+++ b/src/core/fileuploader/providers/album-handler.ts
@@ -31,7 +31,7 @@ export class CoreFileUploaderAlbumHandler implements CoreFileUploaderHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.appProvider.isMobile();
@@ -40,8 +40,8 @@ export class CoreFileUploaderAlbumHandler implements CoreFileUploaderHandler {
     /**
      * Given a list of mimetypes, return the ones that are supported by the handler.
      *
-     * @param {string[]} [mimetypes] List of mimetypes.
-     * @return {string[]} Supported mimetypes.
+     * @param mimetypes List of mimetypes.
+     * @return Supported mimetypes.
      */
     getSupportedMimetypes(mimetypes: string[]): string[] {
         // Album allows picking images and videos.
@@ -51,7 +51,7 @@ export class CoreFileUploaderAlbumHandler implements CoreFileUploaderHandler {
     /**
      * Get the data to display the handler.
      *
-     * @return {CoreFileUploaderHandlerData} Data.
+     * @return Data.
      */
     getData(): CoreFileUploaderHandlerData {
         return {
diff --git a/src/core/fileuploader/providers/audio-handler.ts b/src/core/fileuploader/providers/audio-handler.ts
index c6c73b9c2..c7cb5ac2c 100644
--- a/src/core/fileuploader/providers/audio-handler.ts
+++ b/src/core/fileuploader/providers/audio-handler.ts
@@ -32,7 +32,7 @@ export class CoreFileUploaderAudioHandler implements CoreFileUploaderHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.appProvider.isMobile() || (this.appProvider.canGetUserMedia() && this.appProvider.canRecordMedia());
@@ -41,8 +41,8 @@ export class CoreFileUploaderAudioHandler implements CoreFileUploaderHandler {
     /**
      * Given a list of mimetypes, return the ones that are supported by the handler.
      *
-     * @param {string[]} [mimetypes] List of mimetypes.
-     * @return {string[]} Supported mimetypes.
+     * @param mimetypes List of mimetypes.
+     * @return Supported mimetypes.
      */
     getSupportedMimetypes(mimetypes: string[]): string[] {
         if (this.platform.is('ios')) {
@@ -69,7 +69,7 @@ export class CoreFileUploaderAudioHandler implements CoreFileUploaderHandler {
     /**
      * Get the data to display the handler.
      *
-     * @return {CoreFileUploaderHandlerData} Data.
+     * @return Data.
      */
     getData(): CoreFileUploaderHandlerData {
         return {
diff --git a/src/core/fileuploader/providers/camera-handler.ts b/src/core/fileuploader/providers/camera-handler.ts
index c4a9db2d3..fb290aab5 100644
--- a/src/core/fileuploader/providers/camera-handler.ts
+++ b/src/core/fileuploader/providers/camera-handler.ts
@@ -31,7 +31,7 @@ export class CoreFileUploaderCameraHandler implements CoreFileUploaderHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.appProvider.isMobile() || this.appProvider.canGetUserMedia();
@@ -40,8 +40,8 @@ export class CoreFileUploaderCameraHandler implements CoreFileUploaderHandler {
     /**
      * Given a list of mimetypes, return the ones that are supported by the handler.
      *
-     * @param {string[]} [mimetypes] List of mimetypes.
-     * @return {string[]} Supported mimetypes.
+     * @param mimetypes List of mimetypes.
+     * @return Supported mimetypes.
      */
     getSupportedMimetypes(mimetypes: string[]): string[] {
         // Camera only supports JPEG and PNG.
@@ -51,7 +51,7 @@ export class CoreFileUploaderCameraHandler implements CoreFileUploaderHandler {
     /**
      * Get the data to display the handler.
      *
-     * @return {CoreFileUploaderHandlerData} Data.
+     * @return Data.
      */
     getData(): CoreFileUploaderHandlerData {
         return {
diff --git a/src/core/fileuploader/providers/delegate.ts b/src/core/fileuploader/providers/delegate.ts
index b8e7371a7..3bfea08b7 100644
--- a/src/core/fileuploader/providers/delegate.ts
+++ b/src/core/fileuploader/providers/delegate.ts
@@ -24,22 +24,21 @@ import { CoreDelegate, CoreDelegateHandler } from '@classes/delegate';
 export interface CoreFileUploaderHandler extends CoreDelegateHandler {
     /**
      * Handler's priority. The highest priority, the highest position.
-     * @type {string}
      */
     priority?: number;
 
     /**
      * Given a list of mimetypes, return the ones that are supported by the handler.
      *
-     * @param {string[]} [mimetypes] List of mimetypes.
-     * @return {string[]} Supported mimetypes.
+     * @param mimetypes List of mimetypes.
+     * @return Supported mimetypes.
      */
     getSupportedMimetypes(mimetypes: string[]): string[];
 
     /**
      * Get the data to display the handler.
      *
-     * @return {CoreFileUploaderHandlerData} Data.
+     * @return Data.
      */
     getData(): CoreFileUploaderHandlerData;
 }
@@ -50,30 +49,27 @@ export interface CoreFileUploaderHandler extends CoreDelegateHandler {
 export interface CoreFileUploaderHandlerData {
     /**
      * The title to display in the handler.
-     * @type {string}
      */
     title: string;
 
     /**
      * The icon to display in the handler.
-     * @type {string}
      */
     icon?: string;
 
     /**
      * The class to assign to the handler item.
-     * @type {string}
      */
     class?: string;
 
     /**
      * Action to perform when the handler is clicked.
      *
-     * @param {number} [maxSize] Max size of the file. If not defined or -1, no max size.
-     * @param {boolean} [upload] Whether the file should be uploaded.
-     * @param {boolean} [allowOffline] True to allow selecting in offline, false to require connection.
-     * @param {string[]} [mimetypes] List of supported mimetypes. If undefined, all mimetypes supported.
-     * @return {Promise<CoreFileUploaderHandlerResult>} Promise resolved with the result of picking/uploading the file.
+     * @param maxSize Max size of the file. If not defined or -1, no max size.
+     * @param upload Whether the file should be uploaded.
+     * @param allowOffline True to allow selecting in offline, false to require connection.
+     * @param mimetypes List of supported mimetypes. If undefined, all mimetypes supported.
+     * @return Promise resolved with the result of picking/uploading the file.
      */
     action?(maxSize?: number, upload?: boolean, allowOffline?: boolean, mimetypes?: string[])
         : Promise<CoreFileUploaderHandlerResult>;
@@ -81,10 +77,10 @@ export interface CoreFileUploaderHandlerData {
     /**
      * Function called after the handler is rendered.
      *
-     * @param {number} [maxSize] Max size of the file. If not defined or -1, no max size.
-     * @param {boolean} [upload] Whether the file should be uploaded.
-     * @param {boolean} [allowOffline] True to allow selecting in offline, false to require connection.
-     * @param {string[]} [mimetypes] List of supported mimetypes. If undefined, all mimetypes supported.
+     * @param maxSize Max size of the file. If not defined or -1, no max size.
+     * @param upload Whether the file should be uploaded.
+     * @param allowOffline True to allow selecting in offline, false to require connection.
+     * @param mimetypes List of supported mimetypes. If undefined, all mimetypes supported.
      */
     afterRender?(maxSize: number, upload: boolean, allowOffline: boolean, mimetypes: string[]): void;
 }
@@ -95,31 +91,26 @@ export interface CoreFileUploaderHandlerData {
 export interface CoreFileUploaderHandlerResult {
     /**
      * Whether the file was treated (uploaded or copied to tmp folder).
-     * @type {boolean}
      */
     treated: boolean;
 
     /**
      * The path of the file picked. Required if treated=false and fileEntry is not set.
-     * @type {string}
      */
     path?: string;
 
     /**
      * The fileEntry of the file picked. Required if treated=false and path is not set.
-     * @type {any}
      */
     fileEntry?: any;
 
     /**
      * Whether the file should be deleted after the upload. Ignored if treated=true.
-     * @type {boolean}
      */
     delete?: boolean;
 
     /**
      * The result of picking/uploading the file. Ignored if treated=false.
-     * @type {any}
      */
     result?: any;
 }
@@ -130,13 +121,11 @@ export interface CoreFileUploaderHandlerResult {
 export interface CoreFileUploaderHandlerDataToReturn extends CoreFileUploaderHandlerData {
     /**
      * Handler's priority.
-     * @type {number}
      */
     priority?: number;
 
     /**
      * Supported mimetypes.
-     * @type {string[]}
      */
     mimetypes?: string[];
 }
@@ -163,8 +152,8 @@ export class CoreFileUploaderDelegate extends CoreDelegate {
     /**
      * Get the handlers for the current site.
      *
-     * @param {string[]} [mimetypes] List of supported mimetypes. If undefined, all mimetypes supported.
-     * @return {CoreFileUploaderHandlerDataToReturn[]} List of handlers data.
+     * @param mimetypes List of supported mimetypes. If undefined, all mimetypes supported.
+     * @return List of handlers data.
      */
     getHandlers(mimetypes: string[]): CoreFileUploaderHandlerDataToReturn[] {
         const handlers = [];
diff --git a/src/core/fileuploader/providers/file-handler.ts b/src/core/fileuploader/providers/file-handler.ts
index 36bda2bf4..45449cc00 100644
--- a/src/core/fileuploader/providers/file-handler.ts
+++ b/src/core/fileuploader/providers/file-handler.ts
@@ -35,7 +35,7 @@ export class CoreFileUploaderFileHandler implements CoreFileUploaderHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.platform.is('android') || !this.appProvider.isMobile() ||
@@ -45,8 +45,8 @@ export class CoreFileUploaderFileHandler implements CoreFileUploaderHandler {
     /**
      * Given a list of mimetypes, return the ones that are supported by the handler.
      *
-     * @param {string[]} [mimetypes] List of mimetypes.
-     * @return {string[]} Supported mimetypes.
+     * @param mimetypes List of mimetypes.
+     * @return Supported mimetypes.
      */
     getSupportedMimetypes(mimetypes: string[]): string[] {
         return mimetypes;
@@ -55,7 +55,7 @@ export class CoreFileUploaderFileHandler implements CoreFileUploaderHandler {
     /**
      * Get the data to display the handler.
      *
-     * @return {CoreFileUploaderHandlerData} Data.
+     * @return Data.
      */
     getData(): CoreFileUploaderHandlerData {
         const isIOS = this.platform.is('ios');
diff --git a/src/core/fileuploader/providers/fileuploader.ts b/src/core/fileuploader/providers/fileuploader.ts
index a43b4d3b4..90c172b1e 100644
--- a/src/core/fileuploader/providers/fileuploader.ts
+++ b/src/core/fileuploader/providers/fileuploader.ts
@@ -34,7 +34,6 @@ import { Subject } from 'rxjs';
 export interface CoreFileUploaderOptions extends CoreWSFileUploadOptions {
     /**
      * Whether the file should be deleted after the upload (if success).
-     * @type {boolean}
      */
     deleteAfterUpload?: boolean;
 }
@@ -65,8 +64,8 @@ export class CoreFileUploaderProvider {
     /**
      * Add a dot to the beginning of an extension.
      *
-     * @param {string} extension Extension.
-     * @return {string}           Treated extension.
+     * @param extension Extension.
+     * @return Treated extension.
      */
     protected addDot(extension: string): string {
         return '.' + extension;
@@ -75,9 +74,9 @@ export class CoreFileUploaderProvider {
     /**
      * Compares two file lists and returns if they are different.
      *
-     * @param {any[]} a First file list.
-     * @param {any[]} b Second file list.
-     * @return {boolean} Whether both lists are different.
+     * @param a First file list.
+     * @param b Second file list.
+     * @return Whether both lists are different.
      */
     areFileListDifferent(a: any[], b: any[]): boolean {
         a = a || [];
@@ -100,8 +99,8 @@ export class CoreFileUploaderProvider {
     /**
      * Start the audio recorder application and return information about captured audio clip files.
      *
-     * @param {CaptureAudioOptions} options Options.
-     * @return {Promise<MediaFile[] | CaptureError>} Promise resolved with the result.
+     * @param options Options.
+     * @return Promise resolved with the result.
      */
     captureAudio(options: CaptureAudioOptions): Promise<MediaFile[] | CaptureError> {
         this.onAudioCapture.next(true);
@@ -114,8 +113,8 @@ export class CoreFileUploaderProvider {
     /**
      * Start the video recorder application and return information about captured video clip files.
      *
-     * @param {CaptureVideoOptions} options Options.
-     * @return {Promise<MediaFile[] | CaptureError>} Promise resolved with the result.
+     * @param options Options.
+     * @return Promise resolved with the result.
      */
     captureVideo(options: CaptureVideoOptions): Promise<MediaFile[] | CaptureError> {
         this.onVideoCapture.next(true);
@@ -129,7 +128,7 @@ export class CoreFileUploaderProvider {
      * Clear temporary attachments to be uploaded.
      * Attachments already saved in an offline store will NOT be deleted.
      *
-     * @param {any[]} files List of files.
+     * @param files List of files.
      */
     clearTmpFiles(files: any[]): void {
         // Delete the local files.
@@ -146,9 +145,9 @@ export class CoreFileUploaderProvider {
     /**
      * Get the upload options for a file taken with the Camera Cordova plugin.
      *
-     * @param {string} uri File URI.
-     * @param {boolean} [isFromAlbum] True if the image was taken from album, false if it's a new image taken with camera.
-     * @return {CoreFileUploaderOptions} Options.
+     * @param uri File URI.
+     * @param isFromAlbum True if the image was taken from album, false if it's a new image taken with camera.
+     * @return Options.
      */
     getCameraUploadOptions(uri: string, isFromAlbum?: boolean): CoreFileUploaderOptions {
         const extension = this.mimeUtils.getExtension(uri),
@@ -183,13 +182,13 @@ export class CoreFileUploaderProvider {
     /**
      * Get the upload options for a file of any type.
      *
-     * @param {string} uri File URI.
-     * @param {string} name File name.
-     * @param {string} type File type.
-     * @param {boolean} [deleteAfterUpload] Whether the file should be deleted after upload.
-     * @param {string} [fileArea] File area to upload the file to. It defaults to 'draft'.
-     * @param {number} [itemId] Draft ID to upload the file to, 0 to create new.
-     * @return {CoreFileUploaderOptions} Options.
+     * @param uri File URI.
+     * @param name File name.
+     * @param type File type.
+     * @param deleteAfterUpload Whether the file should be deleted after upload.
+     * @param fileArea File area to upload the file to. It defaults to 'draft'.
+     * @param itemId Draft ID to upload the file to, 0 to create new.
+     * @return Options.
      */
     getFileUploadOptions(uri: string, name: string, type: string, deleteAfterUpload?: boolean, fileArea?: string, itemId?: number)
             : CoreFileUploaderOptions {
@@ -206,8 +205,8 @@ export class CoreFileUploaderProvider {
     /**
      * Get the upload options for a file taken with the media capture Cordova plugin.
      *
-     * @param {MediaFile} mediaFile File object to upload.
-     * @return {CoreFileUploaderOptions} Options.
+     * @param mediaFile File object to upload.
+     * @return Options.
      */
     getMediaUploadOptions(mediaFile: MediaFile): CoreFileUploaderOptions {
         const options: CoreFileUploaderOptions = {};
@@ -233,8 +232,8 @@ export class CoreFileUploaderProvider {
     /**
      * Take a picture or video, or load one from the library.
      *
-     * @param {CameraOptions} options Options.
-     * @return {Promise<any>} Promise resolved with the result.
+     * @param options Options.
+     * @return Promise resolved with the result.
      */
     getPicture(options: CameraOptions): Promise<any> {
         this.onGetPicture.next(true);
@@ -247,8 +246,8 @@ export class CoreFileUploaderProvider {
     /**
      * Get the files stored in a folder, marking them as offline.
      *
-     * @param {string} folderPath Folder where to get the files.
-     * @return {Promise<any[]>} Promise resolved with the list of files.
+     * @param folderPath Folder where to get the files.
+     * @return Promise resolved with the list of files.
      */
     getStoredFiles(folderPath: string): Promise<any[]> {
         return this.fileProvider.getDirectoryContents(folderPath).then((files) => {
@@ -259,9 +258,9 @@ export class CoreFileUploaderProvider {
     /**
      * Get stored files from combined online and offline file object.
      *
-     * @param {{online: any[], offline: number}} filesObject The combined offline and online files object.
-     * @param {string} folderPath Folder path to get files from.
-     * @return {Promise<any[]>} Promise resolved with files.
+     * @param filesObject The combined offline and online files object.
+     * @param folderPath Folder path to get files from.
+     * @return Promise resolved with files.
      */
     getStoredFilesFromOfflineFilesObject(filesObject: { online: any[], offline: number }, folderPath: string): Promise<any[]> {
         let files = [];
@@ -288,10 +287,10 @@ export class CoreFileUploaderProvider {
      * Check if a file's mimetype is invalid based on the list of accepted mimetypes. This function needs either the file's
      * mimetype or the file's path/name.
      *
-     * @param {string[]} [mimetypes] List of supported mimetypes. If undefined, all mimetypes supported.
-     * @param {string} [path] File's path or name.
-     * @param {string} [mimetype] File's mimetype.
-     * @return {string} Undefined if file is valid, error message if file is invalid.
+     * @param mimetypes List of supported mimetypes. If undefined, all mimetypes supported.
+     * @param path File's path or name.
+     * @param mimetype File's mimetype.
+     * @return Undefined if file is valid, error message if file is invalid.
      */
     isInvalidMimetype(mimetypes?: string[], path?: string, mimetype?: string): string {
         let extension;
@@ -316,8 +315,8 @@ export class CoreFileUploaderProvider {
     /**
      * Mark files as offline.
      *
-     * @param {any[]} files Files to mark as offline.
-     * @return {any[]} Files marked as offline.
+     * @param files Files to mark as offline.
+     * @return Files marked as offline.
      */
     markOfflineFiles(files: any[]): any[] {
         // Mark the files as pending offline.
@@ -332,8 +331,8 @@ export class CoreFileUploaderProvider {
     /**
      * Parse filetypeList to get the list of allowed mimetypes and the data to render information.
      *
-     * @param {string} filetypeList Formatted string list where the mimetypes can be checked.
-     * @return {{info: any[], mimetypes: string[]}}  Mimetypes and the filetypes informations. Undefined if all types supported.
+     * @param filetypeList Formatted string list where the mimetypes can be checked.
+     * @return Mimetypes and the filetypes informations. Undefined if all types supported.
      */
     prepareFiletypeList(filetypeList: string): { info: any[], mimetypes: string[] } {
         filetypeList = filetypeList && filetypeList.trim();
@@ -414,9 +413,9 @@ export class CoreFileUploaderProvider {
      * Given a list of files (either online files or local files), store the local files in a local folder
      * to be uploaded later.
      *
-     * @param {string} folderPath Path of the folder where to store the files.
-     * @param {any[]} files List of files.
-     * @return {Promise<{online: any[], offline: number}>} Promise resolved if success.
+     * @param folderPath Path of the folder where to store the files.
+     * @param files List of files.
+     * @return Promise resolved if success.
      */
     storeFilesToUpload(folderPath: string, files: any[]): Promise<{ online: any[], offline: number }> {
         const result = {
@@ -463,11 +462,11 @@ export class CoreFileUploaderProvider {
     /**
      * Upload a file.
      *
-     * @param {string} uri File URI.
-     * @param {CoreFileUploaderOptions} [options] Options for the upload.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @param {string} [siteId] Id of the site to upload the file to. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param uri File URI.
+     * @param options Options for the upload.
+     * @param onProgress Function to call on progress.
+     * @param siteId Id of the site to upload the file to. If not defined, use current site.
+     * @return Promise resolved when done.
      */
     uploadFile(uri: string, options?: CoreFileUploaderOptions, onProgress?: (event: ProgressEvent) => any,
             siteId?: string): Promise<any> {
@@ -498,12 +497,12 @@ export class CoreFileUploaderProvider {
      * If the file is an online file it will be downloaded and then re-uploaded.
      * If the file is a local file it will not be deleted from the device after upload.
      *
-     * @param {any} file Online file or local FileEntry.
-     * @param {number} [itemId] Draft ID to use. Undefined or 0 to create a new draft ID.
-     * @param {string} [component] The component to set to the downloaded files.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number>} Promise resolved with the itemId.
+     * @param file Online file or local FileEntry.
+     * @param itemId Draft ID to use. Undefined or 0 to create a new draft ID.
+     * @param component The component to set to the downloaded files.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the itemId.
      */
     uploadOrReuploadFile(file: any, itemId?: number, component?: string, componentId?: string | number,
             siteId?: string): Promise<number> {
@@ -544,11 +543,11 @@ export class CoreFileUploaderProvider {
      * Local files are not deleted from the device after upload.
      * If there are no files to upload it will return a fake draft ID (1).
      *
-     * @param {any[]} files List of files.
-     * @param {string} [component] The component to set to the downloaded files.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<number>} Promise resolved with the itemId.
+     * @param files List of files.
+     * @param component The component to set to the downloaded files.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the itemId.
      */
     uploadOrReuploadFiles(files: any[], component?: string, componentId?: string | number, siteId?: string): Promise<number> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
diff --git a/src/core/fileuploader/providers/helper.ts b/src/core/fileuploader/providers/helper.ts
index d530bd4be..8ae78e070 100644
--- a/src/core/fileuploader/providers/helper.ts
+++ b/src/core/fileuploader/providers/helper.ts
@@ -47,12 +47,12 @@ export class CoreFileUploaderHelperProvider {
     /**
      * Show a confirmation modal to the user if the size of the file is bigger than the allowed threshold.
      *
-     * @param {number} size File size.
-     * @param {boolean} [alwaysConfirm] True to show a confirm even if the size isn't high.
-     * @param {boolean} [allowOffline] True to allow uploading in offline.
-     * @param {number} [wifiThreshold] Threshold for WiFi connection. Default: CoreFileUploaderProvider.WIFI_SIZE_WARNING.
-     * @param {number} [limitedThreshold] Threshold for limited connection. Default: CoreFileUploaderProvider.LIMITED_SIZE_WARNING.
-     * @return {Promise<void>} Promise resolved when the user confirms or if there's no need to show a modal.
+     * @param size File size.
+     * @param alwaysConfirm True to show a confirm even if the size isn't high.
+     * @param allowOffline True to allow uploading in offline.
+     * @param wifiThreshold Threshold for WiFi connection. Default: CoreFileUploaderProvider.WIFI_SIZE_WARNING.
+     * @param limitedThreshold Threshold for limited connection. Default: CoreFileUploaderProvider.LIMITED_SIZE_WARNING.
+     * @return Promise resolved when the user confirms or if there's no need to show a modal.
      */
     confirmUploadFile(size: number, alwaysConfirm?: boolean, allowOffline?: boolean, wifiThreshold?: number,
             limitedThreshold?: number): Promise<void> {
@@ -84,10 +84,10 @@ export class CoreFileUploaderHelperProvider {
     /**
      * Create a temporary copy of a file and upload it.
      *
-     * @param {any} file File to copy and upload.
-     * @param {boolean} [upload] True if the file should be uploaded, false to return the copy of the file.
-     * @param {string} [name] Name to use when uploading the file. If not defined, use the file's name.
-     * @return {Promise<any>} Promise resolved when the file is uploaded.
+     * @param file File to copy and upload.
+     * @param upload True if the file should be uploaded, false to return the copy of the file.
+     * @param name Name to use when uploading the file. If not defined, use the file's name.
+     * @return Promise resolved when the file is uploaded.
      */
     copyAndUploadFile(file: any, upload?: boolean, name?: string): Promise<any> {
         name = name || file.name;
@@ -122,11 +122,11 @@ export class CoreFileUploaderHelperProvider {
     /**
      * Copy or move a file to the app temporary folder.
      *
-     * @param {string} path  Path of the file.
-     * @param {boolean} shouldDelete True if original file should be deleted (move), false otherwise (copy).
-     * @param {number} [maxSize] Max size of the file. If not defined or -1, no max size.
-     * @param {string} [defaultExt] Defaut extension to use if the file doesn't have any.
-     * @return {Promise<any>} Promise resolved with the copied file.
+     * @param path Path of the file.
+     * @param shouldDelete True if original file should be deleted (move), false otherwise (copy).
+     * @param maxSize Max size of the file. If not defined or -1, no max size.
+     * @param defaultExt Defaut extension to use if the file doesn't have any.
+     * @return Promise resolved with the copied file.
      */
     protected copyToTmpFolder(path: string, shouldDelete: boolean, maxSize?: number, defaultExt?: string): Promise<any> {
         let fileName = this.fileProvider.getFileAndDirectoryFromPath(path).name,
@@ -173,9 +173,9 @@ export class CoreFileUploaderHelperProvider {
     /**
      * Function called when trying to upload a file bigger than max size. Shows an error.
      *
-     * @param {number} maxSize Max size (bytes).
-     * @param {string} fileName Name of the file.
-     * @return {Promise<any>} Rejected promise.
+     * @param maxSize Max size (bytes).
+     * @param fileName Name of the file.
+     * @return Rejected promise.
      */
     protected errorMaxBytes(maxSize: number, fileName: string): Promise<any> {
         const errorMessage = this.translate.instant('core.fileuploader.maxbytesfile', {
@@ -203,7 +203,7 @@ export class CoreFileUploaderHelperProvider {
     /**
      * Function to call once a file is uploaded using the file picker.
      *
-     * @param {any} result Result of the upload process.
+     * @param result Result of the upload process.
      */
     fileUploaded(result: any): void {
         if (this.filePickerDeferred) {
@@ -219,11 +219,11 @@ export class CoreFileUploaderHelperProvider {
     /**
      * Open the "file picker" to select and upload a file.
      *
-     * @param {number} [maxSize] Max size of the file to upload. If not defined or -1, no max size.
-     * @param {string} [title] File picker title.
-     * @param {string[]} [mimetypes] List of supported mimetypes. If undefined, all mimetypes supported.
-     * @return {Promise<any>} Promise resolved when a file is uploaded, rejected if file picker is closed without a file uploaded.
-     *                        The resolve value is the response of the upload request.
+     * @param maxSize Max size of the file to upload. If not defined or -1, no max size.
+     * @param title File picker title.
+     * @param mimetypes List of supported mimetypes. If undefined, all mimetypes supported.
+     * @return Promise resolved when a file is uploaded, rejected if file picker is closed without a file uploaded.
+     *         The resolve value is the response of the upload request.
      */
     selectAndUploadFile(maxSize?: number, title?: string, mimetypes?: string[]): Promise<any> {
         return this.selectFileWithPicker(maxSize, false, title, mimetypes, true);
@@ -232,12 +232,12 @@ export class CoreFileUploaderHelperProvider {
     /**
      * Open the "file picker" to select a file without uploading it.
      *
-     * @param {number} [maxSize] Max size of the file. If not defined or -1, no max size.
-     * @param {boolean} [allowOffline] True to allow selecting in offline, false to require connection.
-     * @param {string} [title] File picker title.
-     * @param {string[]} [mimetypes] List of supported mimetypes. If undefined, all mimetypes supported.
-     * @return {Promise<any>} Promise resolved when a file is selected, rejected if file picker is closed without selecting a file.
-     *                        The resolve value is the FileEntry of a copy of the picked file, so it can be deleted afterwards.
+     * @param maxSize Max size of the file. If not defined or -1, no max size.
+     * @param allowOffline True to allow selecting in offline, false to require connection.
+     * @param title File picker title.
+     * @param mimetypes List of supported mimetypes. If undefined, all mimetypes supported.
+     * @return Promise resolved when a file is selected, rejected if file picker is closed without selecting a file.
+     *         The resolve value is the FileEntry of a copy of the picked file, so it can be deleted afterwards.
      */
     selectFile(maxSize?: number, allowOffline?: boolean, title?: string, mimetypes?: string[])
             : Promise<any> {
@@ -247,12 +247,12 @@ export class CoreFileUploaderHelperProvider {
     /**
      * Open the "file picker" to select a file and maybe uploading it.
      *
-     * @param {number} [maxSize] Max size of the file. If not defined or -1, no max size.
-     * @param {boolean} [allowOffline] True to allow selecting in offline, false to require connection.
-     * @param {string} [title] File picker title.
-     * @param {string[]} [mimetypes] List of supported mimetypes. If undefined, all mimetypes supported.
-     * @param {boolean} [upload] Whether the file should be uploaded.
-     * @return {Promise<any>} Promise resolved when a file is selected/uploaded, rejected if file picker is closed.
+     * @param maxSize Max size of the file. If not defined or -1, no max size.
+     * @param allowOffline True to allow selecting in offline, false to require connection.
+     * @param title File picker title.
+     * @param mimetypes List of supported mimetypes. If undefined, all mimetypes supported.
+     * @param upload Whether the file should be uploaded.
+     * @return Promise resolved when a file is selected/uploaded, rejected if file picker is closed.
      */
     protected selectFileWithPicker(maxSize?: number, allowOffline?: boolean, title?: string, mimetypes?: string[],
             upload?: boolean): Promise<any> {
@@ -352,10 +352,10 @@ export class CoreFileUploaderHelperProvider {
     /**
      * Convenience function to upload a file on a certain site, showing a confirm if needed.
      *
-     * @param {any} fileEntry FileEntry of the file to upload.
-     * @param {boolean} [deleteAfterUpload] Whether the file should be deleted after upload.
-     * @param {string} [siteId] Id of the site to upload the file to. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the file is uploaded.
+     * @param fileEntry FileEntry of the file to upload.
+     * @param deleteAfterUpload Whether the file should be deleted after upload.
+     * @param siteId Id of the site to upload the file to. If not defined, use current site.
+     * @return Promise resolved when the file is uploaded.
      */
     showConfirmAndUploadInSite(fileEntry: any, deleteAfterUpload?: boolean, siteId?: string): Promise<void> {
         return this.fileProvider.getFileObjectFromFileEntry(fileEntry).then((file) => {
@@ -380,9 +380,9 @@ export class CoreFileUploaderHelperProvider {
     /**
      * Treat a capture audio/video error.
      *
-     * @param {any} error Error returned by the Cordova plugin. Can be a string or an object.
-     * @param {string} defaultMessage Key of the default message to show.
-     * @return {Promise<any>} Rejected promise. If it doesn't have an error message it means it was cancelled.
+     * @param error Error returned by the Cordova plugin. Can be a string or an object.
+     * @param defaultMessage Key of the default message to show.
+     * @return Rejected promise. If it doesn't have an error message it means it was cancelled.
      */
     protected treatCaptureError(error: any, defaultMessage: string): Promise<any> {
         // Cancelled or error. If cancelled, error is an object with code = 3.
@@ -413,9 +413,9 @@ export class CoreFileUploaderHelperProvider {
     /**
      * Treat a capture image or browse album error.
      *
-     * @param {string} error Error returned by the Cordova plugin.
-     * @param {string} defaultMessage Key of the default message to show.
-     * @return {Promise<any>} Rejected promise. If it doesn't have an error message it means it was cancelled.
+     * @param error Error returned by the Cordova plugin.
+     * @param defaultMessage Key of the default message to show.
+     * @return Rejected promise. If it doesn't have an error message it means it was cancelled.
      */
     protected treatImageError(error: string, defaultMessage: string): Promise<any> {
         // Cancelled or error.
@@ -440,11 +440,11 @@ export class CoreFileUploaderHelperProvider {
     /**
      * Convenient helper for the user to record and upload a video.
      *
-     * @param {boolean} isAudio True if uploading an audio, false if it's a video.
-     * @param {number} maxSize Max size of the upload. -1 for no max size.
-     * @param {boolean} [upload] True if the file should be uploaded, false to return the picked file.
-     * @param {string[]} [mimetypes] List of supported mimetypes. If undefined, all mimetypes supported.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param isAudio True if uploading an audio, false if it's a video.
+     * @param maxSize Max size of the upload. -1 for no max size.
+     * @param upload True if the file should be uploaded, false to return the picked file.
+     * @param mimetypes List of supported mimetypes. If undefined, all mimetypes supported.
+     * @return Promise resolved when done.
      */
     uploadAudioOrVideo(isAudio: boolean, maxSize: number, upload?: boolean, mimetypes?: string[]): Promise<any> {
         this.logger.debug('Trying to record a ' + (isAudio ? 'audio' : 'video') + ' file');
@@ -485,12 +485,12 @@ export class CoreFileUploaderHelperProvider {
      * Uploads a file of any type.
      * This function will not check the size of the file, please check it before calling this function.
      *
-     * @param {string} uri File URI.
-     * @param {string} name File name.
-     * @param {string} type File type.
-     * @param {boolean} [deleteAfterUpload] Whether the file should be deleted after upload.
-     * @param {string} [siteId] Id of the site to upload the file to. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the file is uploaded.
+     * @param uri File URI.
+     * @param name File name.
+     * @param type File type.
+     * @param deleteAfterUpload Whether the file should be deleted after upload.
+     * @param siteId Id of the site to upload the file to. If not defined, use current site.
+     * @return Promise resolved when the file is uploaded.
      */
     uploadGenericFile(uri: string, name: string, type: string, deleteAfterUpload?: boolean, siteId?: string): Promise<any> {
         const options = this.fileUploaderProvider.getFileUploadOptions(uri, name, type, deleteAfterUpload);
@@ -501,11 +501,11 @@ export class CoreFileUploaderHelperProvider {
     /**
      * Convenient helper for the user to upload an image, either from the album or taking it with the camera.
      *
-     * @param {boolean} fromAlbum True if the image should be selected from album, false if it should be taken with camera.
-     * @param {number} maxSize Max size of the upload. -1 for no max size.
-     * @param {boolean} [upload] True if the file should be uploaded, false to return the picked file.
-     * @param {string[]} [mimetypes] List of supported mimetypes. If undefined, all mimetypes supported.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param fromAlbum True if the image should be selected from album, false if it should be taken with camera.
+     * @param maxSize Max size of the upload. -1 for no max size.
+     * @param upload True if the file should be uploaded, false to return the picked file.
+     * @param mimetypes List of supported mimetypes. If undefined, all mimetypes supported.
+     * @return Promise resolved when done.
      */
     uploadImage(fromAlbum: boolean, maxSize: number, upload?: boolean, mimetypes?: string[]): Promise<any> {
         this.logger.debug('Trying to capture an image with camera');
@@ -568,13 +568,13 @@ export class CoreFileUploaderHelperProvider {
     /**
      * Upload a file given the file entry.
      *
-     * @param {any} fileEntry The file entry.
-     * @param {boolean} deleteAfter True if the file should be deleted once treated.
-     * @param {number} [maxSize] Max size of the file. If not defined or -1, no max size.
-     * @param {boolean} [upload] True if the file should be uploaded, false to return the picked file.
-     * @param {boolean} [allowOffline] True to allow selecting in offline, false to require connection.
-     * @param {string} [name] Name to use when uploading the file. If not defined, use the file's name.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param fileEntry The file entry.
+     * @param deleteAfter True if the file should be deleted once treated.
+     * @param maxSize Max size of the file. If not defined or -1, no max size.
+     * @param upload True if the file should be uploaded, false to return the picked file.
+     * @param allowOffline True to allow selecting in offline, false to require connection.
+     * @param name Name to use when uploading the file. If not defined, use the file's name.
+     * @return Promise resolved when done.
      */
     uploadFileEntry(fileEntry: any, deleteAfter: boolean, maxSize?: number, upload?: boolean, allowOffline?: boolean,
             name?: string): Promise<any> {
@@ -593,12 +593,12 @@ export class CoreFileUploaderHelperProvider {
     /**
      * Upload a file given the file object.
      *
-     * @param {any} file The file object.
-     * @param {number} [maxSize] Max size of the file. If not defined or -1, no max size.
-     * @param {boolean} [upload] True if the file should be uploaded, false to return the picked file.
-     * @param {boolean} [allowOffline] True to allow selecting in offline, false to require connection.
-     * @param {string} [name] Name to use when uploading the file. If not defined, use the file's name.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param file The file object.
+     * @param maxSize Max size of the file. If not defined or -1, no max size.
+     * @param upload True if the file should be uploaded, false to return the picked file.
+     * @param allowOffline True to allow selecting in offline, false to require connection.
+     * @param name Name to use when uploading the file. If not defined, use the file's name.
+     * @return Promise resolved when done.
      */
     uploadFileObject(file: any, maxSize?: number, upload?: boolean, allowOffline?: boolean, name?: string): Promise<any> {
         if (maxSize != -1 && file.size > maxSize) {
@@ -614,12 +614,12 @@ export class CoreFileUploaderHelperProvider {
     /**
      * Convenience function to upload a file, allowing to retry if it fails.
      *
-     * @param {string} path Absolute path of the file to upload.
-     * @param {number} maxSize Max size of the upload. -1 for no max size.
-     * @param {boolean} checkSize True to check size.
-     * @param {CoreFileUploaderOptions} Options.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if the file is uploaded, rejected otherwise.
+     * @param path Absolute path of the file to upload.
+     * @param maxSize Max size of the upload. -1 for no max size.
+     * @param checkSize True to check size.
+     * @param Options.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if the file is uploaded, rejected otherwise.
      */
     protected uploadFile(path: string, maxSize: number, checkSize: boolean, options: CoreFileUploaderOptions, siteId?: string)
             : Promise<any> {
@@ -697,9 +697,9 @@ export class CoreFileUploaderHelperProvider {
     /**
      * Show a progress modal.
      *
-     * @param {Loading} modal The modal where to show the progress.
-     * @param {string} stringKey The key of the string to display.
-     * @param {ProgressEvent|CoreFileProgressEvent} progress The progress event.
+     * @param modal The modal where to show the progress.
+     * @param stringKey The key of the string to display.
+     * @param progress The progress event.
      */
     protected showProgressModal(modal: Loading, stringKey: string, progress: ProgressEvent | CoreFileProgressEvent): void {
         if (progress && progress.lengthComputable) {
diff --git a/src/core/fileuploader/providers/video-handler.ts b/src/core/fileuploader/providers/video-handler.ts
index 22c70ecac..6d9fb58f8 100644
--- a/src/core/fileuploader/providers/video-handler.ts
+++ b/src/core/fileuploader/providers/video-handler.ts
@@ -32,7 +32,7 @@ export class CoreFileUploaderVideoHandler implements CoreFileUploaderHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.appProvider.isMobile() || (this.appProvider.canGetUserMedia() && this.appProvider.canRecordMedia());
@@ -41,8 +41,8 @@ export class CoreFileUploaderVideoHandler implements CoreFileUploaderHandler {
     /**
      * Given a list of mimetypes, return the ones that are supported by the handler.
      *
-     * @param {string[]} [mimetypes] List of mimetypes.
-     * @return {string[]} Supported mimetypes.
+     * @param mimetypes List of mimetypes.
+     * @return Supported mimetypes.
      */
     getSupportedMimetypes(mimetypes: string[]): string[] {
         if (this.platform.is('ios')) {
@@ -69,7 +69,7 @@ export class CoreFileUploaderVideoHandler implements CoreFileUploaderHandler {
     /**
      * Get the data to display the handler.
      *
-     * @return {CoreFileUploaderHandlerData} Data.
+     * @return Data.
      */
     getData(): CoreFileUploaderHandlerData {
         return {
diff --git a/src/core/grades/components/course/course.ts b/src/core/grades/components/course/course.ts
index 8d66dd320..51703f87b 100644
--- a/src/core/grades/components/course/course.ts
+++ b/src/core/grades/components/course/course.ts
@@ -64,8 +64,8 @@ export class CoreGradesCourseComponent {
     /**
      * Fetch all the data required for the view.
      *
-     * @param {boolean} [refresh] Empty events array first.
-     * @return {Promise<any>}     Resolved when done.
+     * @param refresh Empty events array first.
+     * @return Resolved when done.
      */
     fetchData(refresh: boolean = false): Promise<any> {
         return this.gradesProvider.getCourseGradesTable(this.courseId, this.userId).then((table) => {
@@ -78,7 +78,7 @@ export class CoreGradesCourseComponent {
     /**
      * Refresh data.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshGrades(refresher: any): void {
         this.gradesProvider.invalidateCourseGradesData(this.courseId, this.userId).finally(() => {
@@ -90,7 +90,7 @@ export class CoreGradesCourseComponent {
 
     /**
      * Navigate to the grade of the selected item.
-     * @param {number} gradeId  Grade item ID where to navigate.
+     * @param gradeId Grade item ID where to navigate.
      */
     gotoGrade(gradeId: number): void {
         if (gradeId) {
diff --git a/src/core/grades/pages/courses/courses.ts b/src/core/grades/pages/courses/courses.ts
index 62a67829a..fe186edd8 100644
--- a/src/core/grades/pages/courses/courses.ts
+++ b/src/core/grades/pages/courses/courses.ts
@@ -66,7 +66,7 @@ export class CoreGradesCoursesPage {
     /**
      * Fetch all the data required for the view.
      *
-     * @return {Promise<any>}     Resolved when done.
+     * @return Resolved when done.
      */
     fetchData(): Promise<any> {
         return this.gradesProvider.getCoursesGrades().then((grades) => {
@@ -81,7 +81,7 @@ export class CoreGradesCoursesPage {
     /**
      * Refresh data.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshGrades(refresher: any): void {
         this.gradesProvider.invalidateCoursesGradesData().finally(() => {
@@ -93,7 +93,7 @@ export class CoreGradesCoursesPage {
 
     /**
      * Navigate to the grades of the selected course.
-     * @param {number} courseId  Course Id where to navigate.
+     * @param courseId Course Id where to navigate.
      */
     gotoCourseGrades(courseId: number): void {
         this.courseId = courseId;
diff --git a/src/core/grades/pages/grade/grade.ts b/src/core/grades/pages/grade/grade.ts
index fc94c0497..dcdad5290 100644
--- a/src/core/grades/pages/grade/grade.ts
+++ b/src/core/grades/pages/grade/grade.ts
@@ -56,7 +56,7 @@ export class CoreGradesGradePage {
     /**
      * Fetch all the data required for the view.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     fetchData(): Promise<any> {
         return this.gradesHelper.getGradeItem(this.courseId, this.gradeId, this.userId).then((grade) => {
@@ -69,7 +69,7 @@ export class CoreGradesGradePage {
     /**
      * Refresh data.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshGrade(refresher: any): void {
         this.gradesProvider.invalidateCourseGradesData(this.courseId, this.userId).finally(() => {
diff --git a/src/core/grades/providers/course-option-handler.ts b/src/core/grades/providers/course-option-handler.ts
index d544e4e85..a927a0d09 100644
--- a/src/core/grades/providers/course-option-handler.ts
+++ b/src/core/grades/providers/course-option-handler.ts
@@ -32,10 +32,10 @@ export class CoreGradesCourseOptionHandler implements CoreCourseOptionsHandler {
     /**
      * Should invalidate the data to determine if the handler is enabled for a certain course.
      *
-     * @param {number} courseId The course ID.
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param courseId The course ID.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved when done.
      */
     invalidateEnabledForCourse(courseId: number, navOptions?: any, admOptions?: any): Promise<any> {
         if (navOptions && typeof navOptions.grades != 'undefined') {
@@ -49,7 +49,7 @@ export class CoreGradesCourseOptionHandler implements CoreCourseOptionsHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -58,11 +58,11 @@ export class CoreGradesCourseOptionHandler implements CoreCourseOptionsHandler {
     /**
      * Whether or not the handler is enabled for a certain course.
      *
-     * @param {number} courseId The course ID.
-     * @param {any} accessData Access type and data. Default, guest, ...
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @param courseId The course ID.
+     * @param accessData Access type and data. Default, guest, ...
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabledForCourse(courseId: number, accessData: any, navOptions?: any, admOptions?: any): boolean | Promise<boolean> {
         if (accessData && accessData.type == CoreCourseProvider.ACCESS_GUEST) {
@@ -79,9 +79,9 @@ export class CoreGradesCourseOptionHandler implements CoreCourseOptionsHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @param {Injector} injector Injector.
-     * @param {number} course The course.
-     * @return {CoreCourseOptionsHandlerData|Promise<CoreCourseOptionsHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param course The course.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, course: any): CoreCourseOptionsHandlerData | Promise<CoreCourseOptionsHandlerData> {
         return {
@@ -94,8 +94,8 @@ export class CoreGradesCourseOptionHandler implements CoreCourseOptionsHandler {
     /**
      * Called when a course is downloaded. It should prefetch all the data to be able to see the addon in offline.
      *
-     * @param {any} course The course.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param course The course.
+     * @return Promise resolved when done.
      */
     prefetch(course: any): Promise<any> {
         return this.gradesProvider.getCourseGradesTable(course.id, undefined, undefined, true);
diff --git a/src/core/grades/providers/grades.ts b/src/core/grades/providers/grades.ts
index 59b25b1d2..b2f35b266 100644
--- a/src/core/grades/providers/grades.ts
+++ b/src/core/grades/providers/grades.ts
@@ -41,9 +41,9 @@ export class CoreGradesProvider {
     /**
      * Get cache key for grade table data WS calls.
      *
-     * @param {number} courseId ID of the course to get the grades from.
-     * @param {number} userId   ID of the user to get the grades from.
-     * @return {string}         Cache key.
+     * @param courseId ID of the course to get the grades from.
+     * @param userId ID of the user to get the grades from.
+     * @return Cache key.
      */
     protected getCourseGradesCacheKey(courseId: number, userId: number): string {
         return this.getCourseGradesPrefixCacheKey(courseId) + userId;
@@ -52,10 +52,10 @@ export class CoreGradesProvider {
     /**
      * Get cache key for grade items data WS calls.
      *
-     * @param {number} courseId     ID of the course to get the grades from.
-     * @param {number} userId       ID of the user to get the grades from.
-     * @param {number} [groupId]    ID of the group to get the grades from. Default: 0.
-     * @return {string}         Cache key.
+     * @param courseId ID of the course to get the grades from.
+     * @param userId ID of the user to get the grades from.
+     * @param groupId ID of the group to get the grades from. Default: 0.
+     * @return Cache key.
      */
     protected getCourseGradesItemsCacheKey(courseId: number, userId: number, groupId: number): string {
         groupId = groupId || 0;
@@ -66,8 +66,8 @@ export class CoreGradesProvider {
     /**
      * Get prefix cache key for grade table data WS calls.
      *
-     * @param {number} courseId ID of the course to get the grades from.
-     * @return {string}         Cache key.
+     * @param courseId ID of the course to get the grades from.
+     * @return Cache key.
      */
     protected getCourseGradesPrefixCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'items:' + courseId + ':';
@@ -76,7 +76,7 @@ export class CoreGradesProvider {
     /**
      * Get cache key for courses grade WS calls.
      *
-     * @return {string}   Cache key.
+     * @return Cache key.
      */
     protected getCoursesGradesCacheKey(): string {
         return this.ROOT_CACHE_KEY + 'coursesgrades';
@@ -86,12 +86,12 @@ export class CoreGradesProvider {
      * Get the grade items for a certain module. Keep in mind that may have more than one item to include outcomes and scales.
      * Fallback function only used if 'gradereport_user_get_grade_items' WS is not avalaible Moodle < 3.2.
      *
-     * @param  {number}  courseId             ID of the course to get the grades from.
-     * @param  {number}  [userId]             ID of the user to get the grades from. If not defined use site's current user.
-     * @param  {number}  [groupId]            ID of the group to get the grades from. Not used for old gradebook table.
-     * @param  {string}  [siteId]             Site ID. If not defined, current site.
-     * @param  {boolean} [ignoreCache=false]  True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<any>}                Promise to be resolved when the grades are retrieved.
+     * @param courseId ID of the course to get the grades from.
+     * @param userId ID of the user to get the grades from. If not defined use site's current user.
+     * @param groupId ID of the group to get the grades from. Not used for old gradebook table.
+     * @param siteId Site ID. If not defined, current site.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise to be resolved when the grades are retrieved.
      */
     getGradeItems(courseId: number, userId?: number, groupId?: number, siteId?: string, ignoreCache: boolean = false):
             Promise<any> {
@@ -116,12 +116,12 @@ export class CoreGradesProvider {
     /**
      * Get the grade items for a certain course.
      *
-     * @param  {number}  courseId             ID of the course to get the grades from.
-     * @param  {number}  [userId]             ID of the user to get the grades from.
-     * @param  {number}  [groupId]            ID of the group to get the grades from. Default 0.
-     * @param  {string}  [siteId]             Site ID. If not defined, current site.
-     * @param  {boolean} [ignoreCache=false]  True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<any>}                      Promise to be resolved when the grades table is retrieved.
+     * @param courseId ID of the course to get the grades from.
+     * @param userId ID of the user to get the grades from.
+     * @param groupId ID of the group to get the grades from. Default 0.
+     * @param siteId Site ID. If not defined, current site.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise to be resolved when the grades table is retrieved.
      */
     getCourseGradesItems(courseId: number, userId?: number, groupId?: number, siteId?: string,
             ignoreCache: boolean = false): Promise<any> {
@@ -158,11 +158,11 @@ export class CoreGradesProvider {
     /**
      * Get the grades for a certain course.
      *
-     * @param  {number}  courseId             ID of the course to get the grades from.
-     * @param  {number}  [userId]             ID of the user to get the grades from.
-     * @param  {string}  [siteId]             Site ID. If not defined, current site.
-     * @param  {boolean} [ignoreCache=false]  True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<any>}                      Promise to be resolved when the grades table is retrieved.
+     * @param courseId ID of the course to get the grades from.
+     * @param userId ID of the user to get the grades from.
+     * @param siteId Site ID. If not defined, current site.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise to be resolved when the grades table is retrieved.
      */
     getCourseGradesTable(courseId: number, userId?: number, siteId?: string, ignoreCache: boolean = false): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -196,8 +196,8 @@ export class CoreGradesProvider {
     /**
      * Get the grades for a certain course.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}   Promise to be resolved when the grades are retrieved.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise to be resolved when the grades are retrieved.
      */
     getCoursesGrades(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -220,9 +220,9 @@ export class CoreGradesProvider {
     /**
      * Invalidates courses grade table and items WS calls for all users.
      *
-     * @param {number} courseId ID of the course to get the grades from.
-     * @param {string} [siteId] Site ID (empty for current site).
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courseId ID of the course to get the grades from.
+     * @param siteId Site ID (empty for current site).
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAllCourseGradesData(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -233,10 +233,10 @@ export class CoreGradesProvider {
     /**
      * Invalidates grade table data WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} [userId]   User ID.
-     * @param {string} [siteId]   Site id (empty for current site).
-     * @return {Promise<any>}        Promise resolved when the data is invalidated.
+     * @param courseId Course ID.
+     * @param userId User ID.
+     * @param siteId Site id (empty for current site).
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCourseGradesData(courseId: number, userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -249,8 +249,8 @@ export class CoreGradesProvider {
     /**
      * Invalidates courses grade data WS calls.
      *
-     * @param {string} [siteId]   Site id (empty for current site).
-     * @return {Promise<any>}     Promise resolved when the data is invalidated.
+     * @param siteId Site id (empty for current site).
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCoursesGradesData(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -261,11 +261,11 @@ export class CoreGradesProvider {
     /**
      * Invalidates courses grade items data WS calls.
      *
-     * @param {number} courseId     ID of the course to get the grades from.
-     * @param {number} userId       ID of the user to get the grades from.
-     * @param {number} [groupId]    ID of the group to get the grades from. Default: 0.
-     * @param {string} [siteId]     Site id (empty for current site).
-     * @return {Promise<any>}     Promise resolved when the data is invalidated.
+     * @param courseId ID of the course to get the grades from.
+     * @param userId ID of the user to get the grades from.
+     * @param groupId ID of the group to get the grades from. Default: 0.
+     * @param siteId Site id (empty for current site).
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCourseGradesItemsData(courseId: number, userId: number, groupId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -276,8 +276,8 @@ export class CoreGradesProvider {
     /**
      * Returns whether or not the plugin is enabled for a certain site.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>}  Resolve with true if plugin is enabled, false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Resolve with true if plugin is enabled, false otherwise.
      * @since  Moodle 3.2
      */
     isCourseGradesEnabled(siteId?: string): Promise<boolean> {
@@ -295,9 +295,9 @@ export class CoreGradesProvider {
     /**
      * Returns whether or not the grade addon is enabled for a certain course.
      *
-     * @param {number} courseId  Course ID.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promisee<boolean>} Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
      */
     isPluginEnabledForCourse(courseId: number, siteId?: string): Promise<boolean> {
         if (!courseId) {
@@ -312,8 +312,8 @@ export class CoreGradesProvider {
     /**
      * Returns whether or not WS Grade Items is avalaible.
      *
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>}         True if ws is avalaible, false otherwise.
+     * @param siteId Site ID. If not defined, current site.
+     * @return True if ws is avalaible, false otherwise.
      * @since  Moodle 3.2
      */
     isGradeItemsAvalaible(siteId?: string): Promise<boolean> {
@@ -325,10 +325,10 @@ export class CoreGradesProvider {
     /**
      * Log Course grades view in Moodle.
      *
-     * @param  {number}  courseId Course ID.
-     * @param  {number}  userId   User ID.
-     * @param  {string}  [name]   Course name. If not set, it will be calculated.
-     * @return {Promise<any>}     Promise resolved when done.
+     * @param courseId Course ID.
+     * @param userId User ID.
+     * @param name Course name. If not set, it will be calculated.
+     * @return Promise resolved when done.
      */
     logCourseGradesView(courseId: number, userId: number, name?: string): Promise<any> {
         userId = userId || this.sitesProvider.getCurrentSiteUserId();
@@ -354,8 +354,8 @@ export class CoreGradesProvider {
     /**
      * Log Courses grades view in Moodle.
      *
-     * @param  {number}  [courseId] Course ID. If not defined, site Home ID.
-     * @return {Promise<any>}     Promise resolved when done.
+     * @param courseId Course ID. If not defined, site Home ID.
+     * @return Promise resolved when done.
      */
     logCoursesGradesView(courseId?: number): Promise<any> {
         if (!courseId) {
diff --git a/src/core/grades/providers/helper.ts b/src/core/grades/providers/helper.ts
index 22d925f6a..86cf0fa19 100644
--- a/src/core/grades/providers/helper.ts
+++ b/src/core/grades/providers/helper.ts
@@ -44,8 +44,8 @@ export class CoreGradesHelperProvider {
     /**
      * Formats a row from the grades table te be rendered in a page.
      *
-     * @param  {any}  tableRow JSON object representing row of grades table data.
-     * @return {any}           Formatted row object.
+     * @param tableRow JSON object representing row of grades table data.
+     * @return Formatted row object.
      */
     protected formatGradeRow(tableRow: any): any {
         const row = {};
@@ -79,8 +79,8 @@ export class CoreGradesHelperProvider {
     /**
      * Formats a row from the grades table to be rendered in one table.
      *
-     * @param  {any}  tableRow JSON object representing row of grades table data.
-     * @return {any}           Formatted row object.
+     * @param tableRow JSON object representing row of grades table data.
+     * @return Formatted row object.
      */
     protected formatGradeRowForTable(tableRow: any): any {
         const row = {};
@@ -119,8 +119,8 @@ export class CoreGradesHelperProvider {
     /**
      * Removes suffix formatted to compatibilize data from table and items.
      *
-     * @param  {any} item Grade item to format.
-     * @return {any}      Grade item formatted.
+     * @param item Grade item to format.
+     * @return Grade item formatted.
      */
     protected formatGradeItem(item: any): any {
         for (const name in item) {
@@ -136,8 +136,8 @@ export class CoreGradesHelperProvider {
     /**
      * Formats the response of gradereport_user_get_grades_table to be rendered.
      *
-     * @param  {any}  table          JSON object representing a table with data.
-     * @return {any}             Formatted HTML table.
+     * @param table JSON object representing a table with data.
+     * @return Formatted HTML table.
      */
     formatGradesTable(table: any): any {
         const maxDepth = table.maxdepth,
@@ -195,8 +195,8 @@ export class CoreGradesHelperProvider {
     /**
      * Get course data for grades since they only have courseid.
      *
-     * @param  {any} grades    Grades to get the data for.
-     * @return {Promise<any>}  Promise always resolved. Resolve param is the formatted grades.
+     * @param grades Grades to get the data for.
+     * @return Promise always resolved. Resolve param is the formatted grades.
      */
     getGradesCourseData(grades: any): Promise<any> {
         // Using cache for performance reasons.
@@ -219,12 +219,12 @@ export class CoreGradesHelperProvider {
     /**
      * Get an specific grade item.
      *
-     * @param  {number}  courseId             ID of the course to get the grades from.
-     * @param  {number}  gradeId              Grade ID.
-     * @param  {number}  [userId]             ID of the user to get the grades from. If not defined use site's current user.
-     * @param  {string}  [siteId]             Site ID. If not defined, current site.
-     * @param  {boolean} [ignoreCache=false]  True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<any>}                Promise to be resolved when the grades are retrieved.
+     * @param courseId ID of the course to get the grades from.
+     * @param gradeId Grade ID.
+     * @param userId ID of the user to get the grades from. If not defined use site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise to be resolved when the grades are retrieved.
      */
     getGradeItem(courseId: number, gradeId: number, userId?: number, siteId?: string, ignoreCache: boolean = false): Promise<any> {
 
@@ -240,9 +240,9 @@ export class CoreGradesHelperProvider {
     /**
      * Returns the label of the selected grade.
      *
-     * @param {any[]} grades Array with objects with value and label.
-     * @param {number} selectedGrade Selected grade value.
-     * @return {string} Selected grade label.
+     * @param grades Array with objects with value and label.
+     * @param selectedGrade Selected grade value.
+     * @return Selected grade label.
      */
     getGradeLabelFromValue(grades: any[], selectedGrade: number): string {
         selectedGrade = Number(selectedGrade);
@@ -263,13 +263,13 @@ export class CoreGradesHelperProvider {
     /**
      * Get the grade items for a certain module. Keep in mind that may have more than one item to include outcomes and scales.
      *
-     * @param  {number}  courseId             ID of the course to get the grades from.
-     * @param  {number}  moduleId             Module ID.
-     * @param  {number}  [userId]             ID of the user to get the grades from. If not defined use site's current user.
-     * @param  {number}  [groupId]            ID of the group to get the grades from. Not used for old gradebook table.
-     * @param  {string}  [siteId]             Site ID. If not defined, current site.
-     * @param  {boolean} [ignoreCache=false]  True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<any>}                Promise to be resolved when the grades are retrieved.
+     * @param courseId ID of the course to get the grades from.
+     * @param moduleId Module ID.
+     * @param userId ID of the user to get the grades from. If not defined use site's current user.
+     * @param groupId ID of the group to get the grades from. Not used for old gradebook table.
+     * @param siteId Site ID. If not defined, current site.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise to be resolved when the grades are retrieved.
      */
     getGradeModuleItems(courseId: number, moduleId: number, userId?: number, groupId?: number, siteId?: string,
             ignoreCache: boolean = false): Promise<any> {
@@ -295,9 +295,9 @@ export class CoreGradesHelperProvider {
     /**
      * Returns the value of the selected grade.
      *
-     * @param {any[]} grades Array with objects with value and label.
-     * @param {string} selectedGrade Selected grade label.
-     * @return {number} Selected grade value.
+     * @param grades Array with objects with value and label.
+     * @param selectedGrade Selected grade label.
+     * @return Selected grade value.
      */
     getGradeValueFromLabel(grades: any[], selectedGrade: string): number {
         if (!grades || !selectedGrade) {
@@ -316,8 +316,8 @@ export class CoreGradesHelperProvider {
     /**
      * Gets the link to the module for the selected grade.
      *
-     * @param  {string} text HTML where the link is present.
-     * @return {string | false}      URL linking to the module.
+     * @param text HTML where the link is present.
+     * @return URL linking to the module.
      */
     protected getModuleLink(text: string): string | false {
         const el = this.domUtils.toDom(text)[0],
@@ -333,9 +333,9 @@ export class CoreGradesHelperProvider {
     /**
      * Get a row from the grades table.
      *
-     * @param  {any}   table    JSON object representing a table with data.
-     * @param  {number} gradeId Grade Object identifier.
-     * @return {any}            Formatted HTML table.
+     * @param table JSON object representing a table with data.
+     * @param gradeId Grade Object identifier.
+     * @return Formatted HTML table.
      */
     getGradesTableRow(table: any, gradeId: number): any {
         if (table.tabledata) {
@@ -355,9 +355,9 @@ export class CoreGradesHelperProvider {
     /**
      * Get the rows related to a module from the grades table.
      *
-     * @param  {any}   table     JSON object representing a table with data.
-     * @param  {number} moduleId Grade Object identifier.
-     * @return {any}             Formatted HTML table.
+     * @param table JSON object representing a table with data.
+     * @param moduleId Grade Object identifier.
+     * @return Formatted HTML table.
      */
     getModuleGradesTableRows(table: any, moduleId: number): any {
 
@@ -388,12 +388,12 @@ export class CoreGradesHelperProvider {
     /**
      * Go to view grades.
      *
-     * @param {number} courseId Course ID t oview.
-     * @param {number} [userId] User to view. If not defined, current user.
-     * @param {number} [moduleId] Module to view. If not defined, view all course grades.
-     * @param {NavController} [navCtrl] NavController to use.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param courseId Course ID t oview.
+     * @param userId User to view. If not defined, current user.
+     * @param moduleId Module to view. If not defined, view all course grades.
+     * @param navCtrl NavController to use.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     goToGrades(courseId: number, userId?: number, moduleId?: number, navCtrl?: NavController, siteId?: string): Promise<any> {
 
@@ -485,11 +485,11 @@ export class CoreGradesHelperProvider {
     /**
      * Invalidate the grade items for a certain module.
      *
-     * @param  {number}  courseId     ID of the course to invalidate the grades.
-     * @param  {number}  [userId]     ID of the user to invalidate. If not defined use site's current user.
-     * @param  {number}  [groupId]    ID of the group to invalidate. Not used for old gradebook table.
-     * @param  {string}  [siteId]     Site ID. If not defined, current site.
-     * @return {Promise}              Promise to be resolved when the grades are invalidated.
+     * @param courseId ID of the course to invalidate the grades.
+     * @param userId ID of the user to invalidate. If not defined use site's current user.
+     * @param groupId ID of the group to invalidate. Not used for old gradebook table.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise to be resolved when the grades are invalidated.
      */
     invalidateGradeModuleItems(courseId: number, userId?: number, groupId?: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -510,9 +510,9 @@ export class CoreGradesHelperProvider {
     /**
      * Parses the image and sets it to the row.
      *
-     * @param  {any} row  Formatted grade row object.
-     * @param  {string} text HTML where the image will be rendered.
-     * @return {any}      Row object with the image.
+     * @param row Formatted grade row object.
+     * @param text HTML where the image will be rendered.
+     * @return Row object with the image.
      */
     protected setRowIcon(row: any, text: string): any {
         text = text.replace('%2F', '/').replace('%2f', '/');
@@ -564,13 +564,13 @@ export class CoreGradesHelperProvider {
      *
      * Taken from make_grades_menu on moodlelib.php
      *
-     * @param  {number} gradingType     If positive, max grade you can provide. If negative, scale Id.
-     * @param  {number} [moduleId]      Module ID. Used to retrieve the scale items when they are not passed as parameter.
-     *                                  If the user does not have permision to manage the activity an empty list is returned.
-     * @param  {string} [defaultLabel]  Element that will become default option, if not defined, it won't be added.
-     * @param  {any}    [defaultValue]  Element that will become default option value. Default ''.
-     * @param  {string} [scale]         Scale csv list String. If not provided, it will take it from the module grade info.
-     * @return {Promise<any[]>}         Array with objects with value and label to create a propper HTML select.
+     * @param gradingType If positive, max grade you can provide. If negative, scale Id.
+     * @param moduleId Module ID. Used to retrieve the scale items when they are not passed as parameter.
+     *                 If the user does not have permision to manage the activity an empty list is returned.
+     * @param defaultLabel Element that will become default option, if not defined, it won't be added.
+     * @param defaultValue Element that will become default option value. Default ''.
+     * @param scale Scale csv list String. If not provided, it will take it from the module grade info.
+     * @return Array with objects with value and label to create a propper HTML select.
      */
     makeGradesMenu(gradingType: number, moduleId?: number, defaultLabel: string = '', defaultValue: any = '', scale?: string):
             Promise<any[]> {
diff --git a/src/core/grades/providers/mainmenu-handler.ts b/src/core/grades/providers/mainmenu-handler.ts
index fe3b96a77..389c4f3b3 100644
--- a/src/core/grades/providers/mainmenu-handler.ts
+++ b/src/core/grades/providers/mainmenu-handler.ts
@@ -29,7 +29,7 @@ export class CoreGradesMainMenuHandler implements CoreMainMenuHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean | Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.gradesProvider.isCourseGradesEnabled();
@@ -38,7 +38,7 @@ export class CoreGradesMainMenuHandler implements CoreMainMenuHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreMainMenuHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(): CoreMainMenuHandlerData {
         return {
diff --git a/src/core/grades/providers/overview-link-handler.ts b/src/core/grades/providers/overview-link-handler.ts
index 1f34a82b0..7794d17d5 100644
--- a/src/core/grades/providers/overview-link-handler.ts
+++ b/src/core/grades/providers/overview-link-handler.ts
@@ -33,11 +33,11 @@ export class CoreGradesOverviewLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -52,11 +52,11 @@ export class CoreGradesOverviewLinkHandler extends CoreContentLinksHandlerBase {
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return this.gradesProvider.isCourseGradesEnabled(siteId);
diff --git a/src/core/grades/providers/user-handler.ts b/src/core/grades/providers/user-handler.ts
index 20d1d3a49..41d79addf 100644
--- a/src/core/grades/providers/user-handler.ts
+++ b/src/core/grades/providers/user-handler.ts
@@ -35,8 +35,8 @@ export class CoreGradesUserHandler implements CoreUserProfileHandler {
      * Clear view grades cache.
      * If a courseId and userId are specified, it will only delete the entry for that user and course.
      *
-     * @param  {number} [courseId] Course ID.
-     * @param  {number} [userId]   User ID.
+     * @param courseId Course ID.
+     * @param userId User ID.
      */
     clearViewGradesCache(courseId?: number, userId?: number): void {
         if (courseId && userId) {
@@ -49,9 +49,9 @@ export class CoreGradesUserHandler implements CoreUserProfileHandler {
     /**
      * Get a cache key to identify a course and a user.
      *
-     * @param  {number} courseId Course ID.
-     * @param  {number} userId   User ID.
-     * @return {string}          Cache key.
+     * @param courseId Course ID.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getCacheKey(courseId: number, userId: number): string {
         return courseId + '#' + userId;
@@ -60,7 +60,7 @@ export class CoreGradesUserHandler implements CoreUserProfileHandler {
     /**
      * Check if handler is enabled.
      *
-     * @return {boolean} Always enabled.
+     * @return Always enabled.
      */
     isEnabled(): boolean {
         return true;
@@ -69,11 +69,11 @@ export class CoreGradesUserHandler implements CoreUserProfileHandler {
     /**
      * Check if handler is enabled for this user in this context.
      *
-     * @param {any} user     User to check.
-     * @param {number} courseId Course ID.
-     * @param  {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param  {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return  {boolean|Promise<boolean>}   Promise resolved with true if enabled, resolved with false otherwise.
+     * @param user User to check.
+     * @param courseId Course ID.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved with true if enabled, resolved with false otherwise.
      */
     isEnabledForUser(user: any, courseId: number, navOptions?: any, admOptions?: any): boolean | Promise<boolean> {
         const cacheKey = this.getCacheKey(courseId, user.id),
@@ -98,7 +98,7 @@ export class CoreGradesUserHandler implements CoreUserProfileHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreUserProfileHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(user: any, courseId: number): CoreUserProfileHandlerData {
         return {
diff --git a/src/core/grades/providers/user-link-handler.ts b/src/core/grades/providers/user-link-handler.ts
index a6952f917..9235c6d04 100644
--- a/src/core/grades/providers/user-link-handler.ts
+++ b/src/core/grades/providers/user-link-handler.ts
@@ -33,12 +33,12 @@ export class CoreGradesUserLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @param {any} [data] Extra data to handle the URL.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @param data Extra data to handle the URL.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number, data?: any):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -59,11 +59,11 @@ export class CoreGradesUserLinkHandler extends CoreContentLinksHandlerBase {
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         if (!courseId && !params.id) {
diff --git a/src/core/login/pages/credentials/credentials.ts b/src/core/login/pages/credentials/credentials.ts
index fbf6eb574..41c0b541f 100644
--- a/src/core/login/pages/credentials/credentials.ts
+++ b/src/core/login/pages/credentials/credentials.ts
@@ -100,8 +100,8 @@ export class CoreLoginCredentialsPage {
      * Check if a site uses local_mobile, requires SSO login, etc.
      * This should be used only if a fixed URL is set, otherwise this check is already performed in CoreLoginSitePage.
      *
-     * @param {string} siteUrl Site URL to check.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param siteUrl Site URL to check.
+     * @return Promise resolved when done.
      */
     protected checkSite(siteUrl: string): Promise<any> {
         this.pageLoaded = false;
@@ -168,7 +168,7 @@ export class CoreLoginCredentialsPage {
     /**
      * Tries to authenticate the user.
      *
-     * @param {Event} [e] Event.
+     * @param e Event.
      */
     login(e?: Event): void {
         if (e) {
@@ -245,7 +245,7 @@ export class CoreLoginCredentialsPage {
     /**
      * An OAuth button was clicked.
      *
-     * @param {any} provider The provider that was clicked.
+     * @param provider The provider that was clicked.
      */
     oauthClicked(provider: any): void {
         if (!this.loginHelper.openBrowserForOAuthLogin(this.siteUrl, provider, this.siteConfig.launchurl)) {
diff --git a/src/core/login/pages/email-signup/email-signup.ts b/src/core/login/pages/email-signup/email-signup.ts
index 128a37f67..25ecd0e2e 100644
--- a/src/core/login/pages/email-signup/email-signup.ts
+++ b/src/core/login/pages/email-signup/email-signup.ts
@@ -187,8 +187,8 @@ export class CoreLoginEmailSignupPage {
     /**
      * Treat the site config, checking if it's valid and extracting the data we're interested in.
      *
-     * @param {any} siteConfig Site config to treat.
-     * @return {boolean} True if success.
+     * @param siteConfig Site config to treat.
+     * @return True if success.
      */
     protected treatSiteConfig(siteConfig: any): boolean {
         if (siteConfig && siteConfig.registerauth == 'email' && !this.loginHelper.isEmailSignupDisabled(siteConfig)) {
@@ -212,7 +212,7 @@ export class CoreLoginEmailSignupPage {
     /**
      * Pull to refresh.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshSettings(refresher: any): void {
         this.fetchData().finally(() => {
@@ -223,7 +223,7 @@ export class CoreLoginEmailSignupPage {
     /**
      * Create account.
      *
-     * @param {Event} e Event.
+     * @param e Event.
      */
     create(e: Event): void {
         e.preventDefault();
@@ -292,8 +292,8 @@ export class CoreLoginEmailSignupPage {
     /**
      * Escape mail to avoid special characters to be treated as a RegExp.
      *
-     * @param  {string} text Initial mail.
-     * @return {string}      Escaped mail.
+     * @param text Initial mail.
+     * @return Escaped mail.
      */
     escapeMail(text: string): string {
         return this.textUtils.escapeForRegex(text);
@@ -316,7 +316,7 @@ export class CoreLoginEmailSignupPage {
     /**
      * Verify Age.
      *
-     * @param {Event} e Event.
+     * @param e Event.
      */
     verifyAge(e: Event): void {
         e.preventDefault();
diff --git a/src/core/login/pages/forgotten-password/forgotten-password.ts b/src/core/login/pages/forgotten-password/forgotten-password.ts
index e4b3be972..e2e2805a4 100644
--- a/src/core/login/pages/forgotten-password/forgotten-password.ts
+++ b/src/core/login/pages/forgotten-password/forgotten-password.ts
@@ -44,7 +44,7 @@ export class CoreLoginForgottenPasswordPage {
     /**
      * Request to reset the password.
      *
-     * @param {Event} e Event.
+     * @param e Event.
      */
     resetPassword(e: Event): void {
         e.preventDefault();
diff --git a/src/core/login/pages/init/init.ts b/src/core/login/pages/init/init.ts
index 3cadcccfb..d7691fd04 100644
--- a/src/core/login/pages/init/init.ts
+++ b/src/core/login/pages/init/init.ts
@@ -81,7 +81,7 @@ export class CoreLoginInitPage {
     /**
      * Load the right page.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected loadPage(): Promise<any> {
         if (this.sitesProvider.isLoggedIn()) {
diff --git a/src/core/login/pages/reconnect/reconnect.ts b/src/core/login/pages/reconnect/reconnect.ts
index c653e51a6..5dc8ca1fa 100644
--- a/src/core/login/pages/reconnect/reconnect.ts
+++ b/src/core/login/pages/reconnect/reconnect.ts
@@ -102,7 +102,7 @@ export class CoreLoginReconnectPage {
     /**
      * Cancel reconnect.
      *
-     * @param {Event} [e] Event.
+     * @param e Event.
      */
     cancel(e?: Event): void {
         if (e) {
@@ -116,7 +116,7 @@ export class CoreLoginReconnectPage {
     /**
      * Tries to authenticate the user.
      *
-     * @param {Event} e Event.
+     * @param e Event.
      */
     login(e: Event): void {
         e.preventDefault();
@@ -185,7 +185,7 @@ export class CoreLoginReconnectPage {
     /**
      * An OAuth button was clicked.
      *
-     * @param {any} provider The provider that was clicked.
+     * @param provider The provider that was clicked.
      */
     oauthClicked(provider: any): void {
         if (!this.loginHelper.openBrowserForOAuthLogin(this.siteUrl, provider, this.siteConfig.launchurl)) {
diff --git a/src/core/login/pages/site-policy/site-policy.ts b/src/core/login/pages/site-policy/site-policy.ts
index e97d54be4..265505ad6 100644
--- a/src/core/login/pages/site-policy/site-policy.ts
+++ b/src/core/login/pages/site-policy/site-policy.ts
@@ -71,7 +71,7 @@ export class CoreLoginSitePolicyPage {
     /**
      * Fetch the site policy URL.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchSitePolicy(): Promise<any> {
         return this.loginHelper.getSitePolicy(this.siteId).then((sitePolicy) => {
diff --git a/src/core/login/pages/site/site.ts b/src/core/login/pages/site/site.ts
index 856797acd..55aafa984 100644
--- a/src/core/login/pages/site/site.ts
+++ b/src/core/login/pages/site/site.ts
@@ -65,8 +65,8 @@ export class CoreLoginSitePage {
     /**
      * Try to connect to a site.
      *
-     * @param {Event} e Event.
-     * @param {string} url The URL to connect to.
+     * @param e Event.
+     * @param url The URL to connect to.
      */
     connect(e: Event, url: string): void {
         e.preventDefault();
@@ -135,7 +135,7 @@ export class CoreLoginSitePage {
     /**
      * The filter has changed.
      *
-     * @param {any} Received Event.
+     * @param Received Event.
      */
     filterChanged(event: any): void {
         const newValue = event.target.value && event.target.value.trim().toLowerCase();
@@ -159,8 +159,8 @@ export class CoreLoginSitePage {
     /**
      * Show an error that aims people to solve the issue.
      *
-     * @param {string} url The URL the user was trying to connect to.
-     * @param {any} error Error to display.
+     * @param url The URL the user was trying to connect to.
+     * @param error Error to display.
      */
     protected showLoginIssue(url: string, error: any): void {
         const modal = this.modalCtrl.create('CoreLoginSiteErrorPage', {
diff --git a/src/core/login/pages/sites/sites.ts b/src/core/login/pages/sites/sites.ts
index 2fcbc96ab..48719413a 100644
--- a/src/core/login/pages/sites/sites.ts
+++ b/src/core/login/pages/sites/sites.ts
@@ -77,8 +77,8 @@ export class CoreLoginSitesPage {
     /**
      * Delete a site.
      *
-     * @param {Event} e Click event.
-     * @param {number} index Position of the site.
+     * @param e Click event.
+     * @param index Position of the site.
      */
     deleteSite(e: Event, index: number): void {
         e.stopPropagation();
@@ -112,7 +112,7 @@ export class CoreLoginSitesPage {
     /**
      * Login in a site.
      *
-     * @param {string} siteId The site ID.
+     * @param siteId The site ID.
      */
     login(siteId: string): void {
         const modal = this.domUtils.showModalLoading();
diff --git a/src/core/login/providers/helper.ts b/src/core/login/providers/helper.ts
index 9d46e536a..d46ad4a3e 100644
--- a/src/core/login/providers/helper.ts
+++ b/src/core/login/providers/helper.ts
@@ -39,31 +39,26 @@ import { Md5 } from 'ts-md5/dist/md5';
 export interface CoreLoginSSOData {
     /**
      * The site's URL.
-     * @type {string}
      */
     siteUrl: string;
 
     /**
      * User's token.
-     * @type {string}
      */
     token?: string;
 
     /**
      * User's private token.
-     * @type {string}
      */
     privateToken?: string;
 
     /**
      * Name of the page to go after authenticated.
-     * @type {string}
      */
     pageName?: string;
 
     /**
      * Params to page to the page.
-     * @type {string}
      */
     pageParams?: any;
 }
@@ -102,8 +97,8 @@ export class CoreLoginHelperProvider {
     /**
      * Accept site policy.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if success, rejected if failure.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success, rejected if failure.
      */
     acceptSitePolicy(siteId?: string): Promise<void> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -133,8 +128,8 @@ export class CoreLoginHelperProvider {
     /**
      * Function to handle URL received by Custom URL Scheme. If it's a SSO login, perform authentication.
      *
-     * @param {string} url URL received.
-     * @return {boolean} True if it's a SSO URL, false otherwise.
+     * @param url URL received.
+     * @return True if it's a SSO URL, false otherwise.
      * @deprecated Please use CoreCustomURLSchemesProvider.handleCustomURL instead.
      */
     appLaunchedByURL(url: string): boolean {
@@ -209,8 +204,8 @@ export class CoreLoginHelperProvider {
     /**
      * Check if a site allows requesting a password reset through the app.
      *
-     * @param {string} siteUrl URL of the site.
-     * @return {Promise<any>} Promise resolved with boolean: whether can be done through the app.
+     * @param siteUrl URL of the site.
+     * @return Promise resolved with boolean: whether can be done through the app.
      */
     canRequestPasswordReset(siteUrl: string): Promise<any> {
         return this.requestPasswordReset(siteUrl).then(() => {
@@ -236,11 +231,10 @@ export class CoreLoginHelperProvider {
     /**
      * Show a confirm modal if needed and open a browser to perform SSO login.
      *
-     * @param  {string} siteurl     URL of the site where the SSO login will be performed.
-     * @param  {number} typeOfLogin CoreConstants.LOGIN_SSO_CODE or CoreConstants.LOGIN_SSO_INAPP_CODE.
-     * @param  {string} [service]   The service to use. If not defined, external service will be used.
-     * @param  {string} [launchUrl] The URL to open for SSO. If not defined, local_mobile launch URL will be used.
-     * @return {Void}
+     * @param siteurl URL of the site where the SSO login will be performed.
+     * @param typeOfLogin CoreConstants.LOGIN_SSO_CODE or CoreConstants.LOGIN_SSO_INAPP_CODE.
+     * @param service The service to use. If not defined, external service will be used.
+     * @param launchUrl The URL to open for SSO. If not defined, local_mobile launch URL will be used.
      */
     confirmAndOpenBrowserForSSOLogin(siteUrl: string, typeOfLogin: number, service?: string, launchUrl?: string): void {
         // Show confirm only if it's needed. Treat "false" (string) as false to prevent typing errors.
@@ -263,10 +257,10 @@ export class CoreLoginHelperProvider {
     /**
      * Helper function to act when the forgotten password is clicked.
      *
-     * @param {NavController} navCtrl NavController to use to navigate.
-     * @param {string} siteUrl Site URL.
-     * @param {string} username Username.
-     * @param {any} [siteConfig] Site config.
+     * @param navCtrl NavController to use to navigate.
+     * @param siteUrl Site URL.
+     * @param username Username.
+     * @param siteConfig Site config.
      */
     forgottenPasswordClicked(navCtrl: NavController, siteUrl: string, username: string, siteConfig?: any): void {
         if (siteConfig && siteConfig.forgottenpasswordurl) {
@@ -295,8 +289,8 @@ export class CoreLoginHelperProvider {
     /**
      * Format profile fields, filtering the ones that shouldn't be shown on signup and classifying them in categories.
      *
-     * @param {any[]} profileFields Profile fields to format.
-     * @return {any} Categories with the fields to show in each one.
+     * @param profileFields Profile fields to format.
+     * @return Categories with the fields to show in each one.
      */
     formatProfileFieldsForSignup(profileFields: any[]): any {
         if (!profileFields) {
@@ -331,15 +325,15 @@ export class CoreLoginHelperProvider {
      * Builds an object with error messages for some common errors.
      * Please notice that this function doesn't support all possible error types.
      *
-     * @param {string} [requiredMsg] Code of the string for required error.
-     * @param {string} [emailMsg] Code of the string for invalid email error.
-     * @param {string} [patternMsg] Code of the string for pattern not match error.
-     * @param {string} [urlMsg] Code of the string for invalid url error.
-     * @param {string} [minlengthMsg] Code of the string for "too short" error.
-     * @param {string} [maxlengthMsg] Code of the string for "too long" error.
-     * @param {string} [minMsg] Code of the string for min value error.
-     * @param {string} [maxMsg] Code of the string for max value error.
-     * @return {any} Object with the errors.
+     * @param requiredMsg Code of the string for required error.
+     * @param emailMsg Code of the string for invalid email error.
+     * @param patternMsg Code of the string for pattern not match error.
+     * @param urlMsg Code of the string for invalid url error.
+     * @param minlengthMsg Code of the string for "too short" error.
+     * @param maxlengthMsg Code of the string for "too long" error.
+     * @param minMsg Code of the string for min value error.
+     * @param maxMsg Code of the string for max value error.
+     * @return Object with the errors.
      */
     getErrorMessages(requiredMsg?: string, emailMsg?: string, patternMsg?: string, urlMsg?: string, minlengthMsg?: string,
             maxlengthMsg?: string, minMsg?: string, maxMsg?: string): any {
@@ -376,8 +370,8 @@ export class CoreLoginHelperProvider {
     /**
      * Get the site policy.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<string>} Promise resolved with the site policy.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the site policy.
      */
     getSitePolicy(siteId?: string): Promise<string> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -397,7 +391,7 @@ export class CoreLoginHelperProvider {
     /**
      * Get fixed site or sites.
      *
-     * @return {string|any[]} Fixed site or list of fixed sites.
+     * @return Fixed site or list of fixed sites.
      */
     getFixedSites(): string | any[] {
         return CoreConfigConstants.siteurl;
@@ -406,8 +400,8 @@ export class CoreLoginHelperProvider {
     /**
      * Get the valid identity providers from a site config.
      *
-     * @param {any} siteConfig Site's public config.
-     * @return {any[]} Valid identity providers.
+     * @param siteConfig Site's public config.
+     * @return Valid identity providers.
      */
     getValidIdentityProviders(siteConfig: any): any[] {
         const validProviders = [],
@@ -429,9 +423,9 @@ export class CoreLoginHelperProvider {
      * Go to the page to add a new site.
      * If a fixed URL is configured, go to credentials instead.
      *
-     * @param {boolean} [setRoot] True to set the new page as root, false to add it to the stack.
-     * @param {boolean} [showKeyboard] Whether to show keyboard in the new page. Only if no fixed URL set.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param setRoot True to set the new page as root, false to add it to the stack.
+     * @param showKeyboard Whether to show keyboard in the new page. Only if no fixed URL set.
+     * @return Promise resolved when done.
      */
     goToAddSite(setRoot?: boolean, showKeyboard?: boolean): Promise<any> {
         let pageName,
@@ -461,10 +455,10 @@ export class CoreLoginHelperProvider {
     /**
      * Open a page that doesn't belong to any site.
      *
-     * @param {NavController} [navCtrl] Nav Controller.
-     * @param {string} [page] Page to open.
-     * @param {any} [params] Params of the page.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param navCtrl Nav Controller.
+     * @param page Page to open.
+     * @param params Params of the page.
+     * @return Promise resolved when done.
      */
     goToNoSitePage(navCtrl: NavController, page: string, params?: any): Promise<any> {
         navCtrl = navCtrl || this.appProvider.getRootNavController();
@@ -498,12 +492,12 @@ export class CoreLoginHelperProvider {
     /**
      * Go to the initial page of a site depending on 'userhomepage' setting.
      *
-     * @param {NavController} [navCtrl] NavController to use. Defaults to app root NavController.
-     * @param {string} [page] Name of the page to load after loading the main page.
-     * @param {any} [params] Params to pass to the page.
-     * @param {NavOptions} [options] Navigation options.
-     * @param {string} [url] URL to open once the main menu is loaded.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param navCtrl NavController to use. Defaults to app root NavController.
+     * @param page Name of the page to load after loading the main page.
+     * @param params Params to pass to the page.
+     * @param options Navigation options.
+     * @param url URL to open once the main menu is loaded.
+     * @return Promise resolved when done.
      */
     goToSiteInitialPage(navCtrl?: NavController, page?: string, params?: any, options?: NavOptions, url?: string): Promise<any> {
         return this.openMainMenu(navCtrl, page, params, options, url);
@@ -513,10 +507,10 @@ export class CoreLoginHelperProvider {
      * Convenient helper to handle authentication in the app using a token received by SSO login. If it's a new account,
      * the site is stored and the user is authenticated. If the account already exists, update its token.
      *
-     * @param {string} siteUrl Site's URL.
-     * @param {string} token User's token.
-     * @param {string} [privateToken] User's private token.
-     * @return {Promise<any>} Promise resolved when the user is authenticated with the token.
+     * @param siteUrl Site's URL.
+     * @param token User's token.
+     * @param privateToken User's private token.
+     * @return Promise resolved when the user is authenticated with the token.
      */
     handleSSOLoginAuthentication(siteUrl: string, token: string, privateToken?: string): Promise<any> {
         // Always create a new site to prevent overriding data if another user credentials were introduced.
@@ -526,7 +520,7 @@ export class CoreLoginHelperProvider {
     /**
      * Check if the app is configured to use several fixed URLs.
      *
-     * @return {boolean} Whether there are several fixed URLs.
+     * @return Whether there are several fixed URLs.
      */
     hasSeveralFixedSites(): boolean {
         return CoreConfigConstants.siteurl && Array.isArray(CoreConfigConstants.siteurl) &&
@@ -536,7 +530,7 @@ export class CoreLoginHelperProvider {
     /**
      * Function called when a page starts loading in any InAppBrowser window.
      *
-     * @param {string} url Loaded url.
+     * @param url Loaded url.
      * @deprecated
      */
     inAppBrowserLoadStart(url: string): void {
@@ -546,8 +540,8 @@ export class CoreLoginHelperProvider {
     /**
      * Given a site public config, check if email signup is disabled.
      *
-     * @param {any} config Site public config.
-     * @return {boolean} Whether email signup is disabled.
+     * @param config Site public config.
+     * @return Whether email signup is disabled.
      */
     isEmailSignupDisabled(config: any): boolean {
         let disabledFeatures = config && config.tool_mobile_disabledfeatures;
@@ -565,7 +559,7 @@ export class CoreLoginHelperProvider {
     /**
      * Check if the app is configured to use a fixed URL (only 1).
      *
-     * @return {boolean} Whether there is 1 fixed URL.
+     * @return Whether there is 1 fixed URL.
      */
     isFixedUrlSet(): boolean {
         if (Array.isArray(CoreConfigConstants.siteurl)) {
@@ -578,9 +572,9 @@ export class CoreLoginHelperProvider {
     /**
      * Check if current site is logged out, triggering mmCoreEventSessionExpired if it is.
      *
-     * @param {string} [pageName] Name of the page to go once authenticated if logged out. If not defined, site initial page.
-     * @param {any} [params] Params of the page to go once authenticated if logged out.
-     * @return {boolean} True if user is logged out, false otherwise.
+     * @param pageName Name of the page to go once authenticated if logged out. If not defined, site initial page.
+     * @param params Params of the page to go once authenticated if logged out.
+     * @return True if user is logged out, false otherwise.
      */
     isSiteLoggedOut(pageName?: string, params?: any): boolean {
         const site = this.sitesProvider.getCurrentSite();
@@ -603,8 +597,8 @@ export class CoreLoginHelperProvider {
     /**
      * Check if SSO login should use an embedded browser.
      *
-     * @param {number} code Code to check.
-     * @return {boolean} True if embedded browser, false othwerise.
+     * @param code Code to check.
+     * @return True if embedded browser, false othwerise.
      */
     isSSOEmbeddedBrowser(code: number): boolean {
         if (this.appProvider.isLinux()) {
@@ -618,8 +612,8 @@ export class CoreLoginHelperProvider {
     /**
      * Check if SSO login is needed based on code returned by the WS.
      *
-     * @param {number} code Code to check.
-     * @return {boolean} True if SSO login is needed, false othwerise.
+     * @param code Code to check.
+     * @return True if SSO login is needed, false othwerise.
      */
     isSSOLoginNeeded(code: number): boolean {
         return code == CoreConstants.LOGIN_SSO_CODE || code == CoreConstants.LOGIN_SSO_INAPP_CODE;
@@ -628,10 +622,10 @@ export class CoreLoginHelperProvider {
     /**
      * Load a site and load a certain page in that site.
      *
-     * @param {string} page Name of the page to load.
-     * @param {any} params Params to pass to the page.
-     * @param {string} siteId Site to load.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param page Name of the page to load.
+     * @param params Params to pass to the page.
+     * @param siteId Site to load.
+     * @return Promise resolved when done.
      */
     protected loadSiteAndPage(page: string, params: any, siteId: string): Promise<any> {
         const navCtrl = this.appProvider.getRootNavController();
@@ -658,8 +652,8 @@ export class CoreLoginHelperProvider {
     /**
      * Load a certain page in the main menu page.
      *
-     * @param {string} page Name of the page to load.
-     * @param {any} params Params to pass to the page.
+     * @param page Name of the page to load.
+     * @param params Params to pass to the page.
      */
     loadPageInMainMenu(page: string, params: any): void {
         if (!this.appProvider.isMainMenuOpen()) {
@@ -684,12 +678,12 @@ export class CoreLoginHelperProvider {
     /**
      * Open the main menu, loading a certain page.
      *
-     * @param {NavController} navCtrl NavController.
-     * @param {string} page Name of the page to load.
-     * @param {any} params Params to pass to the page.
-     * @param {NavOptions} [options] Navigation options.
-     * @param {string} [url] URL to open once the main menu is loaded.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param navCtrl NavController.
+     * @param page Name of the page to load.
+     * @param params Params to pass to the page.
+     * @param options Navigation options.
+     * @param url URL to open once the main menu is loaded.
+     * @return Promise resolved when done.
      */
     protected openMainMenu(navCtrl: NavController, page: string, params: any, options?: NavOptions, url?: string): Promise<any> {
         navCtrl = navCtrl || this.appProvider.getRootNavController();
@@ -712,12 +706,12 @@ export class CoreLoginHelperProvider {
     /**
      * Open a browser to perform OAuth login (Google, Facebook, Microsoft).
      *
-     * @param {string} siteUrl URL of the site where the login will be performed.
-     * @param {any} provider The identity provider.
-     * @param {string} [launchUrl] The URL to open for SSO. If not defined, tool/mobile launch URL will be used.
-     * @param {string} [pageName] Name of the page to go once authenticated. If not defined, site initial page.
-     * @param {any} [pageParams] Params of the state to go once authenticated.
-     * @return {boolean} True if success, false if error.
+     * @param siteUrl URL of the site where the login will be performed.
+     * @param provider The identity provider.
+     * @param launchUrl The URL to open for SSO. If not defined, tool/mobile launch URL will be used.
+     * @param pageName Name of the page to go once authenticated. If not defined, site initial page.
+     * @param pageParams Params of the state to go once authenticated.
+     * @return True if success, false if error.
      */
     openBrowserForOAuthLogin(siteUrl: string, provider: any, launchUrl?: string, pageName?: string, pageParams?: any): boolean {
         launchUrl = launchUrl || siteUrl + '/admin/tool/mobile/launch.php';
@@ -752,12 +746,12 @@ export class CoreLoginHelperProvider {
     /**
      * Open a browser to perform SSO login.
      *
-     * @param {string} siteurl URL of the site where the SSO login will be performed.
-     * @param {number} typeOfLogin CoreConstants.LOGIN_SSO_CODE or CoreConstants.LOGIN_SSO_INAPP_CODE.
-     * @param {string} [service] The service to use. If not defined, external service will be used.
-     * @param {string} [launchUrl] The URL to open for SSO. If not defined, local_mobile launch URL will be used.
-     * @param {string} [pageName] Name of the page to go once authenticated. If not defined, site initial page.
-     * @param {any} [pageParams] Params of the state to go once authenticated.
+     * @param siteurl URL of the site where the SSO login will be performed.
+     * @param typeOfLogin CoreConstants.LOGIN_SSO_CODE or CoreConstants.LOGIN_SSO_INAPP_CODE.
+     * @param service The service to use. If not defined, external service will be used.
+     * @param launchUrl The URL to open for SSO. If not defined, local_mobile launch URL will be used.
+     * @param pageName Name of the page to go once authenticated. If not defined, site initial page.
+     * @param pageParams Params of the state to go once authenticated.
      */
     openBrowserForSSOLogin(siteUrl: string, typeOfLogin: number, service?: string, launchUrl?: string, pageName?: string,
             pageParams?: any): void {
@@ -780,8 +774,8 @@ export class CoreLoginHelperProvider {
     /**
      * Convenient helper to open change password page.
      *
-     * @param {string} siteUrl Site URL to construct change password URL.
-     * @param {string} error Error message.
+     * @param siteUrl Site URL to construct change password URL.
+     * @param error Error message.
      */
     openChangePassword(siteUrl: string, error: string): void {
         this.domUtils.showAlert(this.translate.instant('core.notice'), error, undefined, 3000).then((alert) => {
@@ -796,7 +790,7 @@ export class CoreLoginHelperProvider {
     /**
      * Open forgotten password in inappbrowser.
      *
-     * @param {string} siteUrl URL of the site.
+     * @param siteUrl URL of the site.
      */
     openForgottenPassword(siteUrl: string): void {
         this.utils.openInApp(siteUrl + '/login/forgot_password.php');
@@ -805,10 +799,10 @@ export class CoreLoginHelperProvider {
     /*
      * Function to open in app browser to change password or complete user profile.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} path The relative path of the URL to open.
-     * @param {string} alertMessage The key of the message to display before opening the in app browser.
-     * @param {boolean} [invalidateCache] Whether to invalidate site's cache (e.g. when the user is forced to change password).
+     * @param siteId The site ID.
+     * @param path The relative path of the URL to open.
+     * @param alertMessage The key of the message to display before opening the in app browser.
+     * @param invalidateCache Whether to invalidate site's cache (e.g. when the user is forced to change password).
      */
     openInAppForEdit(siteId: string, path: string, alertMessage: string, invalidateCache?: boolean): void {
         if (!siteId || siteId !== this.sitesProvider.getCurrentSiteId()) {
@@ -842,11 +836,11 @@ export class CoreLoginHelperProvider {
     /**
      * Prepare the app to perform SSO login.
      *
-     * @param {string} siteUrl URL of the site where the SSO login will be performed.
-     * @param {string} [service] The service to use. If not defined, external service will be used.
-     * @param {string} [launchUrl] The URL to open for SSO. If not defined, local_mobile launch URL will be used.
-     * @param {string} [pageName] Name of the page to go once authenticated. If not defined, site initial page.
-     * @param {any} [pageParams] Params of the state to go once authenticated.
+     * @param siteUrl URL of the site where the SSO login will be performed.
+     * @param service The service to use. If not defined, external service will be used.
+     * @param launchUrl The URL to open for SSO. If not defined, local_mobile launch URL will be used.
+     * @param pageName Name of the page to go once authenticated. If not defined, site initial page.
+     * @param pageParams Params of the state to go once authenticated.
      */
     prepareForSSOLogin(siteUrl: string, service?: string, launchUrl?: string, pageName?: string, pageParams?: any): string {
         service = service || CoreConfigConstants.wsextservice;
@@ -873,10 +867,10 @@ export class CoreLoginHelperProvider {
     /**
      * Redirect to a new page, setting it as the root page and loading the right site if needed.
      *
-     * @param {string} page Name of the page to load. Special cases: OPEN_COURSE (to open course page).
-     * @param {any} params Params to pass to the page.
-     * @param {string} [siteId] Site to load. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param page Name of the page to load. Special cases: OPEN_COURSE (to open course page).
+     * @param params Params to pass to the page.
+     * @param siteId Site to load. If not defined, current site.
+     * @return Promise resolved when done.
      */
     redirect(page: string, params?: any, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -911,10 +905,10 @@ export class CoreLoginHelperProvider {
     /**
      * Request a password reset.
      *
-     * @param {string} siteUrl URL of the site.
-     * @param {string} [username] Username to search.
-     * @param {string} [email] Email to search.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param siteUrl URL of the site.
+     * @param username Username to search.
+     * @param email Email to search.
+     * @return Promise resolved when done.
      */
     requestPasswordReset(siteUrl: string, username?: string, email?: string): Promise<any> {
         const params: any = {};
@@ -933,7 +927,7 @@ export class CoreLoginHelperProvider {
     /**
      * Function that should be called when the session expires. Reserved for core use.
      *
-     * @param {any} data Data received by the SESSION_EXPIRED event.
+     * @param data Data received by the SESSION_EXPIRED event.
      */
     sessionExpired(data: any): void {
         const siteId = data && data.siteId,
@@ -1015,8 +1009,8 @@ export class CoreLoginHelperProvider {
     /**
      * Check if a confirm should be shown to open a SSO authentication.
      *
-     * @param {number} typeOfLogin CoreConstants.LOGIN_SSO_CODE or CoreConstants.LOGIN_SSO_INAPP_CODE.
-     * @return {boolean} True if confirm modal should be shown, false otherwise.
+     * @param typeOfLogin CoreConstants.LOGIN_SSO_CODE or CoreConstants.LOGIN_SSO_INAPP_CODE.
+     * @return True if confirm modal should be shown, false otherwise.
      */
     shouldShowSSOConfirm(typeOfLogin: number): boolean {
         return !this.isSSOEmbeddedBrowser(typeOfLogin) &&
@@ -1026,7 +1020,7 @@ export class CoreLoginHelperProvider {
     /**
      * Show a modal warning the user that he should use the Classic app.
      *
-     * @param {string} message The warning message.
+     * @param message The warning message.
      */
     protected showLegacyNoticeModal(message: string): void {
         let link;
@@ -1048,7 +1042,7 @@ export class CoreLoginHelperProvider {
     /**
      * Show a modal warning the user that he should use the Workplace app.
      *
-     * @param {string} message The warning message.
+     * @param message The warning message.
      */
     protected showWorkplaceNoticeModal(message: string): void {
         let link;
@@ -1065,7 +1059,7 @@ export class CoreLoginHelperProvider {
     /**
      * Show a modal warning the user that he should use the current Moodle app.
      *
-     * @param {string} message The warning message.
+     * @param message The warning message.
      */
     protected showMoodleAppNoticeModal(message: string): void {
         let link;
@@ -1089,8 +1083,8 @@ export class CoreLoginHelperProvider {
     /**
      * Show a modal warning the user that he should use a different app.
      *
-     * @param {string} message The warning message.
-     * @param {string} link Link to the app to download if any.
+     * @param message The warning message.
+     * @param link Link to the app to download if any.
      */
     protected showDownloadAppNoticeModal(message: string, link?: string): void {
         const buttons: any[] = [
@@ -1127,10 +1121,10 @@ export class CoreLoginHelperProvider {
     /**
      * Show a modal to inform the user that a confirmation email was sent, and a button to resend the email on 3.6+ sites.
      *
-     * @param {string} siteUrl Site URL.
-     * @param {string} [email] Email of the user. If set displayed in the message.
-     * @param {string} [username] Username. If not set the button to resend email will not be shown.
-     * @param {string} [password] User password. If not set the button to resend email will not be shown.
+     * @param siteUrl Site URL.
+     * @param email Email of the user. If set displayed in the message.
+     * @param username Username. If not set the button to resend email will not be shown.
+     * @param password User password. If not set the button to resend email will not be shown.
      */
     protected showNotConfirmedModal(siteUrl: string, email?: string, username?: string, password?: string): void {
         const title = this.translate.instant('core.login.mustconfirm');
@@ -1187,7 +1181,7 @@ export class CoreLoginHelperProvider {
     /**
      * Function called when site policy is not agreed. Reserved for core use.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
+     * @param siteId Site ID. If not defined, current site.
      */
     sitePolicyNotAgreed(siteId?: string): void {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -1215,10 +1209,10 @@ export class CoreLoginHelperProvider {
     /**
      * Convenient helper to handle get User Token error. It redirects to change password page if forcepassword is set.
      *
-     * @param {string} siteUrl Site URL to construct change password URL.
-     * @param {any} error Error object containing errorcode and error message.
-     * @param {string} [username] Username.
-     * @param {string} [password] User password.
+     * @param siteUrl Site URL to construct change password URL.
+     * @param error Error object containing errorcode and error message.
+     * @param username Username.
+     * @param password User password.
      */
     treatUserTokenError(siteUrl: string, error: any, username?: string, password?: string): void {
         if (error.errorcode == 'forcepasswordchangenotice') {
@@ -1239,8 +1233,8 @@ export class CoreLoginHelperProvider {
     /**
      * Convenient helper to validate a browser SSO login.
      *
-     * @param {string} url URL received, to be validated.
-     * @return {Promise<CoreLoginSSOData>} Promise resolved on success.
+     * @param url URL received, to be validated.
+     * @return Promise resolved on success.
      */
     validateBrowserSSOLogin(url: string): Promise<CoreLoginSSOData> {
         // Split signature:::token
diff --git a/src/core/mainmenu/pages/menu/menu.ts b/src/core/mainmenu/pages/menu/menu.ts
index d06d413c2..afda6473a 100644
--- a/src/core/mainmenu/pages/menu/menu.ts
+++ b/src/core/mainmenu/pages/menu/menu.ts
@@ -187,7 +187,7 @@ export class CoreMainMenuPage implements OnDestroy {
     /**
      * Handle a redirect.
      *
-     * @param {any} data Data received.
+     * @param data Data received.
      */
     protected handleRedirect(data: any): void {
         // Check if the redirect page is the root page of any of the tabs.
diff --git a/src/core/mainmenu/pages/more/more.ts b/src/core/mainmenu/pages/more/more.ts
index c91d984bb..09dd27b06 100644
--- a/src/core/mainmenu/pages/more/more.ts
+++ b/src/core/mainmenu/pages/more/more.ts
@@ -124,7 +124,7 @@ export class CoreMainMenuMorePage implements OnDestroy {
     /**
      * Open a handler.
      *
-     * @param {CoreMainMenuHandlerData} handler Handler to open.
+     * @param handler Handler to open.
      */
     openHandler(handler: CoreMainMenuHandlerData): void {
         this.navCtrl.push(handler.page, handler.pageParams);
@@ -133,7 +133,7 @@ export class CoreMainMenuMorePage implements OnDestroy {
     /**
      * Open an embedded custom item.
      *
-     * @param {CoreMainMenuCustomItem} item Item to open.
+     * @param item Item to open.
      */
     openItem(item: CoreMainMenuCustomItem): void {
         this.navCtrl.push('CoreViewerIframePage', {title: item.label, url: item.url});
diff --git a/src/core/mainmenu/providers/delegate.ts b/src/core/mainmenu/providers/delegate.ts
index a32d6e040..f42550d8b 100644
--- a/src/core/mainmenu/providers/delegate.ts
+++ b/src/core/mainmenu/providers/delegate.ts
@@ -25,14 +25,13 @@ import { Subject, BehaviorSubject } from 'rxjs';
 export interface CoreMainMenuHandler extends CoreDelegateHandler {
     /**
      * The highest priority is displayed first.
-     * @type {number}
      */
     priority: number;
 
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreMainMenuHandlerData} Data.
+     * @return Data.
      */
     getDisplayData(): CoreMainMenuHandlerData;
 }
@@ -43,55 +42,46 @@ export interface CoreMainMenuHandler extends CoreDelegateHandler {
 export interface CoreMainMenuHandlerData {
     /**
      * Name of the page to load for the handler.
-     * @type {string}
      */
     page: string;
 
     /**
      * Title to display for the handler.
-     * @type {string}
      */
     title: string;
 
     /**
      * Name of the icon to display for the handler.
-     * @type {string}
      */
     icon: string; // Name of the icon to display in the tab.
 
     /**
      * Class to add to the displayed handler.
-     * @type {string}
      */
     class?: string;
 
     /**
      * If the handler has badge to show or not.
-     * @type {boolean}
      */
     showBadge?: boolean;
 
     /**
      * Text to display on the badge. Only used if showBadge is true.
-     * @type {string}
      */
     badge?: string;
 
     /**
      * If true, the badge number is being loaded. Only used if showBadge is true.
-     * @type {boolean}
      */
     loading?: boolean;
 
     /**
      * Params to pass to the page.
-     * @type {any}
      */
     pageParams?: any;
 
     /**
      * Whether the handler should only appear in More menu.
-     * @type {boolean}
      */
     onlyInMore?: boolean;
 }
@@ -102,19 +92,16 @@ export interface CoreMainMenuHandlerData {
 export interface CoreMainMenuHandlerToDisplay extends CoreMainMenuHandlerData {
     /**
      * Name of the handler.
-     * @type {string}
      */
     name?: string;
 
     /**
      * Priority of the handler.
-     * @type {number}
      */
     priority?: number;
 
     /**
      * Hide tab. Used then resizing.
-     * @type {[type]}
      */
     hide?: boolean;
 }
@@ -139,7 +126,7 @@ export class CoreMainMenuDelegate extends CoreDelegate {
     /**
      * Check if handlers are loaded.
      *
-     * @return {boolean} True if handlers are loaded, false otherwise.
+     * @return True if handlers are loaded, false otherwise.
      */
     areHandlersLoaded(): boolean {
         return this.loaded;
@@ -156,7 +143,7 @@ export class CoreMainMenuDelegate extends CoreDelegate {
     /**
      * Get the handlers for the current site.
      *
-     * @return {Subject<CoreMainMenuHandlerToDisplay[]>} An observable that will receive the handlers.
+     * @return An observable that will receive the handlers.
      */
     getHandlers(): Subject<CoreMainMenuHandlerToDisplay[]> {
         return this.siteHandlers;
diff --git a/src/core/mainmenu/providers/mainmenu.ts b/src/core/mainmenu/providers/mainmenu.ts
index d601956c4..8181b1067 100644
--- a/src/core/mainmenu/providers/mainmenu.ts
+++ b/src/core/mainmenu/providers/mainmenu.ts
@@ -26,25 +26,21 @@ import { CoreMainMenuDelegate, CoreMainMenuHandlerToDisplay } from './delegate';
 export interface CoreMainMenuCustomItem {
     /**
      * Type of the item: app, inappbrowser, browser or embedded.
-     * @type {string}
      */
     type: string;
 
     /**
      * Url of the item.
-     * @type {string}
      */
     url: string;
 
     /**
      * Label to display for the item.
-     * @type {string}
      */
     label: string;
 
     /**
      * Name of the icon to display for the item.
-     * @type {string}
      */
     icon: string;
 }
@@ -66,7 +62,7 @@ export class CoreMainMenuProvider {
     /**
      * Get the current main menu handlers.
      *
-     * @return {Promise<CoreMainMenuHandlerToDisplay[]>} Promise resolved with the current main menu handlers.
+     * @return Promise resolved with the current main menu handlers.
      */
     getCurrentMainMenuHandlers(): Promise<CoreMainMenuHandlerToDisplay[]> {
         const deferred = this.utils.promiseDefer();
@@ -89,8 +85,8 @@ export class CoreMainMenuProvider {
     /**
      * Get a list of custom menu items for a certain site.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<CoreMainMenuCustomItem[]>} List of custom menu items.
+     * @param siteId Site ID. If not defined, current site.
+     * @return List of custom menu items.
      */
     getCustomMenuItems(siteId?: string): Promise<CoreMainMenuCustomItem[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -193,7 +189,7 @@ export class CoreMainMenuProvider {
     /**
      * Get the number of items to be shown on the main menu bar.
      *
-     * @return {number} Number of items depending on the device width.
+     * @return Number of items depending on the device width.
      */
     getNumItems(): number {
         if (!this.isResponsiveMainMenuItemsDisabledInCurrentSite() && window && window.innerWidth) {
@@ -219,8 +215,8 @@ export class CoreMainMenuProvider {
     /**
      * Get tabs placement depending on the device size.
      *
-     * @param  {NavController} navCtrl  NavController to resize the content.
-     * @return {string}                Tabs placement including side value.
+     * @param navCtrl NavController to resize the content.
+     * @return Tabs placement including side value.
      */
     getTabPlacement(navCtrl: NavController): string {
         const tablet = window && window.innerWidth && window.innerWidth >= 576 && window.innerHeight >= 576;
@@ -240,9 +236,9 @@ export class CoreMainMenuProvider {
     /**
      * Check if a certain page is the root of a main menu handler currently displayed.
      *
-     * @param {string} page Name of the page.
-     * @param {string} [pageParams] Page params.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether it's the root of a main menu handler.
+     * @param page Name of the page.
+     * @param pageParams Page params.
+     * @return Promise resolved with boolean: whether it's the root of a main menu handler.
      */
     isCurrentMainMenuHandler(pageName: string, pageParams?: any): Promise<boolean> {
         return this.getCurrentMainMenuHandlers().then((handlers) => {
@@ -257,7 +253,7 @@ export class CoreMainMenuProvider {
     /**
      * Check if responsive main menu items is disabled in the current site.
      *
-     * @return {boolean} Whether it's disabled.
+     * @return Whether it's disabled.
      */
     protected isResponsiveMainMenuItemsDisabledInCurrentSite(): boolean {
         const site = this.sitesProvider.getCurrentSite();
diff --git a/src/core/pushnotifications/providers/delegate.ts b/src/core/pushnotifications/providers/delegate.ts
index 8f64a4ed5..e15e28c60 100644
--- a/src/core/pushnotifications/providers/delegate.ts
+++ b/src/core/pushnotifications/providers/delegate.ts
@@ -24,36 +24,33 @@ import { Subject } from 'rxjs';
 export interface CorePushNotificationsClickHandler {
     /**
      * A name to identify the handler.
-     * @type {string}
      */
     name: string;
 
     /**
      * Handler's priority. The highest priority is treated first.
-     * @type {number}
      */
     priority?: number;
 
     /**
      * Name of the feature this handler is related to.
      * It will be used to check if the feature is disabled (@see CoreSite.isFeatureDisabled).
-     * @type {string}
      */
     featureName?: string;
 
     /**
      * Check if a notification click is handled by this handler.
      *
-     * @param {any} notification The notification to check.
-     * @return {boolean} Whether the notification click is handled by this handler.
+     * @param notification The notification to check.
+     * @return Whether the notification click is handled by this handler.
      */
     handles(notification: any): boolean | Promise<boolean>;
 
     /**
      * Handle the notification click.
      *
-     * @param {any} notification The notification to check.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param notification The notification to check.
+     * @return Promise resolved when done.
      */
     handleClick(notification: any): Promise<any>;
 }
@@ -77,8 +74,8 @@ export class CorePushNotificationsDelegate {
     /**
      * Function called when a push notification is clicked. Sends notification to handlers.
      *
-     * @param {any} notification Notification clicked.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param notification Notification clicked.
+     * @return Promise resolved when done.
      */
     clicked(notification: any): Promise<any> {
         if (!notification) {
@@ -122,9 +119,9 @@ export class CorePushNotificationsDelegate {
     /**
      * Check if a handler's feature is disabled for a certain site.
      *
-     * @param {CorePushNotificationsClickHandler} handler Handler to check.
-     * @param {string} siteId The site ID to check.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether the handler feature is disabled.
+     * @param handler Handler to check.
+     * @param siteId The site ID to check.
+     * @return Promise resolved with boolean: whether the handler feature is disabled.
      */
     protected isFeatureDisabled(handler: CorePushNotificationsClickHandler, siteId: string): Promise<boolean> {
         if (handler.featureName) {
@@ -139,7 +136,7 @@ export class CorePushNotificationsDelegate {
      * Function called when a push notification is received in foreground (cannot tell when it's received in background).
      * Sends notification to all handlers.
      *
-     * @param {any} notification Notification received.
+     * @param notification Notification received.
      */
     received(notification: any): void {
         this.observables['receive'].next(notification);
@@ -151,8 +148,8 @@ export class CorePushNotificationsDelegate {
      * ...
      * observer.unsuscribe();
      *
-     * @param {string}  eventName Only receive is permitted.
-     * @return {Subject<any>} Observer to subscribe.
+     * @param eventName Only receive is permitted.
+     * @return Observer to subscribe.
      */
     on(eventName: string): Subject<any> {
         if (typeof this.observables[eventName] == 'undefined') {
@@ -168,8 +165,8 @@ export class CorePushNotificationsDelegate {
     /**
      * Register a click handler.
      *
-     * @param {CorePushNotificationsClickHandler} handler The handler to register.
-     * @return {boolean} True if registered successfully, false otherwise.
+     * @param handler The handler to register.
+     * @return True if registered successfully, false otherwise.
      */
     registerClickHandler(handler: CorePushNotificationsClickHandler): boolean {
         if (typeof this.clickHandlers[handler.name] !== 'undefined') {
@@ -187,7 +184,7 @@ export class CorePushNotificationsDelegate {
     /**
      * Register a push notifications handler for update badge counter.
      *
-     * @param {string} name  Handler's name.
+     * @param name Handler's name.
      */
     registerCounterHandler(name: string): void {
         if (typeof this.counterHandlers[name] == 'undefined') {
@@ -201,8 +198,8 @@ export class CorePushNotificationsDelegate {
     /**
      * Check if a counter handler is present.
      *
-     * @param {string} name       Handler's name.
-     * @return {boolean}  If handler name is present.
+     * @param name Handler's name.
+     * @return If handler name is present.
      */
     isCounterHandlerRegistered(name: string): boolean {
         return typeof this.counterHandlers[name] != 'undefined';
@@ -211,7 +208,7 @@ export class CorePushNotificationsDelegate {
     /**
      * Get all counter badge handlers.
      *
-     * @return {any}  with all the handler names.
+     * @return with all the handler names.
      */
     getCounterHandlers(): any {
         return this.counterHandlers;
diff --git a/src/core/pushnotifications/providers/pushnotifications.ts b/src/core/pushnotifications/providers/pushnotifications.ts
index 0985c6b18..8e55142a0 100644
--- a/src/core/pushnotifications/providers/pushnotifications.ts
+++ b/src/core/pushnotifications/providers/pushnotifications.ts
@@ -40,43 +40,36 @@ import { CoreSite } from '@classes/site';
 export interface CorePushNotificationsRegisterData {
     /**
      * App ID.
-     * @type {string}
      */
     appid: string;
 
     /**
      * Device UUID.
-     * @type {string}
      */
     uuid: string;
 
     /**
      * Device name.
-     * @type {string}
      */
     name: string;
 
     /**
      * Device model.
-     * @type {string}
      */
     model: string;
 
     /**
      * Device platform.
-     * @type {string}
      */
     platform: string;
 
     /**
      * Device version.
-     * @type {string}
      */
     version: string;
 
     /**
      * Push ID.
-     * @type {string}
      */
     pushid: string;
 }
@@ -203,7 +196,7 @@ export class CorePushNotificationsProvider {
     /**
      * Check whether the device can be registered in Moodle to receive push notifications.
      *
-     * @return {boolean} Whether the device can be registered in Moodle.
+     * @return Whether the device can be registered in Moodle.
      */
     canRegisterOnMoodle(): boolean {
         return this.pushID && this.appProvider.isMobile();
@@ -212,8 +205,8 @@ export class CorePushNotificationsProvider {
     /**
      * Delete all badge records for a given site.
      *
-     * @param  {string} siteId Site ID.
-     * @return {Promise<any>}  Resolved when done.
+     * @param siteId Site ID.
+     * @return Resolved when done.
      */
     cleanSiteCounters(siteId: string): Promise<any> {
         return this.appDB.deleteRecords(CorePushNotificationsProvider.BADGE_TABLE, {siteid: siteId} ).finally(() => {
@@ -224,7 +217,7 @@ export class CorePushNotificationsProvider {
     /**
      * Create the default push channel. It is used to change the name.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected createDefaultChannel(): Promise<any> {
         if (!this.platform.is('android')) {
@@ -243,8 +236,8 @@ export class CorePushNotificationsProvider {
     /**
      * Enable or disable Firebase analytics.
      *
-     * @param {boolean} enable Whether to enable or disable.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param enable Whether to enable or disable.
+     * @return Promise resolved when done.
      */
     enableAnalytics(enable: boolean): Promise<any> {
         const win = <any> window; // This feature is only present in our fork of the plugin.
@@ -264,7 +257,7 @@ export class CorePushNotificationsProvider {
     /**
      * Returns options for push notifications based on device.
      *
-     * @return {Promise<PushOptions>} Promise with the push options resolved when done.
+     * @return Promise with the push options resolved when done.
      */
     protected getOptions(): Promise<PushOptions> {
         let promise;
@@ -297,7 +290,7 @@ export class CorePushNotificationsProvider {
     /**
      * Get the pushID for this device.
      *
-     * @return {string} Push ID.
+     * @return Push ID.
      */
     getPushId(): string {
         return this.pushID;
@@ -306,7 +299,7 @@ export class CorePushNotificationsProvider {
     /**
      * Get data to register the device in Moodle.
      *
-     * @return {CorePushNotificationsRegisterData} Data.
+     * @return Data.
      */
     protected getRegisterData(): CorePushNotificationsRegisterData {
         return {
@@ -323,8 +316,8 @@ export class CorePushNotificationsProvider {
     /**
      * Get Sitebadge  counter from the database.
      *
-     * @param  {string} siteId Site ID.
-     * @return {Promise<any>}       Promise resolved with the stored badge counter for the site.
+     * @param siteId Site ID.
+     * @return Promise resolved with the stored badge counter for the site.
      */
     getSiteCounter(siteId: string): Promise<any> {
         return this.getAddonBadge(siteId);
@@ -333,10 +326,10 @@ export class CorePushNotificationsProvider {
     /**
      * Log a firebase event.
      *
-     * @param {string} name Name of the event.
-     * @param {any} data Data of the event.
-     * @param {boolean} [filter] Whether to filter the data. This is useful when logging a full notification.
-     * @return {Promise<any>} Promise resolved when done. This promise is never rejected.
+     * @param name Name of the event.
+     * @param data Data of the event.
+     * @param filter Whether to filter the data. This is useful when logging a full notification.
+     * @return Promise resolved when done. This promise is never rejected.
      */
     logEvent(name: string, data: any, filter?: boolean): Promise<any> {
         const win = <any> window; // This feature is only present in our fork of the plugin.
@@ -362,13 +355,13 @@ export class CorePushNotificationsProvider {
     /**
      * Log a firebase view_item event.
      *
-     * @param {number|string} itemId The item ID.
-     * @param {string} itemName The item name.
-     * @param {string} itemCategory The item category.
-     * @param {string} wsName Name of the WS.
-     * @param {any} [data] Other data to pass to the event.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done. This promise is never rejected.
+     * @param itemId The item ID.
+     * @param itemName The item name.
+     * @param itemCategory The item category.
+     * @param wsName Name of the WS.
+     * @param data Other data to pass to the event.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done. This promise is never rejected.
      */
     logViewEvent(itemId: number | string, itemName: string, itemCategory: string, wsName: string, data?: any, siteId?: string)
             : Promise<any> {
@@ -395,11 +388,11 @@ export class CorePushNotificationsProvider {
     /**
      * Log a firebase view_item_list event.
      *
-     * @param {string} itemCategory The item category.
-     * @param {string} wsName Name of the WS.
-     * @param {any} [data] Other data to pass to the event.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done. This promise is never rejected.
+     * @param itemCategory The item category.
+     * @param wsName Name of the WS.
+     * @param data Other data to pass to the event.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done. This promise is never rejected.
      */
     logViewListEvent(itemCategory: string, wsName: string, data?: any, siteId?: string): Promise<any> {
         data = data || {};
@@ -419,7 +412,7 @@ export class CorePushNotificationsProvider {
     /**
      * Function called when a push notification is clicked. Redirect the user to the right state.
      *
-     * @param {any} notification Notification.
+     * @param notification Notification.
      */
     notificationClicked(notification: any): void {
         this.initDelegate.ready().then(() => {
@@ -432,7 +425,7 @@ export class CorePushNotificationsProvider {
      * The app can be in foreground or background,
      * if we are in background this code is executed when we open the app clicking in the notification bar.
      *
-     * @param {any} notification Notification received.
+     * @param notification Notification received.
      */
     onMessageReceived(notification: any): void {
         const data = notification ? notification.additionalData : {};
@@ -510,8 +503,8 @@ export class CorePushNotificationsProvider {
     /**
      * Unregisters a device from a certain Moodle site.
      *
-     * @param {CoreSite} site Site to unregister from.
-     * @return {Promise<any>} Promise resolved when device is unregistered.
+     * @param site Site to unregister from.
+     * @return Promise resolved when device is unregistered.
      */
     unregisterDeviceOnMoodle(site: CoreSite): Promise<any> {
         if (!site || !this.appProvider.isMobile()) {
@@ -564,10 +557,10 @@ export class CorePushNotificationsProvider {
      * Update Counter for an addon. It will update the refered siteId counter and the total badge.
      * It will return the updated addon counter.
      *
-     * @param  {string} addon    Registered addon name to set the badge number.
-     * @param  {number} value    The number to be stored.
-     * @param  {string} [siteId] Site ID. If not defined, use current site.
-     * @return {Promise<any>}    Promise resolved with the stored badge counter for the addon on the site.
+     * @param addon Registered addon name to set the badge number.
+     * @param value The number to be stored.
+     * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with the stored badge counter for the addon on the site.
      */
     updateAddonCounter(addon: string, value: number, siteId?: string): Promise<any> {
         if (this.pushNotificationsDelegate.isCounterHandlerRegistered(addon)) {
@@ -586,7 +579,7 @@ export class CorePushNotificationsProvider {
     /**
      * Update total badge counter of the app.
      *
-     * @return {Promise<any>}        Promise resolved with the stored badge counter for the site.
+     * @return Promise resolved with the stored badge counter for the site.
      */
     updateAppCounter(): Promise<any> {
         return this.sitesProvider.getSitesIds().then((sites) => {
@@ -618,8 +611,8 @@ export class CorePushNotificationsProvider {
      * Update counter for a site using the stored addon data. It will update the total badge application number.
      * It will return the updated site counter.
      *
-     * @param  {string} siteId Site ID.
-     * @return {Promise<any>}       Promise resolved with the stored badge counter for the site.
+     * @param siteId Site ID.
+     * @return Promise resolved with the stored badge counter for the site.
      */
     updateSiteCounter(siteId: string): Promise<any> {
         const addons = this.pushNotificationsDelegate.getCounterHandlers(),
@@ -655,7 +648,7 @@ export class CorePushNotificationsProvider {
     /**
      * Register a device in Apple APNS or Google GCM.
      *
-     * @return {Promise<any>} Promise resolved when the device is registered.
+     * @return Promise resolved when the device is registered.
      */
     registerDevice(): Promise<any> {
         try {
@@ -701,9 +694,9 @@ export class CorePushNotificationsProvider {
     /**
      * Registers a device on a Moodle site if needed.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {boolean} [forceUnregister] Whether to force unregister and register.
-     * @return {Promise<any>} Promise resolved when device is registered.
+     * @param siteId Site ID. If not defined, current site.
+     * @param forceUnregister Whether to force unregister and register.
+     * @return Promise resolved when device is registered.
      */
     registerDeviceOnMoodle(siteId?: string, forceUnregister?: boolean): Promise<any> {
         this.logger.debug('Register device on Moodle.');
@@ -756,9 +749,9 @@ export class CorePushNotificationsProvider {
     /**
      * Get the addon/site badge counter from the database.
      *
-     * @param  {string} siteId   Site ID.
-     * @param  {string} [addon='site'] Registered addon name. If not defined it will store the site total.
-     * @return {Promise<any>}         Promise resolved with the stored badge counter for the addon or site or 0 if none.
+     * @param siteId Site ID.
+     * @param addon Registered addon name. If not defined it will store the site total.
+     * @return Promise resolved with the stored badge counter for the addon or site or 0 if none.
      */
     protected getAddonBadge(siteId?: string, addon: string = 'site'): Promise<any> {
         return this.appDB.getRecord(CorePushNotificationsProvider.BADGE_TABLE, {siteid: siteId, addon: addon}).then((entry) => {
@@ -771,8 +764,8 @@ export class CorePushNotificationsProvider {
     /**
      * Retry pending unregisters.
      *
-     * @param {string} [siteId] If defined, retry only for that site if needed. Otherwise, retry all pending unregisters.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param siteId If defined, retry only for that site if needed. Otherwise, retry all pending unregisters.
+     * @return Promise resolved when done.
      */
     retryUnregisters(siteId?: string): Promise<any> {
         let promise;
@@ -803,10 +796,10 @@ export class CorePushNotificationsProvider {
     /**
      * Save the addon/site badgecounter on the database.
      *
-     * @param  {number} value   The number to be stored.
-     * @param  {string} [siteId] Site ID. If not defined, use current site.
-     * @param  {string} [addon='site'] Registered addon name. If not defined it will store the site total.
-     * @return {Promise<any>}         Promise resolved with the stored badge counter for the addon or site.
+     * @param value The number to be stored.
+     * @param siteId Site ID. If not defined, use current site.
+     * @param addon Registered addon name. If not defined it will store the site total.
+     * @return Promise resolved with the stored badge counter for the addon or site.
      */
     protected saveAddonBadge(value: number, siteId?: string, addon: string = 'site'): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -825,9 +818,9 @@ export class CorePushNotificationsProvider {
     /**
      * Check if device should be registered (and unregistered first).
      *
-     * @param {CorePushNotificationsRegisterData} data Data of the device.
-     * @param {CoreSite} site Site to use.
-     * @return {Promise<{register: boolean, unregister: boolean}>} Promise resolved with booleans: whether to register/unregister.
+     * @param data Data of the device.
+     * @param site Site to use.
+     * @return Promise resolved with booleans: whether to register/unregister.
      */
     protected shouldRegister(data: CorePushNotificationsRegisterData, site: CoreSite)
             : Promise<{register: boolean, unregister: boolean}> {
diff --git a/src/core/pushnotifications/providers/register-cron-handler.ts b/src/core/pushnotifications/providers/register-cron-handler.ts
index e2bc48b2c..ea03c062f 100644
--- a/src/core/pushnotifications/providers/register-cron-handler.ts
+++ b/src/core/pushnotifications/providers/register-cron-handler.ts
@@ -28,7 +28,7 @@ export class CorePushNotificationsRegisterCronHandler implements CoreCronHandler
     /**
      * Check whether the sync can be executed manually. Call isSync if not defined.
      *
-     * @return {boolean} Whether the sync can be executed manually.
+     * @return Whether the sync can be executed manually.
      */
     canManualSync(): boolean {
         return true; // Execute the handler when the site is manually synchronized.
@@ -38,8 +38,8 @@ export class CorePushNotificationsRegisterCronHandler implements CoreCronHandler
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @return {Promise<any>}         Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string): Promise<any> {
         if (!siteId || !this.pushNotificationsProvider.canRegisterOnMoodle()) {
@@ -54,7 +54,7 @@ export class CorePushNotificationsRegisterCronHandler implements CoreCronHandler
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return 86400000; // 1 day. We won't do anything with automatic execution, so use a big number.
@@ -63,7 +63,7 @@ export class CorePushNotificationsRegisterCronHandler implements CoreCronHandler
     /**
      * Check whether it's a synchronization process or not. True if not defined.
      *
-     * @return {boolean} Whether it's a synchronization process or not.
+     * @return Whether it's a synchronization process or not.
      */
     isSync(): boolean {
         return false;
diff --git a/src/core/pushnotifications/providers/unregister-cron-handler.ts b/src/core/pushnotifications/providers/unregister-cron-handler.ts
index f533efaa0..a2c87c179 100644
--- a/src/core/pushnotifications/providers/unregister-cron-handler.ts
+++ b/src/core/pushnotifications/providers/unregister-cron-handler.ts
@@ -29,8 +29,8 @@ export class CorePushNotificationsUnregisterCronHandler implements CoreCronHandl
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param  {string} [siteId] ID of the site affected, undefined for all sites.
-     * @return {Promise<any>} Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string): Promise<any> {
         return this.pushNotificationsProvider.retryUnregisters(siteId);
@@ -39,7 +39,7 @@ export class CorePushNotificationsUnregisterCronHandler implements CoreCronHandl
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return 300000;
diff --git a/src/core/question/classes/base-behaviour-handler.ts b/src/core/question/classes/base-behaviour-handler.ts
index 8da0309ac..88bf3ed61 100644
--- a/src/core/question/classes/base-behaviour-handler.ts
+++ b/src/core/question/classes/base-behaviour-handler.ts
@@ -31,11 +31,11 @@ export class CoreQuestionBehaviourBaseHandler implements CoreQuestionBehaviourHa
     /**
      * Determine a question new state based on its answer(s).
      *
-     * @param {string} component Component the question belongs to.
-     * @param {number} attemptId Attempt ID the question belongs to.
-     * @param {any} question The question.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {CoreQuestionState|Promise<CoreQuestionState>} New state (or promise resolved with state).
+     * @param component Component the question belongs to.
+     * @param attemptId Attempt ID the question belongs to.
+     * @param question The question.
+     * @param siteId Site ID. If not defined, current site.
+     * @return New state (or promise resolved with state).
      */
     determineNewState(component: string, attemptId: number, question: any, siteId?: string)
             : CoreQuestionState | Promise<CoreQuestionState> {
@@ -48,10 +48,10 @@ export class CoreQuestionBehaviourBaseHandler implements CoreQuestionBehaviourHa
      * If the behaviour requires a submit button, it should add it to question.behaviourButtons.
      * If the behaviour requires to show some extra data, it should return the components to render it.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question.
-     * @return {any[]|Promise<any[]>} Components (or promise resolved with components) to render some extra data in the question
-     *                                (e.g. certainty options). Don't return anything if no extra data is required.
+     * @param injector Injector.
+     * @param question The question.
+     * @return Components (or promise resolved with components) to render some extra data in the question
+     *         (e.g. certainty options). Don't return anything if no extra data is required.
      */
     handleQuestion(injector: Injector, question: any): any[] | Promise<any[]> {
         // Nothing to do.
@@ -61,7 +61,7 @@ export class CoreQuestionBehaviourBaseHandler implements CoreQuestionBehaviourHa
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/core/question/classes/base-question-component.ts b/src/core/question/classes/base-question-component.ts
index c36375f8b..4d3275fc9 100644
--- a/src/core/question/classes/base-question-component.ts
+++ b/src/core/question/classes/base-question-component.ts
@@ -49,7 +49,7 @@ export class CoreQuestionBaseComponent {
     /**
      * Initialize a question component of type calculated or calculated simple.
      *
-     * @return {void|HTMLElement} Element containing the question HTML, void if the data is not valid.
+     * @return Element containing the question HTML, void if the data is not valid.
      */
     initCalculatedComponent(): void | HTMLElement {
         // Treat the input text first.
@@ -165,7 +165,7 @@ export class CoreQuestionBaseComponent {
     /**
      * Initialize the component and the question text.
      *
-     * @return {void|HTMLElement} Element containing the question HTML, void if the data is not valid.
+     * @return Element containing the question HTML, void if the data is not valid.
      */
     initComponent(): void | HTMLElement {
         if (!this.question) {
@@ -192,7 +192,7 @@ export class CoreQuestionBaseComponent {
     /**
      * Initialize a question component of type essay.
      *
-     * @return {void|HTMLElement} Element containing the question HTML, void if the data is not valid.
+     * @return Element containing the question HTML, void if the data is not valid.
      */
     initEssayComponent(): void | HTMLElement {
         const questionEl = this.initComponent();
@@ -234,8 +234,8 @@ export class CoreQuestionBaseComponent {
     /**
      * Initialize a question component that uses the original question text with some basic treatment.
      *
-     * @param {string} contentSelector The selector to find the question content (text).
-     * @return {void|HTMLElement} Element containing the question HTML, void if the data is not valid.
+     * @param contentSelector The selector to find the question content (text).
+     * @return Element containing the question HTML, void if the data is not valid.
      */
     initOriginalTextComponent(contentSelector: string): void | HTMLElement {
         if (!this.question) {
@@ -272,7 +272,7 @@ export class CoreQuestionBaseComponent {
     /**
      * Initialize a question component that has an input of type "text".
      *
-     * @return {void|HTMLElement} Element containing the question HTML, void if the data is not valid.
+     * @return Element containing the question HTML, void if the data is not valid.
      */
     initInputTextComponent(): void | HTMLElement {
         const questionEl = this.initComponent();
@@ -329,7 +329,7 @@ export class CoreQuestionBaseComponent {
     /**
      * Initialize a question component with a "match" behaviour.
      *
-     * @return {void|HTMLElement} Element containing the question HTML, void if the data is not valid.
+     * @return Element containing the question HTML, void if the data is not valid.
      */
     initMatchComponent(): void | HTMLElement {
         const questionEl = this.initComponent();
@@ -421,7 +421,7 @@ export class CoreQuestionBaseComponent {
     /**
      * Initialize a question component with a multiple choice (checkbox) or single choice (radio).
      *
-     * @return {void|HTMLElement} Element containing the question HTML, void if the data is not valid.
+     * @return Element containing the question HTML, void if the data is not valid.
      */
     initMultichoiceComponent(): void | HTMLElement {
         const questionEl = this.initComponent();
diff --git a/src/core/question/classes/base-question-handler.ts b/src/core/question/classes/base-question-handler.ts
index e7782c2fb..5cc31dde5 100644
--- a/src/core/question/classes/base-question-handler.ts
+++ b/src/core/question/classes/base-question-handler.ts
@@ -32,7 +32,7 @@ export class CoreQuestionBaseHandler implements CoreQuestionHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -42,9 +42,9 @@ export class CoreQuestionBaseHandler implements CoreQuestionHandler {
      * Return the Component to use to display the question.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param question The question to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, question: any): any | Promise<any> {
         // There is no default component for questions.
@@ -54,9 +54,9 @@ export class CoreQuestionBaseHandler implements CoreQuestionHandler {
      * Return the name of the behaviour to use for the question.
      * If the question should use the default behaviour you shouldn't implement this function.
      *
-     * @param {any} question The question.
-     * @param {string} behaviour The default behaviour.
-     * @return {string} The behaviour to use.
+     * @param question The question.
+     * @param behaviour The default behaviour.
+     * @return The behaviour to use.
      */
     getBehaviour(question: any, behaviour: string): string {
         return behaviour;
@@ -66,8 +66,8 @@ export class CoreQuestionBaseHandler implements CoreQuestionHandler {
      * Check if a question can be submitted.
      * If a question cannot be submitted it should return a message explaining why (translated or not).
      *
-     * @param {any} question The question.
-     * @return {string} Prevent submit message. Undefined or empty if can be submitted.
+     * @param question The question.
+     * @return Prevent submit message. Undefined or empty if can be submitted.
      */
     getPreventSubmitMessage(question: any): string {
         // Never prevent by default.
@@ -77,9 +77,9 @@ export class CoreQuestionBaseHandler implements CoreQuestionHandler {
     /**
      * Check if a response is complete.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if complete, 0 if not complete, -1 if cannot determine.
      */
     isCompleteResponse(question: any, answers: any): number {
         return -1;
@@ -89,9 +89,9 @@ export class CoreQuestionBaseHandler implements CoreQuestionHandler {
      * Check if a student has provided enough of an answer for the question to be graded automatically,
      * or whether it must be considered aborted.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if gradable, 0 if not gradable, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if gradable, 0 if not gradable, -1 if cannot determine.
      */
     isGradableResponse(question: any, answers: any): number {
         return -1;
@@ -100,10 +100,10 @@ export class CoreQuestionBaseHandler implements CoreQuestionHandler {
     /**
      * Check if two responses are the same.
      *
-     * @param {any} question Question.
-     * @param {any} prevAnswers Object with the previous question answers.
-     * @param {any} newAnswers Object with the new question answers.
-     * @return {boolean} Whether they're the same.
+     * @param question Question.
+     * @param prevAnswers Object with the previous question answers.
+     * @param newAnswers Object with the new question answers.
+     * @return Whether they're the same.
      */
     isSameResponse(question: any, prevAnswers: any, newAnswers: any): boolean {
         return false;
@@ -112,11 +112,11 @@ export class CoreQuestionBaseHandler implements CoreQuestionHandler {
     /**
      * Prepare and add to answers the data to send to server based in the input. Return promise if async.
      *
-     * @param {any} question Question.
-     * @param {any} answers The answers retrieved from the form. Prepared answers must be stored in this object.
-     * @param {boolean} [offline] Whether the data should be saved in offline.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} Return a promise resolved when done if async, void if sync.
+     * @param question Question.
+     * @param answers The answers retrieved from the form. Prepared answers must be stored in this object.
+     * @param offline Whether the data should be saved in offline.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Return a promise resolved when done if async, void if sync.
      */
     prepareAnswers(question: any, answers: any, offline: boolean, siteId?: string): void | Promise<any> {
         // Nothing to do.
@@ -126,9 +126,9 @@ export class CoreQuestionBaseHandler implements CoreQuestionHandler {
      * Validate if an offline sequencecheck is valid compared with the online one.
      * This function only needs to be implemented if a specific compare is required.
      *
-     * @param {any} question The question.
-     * @param {string} offlineSequenceCheck Sequence check stored in offline.
-     * @return {boolean} Whether sequencecheck is valid.
+     * @param question The question.
+     * @param offlineSequenceCheck Sequence check stored in offline.
+     * @return Whether sequencecheck is valid.
      */
     validateSequenceCheck(question: any, offlineSequenceCheck: string): boolean {
         return question.sequencecheck == offlineSequenceCheck;
diff --git a/src/core/question/components/question/question.ts b/src/core/question/components/question/question.ts
index 11b276ce4..8d1ee9f1c 100644
--- a/src/core/question/components/question/question.ts
+++ b/src/core/question/components/question/question.ts
@@ -156,7 +156,7 @@ export class CoreQuestionComponent implements OnInit {
     /**
      * Update the sequence check of the question.
      *
-     * @param {any} sequenceChecks Object with sequence checks. The keys are the question slot.
+     * @param sequenceChecks Object with sequence checks. The keys are the question slot.
      */
     updateSequenceCheck(sequenceChecks: any): void {
         if (sequenceChecks[this.question.slot]) {
diff --git a/src/core/question/providers/behaviour-delegate.ts b/src/core/question/providers/behaviour-delegate.ts
index 9333e87f9..77ee65506 100644
--- a/src/core/question/providers/behaviour-delegate.ts
+++ b/src/core/question/providers/behaviour-delegate.ts
@@ -27,18 +27,17 @@ import { CoreQuestionBehaviourDefaultHandler } from './default-behaviour-handler
 export interface CoreQuestionBehaviourHandler extends CoreDelegateHandler {
     /**
      * Type of the behaviour the handler supports. E.g. 'adaptive'.
-     * @type {string}
      */
     type: string;
 
     /**
      * Determine a question new state based on its answer(s).
      *
-     * @param {string} component Component the question belongs to.
-     * @param {number} attemptId Attempt ID the question belongs to.
-     * @param {any} question The question.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {CoreQuestionState|Promise<CoreQuestionState>} State (or promise resolved with state).
+     * @param component Component the question belongs to.
+     * @param attemptId Attempt ID the question belongs to.
+     * @param question The question.
+     * @param siteId Site ID. If not defined, current site.
+     * @return State (or promise resolved with state).
      */
     determineNewState?(component: string, attemptId: number, question: any, siteId?: string)
         : CoreQuestionState | Promise<CoreQuestionState>;
@@ -48,10 +47,10 @@ export interface CoreQuestionBehaviourHandler extends CoreDelegateHandler {
      * If the behaviour requires a submit button, it should add it to question.behaviourButtons.
      * If the behaviour requires to show some extra data, it should return the components to render it.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question.
-     * @return {any[]|Promise<any[]>} Components (or promise resolved with components) to render some extra data in the question
-     *                                (e.g. certainty options). Don't return anything if no extra data is required.
+     * @param injector Injector.
+     * @param question The question.
+     * @return Components (or promise resolved with components) to render some extra data in the question
+     *         (e.g. certainty options). Don't return anything if no extra data is required.
      */
     handleQuestion?(injector: Injector, question: any): any[] | Promise<any[]>;
 }
@@ -72,11 +71,11 @@ export class CoreQuestionBehaviourDelegate extends CoreDelegate {
     /**
      * Determine a question new state based on its answer(s).
      *
-     * @param {string} component Component the question belongs to.
-     * @param {number} attemptId Attempt ID the question belongs to.
-     * @param {any} question The question.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<CoreQuestionState>} Promise resolved with state.
+     * @param component Component the question belongs to.
+     * @param attemptId Attempt ID the question belongs to.
+     * @param question The question.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with state.
      */
     determineNewState(behaviour: string, component: string, attemptId: number, question: any, siteId?: string)
             : Promise<CoreQuestionState> {
@@ -91,10 +90,10 @@ export class CoreQuestionBehaviourDelegate extends CoreDelegate {
      * If the behaviour requires a submit button, it should add it to question.behaviourButtons.
      * If the behaviour requires to show some extra data, it should return a directive to render it.
      *
-     * @param {Injector} injector Injector.
-     * @param {string} behaviour Default behaviour.
-     * @param {any} question The question.
-     * @return {Promise<any[]>} Promise resolved with components to render some extra data in the question.
+     * @param injector Injector.
+     * @param behaviour Default behaviour.
+     * @param question The question.
+     * @return Promise resolved with components to render some extra data in the question.
      */
     handleQuestion(injector: Injector, behaviour: string, question: any): Promise<any[]> {
         behaviour = this.questionDelegate.getBehaviourForQuestion(question, behaviour);
@@ -105,8 +104,8 @@ export class CoreQuestionBehaviourDelegate extends CoreDelegate {
     /**
      * Check if a question behaviour is supported.
      *
-     * @param {string} behaviour Name of the behaviour.
-     * @return {boolean} Whether it's supported.
+     * @param behaviour Name of the behaviour.
+     * @return Whether it's supported.
      */
     isBehaviourSupported(behaviour: string): boolean {
         return this.hasHandler(behaviour, true);
diff --git a/src/core/question/providers/delegate.ts b/src/core/question/providers/delegate.ts
index 3dc33326d..5c78d4e95 100644
--- a/src/core/question/providers/delegate.ts
+++ b/src/core/question/providers/delegate.ts
@@ -25,7 +25,6 @@ import { CoreQuestionDefaultHandler } from './default-question-handler';
 export interface CoreQuestionHandler extends CoreDelegateHandler {
     /**
      * Type of the question the handler supports. E.g. 'qtype_calculated'.
-     * @type {string}
      */
     type: string;
 
@@ -33,9 +32,9 @@ export interface CoreQuestionHandler extends CoreDelegateHandler {
      * Return the Component to use to display the question.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param question The question to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, question: any): any | Promise<any>;
 
@@ -43,9 +42,9 @@ export interface CoreQuestionHandler extends CoreDelegateHandler {
      * Return the name of the behaviour to use for the question.
      * If the question should use the default behaviour you shouldn't implement this function.
      *
-     * @param {any} question The question.
-     * @param {string} behaviour The default behaviour.
-     * @return {string} The behaviour to use.
+     * @param question The question.
+     * @param behaviour The default behaviour.
+     * @return The behaviour to use.
      */
     getBehaviour?(question: any, behaviour: string): string;
 
@@ -53,17 +52,17 @@ export interface CoreQuestionHandler extends CoreDelegateHandler {
      * Check if a question can be submitted.
      * If a question cannot be submitted it should return a message explaining why (translated or not).
      *
-     * @param {any} question The question.
-     * @return {string} Prevent submit message. Undefined or empty if can be submitted.
+     * @param question The question.
+     * @return Prevent submit message. Undefined or empty if can be submitted.
      */
     getPreventSubmitMessage?(question: any): string;
 
     /**
      * Check if a response is complete.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if complete, 0 if not complete, -1 if cannot determine.
      */
     isCompleteResponse?(question: any, answers: any): number;
 
@@ -71,30 +70,30 @@ export interface CoreQuestionHandler extends CoreDelegateHandler {
      * Check if a student has provided enough of an answer for the question to be graded automatically,
      * or whether it must be considered aborted.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if gradable, 0 if not gradable, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if gradable, 0 if not gradable, -1 if cannot determine.
      */
     isGradableResponse?(question: any, answers: any): number;
 
     /**
      * Check if two responses are the same.
      *
-     * @param {any} question Question.
-     * @param {any} prevAnswers Object with the previous question answers.
-     * @param {any} newAnswers Object with the new question answers.
-     * @return {boolean} Whether they're the same.
+     * @param question Question.
+     * @param prevAnswers Object with the previous question answers.
+     * @param newAnswers Object with the new question answers.
+     * @return Whether they're the same.
      */
     isSameResponse?(question: any, prevAnswers: any, newAnswers: any): boolean;
 
     /**
      * Prepare and add to answers the data to send to server based in the input. Return promise if async.
      *
-     * @param {any} question Question.
-     * @param {any} answers The answers retrieved from the form. Prepared answers must be stored in this object.
-     * @param {boolean} [offline] Whether the data should be saved in offline.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} Return a promise resolved when done if async, void if sync.
+     * @param question Question.
+     * @param answers The answers retrieved from the form. Prepared answers must be stored in this object.
+     * @param offline Whether the data should be saved in offline.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Return a promise resolved when done if async, void if sync.
      */
     prepareAnswers?(question: any, answers: any, offline: boolean, siteId?: string): void | Promise<any>;
 
@@ -102,18 +101,18 @@ export interface CoreQuestionHandler extends CoreDelegateHandler {
      * Validate if an offline sequencecheck is valid compared with the online one.
      * This function only needs to be implemented if a specific compare is required.
      *
-     * @param {any} question The question.
-     * @param {string} offlineSequenceCheck Sequence check stored in offline.
-     * @return {boolean} Whether sequencecheck is valid.
+     * @param question The question.
+     * @param offlineSequenceCheck Sequence check stored in offline.
+     * @return Whether sequencecheck is valid.
      */
     validateSequenceCheck?(question: any, offlineSequenceCheck: string): boolean;
 
     /**
      * Get the list of files that needs to be downloaded in addition to the files embedded in the HTML.
      *
-     * @param {any} question Question.
-     * @param {number} usageId Usage ID.
-     * @return {string[]} List of URLs.
+     * @param question Question.
+     * @param usageId Usage ID.
+     * @return List of URLs.
      */
     getAdditionalDownloadableFiles?(question: any, usageId: number): string[];
 }
@@ -135,9 +134,9 @@ export class CoreQuestionDelegate extends CoreDelegate {
      * Get the behaviour to use for a certain question type.
      * E.g. 'qtype_essay' uses 'manualgraded'.
      *
-     * @param {any} question The question.
-     * @param {string} behaviour The default behaviour.
-     * @return {string} The behaviour to use.
+     * @param question The question.
+     * @param behaviour The default behaviour.
+     * @return The behaviour to use.
      */
     getBehaviourForQuestion(question: any, behaviour: string): string {
         const type = this.getTypeName(question),
@@ -149,9 +148,9 @@ export class CoreQuestionDelegate extends CoreDelegate {
     /**
      * Get the directive to use for a certain question type.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question to render.
-     * @return {Promise<any>} Promise resolved with component to use, undefined if not found.
+     * @param injector Injector.
+     * @param question The question to render.
+     * @return Promise resolved with component to use, undefined if not found.
      */
     getComponentForQuestion(injector: Injector, question: any): Promise<any> {
         const type = this.getTypeName(question);
@@ -163,8 +162,8 @@ export class CoreQuestionDelegate extends CoreDelegate {
      * Check if a question can be submitted.
      * If a question cannot be submitted it should return a message explaining why (translated or not).
      *
-     * @param {any} question Question.
-     * @return {string} Prevent submit message. Undefined or empty if can be submitted.
+     * @param question Question.
+     * @return Prevent submit message. Undefined or empty if can be submitted.
      */
     getPreventSubmitMessage(question: any): string {
         const type = this.getTypeName(question);
@@ -175,8 +174,8 @@ export class CoreQuestionDelegate extends CoreDelegate {
     /**
      * Given a type name, return the full name of that type. E.g. 'calculated' -> 'qtype_calculated'.
      *
-     * @param {string} type Type to treat.
-     * @return {string} Type full name.
+     * @param type Type to treat.
+     * @return Type full name.
      */
     protected getFullTypeName(type: string): string {
         return 'qtype_' + type;
@@ -185,8 +184,8 @@ export class CoreQuestionDelegate extends CoreDelegate {
     /**
      * Given a question, return the full name of its question type.
      *
-     * @param {any} question Question.
-     * @return {string} Type name.
+     * @param question Question.
+     * @return Type name.
      */
     protected getTypeName(question: any): string {
         return this.getFullTypeName(question.type);
@@ -195,9 +194,9 @@ export class CoreQuestionDelegate extends CoreDelegate {
     /**
      * Check if a response is complete.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if complete, 0 if not complete, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if complete, 0 if not complete, -1 if cannot determine.
      */
     isCompleteResponse(question: any, answers: any): number {
         const type = this.getTypeName(question);
@@ -209,9 +208,9 @@ export class CoreQuestionDelegate extends CoreDelegate {
      * Check if a student has provided enough of an answer for the question to be graded automatically,
      * or whether it must be considered aborted.
      *
-     * @param {any} question The question.
-     * @param {any} answers Object with the question answers (without prefix).
-     * @return {number} 1 if gradable, 0 if not gradable, -1 if cannot determine.
+     * @param question The question.
+     * @param answers Object with the question answers (without prefix).
+     * @return 1 if gradable, 0 if not gradable, -1 if cannot determine.
      */
     isGradableResponse(question: any, answers: any): number {
         const type = this.getTypeName(question);
@@ -222,10 +221,10 @@ export class CoreQuestionDelegate extends CoreDelegate {
     /**
      * Check if two responses are the same.
      *
-     * @param {any} question Question.
-     * @param {any} prevAnswers Object with the previous question answers.
-     * @param {any} newAnswers Object with the new question answers.
-     * @return {boolean} Whether they're the same.
+     * @param question Question.
+     * @param prevAnswers Object with the previous question answers.
+     * @param newAnswers Object with the new question answers.
+     * @return Whether they're the same.
      */
     isSameResponse(question: any, prevAnswers: any, newAnswers: any): boolean {
         const type = this.getTypeName(question);
@@ -236,8 +235,8 @@ export class CoreQuestionDelegate extends CoreDelegate {
     /**
      * Check if a question type is supported.
      *
-     * @param {string} type Question type.
-     * @return {boolean} Whether it's supported.
+     * @param type Question type.
+     * @return Whether it's supported.
      */
     isQuestionSupported(type: string): boolean {
         return this.hasHandler(this.getFullTypeName(type), true);
@@ -246,11 +245,11 @@ export class CoreQuestionDelegate extends CoreDelegate {
     /**
      * Prepare the answers for a certain question.
      *
-     * @param {any} question Question.
-     * @param {any} answers The answers retrieved from the form. Prepared answers must be stored in this object.
-     * @param {boolean} [offline] Whether the data should be saved in offline.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when data has been prepared.
+     * @param question Question.
+     * @param answers The answers retrieved from the form. Prepared answers must be stored in this object.
+     * @param offline Whether the data should be saved in offline.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when data has been prepared.
      */
     prepareAnswersForQuestion(question: any, answers: any, offline: boolean, siteId?: string): Promise<any> {
         const type = this.getTypeName(question);
@@ -261,9 +260,9 @@ export class CoreQuestionDelegate extends CoreDelegate {
     /**
      * Validate if an offline sequencecheck is valid compared with the online one.
      *
-     * @param {any} question The question.
-     * @param {string} offlineSequenceCheck Sequence check stored in offline.
-     * @return {boolean} Whether sequencecheck is valid.
+     * @param question The question.
+     * @param offlineSequenceCheck Sequence check stored in offline.
+     * @return Whether sequencecheck is valid.
      */
     validateSequenceCheck(question: any, offlineSequenceCheck: string): boolean {
         const type = this.getTypeName(question);
@@ -274,9 +273,9 @@ export class CoreQuestionDelegate extends CoreDelegate {
     /**
      * Get the list of files that needs to be downloaded in addition to the files embedded in the HTML.
      *
-     * @param {any} question Question.
-     * @param {number} usageId Usage ID.
-     * @return {string[]} List of URLs.
+     * @param question Question.
+     * @param usageId Usage ID.
+     * @return List of URLs.
      */
     getAdditionalDownloadableFiles(question: any, usageId: number): string[] {
         const type = this.getTypeName(question);
diff --git a/src/core/question/providers/helper.ts b/src/core/question/providers/helper.ts
index e564a97d8..b69929f1e 100644
--- a/src/core/question/providers/helper.ts
+++ b/src/core/question/providers/helper.ts
@@ -38,8 +38,8 @@ export class CoreQuestionHelperProvider {
     /**
      * Add a behaviour button to the question's "behaviourButtons" property.
      *
-     * @param {any} question Question.
-     * @param {HTMLInputElement} button Behaviour button (DOM element).
+     * @param question Question.
+     * @param button Behaviour button (DOM element).
      */
     protected addBehaviourButton(question: any, button: HTMLInputElement): void {
         if (!button || !question) {
@@ -63,8 +63,8 @@ export class CoreQuestionHelperProvider {
      * Extract question behaviour submit buttons from the question's HTML and add them to "behaviourButtons" property.
      * The buttons aren't deleted from the content because all the im-controls block will be removed afterwards.
      *
-     * @param {any} question Question to treat.
-     * @param {string} [selector] Selector to search the buttons. By default, '.im-controls input[type="submit"]'.
+     * @param question Question to treat.
+     * @param selector Selector to search the buttons. By default, '.im-controls input[type="submit"]'.
      */
     extractQbehaviourButtons(question: any, selector?: string): void {
         if (this.questionDelegate.getPreventSubmitMessage(question)) {
@@ -89,8 +89,8 @@ export class CoreQuestionHelperProvider {
      * The value of the selected option is stored in question.behaviourCertaintySelected.
      * We don't remove them from HTML because the whole im-controls block will be removed afterwards.
      *
-     * @param {any} question Question to treat.
-     * @return {boolean} Wether the certainty is found.
+     * @param question Question to treat.
+     * @return Wether the certainty is found.
      */
     extractQbehaviourCBM(question: any): boolean {
         const element = this.domUtils.convertToElement(question.html);
@@ -128,7 +128,7 @@ export class CoreQuestionHelperProvider {
      * Check if the question has a redo button and, if so, add it to "behaviourButtons" property
      * and remove it from the HTML.
      *
-     * @param {any} question Question to treat.
+     * @param question Question to treat.
      */
     extractQbehaviourRedoButton(question: any): void {
         // Create a fake div element so we can search using querySelector.
@@ -156,8 +156,8 @@ export class CoreQuestionHelperProvider {
      * Check if the question contains a "seen" input.
      * If so, add the name and value to a "behaviourSeenInput" property and remove the input.
      *
-     * @param {any} question Question to treat.
-     * @return {boolean} Whether the seen input is found.
+     * @param question Question to treat.
+     * @return Whether the seen input is found.
      */
     extractQbehaviourSeenInput(question: any): boolean {
         const element = this.domUtils.convertToElement(question.html);
@@ -182,7 +182,7 @@ export class CoreQuestionHelperProvider {
     /**
      * Removes the comment from the question HTML code and adds it in a new "commentHtml" property.
      *
-     * @param {any} question Question.
+     * @param question Question.
      */
     extractQuestionComment(question: any): void {
         this.extractQuestionLastElementNotInContent(question, '.comment', 'commentHtml');
@@ -191,7 +191,7 @@ export class CoreQuestionHelperProvider {
     /**
      * Removes the feedback from the question HTML code and adds it in a new "feedbackHtml" property.
      *
-     * @param {any} question Question.
+     * @param question Question.
      */
     extractQuestionFeedback(question: any): void {
         this.extractQuestionLastElementNotInContent(question, '.outcome', 'feedbackHtml');
@@ -200,8 +200,8 @@ export class CoreQuestionHelperProvider {
     /**
      * Extracts the info box from a question and add it to an "infoHtml" property.
      *
-     * @param {any} question Question.
-     * @param {string} selector Selector to search the element.
+     * @param question Question.
+     * @param selector Selector to search the element.
      */
     extractQuestionInfoBox(question: any, selector: string): void {
         this.extractQuestionLastElementNotInContent(question, selector, 'infoHtml');
@@ -211,9 +211,9 @@ export class CoreQuestionHelperProvider {
      * Searches the last occurrence of a certain element and check it's not in the question contents.
      * If found, removes it from the question HTML and adds it to a new property inside question.
      *
-     * @param {any} question Question.
-     * @param {string} selector Selector to search the element.
-     * @param {string} attrName Name of the attribute to store the HTML in.
+     * @param question Question.
+     * @param selector Selector to search the element.
+     * @param attrName Name of the attribute to store the HTML in.
      */
     protected extractQuestionLastElementNotInContent(question: any, selector: string, attrName: string): void {
         const element = this.domUtils.convertToElement(question.html);
@@ -241,8 +241,8 @@ export class CoreQuestionHelperProvider {
      * Removes the scripts from a question's HTML and adds it in a new 'scriptsCode' property.
      * It will also search for init_question functions of the question type and add the object to an 'initObjects' property.
      *
-     * @param {any} question Question.
-     * @param {number} usageId Usage ID.
+     * @param question Question.
+     * @param usageId Usage ID.
      */
     extractQuestionScripts(question: any, usageId: number): void {
         question.scriptsCode = '';
@@ -292,8 +292,8 @@ export class CoreQuestionHelperProvider {
      * This function will return an object where the keys are the input names. The values will always be true.
      * This is in order to make this function compatible with other functions like CoreQuestionProvider.getBasicAnswers.
      *
-     * @param {string} html HTML code.
-     * @return {any} Object where the keys are the names.
+     * @param html HTML code.
+     * @return Object where the keys are the names.
      */
     getAllInputNamesFromHtml(html: string): any {
         const element = this.domUtils.convertToElement('<form>' + html + '</form>'),
@@ -319,8 +319,8 @@ export class CoreQuestionHelperProvider {
      * Retrieve the answers entered in a form.
      * We don't use ngModel because it doesn't detect changes done by JavaScript and some questions might do that.
      *
-     * @param {HTMLFormElement} form Form.
-     * @return {any} Object with the answers.
+     * @param form Form.
+     * @return Object with the answers.
      */
     getAnswersFromForm(form: HTMLFormElement): any {
         if (!form || !form.elements) {
@@ -358,8 +358,8 @@ export class CoreQuestionHelperProvider {
      * Please take into account that this function will treat all the anchors in the HTML, you should provide
      * an HTML containing only the attachments anchors.
      *
-     * @param  {String} html HTML code to search in.
-     * @return {Object[]}    Attachments.
+     * @param html HTML code to search in.
+     * @return Attachments.
      */
     getQuestionAttachmentsFromHtml(html: string): any[] {
         const element = this.domUtils.convertToElement(html);
@@ -390,8 +390,8 @@ export class CoreQuestionHelperProvider {
     /**
      * Get the sequence check from a question HTML.
      *
-     * @param {string} html Question's HTML.
-     * @return {{name: string, value: string}} Object with the sequencecheck name and value.
+     * @param html Question's HTML.
+     * @return Object with the sequencecheck name and value.
      */
     getQuestionSequenceCheckFromHtml(html: string): {name: string, value: string} {
         if (html) {
@@ -411,8 +411,8 @@ export class CoreQuestionHelperProvider {
     /**
      * Get the CSS class for a question based on its state.
      *
-     * @param {string} name Question's state name.
-     * @return {string} State class.
+     * @param name Question's state name.
+     * @return State class.
      */
     getQuestionStateClass(name: string): string {
         const state = this.questionProvider.getState(name);
@@ -423,8 +423,8 @@ export class CoreQuestionHelperProvider {
     /**
      * Get the validation error message from a question HTML if it's there.
      *
-     * @param {string} html Question's HTML.
-     * @return {string} Validation error message if present.
+     * @param html Question's HTML.
+     * @return Validation error message if present.
      */
     getValidationErrorFromHtml(html: string): string {
         const element = this.domUtils.convertToElement(html);
@@ -435,8 +435,8 @@ export class CoreQuestionHelperProvider {
     /**
      * Check if some HTML contains draft file URLs for the current site.
      *
-     * @param {string} html Question's HTML.
-     * @return {boolean} Whether it contains draft files URLs.
+     * @param html Question's HTML.
+     * @return Whether it contains draft files URLs.
      */
     hasDraftFileUrls(html: string): boolean {
         let url = this.sitesProvider.getCurrentSite().getURL();
@@ -452,7 +452,7 @@ export class CoreQuestionHelperProvider {
      * For each input element found in the HTML, search if there's a local answer stored and
      * override the HTML's value with the local one.
      *
-     * @param {any} question Question.
+     * @param question Question.
      */
     loadLocalAnswersInHtml(question: any): void {
         const element = this.domUtils.convertToElement('<form>' + question.html + '</form>'),
@@ -507,12 +507,12 @@ export class CoreQuestionHelperProvider {
     /**
      * Prefetch the files in a question HTML.
      *
-     * @param {any} question Question.
-     * @param {string} [component] The component to link the files to. If not defined, question component.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component. If not defined, question ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [usageId] Usage ID. Required in Moodle 3.7+.
-     * @return {Promise<any>} Promise resolved when all the files have been downloaded.
+     * @param question Question.
+     * @param component The component to link the files to. If not defined, question component.
+     * @param componentId An ID to use in conjunction with the component. If not defined, question ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param usageId Usage ID. Required in Moodle 3.7+.
+     * @return Promise resolved when all the files have been downloaded.
      */
     prefetchQuestionFiles(question: any, component?: string, componentId?: string | number, siteId?: string, usageId?: number)
             : Promise<any> {
@@ -548,11 +548,11 @@ export class CoreQuestionHelperProvider {
     /**
      * Prepare and return the answers.
      *
-     * @param {any[]} questions The list of questions.
-     * @param {any} answers The input data.
-     * @param {boolean} offline True if data should be saved in offline.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with answers to send to server.
+     * @param questions The list of questions.
+     * @param answers The input data.
+     * @param offline True if data should be saved in offline.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with answers to send to server.
      */
     prepareAnswers(questions: any[], answers: any, offline?: boolean, siteId?: string): Promise<any> {
         const promises = [];
@@ -570,7 +570,7 @@ export class CoreQuestionHelperProvider {
     /**
      * Replace Moodle's correct/incorrect classes with the Mobile ones.
      *
-     * @param {HTMLElement} element DOM element.
+     * @param element DOM element.
      */
     replaceCorrectnessClasses(element: HTMLElement): void {
         this.domUtils.replaceClassesInElement(element, {
@@ -582,7 +582,7 @@ export class CoreQuestionHelperProvider {
     /**
      * Replace Moodle's feedback classes with the Mobile ones.
      *
-     * @param {HTMLElement} element DOM element.
+     * @param element DOM element.
      */
     replaceFeedbackClasses(element: HTMLElement): void {
         this.domUtils.replaceClassesInElement(element, {
@@ -594,10 +594,10 @@ export class CoreQuestionHelperProvider {
     /**
      * Search a behaviour button in a certain question property containing HTML.
      *
-     * @param {any} question Question.
-     * @param {string} htmlProperty The name of the property containing the HTML to search.
-     * @param {string} selector The selector to find the button.
-     * @return {boolean} Whether the button is found.
+     * @param question Question.
+     * @param htmlProperty The name of the property containing the HTML to search.
+     * @param selector The selector to find the button.
+     * @return Whether the button is found.
      */
     protected searchBehaviourButton(question: any, htmlProperty: string, selector: string): boolean {
         const element = this.domUtils.convertToElement(question[htmlProperty]);
@@ -622,8 +622,8 @@ export class CoreQuestionHelperProvider {
     /**
      * Convenience function to show a parsing error and abort.
      *
-     * @param {EventEmitter<void>} [onAbort] If supplied, will emit an event.
-     * @param {string} [error] Error to show.
+     * @param onAbort If supplied, will emit an event.
+     * @param error Error to show.
      */
     showComponentError(onAbort: EventEmitter<void>, error?: string): void {
         // Prevent consecutive errors.
@@ -639,7 +639,7 @@ export class CoreQuestionHelperProvider {
     /**
      * Treat correctness icons, replacing them with local icons and setting click events to show the feedback if needed.
      *
-     * @param {HTMLElement} element DOM element.
+     * @param element DOM element.
      */
     treatCorrectnessIcons(element: HTMLElement): void {
 
@@ -688,9 +688,9 @@ export class CoreQuestionHelperProvider {
     /**
      * Add click listeners to all tappable correctness icons.
      *
-     * @param {HTMLElement} element DOM element.
-     * @param {string} [component] The component to use when viewing the feedback.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
+     * @param element DOM element.
+     * @param component The component to use when viewing the feedback.
+     * @param componentId An ID to use in conjunction with the component.
      */
     treatCorrectnessIconsClicks(element: HTMLElement, component?: string, componentId?: number): void {
         const icons = <HTMLElement[]> Array.from(element.querySelectorAll('i.icon.questioncorrectnessicon[tappable]')),
diff --git a/src/core/question/providers/question.ts b/src/core/question/providers/question.ts
index 92d8bc55c..d8372a358 100644
--- a/src/core/question/providers/question.ts
+++ b/src/core/question/providers/question.ts
@@ -24,31 +24,26 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
 export interface CoreQuestionState {
     /**
      * Name of the state.
-     * @type {string}
      */
     name: string;
 
     /**
      * Class of the state.
-     * @type {string}
      */
     class: string;
 
     /**
      * The string key to translate the status.
-     * @type {string}
      */
     status: string;
 
     /**
      * Whether the question with this state is active.
-     * @type {boolean}
      */
     active: boolean;
 
     /**
      * Whether the question with this state is finished.
-     * @type {boolean}
      */
     finished: boolean;
 }
@@ -254,9 +249,9 @@ export class CoreQuestionProvider {
     /**
      * Compare that all the answers in two objects are equal, except some extra data like sequencecheck or certainty.
      *
-     * @param {any} prevAnswers Object with previous answers.
-     * @param {any} newAnswers Object with new answers.
-     * @return {boolean} Whether all answers are equal.
+     * @param prevAnswers Object with previous answers.
+     * @param newAnswers Object with new answers.
+     * @return Whether all answers are equal.
      */
     compareAllAnswers(prevAnswers: any, newAnswers: any): boolean {
         // Get all the keys.
@@ -280,9 +275,9 @@ export class CoreQuestionProvider {
     /**
      * Convert a list of answers retrieved from local DB to an object with name - value.
      *
-     * @param {any[]} answers List of answers.
-     * @param {boolean} [removePrefix] Whether to remove the prefix in the answer's name.
-     * @return {any} Object with name -> value.
+     * @param answers List of answers.
+     * @param removePrefix Whether to remove the prefix in the answer's name.
+     * @return Object with name -> value.
      */
     convertAnswersArrayToObject(answers: any[], removePrefix?: boolean): any {
         const result = {};
@@ -302,11 +297,11 @@ export class CoreQuestionProvider {
     /**
      * Retrieve an answer from site DB.
      *
-     * @param {string} component Component the attempt belongs to.
-     * @param {number} attemptId Attempt ID.
-     * @param {string} name Answer's name.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the answer.
+     * @param component Component the attempt belongs to.
+     * @param attemptId Attempt ID.
+     * @param name Answer's name.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the answer.
      */
     getAnswer(component: string, attemptId: number, name: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -317,10 +312,10 @@ export class CoreQuestionProvider {
     /**
      * Retrieve an attempt answers from site DB.
      *
-     * @param {string} component Component the attempt belongs to.
-     * @param {number} attemptId Attempt ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the answers.
+     * @param component Component the attempt belongs to.
+     * @param attemptId Attempt ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the answers.
      */
     getAttemptAnswers(component: string, attemptId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -331,10 +326,10 @@ export class CoreQuestionProvider {
     /**
      * Retrieve an attempt questions from site DB.
      *
-     * @param {string} component Component the attempt belongs to.
-     * @param {number} attemptId Attempt ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the questions.
+     * @param component Component the attempt belongs to.
+     * @param attemptId Attempt ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the questions.
      */
     getAttemptQuestions(component: string, attemptId: number, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -345,8 +340,8 @@ export class CoreQuestionProvider {
     /**
      * Get all the answers that aren't "extra" (sequencecheck, certainty, ...).
      *
-     * @param {any} answers Object with all the answers.
-     * @return {any} Object with the basic answers.
+     * @param answers Object with all the answers.
+     * @return Object with the basic answers.
      */
     getBasicAnswers(answers: any): any {
         const result = {};
@@ -363,8 +358,8 @@ export class CoreQuestionProvider {
     /**
      * Get all the answers that aren't "extra" (sequencecheck, certainty, ...).
      *
-     * @param {any[]} answers List of answers.
-     * @return {any[]} List with the basic answers.
+     * @param answers List of answers.
+     * @return List with the basic answers.
      */
     getBasicAnswersFromArray(answers: any[]): any[] {
         const result = [];
@@ -381,11 +376,11 @@ export class CoreQuestionProvider {
     /**
      * Retrieve a question from site DB.
      *
-     * @param {string} component Component the attempt belongs to.
-     * @param {number} attemptId Attempt ID.
-     * @param {string} slot Question slot.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the question.
+     * @param component Component the attempt belongs to.
+     * @param attemptId Attempt ID.
+     * @param slot Question slot.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the question.
      */
     getQuestion(component: string, attemptId: number, slot: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -396,12 +391,12 @@ export class CoreQuestionProvider {
     /**
      * Retrieve a question answers from site DB.
      *
-     * @param {string} component Component the attempt belongs to.
-     * @param {number} attemptId Attempt ID.
-     * @param {string} slot Question slot.
-     * @param {boolean} [filter] Whether it should ignore "extra" answers like sequencecheck or certainty.
-     * @param {string} [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved with the answers.
+     * @param component Component the attempt belongs to.
+     * @param attemptId Attempt ID.
+     * @param slot Question slot.
+     * @param filter Whether it should ignore "extra" answers like sequencecheck or certainty.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the answers.
      */
     getQuestionAnswers(component: string, attemptId: number, slot: number, filter?: boolean, siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -421,8 +416,8 @@ export class CoreQuestionProvider {
     /**
      * Extract the question slot from a question name.
      *
-     * @param {string} name Question name.
-     * @return {number} Question slot.
+     * @param name Question name.
+     * @return Question slot.
      */
     getQuestionSlotFromName(name: string): number {
         if (name) {
@@ -438,8 +433,8 @@ export class CoreQuestionProvider {
     /**
      * Get question state based on state name.
      *
-     * @param {string} name State name.
-     * @return {CoreQuestionState} State.
+     * @param name State name.
+     * @return State.
      */
     getState(name: string): CoreQuestionState {
         return this.STATES[name || 'cannotdeterminestatus'];
@@ -448,8 +443,8 @@ export class CoreQuestionProvider {
     /**
      * Check if an answer is extra data like sequencecheck or certainty.
      *
-     * @param {string} name Answer name.
-     * @return {boolean} Whether it's extra data.
+     * @param name Answer name.
+     * @return Whether it's extra data.
      */
     isExtraAnswer(name: string): boolean {
         // Maybe the name still has the prefix.
@@ -461,10 +456,10 @@ export class CoreQuestionProvider {
     /**
      * Remove an attempt answers from site DB.
      *
-     * @param {string} component Component the attempt belongs to.
-     * @param {number} attemptId Attempt ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param component Component the attempt belongs to.
+     * @param attemptId Attempt ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     removeAttemptAnswers(component: string, attemptId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -475,10 +470,10 @@ export class CoreQuestionProvider {
     /**
      * Remove an attempt questions from site DB.
      *
-     * @param {string} component Component the attempt belongs to.
-     * @param {number} attemptId Attempt ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param component Component the attempt belongs to.
+     * @param attemptId Attempt ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     removeAttemptQuestions(component: string, attemptId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -489,11 +484,11 @@ export class CoreQuestionProvider {
     /**
      * Remove an answer from site DB.
      *
-     * @param {string} component Component the attempt belongs to.
-     * @param {number} attemptId Attempt ID.
-     * @param {string} name Answer's name.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param component Component the attempt belongs to.
+     * @param attemptId Attempt ID.
+     * @param name Answer's name.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     removeAnswer(component: string, attemptId: number, name: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -505,11 +500,11 @@ export class CoreQuestionProvider {
     /**
      * Remove a question from site DB.
      *
-     * @param {string} component Component the attempt belongs to.
-     * @param {number} attemptId Attempt ID.
-     * @param {string} slot Question slot.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param component Component the attempt belongs to.
+     * @param attemptId Attempt ID.
+     * @param slot Question slot.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     removeQuestion(component: string, attemptId: number, slot: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -520,11 +515,11 @@ export class CoreQuestionProvider {
     /**
      * Remove a question answers from site DB.
      *
-     * @param {string} component Component the attempt belongs to.
-     * @param {number} attemptId Attempt ID.
-     * @param {string} slot Question slot.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param component Component the attempt belongs to.
+     * @param attemptId Attempt ID.
+     * @param slot Question slot.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     removeQuestionAnswers(component: string, attemptId: number, slot: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -536,8 +531,8 @@ export class CoreQuestionProvider {
     /**
      * Remove the prefix from a question answer name.
      *
-     * @param {string} name Question name.
-     * @return {string} Name without prefix.
+     * @param name Question name.
+     * @return Name without prefix.
      */
     removeQuestionPrefix(name: string): string {
         if (name) {
@@ -550,14 +545,14 @@ export class CoreQuestionProvider {
     /**
      * Save answers in local DB.
      *
-     * @param {string} component Component the answers belong to. E.g. 'mmaModQuiz'.
-     * @param {number} componentId ID of the component the answers belong to.
-     * @param {number} attemptId Attempt ID.
-     * @param {number} userId User ID.
-     * @param {any} answers Object with the answers to save.
-     * @param {number} [timemodified] Time modified to set in the answers. If not defined, current time.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param component Component the answers belong to. E.g. 'mmaModQuiz'.
+     * @param componentId ID of the component the answers belong to.
+     * @param attemptId Attempt ID.
+     * @param userId User ID.
+     * @param answers Object with the answers to save.
+     * @param timemodified Time modified to set in the answers. If not defined, current time.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     saveAnswers(component: string, componentId: number, attemptId: number, userId: number, answers: any, timemodified?: number,
             siteId?: string): Promise<any> {
@@ -590,14 +585,14 @@ export class CoreQuestionProvider {
     /**
      * Save a question in local DB.
      *
-     * @param {string} component Component the question belongs to. E.g. 'mmaModQuiz'.
-     * @param {number} componentId ID of the component the question belongs to.
-     * @param {number} attemptId Attempt ID.
-     * @param {number} userId User ID.
-     * @param {any} question The question to save.
-     * @param {string} state Question's state.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param component Component the question belongs to. E.g. 'mmaModQuiz'.
+     * @param componentId ID of the component the question belongs to.
+     * @param attemptId Attempt ID.
+     * @param userId User ID.
+     * @param question The question to save.
+     * @param state Question's state.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     saveQuestion(component: string, componentId: number, attemptId: number, userId: number, question: any, state: string,
             siteId?: string): Promise<any> {
diff --git a/src/core/rating/pages/ratings/ratings.ts b/src/core/rating/pages/ratings/ratings.ts
index 1114562ca..1b0980ae2 100644
--- a/src/core/rating/pages/ratings/ratings.ts
+++ b/src/core/rating/pages/ratings/ratings.ts
@@ -61,7 +61,7 @@ export class CoreRatingRatingsPage {
     /**
      * Fetch all the data required for the view.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     fetchData(): Promise<any> {
         return this.ratingProvider.getItemRatings(this.contextLevel, this.instanceId, this.component, this.ratingArea, this.itemId,
@@ -75,7 +75,7 @@ export class CoreRatingRatingsPage {
     /**
      * Refresh data.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshRatings(refresher: any): void {
         this.ratingProvider.invalidateRatingItems(this.contextLevel, this.instanceId, this.component, this.ratingArea, this.itemId,
diff --git a/src/core/rating/providers/offline.ts b/src/core/rating/providers/offline.ts
index 920130118..1de0b00b0 100644
--- a/src/core/rating/providers/offline.ts
+++ b/src/core/rating/providers/offline.ts
@@ -117,13 +117,13 @@ export class CoreRatingOfflineProvider {
     /**
      * Get an offline rating.
      *
-     * @param {string} contextLevel Context level: course, module, user, etc.
-     * @param {numnber} instanceId Context instance id.
-     * @param {string} component Component. Example: "mod_forum".
-     * @param {string} ratingArea Rating area. Example: "post".
-     * @param {number} itemId Item id. Example: forum post id.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<CoreRatingOfflineRating>} Promise resolved with the saved rating, rejected if not found.
+     * @param contextLevel Context level: course, module, user, etc.
+     * @param instanceId Context instance id.
+     * @param component Component. Example: "mod_forum".
+     * @param ratingArea Rating area. Example: "post".
+     * @param itemId Item id. Example: forum post id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the saved rating, rejected if not found.
      */
     getRating(contextLevel: string, instanceId: number, component: string, ratingArea: string, itemId: number,  siteId?: string):
             Promise<CoreRatingOfflineRating> {
@@ -143,19 +143,19 @@ export class CoreRatingOfflineProvider {
     /**
      * Add an offline rating.
      *
-     * @param {string} component Component. Example: "mod_forum".
-     * @param {string} ratingArea Rating area. Example: "post".
-     * @param {string} contextLevel Context level: course, module, user, etc.
-     * @param {numnber} instanceId Context instance id.
-     * @param {number} itemId Item id. Example: forum post id.
-     * @param {number} itemSetId Item set id. Example: forum discussion id.
-     * @param {number} courseId Course id.
-     * @param {number} scaleId Scale id.
-     * @param {number} rating Rating value. Use CoreRatingProvider.UNSET_RATING to delete rating.
-     * @param {number} ratedUserId Rated user id.
-     * @param {number} aggregateMethod Aggregate method.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the rating is saved.
+     * @param component Component. Example: "mod_forum".
+     * @param ratingArea Rating area. Example: "post".
+     * @param contextLevel Context level: course, module, user, etc.
+     * @param instanceId Context instance id.
+     * @param itemId Item id. Example: forum post id.
+     * @param itemSetId Item set id. Example: forum discussion id.
+     * @param courseId Course id.
+     * @param scaleId Scale id.
+     * @param rating Rating value. Use CoreRatingProvider.UNSET_RATING to delete rating.
+     * @param ratedUserId Rated user id.
+     * @param aggregateMethod Aggregate method.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the rating is saved.
      */
     addRating(component: string, ratingArea: string, contextLevel: string, instanceId: number, itemId: number, itemSetId: number,
             courseId: number, scaleId: number, rating: number, ratedUserId: number, aggregateMethod: number, siteId?: string):
@@ -182,12 +182,12 @@ export class CoreRatingOfflineProvider {
     /**
      * Delete offline rating.
      *
-     * @param {string} component Component. Example: "mod_forum".
-     * @param {string} ratingArea Rating area. Example: "post".
-     * @param {string} contextLevel Context level: course, module, user, etc.
-     * @param {number} itemId Item id. Example: forum post id.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the rating is saved.
+     * @param component Component. Example: "mod_forum".
+     * @param ratingArea Rating area. Example: "post".
+     * @param contextLevel Context level: course, module, user, etc.
+     * @param itemId Item id. Example: forum post id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the rating is saved.
      */
     deleteRating(component: string, ratingArea: string, contextLevel: string, instanceId: number, itemId: number, siteId?: string):
             Promise<any> {
@@ -207,13 +207,13 @@ export class CoreRatingOfflineProvider {
     /**
      * Get the list of item sets in a component or instance.
      *
-     * @param {string} component Component. Example: "mod_forum".
-     * @param {string} ratingArea Rating Area. Example: "post".
-     * @param {string} [contextLevel] Context level: course, module, user, etc.
-     * @param {numnber} [instanceId] Context instance id.
-     * @param {number} [itemSetId] Item set id.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<CoreRatingItemSet[]>} Promise resolved with the list of item set ids.
+     * @param component Component. Example: "mod_forum".
+     * @param ratingArea Rating Area. Example: "post".
+     * @param contextLevel Context level: course, module, user, etc.
+     * @param instanceId Context instance id.
+     * @param itemSetId Item set id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of item set ids.
      */
     getItemSets(component: string, ratingArea: string, contextLevel?: string, instanceId?: number, itemSetId?: number,
             siteId?: string): Promise<CoreRatingItemSet[]> {
@@ -250,13 +250,13 @@ export class CoreRatingOfflineProvider {
     /**
      * Get offline ratings of an item set.
      *
-     * @param {string} component Component. Example: "mod_forum".
-     * @param {string} ratingArea Rating Area. Example: "post".
-     * @param {string} contextLevel Context level: course, module, user, etc.
-     * @param {number} itemId Item id. Example: forum post id.
-     * @param {number} itemSetId Item set id. Example: forum discussion id.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<CoreRatingOfflineRating[]>} Promise resolved with the list of ratings.
+     * @param component Component. Example: "mod_forum".
+     * @param ratingArea Rating Area. Example: "post".
+     * @param contextLevel Context level: course, module, user, etc.
+     * @param itemId Item id. Example: forum post id.
+     * @param itemSetId Item set id. Example: forum discussion id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of ratings.
      */
     getRatings(component: string, ratingArea: string, contextLevel: string, instanceId: number, itemSetId: number, siteId?: string):
             Promise<CoreRatingOfflineRating[]> {
@@ -276,13 +276,13 @@ export class CoreRatingOfflineProvider {
     /**
      * Return whether a component, instance or item set has offline ratings.
      *
-     * @param {string} component Component. Example: "mod_forum".
-     * @param {string} ratingArea Rating Area. Example: "post".
-     * @param {string} [contextLevel] Context level: course, module, user, etc.
-     * @param {number} [instanceId] Context instance id.
-     * @param {number} [itemSetId] Item set id. Example: forum discussion id.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with a boolean.
+     * @param component Component. Example: "mod_forum".
+     * @param ratingArea Rating Area. Example: "post".
+     * @param contextLevel Context level: course, module, user, etc.
+     * @param instanceId Context instance id.
+     * @param itemSetId Item set id. Example: forum discussion id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with a boolean.
      */
     hasRatings(component: string, ratingArea: string, contextLevel?: string, instanceId?: number, itemSetId?: number,
             siteId?: string): Promise<boolean> {
diff --git a/src/core/rating/providers/rating.ts b/src/core/rating/providers/rating.ts
index 1b482dd08..bbdd1d454 100644
--- a/src/core/rating/providers/rating.ts
+++ b/src/core/rating/providers/rating.ts
@@ -104,7 +104,7 @@ export class CoreRatingProvider {
     /**
      * Returns whether the web serivce to add ratings is available.
      *
-     * @return {boolean} If WS is abalaible.
+     * @return If WS is abalaible.
      * @since 3.2
      */
     isAddRatingWSAvailable(): boolean {
@@ -114,19 +114,19 @@ export class CoreRatingProvider {
     /**
      * Add a rating to an item.
      *
-     * @param {string} component Component. Example: "mod_forum".
-     * @param {string} ratingArea Rating area. Example: "post".
-     * @param {string} contextLevel Context level: course, module, user, etc.
-     * @param {number} instanceId Context instance id.
-     * @param {number} itemId Item id. Example: forum post id.
-     * @param {number} itemSetId Item set id. Example: forum discussion id.
-     * @param {number} courseId Course id.
-     * @param {number} scaleId Scale id.
-     * @param {number} rating Rating value. Use CoreRatingProvider.UNSET_RATING to delete rating.
-     * @param {number} ratedUserId Rated user id.
-     * @param {number} aggregateMethod Aggregate method.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<CoreRatingItemRating|null>} Promise resolved with the aggregated rating or null if stored offline.
+     * @param component Component. Example: "mod_forum".
+     * @param ratingArea Rating area. Example: "post".
+     * @param contextLevel Context level: course, module, user, etc.
+     * @param instanceId Context instance id.
+     * @param itemId Item id. Example: forum post id.
+     * @param itemSetId Item set id. Example: forum discussion id.
+     * @param courseId Course id.
+     * @param scaleId Scale id.
+     * @param rating Rating value. Use CoreRatingProvider.UNSET_RATING to delete rating.
+     * @param ratedUserId Rated user id.
+     * @param aggregateMethod Aggregate method.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the aggregated rating or null if stored offline.
      * @since 3.2
      */
     addRating(component: string, ratingArea: string, contextLevel: string, instanceId: number, itemId: number, itemSetId: number,
@@ -174,17 +174,17 @@ export class CoreRatingProvider {
     /**
      * Add a rating to an item. It will fail if offline or cannot connect.
      *
-     * @param {string} component Component. Example: "mod_forum".
-     * @param {string} ratingArea Rating area. Example: "post".
-     * @param {string} contextLevel Context level: course, module, user, etc.
-     * @param {number} instanceId Context instance id.
-     * @param {number} itemId Item id. Example: forum post id.
-     * @param {number} scaleId Scale id.
-     * @param {number} rating Rating value. Use CoreRatingProvider.UNSET_RATING to delete rating.
-     * @param {number} ratedUserId Rated user id.
-     * @param {number} aggregateMethod Aggregate method.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<CoreRatingItemRating>} Promise resolved with the aggregated rating.
+     * @param component Component. Example: "mod_forum".
+     * @param ratingArea Rating area. Example: "post".
+     * @param contextLevel Context level: course, module, user, etc.
+     * @param instanceId Context instance id.
+     * @param itemId Item id. Example: forum post id.
+     * @param scaleId Scale id.
+     * @param rating Rating value. Use CoreRatingProvider.UNSET_RATING to delete rating.
+     * @param ratedUserId Rated user id.
+     * @param aggregateMethod Aggregate method.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the aggregated rating.
      * @since 3.2
      */
     addRatingOnline(component: string, ratingArea: string, contextLevel: string, instanceId: number, itemId: number,
@@ -225,17 +225,17 @@ export class CoreRatingProvider {
     /**
      * Get item ratings.
      *
-     * @param {string} contextLevel Context level: course, module, user, etc.
-     * @param {number} instanceId Context instance id.
-     * @param {string} component Component. Example: "mod_forum".
-     * @param {string} ratingArea Rating area. Example: "post".
-     * @param {number} itemId Item id. Example: forum post id.
-     * @param {number} scaleId Scale id.
-     * @param {string} [sort="timemodified"] Sort field.
-     * @param {number} [courseId] Course id. Used for fetching user profiles.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {boolean} [ignoreCache=false] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<CoreRatingItemRating[]>} Promise resolved with the list of ratings.
+     * @param contextLevel Context level: course, module, user, etc.
+     * @param instanceId Context instance id.
+     * @param component Component. Example: "mod_forum".
+     * @param ratingArea Rating area. Example: "post".
+     * @param itemId Item id. Example: forum post id.
+     * @param scaleId Scale id.
+     * @param sort Sort field.
+     * @param courseId Course id. Used for fetching user profiles.
+     * @param siteId Site ID. If not defined, current site.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise resolved with the list of ratings.
      */
     getItemRatings(contextLevel: string, instanceId: number, component: string, ratingArea: string, itemId: number,
             scaleId: number, sort: string = 'timemodified', courseId?: number, siteId?: string, ignoreCache: boolean = false):
@@ -284,15 +284,15 @@ export class CoreRatingProvider {
     /**
      * Invalidate item ratings.
      *
-     * @param {string} contextLevel Context level: course, module, user, etc.
-     * @param {number} instanceId Context instance id.
-     * @param {string} component Component. Example: "mod_forum".
-     * @param {string} ratingArea Rating area. Example: "post".
-     * @param {number} itemId Item id. Example: forum post id.
-     * @param {number} scaleId Scale id.
-     * @param {string} [sort="timemodified"] Sort field.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param contextLevel Context level: course, module, user, etc.
+     * @param instanceId Context instance id.
+     * @param component Component. Example: "mod_forum".
+     * @param ratingArea Rating area. Example: "post".
+     * @param itemId Item id. Example: forum post id.
+     * @param scaleId Scale id.
+     * @param sort Sort field.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateRatingItems(contextLevel: string, instanceId: number, component: string, ratingArea: string,
             itemId: number, scaleId: number, sort: string = 'timemodified', siteId?: string): Promise<any> {
@@ -306,8 +306,8 @@ export class CoreRatingProvider {
     /**
      * Check if rating is disabled in a certain site.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether it's disabled.
+     * @param site Site. If not defined, use current site.
+     * @return Whether it's disabled.
      */
     isRatingDisabledInSite(site?: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
@@ -318,8 +318,8 @@ export class CoreRatingProvider {
     /**
      * Check if rating is disabled in a certain site.
      *
-     * @param  {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>} Promise resolved with true if disabled, rejected or resolved with false otherwise.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if disabled, rejected or resolved with false otherwise.
      */
     isRatingDisabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -330,8 +330,8 @@ export class CoreRatingProvider {
     /**
      * Convenience function to merge two or more rating infos of the same instance.
      *
-     * @param {CoreRatingInfo[]} ratingInfos Array of rating infos.
-     * @return {CoreRatingInfo} Merged rating info or null.
+     * @param ratingInfos Array of rating infos.
+     * @return Merged rating info or null.
      */
     mergeRatingInfos(ratingInfos: CoreRatingInfo[]): CoreRatingInfo {
         let result: CoreRatingInfo = null;
@@ -370,12 +370,12 @@ export class CoreRatingProvider {
      *
      * This function should be called from the prefetch handler of activities with ratings.
      *
-     * @param {string} contextLevel Context level: course, module, user, etc.
-     * @param {number} instanceId Instance id.
-     * @param {string} [siteId] Site id. If not defined, current site.
-     * @param {number} [courseId] Course id. Used for prefetching user profiles.
-     * @param {CoreRatingInfo} [ratingInfo] Rating info returned by web services.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param contextLevel Context level: course, module, user, etc.
+     * @param instanceId Instance id.
+     * @param siteId Site id. If not defined, current site.
+     * @param courseId Course id. Used for prefetching user profiles.
+     * @param ratingInfo Rating info returned by web services.
+     * @return Promise resolved when done.
      */
     prefetchRatings(contextLevel: string, instanceId: number, scaleId: number, courseId?: number, ratingInfo?: CoreRatingInfo,
             siteId?: string): Promise<any> {
@@ -400,13 +400,13 @@ export class CoreRatingProvider {
     /**
      * Get cache key for rating items WS calls.
      *
-     * @param {string} contextLevel Context level: course, module, user, etc.
-     * @param {string} component Component. Example: "mod_forum".
-     * @param {string} ratingArea Rating area. Example: "post".
-     * @param {number} itemId Item id. Example: forum post id.
-     * @param {number} scaleId Scale id.
-     * @param {string} sort Sort field.
-     * @return {string} Cache key.
+     * @param contextLevel Context level: course, module, user, etc.
+     * @param component Component. Example: "mod_forum".
+     * @param ratingArea Rating area. Example: "post".
+     * @param itemId Item id. Example: forum post id.
+     * @param scaleId Scale id.
+     * @param sort Sort field.
+     * @return Cache key.
      */
     protected getItemRatingsCacheKey(contextLevel: string, instanceId: number, component: string, ratingArea: string,
             itemId: number, scaleId: number, sort: string): string {
diff --git a/src/core/rating/providers/sync.ts b/src/core/rating/providers/sync.ts
index 341797fe2..e7f292d36 100644
--- a/src/core/rating/providers/sync.ts
+++ b/src/core/rating/providers/sync.ts
@@ -54,14 +54,14 @@ export class CoreRatingSyncProvider extends CoreSyncBaseProvider {
      *
      * This function should be called from the sync provider of activities with ratings.
      *
-     * @param {string} component Component. Example: "mod_forum".
-     * @param {string} ratingArea Rating Area. Example: "post".
-     * @param {string} [contextLevel] Context level: course, module, user, etc.
-     * @param {numnber} [instanceId] Context instance id.
-     * @param {number} [itemSetId] Item set id.
-     * @param {boolean} [force] Wether to force sync not depending on last execution.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
+     * @param component Component. Example: "mod_forum".
+     * @param ratingArea Rating Area. Example: "post".
+     * @param contextLevel Context level: course, module, user, etc.
+     * @param instanceId Context instance id.
+     * @param itemSetId Item set id.
+     * @param force Wether to force sync not depending on last execution.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     syncRatings(component: string, ratingArea: string, contextLevel?: string, instanceId?: number, itemSetId?: number,
             force?: boolean, siteId?: string): Promise<{itemSet: CoreRatingItemSet, updated: number[], warnings: string[]}[]> {
@@ -97,13 +97,13 @@ export class CoreRatingSyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync ratings of an item set only if a certain time has passed since the last time.
      *
-     * @param {string} component Component. Example: "mod_forum".
-     * @param {string} ratingArea Rating Area. Example: "post".
-     * @param {string} contextLevel Context level: course, module, user, etc.
-     * @param {number} instanceId Context instance id.
-     * @param {number} itemSetId Item set id. Example: forum discussion id.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when ratings are synced or if it doesn't need to be synced.
+     * @param component Component. Example: "mod_forum".
+     * @param ratingArea Rating Area. Example: "post".
+     * @param contextLevel Context level: course, module, user, etc.
+     * @param instanceId Context instance id.
+     * @param itemSetId Item set id. Example: forum discussion id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when ratings are synced or if it doesn't need to be synced.
      */
     protected syncItemSetIfNeeded(component: string, ratingArea: string,  contextLevel: string, instanceId: number,
             itemSetId: number, siteId?: string): Promise<{updated: number[], warnings: string[]}> {
@@ -121,13 +121,13 @@ export class CoreRatingSyncProvider extends CoreSyncBaseProvider {
     /**
      * Synchronize all offline ratings of an item set.
      *
-     * @param {string} component Component. Example: "mod_forum".
-     * @param {string} ratingArea Rating Area. Example: "post".
-     * @param {string} contextLevel Context level: course, module, user, etc.
-     * @param {number} instanceId Context instance id.
-     * @param {number} itemSetId Item set id. Example: forum discussion id.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected otherwise.
+     * @param component Component. Example: "mod_forum".
+     * @param ratingArea Rating Area. Example: "post".
+     * @param contextLevel Context level: course, module, user, etc.
+     * @param instanceId Context instance id.
+     * @param itemSetId Item set id. Example: forum discussion id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if sync is successful, rejected otherwise.
      */
     protected syncItemSet(component: string, ratingArea: string, contextLevel: string, instanceId: number, itemSetId: number,
             siteId?: string): Promise<{updated: number[], warnings: string[]}> {
@@ -186,12 +186,12 @@ export class CoreRatingSyncProvider extends CoreSyncBaseProvider {
     /**
      * Get the sync id of an item set.
      *
-     * @param {string} component Component. Example: "mod_forum".
-     * @param {string} ratingArea Rating Area. Example: "post".
-     * @param {string} contextLevel Context level: course, module, user, etc.
-     * @param {number} instanceId Context instance id.
-     * @param {number} itemSetId Item set id. Example: forum discussion id.
-     * @return {string} Sync id.
+     * @param component Component. Example: "mod_forum".
+     * @param ratingArea Rating Area. Example: "post".
+     * @param contextLevel Context level: course, module, user, etc.
+     * @param instanceId Context instance id.
+     * @param itemSetId Item set id. Example: forum discussion id.
+     * @return Sync id.
      */
     protected getItemSetSyncId(component: string, ratingArea: string, contextLevel: string, instanceId: number, itemSetId: number):
             string {
diff --git a/src/core/settings/pages/list/list.ts b/src/core/settings/pages/list/list.ts
index 8e6c4b944..3c50f1350 100644
--- a/src/core/settings/pages/list/list.ts
+++ b/src/core/settings/pages/list/list.ts
@@ -54,8 +54,8 @@ export class CoreSettingsListPage {
     /**
      * Open a handler.
      *
-     * @param {string} page Page to open.
-     * @param {any} params Params of the page to open.
+     * @param page Page to open.
+     * @param params Params of the page to open.
      */
     openHandler(page: string, params?: any): void {
         this.selectedPage = page;
diff --git a/src/core/settings/pages/space-usage/space-usage.ts b/src/core/settings/pages/space-usage/space-usage.ts
index afd45fcd2..0a782a9c6 100644
--- a/src/core/settings/pages/space-usage/space-usage.ts
+++ b/src/core/settings/pages/space-usage/space-usage.ts
@@ -57,7 +57,7 @@ export class CoreSettingsSpaceUsagePage {
     /**
      * Convenience function to calculate each site's usage, and the total usage.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected calculateSizeUsage(): Promise<any> {
         return this.sitesProvider.getSortedSites().then((sites) => {
@@ -101,7 +101,7 @@ export class CoreSettingsSpaceUsagePage {
     /**
      * Convenience function to calculate space usage.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     protected fetchData(): Promise<any> {
         const promises = [
@@ -114,7 +114,7 @@ export class CoreSettingsSpaceUsagePage {
     /**
      * Refresh the data.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshData(refresher: any): void {
         this.fetchData().finally(() => {
@@ -125,8 +125,8 @@ export class CoreSettingsSpaceUsagePage {
     /**
      * Convenience function to update site size, along with total usage.
      *
-     * @param {any} site Site object with space usage.
-     * @param {number} newUsage New space usage of the site in bytes.
+     * @param site Site object with space usage.
+     * @param newUsage New space usage of the site in bytes.
      */
     protected updateSiteUsage(site: any, newUsage: number): void {
         const oldUsage = site.spaceUsage;
@@ -137,8 +137,8 @@ export class CoreSettingsSpaceUsagePage {
     /**
      * Calculate the number of rows to be deleted on a site.
      *
-     * @param  {any}             site Site object.
-     * @return {Promise<number>}      If there are rows to delete or not.
+     * @param site Site object.
+     * @return If there are rows to delete or not.
      */
     protected calcSiteClearRows(site: any): Promise<number> {
         const clearTables = this.sitesProvider.getSiteTableSchemasToClear();
@@ -159,7 +159,7 @@ export class CoreSettingsSpaceUsagePage {
     /**
      * Deletes files of a site and the tables that can be cleared.
      *
-     * @param {any} siteData Site object with space usage.
+     * @param siteData Site object with space usage.
      */
     deleteSiteStorage(siteData: any): void {
         this.textUtils.formatText(siteData.siteName).then((siteName) => {
diff --git a/src/core/settings/pages/synchronization/synchronization.ts b/src/core/settings/pages/synchronization/synchronization.ts
index e6c81b5e7..4238282d1 100644
--- a/src/core/settings/pages/synchronization/synchronization.ts
+++ b/src/core/settings/pages/synchronization/synchronization.ts
@@ -82,7 +82,7 @@ export class CoreSettingsSynchronizationPage implements OnDestroy {
     /**
      * Syncrhonizes a site.
      *
-     * @param {string} siteId Site ID.
+     * @param siteId Site ID.
      */
     synchronize(siteId: string): void {
         this.settingsHelper.synchronizeSite(this.syncOnlyOnWifi, siteId).catch((error) => {
@@ -96,8 +96,8 @@ export class CoreSettingsSynchronizationPage implements OnDestroy {
     /**
      * Returns true if site is beeing synchronized.
      *
-     * @param {string} siteId Site ID.
-     * @return {boolean} True if site is beeing synchronized, false otherwise.
+     * @param siteId Site ID.
+     * @return True if site is beeing synchronized, false otherwise.
      */
     isSynchronizing(siteId: string): boolean {
         return !!this.settingsHelper.getSiteSyncPromise(siteId);
diff --git a/src/core/settings/providers/delegate.ts b/src/core/settings/providers/delegate.ts
index a7fca19cd..e3e5fb2b4 100644
--- a/src/core/settings/providers/delegate.ts
+++ b/src/core/settings/providers/delegate.ts
@@ -25,14 +25,13 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
 export interface CoreSettingsHandler extends CoreDelegateHandler {
     /**
      * The highest priority is displayed first.
-     * @type {number}
      */
     priority: number;
 
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreSettingsHandlerData} Data.
+     * @return Data.
      */
     getDisplayData(): CoreSettingsHandlerData;
 }
@@ -43,31 +42,26 @@ export interface CoreSettingsHandler extends CoreDelegateHandler {
 export interface CoreSettingsHandlerData {
     /**
      * Name of the page to load for the handler.
-     * @type {string}
      */
     page: string;
 
     /**
      * Params list of the page to load for the handler.
-     * @type {any}
      */
     params?: any;
 
     /**
      * Title to display for the handler.
-     * @type {string}
      */
     title: string;
 
     /**
      * Name of the icon to display for the handler.
-     * @type {string}
      */
     icon?: string; // Name of the icon to display in the menu.
 
     /**
      * Class to add to the displayed handler.
-     * @type {string}
      */
     class?: string;
 }
@@ -97,8 +91,6 @@ export class CoreSettingsDelegate extends CoreDelegate {
 
     /**
      * Get the handlers for the current site.
-     *
-     * @return {CoreSettingsHandlerData[]}
      */
     getHandlers(): CoreSettingsHandlerData[] {
         return this.siteHandlers;
diff --git a/src/core/settings/providers/helper.ts b/src/core/settings/providers/helper.ts
index 0a2d5c32f..26ffda777 100644
--- a/src/core/settings/providers/helper.ts
+++ b/src/core/settings/providers/helper.ts
@@ -39,10 +39,10 @@ export class CoreSettingsHelper {
     /**
      * Get a certain processor from a list of processors.
      *
-     * @param {any[]} processors List of processors.
-     * @param {string} name Name of the processor to get.
-     * @param {boolean} [fallback=true] True to return first processor if not found, false to not return any. Defaults to true.
-     * @return {any} Processor.
+     * @param processors List of processors.
+     * @param name Name of the processor to get.
+     * @param fallback True to return first processor if not found, false to not return any. Defaults to true.
+     * @return Processor.
      */
     getProcessor(processors: any[], name: string, fallback: boolean = true): any {
         if (!processors || !processors.length) {
@@ -63,9 +63,9 @@ export class CoreSettingsHelper {
     /**
      * Return the components and notifications that have a certain processor.
      *
-     * @param {string} processor Name of the processor to filter.
-     * @param {any[]} components Array of components.
-     * @return {any[]} Filtered components.
+     * @param processor Name of the processor to filter.
+     * @param components Array of components.
+     * @return Filtered components.
      */
     getProcessorComponents(processor: string, components: any[]): any[] {
         const result = [];
@@ -104,8 +104,8 @@ export class CoreSettingsHelper {
     /**
      * Get the synchronization promise of a site.
      *
-     * @param {string} siteId ID of the site.
-     * @return {Promise<any> | null} Sync promise or null if site is not being syncrhonized.
+     * @param siteId ID of the site.
+     * @return Sync promise or null if site is not being syncrhonized.
      */
     getSiteSyncPromise(siteId: string): Promise<any> {
         if (this.syncPromises[siteId]) {
@@ -118,9 +118,9 @@ export class CoreSettingsHelper {
     /**
      * Synchronize a site.
      *
-     * @param {boolean} syncOnlyOnWifi True to sync only on wifi, false otherwise.
-     * @param {string} siteId ID of the site to synchronize.
-     * @return {Promise<any>} Promise resolved when synchronized, rejected if failure.
+     * @param syncOnlyOnWifi True to sync only on wifi, false otherwise.
+     * @param siteId ID of the site to synchronize.
+     * @return Promise resolved when synchronized, rejected if failure.
      */
     synchronizeSite(syncOnlyOnWifi: boolean, siteId: string): Promise<any> {
         if (this.syncPromises[siteId]) {
diff --git a/src/core/sharedfiles/pages/choose-site/choose-site.ts b/src/core/sharedfiles/pages/choose-site/choose-site.ts
index d680913a9..e1622c50c 100644
--- a/src/core/sharedfiles/pages/choose-site/choose-site.ts
+++ b/src/core/sharedfiles/pages/choose-site/choose-site.ts
@@ -78,7 +78,7 @@ export class CoreSharedFilesChooseSitePage implements OnInit {
     /**
      * Store the file in a certain site.
      *
-     * @param {string} siteId Site ID.
+     * @param siteId Site ID.
      */
     storeInSite(siteId: string): void {
         this.loaded = false;
diff --git a/src/core/sharedfiles/pages/list/list.ts b/src/core/sharedfiles/pages/list/list.ts
index db1f706b5..72e1db6e9 100644
--- a/src/core/sharedfiles/pages/list/list.ts
+++ b/src/core/sharedfiles/pages/list/list.ts
@@ -75,7 +75,7 @@ export class CoreSharedFilesListPage implements OnInit, OnDestroy {
     /**
      * Load the files.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected loadFiles(): Promise<any> {
         if (this.path) {
@@ -100,7 +100,7 @@ export class CoreSharedFilesListPage implements OnInit, OnDestroy {
     /**
      * Refresh the list of files.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshFiles(refresher: any): void {
         this.loadFiles().finally(() => {
@@ -111,7 +111,7 @@ export class CoreSharedFilesListPage implements OnInit, OnDestroy {
     /**
      * Called when a file is deleted. Remove the file from the list.
      *
-     * @param {number} index Position of the file.
+     * @param index Position of the file.
      */
     fileDeleted(index: number): void {
         this.files.splice(index, 1);
@@ -120,8 +120,8 @@ export class CoreSharedFilesListPage implements OnInit, OnDestroy {
     /**
      * Called when a file is renamed. Update the list.
      *
-     * @param {number} index Position of the file.
-     * @param {any} data Data containing the new FileEntry.
+     * @param index Position of the file.
+     * @param data Data containing the new FileEntry.
      */
     fileRenamed(index: number, data: any): void {
         this.files[index] = data.file;
@@ -130,7 +130,7 @@ export class CoreSharedFilesListPage implements OnInit, OnDestroy {
     /**
      * Open a subfolder.
      *
-     * @param {any} folder The folder to open.
+     * @param folder The folder to open.
      */
     openFolder(folder: any): void {
         const path = this.textUtils.concatenatePaths(this.path, folder.name);
@@ -154,7 +154,7 @@ export class CoreSharedFilesListPage implements OnInit, OnDestroy {
     /**
      * Change site loaded.
      *
-     * @param {string} id Site to load.
+     * @param id Site to load.
      */
     changeSite(id: string): void {
         this.siteId = id;
@@ -166,7 +166,7 @@ export class CoreSharedFilesListPage implements OnInit, OnDestroy {
     /**
      * A file was picked.
      *
-     * @param {any} file Picked file.
+     * @param file Picked file.
      */
     filePicked(file: any): void {
         this.viewCtrl.dismiss(file);
diff --git a/src/core/sharedfiles/providers/helper.ts b/src/core/sharedfiles/providers/helper.ts
index a2ef83342..449905abf 100644
--- a/src/core/sharedfiles/providers/helper.ts
+++ b/src/core/sharedfiles/providers/helper.ts
@@ -43,9 +43,9 @@ export class CoreSharedFilesHelperProvider {
     /**
      * Ask a user if he wants to replace a file (using originalName) or rename it (using newName).
      *
-     * @param {string} originalName Original name.
-     * @param {string} newName New name.
-     * @return {Promise<string>} Promise resolved with the name to use when the user chooses. Rejected if user cancels.
+     * @param originalName Original name.
+     * @param newName New name.
+     * @return Promise resolved with the name to use when the user chooses. Rejected if user cancels.
      */
     askRenameReplace(originalName: string, newName: string): Promise<string> {
         const deferred = this.utils.promiseDefer(),
@@ -76,8 +76,8 @@ export class CoreSharedFilesHelperProvider {
     /**
      * Go to the choose site view.
      *
-     * @param {string} filePath File path to send to the view.
-     * @param {boolean} [isInbox] Whether the file is in the Inbox folder.
+     * @param filePath File path to send to the view.
+     * @param isInbox Whether the file is in the Inbox folder.
      */
     goToChooseSite(filePath: string, isInbox?: boolean): void {
         const navCtrl = this.appProvider.getRootNavController();
@@ -87,7 +87,7 @@ export class CoreSharedFilesHelperProvider {
     /**
      * Whether the user is already choosing a site to store a shared file.
      *
-     * @return {boolean} Whether the user is already choosing a site to store a shared file.
+     * @return Whether the user is already choosing a site to store a shared file.
      */
     protected isChoosingSite(): boolean {
         const navCtrl = this.appProvider.getRootNavController();
@@ -98,8 +98,8 @@ export class CoreSharedFilesHelperProvider {
     /**
      * Open the view to select a shared file.
      *
-     * @param  {string[]} [mimetypes] List of supported mimetypes. If undefined, all mimetypes supported.
-     * @return {Promise<any>} Promise resolved when a file is picked, rejected if file picker is closed without selecting a file.
+     * @param mimetypes List of supported mimetypes. If undefined, all mimetypes supported.
+     * @return Promise resolved when a file is picked, rejected if file picker is closed without selecting a file.
      */
     pickSharedFile(mimetypes?: string[]): Promise<any> {
         return new Promise((resolve, reject): void => {
@@ -130,9 +130,9 @@ export class CoreSharedFilesHelperProvider {
     /**
      * Delete a shared file.
      *
-     * @param {any} fileEntry The file entry to delete.
-     * @param {boolean} [isInbox] Whether the file is in the Inbox folder.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param fileEntry The file entry to delete.
+     * @param isInbox Whether the file is in the Inbox folder.
+     * @return Promise resolved when done.
      */
     protected removeSharedFile(fileEntry: any, isInbox?: boolean): Promise<any> {
         if (isInbox) {
@@ -147,8 +147,8 @@ export class CoreSharedFilesHelperProvider {
      * If more than one site is found, the user will have to choose the site where to store it in.
      * If more than one file is found, treat only the first one.
      *
-     * @param {string} [path] Path to a file received when launching the app.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param path Path to a file received when launching the app.
+     * @return Promise resolved when done.
      */
     searchIOSNewSharedFiles(path?: string): Promise<any> {
         return this.initDelegate.ready().then(() => {
@@ -190,10 +190,10 @@ export class CoreSharedFilesHelperProvider {
     /**
      * Store a shared file in a site's shared files folder.
      *
-     * @param {any} fileEntry Shared file entry.
-     * @param {string} [siteId]  Site ID. If not defined, current site.
-     * @param {boolean} [isInbox] Whether the file is in the Inbox folder.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param fileEntry Shared file entry.
+     * @param siteId Site ID. If not defined, current site.
+     * @param isInbox Whether the file is in the Inbox folder.
+     * @return Promise resolved when done.
      */
     storeSharedFileInSite(fileEntry: any, siteId?: string, isInbox?: boolean): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
diff --git a/src/core/sharedfiles/providers/sharedfiles.ts b/src/core/sharedfiles/providers/sharedfiles.ts
index 1938c1ec4..0c31bf8a1 100644
--- a/src/core/sharedfiles/providers/sharedfiles.ts
+++ b/src/core/sharedfiles/providers/sharedfiles.ts
@@ -59,7 +59,7 @@ export class CoreSharedFilesProvider {
      * Checks if there is a new file received in iOS. If more than one file is found, treat only the first one.
      * The file returned is marked as "treated" and will be deleted in the next execution.
      *
-     * @return {Promise<any>} Promise resolved with a new file to be treated. If no new files found, promise is rejected.
+     * @return Promise resolved with a new file to be treated. If no new files found, promise is rejected.
      */
     checkIOSNewFiles(): Promise<any> {
         this.logger.debug('Search for new files on iOS');
@@ -110,8 +110,8 @@ export class CoreSharedFilesProvider {
     /**
      * Deletes a file in the Inbox folder (shared with the app).
      *
-     * @param {any} entry FileEntry.
-     * @return {Promise<any>} Promise resolved when done, rejected otherwise.
+     * @param entry FileEntry.
+     * @return Promise resolved when done, rejected otherwise.
      */
     deleteInboxFile(entry: any): Promise<any> {
         this.logger.debug('Delete inbox file: ' + entry.name);
@@ -132,8 +132,8 @@ export class CoreSharedFilesProvider {
     /**
      * Get the ID of a file for managing "treated" files.
      *
-     * @param {any} entry FileEntry.
-     * @return {string} File ID.
+     * @param entry FileEntry.
+     * @return File ID.
      */
     protected getFileId(entry: any): string {
         return <string> Md5.hashAsciiStr(entry.name);
@@ -142,10 +142,10 @@ export class CoreSharedFilesProvider {
     /**
      * Get the shared files stored in a site.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {string} [path] Path to search inside the site shared folder.
-     * @param {string[]} [mimetypes] List of supported mimetypes. If undefined, all mimetypes supported.
-     * @return {Promise<any[]>} Promise resolved with the files.
+     * @param siteId Site ID. If not defined, current site.
+     * @param path Path to search inside the site shared folder.
+     * @param mimetypes List of supported mimetypes. If undefined, all mimetypes supported.
+     * @return Promise resolved with the files.
      */
     getSiteSharedFiles(siteId?: string, path?: string, mimetypes?: string[]): Promise<any[]> {
         let pathToGet = this.getSiteSharedFilesDirPath(siteId);
@@ -174,8 +174,8 @@ export class CoreSharedFilesProvider {
     /**
      * Get the path to a site's shared files folder.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {string} Path.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Path.
      */
     getSiteSharedFilesDirPath(siteId?: string): string {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -186,8 +186,8 @@ export class CoreSharedFilesProvider {
     /**
      * Check if a file has been treated already.
      *
-     * @param {string} fileId File ID.
-     * @return {Promise<any>} Resolved if treated, rejected otherwise.
+     * @param fileId File ID.
+     * @return Resolved if treated, rejected otherwise.
      */
     protected isFileTreated(fileId: string): Promise<any> {
         return this.appDB.getRecord(this.SHARED_FILES_TABLE, { id: fileId });
@@ -196,8 +196,8 @@ export class CoreSharedFilesProvider {
     /**
      * Mark a file as treated.
      *
-     * @param {string} fileId File ID.
-     * @return {Promise<any>} Promise resolved when marked.
+     * @param fileId File ID.
+     * @return Promise resolved when marked.
      */
     protected markAsTreated(fileId: string): Promise<any> {
         // Check if it's already marked.
@@ -210,10 +210,10 @@ export class CoreSharedFilesProvider {
     /**
      * Store a file in a site's shared folder.
      *
-     * @param {any} entry File entry.
-     * @param {string} [newName] Name of the new file. If not defined, use original file's name.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}Promise resolved when done.
+     * @param entry File entry.
+     * @param newName Name of the new file. If not defined, use original file's name.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
      */
     storeFileInSite(entry: any, newName?: string, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -240,8 +240,8 @@ export class CoreSharedFilesProvider {
     /**
      * Unmark a file as treated.
      *
-     * @param {string} fileId File ID.
-     * @return {Promise<any>} Resolved when unmarked.
+     * @param fileId File ID.
+     * @return Resolved when unmarked.
      */
     protected unmarkAsTreated(fileId: string): Promise<any> {
         return this.appDB.deleteRecords(this.SHARED_FILES_TABLE, { id: fileId });
diff --git a/src/core/sharedfiles/providers/upload-handler.ts b/src/core/sharedfiles/providers/upload-handler.ts
index da602b2b3..6eab53615 100644
--- a/src/core/sharedfiles/providers/upload-handler.ts
+++ b/src/core/sharedfiles/providers/upload-handler.ts
@@ -29,7 +29,7 @@ export class CoreSharedFilesUploadHandler implements CoreFileUploaderHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.platform.is('ios');
@@ -38,8 +38,8 @@ export class CoreSharedFilesUploadHandler implements CoreFileUploaderHandler {
     /**
      * Given a list of mimetypes, return the ones that are supported by the handler.
      *
-     * @param {string[]} [mimetypes] List of mimetypes.
-     * @return {string[]} Supported mimetypes.
+     * @param mimetypes List of mimetypes.
+     * @return Supported mimetypes.
      */
     getSupportedMimetypes(mimetypes: string[]): string[] {
         return mimetypes;
@@ -48,7 +48,7 @@ export class CoreSharedFilesUploadHandler implements CoreFileUploaderHandler {
     /**
      * Get the data to display the handler.
      *
-     * @return {CoreFileUploaderHandlerData} Data.
+     * @return Data.
      */
     getData(): CoreFileUploaderHandlerData {
         return {
diff --git a/src/core/sitehome/components/index/index.ts b/src/core/sitehome/components/index/index.ts
index 8c8a511c1..efc92458d 100644
--- a/src/core/sitehome/components/index/index.ts
+++ b/src/core/sitehome/components/index/index.ts
@@ -58,7 +58,7 @@ export class CoreSiteHomeIndexComponent implements OnInit {
     /**
      * Refresh the data.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     doRefresh(refresher: any): void {
         const promises = [];
@@ -93,7 +93,7 @@ export class CoreSiteHomeIndexComponent implements OnInit {
     /**
      * Convenience function to fetch the data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected loadContent(): Promise<any> {
         this.hasContent = false;
diff --git a/src/core/sitehome/providers/index-link-handler.ts b/src/core/sitehome/providers/index-link-handler.ts
index f0e15ad31..2f57e218b 100644
--- a/src/core/sitehome/providers/index-link-handler.ts
+++ b/src/core/sitehome/providers/index-link-handler.ts
@@ -36,11 +36,11 @@ export class CoreSiteHomeIndexLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
         CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -55,11 +55,11 @@ export class CoreSiteHomeIndexLinkHandler extends CoreContentLinksHandlerBase {
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         courseId = parseInt(params.id, 10);
diff --git a/src/core/sitehome/providers/sitehome.ts b/src/core/sitehome/providers/sitehome.ts
index 2d5fa3aaf..207916fe9 100644
--- a/src/core/sitehome/providers/sitehome.ts
+++ b/src/core/sitehome/providers/sitehome.ts
@@ -34,8 +34,8 @@ export class CoreSiteHomeProvider {
     /**
      * Get the news forum for the Site Home.
      *
-     * @param {number} siteHomeId Site Home ID.
-     * @return {Promise<any>} Promise resolved with the forum if found, rejected otherwise.
+     * @param siteHomeId Site Home ID.
+     * @return Promise resolved with the forum if found, rejected otherwise.
      */
     getNewsForum(siteHomeId: number): Promise<any> {
         return this.forumProvider.getCourseForums(siteHomeId).then((forums) => {
@@ -52,8 +52,8 @@ export class CoreSiteHomeProvider {
     /**
      * Invalidate the WS call to get the news forum for the Site Home.
      *
-     * @param {number} siteHomeId Site Home ID.
-     * @return {Promise<any>} Promise resolved when invalidated.
+     * @param siteHomeId Site Home ID.
+     * @return Promise resolved when invalidated.
      */
     invalidateNewsForum(siteHomeId: number): Promise<any> {
         return this.forumProvider.invalidateForumData(siteHomeId);
@@ -62,8 +62,8 @@ export class CoreSiteHomeProvider {
     /**
      * Returns whether or not the frontpage is available for the current site.
      *
-     * @param {string} [siteId] The site ID. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with boolean: whether it's available.
+     * @param siteId The site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether it's available.
      */
     isAvailable(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -112,8 +112,8 @@ export class CoreSiteHomeProvider {
     /**
      * Check if Site Home is disabled in a certain site.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>} Promise resolved with true if disabled, rejected or resolved with false otherwise.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if disabled, rejected or resolved with false otherwise.
      */
     isDisabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -124,8 +124,8 @@ export class CoreSiteHomeProvider {
     /**
      * Check if Site Home is disabled in a certain site.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether it's disabled.
+     * @param site Site. If not defined, use current site.
+     * @return Whether it's disabled.
      */
     isDisabledInSite(site: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
diff --git a/src/core/siteplugins/classes/call-ws-click-directive.ts b/src/core/siteplugins/classes/call-ws-click-directive.ts
index c6c598b53..eb88363fe 100644
--- a/src/core/siteplugins/classes/call-ws-click-directive.ts
+++ b/src/core/siteplugins/classes/call-ws-click-directive.ts
@@ -63,7 +63,7 @@ export class CoreSitePluginsCallWSOnClickBaseDirective extends CoreSitePluginsCa
     /**
      * Call a WS.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected callWS(): Promise<any> {
         const modal = this.domUtils.showModalLoading();
diff --git a/src/core/siteplugins/classes/call-ws-directive.ts b/src/core/siteplugins/classes/call-ws-directive.ts
index 08dac6c7f..fb4f7d1f8 100644
--- a/src/core/siteplugins/classes/call-ws-directive.ts
+++ b/src/core/siteplugins/classes/call-ws-directive.ts
@@ -57,7 +57,7 @@ export class CoreSitePluginsCallWSBaseDirective implements OnInit, OnDestroy {
     /**
      * Call a WS.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected callWS(): Promise<any> {
         const params = this.getParamsForWS();
@@ -78,7 +78,7 @@ export class CoreSitePluginsCallWSBaseDirective implements OnInit, OnDestroy {
     /**
      * Get the params for the WS call.
      *
-     * @return {any} Params.
+     * @return Params.
      */
     protected getParamsForWS(): any {
         let params = this.params || {};
@@ -97,7 +97,7 @@ export class CoreSitePluginsCallWSBaseDirective implements OnInit, OnDestroy {
     /**
      * Function called when the WS call is successful.
      *
-     * @param {any} result Result of the WS call.
+     * @param result Result of the WS call.
      */
     protected wsCallSuccess(result: any): void {
         // Function to be overridden.
@@ -106,7 +106,7 @@ export class CoreSitePluginsCallWSBaseDirective implements OnInit, OnDestroy {
     /**
      * Invalidate the WS call.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     invalidate(): Promise<any> {
         const params = this.getParamsForWS();
diff --git a/src/core/siteplugins/classes/compile-init-component.ts b/src/core/siteplugins/classes/compile-init-component.ts
index 96bf80965..c71fe3b6f 100644
--- a/src/core/siteplugins/classes/compile-init-component.ts
+++ b/src/core/siteplugins/classes/compile-init-component.ts
@@ -29,7 +29,7 @@ export class CoreSitePluginsCompileInitComponent {
     /**
      * Function called when the component is created.
      *
-     * @param {any} instance The component instance.
+     * @param instance The component instance.
      */
     componentCreated(instance: any): void {
         // Check if the JS defined an init function.
@@ -42,7 +42,7 @@ export class CoreSitePluginsCompileInitComponent {
     /**
      * Get the handler data.
      *
-     * @param {string} name The name of the handler.
+     * @param name The name of the handler.
      */
     getHandlerData(name: string): void {
         // Retrieve the handler data.
diff --git a/src/core/siteplugins/classes/handlers/assign-feedback-handler.ts b/src/core/siteplugins/classes/handlers/assign-feedback-handler.ts
index 0948c0c8c..527c6bb3e 100644
--- a/src/core/siteplugins/classes/handlers/assign-feedback-handler.ts
+++ b/src/core/siteplugins/classes/handlers/assign-feedback-handler.ts
@@ -30,10 +30,10 @@ export class CoreSitePluginsAssignFeedbackHandler extends AddonModAssignBaseFeed
      * Return the Component to use to display the plugin data, either in read or in edit mode.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} plugin The plugin object.
-     * @param {boolean} [edit] Whether the user is editing.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param plugin The plugin object.
+     * @param edit Whether the user is editing.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any, edit?: boolean): any | Promise<any> {
         return CoreSitePluginsAssignFeedbackComponent;
@@ -42,8 +42,8 @@ export class CoreSitePluginsAssignFeedbackHandler extends AddonModAssignBaseFeed
     /**
      * Get a readable name to use for the plugin.
      *
-     * @param {any} plugin The plugin object.
-     * @return {string} The plugin name.
+     * @param plugin The plugin object.
+     * @return The plugin name.
      */
     getPluginName(plugin: any): string {
         // Check if there's a translated string for the plugin.
diff --git a/src/core/siteplugins/classes/handlers/assign-submission-handler.ts b/src/core/siteplugins/classes/handlers/assign-submission-handler.ts
index 9658a370e..85de62cb0 100644
--- a/src/core/siteplugins/classes/handlers/assign-submission-handler.ts
+++ b/src/core/siteplugins/classes/handlers/assign-submission-handler.ts
@@ -30,10 +30,10 @@ export class CoreSitePluginsAssignSubmissionHandler extends AddonModAssignBaseSu
      * Return the Component to use to display the plugin data, either in read or in edit mode.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} plugin The plugin object.
-     * @param {boolean} [edit] Whether the user is editing.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param plugin The plugin object.
+     * @param edit Whether the user is editing.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector, plugin: any, edit?: boolean): any | Promise<any> {
         return CoreSitePluginsAssignSubmissionComponent;
@@ -42,8 +42,8 @@ export class CoreSitePluginsAssignSubmissionHandler extends AddonModAssignBaseSu
     /**
      * Get a readable name to use for the plugin.
      *
-     * @param {any} plugin The plugin object.
-     * @return {string} The plugin name.
+     * @param plugin The plugin object.
+     * @return The plugin name.
      */
     getPluginName(plugin: any): string {
         // Check if there's a translated string for the plugin.
@@ -64,7 +64,7 @@ export class CoreSitePluginsAssignSubmissionHandler extends AddonModAssignBaseSu
     /**
      * Whether or not the handler is enabled for edit on a site level.
      *
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled for edit on a site level.
+     * @return Whether or not the handler is enabled for edit on a site level.
      */
     isEnabledForEdit(): boolean | Promise<boolean> {
         return true;
diff --git a/src/core/siteplugins/classes/handlers/base-handler.ts b/src/core/siteplugins/classes/handlers/base-handler.ts
index 7226a0202..dc68d6b43 100644
--- a/src/core/siteplugins/classes/handlers/base-handler.ts
+++ b/src/core/siteplugins/classes/handlers/base-handler.ts
@@ -24,7 +24,7 @@ export class CoreSitePluginsBaseHandler implements CoreDelegateHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
+     * @return A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/core/siteplugins/classes/handlers/block-handler.ts b/src/core/siteplugins/classes/handlers/block-handler.ts
index b4734d36e..25602a22e 100644
--- a/src/core/siteplugins/classes/handlers/block-handler.ts
+++ b/src/core/siteplugins/classes/handlers/block-handler.ts
@@ -33,11 +33,11 @@ export class CoreSitePluginsBlockHandler extends CoreSitePluginsBaseHandler impl
      * Gets display data for this block. The class and title can be provided either by data from
      * the handler schema (mobile.php) or using default values.
      *
-     * @param {Injector} injector Injector
-     * @param {any} block Block data
-     * @param {string} contextLevel Context level (not used)
-     * @param {number} instanceId Instance id (not used)
-     * @return {CoreBlockHandlerData|Promise<CoreBlockHandlerData>} Data or promise resolved with the data
+     * @param injector Injector
+     * @param block Block data
+     * @param contextLevel Context level (not used)
+     * @param instanceId Instance id (not used)
+     * @return Data or promise resolved with the data
      */
     getDisplayData(injector: Injector, block: any, contextLevel: string, instanceId: number):
             CoreBlockHandlerData | Promise<CoreBlockHandlerData> {
diff --git a/src/core/siteplugins/classes/handlers/course-format-handler.ts b/src/core/siteplugins/classes/handlers/course-format-handler.ts
index b8453ca2a..83a1d5149 100644
--- a/src/core/siteplugins/classes/handlers/course-format-handler.ts
+++ b/src/core/siteplugins/classes/handlers/course-format-handler.ts
@@ -29,8 +29,8 @@ export class CoreSitePluginsCourseFormatHandler extends CoreSitePluginsBaseHandl
     /**
      * Whether it allows seeing all sections at the same time. Defaults to true.
      *
-     * @param {any} course The course to check.
-     * @type {boolean} Whether it can view all sections.
+     * @param course The course to check.
+     * @return Whether it can view all sections.
      */
     canViewAllSections(course: any): boolean {
         return typeof this.handlerSchema.canviewallsections != 'undefined' ? this.handlerSchema.canviewallsections : true;
@@ -39,8 +39,8 @@ export class CoreSitePluginsCourseFormatHandler extends CoreSitePluginsBaseHandl
     /**
      * Whether the option to enable section/module download should be displayed. Defaults to true.
      *
-     * @param {any} course The course to check.
-     * @type {boolean} Whether the option to enable section/module download should be displayed.
+     * @param course The course to check.
+     * @return Whether the option to enable section/module download should be displayed.
      */
     displayEnableDownload(course: any): boolean {
         return typeof this.handlerSchema.displayenabledownload != 'undefined' ? this.handlerSchema.displayenabledownload : true;
@@ -49,8 +49,8 @@ export class CoreSitePluginsCourseFormatHandler extends CoreSitePluginsBaseHandl
     /**
      * Whether the default section selector should be displayed. Defaults to true.
      *
-     * @param {any} course The course to check.
-     * @type {boolean} Whether the default section selector should be displayed.
+     * @param course The course to check.
+     * @return Whether the default section selector should be displayed.
      */
     displaySectionSelector(course: any): boolean {
         return typeof this.handlerSchema.displaysectionselector != 'undefined' ? this.handlerSchema.displaysectionselector : true;
@@ -62,9 +62,9 @@ export class CoreSitePluginsCourseFormatHandler extends CoreSitePluginsBaseHandl
      * If you want to customize the default format there are several methods to customize parts of it.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param course The course to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getCourseFormatComponent(injector: Injector, course: any): any | Promise<any> {
         if (this.handlerSchema.method) {
diff --git a/src/core/siteplugins/classes/handlers/course-option-handler.ts b/src/core/siteplugins/classes/handlers/course-option-handler.ts
index e3fde2bd2..4bc1f7ce2 100644
--- a/src/core/siteplugins/classes/handlers/course-option-handler.ts
+++ b/src/core/siteplugins/classes/handlers/course-option-handler.ts
@@ -42,11 +42,11 @@ export class CoreSitePluginsCourseOptionHandler extends CoreSitePluginsBaseHandl
     /**
      * Whether or not the handler is enabled for a certain course.
      *
-     * @param {number} courseId The course ID.
-     * @param {any} accessData Access type and data. Default, guest, ...
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @param courseId The course ID.
+     * @param accessData Access type and data. Default, guest, ...
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabledForCourse(courseId: number, accessData: any, navOptions?: any, admOptions?: any): boolean | Promise<boolean> {
         // Wait for "init" result to be updated.
@@ -61,9 +61,9 @@ export class CoreSitePluginsCourseOptionHandler extends CoreSitePluginsBaseHandl
     /**
      * Returns the data needed to render the handler (if it isn't a menu handler).
      *
-     * @param {Injector} injector Injector.
-     * @param {number} course The course.
-     * @return {CoreCourseOptionsHandlerData|Promise<CoreCourseOptionsHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param course The course.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, course: any): CoreCourseOptionsHandlerData | Promise<CoreCourseOptionsHandlerData> {
         return {
@@ -79,9 +79,9 @@ export class CoreSitePluginsCourseOptionHandler extends CoreSitePluginsBaseHandl
     /**
      * Returns the data needed to render the handler (if it's a menu handler).
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course.
-     * @return {CoreCourseOptionsMenuHandlerData|Promise<CoreCourseOptionsMenuHandlerData>} Data or promise resolved with data.
+     * @param injector Injector.
+     * @param course The course.
+     * @return Data or promise resolved with data.
      */
     getMenuDisplayData(injector: Injector, course: any):
             CoreCourseOptionsMenuHandlerData | Promise<CoreCourseOptionsMenuHandlerData> {
@@ -106,8 +106,8 @@ export class CoreSitePluginsCourseOptionHandler extends CoreSitePluginsBaseHandl
     /**
      * Called when a course is downloaded. It should prefetch all the data to be able to see the plugin in offline.
      *
-     * @param {any} course The course.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param course The course.
+     * @return Promise resolved when done.
      */
     prefetch(course: any): Promise<any> {
         const args = {
@@ -121,7 +121,7 @@ export class CoreSitePluginsCourseOptionHandler extends CoreSitePluginsBaseHandl
     /**
      * Set init result.
      *
-     * @param {any} result Result to set.
+     * @param result Result to set.
      */
     setInitResult(result: any): void {
         this.initResult = result;
diff --git a/src/core/siteplugins/classes/handlers/main-menu-handler.ts b/src/core/siteplugins/classes/handlers/main-menu-handler.ts
index db47e3598..09be56f52 100644
--- a/src/core/siteplugins/classes/handlers/main-menu-handler.ts
+++ b/src/core/siteplugins/classes/handlers/main-menu-handler.ts
@@ -31,7 +31,7 @@ export class CoreSitePluginsMainMenuHandler extends CoreSitePluginsBaseHandler i
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreMainMenuHandlerData} Data.
+     * @return Data.
      */
     getDisplayData(): CoreMainMenuHandlerData {
         return {
diff --git a/src/core/siteplugins/classes/handlers/message-output-handler.ts b/src/core/siteplugins/classes/handlers/message-output-handler.ts
index 264008d64..51e636e78 100644
--- a/src/core/siteplugins/classes/handlers/message-output-handler.ts
+++ b/src/core/siteplugins/classes/handlers/message-output-handler.ts
@@ -28,7 +28,7 @@ export class CoreSitePluginsMessageOutputHandler extends CoreSitePluginsBaseHand
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {AddonMessageOutputHandlerData} Data.
+     * @return Data.
      */
     getDisplayData(): AddonMessageOutputHandlerData {
         return {
diff --git a/src/core/siteplugins/classes/handlers/module-handler.ts b/src/core/siteplugins/classes/handlers/module-handler.ts
index 41cffe6c6..bb454ea11 100644
--- a/src/core/siteplugins/classes/handlers/module-handler.ts
+++ b/src/core/siteplugins/classes/handlers/module-handler.ts
@@ -40,10 +40,10 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
     /**
      * Get the data required to display the module in the course contents view.
      *
-     * @param {any} module The module object.
-     * @param {number} courseId The course ID.
-     * @param {number} sectionId The section ID.
-     * @return {CoreCourseModuleHandlerData} Data to render the module.
+     * @param module The module object.
+     * @param courseId The course ID.
+     * @param sectionId The section ID.
+     * @return Data to render the module.
      */
     getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
         const hasOffline = !!(this.handlerSchema.offlinefunctions && Object.keys(this.handlerSchema.offlinefunctions).length),
@@ -70,7 +70,7 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
     /**
      * Get the icon src for the module.
      *
-     * @return {string} The icon src.
+     * @return The icon src.
      */
     getIconSrc(): string {
         return this.handlerSchema.displaydata.icon;
@@ -81,10 +81,10 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
      * The component returned must implement CoreCourseModuleMainComponent.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} course The course object.
-     * @param {any} module The module object.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param course The course object.
+     * @param module The module object.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getMainComponent(injector: Injector, course: any, module: any): any | Promise<any> {
         return CoreSitePluginsModuleIndexComponent;
diff --git a/src/core/siteplugins/classes/handlers/module-prefetch-handler.ts b/src/core/siteplugins/classes/handlers/module-prefetch-handler.ts
index 434838b75..91788299b 100644
--- a/src/core/siteplugins/classes/handlers/module-prefetch-handler.ts
+++ b/src/core/siteplugins/classes/handlers/module-prefetch-handler.ts
@@ -54,10 +54,10 @@ export class CoreSitePluginsModulePrefetchHandler extends CoreCourseActivityPref
     /**
      * Download the module.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when all content is downloaded.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when all content is downloaded.
      */
     download(module: any, courseId: number, dirPath?: string): Promise<any> {
         return this.prefetchPackage(module, courseId, false, this.downloadPrefetchPlugin.bind(this), undefined, false, dirPath);
@@ -66,13 +66,13 @@ export class CoreSitePluginsModulePrefetchHandler extends CoreCourseActivityPref
     /**
      * Download or prefetch the plugin, downloading the files and calling the needed WS.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {boolean} [prefetch] True to prefetch, false to download right away.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param siteId Site ID. If not defined, current site.
+     * @param prefetch True to prefetch, false to download right away.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
      */
     protected downloadPrefetchPlugin(module: any, courseId: number, single?: boolean, siteId?: string, prefetch?: boolean,
             dirPath?: string): Promise<any> {
@@ -99,11 +99,11 @@ export class CoreSitePluginsModulePrefetchHandler extends CoreCourseActivityPref
     /**
      * Download or prefetch the plugin files.
      *
-     * @param {any} module The module object returned by WS.
-     * @param {number} courseId Course ID.
-     * @param {boolean} [prefetch] True to prefetch, false to download right away.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @param prefetch True to prefetch, false to download right away.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
      */
     protected downloadOrPrefetchFiles(siteId: string, module: any, courseId: number, prefetch?: boolean, dirPath?: string)
             : Promise<any> {
@@ -137,11 +137,11 @@ export class CoreSitePluginsModulePrefetchHandler extends CoreCourseActivityPref
     /**
      * Get the download size of a module.
      *
-     * @param {any} module Module.
-     * @param {Number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @return {Promise<{size: number, total: boolean}>} Promise resolved with the size and a boolean indicating if it was able
-     *                                                   to calculate the total size.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @return Promise resolved with the size and a boolean indicating if it was able
+     *         to calculate the total size.
      */
     getDownloadSize(module: any, courseId: number, single?: boolean): Promise<{ size: number, total: boolean }> {
         // In most cases, to calculate the size we'll have to do all the WS calls. Just return unknown size.
@@ -151,9 +151,9 @@ export class CoreSitePluginsModulePrefetchHandler extends CoreCourseActivityPref
     /**
      * Invalidate the prefetched content.
      *
-     * @param {number} moduleId The module ID.
-     * @param {number} courseId Course ID the module belongs to.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param moduleId The module ID.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(moduleId: number, courseId: number): Promise<any> {
         const promises = [],
@@ -186,7 +186,7 @@ export class CoreSitePluginsModulePrefetchHandler extends CoreCourseActivityPref
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
+     * @return A boolean, or a promise resolved with a boolean, indicating if the handler is enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -195,10 +195,10 @@ export class CoreSitePluginsModulePrefetchHandler extends CoreCourseActivityPref
     /**
      * Load module contents into module.contents if they aren't loaded already.
      *
-     * @param {any} module Module to load the contents.
-     * @param {number} [courseId] The course ID. Recommended to speed up the process and minimize data usage.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise}           Promise resolved when loaded.
+     * @param module Module to load the contents.
+     * @param courseId The course ID. Recommended to speed up the process and minimize data usage.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise resolved when loaded.
      */
     loadContents(module: any, courseId: number, ignoreCache?: boolean): Promise<void> {
         if (this.isResource) {
@@ -211,11 +211,11 @@ export class CoreSitePluginsModulePrefetchHandler extends CoreCourseActivityPref
     /**
      * Prefetch a module.
      *
-     * @param {any} module Module.
-     * @param {number} courseId Course ID the module belongs to.
-     * @param {boolean} [single] True if we're downloading a single module, false if we're downloading a whole section.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
      */
     prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string): Promise<any> {
         return this.prefetchPackage(module, courseId, false, this.downloadPrefetchPlugin.bind(this), undefined, true, dirPath);
diff --git a/src/core/siteplugins/classes/handlers/question-behaviour-handler.ts b/src/core/siteplugins/classes/handlers/question-behaviour-handler.ts
index 1b7a8372f..62ad964b9 100644
--- a/src/core/siteplugins/classes/handlers/question-behaviour-handler.ts
+++ b/src/core/siteplugins/classes/handlers/question-behaviour-handler.ts
@@ -31,10 +31,10 @@ export class CoreSitePluginsQuestionBehaviourHandler extends CoreQuestionBehavio
      * If the behaviour requires a submit button, it should add it to question.behaviourButtons.
      * If the behaviour requires to show some extra data, it should return the components to render it.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question.
-     * @return {any[]|Promise<any[]>} Components (or promise resolved with components) to render some extra data in the question
-     *                                (e.g. certainty options). Don't return anything if no extra data is required.
+     * @param injector Injector.
+     * @param question The question.
+     * @return Components (or promise resolved with components) to render some extra data in the question
+     *         (e.g. certainty options). Don't return anything if no extra data is required.
      */
     handleQuestion(injector: Injector, question: any): any[] | Promise<any[]> {
         if (this.hasTemplate) {
diff --git a/src/core/siteplugins/classes/handlers/question-handler.ts b/src/core/siteplugins/classes/handlers/question-handler.ts
index b0be9ed6a..51ce3885c 100644
--- a/src/core/siteplugins/classes/handlers/question-handler.ts
+++ b/src/core/siteplugins/classes/handlers/question-handler.ts
@@ -29,9 +29,9 @@ export class CoreSitePluginsQuestionHandler extends CoreQuestionBaseHandler {
      * Return the Component to use to display the question.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} question The question to render.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param question The question to render.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return CoreSitePluginsQuestionComponent;
diff --git a/src/core/siteplugins/classes/handlers/quiz-access-rule-handler.ts b/src/core/siteplugins/classes/handlers/quiz-access-rule-handler.ts
index 5ddf618f3..c72ba32ca 100644
--- a/src/core/siteplugins/classes/handlers/quiz-access-rule-handler.ts
+++ b/src/core/siteplugins/classes/handlers/quiz-access-rule-handler.ts
@@ -25,11 +25,11 @@ export class CoreSitePluginsQuizAccessRuleHandler {
     /**
      * Whether the rule requires a preflight check when prefetch/start/continue an attempt.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} [attempt] The attempt started/continued. If not supplied, user is starting a new attempt.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean|Promise<boolean>} Whether the rule requires a preflight check.
+     * @param quiz The quiz the rule belongs to.
+     * @param attempt The attempt started/continued. If not supplied, user is starting a new attempt.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Whether the rule requires a preflight check.
      */
     isPreflightCheckRequired(quiz: any, attempt?: any, prefetch?: boolean, siteId?: string): boolean | Promise<boolean> {
         return this.hasTemplate;
@@ -38,12 +38,12 @@ export class CoreSitePluginsQuizAccessRuleHandler {
     /**
      * Add preflight data that doesn't require user interaction. The data should be added to the preflightData param.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} preflightData Object where to add the preflight data.
-     * @param {any} [attempt] The attempt started/continued. If not supplied, user is starting a new attempt.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} Promise resolved when done if async, void if it's synchronous.
+     * @param quiz The quiz the rule belongs to.
+     * @param preflightData Object where to add the preflight data.
+     * @param attempt The attempt started/continued. If not supplied, user is starting a new attempt.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done if async, void if it's synchronous.
      */
     getFixedPreflightData(quiz: any, preflightData: any, attempt?: any, prefetch?: boolean, siteId?: string): void | Promise<any> {
         // Nothing to do.
@@ -54,8 +54,8 @@ export class CoreSitePluginsQuizAccessRuleHandler {
      * Implement this if your access rule requires a preflight check with user interaction.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getPreflightComponent(injector: Injector): any | Promise<any> {
         if (this.hasTemplate) {
@@ -66,12 +66,12 @@ export class CoreSitePluginsQuizAccessRuleHandler {
     /**
      * Function called when the preflight check has passed. This is a chance to record that fact in some way.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} attempt The attempt started/continued.
-     * @param {any} preflightData Preflight data gathered.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} Promise resolved when done if async, void if it's synchronous.
+     * @param quiz The quiz the rule belongs to.
+     * @param attempt The attempt started/continued.
+     * @param preflightData Preflight data gathered.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done if async, void if it's synchronous.
      */
     notifyPreflightCheckPassed(quiz: any, attempt: any, preflightData: any, prefetch?: boolean, siteId?: string)
             : void | Promise<any> {
@@ -81,12 +81,12 @@ export class CoreSitePluginsQuizAccessRuleHandler {
     /**
      * Function called when the preflight check fails. This is a chance to record that fact in some way.
      *
-     * @param {any} quiz The quiz the rule belongs to.
-     * @param {any} attempt The attempt started/continued.
-     * @param {any} preflightData Preflight data gathered.
-     * @param {boolean} [prefetch] Whether the user is prefetching the quiz.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {void|Promise<any>} Promise resolved when done if async, void if it's synchronous.
+     * @param quiz The quiz the rule belongs to.
+     * @param attempt The attempt started/continued.
+     * @param preflightData Preflight data gathered.
+     * @param prefetch Whether the user is prefetching the quiz.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done if async, void if it's synchronous.
      */
     notifyPreflightCheckFailed(quiz: any, attempt: any, preflightData: any, prefetch?: boolean, siteId?: string)
             : void | Promise<any> {
@@ -96,10 +96,10 @@ export class CoreSitePluginsQuizAccessRuleHandler {
     /**
      * Whether or not the time left of an attempt should be displayed.
      *
-     * @param {any} attempt The attempt.
-     * @param {number} endTime The attempt end time (in seconds).
-     * @param {number} timeNow The current time in seconds.
-     * @return {boolean} Whether it should be displayed.
+     * @param attempt The attempt.
+     * @param endTime The attempt end time (in seconds).
+     * @param timeNow The current time in seconds.
+     * @return Whether it should be displayed.
      */
     shouldShowTimeLeft(attempt: any, endTime: number, timeNow: number): boolean {
         return false;
diff --git a/src/core/siteplugins/classes/handlers/settings-handler.ts b/src/core/siteplugins/classes/handlers/settings-handler.ts
index a90764c8b..ee788d317 100644
--- a/src/core/siteplugins/classes/handlers/settings-handler.ts
+++ b/src/core/siteplugins/classes/handlers/settings-handler.ts
@@ -31,7 +31,7 @@ export class CoreSitePluginsSettingsHandler extends CoreSitePluginsBaseHandler i
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreSettingsHandlerData} Data.
+     * @return Data.
      */
     getDisplayData(): CoreSettingsHandlerData {
         return {
diff --git a/src/core/siteplugins/classes/handlers/user-handler.ts b/src/core/siteplugins/classes/handlers/user-handler.ts
index 5bd01b063..bb5b6bbf7 100644
--- a/src/core/siteplugins/classes/handlers/user-handler.ts
+++ b/src/core/siteplugins/classes/handlers/user-handler.ts
@@ -24,7 +24,6 @@ import { CoreUtilsProvider, PromiseDefer } from '@providers/utils/utils';
 export class CoreSitePluginsUserProfileHandler extends CoreSitePluginsBaseHandler implements CoreUserProfileHandler {
     /**
      * The highest priority is displayed first.
-     * @type {number}
      */
     priority: number;
 
@@ -34,7 +33,6 @@ export class CoreSitePluginsUserProfileHandler extends CoreSitePluginsBaseHandle
      * - TYPE_NEW_PAGE: will be displayed as a list of items. Should have icon. Spinner not used.
      *     Default value if none is specified.
      * - TYPE_ACTION: will be displayed as a button and should not redirect to any state. Spinner use is recommended.
-     * @type {string}
      */
     type: string;
 
@@ -54,11 +52,11 @@ export class CoreSitePluginsUserProfileHandler extends CoreSitePluginsBaseHandle
 
     /**
      * Whether or not the handler is enabled for a user.
-     * @param  {any}     user       User object.
-     * @param  {number}  courseId   Course ID where to show.
-     * @param  {any}     [navOptions] Navigation options for the course.
-     * @param  {any}     [admOptions] Admin options for the course.
-     * @return {boolean|Promise<boolean>}            Whether or not the handler is enabled for a user.
+     * @param user User object.
+     * @param courseId Course ID where to show.
+     * @param navOptions Navigation options for the course.
+     * @param admOptions Admin options for the course.
+     * @return Whether or not the handler is enabled for a user.
      */
     isEnabledForUser(user: any, courseId: number, navOptions?: any, admOptions?: any): boolean | Promise<boolean> {
         // First check if it's enabled for the user.
@@ -75,9 +73,9 @@ export class CoreSitePluginsUserProfileHandler extends CoreSitePluginsBaseHandle
 
     /**
      * Returns the data needed to render the handler.
-     * @param  {any}     user       User object.
-     * @param  {number}  courseId   Course ID where to show.
-     * @return {CoreUserProfileHandlerData}    Data to be shown.
+     * @param user User object.
+     * @param courseId Course ID where to show.
+     * @return Data to be shown.
      */
     getDisplayData(user: any, courseId: number): CoreUserProfileHandlerData {
         return {
@@ -105,7 +103,7 @@ export class CoreSitePluginsUserProfileHandler extends CoreSitePluginsBaseHandle
     /**
      * Set init result.
      *
-     * @param {any} result Result to set.
+     * @param result Result to set.
      */
     setInitResult(result: any): void {
         this.initResult = result;
diff --git a/src/core/siteplugins/classes/handlers/user-profile-field-handler.ts b/src/core/siteplugins/classes/handlers/user-profile-field-handler.ts
index bd7c1250a..0dfebb1c0 100644
--- a/src/core/siteplugins/classes/handlers/user-profile-field-handler.ts
+++ b/src/core/siteplugins/classes/handlers/user-profile-field-handler.ts
@@ -30,8 +30,8 @@ export class CoreSitePluginsUserProfileFieldHandler extends CoreSitePluginsBaseH
      * Return the Component to use to display the user profile field.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return CoreSitePluginsUserProfileFieldComponent;
@@ -39,11 +39,11 @@ export class CoreSitePluginsUserProfileFieldHandler extends CoreSitePluginsBaseH
 
     /**
      * Get the data to send for the field based on the input data.
-     * @param  {any}     field          User field to get the data for.
-     * @param  {boolean} signup         True if user is in signup page.
-     * @param  {string}  [registerAuth] Register auth method. E.g. 'email'.
-     * @param  {any}     formValues     Form Values.
-     * @return {Promise<CoreUserProfileFieldHandlerData>|CoreUserProfileFieldHandlerData}  Data to send for the field.
+     * @param field User field to get the data for.
+     * @param signup True if user is in signup page.
+     * @param registerAuth Register auth method. E.g. 'email'.
+     * @param formValues Form Values.
+     * @return Data to send for the field.
      */
     getData(field: any, signup: boolean, registerAuth: string, formValues: any):
             Promise<CoreUserProfileFieldHandlerData> | CoreUserProfileFieldHandlerData {
diff --git a/src/core/siteplugins/classes/handlers/workshop-assessment-strategy-handler.ts b/src/core/siteplugins/classes/handlers/workshop-assessment-strategy-handler.ts
index c85da31db..e04c5b1b4 100644
--- a/src/core/siteplugins/classes/handlers/workshop-assessment-strategy-handler.ts
+++ b/src/core/siteplugins/classes/handlers/workshop-assessment-strategy-handler.ts
@@ -29,10 +29,10 @@ export class CoreSitePluginsWorkshopAssessmentStrategyHandler implements AddonWo
      * Return the Component to use to display the plugin data, either in read or in edit mode.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @param {any} plugin The plugin object.
-     * @param {boolean} [edit] Whether the user is editing.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @param plugin The plugin object.
+     * @param edit Whether the user is editing.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return CoreSitePluginsWorkshopAssessmentStrategyComponent;
@@ -41,9 +41,9 @@ export class CoreSitePluginsWorkshopAssessmentStrategyHandler implements AddonWo
     /**
      * Prepare original values to be shown and compared.
      *
-     * @param  {any}    form       Original data of the form.
-     * @param  {number} workshopId WorkShop Id
-     * @return {Promise<any[]>}    Promise resolved with original values sorted.
+     * @param form Original data of the form.
+     * @param workshopId WorkShop Id
+     * @return Promise resolved with original values sorted.
      */
      getOriginalValues(form: any, workshopId: number): Promise<any[]> {
          return Promise.resolve([]);
@@ -52,9 +52,9 @@ export class CoreSitePluginsWorkshopAssessmentStrategyHandler implements AddonWo
     /**
      * Check if the assessment data has changed for a certain submission and workshop for a this strategy plugin.
      *
-     * @param  {any[]} originalValues Original values of the form.
-     * @param  {any[]} currentValues  Current values of the form.
-     * @return {boolean}              True if data has changed, false otherwise.
+     * @param originalValues Original values of the form.
+     * @param currentValues Current values of the form.
+     * @return True if data has changed, false otherwise.
      */
     hasDataChanged(originalValues: any[], currentValues: any[]): boolean {
         return false;
@@ -62,7 +62,7 @@ export class CoreSitePluginsWorkshopAssessmentStrategyHandler implements AddonWo
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -71,9 +71,9 @@ export class CoreSitePluginsWorkshopAssessmentStrategyHandler implements AddonWo
     /**
      * Prepare assessment data to be sent to the server depending on the strategy selected.
      *
-     * @param  {any{}} currentValues Current values of the form.
-     * @param  {any}   form          Assessment form data.
-     * @return {Promise<any>}        Promise resolved with the data to be sent. Or rejected with the input errors object.
+     * @param currentValues Current values of the form.
+     * @param form Assessment form data.
+     * @return Promise resolved with the data to be sent. Or rejected with the input errors object.
      */
     prepareAssessmentData(currentValues: any[], form: any): Promise<any> {
         return Promise.resolve({});
diff --git a/src/core/siteplugins/components/assign-feedback/assign-feedback.ts b/src/core/siteplugins/components/assign-feedback/assign-feedback.ts
index 4fc0fe2eb..e7e236261 100644
--- a/src/core/siteplugins/components/assign-feedback/assign-feedback.ts
+++ b/src/core/siteplugins/components/assign-feedback/assign-feedback.ts
@@ -60,7 +60,7 @@ export class CoreSitePluginsAssignFeedbackComponent extends CoreSitePluginsCompi
     /**
      * Invalidate the data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     invalidate(): Promise<any> {
         return Promise.resolve();
diff --git a/src/core/siteplugins/components/assign-submission/assign-submission.ts b/src/core/siteplugins/components/assign-submission/assign-submission.ts
index f034caf41..572d76158 100644
--- a/src/core/siteplugins/components/assign-submission/assign-submission.ts
+++ b/src/core/siteplugins/components/assign-submission/assign-submission.ts
@@ -58,7 +58,7 @@ export class CoreSitePluginsAssignSubmissionComponent extends CoreSitePluginsCom
     /**
      * Invalidate the data.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     invalidate(): Promise<any> {
         return Promise.resolve();
diff --git a/src/core/siteplugins/components/course-format/course-format.ts b/src/core/siteplugins/components/course-format/course-format.ts
index 3f4407c6e..76c21493b 100644
--- a/src/core/siteplugins/components/course-format/course-format.ts
+++ b/src/core/siteplugins/components/course-format/course-format.ts
@@ -88,10 +88,10 @@ export class CoreSitePluginsCourseFormatComponent implements OnChanges {
     /**
      * Refresh the data.
      *
-     * @param {any} [refresher] Refresher.
-     * @param {Function} [done] Function to call when done.
-     * @param {boolean} [afterCompletionChange] Whether the refresh is due to a completion change.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @param done Function to call when done.
+     * @param afterCompletionChange Whether the refresh is due to a completion change.
+     * @return Promise resolved when done.
      */
     doRefresh(refresher?: any, done?: () => void, afterCompletionChange?: boolean): Promise<any> {
         return Promise.resolve(this.content.refreshContent(afterCompletionChange));
diff --git a/src/core/siteplugins/components/course-option/course-option.ts b/src/core/siteplugins/components/course-option/course-option.ts
index a92fb71a4..54d534c45 100644
--- a/src/core/siteplugins/components/course-option/course-option.ts
+++ b/src/core/siteplugins/components/course-option/course-option.ts
@@ -56,7 +56,7 @@ export class CoreSitePluginsCourseOptionComponent implements OnInit {
     /**
      * Refresh the data.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshData(refresher: any): void {
         this.content.refreshContent(false).finally(() => {
diff --git a/src/core/siteplugins/components/module-index/module-index.ts b/src/core/siteplugins/components/module-index/module-index.ts
index 79be3063c..c5947c0ca 100644
--- a/src/core/siteplugins/components/module-index/module-index.ts
+++ b/src/core/siteplugins/components/module-index/module-index.ts
@@ -102,9 +102,9 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C
     /**
      * Refresh the data.
      *
-     * @param {any} [refresher] Refresher.
-     * @param {Function} [done] Function to call when done.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresher Refresher.
+     * @param done Function to call when done.
+     * @return Promise resolved when done.
      */
     doRefresh(refresher?: any, done?: () => void): Promise<any> {
         if (this.content) {
@@ -173,9 +173,9 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C
     /**
      * Call a certain function on the component instance.
      *
-     * @param {string} name Name of the function to call.
-     * @param {any[]} params List of params to send to the function.
-     * @return {any} Result of the call. Undefined if no component instance or the function doesn't exist.
+     * @param name Name of the function to call.
+     * @param params List of params to send to the function.
+     * @return Result of the call. Undefined if no component instance or the function doesn't exist.
      */
     callComponentFunction(name: string, params?: any[]): any {
         return this.content.callComponentFunction(name, params);
diff --git a/src/core/siteplugins/components/plugin-content/plugin-content.ts b/src/core/siteplugins/components/plugin-content/plugin-content.ts
index 4b6356844..ede995524 100644
--- a/src/core/siteplugins/components/plugin-content/plugin-content.ts
+++ b/src/core/siteplugins/components/plugin-content/plugin-content.ts
@@ -83,8 +83,8 @@ export class CoreSitePluginsPluginContentComponent implements OnInit, DoCheck {
     /**
      * Fetches the content to render.
      *
-     * @param {boolean} [refresh] Whether the user is refreshing.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param refresh Whether the user is refreshing.
+     * @return Promise resolved when done.
      */
     fetchContent(refresh?: boolean): Promise<any> {
         this.onLoadingContent.emit(refresh);
@@ -116,13 +116,13 @@ export class CoreSitePluginsPluginContentComponent implements OnInit, DoCheck {
     /**
      * Open a new page with a new content.
      *
-     * @param {string} title The title to display with the new content.
-     * @param {any} args New params.
-     * @param {string} [component] New component. If not provided, current component
-     * @param {string} [method] New method. If not provided, current method
-     * @param {any} [jsData] JS variables to pass to the new view so they can be used in the template or JS.
-     *                       If true is supplied instead of an object, all initial variables from current page will be copied.
-     * @param {any} [preSets] The preSets for the WS call of the new content.
+     * @param title The title to display with the new content.
+     * @param args New params.
+     * @param component New component. If not provided, current component
+     * @param method New method. If not provided, current method
+     * @param jsData JS variables to pass to the new view so they can be used in the template or JS.
+     *               If true is supplied instead of an object, all initial variables from current page will be copied.
+     * @param preSets The preSets for the WS call of the new content.
      */
     openContent(title: string, args: any, component?: string, method?: string, jsData?: any, preSets?: any): void {
         if (jsData === true) {
@@ -143,7 +143,7 @@ export class CoreSitePluginsPluginContentComponent implements OnInit, DoCheck {
     /**
      * Refresh the data.
      *
-     * @param {boolean} [showSpinner=true] Whether to show spinner while refreshing.
+     * @param showSpinner Whether to show spinner while refreshing.
      */
     refreshContent(showSpinner: boolean = true): Promise<any> {
         if (showSpinner) {
@@ -160,10 +160,10 @@ export class CoreSitePluginsPluginContentComponent implements OnInit, DoCheck {
     /**
      * Update the content, usually with a different method or params.
      *
-     * @param {any} args New params.
-     * @param {string} [component] New component. If not provided, current component
-     * @param {string} [method] New method. If not provided, current method
-     * @param {string} [jsData] JS variables to pass to the new view so they can be used in the template or JS.
+     * @param args New params.
+     * @param component New component. If not provided, current component
+     * @param method New method. If not provided, current method
+     * @param jsData JS variables to pass to the new view so they can be used in the template or JS.
      */
     updateContent(args: any, component?: string, method?: string, jsData?: any): void {
         this.component = component || this.component;
@@ -180,9 +180,9 @@ export class CoreSitePluginsPluginContentComponent implements OnInit, DoCheck {
     /**
      * Call a certain function on the component instance.
      *
-     * @param {string} name Name of the function to call.
-     * @param {any[]} params List of params to send to the function.
-     * @return {any} Result of the call. Undefined if no component instance or the function doesn't exist.
+     * @param name Name of the function to call.
+     * @param params List of params to send to the function.
+     * @return Result of the call. Undefined if no component instance or the function doesn't exist.
      */
     callComponentFunction(name: string, params?: any[]): any {
         if (this.compileComponent) {
diff --git a/src/core/siteplugins/directives/call-ws-new-content.ts b/src/core/siteplugins/directives/call-ws-new-content.ts
index a2d80d939..159085d6d 100644
--- a/src/core/siteplugins/directives/call-ws-new-content.ts
+++ b/src/core/siteplugins/directives/call-ws-new-content.ts
@@ -72,7 +72,7 @@ export class CoreSitePluginsCallWSNewContentDirective extends CoreSitePluginsCal
     /**
      * Function called when the WS call is successful.
      *
-     * @param {any} result Result of the WS call.
+     * @param result Result of the WS call.
      */
     protected wsCallSuccess(result: any): void {
         let args = this.args || {};
diff --git a/src/core/siteplugins/directives/call-ws.ts b/src/core/siteplugins/directives/call-ws.ts
index 9a0742ed2..4f5b65e69 100644
--- a/src/core/siteplugins/directives/call-ws.ts
+++ b/src/core/siteplugins/directives/call-ws.ts
@@ -63,7 +63,7 @@ export class CoreSitePluginsCallWSDirective extends CoreSitePluginsCallWSOnClick
     /**
      * Function called when the WS call is successful.
      *
-     * @param {any} result Result of the WS call.
+     * @param result Result of the WS call.
      */
     protected wsCallSuccess(result: any): void {
         if (typeof this.successMessage != 'undefined') {
diff --git a/src/core/siteplugins/pages/module-index/module-index.ts b/src/core/siteplugins/pages/module-index/module-index.ts
index f5829666c..7203d804a 100644
--- a/src/core/siteplugins/pages/module-index/module-index.ts
+++ b/src/core/siteplugins/pages/module-index/module-index.ts
@@ -41,7 +41,7 @@ export class CoreSitePluginsModuleIndexPage {
     /**
      * Refresh the data.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshData(refresher: any): void {
         this.content.doRefresh().finally(() => {
@@ -87,7 +87,7 @@ export class CoreSitePluginsModuleIndexPage {
     /**
      * Check if we can leave the page or not.
      *
-     * @return {boolean|Promise<void>} Resolved if we can leave it, rejected if not.
+     * @return Resolved if we can leave it, rejected if not.
      */
     ionViewCanLeave(): boolean | Promise<void> {
         return this.content.callComponentFunction('ionViewCanLeave');
diff --git a/src/core/siteplugins/pages/plugin-page/plugin-page.ts b/src/core/siteplugins/pages/plugin-page/plugin-page.ts
index 4d3128918..9156aa30c 100644
--- a/src/core/siteplugins/pages/plugin-page/plugin-page.ts
+++ b/src/core/siteplugins/pages/plugin-page/plugin-page.ts
@@ -49,7 +49,7 @@ export class CoreSitePluginsPluginPage {
     /**
      * Refresh the data.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshData(refresher: any): void {
         this.content.refreshContent(false).finally(() => {
@@ -95,7 +95,7 @@ export class CoreSitePluginsPluginPage {
     /**
      * Check if we can leave the page or not.
      *
-     * @return {boolean|Promise<void>} Resolved if we can leave it, rejected if not.
+     * @return Resolved if we can leave it, rejected if not.
      */
     ionViewCanLeave(): boolean | Promise<void> {
         return this.content.callComponentFunction('ionViewCanLeave');
diff --git a/src/core/siteplugins/providers/helper.ts b/src/core/siteplugins/providers/helper.ts
index b6c33d0fc..4a0230413 100644
--- a/src/core/siteplugins/providers/helper.ts
+++ b/src/core/siteplugins/providers/helper.ts
@@ -140,11 +140,11 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Download the styles for a handler (if any).
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler in the plugin.
-     * @param {any} handlerSchema Data about the handler.
-     * @param {string} [siteId] Site ID. If not provided, current site.
-     * @return {Promise<string>} Promise resolved with the CSS code.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler in the plugin.
+     * @param handlerSchema Data about the handler.
+     * @param siteId Site ID. If not provided, current site.
+     * @return Promise resolved with the CSS code.
      */
     downloadStyles(plugin: any, handlerName: string, handlerSchema: any, siteId?: string): Promise<string> {
 
@@ -203,10 +203,10 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Execute a handler's init method if it has any.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {any} handlerSchema Data about the handler.
-     * @return {Promise<any>} Promise resolved when done. It returns the results of the getContent call and the data returned by
-     *                        the init JS (if any).
+     * @param plugin Data of the plugin.
+     * @param handlerSchema Data about the handler.
+     * @return Promise resolved when done. It returns the results of the getContent call and the data returned by
+     *         the init JS (if any).
      */
     protected executeHandlerInit(plugin: any, handlerSchema: any): Promise<any> {
         if (!handlerSchema.init) {
@@ -219,11 +219,11 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Execute a get_content method and run its javascript (if any).
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} method The method to call.
-     * @param {boolean} [isInit] Whether it's the init method.
-     * @return {Promise<any>} Promise resolved when done. It returns the results of the getContent call and the data returned by
-     *                        the JS (if any).
+     * @param plugin Data of the plugin.
+     * @param method The method to call.
+     * @param isInit Whether it's the init method.
+     * @return Promise resolved when done. It returns the results of the getContent call and the data returned by
+     *         the JS (if any).
      */
     protected executeMethodAndJS(plugin: any, method: string, isInit?: boolean): Promise<any> {
         const siteId = this.sitesProvider.getCurrentSiteId(),
@@ -265,8 +265,8 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Fetch site plugins.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any[]>} Promise resolved when done. Returns the list of plugins to load.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done. Returns the list of plugins to load.
      */
     fetchSitePlugins(siteId?: string): Promise<any[]> {
         const plugins = [];
@@ -294,8 +294,8 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Given an addon name, return the prefix to add to its string keys.
      *
-     * @param {string} addon Name of the addon (plugin.addon).
-     * @return {string} Prefix.
+     * @param addon Name of the addon (plugin.addon).
+     * @return Prefix.
      */
     protected getPrefixForStrings(addon: string): string {
         if (addon) {
@@ -308,9 +308,9 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Given an addon name and the key of a string, return the full string key (prefixed).
      *
-     * @param {string} addon Name of the addon (plugin.addon).
-     * @param {string} key The key of the string.
-     * @return {string} Full string key.
+     * @param addon Name of the addon (plugin.addon).
+     * @param key The key of the string.
+     * @return Full string key.
      */
     protected getPrefixedString(addon: string, key: string): string {
         return this.getPrefixForStrings(addon) + key;
@@ -319,9 +319,9 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Check if a certain plugin is a site plugin and it's enabled in a certain site.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {CoreSite} site Site affected.
-     * @return {boolean} Whether it's a site plugin and it's enabled.
+     * @param plugin Data of the plugin.
+     * @param site Site affected.
+     * @return Whether it's a site plugin and it's enabled.
      */
     isSitePluginEnabled(plugin: any, site: CoreSite): boolean {
         if (!site.isFeatureDisabled('sitePlugin_' + plugin.component + '_' + plugin.addon) && plugin.handlers) {
@@ -340,7 +340,7 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Load the lang strings for a plugin.
      *
-     * @param {any} plugin Data of the plugin.
+     * @param plugin Data of the plugin.
      */
     loadLangStrings(plugin: any): void {
         if (!plugin.parsedLang) {
@@ -357,8 +357,8 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Load a site plugin.
      *
-     * @param {any} plugin Data of the plugin.
-     * @return {Promise<any>} Promise resolved when loaded.
+     * @param plugin Data of the plugin.
+     * @return Promise resolved when loaded.
      */
     loadSitePlugin(plugin: any): Promise<any> {
         const promises = [];
@@ -390,8 +390,8 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Load site plugins.
      *
-     * @param {any[]} plugins The plugins to load.
-     * @return {Promise<any>} Promise resolved when loaded.
+     * @param plugins The plugins to load.
+     * @return Promise resolved when loaded.
      */
     loadSitePlugins(plugins: any[]): Promise<any> {
         const promises = [];
@@ -409,12 +409,12 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Load the styles for a handler.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler in the plugin.
-     * @param {string} fileUrl CSS file URL.
-     * @param {string} cssCode CSS code.
-     * @param {number} [version] Styles version.
-     * @param {string} [siteId] Site ID. If not provided, current site.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler in the plugin.
+     * @param fileUrl CSS file URL.
+     * @param cssCode CSS code.
+     * @param version Styles version.
+     * @param siteId Site ID. If not provided, current site.
      */
     loadStyles(plugin: any, handlerName: string, fileUrl: string, cssCode: string, version?: number, siteId?: string): void {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -438,10 +438,10 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Register a site plugin handler in the right delegate.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler in the plugin.
-     * @param {any} handlerSchema Data about the handler.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler in the plugin.
+     * @param handlerSchema Data about the handler.
+     * @return Promise resolved when done.
      */
     registerHandler(plugin: any, handlerName: string, handlerSchema: any): Promise<any> {
 
@@ -563,10 +563,10 @@ export class CoreSitePluginsHelperProvider {
      * These type of handlers will return a generic template and its JS in the main method, so it will be called
      * before registering the handler.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler in the plugin.
-     * @param {any} handlerSchema Data about the handler.
-     * @return {string|Promise<string>} A string (or a promise resolved with a string) to identify the handler.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler in the plugin.
+     * @param handlerSchema Data about the handler.
+     * @return A string (or a promise resolved with a string) to identify the handler.
      */
     protected registerComponentInitHandler(plugin: any, handlerName: string, handlerSchema: any, delegate: any,
             createHandlerFn: (uniqueName: string, result: any) => any): string | Promise<string> {
@@ -613,10 +613,10 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Given a handler in a plugin, register it in the assign feedback delegate.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler in the plugin.
-     * @param {any} handlerSchema Data about the handler.
-     * @return {string|Promise<string>} A string (or a promise resolved with a string) to identify the handler.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler in the plugin.
+     * @param handlerSchema Data about the handler.
+     * @return A string (or a promise resolved with a string) to identify the handler.
      */
     protected registerAssignFeedbackHandler(plugin: any, handlerName: string, handlerSchema: any): string | Promise<string> {
 
@@ -633,10 +633,10 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Given a handler in a plugin, register it in the assign submission delegate.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler in the plugin.
-     * @param {any} handlerSchema Data about the handler.
-     * @return {string|Promise<string>} A string (or a promise resolved with a string) to identify the handler.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler in the plugin.
+     * @param handlerSchema Data about the handler.
+     * @return A string (or a promise resolved with a string) to identify the handler.
      */
     protected registerAssignSubmissionHandler(plugin: any, handlerName: string, handlerSchema: any): string | Promise<string> {
 
@@ -653,11 +653,11 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Given a handler in a plugin, register it in the block delegate.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler in the plugin.
-     * @param {any} handlerSchema Data about the handler.
-     * @param {any} initResult Result of init function.
-     * @return {string|Promise<string>} A string (or a promise resolved with a string) to identify the handler.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler in the plugin.
+     * @param handlerSchema Data about the handler.
+     * @param initResult Result of init function.
+     * @return A string (or a promise resolved with a string) to identify the handler.
      */
     protected registerBlockHandler(plugin: any, handlerName: string, handlerSchema: any, initResult: any):
             string | Promise<string> {
@@ -675,10 +675,10 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Given a handler in a plugin, register it in the course format delegate.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler in the plugin.
-     * @param {any} handlerSchema Data about the handler.
-     * @return {string} A string to identify the handler.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler in the plugin.
+     * @param handlerSchema Data about the handler.
+     * @return A string to identify the handler.
      */
     protected registerCourseFormatHandler(plugin: any, handlerName: string, handlerSchema: any): string {
         this.logger.debug('Register site plugin in course format delegate:', plugin, handlerSchema);
@@ -694,11 +694,11 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Given a handler in a plugin, register it in the course options delegate.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler in the plugin.
-     * @param {any} handlerSchema Data about the handler.
-     * @param {any} initResult Result of the init WS call.
-     * @return {string} A string to identify the handler.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler in the plugin.
+     * @param handlerSchema Data about the handler.
+     * @param initResult Result of the init WS call.
+     * @return A string to identify the handler.
      */
     protected registerCourseOptionHandler(plugin: any, handlerName: string, handlerSchema: any, initResult: any): string {
         if (!handlerSchema.displaydata) {
@@ -734,11 +734,11 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Given a handler in a plugin, register it in the main menu delegate.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler in the plugin.
-     * @param {any} handlerSchema Data about the handler.
-     * @param {any} initResult Result of the init WS call.
-     * @return {string} A string to identify the handler.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler in the plugin.
+     * @param handlerSchema Data about the handler.
+     * @param initResult Result of the init WS call.
+     * @return A string to identify the handler.
      */
     protected registerMainMenuHandler(plugin: any, handlerName: string, handlerSchema: any, initResult: any): string {
         if (!handlerSchema.displaydata) {
@@ -763,11 +763,11 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Given a handler in a plugin, register it in the message output delegate.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler in the plugin.
-     * @param {any} handlerSchema Data about the handler.
-     * @param {any} initResult Result of the init WS call.
-     * @return {string} A string to identify the handler.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler in the plugin.
+     * @param handlerSchema Data about the handler.
+     * @param initResult Result of the init WS call.
+     * @return A string to identify the handler.
      */
     protected registerMessageOutputHandler(plugin: any, handlerName: string, handlerSchema: any, initResult: any): string {
         if (!handlerSchema.displaydata) {
@@ -793,11 +793,11 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Given a handler in a plugin, register it in the module delegate.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler in the plugin.
-     * @param {any} handlerSchema Data about the handler.
-     * @param {any} initResult Result of the init WS call.
-     * @return {string} A string to identify the handler.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler in the plugin.
+     * @param handlerSchema Data about the handler.
+     * @param initResult Result of the init WS call.
+     * @return A string to identify the handler.
      */
     protected registerModuleHandler(plugin: any, handlerName: string, handlerSchema: any, initResult: any): string {
         if (!handlerSchema.displaydata) {
@@ -828,10 +828,10 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Given a handler in a plugin, register it in the question delegate.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler in the plugin.
-     * @param {any} handlerSchema Data about the handler.
-     * @return {string|Promise<string>} A string (or a promise resolved with a string) to identify the handler.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler in the plugin.
+     * @param handlerSchema Data about the handler.
+     * @return A string (or a promise resolved with a string) to identify the handler.
      */
     protected registerQuestionHandler(plugin: any, handlerName: string, handlerSchema: any): string | Promise<string> {
 
@@ -845,10 +845,10 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Given a handler in a plugin, register it in the question behaviour delegate.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler in the plugin.
-     * @param {any} handlerSchema Data about the handler.
-     * @return {string|Promise<string>} A string (or a promise resolved with a string) to identify the handler.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler in the plugin.
+     * @param handlerSchema Data about the handler.
+     * @return A string (or a promise resolved with a string) to identify the handler.
      */
     protected registerQuestionBehaviourHandler(plugin: any, handlerName: string, handlerSchema: any): string | Promise<string> {
 
@@ -864,10 +864,10 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Given a handler in a plugin, register it in the quiz access rule delegate.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler in the plugin.
-     * @param {any} handlerSchema Data about the handler.
-     * @return {string|Promise<string>} A string (or a promise resolved with a string) to identify the handler.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler in the plugin.
+     * @param handlerSchema Data about the handler.
+     * @return A string (or a promise resolved with a string) to identify the handler.
      */
     protected registerQuizAccessRuleHandler(plugin: any, handlerName: string, handlerSchema: any): string | Promise<string> {
 
@@ -882,11 +882,11 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Given a handler in a plugin, register it in the settings delegate.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler in the plugin.
-     * @param {any} handlerSchema Data about the handler.
-     * @param {any} initResult Result of the init WS call.
-     * @return {string} A string to identify the handler.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler in the plugin.
+     * @param handlerSchema Data about the handler.
+     * @param initResult Result of the init WS call.
+     * @return A string to identify the handler.
      */
     protected registerSettingsHandler(plugin: any, handlerName: string, handlerSchema: any, initResult: any): string {
         if (!handlerSchema.displaydata) {
@@ -911,11 +911,11 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Given a handler in a plugin, register it in the user profile delegate.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler in the plugin.
-     * @param {any} handlerSchema Data about the handler.
-     * @param {any} initResult Result of the init WS call.
-     * @return {string} A string to identify the handler.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler in the plugin.
+     * @param handlerSchema Data about the handler.
+     * @param initResult Result of the init WS call.
+     * @return A string to identify the handler.
      */
     protected registerUserProfileHandler(plugin: any, handlerName: string, handlerSchema: any, initResult: any): string {
         if (!handlerSchema.displaydata) {
@@ -951,10 +951,10 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Given a handler in a plugin, register it in the user profile field delegate.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler in the plugin.
-     * @param {any} handlerSchema Data about the handler.
-     * @return {string|Promise<string>} A string (or a promise resolved with a string) to identify the handler.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler in the plugin.
+     * @param handlerSchema Data about the handler.
+     * @return A string (or a promise resolved with a string) to identify the handler.
      */
     protected registerUserProfileFieldHandler(plugin: any, handlerName: string, handlerSchema: any): string | Promise<string> {
 
@@ -970,10 +970,10 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Given a handler in a plugin, register it in the workshop assessment strategy delegate.
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler in the plugin.
-     * @param {any} handlerSchema Data about the handler.
-     * @return {string|Promise<string>} A string (or a promise resolved with a string) to identify the handler.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler in the plugin.
+     * @param handlerSchema Data about the handler.
+     * @return A string (or a promise resolved with a string) to identify the handler.
      */
     protected registerWorkshopAssessmentStrategyHandler(plugin: any, handlerName: string, handlerSchema: any)
             : string | Promise<string> {
@@ -990,7 +990,7 @@ export class CoreSitePluginsHelperProvider {
     /**
      * Reload the handlers that are restricted to certain courses.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected reloadCourseRestrictHandlers(): Promise<any> {
         if (!Object.keys(this.courseRestrictHandlers).length) {
diff --git a/src/core/siteplugins/providers/siteplugins.ts b/src/core/siteplugins/providers/siteplugins.ts
index fe20b3115..0ba03045d 100644
--- a/src/core/siteplugins/providers/siteplugins.ts
+++ b/src/core/siteplugins/providers/siteplugins.ts
@@ -32,25 +32,21 @@ import { CoreEventsProvider } from '@providers/events';
 export interface CoreSitePluginsHandler {
     /**
      * The site plugin data.
-     * @type {any}
      */
     plugin: any;
 
     /**
      * Name of the handler.
-     * @type {string}
      */
     handlerName: string;
 
     /**
      * Data of the handler.
-     * @type {any}
      */
     handlerSchema: any;
 
     /**
      * Result of the init WS call.
-     * @type {any}
      */
     initResult?: any;
 }
@@ -92,9 +88,9 @@ export class CoreSitePluginsProvider {
     /**
      * Add some params that will always be sent for get content.
      *
-     * @param {any} args Original params.
-     * @param {CoreSite} [site] Site. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the new params.
+     * @param args Original params.
+     * @param site Site. If not defined, current site.
+     * @return Promise resolved with the new params.
      */
     protected addDefaultArgs(args: any, site?: CoreSite): Promise<any> {
         args = args || {};
@@ -140,11 +136,11 @@ export class CoreSitePluginsProvider {
     /**
      * Call a WS for a site plugin.
      *
-     * @param {string} method WS method to use.
-     * @param {any} data Data to send to the WS.
-     * @param {CoreSiteWSPreSets} [preSets] Extra options.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the response.
+     * @param method WS method to use.
+     * @param data Data to send to the WS.
+     * @param preSets Extra options.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the response.
      */
     callWS(method: string, data: any, preSets?: CoreSiteWSPreSets, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -159,9 +155,9 @@ export class CoreSitePluginsProvider {
      * Given the result of a init get_content and, optionally, the result of another get_content,
      * build an object with the data to pass to the JS of the get_content.
      *
-     * @param {any} initResult Result of the init WS call.
-     * @param {any} [contentResult] Result of the content WS call (if any).
-     * @return {any} An object with the data to pass to the JS.
+     * @param initResult Result of the init WS call.
+     * @param contentResult Result of the content WS call (if any).
+     * @return An object with the data to pass to the JS.
      */
     createDataForJS(initResult: any, contentResult?: any): any {
         let data;
@@ -190,9 +186,9 @@ export class CoreSitePluginsProvider {
     /**
      * Get cache key for a WS call.
      *
-     * @param {string} method Name of the method.
-     * @param {any} data Data to identify the WS call.
-     * @return {string} Cache key.
+     * @param method Name of the method.
+     * @param data Data to identify the WS call.
+     * @return Cache key.
      */
     getCallWSCacheKey(method: string, data: any): string {
         return this.getCallWSCommonCacheKey(method) + ':' + this.utils.sortAndStringify(data);
@@ -201,8 +197,8 @@ export class CoreSitePluginsProvider {
     /**
      * Get common cache key for a WS call.
      *
-     * @param {string} method Name of the method.
-     * @return {string} Cache key.
+     * @param method Name of the method.
+     * @return Cache key.
      */
     protected getCallWSCommonCacheKey(method: string): string {
         return this.ROOT_CACHE_KEY + 'ws:' + method;
@@ -211,12 +207,12 @@ export class CoreSitePluginsProvider {
     /**
      * Get a certain content for a site plugin.
      *
-     * @param {string} component Component where the class is. E.g. mod_assign.
-     * @param {string} method Method to execute in the class.
-     * @param {any} args The params for the method.
-     * @param {CoreSiteWSPreSets} [preSets] Extra options.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved with the result.
+     * @param component Component where the class is. E.g. mod_assign.
+     * @param method Method to execute in the class.
+     * @param args The params for the method.
+     * @param preSets Extra options.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the result.
      */
     getContent(component: string, method: string, args: any, preSets?: CoreSiteWSPreSets, siteId?: string): Promise<any> {
         this.logger.debug(`Get content for component '${component}' and method '${method}'`);
@@ -262,10 +258,10 @@ export class CoreSitePluginsProvider {
     /**
      * Get cache key for get content WS calls.
      *
-     * @param {string} component Component where the class is. E.g. mod_assign.
-     * @param {string} method Method to execute in the class.
-     * @param {any} args The params for the method.
-     * @return {string} Cache key.
+     * @param component Component where the class is. E.g. mod_assign.
+     * @param method Method to execute in the class.
+     * @param args The params for the method.
+     * @return Cache key.
      */
     protected getContentCacheKey(component: string, method: string, args: any): string {
         return this.ROOT_CACHE_KEY + 'content:' + component + ':' + method + ':' + this.utils.sortAndStringify(args);
@@ -274,11 +270,11 @@ export class CoreSitePluginsProvider {
     /**
      * Get the value of a WS param for prefetch.
      *
-     * @param {string} component The component of the handler.
-     * @param {string} paramName Name of the param as defined by the handler.
-     * @param {number} [courseId] Course ID (if prefetching a course).
-     * @param {any} [module] The module object returned by WS (if prefetching a module).
-     * @return {any} The value.
+     * @param component The component of the handler.
+     * @param paramName Name of the param as defined by the handler.
+     * @param courseId Course ID (if prefetching a course).
+     * @param module The module object returned by WS (if prefetching a module).
+     * @return The value.
      */
     protected getDownloadParam(component: string, paramName: string, courseId?: number, module?: any): any {
         switch (paramName) {
@@ -298,9 +294,9 @@ export class CoreSitePluginsProvider {
     /**
      * Get the unique name of a handler (plugin + handler).
      *
-     * @param {any} plugin Data of the plugin.
-     * @param {string} handlerName Name of the handler inside the plugin.
-     * @return {string} Unique name.
+     * @param plugin Data of the plugin.
+     * @param handlerName Name of the handler inside the plugin.
+     * @return Unique name.
      */
     getHandlerUniqueName(plugin: any, handlerName: string): string {
         return plugin.addon + '_' + handlerName;
@@ -309,8 +305,8 @@ export class CoreSitePluginsProvider {
     /**
      * Get a site plugin handler.
      *
-     * @param {string} name Unique name of the handler.
-     * @return {CoreSitePluginsHandler} Handler.
+     * @param name Unique name of the handler.
+     * @return Handler.
      */
     getSitePluginHandler(name: string): CoreSitePluginsHandler {
         return this.sitePlugins[name];
@@ -319,9 +315,9 @@ export class CoreSitePluginsProvider {
     /**
      * Invalidate all WS call to a certain method.
      *
-     * @param {string} method WS method to use.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param method WS method to use.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAllCallWSForMethod(method: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -332,11 +328,11 @@ export class CoreSitePluginsProvider {
     /**
      * Invalidate a WS call.
      *
-     * @param {string} method WS method to use.
-     * @param {any} data Data to send to the WS.
-     * @param {CoreSiteWSPreSets} [preSets] Extra options.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param method WS method to use.
+     * @param data Data to send to the WS.
+     * @param preSets Extra options.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateCallWS(method: string, data: any, preSets?: CoreSiteWSPreSets, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -347,11 +343,11 @@ export class CoreSitePluginsProvider {
     /**
      * Invalidate a page content.
      *
-     * @param {string} component Component where the class is. E.g. mod_assign.
-     * @param {string} method Method to execute in the class.
-     * @param {any} args The params for the method.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param component Component where the class is. E.g. mod_assign.
+     * @param method Method to execute in the class.
+     * @param args The params for the method.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateContent(component: string, callback: string, args: any, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -362,7 +358,7 @@ export class CoreSitePluginsProvider {
     /**
      * Check if the get content WS is available.
      *
-     * @param {CoreSite} site The site to check. If not defined, current site.
+     * @param site The site to check. If not defined, current site.
      */
     isGetContentAvailable(site?: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
@@ -373,10 +369,10 @@ export class CoreSitePluginsProvider {
     /**
      * Check if a handler is enabled for a certain course.
      *
-     * @param {number} courseId Course ID to check.
-     * @param {boolean} [restrictEnrolled] If true or undefined, handler is only enabled for courses the user is enrolled in.
-     * @param {any} [restrict] Users and courses the handler is restricted to.
-     * @return {boolean | Promise<boolean>} Whether the handler is enabled.
+     * @param courseId Course ID to check.
+     * @param restrictEnrolled If true or undefined, handler is only enabled for courses the user is enrolled in.
+     * @param restrict Users and courses the handler is restricted to.
+     * @return Whether the handler is enabled.
      */
     isHandlerEnabledForCourse(courseId: number, restrictEnrolled?: boolean, restrict?: any): boolean | Promise<boolean> {
         if (restrict && restrict.courses && restrict.courses.indexOf(courseId) == -1) {
@@ -399,10 +395,10 @@ export class CoreSitePluginsProvider {
     /**
      * Check if a handler is enabled for a certain user.
      *
-     * @param {number} userId User ID to check.
-     * @param {boolean} [restrictCurrent] Whether handler is only enabled for current user.
-     * @param {any} [restrict] Users and courses the handler is restricted to.
-     * @return {boolean} Whether the handler is enabled.
+     * @param userId User ID to check.
+     * @param restrictCurrent Whether handler is only enabled for current user.
+     * @param restrict Users and courses the handler is restricted to.
+     * @return Whether the handler is enabled.
      */
     isHandlerEnabledForUser(userId: number, restrictCurrent?: boolean, restrict?: any): boolean {
         if (restrictCurrent && userId != this.sitesProvider.getCurrentSite().getUserId()) {
@@ -424,10 +420,10 @@ export class CoreSitePluginsProvider {
      * If useOtherData is an array, it will only copy the properties whose names are in the array.
      * If useOtherData is any other value, it will copy all the data from otherData to args.
      *
-     * @param {any} args The current args.
-     * @param {any} otherData All the other data.
-     * @param {any} useOtherData Names of the attributes to include.
-     * @return {any} New args.
+     * @param args The current args.
+     * @param otherData All the other data.
+     * @param useOtherData Names of the attributes to include.
+     * @return New args.
      */
     loadOtherDataInArgs(args: any, otherData: any, useOtherData: any): any {
         if (!args) {
@@ -471,15 +467,15 @@ export class CoreSitePluginsProvider {
     /**
      * Prefetch offline functions for a site plugin handler.
      *
-     * @param {string} component The component of the handler.
-     * @param {any} args Params to send to the get_content calls.
-     * @param {any} handlerSchema The handler schema.
-     * @param {number} [courseId] Course ID (if prefetching a course).
-     * @param {any} [module] The module object returned by WS (if prefetching a module).
-     * @param {boolean} [prefetch] True to prefetch, false to download right away.
-     * @param {string} [dirPath] Path of the directory where to store all the content files.
-     * @param {CoreSite} [site] Site. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param component The component of the handler.
+     * @param args Params to send to the get_content calls.
+     * @param handlerSchema The handler schema.
+     * @param courseId Course ID (if prefetching a course).
+     * @param module The module object returned by WS (if prefetching a module).
+     * @param prefetch True to prefetch, false to download right away.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @param site Site. If not defined, current site.
+     * @return Promise resolved when done.
      */
     prefetchFunctions(component: string, args: any, handlerSchema: any, courseId?: number, module?: any, prefetch?: boolean,
             dirPath?: string, site?: CoreSite): Promise<any> {
@@ -536,8 +532,8 @@ export class CoreSitePluginsProvider {
     /**
      * Store a site plugin handler.
      *
-     * @param {string} name A unique name to identify the handler.
-     * @param {CoreSitePluginsHandler} handler Handler to set.
+     * @param name A unique name to identify the handler.
+     * @param handler Handler to set.
      */
     setSitePluginHandler(name: string, handler: CoreSitePluginsHandler): void {
         this.sitePlugins[name] = handler;
@@ -546,8 +542,8 @@ export class CoreSitePluginsProvider {
     /**
      * Store the promise for a plugin that is being initialised.
      *
-     * @param {String} component
-     * @param {Promise<any>} promise
+     * @param component
+     * @param promise
      */
     registerSitePluginPromise(component: string, promise: Promise<any>): void {
         this.sitePluginPromises[component] = promise;
@@ -563,8 +559,7 @@ export class CoreSitePluginsProvider {
     /**
      * Is a plugin being initialised for the specified component?
      *
-     * @param {String} component
-     * @return {boolean}
+     * @param component
      */
     sitePluginPromiseExists(component: string): boolean {
         return this.sitePluginPromises.hasOwnProperty(component);
@@ -573,8 +568,7 @@ export class CoreSitePluginsProvider {
     /**
      * Get the promise for a plugin that is being initialised.
      *
-     * @param {String} component
-     * @return {Promise<any>}
+     * @param component
      */
     sitePluginLoaded(component: string): Promise<any> {
         return this.sitePluginPromises[component];
@@ -583,7 +577,7 @@ export class CoreSitePluginsProvider {
     /**
      * Wait for fetch plugins to be done.
      *
-     * @return {Promise<any>} Promise resolved when site plugins have been fetched.
+     * @return Promise resolved when site plugins have been fetched.
      */
     waitFetchPlugins(): Promise<any> {
         return this.fetchPluginsDeferred.promise;
diff --git a/src/core/tag/pages/index-area/index-area.ts b/src/core/tag/pages/index-area/index-area.ts
index 9f71f0532..a5e76402f 100644
--- a/src/core/tag/pages/index-area/index-area.ts
+++ b/src/core/tag/pages/index-area/index-area.ts
@@ -88,8 +88,8 @@ export class CoreTagIndexAreaPage {
     /**
      * Fetch next page of the tag index area.
      *
-     * @param {boolean} [refresh=false] Whether to refresh the data or fetch a new page.
-     * @return {Promise<any>} Resolved when done.
+     * @param refresh Whether to refresh the data or fetch a new page.
+     * @return Resolved when done.
      */
     fetchData(refresh: boolean = false): Promise<any> {
         this.loadMoreError = false;
@@ -125,8 +125,8 @@ export class CoreTagIndexAreaPage {
     /**
      * Load more items.
      *
-     * @param {any} infiniteComplete Infinite scroll complete function.
-     * @return {Promise<any>} Resolved when done.
+     * @param infiniteComplete Infinite scroll complete function.
+     * @return Resolved when done.
      */
     loadMore(infiniteComplete: any): Promise<any> {
         return this.fetchData().finally(() => {
@@ -137,7 +137,7 @@ export class CoreTagIndexAreaPage {
     /**
      * Refresh data.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshData(refresher: any): void {
         this.tagProvider.invalidateTagIndexPerArea(this.tagId, this.tagName, this.collectionId, this.areaId, this.fromContextId,
diff --git a/src/core/tag/pages/index/index.ts b/src/core/tag/pages/index/index.ts
index 9185bae0f..ed9fbe805 100644
--- a/src/core/tag/pages/index/index.ts
+++ b/src/core/tag/pages/index/index.ts
@@ -78,7 +78,7 @@ export class CoreTagIndexPage {
     /**
      * Fetch first page of tag index per area.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     fetchData(): Promise<any> {
         return this.tagProvider.getTagIndexPerArea(this.tagId, this.tagName, this.collectionId, this.areaId, this.fromContextId,
@@ -116,7 +116,7 @@ export class CoreTagIndexPage {
     /**
      * Refresh data.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshData(refresher: any): void {
         this.tagProvider.invalidateTagIndexPerArea(this.tagId, this.tagName, this.collectionId, this.areaId, this.fromContextId,
@@ -130,7 +130,7 @@ export class CoreTagIndexPage {
     /**
      * Navigate to an index area.
      *
-     * @param {any} area Area.
+     * @param area Area.
      */
     openArea(area: any): void {
         this.selectedAreaId = area.id;
diff --git a/src/core/tag/pages/search/search.ts b/src/core/tag/pages/search/search.ts
index 13f09bb4c..c79edfa28 100644
--- a/src/core/tag/pages/search/search.ts
+++ b/src/core/tag/pages/search/search.ts
@@ -67,7 +67,7 @@ export class CoreTagSearchPage {
     /**
      * Fetch tag collections.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     fetchCollections(): Promise<any> {
         return this.tagProvider.getTagCollections().then((collections) => {
@@ -83,7 +83,7 @@ export class CoreTagSearchPage {
     /**
      * Fetch tags.
      *
-     * @return {Promise<any>} Resolved when done.
+     * @return Resolved when done.
      */
     fetchTags(): Promise<any> {
         return this.tagProvider.getTagCloud(this.collectionId, undefined, undefined, this.query).then((cloud) => {
@@ -102,7 +102,7 @@ export class CoreTagSearchPage {
     /**
      * Refresh data.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshData(refresher: any): void {
         this.utils.allPromises([
@@ -118,8 +118,8 @@ export class CoreTagSearchPage {
     /**
      * Search tags.
      *
-     * @param {string} query Search query.
-     * @return {Promise<any>} Resolved when done.
+     * @param query Search query.
+     * @return Resolved when done.
      */
     searchTags(query: string): Promise<any> {
         this.searching = true;
diff --git a/src/core/tag/providers/area-delegate.ts b/src/core/tag/providers/area-delegate.ts
index 2b0e2ffb8..ac1693ec1 100644
--- a/src/core/tag/providers/area-delegate.ts
+++ b/src/core/tag/providers/area-delegate.ts
@@ -24,23 +24,22 @@ import { CoreDelegate, CoreDelegateHandler } from '@classes/delegate';
 export interface CoreTagAreaHandler extends CoreDelegateHandler {
     /**
      * Component and item type separated by a slash. E.g. 'core/course_modules'.
-     * @type {string}
      */
     type: string;
 
     /**
      * Parses the rendered content of a tag index and returns the items.
      *
-     * @param {string} content Rendered content.
-     * @return {any[]|Promise<any[]>} Area items (or promise resolved with the items).
+     * @param content Rendered content.
+     * @return Area items (or promise resolved with the items).
      */
     parseContent(content: string): any[] | Promise<any[]>;
 
     /**
      * Get the component to use to display items.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any>;
 }
@@ -60,9 +59,9 @@ export class CoreTagAreaDelegate extends CoreDelegate {
     /**
      * Returns the display name string for this area.
      *
-     * @param {string} component Component name.
-     * @param {string} itemType Item type.
-     * @return {string} String key.
+     * @param component Component name.
+     * @param itemType Item type.
+     * @return String key.
      */
     getDisplayNameKey(component: string, itemType: string): string {
         return (component == 'core' ? 'core.tag' : 'addon.' + component) + '.tagarea_' + itemType;
@@ -71,10 +70,10 @@ export class CoreTagAreaDelegate extends CoreDelegate {
     /**
      * Parses the rendered content of a tag index and returns the items.
      *
-     * @param {string} component Component name.
-     * @param {string} itemType Item type.
-     * @param {string} content Rendered content.
-     * @return {Promise<any[]>} Promise resolved with the area items, or undefined if not found.
+     * @param component Component name.
+     * @param itemType Item type.
+     * @param content Rendered content.
+     * @return Promise resolved with the area items, or undefined if not found.
      */
     parseContent(component: string, itemType: string, content: string): Promise<any[]> {
         const type = component + '/' + itemType;
@@ -85,10 +84,10 @@ export class CoreTagAreaDelegate extends CoreDelegate {
     /**
      * Get the component to use to display an area item.
      *
-     * @param {string} component Component name.
-     * @param {string} itemType Item type.
-     * @param {Injector} injector Injector.
-     * @return {Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param component Component name.
+     * @param itemType Item type.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(component: string, itemType: string, injector: Injector): Promise<any> {
         const type = component + '/' + itemType;
diff --git a/src/core/tag/providers/helper.ts b/src/core/tag/providers/helper.ts
index 38c097b79..f62cac0ec 100644
--- a/src/core/tag/providers/helper.ts
+++ b/src/core/tag/providers/helper.ts
@@ -26,8 +26,8 @@ export class CoreTagHelperProvider {
     /**
      * Parses the rendered content of the "core_tag/tagfeed" web template and returns the items.
      *
-     * @param {string} content Rendered content.
-     * @return {any[]} Area items.
+     * @param content Rendered content.
+     * @return Area items.
      */
     parseFeedContent(content: string): any[] {
         const items = [];
diff --git a/src/core/tag/providers/index-link-handler.ts b/src/core/tag/providers/index-link-handler.ts
index c8e1d7c49..e94bca812 100644
--- a/src/core/tag/providers/index-link-handler.ts
+++ b/src/core/tag/providers/index-link-handler.ts
@@ -33,12 +33,12 @@ export class CoreTagIndexLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @param {any} [data] Extra data to handle the URL.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @param data Extra data to handle the URL.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number, data?: any):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -69,11 +69,11 @@ export class CoreTagIndexLinkHandler extends CoreContentLinksHandlerBase {
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return this.tagProvider.areTagsAvailable(siteId);
diff --git a/src/core/tag/providers/mainmenu-handler.ts b/src/core/tag/providers/mainmenu-handler.ts
index 8e676acc1..60f7b1e8c 100644
--- a/src/core/tag/providers/mainmenu-handler.ts
+++ b/src/core/tag/providers/mainmenu-handler.ts
@@ -30,7 +30,7 @@ export class CoreTagMainMenuHandler implements CoreMainMenuHandler {
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean | Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return this.tagProvider.areTagsAvailable().then((available) => {
@@ -46,7 +46,7 @@ export class CoreTagMainMenuHandler implements CoreMainMenuHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreMainMenuHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(): CoreMainMenuHandlerData {
         return {
diff --git a/src/core/tag/providers/search-link-handler.ts b/src/core/tag/providers/search-link-handler.ts
index 68ea7cb96..e0b16f7df 100644
--- a/src/core/tag/providers/search-link-handler.ts
+++ b/src/core/tag/providers/search-link-handler.ts
@@ -33,12 +33,12 @@ export class CoreTagSearchLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @param {any} [data] Extra data to handle the URL.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @param data Extra data to handle the URL.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number, data?: any):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -58,11 +58,11 @@ export class CoreTagSearchLinkHandler extends CoreContentLinksHandlerBase {
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return this.tagProvider.areTagsAvailable(siteId);
diff --git a/src/core/tag/providers/tag.ts b/src/core/tag/providers/tag.ts
index 3a377cba9..4b012d32f 100644
--- a/src/core/tag/providers/tag.ts
+++ b/src/core/tag/providers/tag.ts
@@ -100,8 +100,8 @@ export class CoreTagProvider {
     /**
      * Check whether tags are available in a certain site.
      *
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>} Promise resolved with true if available, resolved with false otherwise.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if available, resolved with false otherwise.
      * @since 3.7
      */
     areTagsAvailable(siteId?: string): Promise<boolean> {
@@ -113,8 +113,8 @@ export class CoreTagProvider {
     /**
      * Check whether tags are available in a certain site.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} True if available.
+     * @param site Site. If not defined, use current site.
+     * @return True if available.
      */
     areTagsAvailableInSite(site?: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
@@ -128,16 +128,16 @@ export class CoreTagProvider {
     /**
      * Fetch the tag cloud.
      *
-     * @param {number} [collectionId=0] Tag collection ID.
-     * @param {boolean} [isStandard=false] Whether to return only standard tags.
-     * @param {string} [sort='name'] Sort order for display (id, name, rawname, count, flag, isstandard, tagcollid).
-     * @param {string} [search=''] Search string.
-     * @param {number} [fromContextId=0] Context ID where this tag cloud is displayed.
-     * @param {number} [contextId=0] Only retrieve tag instances in this context.
-     * @param {boolean} [recursive=true] Retrieve tag instances in the context and its children.
-     * @param {number} [limit] Maximum number of tags to retrieve. Defaults to SEARCH_LIMIT.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<CoreTagCloud>} Promise resolved with the tag cloud.
+     * @param collectionId Tag collection ID.
+     * @param isStandard Whether to return only standard tags.
+     * @param sort Sort order for display (id, name, rawname, count, flag, isstandard, tagcollid).
+     * @param search Search string.
+     * @param fromContextId Context ID where this tag cloud is displayed.
+     * @param contextId Only retrieve tag instances in this context.
+     * @param recursive Retrieve tag instances in the context and its children.
+     * @param limit Maximum number of tags to retrieve. Defaults to SEARCH_LIMIT.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the tag cloud.
      * @since 3.7
      */
     getTagCloud(collectionId: number = 0, isStandard: boolean = false, sort: string = 'name', search: string = '',
@@ -169,8 +169,8 @@ export class CoreTagProvider {
     /**
      * Fetch the tag collections.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<CoreTagCollection[]>} Promise resolved with the tag collections.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the tag collections.
      * @since 3.7
      */
     getTagCollections(siteId?: string): Promise<CoreTagCollection[]> {
@@ -193,16 +193,16 @@ export class CoreTagProvider {
     /**
      * Fetch the tag index.
      *
-     * @param {number} [id=0] Tag ID.
-     * @param {string} [name=''] Tag name.
-     * @param {number} [collectionId=0] Tag collection ID.
-     * @param {number} [areaId=0] Tag area ID.
-     * @param {number} [fromContextId=0] Context ID where the link was displayed.
-     * @param {number} [contextId=0] Context ID where to search for items.
-     * @param {boolean} [recursive=true] Search in the context and its children.
-     * @param {number} [page=0] Page number.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<CoreTagIndex[]>} Promise resolved with the tag index per area.
+     * @param id Tag ID.
+     * @param name Tag name.
+     * @param collectionId Tag collection ID.
+     * @param areaId Tag area ID.
+     * @param fromContextId Context ID where the link was displayed.
+     * @param contextId Context ID where to search for items.
+     * @param recursive Search in the context and its children.
+     * @param page Page number.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the tag index per area.
      * @since 3.7
      */
     getTagIndexPerArea(id: number, name: string = '', collectionId: number = 0, areaId: number = 0, fromContextId: number = 0,
@@ -246,14 +246,14 @@ export class CoreTagProvider {
     /**
      * Invalidate tag cloud.
      *
-     * @param {number} [collectionId=0] Tag collection ID.
-     * @param {boolean} [isStandard=false] Whether to return only standard tags.
-     * @param {string} [sort='name'] Sort order for display (id, name, rawname, count, flag, isstandard, tagcollid).
-     * @param {string} [search=''] Search string.
-     * @param {number} [fromContextId=0] Context ID where this tag cloud is displayed.
-     * @param {number} [contextId=0] Only retrieve tag instances in this context.
-     * @param {boolean} [recursive=true] Retrieve tag instances in the context and its children.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param collectionId Tag collection ID.
+     * @param isStandard Whether to return only standard tags.
+     * @param sort Sort order for display (id, name, rawname, count, flag, isstandard, tagcollid).
+     * @param search Search string.
+     * @param fromContextId Context ID where this tag cloud is displayed.
+     * @param contextId Only retrieve tag instances in this context.
+     * @param recursive Retrieve tag instances in the context and its children.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateTagCloud(collectionId: number = 0, isStandard: boolean = false, sort: string = 'name', search: string = '',
             fromContextId: number = 0, contextId: number = 0, recursive: boolean = true, siteId?: string): Promise<any> {
@@ -267,7 +267,7 @@ export class CoreTagProvider {
     /**
      * Invalidate tag collections.
      *
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateTagCollections(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -280,14 +280,14 @@ export class CoreTagProvider {
     /**
      * Invalidate tag index.
      *
-     * @param {number} [id=0] Tag ID.
-     * @param {string} [name=''] Tag name.
-     * @param {number} [collectionId=0] Tag collection ID.
-     * @param {number} [areaId=0] Tag area ID.
-     * @param {number} [fromContextId=0] Context ID where the link was displayed.
-     * @param {number} [contextId=0] Context ID where to search for items.
-     * @param {boolean} [recursive=true] Search in the context and its children.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param id Tag ID.
+     * @param name Tag name.
+     * @param collectionId Tag collection ID.
+     * @param areaId Tag area ID.
+     * @param fromContextId Context ID where the link was displayed.
+     * @param contextId Context ID where to search for items.
+     * @param recursive Search in the context and its children.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateTagIndexPerArea(id: number, name: string = '', collectionId: number = 0, areaId: number = 0,
             fromContextId: number = 0, contextId: number = 0, recursive: boolean = true, siteId?: string): Promise<any> {
@@ -301,14 +301,14 @@ export class CoreTagProvider {
     /**
      * Get cache key for tag cloud.
      *
-     * @param {number} collectionId Tag collection ID.
-     * @param {boolean} isStandard Whether to return only standard tags.
-     * @param {string} sort Sort order for display (id, name, rawname, count, flag, isstandard, tagcollid).
-     * @param {string} search Search string.
-     * @param {number} fromContextId Context ID where this tag cloud is displayed.
-     * @param {number} contextId Only retrieve tag instances in this context.
-     * @param {boolean} recursive Retrieve tag instances in the context and it's children.
-     * @return {string} Cache key.
+     * @param collectionId Tag collection ID.
+     * @param isStandard Whether to return only standard tags.
+     * @param sort Sort order for display (id, name, rawname, count, flag, isstandard, tagcollid).
+     * @param search Search string.
+     * @param fromContextId Context ID where this tag cloud is displayed.
+     * @param contextId Only retrieve tag instances in this context.
+     * @param recursive Retrieve tag instances in the context and it's children.
+     * @return Cache key.
      */
     protected getTagCloudKey(collectionId: number, isStandard: boolean, sort: string, search: string, fromContextId: number,
             contextId: number, recursive: boolean): string {
@@ -319,7 +319,7 @@ export class CoreTagProvider {
     /**
      * Get cache key for tag collections.
      *
-     * @return {string} Cache key.
+     * @return Cache key.
      */
     protected getTagCollectionsKey(): string {
         return this.ROOT_CACHE_KEY + 'collections';
@@ -328,14 +328,14 @@ export class CoreTagProvider {
     /**
      * Get cache key for tag index.
      *
-     * @param {number} id Tag ID.
-     * @param {string} name Tag name.
-     * @param {number} collectionId Tag collection ID.
-     * @param {number} areaId Tag area ID.
-     * @param {number} fromContextId Context ID where the link was displayed.
-     * @param {number} contextId Context ID where to search for items.
-     * @param {boolean} [recursive=true] Search in the context and its children.
-     * @return {string} Cache key.
+     * @param id Tag ID.
+     * @param name Tag name.
+     * @param collectionId Tag collection ID.
+     * @param areaId Tag area ID.
+     * @param fromContextId Context ID where the link was displayed.
+     * @param contextId Context ID where to search for items.
+     * @param recursive Search in the context and its children.
+     * @return Cache key.
      */
     protected getTagIndexPerAreaKey(id: number, name: string, collectionId: number, areaId: number,  fromContextId: number,
             contextId: number, recursive: boolean): string {
diff --git a/src/core/user/components/participants/participants.ts b/src/core/user/components/participants/participants.ts
index 35475a2b4..236345e90 100644
--- a/src/core/user/components/participants/participants.ts
+++ b/src/core/user/components/participants/participants.ts
@@ -64,8 +64,8 @@ export class CoreUserParticipantsComponent implements OnInit {
     /**
      * Fetch all the data required for the view.
      *
-     * @param {boolean} [refresh] Empty events array first.
-     * @return {Promise<any>}     Resolved when done.
+     * @param refresh Empty events array first.
+     * @return Resolved when done.
      */
     fetchData(refresh: boolean = false): Promise<any> {
         const firstToGet = refresh ? 0 : this.participants.length;
@@ -87,8 +87,8 @@ export class CoreUserParticipantsComponent implements OnInit {
     /**
      * Function to load more data.
      *
-     * @param {any} [infiniteComplete] Infinite scroll complete function. Only used from core-infinite-loading.
-     * @return {Promise<any>} Resolved when done.
+     * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
+     * @return Resolved when done.
      */
     loadMoreData(infiniteComplete?: any): Promise<any> {
         return this.fetchData().finally(() => {
@@ -99,7 +99,7 @@ export class CoreUserParticipantsComponent implements OnInit {
     /**
      * Refresh data.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshParticipants(refresher: any): void {
         this.userProvider.invalidateParticipantsList(this.courseId).finally(() => {
@@ -111,7 +111,7 @@ export class CoreUserParticipantsComponent implements OnInit {
 
     /**
      * Navigate to a particular user profile.
-     * @param {number} userId  User Id where to navigate.
+     * @param userId User Id where to navigate.
      */
     gotoParticipant(userId: number): void {
         this.participantId = userId;
diff --git a/src/core/user/pages/about/about.ts b/src/core/user/pages/about/about.ts
index baed48158..96ab5b210 100644
--- a/src/core/user/pages/about/about.ts
+++ b/src/core/user/pages/about/about.ts
@@ -83,7 +83,7 @@ export class CoreUserAboutPage {
     /**
      * Refresh the user.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshUser(refresher?: any): void {
         this.userProvider.invalidateUserCache(this.userId).finally(() => {
diff --git a/src/core/user/pages/profile/profile.ts b/src/core/user/pages/profile/profile.ts
index fd3875f0d..c60bb9a2f 100644
--- a/src/core/user/pages/profile/profile.ts
+++ b/src/core/user/pages/profile/profile.ts
@@ -192,7 +192,7 @@ export class CoreUserProfilePage {
     /**
      * Refresh the user.
      *
-     * @param {any} refresher Refresher.
+     * @param refresher Refresher.
      */
     refreshUser(refresher?: any): void {
         const promises = [];
@@ -225,8 +225,8 @@ export class CoreUserProfilePage {
     /**
      * A handler was clicked.
      *
-     * @param {Event} event Click event.
-     * @param {CoreUserProfileHandlerData} handler Handler that was clicked.
+     * @param event Click event.
+     * @param handler Handler that was clicked.
      */
     handlerClicked(event: Event, handler: CoreUserProfileHandlerData): void {
         // Decide which navCtrl to use. If this page is inside a split view, use the split view's master nav.
diff --git a/src/core/user/providers/course-option-handler.ts b/src/core/user/providers/course-option-handler.ts
index 9636dcfeb..5d1c61d33 100644
--- a/src/core/user/providers/course-option-handler.ts
+++ b/src/core/user/providers/course-option-handler.ts
@@ -31,10 +31,10 @@ export class CoreUserParticipantsCourseOptionHandler implements CoreCourseOption
     /**
      * Should invalidate the data to determine if the handler is enabled for a certain course.
      *
-     * @param {number} courseId The course ID.
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param courseId The course ID.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved when done.
      */
     invalidateEnabledForCourse(courseId: number, navOptions?: any, admOptions?: any): Promise<any> {
         if (navOptions && typeof navOptions.participants != 'undefined') {
@@ -48,7 +48,7 @@ export class CoreUserParticipantsCourseOptionHandler implements CoreCourseOption
     /**
      * Check if the handler is enabled on a site level.
      *
-     * @return {boolean} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -57,11 +57,11 @@ export class CoreUserParticipantsCourseOptionHandler implements CoreCourseOption
     /**
      * Whether or not the handler is enabled for a certain course.
      *
-     * @param {number} courseId The course ID.
-     * @param {any} accessData Access type and data. Default, guest, ...
-     * @param {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return {boolean|Promise<boolean>} True or promise resolved with true if enabled.
+     * @param courseId The course ID.
+     * @param accessData Access type and data. Default, guest, ...
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return True or promise resolved with true if enabled.
      */
     isEnabledForCourse(courseId: number, accessData: any, navOptions?: any, admOptions?: any): boolean | Promise<boolean> {
         if (accessData && accessData.type == CoreCourseProvider.ACCESS_GUEST) {
@@ -78,9 +78,9 @@ export class CoreUserParticipantsCourseOptionHandler implements CoreCourseOption
     /**
      * Returns the data needed to render the handler.
      *
-     * @param {Injector} injector Injector.
-     * @param {number} course The course.
-     * @return {CoreCourseOptionsHandlerData|Promise<CoreCourseOptionsHandlerData>} Data or promise resolved with the data.
+     * @param injector Injector.
+     * @param course The course.
+     * @return Data or promise resolved with the data.
      */
     getDisplayData(injector: Injector, course: any): CoreCourseOptionsHandlerData | Promise<CoreCourseOptionsHandlerData> {
         return {
@@ -93,8 +93,8 @@ export class CoreUserParticipantsCourseOptionHandler implements CoreCourseOption
     /**
      * Called when a course is downloaded. It should prefetch all the data to be able to see the addon in offline.
      *
-     * @param {any} course The course.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param course The course.
+     * @return Promise resolved when done.
      */
     prefetch(course: any): Promise<any> {
         return this.getParticipantsPage(course.id, 0);
@@ -103,9 +103,9 @@ export class CoreUserParticipantsCourseOptionHandler implements CoreCourseOption
     /**
      * Get a participant page and, if there are more participants, call the function again to get it too.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} limitFrom The number of participants already loaded.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param courseId Course ID.
+     * @param limitFrom The number of participants already loaded.
+     * @return Promise resolved when done.
      */
     protected getParticipantsPage(courseId: number, limitFrom: number): Promise<any> {
         return this.userProvider.getParticipants(courseId, limitFrom, undefined, undefined, true).then((result) => {
diff --git a/src/core/user/providers/helper.ts b/src/core/user/providers/helper.ts
index fd9367869..876ea1aa0 100644
--- a/src/core/user/providers/helper.ts
+++ b/src/core/user/providers/helper.ts
@@ -30,10 +30,10 @@ export class CoreUserHelperProvider {
     /**
      * Formats a user address, concatenating address, city and country.
      *
-     * @param {string} address Address.
-     * @param {string} city    City.
-     * @param {string} country Country.
-     * @return {string} Formatted address.
+     * @param address Address.
+     * @param city City.
+     * @param country Country.
+     * @return Formatted address.
      */
     formatAddress(address: string, city: string, country: string): string {
         const separator = this.translate.instant('core.listsep');
@@ -49,8 +49,8 @@ export class CoreUserHelperProvider {
     /**
      * Formats a user role list, translating and concatenating them.
      *
-     * @param {any[]} [roles] List of user roles.
-     * @return {string} The formatted roles.
+     * @param roles List of user roles.
+     * @return The formatted roles.
      */
     formatRoleList(roles?: any[]): string {
         if (!roles || roles.length <= 0) {
diff --git a/src/core/user/providers/offline.ts b/src/core/user/providers/offline.ts
index 36ccc4c05..470a52c9d 100644
--- a/src/core/user/providers/offline.ts
+++ b/src/core/user/providers/offline.ts
@@ -65,7 +65,7 @@ export class CoreUserOfflineProvider {
     /**
      * Get preferences that were changed offline.
      *
-     * @return {Promise<CoreUserOfflinePreference[]>} Promise resolved with list of preferences.
+     * @return Promise resolved with list of preferences.
      */
     getChangedPreferences(siteId?: string): Promise<CoreUserOfflinePreference[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -76,8 +76,8 @@ export class CoreUserOfflineProvider {
     /**
      * Get an offline preference.
      *
-     * @param {string} name Name of the preference.
-     * @return {Promise<CoreUserOfflinePreference>} Promise resolved with the preference, rejected if not found.
+     * @param name Name of the preference.
+     * @return Promise resolved with the preference, rejected if not found.
      */
     getPreference(name: string, siteId?: string): Promise<CoreUserOfflinePreference> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -90,10 +90,10 @@ export class CoreUserOfflineProvider {
     /**
      * Set an offline preference.
      *
-     * @param {string} name Name of the preference.
-     * @param {string} value Value of the preference.
-     * @param {string} onlineValue Online value of the preference. If unedfined, preserve previously stored value.
-     * @return {Promise<CoreUserPreference>} Promise resolved when done.
+     * @param name Name of the preference.
+     * @param value Value of the preference.
+     * @param onlineValue Online value of the preference. If unedfined, preserve previously stored value.
+     * @return Promise resolved when done.
      */
     setPreference(name: string, value: string, onlineValue?: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
diff --git a/src/core/user/providers/participants-link-handler.ts b/src/core/user/providers/participants-link-handler.ts
index fb9971f02..501ecc937 100644
--- a/src/core/user/providers/participants-link-handler.ts
+++ b/src/core/user/providers/participants-link-handler.ts
@@ -39,11 +39,11 @@ export class CoreUserParticipantsLinkHandler extends CoreContentLinksHandlerBase
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -84,11 +84,11 @@ export class CoreUserParticipantsLinkHandler extends CoreContentLinksHandlerBase
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         courseId = parseInt(params.id, 10) || courseId;
diff --git a/src/core/user/providers/sync-cron-handler.ts b/src/core/user/providers/sync-cron-handler.ts
index a51b2da8b..5ee16c66d 100644
--- a/src/core/user/providers/sync-cron-handler.ts
+++ b/src/core/user/providers/sync-cron-handler.ts
@@ -29,9 +29,9 @@ export class CoreUserSyncCronHandler implements CoreCronHandler {
      * Execute the process.
      * Receives the ID of the site affected, undefined for all sites.
      *
-     * @param {string} [siteId] ID of the site affected, undefined for all sites.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @return {Promise<any>} Promise resolved when done, rejected if failure.
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @param force Wether the execution is forced (manual sync).
+     * @return Promise resolved when done, rejected if failure.
      */
     execute(siteId?: string, force?: boolean): Promise<any> {
         return this.userSync.syncPreferences(siteId);
@@ -40,7 +40,7 @@ export class CoreUserSyncCronHandler implements CoreCronHandler {
     /**
      * Get the time between consecutive executions.
      *
-     * @return {number} Time between consecutive executions (in ms).
+     * @return Time between consecutive executions (in ms).
      */
     getInterval(): number {
         return 300000; // 5 minutes.
diff --git a/src/core/user/providers/sync.ts b/src/core/user/providers/sync.ts
index 62de2f679..58cbf6ea7 100644
--- a/src/core/user/providers/sync.ts
+++ b/src/core/user/providers/sync.ts
@@ -43,8 +43,8 @@ export class CoreUserSyncProvider extends CoreSyncBaseProvider {
     /**
      * Try to synchronize user preferences in a certain site or in all sites.
      *
-     * @param {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @return {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @return Promise resolved if sync is successful, rejected if sync fails.
      */
     syncPreferences(siteId?: string): Promise<any> {
         const syncFunctionLog = 'all user preferences';
@@ -55,8 +55,8 @@ export class CoreUserSyncProvider extends CoreSyncBaseProvider {
     /**
      * Sync user preferences of a site.
      *
-     * @param {string} [siteId] Site ID to sync. If not defined, sync all sites.
-     * @param {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
+     * @param siteId Site ID to sync. If not defined, sync all sites.
+     * @param Promise resolved if sync is successful, rejected if sync fails.
      */
     protected syncPreferencesFunc(siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
diff --git a/src/core/user/providers/tag-area-handler.ts b/src/core/user/providers/tag-area-handler.ts
index ab2d167cf..3bd607f44 100644
--- a/src/core/user/providers/tag-area-handler.ts
+++ b/src/core/user/providers/tag-area-handler.ts
@@ -29,7 +29,7 @@ export class CoreUserTagAreaHandler implements CoreTagAreaHandler {
 
     /**
      * Whether or not the handler is enabled on a site level.
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
@@ -38,8 +38,8 @@ export class CoreUserTagAreaHandler implements CoreTagAreaHandler {
     /**
      * Parses the rendered content of a tag index and returns the items.
      *
-     * @param {string} content Rendered content.
-     * @return {any[]|Promise<any[]>} Area items (or promise resolved with the items).
+     * @param content Rendered content.
+     * @return Area items (or promise resolved with the items).
      */
     parseContent(content: string): any[] | Promise<any[]> {
         const items = [];
@@ -73,8 +73,8 @@ export class CoreUserTagAreaHandler implements CoreTagAreaHandler {
     /**
      * Get the component to use to display items.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any> {
         return CoreUserTagAreaComponent;
diff --git a/src/core/user/providers/user-delegate.ts b/src/core/user/providers/user-delegate.ts
index 92796f273..0e74b38f8 100644
--- a/src/core/user/providers/user-delegate.ts
+++ b/src/core/user/providers/user-delegate.ts
@@ -28,7 +28,6 @@ import { Subject, BehaviorSubject } from 'rxjs';
 export interface CoreUserProfileHandler extends CoreDelegateHandler {
     /**
      * The highest priority is displayed first.
-     * @type {number}
      */
     priority: number;
 
@@ -38,25 +37,24 @@ export interface CoreUserProfileHandler extends CoreDelegateHandler {
      * - TYPE_NEW_PAGE: will be displayed as a list of items. Should have icon. Spinner not used.
      *     Default value if none is specified.
      * - TYPE_ACTION: will be displayed as a button and should not redirect to any state. Spinner use is recommended.
-     * @type {string}
      */
     type: string;
 
     /**
      * Whether or not the handler is enabled for a user.
-     * @param  {any}     user       User object.
-     * @param  {number}  courseId   Course ID where to show.
-     * @param  {any}     [navOptions] Navigation options for the course.
-     * @param  {any}     [admOptions] Admin options for the course.
-     * @return {boolean|Promise<boolean>}            Whether or not the handler is enabled for a user.
+     * @param user User object.
+     * @param courseId Course ID where to show.
+     * @param navOptions Navigation options for the course.
+     * @param admOptions Admin options for the course.
+     * @return Whether or not the handler is enabled for a user.
      */
     isEnabledForUser(user: any, courseId: number, navOptions?: any, admOptions?: any): boolean | Promise<boolean>;
 
     /**
      * Returns the data needed to render the handler.
-     * @param  {any}     user       User object.
-     * @param  {number}  courseId   Course ID where to show.
-     * @return {CoreUserProfileHandlerData}    Data to be shown.
+     * @param user User object.
+     * @param courseId Course ID where to show.
+     * @return Data to be shown.
      */
     getDisplayData(user: any, courseId: number): CoreUserProfileHandlerData;
 }
@@ -67,41 +65,36 @@ export interface CoreUserProfileHandler extends CoreDelegateHandler {
 export interface CoreUserProfileHandlerData {
     /**
      * Title to display.
-     * @type {string}
      */
     title: string;
 
     /**
      * Name of the icon to display. Mandatory for TYPE_COMMUNICATION.
-     * @type {string}
      */
     icon?: string;
 
     /**
      * Additional class to add to the HTML.
-     * @type {string}
      */
     class?: string;
 
     /**
      * If enabled, element will be hidden. Only for TYPE_NEW_PAGE and TYPE_ACTION.
-     * @type {boolean}
      */
     hidden?: boolean;
 
     /**
      * If enabled will show an spinner. Only for TYPE_ACTION.
-     * @type {boolean}
      */
     spinner?: boolean;
 
     /**
      * Action to do when clicked.
      *
-     * @param {Event} event Click event.
-     * @param {NavController} Nav controller to use to navigate.
-     * @param {any} user User object.
-     * @param {number} [courseId] Course ID being viewed. If not defined, site context.
+     * @param event Click event.
+     * @param Nav controller to use to navigate.
+     * @param user User object.
+     * @param courseId Course ID being viewed. If not defined, site context.
      */
     action?(event: Event, navCtrl: NavController, user: any, courseId?: number): void;
 }
@@ -112,25 +105,21 @@ export interface CoreUserProfileHandlerData {
 export interface CoreUserProfileHandlerToDisplay {
     /**
      * Name of the handler.
-     * @type {string}
      */
     name?: string;
 
     /**
      * Data to display.
-     * @type {CoreUserProfileHandlerData}
      */
     data: CoreUserProfileHandlerData;
 
     /**
      * The highest priority is displayed first.
-     * @type {number}
      */
     priority?: number;
 
     /**
      * The type of the handler. See CoreUserProfileHandler.
-     * @type {string}
      */
     type: string;
 }
@@ -143,23 +132,19 @@ export interface CoreUserProfileHandlerToDisplay {
 export class CoreUserDelegate extends CoreDelegate {
     /**
      * User profile handler type for communication.
-     * @type {string}
      */
     static TYPE_COMMUNICATION = 'communication';
     /**
      * User profile handler type for new page.
-     * @type {string}
      */
     static TYPE_NEW_PAGE = 'newpage';
     /**
      * User profile handler type for actions.
-     * @type {string}
      */
     static TYPE_ACTION = 'action';
 
     /**
      * Update handler information event.
-     * @type {string}
      */
     static UPDATE_HANDLER_EVENT = 'CoreUserDelegate_update_handler_event';
 
@@ -198,7 +183,7 @@ export class CoreUserDelegate extends CoreDelegate {
     /**
      * Check if handlers are loaded.
      *
-     * @return {boolean} True if handlers are loaded, false otherwise.
+     * @return True if handlers are loaded, false otherwise.
      */
     areHandlersLoaded(userId: number): boolean {
         return this.userHandlers[userId] && this.userHandlers[userId].loaded;
@@ -207,7 +192,7 @@ export class CoreUserDelegate extends CoreDelegate {
     /**
      * Clear current user handlers.
      *
-     * @param {number} userId The user to clear.
+     * @param userId The user to clear.
      */
     clearUserHandlers(userId: number): void {
         const userData = this.userHandlers[userId];
@@ -222,9 +207,9 @@ export class CoreUserDelegate extends CoreDelegate {
     /**
      * Get the profile handlers for a user.
      *
-     * @param {any} user The user object.
-     * @param {number} courseId The course ID.
-     * @return {Subject<CoreUserProfileHandlerToDisplay[]>} Resolved with the handlers.
+     * @param user The user object.
+     * @param courseId The course ID.
+     * @return Resolved with the handlers.
      */
     getProfileHandlersFor(user: any, courseId: number): Subject<CoreUserProfileHandlerToDisplay[]> {
         let promise,
diff --git a/src/core/user/providers/user-handler.ts b/src/core/user/providers/user-handler.ts
index 699f1fac2..862dde6a5 100644
--- a/src/core/user/providers/user-handler.ts
+++ b/src/core/user/providers/user-handler.ts
@@ -31,7 +31,7 @@ export class CoreUserProfileMailHandler implements CoreUserProfileHandler {
     /**
      * Check if handler is enabled.
      *
-     * @return {boolean} Always enabled.
+     * @return Always enabled.
      */
     isEnabled(): boolean {
         return true;
@@ -40,11 +40,11 @@ export class CoreUserProfileMailHandler implements CoreUserProfileHandler {
     /**
      * Check if handler is enabled for this user in this context.
      *
-     * @param {any} user     User to check.
-     * @param {number} courseId Course ID.
-     * @param  {any} [navOptions] Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
-     * @param  {any} [admOptions] Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
-     * @return  {boolean|Promise<boolean>}   Promise resolved with true if enabled, resolved with false otherwise.
+     * @param user User to check.
+     * @param courseId Course ID.
+     * @param navOptions Course navigation options for current user. See CoreCoursesProvider.getUserNavigationOptions.
+     * @param admOptions Course admin options for current user. See CoreCoursesProvider.getUserAdministrationOptions.
+     * @return Promise resolved with true if enabled, resolved with false otherwise.
      */
     isEnabledForUser(user: any, courseId: number, navOptions?: any, admOptions?: any): boolean | Promise<boolean> {
         // Not current user required.
@@ -54,7 +54,7 @@ export class CoreUserProfileMailHandler implements CoreUserProfileHandler {
     /**
      * Returns the data needed to render the handler.
      *
-     * @return {CoreUserProfileHandlerData} Data needed to render the handler.
+     * @return Data needed to render the handler.
      */
     getDisplayData(user: any, courseId: number): CoreUserProfileHandlerData {
         return {
diff --git a/src/core/user/providers/user-link-handler.ts b/src/core/user/providers/user-link-handler.ts
index eb9a0b0b6..6fd64e759 100644
--- a/src/core/user/providers/user-link-handler.ts
+++ b/src/core/user/providers/user-link-handler.ts
@@ -33,11 +33,11 @@ export class CoreUserProfileLinkHandler extends CoreContentLinksHandlerBase {
     /**
      * Get the list of actions for a link (url).
      *
-     * @param {string[]} siteIds List of sites the URL belongs to.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {CoreContentLinksAction[]|Promise<CoreContentLinksAction[]>} List of (or promise resolved with list of) actions.
+     * @param siteIds List of sites the URL belongs to.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return List of (or promise resolved with list of) actions.
      */
     getActions(siteIds: string[], url: string, params: any, courseId?: number):
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
@@ -56,11 +56,11 @@ export class CoreUserProfileLinkHandler extends CoreContentLinksHandlerBase {
      * Check if the handler is enabled for a certain site (site + user) and a URL.
      * If not defined, defaults to true.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url The URL to treat.
-     * @param {any} params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param {number} [courseId] Course ID related to the URL. Optional but recommended.
-     * @return {boolean|Promise<boolean>} Whether the handler is enabled for the URL and site.
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
      */
     isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
         return url.indexOf('/grade/report/') == -1;
diff --git a/src/core/user/providers/user-profile-field-delegate.ts b/src/core/user/providers/user-profile-field-delegate.ts
index e047100bd..a059ad1a5 100644
--- a/src/core/user/providers/user-profile-field-delegate.ts
+++ b/src/core/user/providers/user-profile-field-delegate.ts
@@ -21,7 +21,6 @@ import { CoreEventsProvider } from '@providers/events';
 export interface CoreUserProfileFieldHandler extends CoreDelegateHandler {
     /**
      * Type of the field the handler supports. E.g. 'checkbox'.
-     * @type {string}
      */
     type: string;
 
@@ -29,18 +28,18 @@ export interface CoreUserProfileFieldHandler extends CoreDelegateHandler {
      * Return the Component to use to display the user profile field.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
-     * @param {Injector} injector Injector.
-     * @return {any|Promise<any>} The component (or promise resolved with component) to use, undefined if not found.
+     * @param injector Injector.
+     * @return The component (or promise resolved with component) to use, undefined if not found.
      */
     getComponent(injector: Injector): any | Promise<any>;
 
     /**
      * Get the data to send for the field based on the input data.
-     * @param  {any}     field          User field to get the data for.
-     * @param  {boolean} signup         True if user is in signup page.
-     * @param  {string}  [registerAuth] Register auth method. E.g. 'email'.
-     * @param  {any}     formValues     Form Values.
-     * @return {Promise<CoreUserProfileFieldHandlerData>|CoreUserProfileFieldHandlerData}  Data to send for the field.
+     * @param field User field to get the data for.
+     * @param signup True if user is in signup page.
+     * @param registerAuth Register auth method. E.g. 'email'.
+     * @param formValues Form Values.
+     * @return Data to send for the field.
      */
     getData?(field: any, signup: boolean, registerAuth: string, formValues: any):
         Promise<CoreUserProfileFieldHandlerData> | CoreUserProfileFieldHandlerData;
@@ -49,19 +48,16 @@ export interface CoreUserProfileFieldHandler extends CoreDelegateHandler {
 export interface CoreUserProfileFieldHandlerData {
     /**
      * Name to display.
-     * @type {string}
      */
     name: string;
 
     /**
      * Field type.
-     * @type {string}
      */
     type?: string;
 
     /**
      * Value of the field.
-     * @type {any}
      */
     value: any;
 }
@@ -81,10 +77,10 @@ export class CoreUserProfileFieldDelegate extends CoreDelegate {
     /**
      * Get the component to use to display an user field.
      *
-     * @param {Injector} injector Injector.
-     * @param  {any} field      User field to get the directive for.
-     * @param  {boolean} signup         True if user is in signup page.
-     * @return {Promise<any>} Promise resolved with component to use, undefined if not found.
+     * @param injector Injector.
+     * @param field User field to get the directive for.
+     * @param signup True if user is in signup page.
+     * @return Promise resolved with component to use, undefined if not found.
      */
     getComponent(injector: Injector, field: any, signup: boolean): Promise<any> {
         const type = field.type || field.datatype;
@@ -103,11 +99,11 @@ export class CoreUserProfileFieldDelegate extends CoreDelegate {
     /**
      * Get the data to send for a certain field based on the input data.
      *
-     * @param  {any}     field          User field to get the data for.
-     * @param  {boolean} signup         True if user is in signup page.
-     * @param  {string}  registerAuth   Register auth method. E.g. 'email'.
-     * @param  {any}     formValues     Form values.
-     * @return {Promise<any>}           Data to send for the field.
+     * @param field User field to get the data for.
+     * @param signup True if user is in signup page.
+     * @param registerAuth Register auth method. E.g. 'email'.
+     * @param formValues Form values.
+     * @return Data to send for the field.
      */
     getDataForField(field: any, signup: boolean, registerAuth: string, formValues: any): Promise<any> {
         const type = field.type || field.datatype,
@@ -133,11 +129,11 @@ export class CoreUserProfileFieldDelegate extends CoreDelegate {
     /**
      * Get the data to send for a list of fields based on the input data.
      *
-     * @param  {any[]}   fields           User fields to get the data for.
-     * @param  {boolean} [signup]       True if user is in signup page.
-     * @param  {string}  [registerAuth] Register auth method. E.g. 'email'.
-     * @param  {any}     formValues     Form values.
-     * @return {Promise<any>}           Data to send.
+     * @param fields User fields to get the data for.
+     * @param signup True if user is in signup page.
+     * @param registerAuth Register auth method. E.g. 'email'.
+     * @param formValues Form values.
+     * @return Data to send.
      */
     getDataForFields(fields: any[], signup: boolean = false, registerAuth: string = '', formValues: any): Promise<any> {
         const result = [],
diff --git a/src/core/user/providers/user.ts b/src/core/user/providers/user.ts
index 5b6141006..7529b0b90 100644
--- a/src/core/user/providers/user.ts
+++ b/src/core/user/providers/user.ts
@@ -72,9 +72,9 @@ export class CoreUserProvider {
     /**
      * Change the given user profile picture.
      *
-     * @param  {number} draftItemId New picture draft item id.
-     * @param  {number} userId      User ID.
-     * @return {Promise<string>}       Promise resolve with the new profileimageurl
+     * @param draftItemId New picture draft item id.
+     * @param userId User ID.
+     * @return Promise resolve with the new profileimageurl
      */
     changeProfilePicture(draftItemId: number, userId: number): Promise<string> {
         const data = {
@@ -95,9 +95,9 @@ export class CoreUserProvider {
     /**
      * Store user basic information in local DB to be retrieved if the WS call fails.
      *
-     * @param  {number} userId  User ID.
-     * @param {string} [siteId] ID of the site. If not defined, use current site.
-     * @return {Promise<any>}   Promise resolve when the user is deleted.
+     * @param userId User ID.
+     * @param siteId ID of the site. If not defined, use current site.
+     * @return Promise resolve when the user is deleted.
      */
     deleteStoredUser(userId: number, siteId?: string): Promise<any> {
         if (isNaN(userId)) {
@@ -121,12 +121,12 @@ export class CoreUserProvider {
     /**
      * Get participants for a certain course.
      *
-     * @param  {number} courseId    ID of the course.
-     * @param  {number} limitFrom   Position of the first participant to get.
-     * @param  {number} limitNumber Number of participants to get.
-     * @param  {string} [siteId]    Site Id. If not defined, use current site.
-     * @param  {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<{participants: any[], canLoadMore: boolean}>} Promise resolved when the participants are retrieved.
+     * @param courseId ID of the course.
+     * @param limitFrom Position of the first participant to get.
+     * @param limitNumber Number of participants to get.
+     * @param siteId Site Id. If not defined, use current site.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise resolved when the participants are retrieved.
      */
     getParticipants(courseId: number, limitFrom: number = 0, limitNumber: number = CoreUserProvider.PARTICIPANTS_LIST_LIMIT,
             siteId?: string, ignoreCache?: boolean): Promise<{participants: any[], canLoadMore: boolean}> {
@@ -172,8 +172,8 @@ export class CoreUserProvider {
     /**
      * Get cache key for participant list WS calls.
      *
-     * @param  {number} courseId Course ID.
-     * @return {string}          Cache key.
+     * @param courseId Course ID.
+     * @return Cache key.
      */
     protected getParticipantsListCacheKey(courseId: number): string {
         return this.ROOT_CACHE_KEY + 'list:' + courseId;
@@ -182,11 +182,11 @@ export class CoreUserProvider {
     /**
      * Get user profile. The type of profile retrieved depends on the params.
      *
-     * @param  {number} userId      User's ID.
-     * @param  {number} [courseId]  Course ID to get course profile, undefined or 0 to get site profile.
-     * @param  {boolean} [forceLocal] True to retrieve the user data from local DB, false to retrieve it from WS.
-     * @param {string} [siteId] ID of the site. If not defined, use current site.
-     * @return {Promise<any>}            Promise resolved with the user data.
+     * @param userId User's ID.
+     * @param courseId Course ID to get course profile, undefined or 0 to get site profile.
+     * @param forceLocal True to retrieve the user data from local DB, false to retrieve it from WS.
+     * @param siteId ID of the site. If not defined, use current site.
+     * @return Promise resolved with the user data.
      */
     getProfile(userId: number, courseId?: number, forceLocal: boolean = false, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -205,8 +205,8 @@ export class CoreUserProvider {
     /**
      * Get cache key for a user WS call.
      *
-     * @param  {number} userId User ID.
-     * @return {string}        Cache key.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getUserCacheKey(userId: number): string {
         return this.ROOT_CACHE_KEY + 'data:' + userId;
@@ -215,9 +215,9 @@ export class CoreUserProvider {
     /**
      * Get user basic information from local DB.
      *
-     * @param {number} userId User ID.
-     * @param {string} [siteId] ID of the site. If not defined, use current site.
-     * @return {Promise<any>}   Promise resolve when the user is retrieved.
+     * @param userId User ID.
+     * @param siteId ID of the site. If not defined, use current site.
+     * @return Promise resolve when the user is retrieved.
      */
     protected getUserFromLocalDb(userId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -228,10 +228,10 @@ export class CoreUserProvider {
     /**
      * Get user profile from WS.
      *
-     * @param {number} userId         User ID.
-     * @param {number} [courseId] Course ID to get course profile, undefined or 0 to get site profile.
-     * @param {string} [siteId] ID of the site. If not defined, use current site.
-     * @return {Promise<any>}           Promise resolve when the user is retrieved.
+     * @param userId User ID.
+     * @param courseId Course ID to get course profile, undefined or 0 to get site profile.
+     * @param siteId ID of the site. If not defined, use current site.
+     * @return Promise resolve when the user is retrieved.
      */
     protected getUserFromWS(userId: number, courseId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -282,9 +282,9 @@ export class CoreUserProvider {
     /**
      * Get a user preference (online or offline).
      *
-     * @param {string} name Name of the preference.
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {string} Preference value or null if preference not set.
+     * @param name Name of the preference.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Preference value or null if preference not set.
      */
     getUserPreference(name: string, siteId?: string): Promise<string> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -313,8 +313,8 @@ export class CoreUserProvider {
     /**
      * Get cache key for a user preference WS call.
      *
-     * @param {string} name Preference name.
-     * @return {string} Cache key.
+     * @param name Preference name.
+     * @return Cache key.
      */
     protected getUserPreferenceCacheKey(name: string): string {
         return this.ROOT_CACHE_KEY + 'preference:' + name;
@@ -323,9 +323,9 @@ export class CoreUserProvider {
     /**
      * Get a user preference online.
      *
-     * @param {string} name Name of the preference.
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {string} Preference value or null if preference not set.
+     * @param name Name of the preference.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Preference value or null if preference not set.
      */
     getUserPreferenceOnline(name: string, siteId?: string): Promise<string> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -344,9 +344,9 @@ export class CoreUserProvider {
     /**
      * Invalidates user WS calls.
      *
-     * @param {number} userId User ID.
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<any>}       Promise resolved when the data is invalidated.
+     * @param userId User ID.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateUserCache(userId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -357,9 +357,9 @@ export class CoreUserProvider {
     /**
      * Invalidates participant list for a certain course.
      *
-     * @param  {number} courseId Course ID.
-     * @param  {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<any>}         Promise resolved when the list is invalidated.
+     * @param courseId Course ID.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved when the list is invalidated.
      */
     invalidateParticipantsList(courseId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -370,9 +370,9 @@ export class CoreUserProvider {
     /**
      * Invalidate user preference.
      *
-     * @param {string} name Name of the preference.
-     * @param {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param name Name of the preference.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateUserPreference(name: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -383,8 +383,8 @@ export class CoreUserProvider {
     /**
      * Check if course participants is disabled in a certain site.
      *
-     * @param  {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<boolean>}     Promise resolved with true if disabled, rejected or resolved with false otherwise.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if disabled, rejected or resolved with false otherwise.
      */
     isParticipantsDisabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -395,8 +395,8 @@ export class CoreUserProvider {
     /**
      * Check if course participants is disabled in a certain site.
      *
-     * @param {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean} Whether it's disabled.
+     * @param site Site. If not defined, use current site.
+     * @return Whether it's disabled.
      */
     isParticipantsDisabledInSite(site?: any): boolean {
         site = site || this.sitesProvider.getCurrentSite();
@@ -407,9 +407,9 @@ export class CoreUserProvider {
     /**
      * Returns whether or not participants is enabled for a certain course.
      *
-     * @param {number} courseId Course ID.
-     * @param  {string} [siteId] Site Id. If not defined, use current site.
-     * @return {Promise<any>}    Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
+     * @param courseId Course ID.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
      */
     isPluginEnabledForCourse(courseId: number, siteId?: string): Promise<any> {
         if (!courseId) {
@@ -423,8 +423,8 @@ export class CoreUserProvider {
     /**
      * Check if update profile picture is disabled in a certain site.
      *
-     * @param  {CoreSite} [site] Site. If not defined, use current site.
-     * @return {boolean}       True if disabled, false otherwise.
+     * @param site Site. If not defined, use current site.
+     * @return True if disabled, false otherwise.
      */
     isUpdatePictureDisabledInSite(site?: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
@@ -434,10 +434,10 @@ export class CoreUserProvider {
 
     /**
      * Log User Profile View in Moodle.
-     * @param  {number}       userId   User ID.
-     * @param  {number}       [courseId] Course ID.
-     * @param  {string}       [name] Name of the user.
-     * @return {Promise<any>}          Promise resolved when done.
+     * @param userId User ID.
+     * @param courseId Course ID.
+     * @param name Name of the user.
+     * @return Promise resolved when done.
      */
     logView(userId: number, courseId?: number, name?: string): Promise<any> {
         const params = {
@@ -456,8 +456,8 @@ export class CoreUserProvider {
 
     /**
      * Log Participants list view in Moodle.
-     * @param  {number}       courseId Course ID.
-     * @return {Promise<any>}          Promise resolved when done.
+     * @param courseId Course ID.
+     * @return Promise resolved when done.
      */
     logParticipantsView(courseId?: number): Promise<any> {
         const params = {
@@ -472,10 +472,10 @@ export class CoreUserProvider {
     /**
      * Prefetch user profiles and their images from a certain course. It prevents duplicates.
      *
-     * @param {number[]} userIds List of user IDs.
-     * @param {number} [courseId] Course the users belong to.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when prefetched.
+     * @param userIds List of user IDs.
+     * @param courseId Course the users belong to.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when prefetched.
      */
     prefetchProfiles(userIds: number[], courseId?: number, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -508,11 +508,11 @@ export class CoreUserProvider {
     /**
      * Store user basic information in local DB to be retrieved if the WS call fails.
      *
-     * @param {number} userId   User ID.
-     * @param {string} fullname User full name.
-     * @param {string} avatar   User avatar URL.
-     * @param  {string} [siteId] ID of the site. If not defined, use current site.
-     * @return {Promise<any>}         Promise resolve when the user is stored.
+     * @param userId User ID.
+     * @param fullname User full name.
+     * @param avatar User avatar URL.
+     * @param siteId ID of the site. If not defined, use current site.
+     * @return Promise resolve when the user is stored.
      */
     protected storeUser(userId: number, fullname: string, avatar: string, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -529,9 +529,9 @@ export class CoreUserProvider {
     /**
      * Store users basic information in local DB.
      *
-     * @param  {any[]} users     Users to store. Fields stored: id, fullname, profileimageurl.
-     * @param  {string} [siteId] ID of the site. If not defined, use current site.
-     * @return {Promise<any>}        Promise resolve when the user is stored.
+     * @param users Users to store. Fields stored: id, fullname, profileimageurl.
+     * @param siteId ID of the site. If not defined, use current site.
+     * @return Promise resolve when the user is stored.
      */
     storeUsers(users: any[], siteId?: string): Promise<any> {
         const promises = [];
@@ -548,10 +548,10 @@ export class CoreUserProvider {
     /**
      * Set a user preference (online or offline).
      *
-     * @param {string} name Name of the preference.
-     * @param {string} value Value of the preference.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved on success.
+     * @param name Name of the preference.
+     * @param value Value of the preference.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved on success.
      */
     setUserPreference(name: string, value: string, siteId?: string): Promise<any> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -587,11 +587,11 @@ export class CoreUserProvider {
     /**
      * Update a preference for a user.
      *
-     * @param  {string} name     Preference name.
-     * @param  {any} value       Preference new value.
-     * @param  {number} [userId] User ID. If not defined, site's current user.
-     * @param  {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>}    Promise resolved if success.
+     * @param name Preference name.
+     * @param value Preference new value.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success.
      */
     updateUserPreference(name: string, value: any, userId?: number, siteId?: string): Promise<any> {
         const preferences = [
@@ -607,11 +607,11 @@ export class CoreUserProvider {
     /**
      * Update some preferences for a user.
      *
-     * @param  {{name: string, value: string}[]} preferences List of preferences.
-     * @param  {boolean} [disableNotifications] Whether to disable all notifications. Undefined to not update this value.
-     * @param  {number} [userId]                User ID. If not defined, site's current user.
-     * @param  {string} [siteId]                Site ID. If not defined, current site.
-     * @return {Promise<any>}                   Promise resolved if success.
+     * @param preferences List of preferences.
+     * @param disableNotifications Whether to disable all notifications. Undefined to not update this value.
+     * @param userId User ID. If not defined, site's current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved if success.
      */
     updateUserPreferences(preferences: {type: string, value: string}[], disableNotifications?: boolean, userId?: number,
             siteId?: string): Promise<any> {
diff --git a/src/directives/auto-rows.ts b/src/directives/auto-rows.ts
index 3160c00f1..6bd56aa22 100644
--- a/src/directives/auto-rows.ts
+++ b/src/directives/auto-rows.ts
@@ -56,7 +56,7 @@ export class CoreAutoRowsDirective {
 
     /**
      * Resize the textarea.
-     * @param {any} $event Event fired.
+     * @param $event Event fired.
      */
     protected resize($event?: any): void {
         let nativeElement = this.element.nativeElement;
diff --git a/src/directives/external-content.ts b/src/directives/external-content.ts
index 4026e7e0a..d86493a80 100644
--- a/src/directives/external-content.ts
+++ b/src/directives/external-content.ts
@@ -84,7 +84,7 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges {
     /**
      * Add a new source with a certain URL as a sibling of the current element.
      *
-     * @param {string} url URL to use in the source.
+     * @param url URL to use in the source.
      */
     protected addSource(url: string): void {
         if (this.element.tagName !== 'SOURCE') {
@@ -174,10 +174,10 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges {
     /**
      * Handle external content, setting the right URL.
      *
-     * @param {string} targetAttr Attribute to modify.
-     * @param {string} url Original URL to treat.
-     * @param {string} [siteId] Site ID.
-     * @return {Promise<any>} Promise resolved if the element is successfully treated.
+     * @param targetAttr Attribute to modify.
+     * @param url Original URL to treat.
+     * @param siteId Site ID.
+     * @return Promise resolved if the element is successfully treated.
      */
     protected handleExternalContent(targetAttr: string, url: string, siteId?: string): Promise<any> {
 
@@ -285,8 +285,8 @@ export class CoreExternalContentDirective implements AfterViewInit, OnChanges {
     /**
      * Handle inline styles, trying to download referenced files.
      *
-     * @param {string} siteId Site ID.
-     * @return {Promise<any>} Promise resolved if the element is successfully treated.
+     * @param siteId Site ID.
+     * @return Promise resolved if the element is successfully treated.
      */
     protected handleInlineStyles(siteId: string): Promise<any> {
         let inlineStyles = this.element.getAttribute('style');
diff --git a/src/directives/format-text.ts b/src/directives/format-text.ts
index ede668a6b..bada2a967 100644
--- a/src/directives/format-text.ts
+++ b/src/directives/format-text.ts
@@ -37,7 +37,6 @@ import { CoreSplitViewComponent } from '@components/split-view/split-view';
  *
  * Example usage:
  * <core-format-text [text]="myText" [component]="component" [componentId]="componentId"></core-format-text>
- *
  */
 @Directive({
     selector: 'core-format-text'
@@ -89,8 +88,8 @@ export class CoreFormatTextDirective implements OnChanges {
     /**
      * Apply CoreExternalContentDirective to a certain element.
      *
-     * @param {HTMLElement} element Element to add the attributes to.
-     * @return {CoreExternalContentDirective} External content instance.
+     * @param element Element to add the attributes to.
+     * @return External content instance.
      */
     protected addExternalContent(element: HTMLElement): CoreExternalContentDirective {
         // Angular 2 doesn't let adding directives dynamically. Create the CoreExternalContentDirective manually.
@@ -113,7 +112,7 @@ export class CoreFormatTextDirective implements OnChanges {
     /**
      * Add class to adapt media to a certain element.
      *
-     * @param {HTMLElement} element Element to add the class to.
+     * @param element Element to add the class to.
      */
     protected addMediaAdaptClass(element: HTMLElement): void {
         element.classList.add('core-media-adapt-width');
@@ -122,7 +121,7 @@ export class CoreFormatTextDirective implements OnChanges {
     /**
      * Wrap an image with a container to adapt its width.
      *
-     * @param {HTMLElement} img Image to adapt.
+     * @param img Image to adapt.
      */
     protected adaptImage(img: HTMLElement): void {
         // Element to wrap the image.
@@ -251,7 +250,7 @@ export class CoreFormatTextDirective implements OnChanges {
     /**
      * Listener to call when the element is clicked.
      *
-     * @param {MouseEvent} e Click event.
+     * @param e Click event.
      */
     protected elementClicked(e: MouseEvent): void {
         if (e.defaultPrevented) {
@@ -352,7 +351,7 @@ export class CoreFormatTextDirective implements OnChanges {
     /**
      * Apply formatText and set sub-directives.
      *
-     * @return {Promise<HTMLElement>} Promise resolved with a div element containing the code.
+     * @return Promise resolved with a div element containing the code.
      */
     protected formatContents(): Promise<HTMLElement> {
 
@@ -497,8 +496,8 @@ export class CoreFormatTextDirective implements OnChanges {
     /**
      * Returns the element width in pixels.
      *
-     * @param {HTMLElement} element Element to get width from.
-     * @return {number} The width of the element in pixels. When 0 is returned it means the element is not visible.
+     * @param element Element to get width from.
+     * @return The width of the element in pixels. When 0 is returned it means the element is not visible.
      */
     protected getElementWidth(element: HTMLElement): number {
         let width = this.domUtils.getElementWidth(element);
@@ -526,8 +525,8 @@ export class CoreFormatTextDirective implements OnChanges {
     /**
      * Returns the element height in pixels.
      *
-     * @param {HTMLElement} elementAng Element to get height from.
-     * @return {number} The height of the element in pixels. When 0 is returned it means the element is not visible.
+     * @param elementAng Element to get height from.
+     * @return The height of the element in pixels. When 0 is returned it means the element is not visible.
      */
     protected getElementHeight(element: HTMLElement): number {
         return this.domUtils.getElementHeight(element) || 0;
@@ -553,8 +552,8 @@ export class CoreFormatTextDirective implements OnChanges {
     /**
      * Treat video filters. Currently only treating youtube video using video JS.
      *
-     * @param {HTMLElement} el Video element.
-     * @param {NavController} navCtrl NavController to use.
+     * @param el Video element.
+     * @param navCtrl NavController to use.
      */
     protected treatVideoFilters(video: HTMLElement, navCtrl: NavController): void {
         // Treat Video JS Youtube video links and translate them to iframes.
@@ -587,7 +586,7 @@ export class CoreFormatTextDirective implements OnChanges {
     /**
      * Add media adapt class and apply CoreExternalContentDirective to the media element and its sources and tracks.
      *
-     * @param {HTMLElement} element Video or audio to treat.
+     * @param element Video or audio to treat.
      */
     protected treatMedia(element: HTMLElement): void {
         this.addMediaAdaptClass(element);
@@ -615,10 +614,10 @@ export class CoreFormatTextDirective implements OnChanges {
     /**
      * Add media adapt class and treat the iframe source.
      *
-     * @param {HTMLIFrameElement} iframe Iframe to treat.
-     * @param {CoreSite} site Site instance.
-     * @param {boolean} canTreatVimeo Whether Vimeo videos can be treated in the site.
-     * @param {NavController} navCtrl NavController to use.
+     * @param iframe Iframe to treat.
+     * @param site Site instance.
+     * @param canTreatVimeo Whether Vimeo videos can be treated in the site.
+     * @param navCtrl NavController to use.
      */
     protected treatIframe(iframe: HTMLIFrameElement, site: CoreSite, canTreatVimeo: boolean, navCtrl: NavController): void {
         const src = iframe.src,
@@ -699,7 +698,7 @@ export class CoreFormatTextDirective implements OnChanges {
      * Parse a YouTube URL.
      * Based on Youtube.parseUrl from Moodle media/player/videojs/amd/src/Youtube-lazy.js
      *
-     * @param {string} url URL of the video.
+     * @param url URL of the video.
      */
     protected parseYoutubeUrl(url: string): {videoId: string, listId?: string, start?: number} {
         const result = {
diff --git a/src/directives/link.ts b/src/directives/link.ts
index a10f69fde..53ac98f78 100644
--- a/src/directives/link.ts
+++ b/src/directives/link.ts
@@ -87,7 +87,7 @@ export class CoreLinkDirective implements OnInit {
     /**
      * Convenience function to correctly navigate, open file or url in the browser.
      *
-     * @param {string} href HREF to be opened.
+     * @param href HREF to be opened.
      */
     protected navigate(href: string): void {
         const contentLinksScheme = CoreConfigConstants.customurlscheme + '://link=';
diff --git a/src/directives/supress-events.ts b/src/directives/supress-events.ts
index 88bfc891b..5c35bb8f2 100644
--- a/src/directives/supress-events.ts
+++ b/src/directives/supress-events.ts
@@ -86,7 +86,7 @@ export class CoreSupressEventsDirective implements OnInit {
     /**
      * Stop event default and propagation.
      *
-     * @param {Event} event Event.
+     * @param event Event.
      */
     protected stopBubble(event: Event): void {
         event.preventDefault();
diff --git a/src/pipes/bytes-to-size.ts b/src/pipes/bytes-to-size.ts
index 6e2d07127..620e1782f 100644
--- a/src/pipes/bytes-to-size.ts
+++ b/src/pipes/bytes-to-size.ts
@@ -32,8 +32,8 @@ export class CoreBytesToSizePipe implements PipeTransform {
     /**
      * Takes a number and turns it to a human readable size.
      *
-     * @param {number|string} value The bytes to convert.
-     * @return {string} Readable bytes.
+     * @param value The bytes to convert.
+     * @return Readable bytes.
      */
     transform(value: number | string): string {
         if (typeof value == 'string') {
diff --git a/src/pipes/create-links.ts b/src/pipes/create-links.ts
index 35bb659d5..b7a5453e4 100644
--- a/src/pipes/create-links.ts
+++ b/src/pipes/create-links.ts
@@ -26,8 +26,8 @@ export class CoreCreateLinksPipe implements PipeTransform {
     /**
      * Takes some text and adds anchor tags to all links that aren't inside anchors.
      *
-     * @param {string} text Text to treat.
-     * @return {string} Treated text.
+     * @param text Text to treat.
+     * @return Treated text.
      */
     transform(text: string): string {
         return text.replace(this.replacePattern, '<a href="$1">$1</a>');
diff --git a/src/pipes/date-day-or-time.ts b/src/pipes/date-day-or-time.ts
index ae1da2238..ed90d1193 100644
--- a/src/pipes/date-day-or-time.ts
+++ b/src/pipes/date-day-or-time.ts
@@ -44,8 +44,8 @@ export class CoreDateDayOrTimePipe implements PipeTransform {
     /**
      * Format a timestamp.
      *
-     * @param {number|string} timestamp The UNIX timestamp (without milliseconds).
-     * @return {string} Formatted time.
+     * @param timestamp The UNIX timestamp (without milliseconds).
+     * @return Formatted time.
      */
     transform(timestamp: string | number): string {
         if (typeof timestamp == 'string') {
diff --git a/src/pipes/duration.ts b/src/pipes/duration.ts
index 7e2f03b5b..4be29d433 100644
--- a/src/pipes/duration.ts
+++ b/src/pipes/duration.ts
@@ -32,8 +32,8 @@ export class CoreDurationPipe implements PipeTransform {
     /**
      * Turn a number of seconds to a duration. E.g. 60 -> 1 minute.
      *
-     * @param {number|string} seconds The number of seconds.
-     * @return {string} Formatted duration.
+     * @param seconds The number of seconds.
+     * @return Formatted duration.
      */
     transform(seconds: string | number): string {
         if (typeof seconds == 'string') {
diff --git a/src/pipes/format-date.ts b/src/pipes/format-date.ts
index f255d4716..e01f62645 100644
--- a/src/pipes/format-date.ts
+++ b/src/pipes/format-date.ts
@@ -32,11 +32,11 @@ export class CoreFormatDatePipe implements PipeTransform {
     /**
      * Format a date.
      *
-     * @param {string|number} timestamp Timestamp to format (in milliseconds). If not defined, use current time.
-     * @param {string} [format] Format to use. It should be a string code to handle i18n (e.g. core.strftimetime).
-     *                          Defaults to strftimedaydatetime.
-     * @param {boolean} [convert] If true, convert the format from PHP to Moment. Set it to false for Moment formats.
-     * @return {string} Formatted date.
+     * @param timestamp Timestamp to format (in milliseconds). If not defined, use current time.
+     * @param format Format to use. It should be a string code to handle i18n (e.g. core.strftimetime).
+     *               Defaults to strftimedaydatetime.
+     * @param convert If true, convert the format from PHP to Moment. Set it to false for Moment formats.
+     * @return Formatted date.
      */
     transform(timestamp: string | number, format?: string, convert?: boolean): string {
         timestamp = timestamp || Date.now();
diff --git a/src/pipes/no-tags.ts b/src/pipes/no-tags.ts
index 921241ac4..cc415e720 100644
--- a/src/pipes/no-tags.ts
+++ b/src/pipes/no-tags.ts
@@ -25,8 +25,8 @@ export class CoreNoTagsPipe implements PipeTransform {
     /**
      * Takes a text and removes HTML tags.
      *
-     * @param {string} text The text to treat.
-     * @return {string} Treated text.
+     * @param text The text to treat.
+     * @return Treated text.
      */
     transform(text: string): string {
         return text.replace(/(<([^>]+)>)/ig, '');
diff --git a/src/pipes/seconds-to-hms.ts b/src/pipes/seconds-to-hms.ts
index dd71624d6..dd2913936 100644
--- a/src/pipes/seconds-to-hms.ts
+++ b/src/pipes/seconds-to-hms.ts
@@ -35,8 +35,8 @@ export class CoreSecondsToHMSPipe implements PipeTransform {
     /**
      * Convert a number of seconds to Hours:Minutes:Seconds.
      *
-     * @param {number|string} seconds Number of seconds.
-     * @return {string} Formatted seconds.
+     * @param seconds Number of seconds.
+     * @return Formatted seconds.
      */
     transform(seconds: string | number): string {
         let hours,
diff --git a/src/pipes/time-ago.ts b/src/pipes/time-ago.ts
index bef10d8f0..cbb67e3df 100644
--- a/src/pipes/time-ago.ts
+++ b/src/pipes/time-ago.ts
@@ -33,8 +33,8 @@ export class CoreTimeAgoPipe implements PipeTransform {
     /**
      * Turn a UNIX timestamp to "time ago".
      *
-     * @param {number|string} timestamp The UNIX timestamp (without milliseconds).
-     * @return {string} Formatted time.
+     * @param timestamp The UNIX timestamp (without milliseconds).
+     * @return Formatted time.
      */
     transform(timestamp: string | number): string {
         if (typeof timestamp == 'string') {
diff --git a/src/pipes/to-locale-string.ts b/src/pipes/to-locale-string.ts
index 2bc2bae49..be74e7f64 100644
--- a/src/pipes/to-locale-string.ts
+++ b/src/pipes/to-locale-string.ts
@@ -33,8 +33,8 @@ export class CoreToLocaleStringPipe implements PipeTransform {
     /**
      * Format a timestamp to a locale string.
      *
-     * @param {number|string} timestamp The timestamp (can be in seconds or milliseconds).
-     * @return {string} Formatted time.
+     * @param timestamp The timestamp (can be in seconds or milliseconds).
+     * @return Formatted time.
      */
     transform(timestamp: number | string): string {
         if (typeof timestamp == 'string') {
diff --git a/src/providers/app.ts b/src/providers/app.ts
index abbf4dd9f..5e9336eb7 100644
--- a/src/providers/app.ts
+++ b/src/providers/app.ts
@@ -30,25 +30,21 @@ import { CoreConfigConstants } from '../configconstants';
 export interface CoreRedirectData {
     /**
      * ID of the site to load.
-     * @type {string}
      */
     siteId?: string;
 
     /**
      * Name of the page to redirect to.
-     * @type {string}
      */
     page?: string;
 
     /**
      * Params to pass to the page.
-     * @type {any}
      */
     params?: any;
 
     /**
      * Timestamp when this redirect was last modified.
-     * @type {number}
      */
     timemodified?: number;
 }
@@ -111,7 +107,7 @@ export class CoreAppProvider {
     /**
      * Check if the browser supports mediaDevices.getUserMedia.
      *
-     * @return {boolean} Whether the function is supported.
+     * @return Whether the function is supported.
      */
     canGetUserMedia(): boolean {
         return !!(navigator && navigator.mediaDevices && navigator.mediaDevices.getUserMedia);
@@ -120,7 +116,7 @@ export class CoreAppProvider {
     /**
      * Check if the browser supports MediaRecorder.
      *
-     * @return {boolean} Whether the function is supported.
+     * @return Whether the function is supported.
      */
     canRecordMedia(): boolean {
         return !!(<any> window).MediaRecorder;
@@ -138,7 +134,7 @@ export class CoreAppProvider {
     /**
      * Get the application global database.
      *
-     * @return {SQLiteDB} App's DB.
+     * @return App's DB.
      */
     getDB(): SQLiteDB {
         return this.db;
@@ -147,7 +143,7 @@ export class CoreAppProvider {
     /**
      * Get an ID for a main menu.
      *
-     * @return {number} Main menu ID.
+     * @return Main menu ID.
      */
     getMainMenuId(): number {
         return this.mainMenuId++;
@@ -156,7 +152,7 @@ export class CoreAppProvider {
     /**
      * Get the app's root NavController.
      *
-     * @return {NavController} Root NavController.
+     * @return Root NavController.
      */
     getRootNavController(): NavController {
         // Function getRootNav is deprecated. Get the first root nav, there should always be one.
@@ -166,7 +162,7 @@ export class CoreAppProvider {
     /**
      * Checks if the app is running in a 64 bits desktop environment (not browser).
      *
-     * @return {boolean} Whether the app is running in a 64 bits desktop environment (not browser).
+     * @return Whether the app is running in a 64 bits desktop environment (not browser).
      */
     is64Bits(): boolean {
         const process = (<any> window).process;
@@ -177,7 +173,7 @@ export class CoreAppProvider {
     /**
      * Checks if the app is running in a desktop environment (not browser).
      *
-     * @return {boolean} Whether the app is running in a desktop environment (not browser).
+     * @return Whether the app is running in a desktop environment (not browser).
      */
     isDesktop(): boolean {
         const process = (<any> window).process;
@@ -188,7 +184,7 @@ export class CoreAppProvider {
     /**
      * Check if the keyboard is visible.
      *
-     * @return {boolean} Whether keyboard is visible.
+     * @return Whether keyboard is visible.
      */
     isKeyboardVisible(): boolean {
         return this.isKeyboardShown;
@@ -197,7 +193,7 @@ export class CoreAppProvider {
     /**
      * Check if the app is running in a Linux environment.
      *
-     * @return {boolean} Whether it's running in a Linux environment.
+     * @return Whether it's running in a Linux environment.
      */
     isLinux(): boolean {
         if (!this.isDesktop()) {
@@ -214,7 +210,7 @@ export class CoreAppProvider {
     /**
      * Check if the app is running in a Mac OS environment.
      *
-     * @return {boolean} Whether it's running in a Mac OS environment.
+     * @return Whether it's running in a Mac OS environment.
      */
     isMac(): boolean {
         if (!this.isDesktop()) {
@@ -231,7 +227,7 @@ export class CoreAppProvider {
     /**
      * Check if the main menu is open.
      *
-     * @return {boolean} Whether the main menu is open.
+     * @return Whether the main menu is open.
      */
     isMainMenuOpen(): boolean {
         return typeof this.mainMenuOpen != 'undefined';
@@ -240,7 +236,7 @@ export class CoreAppProvider {
     /**
      * Checks if the app is running in a mobile or tablet device (Cordova).
      *
-     * @return {boolean} Whether the app is running in a mobile or tablet device.
+     * @return Whether the app is running in a mobile or tablet device.
      */
     isMobile(): boolean {
         return this.platform.is('cordova');
@@ -249,7 +245,7 @@ export class CoreAppProvider {
     /**
      * Checks if the current window is wider than a mobile.
      *
-     * @return {boolean} Whether the app the current window is wider than a mobile.
+     * @return Whether the app the current window is wider than a mobile.
      */
     isWide(): boolean {
         return this.platform.width() > 768;
@@ -258,7 +254,7 @@ export class CoreAppProvider {
     /**
      * Returns whether we are online.
      *
-     * @return {boolean} Whether the app is online.
+     * @return Whether the app is online.
      */
     isOnline(): boolean {
         if (this.forceOffline) {
@@ -277,7 +273,7 @@ export class CoreAppProvider {
     /**
      * Check if device uses a limited connection.
      *
-     * @return {boolean} Whether the device uses a limited connection.
+     * @return Whether the device uses a limited connection.
      */
     isNetworkAccessLimited(): boolean {
         const type = this.network.type;
@@ -294,7 +290,7 @@ export class CoreAppProvider {
     /**
      * Check if device uses a wifi connection.
      *
-     * @return {boolean} Whether the device uses a wifi connection.
+     * @return Whether the device uses a wifi connection.
      */
     isWifi(): boolean {
         return this.isOnline() && !this.isNetworkAccessLimited();
@@ -303,7 +299,7 @@ export class CoreAppProvider {
     /**
      * Check if the app is running in a Windows environment.
      *
-     * @return {boolean} Whether it's running in a Windows environment.
+     * @return Whether it's running in a Windows environment.
      */
     isWindows(): boolean {
         if (!this.isDesktop()) {
@@ -330,8 +326,8 @@ export class CoreAppProvider {
     /**
      * Set a main menu as open or not.
      *
-     * @param {number} id Main menu ID.
-     * @param {boolean} open Whether it's open or not.
+     * @param id Main menu ID.
+     * @param open Whether it's open or not.
      */
     setMainMenuOpen(id: number, open: boolean): void {
         if (open) {
@@ -382,7 +378,7 @@ export class CoreAppProvider {
     /**
      * Check if there's an ongoing SSO authentication process.
      *
-     * @return {boolean} Whether there's a SSO authentication ongoing.
+     * @return Whether there's a SSO authentication ongoing.
      */
     isSSOAuthenticationOngoing(): boolean {
         return !!this.ssoAuthenticationPromise;
@@ -391,7 +387,7 @@ export class CoreAppProvider {
     /**
      * Returns a promise that will be resolved once SSO authentication finishes.
      *
-     * @return {Promise<any>} Promise resolved once SSO authentication finishes.
+     * @return Promise resolved once SSO authentication finishes.
      */
     waitForSSOAuthentication(): Promise<any> {
         return this.ssoAuthenticationPromise || Promise.resolve();
@@ -400,7 +396,7 @@ export class CoreAppProvider {
     /**
      * Retrieve redirect data.
      *
-     * @return {CoreRedirectData} Object with siteid, state, params and timemodified.
+     * @return Object with siteid, state, params and timemodified.
      */
     getRedirect(): CoreRedirectData {
         if (localStorage && localStorage.getItem) {
@@ -428,9 +424,9 @@ export class CoreAppProvider {
     /**
      * Store redirect params.
      *
-     * @param {string} siteId Site ID.
-     * @param {string} page Page to go.
-     * @param {any} params Page params.
+     * @param siteId Site ID.
+     * @param page Page to go.
+     * @param params Page params.
      */
     storeRedirect(siteId: string, page: string, params: any): void {
         if (localStorage && localStorage.setItem) {
@@ -511,14 +507,14 @@ export class CoreAppProvider {
      * button is pressed. This method decides which of the registered back button
      * actions has the highest priority and should be called.
      *
-     * @param {Function} fn Called when the back button is pressed,
-     * if this registered action has the highest priority.
-     * @param {number} priority Set the priority for this action. All actions sorted by priority will be executed since one of
-     * them returns true.
-     *   * Priorities higher or equal than 1000 will go before closing modals
-     *   * Priorities lower than 500 will only be executed if you are in the first state of the app (before exit).
-     * @returns {Function} A function that, when called, will unregister
-     * the back button action.
+     * @param fn Called when the back button is pressed,
+     *           if this registered action has the highest priority.
+     * @param priority Set the priority for this action. All actions sorted by priority will be executed since one of
+     *                 them returns true.
+     *                 * Priorities higher or equal than 1000 will go before closing modals
+     *                 * Priorities lower than 500 will only be executed if you are in the first state of the app (before exit).
+     * @return A function that, when called, will unregister
+     *         the back button action.
      */
     registerBackButtonAction(fn: Function, priority: number = 0): Function {
         const action = { fn: fn, priority: priority };
@@ -579,7 +575,7 @@ export class CoreAppProvider {
     /**
      * Set value of forceOffline flag. If true, the app will think the device is offline.
      *
-     * @param {boolean} value Value to set.
+     * @param value Value to set.
      */
     setForceOffline(value: boolean): void {
         this.forceOffline = !!value;
diff --git a/src/providers/config.ts b/src/providers/config.ts
index e368c073b..f5f42b573 100644
--- a/src/providers/config.ts
+++ b/src/providers/config.ts
@@ -47,8 +47,8 @@ export class CoreConfigProvider {
     /**
      * Deletes an app setting.
      *
-     * @param {string} name The config name.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param name The config name.
+     * @return Promise resolved when done.
      */
     delete(name: string): Promise<any> {
         return this.appDB.deleteRecords(this.TABLE_NAME, { name: name });
@@ -57,9 +57,9 @@ export class CoreConfigProvider {
     /**
      * Get an app setting.
      *
-     * @param {string} name The config name.
-     * @param {any} [defaultValue] Default value to use if the entry is not found.
-     * @return {Promise<any>} Resolves upon success along with the config data. Reject on failure.
+     * @param name The config name.
+     * @param defaultValue Default value to use if the entry is not found.
+     * @return Resolves upon success along with the config data. Reject on failure.
      */
     get(name: string, defaultValue?: any): Promise<any> {
         return this.appDB.getRecord(this.TABLE_NAME, { name: name }).then((entry) => {
@@ -76,9 +76,9 @@ export class CoreConfigProvider {
     /**
      * Set an app setting.
      *
-     * @param {string} name The config name.
-     * @param {number|string} value The config value. Can only store number or strings.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param name The config name.
+     * @param value The config value. Can only store number or strings.
+     * @return Promise resolved when done.
      */
     set(name: string, value: number | string): Promise<any> {
         return this.appDB.insertRecord(this.TABLE_NAME, { name: name, value: value });
diff --git a/src/providers/cron.ts b/src/providers/cron.ts
index b29bc654f..0970f12e0 100644
--- a/src/providers/cron.ts
+++ b/src/providers/cron.ts
@@ -27,57 +27,54 @@ import { SQLiteDB, SQLiteDBTableSchema } from '@classes/sqlitedb';
 export interface CoreCronHandler {
     /**
      * A name to identify the handler.
-     * @type {string}
      */
     name: string;
 
     /**
      * Returns handler's interval in milliseconds. Defaults to CoreCronDelegate.DEFAULT_INTERVAL.
      *
-     * @return {number} Interval time (in milliseconds).
+     * @return Interval time (in milliseconds).
      */
     getInterval?(): number;
 
     /**
      * Check whether the process uses network or not. True if not defined.
      *
-     * @return {boolean} Whether the process uses network or not
+     * @return Whether the process uses network or not
      */
     usesNetwork?(): boolean;
 
     /**
      * Check whether it's a synchronization process or not. True if not defined.
      *
-     * @return {boolean} Whether it's a synchronization process or not.
+     * @return Whether it's a synchronization process or not.
      */
     isSync?(): boolean;
 
     /**
      * Check whether the sync can be executed manually. Call isSync if not defined.
      *
-     * @return {boolean} Whether the sync can be executed manually.
+     * @return Whether the sync can be executed manually.
      */
     canManualSync?(): boolean;
 
     /**
      * Execute the process.
      *
-     * @param {string} [siteId] ID of the site affected. If not defined, all sites.
-     * @param {boolean} [force] Determines if it's a forced execution.
-     * @return {Promise<any>} Promise resolved when done. If the promise is rejected, this function will be called again often,
-     *                        it shouldn't be abused.
+     * @param siteId ID of the site affected. If not defined, all sites.
+     * @param force Determines if it's a forced execution.
+     * @return Promise resolved when done. If the promise is rejected, this function will be called again often,
+     *         it shouldn't be abused.
      */
     execute?(siteId?: string, force?: boolean): Promise<any>;
 
     /**
      * Whether the handler is running. Used internally by the provider, there's no need to set it.
-     * @type {boolean}
      */
     running?: boolean;
 
     /**
      * Timeout ID for the handler scheduling. Used internally by the provider, there's no need to set it.
-     * @type {number}
      */
     timeout?: number;
 }
@@ -135,10 +132,10 @@ export class CoreCronDelegate {
      * Try to execute a handler. It will schedule the next execution once done.
      * If the handler cannot be executed or it fails, it will be re-executed after mmCoreCronMinInterval.
      *
-     * @param {string} name Name of the handler.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @param {string}  [siteId] Site ID. If not defined, all sites.
-     * @return {Promise<any>} Promise resolved if handler is executed successfully, rejected otherwise.
+     * @param name Name of the handler.
+     * @param force Wether the execution is forced (manual sync).
+     * @param siteId Site ID. If not defined, all sites.
+     * @return Promise resolved if handler is executed successfully, rejected otherwise.
      */
     protected checkAndExecuteHandler(name: string, force?: boolean, siteId?: string): Promise<any> {
         if (!this.handlers[name] || !this.handlers[name].execute) {
@@ -204,10 +201,10 @@ export class CoreCronDelegate {
     /**
      * Run a handler, cancelling the execution if it takes more than MAX_TIME_PROCESS.
      *
-     * @param {string} name Name of the handler.
-     * @param {boolean} [force] Wether the execution is forced (manual sync).
-     * @param {string} [siteId] Site ID. If not defined, all sites.
-     * @return {Promise<any>} Promise resolved when the handler finishes or reaches max time, rejected if it fails.
+     * @param name Name of the handler.
+     * @param force Wether the execution is forced (manual sync).
+     * @param siteId Site ID. If not defined, all sites.
+     * @return Promise resolved when the handler finishes or reaches max time, rejected if it fails.
      */
     protected executeHandler(name: string, force?: boolean, siteId?: string): Promise<any> {
         return new Promise((resolve, reject): void => {
@@ -232,8 +229,8 @@ export class CoreCronDelegate {
      * Force execution of synchronization cron tasks without waiting for the scheduled time.
      * Please notice that some tasks may not be executed depending on the network connection and sync settings.
      *
-     * @param {string} [siteId] Site ID. If not defined, all sites.
-     * @return {Promise<any>} Promise resolved if all handlers are executed successfully, rejected otherwise.
+     * @param siteId Site ID. If not defined, all sites.
+     * @return Promise resolved if all handlers are executed successfully, rejected otherwise.
      */
     forceSyncExecution(siteId?: string): Promise<any> {
         const promises = [];
@@ -252,9 +249,9 @@ export class CoreCronDelegate {
      * Force execution of a cron tasks without waiting for the scheduled time.
      * Please notice that some tasks may not be executed depending on the network connection and sync settings.
      *
-     * @param {string} [name]  If provided, the name of the handler.
-     * @param {string} [siteId] Site ID. If not defined, all sites.
-     * @return {Promise<any>} Promise resolved if handler has been executed successfully, rejected otherwise.
+     * @param name If provided, the name of the handler.
+     * @param siteId Site ID. If not defined, all sites.
+     * @return Promise resolved if handler has been executed successfully, rejected otherwise.
      */
     forceCronHandlerExecution(name?: string, siteId?: string): Promise<any> {
         const handler = this.handlers[name];
@@ -273,8 +270,8 @@ export class CoreCronDelegate {
     /**
      * Get a handler's interval.
      *
-     * @param {string} name Handler's name.
-     * @return {number} Handler's interval.
+     * @param name Handler's name.
+     * @return Handler's interval.
      */
     protected getHandlerInterval(name: string): number {
         if (!this.handlers[name] || !this.handlers[name].getInterval) {
@@ -296,8 +293,8 @@ export class CoreCronDelegate {
     /**
      * Get a handler's last execution ID.
      *
-     * @param {string} name Handler's name.
-     * @return {string} Handler's last execution ID.
+     * @param name Handler's name.
+     * @return Handler's last execution ID.
      */
     protected getHandlerLastExecutionId(name: string): string {
         return 'last_execution_' + name;
@@ -306,8 +303,8 @@ export class CoreCronDelegate {
     /**
      * Get a handler's last execution time. If not defined, return 0.
      *
-     * @param {string} name Handler's name.
-     * @return {Promise<number>} Promise resolved with the handler's last execution time.
+     * @param name Handler's name.
+     * @return Promise resolved with the handler's last execution time.
      */
     protected getHandlerLastExecutionTime(name: string): Promise<number> {
         const id = this.getHandlerLastExecutionId(name);
@@ -324,8 +321,8 @@ export class CoreCronDelegate {
     /**
      * Check if a handler uses network. Defaults to true.
      *
-     * @param {string} name Handler's name.
-     * @return {boolean} True if handler uses network or not defined, false otherwise.
+     * @param name Handler's name.
+     * @return True if handler uses network or not defined, false otherwise.
      */
     protected handlerUsesNetwork(name: string): boolean {
         if (!this.handlers[name] || !this.handlers[name].usesNetwork) {
@@ -339,7 +336,7 @@ export class CoreCronDelegate {
     /**
      * Check if there is any manual sync handler registered.
      *
-     * @return {boolean} Whether it has at least 1 manual sync handler.
+     * @return Whether it has at least 1 manual sync handler.
      */
     hasManualSyncHandlers(): boolean {
         for (const name in this.handlers) {
@@ -354,7 +351,7 @@ export class CoreCronDelegate {
     /**
      * Check if there is any sync handler registered.
      *
-     * @return {boolean} Whether it has at least 1 sync handler.
+     * @return Whether it has at least 1 sync handler.
      */
     hasSyncHandlers(): boolean {
         for (const name in this.handlers) {
@@ -369,8 +366,8 @@ export class CoreCronDelegate {
     /**
      * Check if a handler can be manually synced. Defaults will use isSync instead.
      *
-     * @param {string} name Handler's name.
-     * @return {boolean} True if handler is a sync process and can be manually executed or not defined, false otherwise.
+     * @param name Handler's name.
+     * @return True if handler is a sync process and can be manually executed or not defined, false otherwise.
      */
     protected isHandlerManualSync(name: string): boolean {
         if (!this.handlers[name] || !this.handlers[name].canManualSync) {
@@ -384,8 +381,8 @@ export class CoreCronDelegate {
     /**
      * Check if a handler is a sync process. Defaults to true.
      *
-     * @param {string} name Handler's name.
-     * @return {boolean} True if handler is a sync process or not defined, false otherwise.
+     * @param name Handler's name.
+     * @return True if handler is a sync process or not defined, false otherwise.
      */
     protected isHandlerSync(name: string): boolean {
         if (!this.handlers[name] || !this.handlers[name].isSync) {
@@ -399,7 +396,7 @@ export class CoreCronDelegate {
     /**
      * Register a handler to be executed every certain time.
      *
-     * @param {CoreCronHandler} handler The handler to register.
+     * @param handler The handler to register.
      */
     register(handler: CoreCronHandler): void {
         if (!handler || !handler.name) {
@@ -424,9 +421,9 @@ export class CoreCronDelegate {
     /**
      * Schedule a next execution for a handler.
      *
-     * @param {string} name Name of the handler.
-     * @param {number} [time] Time to the next execution. If not supplied it will be calculated using the last execution and
-     *                        the handler's interval. This param should be used only if it's really necessary.
+     * @param name Name of the handler.
+     * @param time Time to the next execution. If not supplied it will be calculated using the last execution and
+     *             the handler's interval. This param should be used only if it's really necessary.
      */
     protected scheduleNextExecution(name: string, time?: number): void {
         if (!this.handlers[name]) {
@@ -470,9 +467,9 @@ export class CoreCronDelegate {
     /**
      * Set a handler's last execution time.
      *
-     * @param {string} name Handler's name.
-     * @param {number} time Time to set.
-     * @return {Promise}    Promise resolved when the execution time is saved.
+     * @param name Handler's name.
+     * @param time Time to set.
+     * @return Promise resolved when the execution time is saved.
      */
     protected setHandlerLastExecutionTime(name: string, time: number): Promise<any> {
         const id = this.getHandlerLastExecutionId(name),
@@ -487,7 +484,7 @@ export class CoreCronDelegate {
     /**
      * Start running a handler periodically.
      *
-     * @param {string} name Name of the handler.
+     * @param name Name of the handler.
      */
     protected startHandler(name: string): void {
         if (!this.handlers[name]) {
@@ -522,7 +519,7 @@ export class CoreCronDelegate {
     /**
      * Stop running a handler periodically.
      *
-     * @param {string} name Name of the handler.
+     * @param name Name of the handler.
      */
     protected stopHandler(name: string): void {
         if (!this.handlers[name]) {
diff --git a/src/providers/db.ts b/src/providers/db.ts
index e1007fa27..20c94218e 100644
--- a/src/providers/db.ts
+++ b/src/providers/db.ts
@@ -33,9 +33,9 @@ export class CoreDbProvider {
      *
      * The database objects are cached statically.
      *
-     * @param {string} name DB name.
-     * @param {boolean} forceNew True if it should always create a new instance.
-     * @return {SQLiteDB} DB.
+     * @param name DB name.
+     * @param forceNew True if it should always create a new instance.
+     * @return DB.
      */
     getDB(name: string, forceNew?: boolean): SQLiteDB {
         if (typeof this.dbInstances[name] === 'undefined' || forceNew) {
@@ -52,8 +52,8 @@ export class CoreDbProvider {
     /**
      * Delete a DB.
      *
-     * @param {string} name DB name.
-     * @return {Promise<any>} Promise resolved when the DB is deleted.
+     * @param name DB name.
+     * @return Promise resolved when the DB is deleted.
      */
     deleteDB(name: string): Promise<any> {
         let promise;
diff --git a/src/providers/events.ts b/src/providers/events.ts
index 48f3dcf32..243d4a3d4 100644
--- a/src/providers/events.ts
+++ b/src/providers/events.ts
@@ -77,10 +77,10 @@ export class CoreEventsProvider {
      * ...
      * observer.off();
      *
-     * @param {string} eventName Name of the event to listen to.
-     * @param {Function} callBack Function to call when the event is triggered.
-     * @param {string} [siteId] Site where to trigger the event. Undefined won't check the site.
-     * @return {CoreEventObserver} Observer to stop listening.
+     * @param eventName Name of the event to listen to.
+     * @param callBack Function to call when the event is triggered.
+     * @param siteId Site where to trigger the event. Undefined won't check the site.
+     * @return Observer to stop listening.
      */
     on(eventName: string, callBack: (value: any) => void, siteId?: string): CoreEventObserver {
         // If it's a unique event and has been triggered already, call the callBack.
@@ -121,9 +121,9 @@ export class CoreEventsProvider {
     /**
      * Triggers an event, notifying all the observers.
      *
-     * @param {string} event Name of the event to trigger.
-     * @param {any} [data] Data to pass to the observers.
-     * @param {string} [siteId] Site where to trigger the event. Undefined means no Site.
+     * @param event Name of the event to trigger.
+     * @param data Data to pass to the observers.
+     * @param siteId Site where to trigger the event. Undefined means no Site.
      */
     trigger(eventName: string, data?: any, siteId?: string): void {
         this.logger.debug(`Event '${eventName}' triggered.`);
@@ -141,9 +141,9 @@ export class CoreEventsProvider {
     /**
      * Triggers a unique event, notifying all the observers. If the event has already been triggered, don't do anything.
      *
-     * @param {string} event Name of the event to trigger.
-     * @param {any} data Data to pass to the observers.
-     * @param {string} [siteId] Site where to trigger the event. Undefined means no Site.
+     * @param event Name of the event to trigger.
+     * @param data Data to pass to the observers.
+     * @param siteId Site where to trigger the event. Undefined means no Site.
      */
     triggerUnique(eventName: string, data: any, siteId?: string): void {
         if (this.uniqueEvents[eventName]) {
diff --git a/src/providers/file-helper.ts b/src/providers/file-helper.ts
index 0260eb610..91b91c8c8 100644
--- a/src/providers/file-helper.ts
+++ b/src/providers/file-helper.ts
@@ -34,13 +34,13 @@ export class CoreFileHelperProvider {
     /**
      * Convenience function to open a file, downloading it if needed.
      *
-     * @param {any} file The file to download.
-     * @param {string} [component] The component to link the file to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @param {string} [state] The file's state. If not provided, it will be calculated.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @param {string} [siteId] The site ID. If not defined, current site.
-     * @return {Promise<any>} Resolved on success.
+     * @param file The file to download.
+     * @param component The component to link the file to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param state The file's state. If not provided, it will be calculated.
+     * @param onProgress Function to call on progress.
+     * @param siteId The site ID. If not defined, current site.
+     * @return Resolved on success.
      */
     downloadAndOpenFile(file: any, component: string, componentId: string | number, state?: string,
             onProgress?: (event: any) => any, siteId?: string): Promise<any> {
@@ -104,15 +104,15 @@ export class CoreFileHelperProvider {
     /**
      * Download a file if it needs to be downloaded.
      *
-     * @param {any} file The file to download.
-     * @param {string} fileUrl The file URL.
-     * @param {string} [component] The component to link the file to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @param {number} [timemodified] The time this file was modified.
-     * @param {string} [state] The file's state. If not provided, it will be calculated.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @param {string} [siteId] The site ID. If not defined, current site.
-     * @return {Promise<string>} Resolved with the URL to use on success.
+     * @param file The file to download.
+     * @param fileUrl The file URL.
+     * @param component The component to link the file to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param timemodified The time this file was modified.
+     * @param state The file's state. If not provided, it will be calculated.
+     * @param onProgress Function to call on progress.
+     * @param siteId The site ID. If not defined, current site.
+     * @return Resolved with the URL to use on success.
      */
     protected downloadFileIfNeeded(file: any, fileUrl: string, component?: string, componentId?: string | number,
             timemodified?: number, state?: string, onProgress?: (event: any) => any, siteId?: string): Promise<string> {
@@ -185,14 +185,14 @@ export class CoreFileHelperProvider {
     /**
      * Download the file.
      *
-     * @param {string} fileUrl The file URL.
-     * @param {string} [component] The component to link the file to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @param {number} [timemodified] The time this file was modified.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @param {any} [file] The file to download.
-     * @param {string} [siteId] The site ID. If not defined, current site.
-     * @return {Promise<string>} Resolved with internal URL on success, rejected otherwise.
+     * @param fileUrl The file URL.
+     * @param component The component to link the file to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param timemodified The time this file was modified.
+     * @param onProgress Function to call on progress.
+     * @param file The file to download.
+     * @param siteId The site ID. If not defined, current site.
+     * @return Resolved with internal URL on success, rejected otherwise.
      */
     downloadFile(fileUrl: string, component?: string, componentId?: string | number, timemodified?: number,
             onProgress?: (event: any) => any, file?: any, siteId?: string): Promise<string> {
@@ -222,7 +222,7 @@ export class CoreFileHelperProvider {
     /**
      * Get the file's URL.
      *
-     * @param {any} file The file.
+     * @param file The file.
      */
     getFileUrl(file: any): string {
         return file.fileurl || file.url;
@@ -231,7 +231,7 @@ export class CoreFileHelperProvider {
     /**
      * Get the file's timemodified.
      *
-     * @param {any} file The file.
+     * @param file The file.
      */
     getFileTimemodified(file: any): number {
         return file.timemodified || 0;
@@ -240,7 +240,7 @@ export class CoreFileHelperProvider {
     /**
      * Check if a state is downloaded or outdated.
      *
-     * @param {string} state The state to check.
+     * @param state The state to check.
      */
     isStateDownloaded(state: string): boolean {
         return state === CoreConstants.DOWNLOADED || state === CoreConstants.OUTDATED;
@@ -250,8 +250,8 @@ export class CoreFileHelperProvider {
      * Whether the file has to be opened in browser (external repository).
      * The file must have a mimetype attribute.
      *
-     * @param {any} file The file to check.
-     * @return {boolean} Whether the file should be opened in browser.
+     * @param file The file to check.
+     * @return Whether the file should be opened in browser.
      */
     shouldOpenInBrowser(file: any): boolean {
         if (!file || !file.isexternalfile || !file.mimetype) {
diff --git a/src/providers/file-session.ts b/src/providers/file-session.ts
index 8d35df55e..bd71659e3 100644
--- a/src/providers/file-session.ts
+++ b/src/providers/file-session.ts
@@ -31,10 +31,10 @@ export class CoreFileSessionProvider {
     /**
      * Add a file to the session.
      *
-     * @param {string} component Component Name.
-     * @param {string|number} id File area identifier.
-     * @param {any} file File to add.
-     * @param {string} [siteId] Site ID. If not defined, current site.
+     * @param component Component Name.
+     * @param id File area identifier.
+     * @param file File to add.
+     * @param siteId Site ID. If not defined, current site.
      */
     addFile(component: string, id: string | number, file: any, siteId?: string): void {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -47,9 +47,9 @@ export class CoreFileSessionProvider {
     /**
      * Clear files stored in session.
      *
-     * @param {string} component Component Name.
-     * @param {string|number} id File area identifier.
-     * @param {string} [siteId] Site ID. If not defined, current site.
+     * @param component Component Name.
+     * @param id File area identifier.
+     * @param siteId Site ID. If not defined, current site.
      */
     clearFiles(component: string, id: string | number, siteId?: string): void {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -61,10 +61,10 @@ export class CoreFileSessionProvider {
     /**
      * Get files stored in session.
      *
-     * @param {string} component Component Name.
-     * @param {string|number} id File area identifier.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {any[]} Array of files in session.
+     * @param component Component Name.
+     * @param id File area identifier.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Array of files in session.
      */
     getFiles(component: string, id: string | number, siteId?: string): any[] {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -78,9 +78,9 @@ export class CoreFileSessionProvider {
     /**
      * Initializes the filearea to store the file.
      *
-     * @param {string} component Component Name.
-     * @param {string|number} id File area identifier.
-     * @param {string} [siteId] Site ID. If not defined, current site.
+     * @param component Component Name.
+     * @param id File area identifier.
+     * @param siteId Site ID. If not defined, current site.
      */
     protected initFileArea(component: string, id: string | number, siteId?: string): void {
         if (!this.files[siteId]) {
@@ -99,10 +99,10 @@ export class CoreFileSessionProvider {
     /**
      * Remove a file stored in session.
      *
-     * @param {string} component Component Name.
-     * @param {string|number} id File area identifier.
-     * @param {any} file File to remove. The instance should be exactly the same as the one stored in session.
-     * @param {string} [siteId] Site ID. If not defined, current site.
+     * @param component Component Name.
+     * @param id File area identifier.
+     * @param file File to remove. The instance should be exactly the same as the one stored in session.
+     * @param siteId Site ID. If not defined, current site.
      */
     removeFile(component: string, id: string | number, file: any, siteId?: string): void {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -117,10 +117,10 @@ export class CoreFileSessionProvider {
     /**
      * Remove a file stored in session.
      *
-     * @param {string} component Component Name.
-     * @param {string|number} id File area identifier.
-     * @param {number} index Position of the file to remove.
-     * @param {string} [siteId] Site ID. If not defined, current site.
+     * @param component Component Name.
+     * @param id File area identifier.
+     * @param index Position of the file to remove.
+     * @param siteId Site ID. If not defined, current site.
      */
     removeFileByIndex(component: string, id: string | number, index: number, siteId?: string): void {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -133,10 +133,10 @@ export class CoreFileSessionProvider {
     /**
      * Set a group of files in the session.
      *
-     * @param {string} component Component Name.
-     * @param {string|number} id File area identifier.
-     * @param {any[]} newFiles Files to set.
-     * @param {string} [siteId] Site ID. If not defined, current site.
+     * @param component Component Name.
+     * @param id File area identifier.
+     * @param newFiles Files to set.
+     * @param siteId Site ID. If not defined, current site.
      */
     setFiles(component: string, id: string | number, newFiles: any[], siteId?: string): void {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
diff --git a/src/providers/file.ts b/src/providers/file.ts
index a2c53ceb1..916a2fb7c 100644
--- a/src/providers/file.ts
+++ b/src/providers/file.ts
@@ -28,19 +28,16 @@ import { Zip } from '@ionic-native/zip';
 export interface CoreFileProgressEvent {
     /**
      * Whether the values are reliabñe.
-     * @type {boolean}
      */
     lengthComputable?: boolean;
 
     /**
      * Number of treated bytes.
-     * @type {number}
      */
     loaded?: number;
 
     /**
      * Total of bytes.
-     * @type {number}
      */
     total?: number;
 }
@@ -97,7 +94,7 @@ export class CoreFileProvider {
     /**
      * Define an event for FileReader.
      *
-     * @param {string} eventName Name of the event.
+     * @param eventName Name of the event.
      */
     protected defineEvent(eventName: string): void {
         this.defineGetterSetter(FileReader.prototype, eventName, function(): any {
@@ -110,10 +107,10 @@ export class CoreFileProvider {
     /**
      * Define a getter and, optionally, a setter for a certain property in an object.
      *
-     * @param {any} obj Object to set the getter/setter for.
-     * @param {string} key Name of the property where to set them.
-     * @param {Function} getFunc The getter function.
-     * @param {Function} [setFunc] The setter function.
+     * @param obj Object to set the getter/setter for.
+     * @param key Name of the property where to set them.
+     * @param getFunc The getter function.
+     * @param setFunc The setter function.
      */
     protected defineGetterSetter(obj: any, key: string, getFunc: Function, setFunc?: Function): void {
         if (Object.defineProperty) {
@@ -138,7 +135,7 @@ export class CoreFileProvider {
     /**
      * Sets basePath to use with HTML API. Reserved for core use.
      *
-     * @param {string} path Base path to use.
+     * @param path Base path to use.
      */
     setHTMLBasePath(path: string): void {
         this.isHTMLAPI = true;
@@ -148,7 +145,7 @@ export class CoreFileProvider {
     /**
      * Checks if we're using HTML API.
      *
-     * @return {boolean} True if uses HTML API, false otherwise.
+     * @return True if uses HTML API, false otherwise.
      */
     usesHTMLAPI(): boolean {
         return this.isHTMLAPI;
@@ -157,7 +154,7 @@ export class CoreFileProvider {
     /**
      * Initialize basePath based on the OS if it's not initialized already.
      *
-     * @return {Promise<void>} Promise to be resolved when the initialization is finished.
+     * @return Promise to be resolved when the initialization is finished.
      */
     init(): Promise<void> {
         if (this.initialized) {
@@ -184,7 +181,7 @@ export class CoreFileProvider {
     /**
      * Check if the plugin is available.
      *
-     * @return {boolean} Whether the plugin is available.
+     * @return Whether the plugin is available.
      */
     isAvailable(): boolean {
         return typeof window.resolveLocalFileSystemURL !== 'undefined';
@@ -193,8 +190,8 @@ export class CoreFileProvider {
     /**
      * Get a file.
      *
-     * @param {string} path Relative path to the file.
-     * @return {Promise<FileEntry>} Promise resolved when the file is retrieved.
+     * @param path Relative path to the file.
+     * @return Promise resolved when the file is retrieved.
      */
     getFile(path: string): Promise<FileEntry> {
         return this.init().then(() => {
@@ -209,8 +206,8 @@ export class CoreFileProvider {
     /**
      * Get a directory.
      *
-     * @param {string} path Relative path to the directory.
-     * @return {Promise<DirectoryEntry>} Promise resolved when the directory is retrieved.
+     * @param path Relative path to the directory.
+     * @return Promise resolved when the directory is retrieved.
      */
     getDir(path: string): Promise<DirectoryEntry> {
         return this.init().then(() => {
@@ -223,8 +220,8 @@ export class CoreFileProvider {
     /**
      * Get site folder path.
      *
-     * @param {string} siteId Site ID.
-     * @return {string} Site folder path.
+     * @param siteId Site ID.
+     * @return Site folder path.
      */
     getSiteFolder(siteId: string): string {
         return CoreFileProvider.SITESFOLDER + '/' + siteId;
@@ -233,11 +230,11 @@ export class CoreFileProvider {
     /**
      * Create a directory or a file.
      *
-     * @param {boolean} isDirectory True if a directory should be created, false if it should create a file.
-     * @param {string} path Relative path to the dir/file.
-     * @param {boolean} [failIfExists] True if it should fail if the dir/file exists, false otherwise.
-     * @param {string} [base] Base path to create the dir/file in. If not set, use basePath.
-     * @return {Promise<any>} Promise to be resolved when the dir/file is created.
+     * @param isDirectory True if a directory should be created, false if it should create a file.
+     * @param path Relative path to the dir/file.
+     * @param failIfExists True if it should fail if the dir/file exists, false otherwise.
+     * @param base Base path to create the dir/file in. If not set, use basePath.
+     * @return Promise to be resolved when the dir/file is created.
      */
     protected create(isDirectory: boolean, path: string, failIfExists?: boolean, base?: string): Promise<any> {
         return this.init().then(() => {
@@ -277,9 +274,9 @@ export class CoreFileProvider {
     /**
      * Create a directory.
      *
-     * @param {string} path Relative path to the directory.
-     * @param {boolean} [failIfExists] True if it should fail if the directory exists, false otherwise.
-     * @return {Promise<DirectoryEntry>} Promise to be resolved when the directory is created.
+     * @param path Relative path to the directory.
+     * @param failIfExists True if it should fail if the directory exists, false otherwise.
+     * @return Promise to be resolved when the directory is created.
      */
     createDir(path: string, failIfExists?: boolean): Promise<DirectoryEntry> {
         return this.create(true, path, failIfExists);
@@ -288,9 +285,9 @@ export class CoreFileProvider {
     /**
      * Create a file.
      *
-     * @param {string} path Relative path to the file.
-     * @param {boolean} [failIfExists] True if it should fail if the file exists, false otherwise..
-     * @return {Promise<FileEntry>} Promise to be resolved when the file is created.
+     * @param path Relative path to the file.
+     * @param failIfExists True if it should fail if the file exists, false otherwise..
+     * @return Promise to be resolved when the file is created.
      */
     createFile(path: string, failIfExists?: boolean): Promise<FileEntry> {
         return this.create(false, path, failIfExists);
@@ -299,8 +296,8 @@ export class CoreFileProvider {
     /**
      * Removes a directory and all its contents.
      *
-     * @param {string} path Relative path to the directory.
-     * @return {Promise<any>} Promise to be resolved when the directory is deleted.
+     * @param path Relative path to the directory.
+     * @return Promise to be resolved when the directory is deleted.
      */
     removeDir(path: string): Promise<any> {
         return this.init().then(() => {
@@ -315,8 +312,8 @@ export class CoreFileProvider {
     /**
      * Removes a file and all its contents.
      *
-     * @param {string} path Relative path to the file.
-     * @return {Promise<any>} Promise to be resolved when the file is deleted.
+     * @param path Relative path to the file.
+     * @return Promise to be resolved when the file is deleted.
      */
     removeFile(path: string): Promise<any> {
         return this.init().then(() => {
@@ -340,8 +337,8 @@ export class CoreFileProvider {
     /**
      * Removes a file given its FileEntry.
      *
-     * @param {FileEntry} fileEntry File Entry.
-     * @return {Promise<any>} Promise resolved when the file is deleted.
+     * @param fileEntry File Entry.
+     * @return Promise resolved when the file is deleted.
      */
     removeFileByFileEntry(fileEntry: any): Promise<any> {
         return new Promise((resolve, reject): void => {
@@ -352,8 +349,8 @@ export class CoreFileProvider {
     /**
      * Retrieve the contents of a directory (not subdirectories).
      *
-     * @param {string} path Relative path to the directory.
-     * @return {Promise<any>} Promise to be resolved when the contents are retrieved.
+     * @param path Relative path to the directory.
+     * @return Promise to be resolved when the contents are retrieved.
      */
     getDirectoryContents(path: string): Promise<any> {
         return this.init().then(() => {
@@ -368,8 +365,8 @@ export class CoreFileProvider {
     /**
      * Calculate the size of a directory or a file.
      *
-     * @param {any} entry Directory or file.
-     * @return {Promise<number>} Promise to be resolved when the size is calculated.
+     * @param entry Directory or file.
+     * @return Promise to be resolved when the size is calculated.
      */
     protected getSize(entry: any): Promise<number> {
         return new Promise((resolve, reject): void => {
@@ -411,8 +408,8 @@ export class CoreFileProvider {
     /**
      * Calculate the size of a directory.
      *
-     * @param {string} path Relative path to the directory.
-     * @return {Promise<number>} Promise to be resolved when the size is calculated.
+     * @param path Relative path to the directory.
+     * @return Promise to be resolved when the size is calculated.
      */
     getDirectorySize(path: string): Promise<number> {
         // Remove basePath if it's in the path.
@@ -428,8 +425,8 @@ export class CoreFileProvider {
     /**
      * Calculate the size of a file.
      *
-     * @param {string} path Relative path to the file.
-     * @return {Promise<number>} Promise to be resolved when the size is calculated.
+     * @param path Relative path to the file.
+     * @return Promise to be resolved when the size is calculated.
      */
     getFileSize(path: string): Promise<number> {
         // Remove basePath if it's in the path.
@@ -445,8 +442,8 @@ export class CoreFileProvider {
     /**
      * Get file object from a FileEntry.
      *
-     * @param {FileEntry} path Relative path to the file.
-     * @return {Promise<any>} Promise to be resolved when the file is retrieved.
+     * @param path Relative path to the file.
+     * @return Promise to be resolved when the file is retrieved.
      */
     getFileObjectFromFileEntry(entry: FileEntry): Promise<any> {
         return new Promise((resolve, reject): void => {
@@ -459,7 +456,7 @@ export class CoreFileProvider {
      * Calculate the free space in the disk.
      * Please notice that this function isn't reliable and it's not documented in the Cordova File plugin.
      *
-     * @return {Promise<number>} Promise resolved with the estimated free space in bytes.
+     * @return Promise resolved with the estimated free space in bytes.
      */
     calculateFreeSpace(): Promise<number> {
         return this.file.getFreeDiskSpace().then((size) => {
@@ -476,8 +473,8 @@ export class CoreFileProvider {
     /**
      * Normalize a filename that usually comes URL encoded.
      *
-     * @param {string} filename The file name.
-     * @return {string} The file name normalized.
+     * @param filename The file name.
+     * @return The file name normalized.
      */
     normalizeFileName(filename: string): string {
         filename = this.textUtils.decodeURIComponent(filename);
@@ -488,13 +485,13 @@ export class CoreFileProvider {
     /**
      * Read a file from local file system.
      *
-     * @param {string} path Relative path to the file.
-     * @param {number} [format=FORMATTEXT] Format to read the file. Must be one of:
-     *                                  FORMATTEXT
-     *                                  FORMATDATAURL
-     *                                  FORMATBINARYSTRING
-     *                                  FORMATARRAYBUFFER
-     * @return {Promise<any>} Promise to be resolved when the file is read.
+     * @param path Relative path to the file.
+     * @param format Format to read the file. Must be one of:
+     *               FORMATTEXT
+     *               FORMATDATAURL
+     *               FORMATBINARYSTRING
+     *               FORMATARRAYBUFFER
+     * @return Promise to be resolved when the file is read.
      */
     readFile(path: string, format: number = CoreFileProvider.FORMATTEXT): Promise<any> {
         // Remove basePath if it's in the path.
@@ -516,13 +513,13 @@ export class CoreFileProvider {
     /**
      * Read file contents from a file data object.
      *
-     * @param {any} fileData File's data.
-     * @param {number} [format=FORMATTEXT] Format to read the file. Must be one of:
-     *                                  FORMATTEXT
-     *                                  FORMATDATAURL
-     *                                  FORMATBINARYSTRING
-     *                                  FORMATARRAYBUFFER
-     * @return {Promise<any>} Promise to be resolved when the file is read.
+     * @param fileData File's data.
+     * @param format Format to read the file. Must be one of:
+     *               FORMATTEXT
+     *               FORMATDATAURL
+     *               FORMATBINARYSTRING
+     *               FORMATARRAYBUFFER
+     * @return Promise to be resolved when the file is read.
      */
     readFileData(fileData: any, format: number = CoreFileProvider.FORMATTEXT): Promise<any> {
         format = format || CoreFileProvider.FORMATTEXT;
@@ -574,10 +571,10 @@ export class CoreFileProvider {
     /**
      * Writes some data in a file.
      *
-     * @param {string} path Relative path to the file.
-     * @param {any} data Data to write.
-     * @param {boolean} [append] Whether to append the data to the end of the file.
-     * @return {Promise<any>} Promise to be resolved when the file is written.
+     * @param path Relative path to the file.
+     * @param data Data to write.
+     * @param append Whether to append the data to the end of the file.
+     * @return Promise to be resolved when the file is written.
      */
     writeFile(path: string, data: any, append?: boolean): Promise<any> {
         return this.init().then(() => {
@@ -605,12 +602,12 @@ export class CoreFileProvider {
      * Write some file data into a filesystem file.
      * It's done in chunks to prevent crashing the app for big files.
      *
-     * @param {any} file The data to write.
-     * @param {string} path Path where to store the data.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @param {number} [offset=0] Offset where to start reading from.
-     * @param {boolean} [append] Whether to append the data to the end of the file.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param file The data to write.
+     * @param path Path where to store the data.
+     * @param onProgress Function to call on progress.
+     * @param offset Offset where to start reading from.
+     * @param append Whether to append the data to the end of the file.
+     * @return Promise resolved when done.
      */
     writeFileDataInFile(file: any, path: string, onProgress?: (event: CoreFileProgressEvent) => any, offset: number = 0,
             append?: boolean): Promise<any> {
@@ -642,10 +639,10 @@ export class CoreFileProvider {
     /**
      * Write a chunk of data into a file.
      *
-     * @param {any} chunkData The chunk of data.
-     * @param {string} path Path where to store the data.
-     * @param {boolean} [append] Whether to append the data to the end of the file.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param chunkData The chunk of data.
+     * @param path Path where to store the data.
+     * @param append Whether to append the data to the end of the file.
+     * @return Promise resolved when done.
      */
     protected writeFileDataInFileChunk(chunkData: any, path: string, append?: boolean): Promise<any> {
         // Read the chunk data.
@@ -658,8 +655,8 @@ export class CoreFileProvider {
     /**
      * Gets a file that might be outside the app's folder.
      *
-     * @param {string} fullPath Absolute path to the file.
-     * @return {Promise<FileEntry>} Promise to be resolved when the file is retrieved.
+     * @param fullPath Absolute path to the file.
+     * @return Promise to be resolved when the file is retrieved.
      */
     getExternalFile(fullPath: string): Promise<FileEntry> {
         return this.file.resolveLocalFilesystemUrl(fullPath).then((entry) => {
@@ -670,8 +667,8 @@ export class CoreFileProvider {
     /**
      * Removes a file that might be outside the app's folder.
      *
-     * @param {string} fullPath Absolute path to the file.
-     * @return {Promise<any>} Promise to be resolved when the file is removed.
+     * @param fullPath Absolute path to the file.
+     * @return Promise to be resolved when the file is removed.
      */
     removeExternalFile(fullPath: string): Promise<any> {
         const directory = fullPath.substring(0, fullPath.lastIndexOf('/')),
@@ -683,7 +680,7 @@ export class CoreFileProvider {
     /**
      * Get the base path where the application files are stored.
      *
-     * @return {Promise<string>} Promise to be resolved when the base path is retrieved.
+     * @return Promise to be resolved when the base path is retrieved.
      */
     getBasePath(): Promise<string> {
         return this.init().then(() => {
@@ -700,7 +697,7 @@ export class CoreFileProvider {
      * iOS: Internal URL (cdvfile://).
      * Others: basePath (file://)
      *
-     * @return {Promise<string>} Promise to be resolved when the base path is retrieved.
+     * @return Promise to be resolved when the base path is retrieved.
      */
     getBasePathToDownload(): Promise<string> {
         return this.init().then(() => {
@@ -719,7 +716,7 @@ export class CoreFileProvider {
     /**
      * Get the base path where the application files are stored. Returns the value instantly, without waiting for it to be ready.
      *
-     * @return {string} Base path. If the service hasn't been initialized it will return an invalid value.
+     * @return Base path. If the service hasn't been initialized it will return an invalid value.
      */
     getBasePathInstant(): string {
         if (!this.basePath) {
@@ -734,9 +731,9 @@ export class CoreFileProvider {
     /**
      * Move a file.
      *
-     * @param {string} [originalPath] Path to the file to move.
-     * @param {string} [newPath] New path of the file.
-     * @return {Promise<any>} Promise resolved when the entry is moved.
+     * @param originalPath Path to the file to move.
+     * @param newPath New path of the file.
+     * @return Promise resolved when the entry is moved.
      */
     moveFile(originalPath: string, newPath: string): Promise<any> {
         return this.init().then(() => {
@@ -786,9 +783,9 @@ export class CoreFileProvider {
     /**
      * Copy a file.
      *
-     * @param {string} from Path to the file to move.
-     * @param {string} to New path of the file.
-     * @return {Promise<any>} Promise resolved when the entry is copied.
+     * @param from Path to the file to move.
+     * @param to New path of the file.
+     * @return Promise resolved when the entry is copied.
      */
     copyFile(from: string, to: string): Promise<any> {
         let fromFileAndDir,
@@ -832,8 +829,8 @@ export class CoreFileProvider {
     /**
      * Extract the file name and directory from a given path.
      *
-     * @param {string} path Path to be extracted.
-     * @return {any} Plain object containing the file name and directory.
+     * @param path Path to be extracted.
+     * @return Plain object containing the file name and directory.
      * @description
      * file.pdf         -> directory: '', name: 'file.pdf'
      * /file.pdf        -> directory: '', name: 'file.pdf'
@@ -856,8 +853,8 @@ export class CoreFileProvider {
     /**
      * Get the internal URL of a file.
      *
-     * @param {FileEntry} fileEntry File Entry.
-     * @return {string} Internal URL.
+     * @param fileEntry File Entry.
+     * @return Internal URL.
      */
     getInternalURL(fileEntry: FileEntry): string {
         if (!fileEntry.toInternalURL) {
@@ -871,8 +868,8 @@ export class CoreFileProvider {
     /**
      * Adds the basePath to a path if it doesn't have it already.
      *
-     * @param {string} path Path to treat.
-     * @return {string} Path with basePath added.
+     * @param path Path to treat.
+     * @return Path with basePath added.
      */
     addBasePathIfNeeded(path: string): string {
         if (path.indexOf(this.basePath) > -1) {
@@ -885,8 +882,8 @@ export class CoreFileProvider {
     /**
      * Remove the base path from a path. If basePath isn't found, return false.
      *
-     * @param {string} path Path to treat.
-     * @return {string} Path without basePath if basePath was found, undefined otherwise.
+     * @param path Path to treat.
+     * @return Path without basePath if basePath was found, undefined otherwise.
      */
     removeBasePath(path: string): string {
         if (path.indexOf(this.basePath) > -1) {
@@ -897,11 +894,11 @@ export class CoreFileProvider {
     /**
      * Unzips a file.
      *
-     * @param {string} path Path to the ZIP file.
-     * @param {string} [destFolder] Path to the destination folder. If not defined, a new folder will be created with the
-     *                     same location and name as the ZIP file (without extension).
-     * @param {Function} [onProgress] Function to call on progress.
-     * @return {Promise<any>} Promise resolved when the file is unzipped.
+     * @param path Path to the ZIP file.
+     * @param destFolder Path to the destination folder. If not defined, a new folder will be created with the
+     *                   same location and name as the ZIP file (without extension).
+     * @param onProgress Function to call on progress.
+     * @return Promise resolved when the file is unzipped.
      */
     unzipFile(path: string, destFolder?: string, onProgress?: Function): Promise<any> {
         // Get the source file.
@@ -920,10 +917,10 @@ export class CoreFileProvider {
     /**
      * Search a string or regexp in a file contents and replace it. The result is saved in the same file.
      *
-     * @param {string} path Path to the file.
-     * @param {string|RegExp} search Value to search.
-     * @param {string} newValue New value.
-     * @return {Promise<any>} Promise resolved in success.
+     * @param path Path to the file.
+     * @param search Value to search.
+     * @param newValue New value.
+     * @return Promise resolved in success.
      */
     replaceInFile(path: string, search: string | RegExp, newValue: string): Promise<any> {
         return this.readFile(path).then((content) => {
@@ -942,8 +939,8 @@ export class CoreFileProvider {
     /**
      * Get a file/dir metadata given the file's entry.
      *
-     * @param {Entry} fileEntry FileEntry retrieved from getFile or similar.
-     * @return {Promise<any>} Promise resolved with metadata.
+     * @param fileEntry FileEntry retrieved from getFile or similar.
+     * @return Promise resolved with metadata.
      */
     getMetadata(fileEntry: Entry): Promise<any> {
         if (!fileEntry || !fileEntry.getMetadata) {
@@ -958,9 +955,9 @@ export class CoreFileProvider {
     /**
      * Get a file/dir metadata given the path.
      *
-     * @param {string} path Path to the file/dir.
-     * @param {boolean} [isDir] True if directory, false if file.
-     * @return {Promise<any>} Promise resolved with metadata.
+     * @param path Path to the file/dir.
+     * @param isDir True if directory, false if file.
+     * @return Promise resolved with metadata.
      */
     getMetadataFromPath(path: string, isDir?: boolean): Promise<any> {
         let promise;
@@ -978,8 +975,8 @@ export class CoreFileProvider {
     /**
      * Remove the starting slash of a path if it's there. E.g. '/sites/filepool' -> 'sites/filepool'.
      *
-     * @param {string} path Path.
-     * @return {string} Path without a slash in the first position.
+     * @param path Path.
+     * @return Path without a slash in the first position.
      */
     removeStartingSlash(path: string): string {
         if (path[0] == '/') {
@@ -992,10 +989,10 @@ export class CoreFileProvider {
     /**
      * Convenience function to copy or move an external file.
      *
-     * @param {string} from Absolute path to the file to copy/move.
-     * @param {string} to Relative new path of the file (inside the app folder).
-     * @param {boolean} copy True to copy, false to move.
-     * @return {Promise<any>} Promise resolved when the entry is copied/moved.
+     * @param from Absolute path to the file to copy/move.
+     * @param to Relative new path of the file (inside the app folder).
+     * @param copy True to copy, false to move.
+     * @return Promise resolved when the entry is copied/moved.
      */
     protected copyOrMoveExternalFile(from: string, to: string, copy?: boolean): Promise<any> {
         // Get the file to copy/move.
@@ -1019,9 +1016,9 @@ export class CoreFileProvider {
     /**
      * Copy a file from outside of the app folder to somewhere inside the app folder.
      *
-     * @param {string} from Absolute path to the file to copy.
-     * @param {string} to Relative new path of the file (inside the app folder).
-     * @return {Promise<any>} Promise resolved when the entry is copied.
+     * @param from Absolute path to the file to copy.
+     * @param to Relative new path of the file (inside the app folder).
+     * @return Promise resolved when the entry is copied.
      */
     copyExternalFile(from: string, to: string): Promise<any> {
         return this.copyOrMoveExternalFile(from, to, true);
@@ -1030,9 +1027,9 @@ export class CoreFileProvider {
     /**
      * Move a file from outside of the app folder to somewhere inside the app folder.
      *
-     * @param {string} from Absolute path to the file to move.
-     * @param {string} to Relative new path of the file (inside the app folder).
-     * @return {Promise<any>} Promise resolved when the entry is moved.
+     * @param from Absolute path to the file to move.
+     * @param to Relative new path of the file (inside the app folder).
+     * @return Promise resolved when the entry is moved.
      */
     moveExternalFile(from: string, to: string): Promise<any> {
         return this.copyOrMoveExternalFile(from, to, false);
@@ -1041,10 +1038,10 @@ export class CoreFileProvider {
     /**
      * Get a unique file name inside a folder, adding numbers to the file name if needed.
      *
-     * @param {string} dirPath Path to the destination folder.
-     * @param {string} fileName File name that wants to be used.
-     * @param {string} [defaultExt] Default extension to use if no extension found in the file.
-     * @return {Promise<string>} Promise resolved with the unique file name.
+     * @param dirPath Path to the destination folder.
+     * @param fileName File name that wants to be used.
+     * @param defaultExt Default extension to use if no extension found in the file.
+     * @return Promise resolved with the unique file name.
      */
     getUniqueNameInFolder(dirPath: string, fileName: string, defaultExt?: string): Promise<string> {
         // Get existing files in the folder.
@@ -1094,7 +1091,7 @@ export class CoreFileProvider {
     /**
      * Remove app temporary folder.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     clearTmpFolder(): Promise<any> {
         return this.removeDir(CoreFileProvider.TMPFOLDER).catch(() => {
@@ -1105,9 +1102,9 @@ export class CoreFileProvider {
     /**
      * Given a folder path and a list of used files, remove all the files of the folder that aren't on the list of used files.
      *
-     * @param {string} dirPath Folder path.
-     * @param {any[]} files List of used files.
-     * @return {Promise<any>} Promise resolved when done, rejected if failure.
+     * @param dirPath Folder path.
+     * @param files List of used files.
+     * @return Promise resolved when done, rejected if failure.
      */
     removeUnusedFiles(dirPath: string, files: any[]): Promise<any> {
         // Get the directory contents.
@@ -1143,8 +1140,8 @@ export class CoreFileProvider {
     /**
      * Check if a file is inside the app's folder.
      *
-     * @param {string} path The absolute path of the file to check.
-     * @return {boolean} Whether the file is in the app's folder.
+     * @param path The absolute path of the file to check.
+     * @return Whether the file is in the app's folder.
      */
     isFileInAppFolder(path: string): boolean {
         return path.indexOf(this.basePath) != -1;
diff --git a/src/providers/filepool.ts b/src/providers/filepool.ts
index aded3de7e..8f45b4a0e 100644
--- a/src/providers/filepool.ts
+++ b/src/providers/filepool.ts
@@ -38,61 +38,51 @@ import { Md5 } from 'ts-md5/dist/md5';
 export interface CoreFilepoolFileEntry {
     /**
      * The fileId to identify the file.
-     * @type {string}
      */
     fileId?: string;
 
     /**
      * File's URL.
-     * @type {string}
      */
     url?: string;
 
     /**
      * File's revision.
-     * @type {number}
      */
     revision?: number;
 
     /**
      * File's timemodified.
-     * @type {number}
      */
     timemodified?: number;
 
     /**
      * 1 if file is stale (needs to be updated), 0 otherwise.
-     * @type {number}
      */
     stale?: number;
 
     /**
      * Timestamp when this file was downloaded.
-     * @type {number}
      */
     downloadTime?: number;
 
     /**
      * 1 if it's a external file (from an external repository), 0 otherwise.
-     * @type {number}
      */
     isexternalfile?: number;
 
     /**
      * Type of the repository this file belongs to.
-     * @type {string}
      */
     repositorytype?: string;
 
     /**
      * File's path.
-     * @type {string}
      */
     path?: string;
 
     /**
      * File's extension.
-     * @type {string}
      */
     extension?: string;
 }
@@ -103,67 +93,56 @@ export interface CoreFilepoolFileEntry {
 export interface CoreFilepoolQueueEntry {
     /**
      * The site the file belongs to.
-     * @type {string}
      */
     siteId?: string;
 
     /**
      * The fileId to identify the file.
-     * @type {string}
      */
     fileId?: string;
 
     /**
      * Timestamp when the file was added to the queue.
-     * @type {number}
      */
     added?: number;
 
     /**
      * The priority of the file.
-     * @type {number}
      */
     priority?: number;
 
     /**
      * File's URL.
-     * @type {string}
      */
     url?: string;
 
     /**
      * File's revision.
-     * @type {number}
      */
     revision?: number;
 
     /**
      * File's timemodified.
-     * @type {number}
      */
     timemodified?: number;
 
     /**
      * 1 if it's a external file (from an external repository), 0 otherwise.
-     * @type {number}
      */
     isexternalfile?: number;
 
     /**
      * Type of the repository this file belongs to.
-     * @type {string}
      */
     repositorytype?: string;
 
     /**
      * File's path.
-     * @type {string}
      */
     path?: string;
 
     /**
      * File links (to link the file to components and componentIds).
-     * @type {any[]}
      */
     links?: any[];
 }
@@ -174,55 +153,46 @@ export interface CoreFilepoolQueueEntry {
 export interface CoreFilepoolPackageEntry {
     /**
      * Package id.
-     * @type {string}
      */
     id?: string;
 
     /**
      * The component to link the files to.
-     * @type {string}
      */
     component?: string;
 
     /**
      * An ID to use in conjunction with the component.
-     * @type {string|number}
      */
     componentId?: string | number;
 
     /**
      * Package status.
-     * @type {string}
      */
     status?: string;
 
     /**
      * Package previous status.
-     * @type {string}
      */
     previous?: string;
 
     /**
      * Timestamp when this package was updated.
-     * @type {number}
      */
     updated?: number;
 
     /**
      * Timestamp when this package was downloaded.
-     * @type {number}
      */
     downloadTime?: number;
 
     /**
      * Previous download time.
-     * @type {number}
      */
     previousDownloadTime?: number;
 
     /**
      * Extra data stored by the package.
-     * @type {string}
      */
     extra?: string;
 }
@@ -466,11 +436,11 @@ export class CoreFilepoolProvider {
     /**
      * Link a file with a component.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
-     * @param {string} component The component to link the file to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @return {Promise<any>} Promise resolved on success.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
+     * @param component The component to link the file to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @return Promise resolved on success.
      */
     protected addFileLink(siteId: string, fileId: string, component: string, componentId?: string | number): Promise<any> {
         if (!component) {
@@ -493,11 +463,11 @@ export class CoreFilepoolProvider {
     /**
      * Link a file with a component by URL.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileUrl The file Url.
-     * @param {string} component The component to link the file to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @return {Promise<any>} Promise resolved on success.
+     * @param siteId The site ID.
+     * @param fileUrl The file Url.
+     * @param component The component to link the file to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @return Promise resolved on success.
      * @description
      * Use this method to create a link between a URL and a component. You usually do not need to call this manually since
      * downloading a file automatically does this. Note that this method does not check if the file exists in the pool.
@@ -513,10 +483,10 @@ export class CoreFilepoolProvider {
     /**
      * Link a file with several components.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
-     * @param {any[]} links Array of objects containing the component and optionally componentId.
-     * @return {Promise<any>} Promise resolved on success.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
+     * @param links Array of objects containing the component and optionally componentId.
+     * @return Promise resolved on success.
      */
     protected addFileLinks(siteId: string, fileId: string, links: any[]): Promise<any> {
         const promises = [];
@@ -530,11 +500,11 @@ export class CoreFilepoolProvider {
     /**
      * Add files to queue using a URL.
      *
-     * @param {string} siteId The site ID.
-     * @param {any[]} files Array of files to add.
-     * @param {string} [component] The component to link the file to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component (optional).
-     * @return {Promise<any>} Resolved on success.
+     * @param siteId The site ID.
+     * @param files Array of files to add.
+     * @param component The component to link the file to.
+     * @param componentId An ID to use in conjunction with the component (optional).
+     * @return Resolved on success.
      */
     addFilesToQueue(siteId: string, files: any[], component?: string, componentId?: string | number): Promise<any> {
         return this.downloadOrPrefetchFiles(siteId, files, true, false, component, componentId);
@@ -543,10 +513,10 @@ export class CoreFilepoolProvider {
     /**
      * Add a file to the pool.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
-     * @param {any} data Additional information to store about the file (timemodified, url, ...). See FILES_TABLE schema.
-     * @return {Promise<any>} Promise resolved on success.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
+     * @param data Additional information to store about the file (timemodified, url, ...). See FILES_TABLE schema.
+     * @return Promise resolved on success.
      */
     protected addFileToPool(siteId: string, fileId: string, data: any): Promise<any> {
         const values = Object.assign({}, data);
@@ -560,9 +530,9 @@ export class CoreFilepoolProvider {
     /**
      * Adds a hash to a filename if needed.
      *
-     * @param {string} url The URL of the file, already treated (decoded, without revision, etc.).
-     * @param {string} filename The filename.
-     * @return {string} The filename with the hash.
+     * @param url The URL of the file, already treated (decoded, without revision, etc.).
+     * @param filename The filename.
+     * @return The filename with the hash.
      */
     protected addHashToFilename(url: string, filename: string): string {
         // Check if the file already has a hash. If a file is downloaded and re-uploaded with the app it will have a hash already.
@@ -586,16 +556,16 @@ export class CoreFilepoolProvider {
     /**
      * Add a file to the queue.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
-     * @param {string} url The absolute URL to the file.
-     * @param {number} priority The priority this file should get in the queue (range 0-999).
-     * @param {number} revision The revision of the file.
-     * @param {number} timemodified The time this file was modified. Can be used to check file state.
-     * @param {string} [filePath] Filepath to download the file to. If not defined, download to the filepool folder.
-     * @param {any} options Extra options (isexternalfile, repositorytype).
-     * @param {any} [link] The link to add for the file.
-     * @return {Promise<any>} Promise resolved when the file is downloaded.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
+     * @param url The absolute URL to the file.
+     * @param priority The priority this file should get in the queue (range 0-999).
+     * @param revision The revision of the file.
+     * @param timemodified The time this file was modified. Can be used to check file state.
+     * @param filePath Filepath to download the file to. If not defined, download to the filepool folder.
+     * @param options Extra options (isexternalfile, repositorytype).
+     * @param link The link to add for the file.
+     * @return Promise resolved when the file is downloaded.
      */
     protected addToQueue(siteId: string, fileId: string, url: string, priority: number, revision: number, timemodified: number,
             filePath: string, onProgress?: (event: any) => any, options: any = {}, link?: any): Promise<any> {
@@ -625,17 +595,17 @@ export class CoreFilepoolProvider {
     /**
      * Add an entry to queue using a URL.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileUrl The absolute URL to the file.
-     * @param {string} [component] The component to link the file to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component (optional).
-     * @param {number} [timemodified=0] The time this file was modified. Can be used to check file state.
-     * @param {string} [filePath] Filepath to download the file to. If not defined, download to the filepool folder.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @param {number} [priority=0] The priority this file should get in the queue (range 0-999).
-     * @param {any} [options] Extra options (isexternalfile, repositorytype).
-     * @param {number} [revision] File revision. If not defined, it will be calculated using the URL.
-     * @return {Promise} Resolved on success.
+     * @param siteId The site ID.
+     * @param fileUrl The absolute URL to the file.
+     * @param component The component to link the file to.
+     * @param componentId An ID to use in conjunction with the component (optional).
+     * @param timemodified The time this file was modified. Can be used to check file state.
+     * @param filePath Filepath to download the file to. If not defined, download to the filepool folder.
+     * @param onProgress Function to call on progress.
+     * @param priority The priority this file should get in the queue (range 0-999).
+     * @param options Extra options (isexternalfile, repositorytype).
+     * @param revision File revision. If not defined, it will be calculated using the URL.
+     * @return Resolved on success.
      */
     addToQueueByUrl(siteId: string, fileUrl: string, component?: string, componentId?: string | number, timemodified: number = 0,
             filePath?: string, onProgress?: (event: any) => any, priority: number = 0, options: any = {}, revision?: number)
@@ -748,17 +718,17 @@ export class CoreFilepoolProvider {
     /**
      * Adds a file to the queue if the size is allowed to be downloaded.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileUrl The absolute URL to the file.
-     * @param {string} component The component to link the file to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @param {number} [timemodified=0] The time this file was modified.
-     * @param {boolean} [checkSize=true] True if we shouldn't download files if their size is big, false otherwise.
-     * @param {boolean} [downloadUnknown] True to download file in WiFi if their size is unknown, false otherwise.
-     *                                    Ignored if checkSize=false.
-     * @param {any} [options] Extra options (isexternalfile, repositorytype).
-     * @param {number} [revision] File revision. If not defined, it will be calculated using the URL.
-     * @return {Promise<any>} Promise resolved when the file is downloaded.
+     * @param siteId The site ID.
+     * @param fileUrl The absolute URL to the file.
+     * @param component The component to link the file to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param timemodified The time this file was modified.
+     * @param checkSize True if we shouldn't download files if their size is big, false otherwise.
+     * @param downloadUnknown True to download file in WiFi if their size is unknown, false otherwise.
+     *                        Ignored if checkSize=false.
+     * @param options Extra options (isexternalfile, repositorytype).
+     * @param revision File revision. If not defined, it will be calculated using the URL.
+     * @return Promise resolved when the file is downloaded.
      */
     protected addToQueueIfNeeded(siteId: string, fileUrl: string, component: string, componentId?: string | number,
             timemodified: number = 0, checkSize: boolean = true, downloadUnknown?: boolean, options: any = {}, revision?: number)
@@ -829,8 +799,8 @@ export class CoreFilepoolProvider {
     /**
      * Clear all packages status in a site.
      *
-     * @param {string} siteId Site ID.
-     * @return {Promise<any>} Promise resolved when all status are cleared.
+     * @param siteId Site ID.
+     * @return Promise resolved when all status are cleared.
      */
     clearAllPackagesStatus(siteId: string): Promise<any> {
         this.logger.debug('Clear all packages status for site ' + siteId);
@@ -852,8 +822,8 @@ export class CoreFilepoolProvider {
     /**
      * Clears the filepool. Use it only when all the files from a site are deleted.
      *
-     * @param  {string} siteId ID of the site to clear.
-     * @return {Promise<any>} Promise resolved when the filepool is cleared.
+     * @param siteId ID of the site to clear.
+     * @return Promise resolved when the filepool is cleared.
      */
     clearFilepool(siteId: string): Promise<any> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
@@ -867,10 +837,10 @@ export class CoreFilepoolProvider {
     /**
      * Returns whether a component has files in the pool.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} component The component to link the file to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @return {Promise<void>} Resolved means yes, rejected means no.
+     * @param siteId The site ID.
+     * @param component The component to link the file to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @return Resolved means yes, rejected means no.
      */
     componentHasFiles(siteId: string, component: string, componentId?: string | number): Promise<void> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
@@ -898,9 +868,9 @@ export class CoreFilepoolProvider {
      *     - CoreConstants.OUTDATED if ALL the downloadable packages have status CoreConstants.OUTDATED or CoreConstants.DOWNLOADED
      *                                     or CoreConstants.DOWNLOADING, with at least 1 package with CoreConstants.OUTDATED.
      *
-     * @param {string} current Current status of the list of packages.
-     * @param {string} packagestatus Status of one of the packages.
-     * @return {string} New status for the list of packages;
+     * @param current Current status of the list of packages.
+     * @param packagestatus Status of one of the packages.
+     * @return New status for the list of packages;
      */
     determinePackagesStatus(current: string, packageStatus: string): string {
         if (!current) {
@@ -931,13 +901,13 @@ export class CoreFilepoolProvider {
      *
      * This uses the file system, you should always make sure that it is accessible before calling this method.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileUrl The file URL.
-     * @param {any} [options] Extra options (revision, timemodified, isexternalfile, repositorytype).
-     * @param {string} [filePath] Filepath to download the file to. If defined, no extension will be added.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @param {CoreFilepoolFileEntry} [poolFileObject] When set, the object will be updated, a new entry will not be created.
-     * @return {Promise<any>} Resolved with internal URL on success, rejected otherwise.
+     * @param siteId The site ID.
+     * @param fileUrl The file URL.
+     * @param options Extra options (revision, timemodified, isexternalfile, repositorytype).
+     * @param filePath Filepath to download the file to. If defined, no extension will be added.
+     * @param onProgress Function to call on progress.
+     * @param poolFileObject When set, the object will be updated, a new entry will not be created.
+     * @return Resolved with internal URL on success, rejected otherwise.
      */
     protected downloadForPoolByUrl(siteId: string, fileUrl: string, options: any = {}, filePath?: string,
         onProgress?: (event: any) => any, poolFileObject?: CoreFilepoolFileEntry): Promise<any> {
@@ -997,15 +967,15 @@ export class CoreFilepoolProvider {
     /**
      * Download or prefetch several files into the filepool folder.
      *
-     * @param {string} siteId The site ID.
-     * @param {any[]} files Array of files to download.
-     * @param {boolean} prefetch True if should prefetch the contents (queue), false if they should be downloaded right now.
-     * @param {boolean} [ignoreStale] True if 'stale' should be ignored. Only if prefetch=false.
-     * @param {string} [component] The component to link the file to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @param {string} [dirPath] Name of the directory where to store the files (inside filepool dir). If not defined, store
-     *                           the files directly inside the filepool folder.
-     * @return {Promise<any>} Resolved on success.
+     * @param siteId The site ID.
+     * @param files Array of files to download.
+     * @param prefetch True if should prefetch the contents (queue), false if they should be downloaded right now.
+     * @param ignoreStale True if 'stale' should be ignored. Only if prefetch=false.
+     * @param component The component to link the file to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param dirPath Name of the directory where to store the files (inside filepool dir). If not defined, store
+     *                the files directly inside the filepool folder.
+     * @return Resolved on success.
      */
     downloadOrPrefetchFiles(siteId: string, files: any[], prefetch: boolean, ignoreStale?: boolean, component?: string,
             componentId?: string | number, dirPath?: string): Promise<any> {
@@ -1045,16 +1015,16 @@ export class CoreFilepoolProvider {
     /**
      * Downloads or prefetches a list of files as a "package".
      *
-     * @param {string} siteId The site ID.
-     * @param {any[]} fileList List of files to download.
-     * @param {boolean} [prefetch] True if should prefetch the contents (queue), false if they should be downloaded right now.
-     * @param {string} [component] The component to link the file to.
-     * @param {string|number} [componentId]  An ID to use in conjunction with the component.
-     * @param {string} [extra] Extra data to store for the package.
-     * @param {string} [dirPath] Name of the directory where to store the files (inside filepool dir). If not defined, store
-     *                           the files directly inside the filepool folder.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @return {Promise<any>} Promise resolved when the package is downloaded.
+     * @param siteId The site ID.
+     * @param fileList List of files to download.
+     * @param prefetch True if should prefetch the contents (queue), false if they should be downloaded right now.
+     * @param component The component to link the file to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param extra Extra data to store for the package.
+     * @param dirPath Name of the directory where to store the files (inside filepool dir). If not defined, store
+     *                the files directly inside the filepool folder.
+     * @param onProgress Function to call on progress.
+     * @return Promise resolved when the package is downloaded.
      */
     protected downloadOrPrefetchPackage(siteId: string, fileList: any[], prefetch?: boolean, component?: string,
             componentId?: string | number, extra?: string, dirPath?: string, onProgress?: (event: any) => any): Promise<any> {
@@ -1145,15 +1115,15 @@ export class CoreFilepoolProvider {
     /**
      * Downloads a list of files.
      *
-     * @param {string} siteId The site ID.
-     * @param {any[]} fileList List of files to download.
-     * @param {string} component The component to link the file to.
-     * @param {string|number} [componentId] An ID to identify the download.
-     * @param {string} [extra] Extra data to store for the package.
-     * @param {string} [dirPath] Name of the directory where to store the files (inside filepool dir). If not defined, store
-     *                           the files directly inside the filepool folder.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @return {Promise<any>}  Promise resolved when all files are downloaded.
+     * @param siteId The site ID.
+     * @param fileList List of files to download.
+     * @param component The component to link the file to.
+     * @param componentId An ID to identify the download.
+     * @param extra Extra data to store for the package.
+     * @param dirPath Name of the directory where to store the files (inside filepool dir). If not defined, store
+     *                the files directly inside the filepool folder.
+     * @param onProgress Function to call on progress.
+     * @return Promise resolved when all files are downloaded.
      */
     downloadPackage(siteId: string, fileList: any[], component: string, componentId?: string | number, extra?: string,
             dirPath?: string, onProgress?: (event: any) => any): Promise<any> {
@@ -1163,16 +1133,16 @@ export class CoreFilepoolProvider {
     /**
      * Downloads a file on the spot.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileUrl The file URL.
-     * @param {boolean} [ignoreStale] Whether 'stale' should be ignored.
-     * @param {string} [component] The component to link the file to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @param {number} [timemodified=0] The time this file was modified. Can be used to check file state.
-     * @param {string} [filePath] Filepath to download the file to. If not defined, download to the filepool folder.
-     * @param {any} [options] Extra options (isexternalfile, repositorytype).
-     * @param {number} [revision] File revision. If not defined, it will be calculated using the URL.
-     * @return {Promise<any>} Resolved with internal URL on success, rejected otherwise.
+     * @param siteId The site ID.
+     * @param fileUrl The file URL.
+     * @param ignoreStale Whether 'stale' should be ignored.
+     * @param component The component to link the file to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param timemodified The time this file was modified. Can be used to check file state.
+     * @param filePath Filepath to download the file to. If not defined, download to the filepool folder.
+     * @param options Extra options (isexternalfile, repositorytype).
+     * @param revision File revision. If not defined, it will be calculated using the URL.
+     * @return Resolved with internal URL on success, rejected otherwise.
      * @description
      * Downloads a file on the spot.
      *
@@ -1256,9 +1226,9 @@ export class CoreFilepoolProvider {
      * Fill Missing Extension In the File Object if needed.
      * This is to migrate from old versions.
      *
-     * @param {CoreFilepoolFileEntry} fileObject File object to be migrated.
-     * @param {string} siteId SiteID to get migrated.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param fileObject File object to be migrated.
+     * @param siteId SiteID to get migrated.
+     * @return Promise resolved when done.
      */
     protected fillExtensionInFile(entry: CoreFilepoolFileEntry, siteId: string): Promise<any> {
         if (typeof entry.extension != 'undefined') {
@@ -1299,8 +1269,8 @@ export class CoreFilepoolProvider {
      * Fill Missing Extension In Files, used to migrate from previous file handling.
      * Reserved for core use, please do not call.
      *
-     * @param {string} siteId SiteID to get migrated
-     * @return {Promise<any>} Promise resolved when done.
+     * @param siteId SiteID to get migrated
+     * @return Promise resolved when done.
      */
     fillMissingExtensionInFiles(siteId: string): Promise<any> {
         this.logger.debug('Fill missing extensions in files of ' + siteId);
@@ -1320,8 +1290,8 @@ export class CoreFilepoolProvider {
     /**
      * Fix a component ID to always be a Number if possible.
      *
-     * @param {string|number} componentId The component ID.
-     * @return {string|number} The normalised component ID. -1 when undefined was passed.
+     * @param componentId The component ID.
+     * @return The normalised component ID. -1 when undefined was passed.
      */
     protected fixComponentId(componentId: string | number): string | number {
         if (typeof componentId == 'number') {
@@ -1345,9 +1315,9 @@ export class CoreFilepoolProvider {
     /**
      * Add the wstoken url and points to the correct script.
      *
-     * @param {string} siteId  The site ID.
-     * @param {string} fileUrl The file URL.
-     * @return {Promise}       Resolved with fixed URL on success, rejected otherwise.
+     * @param siteId The site ID.
+     * @param fileUrl The file URL.
+     * @return Resolved with fixed URL on success, rejected otherwise.
      */
     protected fixPluginfileURL(siteId: string, fileUrl: string): Promise<string> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1358,10 +1328,10 @@ export class CoreFilepoolProvider {
     /**
      * Convenience function to get component files.
      *
-     * @param {SQLiteDB} db Site's DB.
-     * @param {string} component The component to get.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @return {Promise<any[]>} Promise resolved with the files.
+     * @param db Site's DB.
+     * @param component The component to get.
+     * @param componentId An ID to use in conjunction with the component.
+     * @return Promise resolved with the files.
      */
     protected getComponentFiles(db: SQLiteDB, component: string, componentId?: string | number): Promise<any[]> {
         const conditions = {
@@ -1375,9 +1345,9 @@ export class CoreFilepoolProvider {
     /**
      * Returns the local URL of a directory.
      *
-     * @param {string} siteId  The site ID.
-     * @param {string} fileUrl The file URL.
-     * @return {Promise}       Resolved with the URL. Rejected otherwise.
+     * @param siteId The site ID.
+     * @param fileUrl The file URL.
+     * @return Resolved with the URL. Rejected otherwise.
      */
     getDirectoryUrlByUrl(siteId: string, fileUrl: string): Promise<string> {
         if (this.fileProvider.isAvailable()) {
@@ -1397,9 +1367,9 @@ export class CoreFilepoolProvider {
     /**
      * Get the ID of a file download. Used to keep track of filePromises.
      *
-     * @param {string} fileUrl  The file URL.
-     * @param {string} filePath The file destination path.
-     * @return {string}         File download ID.
+     * @param fileUrl The file URL.
+     * @param filePath The file destination path.
+     * @return File download ID.
      */
     protected getFileDownloadId(fileUrl: string, filePath: string): string {
         return <string> Md5.hashAsciiStr(fileUrl + '###' + filePath);
@@ -1408,9 +1378,9 @@ export class CoreFilepoolProvider {
     /**
      * Get the name of the event used to notify download events (CoreEventsProvider).
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
-     * @return {string} Event name.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
+     * @return Event name.
      */
     protected getFileEventName(siteId: string, fileId: string): string {
         return 'CoreFilepoolFile:' + siteId + ':' + fileId;
@@ -1419,9 +1389,9 @@ export class CoreFilepoolProvider {
     /**
      * Get the name of the event used to notify download events (CoreEventsProvider).
      *
-     * @param {string} siteId  The site ID.
-     * @param {string} fileUrl The absolute URL to the file.
-     * @return {Promise}       Promise resolved with event name.
+     * @param siteId The site ID.
+     * @param fileUrl The absolute URL to the file.
+     * @return Promise resolved with event name.
      */
     getFileEventNameByUrl(siteId: string, fileUrl: string): Promise<string> {
         return this.fixPluginfileURL(siteId, fileUrl).then((fileUrl) => {
@@ -1437,8 +1407,8 @@ export class CoreFilepoolProvider {
      * This has a minimal handling of pluginfiles in order to generate a clean file ID which will not change if
      * pointing to the same pluginfile URL even if the token or extra attributes have changed.
      *
-     * @param {string} fileUrl The absolute URL to the file.
-     * @return {string} The file ID.
+     * @param fileUrl The absolute URL to the file.
+     * @return The file ID.
      */
     protected getFileIdByUrl(fileUrl: string): string {
         let url = this.removeRevisionFromUrl(fileUrl),
@@ -1464,9 +1434,9 @@ export class CoreFilepoolProvider {
     /**
      * Get the links of a file.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
-     * @return {Promise<any[]>} Promise resolved with the links.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
+     * @return Promise resolved with the links.
      */
     protected getFileLinks(siteId: string, fileId: string): Promise<any[]> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
@@ -1477,10 +1447,10 @@ export class CoreFilepoolProvider {
     /**
      * Get the path to a file. This does not check if the file exists or not.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
-     * @param {string} [extension] Previously calculated extension. Empty to not add any. Undefined to calculate it.
-     * @return {string|Promise<string>} The path to the file relative to storage root.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
+     * @param extension Previously calculated extension. Empty to not add any. Undefined to calculate it.
+     * @return The path to the file relative to storage root.
      */
     protected getFilePath(siteId: string, fileId: string, extension?: string): string | Promise<string> {
         let path = this.getFilepoolFolderPath(siteId) + '/' + fileId;
@@ -1508,9 +1478,9 @@ export class CoreFilepoolProvider {
     /**
      * Get the path to a file from its URL. This does not check if the file exists or not.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileUrl The file URL.
-     * @return {Promise<string>} Promise resolved with the path to the file relative to storage root.
+     * @param siteId The site ID.
+     * @param fileUrl The file URL.
+     * @return Promise resolved with the path to the file relative to storage root.
      */
     getFilePathByUrl(siteId: string, fileUrl: string): Promise<string> {
         return this.fixPluginfileURL(siteId, fileUrl).then((fileUrl) => {
@@ -1523,8 +1493,8 @@ export class CoreFilepoolProvider {
     /**
      * Get site Filepool Folder Path
      *
-     * @param {string} siteId The site ID.
-     * @return {string} The root path to the filepool of the site.
+     * @param siteId The site ID.
+     * @return The root path to the filepool of the site.
      */
     getFilepoolFolderPath(siteId: string): string {
         return this.fileProvider.getSiteFolder(siteId) + '/' + this.FOLDER;
@@ -1533,10 +1503,10 @@ export class CoreFilepoolProvider {
     /**
      * Get all the matching files from a component. Returns objects containing properties like path, extension and url.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} component The component to get.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @return {Promise<any[]>} Promise resolved with the files on success.
+     * @param siteId The site ID.
+     * @param component The component to get.
+     * @param componentId An ID to use in conjunction with the component.
+     * @return Promise resolved with the files on success.
      */
     getFilesByComponent(siteId: string, component: string, componentId?: string | number): Promise<any[]> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
@@ -1572,10 +1542,10 @@ export class CoreFilepoolProvider {
     /**
      * Get the size of all the files from a component.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} component    The component to get.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @return {Promise<number>} Promise resolved with the size on success.
+     * @param siteId The site ID.
+     * @param component The component to get.
+     * @param componentId An ID to use in conjunction with the component.
+     * @return Promise resolved with the size on success.
      */
     getFilesSizeByComponent(siteId: string, component: string, componentId?: string | number): Promise<number> {
         return this.getFilesByComponent(siteId, component, componentId).then((files) => {
@@ -1599,12 +1569,12 @@ export class CoreFilepoolProvider {
     /**
      * Returns the file state: mmCoreDownloaded, mmCoreDownloading, mmCoreNotDownloaded or mmCoreOutdated.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileUrl File URL.
-     * @param {number} [timemodified=0] The time this file was modified.
-     * @param {string} [filePath] Filepath to download the file to. If defined, no extension will be added.
-     * @param {number} [revision] File revision. If not defined, it will be calculated using the URL.
-     * @return {Promise<string>} Promise resolved with the file state.
+     * @param siteId The site ID.
+     * @param fileUrl File URL.
+     * @param timemodified The time this file was modified.
+     * @param filePath Filepath to download the file to. If defined, no extension will be added.
+     * @param revision File revision. If not defined, it will be calculated using the URL.
+     * @return Promise resolved with the file state.
      */
     getFileStateByUrl(siteId: string, fileUrl: string, timemodified: number = 0, filePath?: string, revision?: number)
             : Promise<string> {
@@ -1647,18 +1617,18 @@ export class CoreFilepoolProvider {
     /**
      * Returns an absolute URL to access the file URL.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileUrl The absolute URL to the file.
-     * @param {string} [mode=url] The type of URL to return. Accepts 'url' or 'src'.
-     * @param {string} component The component to link the file to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @param {number} [timemodified=0] The time this file was modified.
-     * @param {boolean} [checkSize=true] True if we shouldn't download files if their size is big, false otherwise.
-     * @param {boolean} [downloadUnknown] True to download file in WiFi if their size is unknown, false otherwise.
-     *                                    Ignored if checkSize=false.
-     * @param {any} [options] Extra options (isexternalfile, repositorytype).
-     * @param {number} [revision] File revision. If not defined, it will be calculated using the URL.
-     * @return {Promise<string>} Resolved with the URL to use.
+     * @param siteId The site ID.
+     * @param fileUrl The absolute URL to the file.
+     * @param mode The type of URL to return. Accepts 'url' or 'src'.
+     * @param component The component to link the file to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param timemodified The time this file was modified.
+     * @param checkSize True if we shouldn't download files if their size is big, false otherwise.
+     * @param downloadUnknown True to download file in WiFi if their size is unknown, false otherwise.
+     *                        Ignored if checkSize=false.
+     * @param options Extra options (isexternalfile, repositorytype).
+     * @param revision File revision. If not defined, it will be calculated using the URL.
+     * @return Resolved with the URL to use.
      * @description
      * This will return a URL pointing to the content of the requested URL.
      *
@@ -1736,9 +1706,9 @@ export class CoreFilepoolProvider {
      *
      * The returned URL from this method is typically used with IMG tags.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
-     * @return {Promise<string>} Resolved with the internal URL. Rejected otherwise.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
+     * @return Resolved with the internal URL. Rejected otherwise.
      */
     protected getInternalSrcById(siteId: string, fileId: string): Promise<string> {
         if (this.fileProvider.isAvailable()) {
@@ -1756,9 +1726,9 @@ export class CoreFilepoolProvider {
     /**
      * Returns the local URL of a file.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
-     * @return {Promise<string>} Resolved with the URL. Rejected otherwise.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
+     * @return Resolved with the URL. Rejected otherwise.
      */
     protected getInternalUrlById(siteId: string, fileId: string): Promise<string> {
         if (this.fileProvider.isAvailable()) {
@@ -1780,8 +1750,8 @@ export class CoreFilepoolProvider {
     /**
      * Returns the local URL of a file.
      *
-     * @param {string} filePath The file path.
-     * @return {Promise<string>} Resolved with the URL.
+     * @param filePath The file path.
+     * @return Resolved with the URL.
      */
     protected getInternalUrlByPath(filePath: string): Promise<string> {
         if (this.fileProvider.isAvailable()) {
@@ -1796,9 +1766,9 @@ export class CoreFilepoolProvider {
     /**
      * Returns the local URL of a file.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileUrl The file URL.
-     * @return {Promise<string>} Resolved with the URL. Rejected otherwise.
+     * @param siteId The site ID.
+     * @param fileUrl The file URL.
+     * @return Resolved with the URL. Rejected otherwise.
      */
     getInternalUrlByUrl(siteId: string, fileUrl: string): Promise<string> {
         if (this.fileProvider.isAvailable()) {
@@ -1815,10 +1785,10 @@ export class CoreFilepoolProvider {
     /**
      * Get the data stored for a package.
      *
-     * @param {string} siteId Site ID.
-     * @param {string} component Package's component.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @return {Promise<CoreFilepoolPackageEntry>} Promise resolved with the data.
+     * @param siteId Site ID.
+     * @param component Package's component.
+     * @param componentId An ID to use in conjunction with the component.
+     * @return Promise resolved with the data.
      */
     getPackageData(siteId: string, component: string, componentId?: string | number): Promise<CoreFilepoolPackageEntry> {
         componentId = this.fixComponentId(componentId);
@@ -1833,8 +1803,8 @@ export class CoreFilepoolProvider {
     /**
      * Creates the name for a package directory (hash).
      *
-     * @param {string} url An URL to identify the package.
-     * @return {string} The directory name.
+     * @param url An URL to identify the package.
+     * @return The directory name.
      */
     protected getPackageDirNameByUrl(url: string): string {
         let candidate,
@@ -1861,9 +1831,9 @@ export class CoreFilepoolProvider {
     /**
      * Get the path to a directory to store a package files. This does not check if the file exists or not.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url An URL to identify the package.
-     * @return {Promise<string>} Promise resolved with the path of the package.
+     * @param siteId The site ID.
+     * @param url An URL to identify the package.
+     * @return Promise resolved with the path of the package.
      */
     getPackageDirPathByUrl(siteId: string, url: string): Promise<string> {
         return this.fixPluginfileURL(siteId, url).then((fixedUrl) => {
@@ -1876,9 +1846,9 @@ export class CoreFilepoolProvider {
     /**
      * Returns the local URL of a package directory.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} url An URL to identify the package.
-     * @return {Promise<string>} Resolved with the URL.
+     * @param siteId The site ID.
+     * @param url An URL to identify the package.
+     * @return Resolved with the URL.
      */
     getPackageDirUrlByUrl(siteId: string, url: string): Promise<string> {
         if (this.fileProvider.isAvailable()) {
@@ -1898,10 +1868,10 @@ export class CoreFilepoolProvider {
     /**
      * Get a download promise. If the promise is not set, return undefined.
      *
-     * @param {string} siteId Site ID.
-     * @param {string} component The component of the package.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @return {Promise<any>} Download promise or undefined.
+     * @param siteId Site ID.
+     * @param component The component of the package.
+     * @param componentId An ID to use in conjunction with the component.
+     * @return Download promise or undefined.
      */
     getPackageDownloadPromise(siteId: string, component: string, componentId?: string | number): Promise<any> {
         const packageId = this.getPackageId(component, componentId);
@@ -1912,10 +1882,10 @@ export class CoreFilepoolProvider {
     /**
      * Get a package extra data.
      *
-     * @param {string} siteId Site ID.
-     * @param {string} component Package's component.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @return {Promise<string>} Promise resolved with the extra data.
+     * @param siteId Site ID.
+     * @param component Package's component.
+     * @param componentId An ID to use in conjunction with the component.
+     * @return Promise resolved with the extra data.
      */
     getPackageExtra(siteId: string, component: string, componentId?: string | number): Promise<string> {
         return this.getPackageData(siteId, component, componentId).then((entry) => {
@@ -1926,9 +1896,9 @@ export class CoreFilepoolProvider {
     /**
      * Get the ID of a package.
      *
-     * @param {string} component Package's component.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @return {string} Package ID.
+     * @param component Package's component.
+     * @param componentId An ID to use in conjunction with the component.
+     * @return Package ID.
      */
     getPackageId(component: string, componentId?: string | number): string {
         return <string> Md5.hashAsciiStr(component + '#' + this.fixComponentId(componentId));
@@ -1937,10 +1907,10 @@ export class CoreFilepoolProvider {
     /**
      * Get a package previous status.
      *
-     * @param {string} siteId Site ID.
-     * @param {string} component Package's component.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @return {Promise<string>} Promise resolved with the status.
+     * @param siteId Site ID.
+     * @param component Package's component.
+     * @param componentId An ID to use in conjunction with the component.
+     * @return Promise resolved with the status.
      */
     getPackagePreviousStatus(siteId: string, component: string, componentId?: string | number): Promise<string> {
         return this.getPackageData(siteId, component, componentId).then((entry) => {
@@ -1953,10 +1923,10 @@ export class CoreFilepoolProvider {
     /**
      * Get a package status.
      *
-     * @param {string} siteId Site ID.
-     * @param {string} component Package's component.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @return {Promise<string>} Promise resolved with the status.
+     * @param siteId Site ID.
+     * @param component Package's component.
+     * @param componentId An ID to use in conjunction with the component.
+     * @return Promise resolved with the status.
      */
     getPackageStatus(siteId: string, component: string, componentId?: string | number): Promise<string> {
         return this.getPackageData(siteId, component, componentId).then((entry) => {
@@ -1969,8 +1939,8 @@ export class CoreFilepoolProvider {
     /**
      * Return the array of arguments of the pluginfile url.
      *
-     * @param {string} url URL to get the args.
-     * @return {string[]} The args found, undefined if not a pluginfile.
+     * @param url URL to get the args.
+     * @return The args found, undefined if not a pluginfile.
      */
     protected getPluginFileArgs(url: string): string[] {
         if (!this.urlUtils.isPluginFileUrl(url)) {
@@ -1992,11 +1962,11 @@ export class CoreFilepoolProvider {
     /**
      * Get the deferred object for a file in the queue.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
-     * @param {boolean} [create=true] True if it should create a new deferred if it doesn't exist.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @return {any} Deferred.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
+     * @param create True if it should create a new deferred if it doesn't exist.
+     * @param onProgress Function to call on progress.
+     * @return Deferred.
      */
     protected getQueueDeferred(siteId: string, fileId: string, create: boolean = true, onProgress?: (event: any) => any): any {
         if (!this.queueDeferreds[siteId]) {
@@ -2022,9 +1992,9 @@ export class CoreFilepoolProvider {
     /**
      * Get the on progress for a file in the queue.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
-     * @return {Function} On progress function, undefined if not found.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
+     * @return On progress function, undefined if not found.
      */
     protected getQueueOnProgress(siteId: string, fileId: string): (event: any) => any {
         const deferred = this.getQueueDeferred(siteId, fileId, false);
@@ -2036,11 +2006,11 @@ export class CoreFilepoolProvider {
     /**
      * Get the promise for a file in the queue.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
-     * @param {boolean} [create=true] True if it should create a new promise if it doesn't exist.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @return {Promise<any>} Promise.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
+     * @param create True if it should create a new promise if it doesn't exist.
+     * @param onProgress Function to call on progress.
+     * @return Promise.
      */
     protected getQueuePromise(siteId: string, fileId: string, create: boolean = true, onProgress?: (event: any) => any)
             : Promise<any> {
@@ -2050,8 +2020,8 @@ export class CoreFilepoolProvider {
     /**
      * Get a revision number from a list of files (highest revision).
      *
-     * @param {any[]} files Package files.
-     * @return {number} Highest revision.
+     * @param files Package files.
+     * @return Highest revision.
      */
     getRevisionFromFileList(files: any[]): number {
         let revision = 0;
@@ -2071,8 +2041,8 @@ export class CoreFilepoolProvider {
     /**
      * Get the revision number from a file URL.
      *
-     * @param {string} url URL to get the revision number.
-     * @return {number} Revision number.
+     * @param url URL to get the revision number.
+     * @return Revision number.
      */
     protected getRevisionFromUrl(url: string): number {
         const args = this.getPluginFileArgs(url);
@@ -2097,18 +2067,18 @@ export class CoreFilepoolProvider {
     /**
      * Returns an absolute URL to use in IMG tags.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileUrl The absolute URL to the file.
-     * @param {string} [mode=url] The type of URL to return. Accepts 'url' or 'src'.
-     * @param {string} component The component to link the file to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @param {number} [timemodified=0] The time this file was modified.
-     * @param {boolean} [checkSize=true] True if we shouldn't download files if their size is big, false otherwise.
-     * @param {boolean} [downloadUnknown] True to download file in WiFi if their size is unknown, false otherwise.
-     *                                    Ignored if checkSize=false.
-     * @param {any} [options] Extra options (isexternalfile, repositorytype).
-     * @param {number} [revision] File revision. If not defined, it will be calculated using the URL.
-     * @return {Promise<string>} Resolved with the URL to use.
+     * @param siteId The site ID.
+     * @param fileUrl The absolute URL to the file.
+     * @param mode The type of URL to return. Accepts 'url' or 'src'.
+     * @param component The component to link the file to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param timemodified The time this file was modified.
+     * @param checkSize True if we shouldn't download files if their size is big, false otherwise.
+     * @param downloadUnknown True to download file in WiFi if their size is unknown, false otherwise.
+     *                        Ignored if checkSize=false.
+     * @param options Extra options (isexternalfile, repositorytype).
+     * @param revision File revision. If not defined, it will be calculated using the URL.
+     * @return Resolved with the URL to use.
      * @description
      * This will return a URL pointing to the content of the requested URL.
      * The URL returned is compatible to use with IMG tags.
@@ -2122,8 +2092,8 @@ export class CoreFilepoolProvider {
     /**
      * Get time modified from a list of files.
      *
-     * @param {any[]} files List of files.
-     * @return {number} Time modified.
+     * @param files List of files.
+     * @return Time modified.
      */
     getTimemodifiedFromFileList(files: any[]): number {
         let timemodified = 0;
@@ -2140,18 +2110,18 @@ export class CoreFilepoolProvider {
     /**
      * Returns an absolute URL to access the file.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileUrl The absolute URL to the file.
-     * @param {string} [mode=url] The type of URL to return. Accepts 'url' or 'src'.
-     * @param {string} component The component to link the file to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @param {number} [timemodified=0] The time this file was modified.
-     * @param {boolean} [checkSize=true] True if we shouldn't download files if their size is big, false otherwise.
-     * @param {boolean} [downloadUnknown] True to download file in WiFi if their size is unknown, false otherwise.
-     *                                    Ignored if checkSize=false.
-     * @param {any} [options] Extra options (isexternalfile, repositorytype).
-     * @param {number} [revision] File revision. If not defined, it will be calculated using the URL.
-     * @return {Promise<string>} Resolved with the URL to use.
+     * @param siteId The site ID.
+     * @param fileUrl The absolute URL to the file.
+     * @param mode The type of URL to return. Accepts 'url' or 'src'.
+     * @param component The component to link the file to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param timemodified The time this file was modified.
+     * @param checkSize True if we shouldn't download files if their size is big, false otherwise.
+     * @param downloadUnknown True to download file in WiFi if their size is unknown, false otherwise.
+     *                        Ignored if checkSize=false.
+     * @param options Extra options (isexternalfile, repositorytype).
+     * @param revision File revision. If not defined, it will be calculated using the URL.
+     * @return Resolved with the URL to use.
      * @description
      * This will return a URL pointing to the content of the requested URL.
      * The URL returned is compatible to use with a local browser.
@@ -2165,8 +2135,8 @@ export class CoreFilepoolProvider {
     /**
      * Guess the filename of a file from its URL. This is very weak and unreliable.
      *
-     * @param {string} fileUrl The file URL.
-     * @return {string}        The filename treated so it doesn't have any special character.
+     * @param fileUrl The file URL.
+     * @return The filename treated so it doesn't have any special character.
      */
     protected guessFilenameFromUrl(fileUrl: string): string {
         let filename = '';
@@ -2224,9 +2194,9 @@ export class CoreFilepoolProvider {
     /**
      * Check if the file is already in the pool. This does not check if the file is on the disk.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileUrl The file URL.
-     * @return {Promise<CoreFilepoolFileEntry>} Resolved with file object from DB on success, rejected otherwise.
+     * @param siteId The site ID.
+     * @param fileUrl The file URL.
+     * @return Resolved with file object from DB on success, rejected otherwise.
      */
     protected hasFileInPool(siteId: string, fileId: string): Promise<CoreFilepoolFileEntry> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
@@ -2243,9 +2213,9 @@ export class CoreFilepoolProvider {
     /**
      * Check if the file is in the queue.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileUrl The file URL.
-     * @return {Promise} Resolved with file object from DB on success, rejected otherwise.
+     * @param siteId The site ID.
+     * @param fileUrl The file URL.
+     * @return Resolved with file object from DB on success, rejected otherwise.
      */
     protected hasFileInQueue(siteId: string, fileId: string): Promise<CoreFilepoolQueueEntry> {
         return this.appDB.getRecord(this.QUEUE_TABLE, { siteId: siteId, fileId: fileId }).then((entry) => {
@@ -2262,10 +2232,10 @@ export class CoreFilepoolProvider {
     /**
      * Invalidate all the files in a site.
      *
-     * @param {string} siteId The site ID.
-     * @param {boolean} [onlyUnknown=true] True to only invalidate files from external repos or without revision/timemodified.
-     *                                     It is advised to set it to true to reduce the performance and data usage of the app.
-     * @return {Promise<any>} Resolved on success.
+     * @param siteId The site ID.
+     * @param onlyUnknown True to only invalidate files from external repos or without revision/timemodified.
+     *                    It is advised to set it to true to reduce the performance and data usage of the app.
+     * @return Resolved on success.
      */
     invalidateAllFiles(siteId: string, onlyUnknown: boolean = true): Promise<any> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
@@ -2283,9 +2253,9 @@ export class CoreFilepoolProvider {
     /**
      * Invalidate a file by URL.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileUrl The file URL.
-     * @return {Promise<any>} Resolved on success.
+     * @param siteId The site ID.
+     * @param fileUrl The file URL.
+     * @return Resolved on success.
      * @description
      * Invalidates a file by marking it stale. It will not be added to the queue automatically, but the next time this file
      * is requested it will be added to the queue.
@@ -2305,12 +2275,12 @@ export class CoreFilepoolProvider {
     /**
      * Invalidate all the matching files from a component.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} component The component to invalidate.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @param {boolean} [onlyUnknown=true] True to only invalidate files from external repos or without revision/timemodified.
-     *                                     It is advised to set it to true to reduce the performance and data usage of the app.
-     * @return {Promise<any>} Resolved when done.
+     * @param siteId The site ID.
+     * @param component The component to invalidate.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param onlyUnknown True to only invalidate files from external repos or without revision/timemodified.
+     *                    It is advised to set it to true to reduce the performance and data usage of the app.
+     * @return Resolved when done.
      */
     invalidateFilesByComponent(siteId: string, component: string, componentId?: string | number, onlyUnknown: boolean = true)
             : Promise<any> {
@@ -2336,9 +2306,9 @@ export class CoreFilepoolProvider {
     /**
      * Check if a file is downloading.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileUrl File URL.
-     * @param {Promise<any>} Promise resolved if file is downloading, rejected otherwise.
+     * @param siteId The site ID.
+     * @param fileUrl File URL.
+     * @param Promise resolved if file is downloading, rejected otherwise.
      */
     isFileDownloadingByUrl(siteId: string, fileUrl: string): Promise<any> {
         return this.fixPluginfileURL(siteId, fileUrl).then((fileUrl) => {
@@ -2351,10 +2321,10 @@ export class CoreFilepoolProvider {
     /**
      * Check if a file is outdated.
      *
-     * @param {CoreFilepoolFileEntry} entry Filepool entry.
-     * @param {number} [revision]  File revision number.
-     * @param {number} [timemodified] The time this file was modified.
-     * @param {boolean} Whether the file is outdated.
+     * @param entry Filepool entry.
+     * @param revision File revision number.
+     * @param timemodified The time this file was modified.
+     * @param Whether the file is outdated.
      */
     protected isFileOutdated(entry: CoreFilepoolFileEntry, revision?: number, timemodified?: number): boolean {
         return !!entry.stale || revision > entry.revision || timemodified > entry.timemodified;
@@ -2363,8 +2333,8 @@ export class CoreFilepoolProvider {
     /**
      * Check if cannot determine if a file has been updated.
      *
-     * @param {CoreFilepoolFileEntry} entry Filepool entry.
-     * @return {boolean} Whether it cannot determine updates.
+     * @param entry Filepool entry.
+     * @return Whether it cannot determine updates.
      */
     protected isFileUpdateUnknown(entry: CoreFilepoolFileEntry): boolean {
         return !!entry.isexternalfile || (entry.revision < 1 && !entry.timemodified);
@@ -2373,8 +2343,8 @@ export class CoreFilepoolProvider {
     /**
      * Notify a file has been deleted.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
      */
     protected notifyFileDeleted(siteId: string, fileId: string): void {
         this.eventsProvider.trigger(this.getFileEventName(siteId, fileId), { action: 'deleted' });
@@ -2383,8 +2353,8 @@ export class CoreFilepoolProvider {
     /**
      * Notify a file has been downloaded.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
      */
     protected notifyFileDownloaded(siteId: string, fileId: string): void {
         this.eventsProvider.trigger(this.getFileEventName(siteId, fileId), { action: 'download', success: true });
@@ -2393,8 +2363,8 @@ export class CoreFilepoolProvider {
     /**
      * Notify error occurred while downloading a file.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
      */
     protected notifyFileDownloadError(siteId: string, fileId: string): void {
         this.eventsProvider.trigger(this.getFileEventName(siteId, fileId), { action: 'download', success: false });
@@ -2403,8 +2373,8 @@ export class CoreFilepoolProvider {
     /**
      * Notify a file starts being downloaded or added to queue.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
      */
     protected notifyFileDownloading(siteId: string, fileId: string): void {
         this.eventsProvider.trigger(this.getFileEventName(siteId, fileId), { action: 'downloading' });
@@ -2413,8 +2383,8 @@ export class CoreFilepoolProvider {
     /**
      * Notify a file has been outdated.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
      */
     protected notifyFileOutdated(siteId: string, fileId: string): void {
         this.eventsProvider.trigger(this.getFileEventName(siteId, fileId), { action: 'outdated' });
@@ -2423,15 +2393,15 @@ export class CoreFilepoolProvider {
     /**
      * Prefetches a list of files.
      *
-     * @param {string} siteId The site ID.
-     * @param {any[]} fileList List of files to download.
-     * @param {string} component The component to link the file to.
-     * @param {string|number} [componentId] An ID to identify the download.
-     * @param {string} [extra] Extra data to store for the package.
-     * @param {string} [dirPath] Name of the directory where to store the files (inside filepool dir). If not defined, store
-     *                           the files directly inside the filepool folder.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @return {Promise<any>}  Promise resolved when all files are downloaded.
+     * @param siteId The site ID.
+     * @param fileList List of files to download.
+     * @param component The component to link the file to.
+     * @param componentId An ID to identify the download.
+     * @param extra Extra data to store for the package.
+     * @param dirPath Name of the directory where to store the files (inside filepool dir). If not defined, store
+     *                the files directly inside the filepool folder.
+     * @param onProgress Function to call on progress.
+     * @return Promise resolved when all files are downloaded.
      */
     prefetchPackage(siteId: string, fileList: any[], component: string, componentId?: string | number, extra?: string,
             dirPath?: string, onProgress?: (event: any) => any): Promise<any> {
@@ -2482,7 +2452,7 @@ export class CoreFilepoolProvider {
     /**
      * Process the most important queue item.
      *
-     * @return {Promise} Resolved on success. Rejected on failure.
+     * @return Resolved on success. Rejected on failure.
      */
     protected processImportantQueueItem(): Promise<any> {
         return this.appDB.getRecords(this.QUEUE_TABLE, undefined, 'priority DESC, added ASC', undefined, 0, 1).then((items) => {
@@ -2502,8 +2472,8 @@ export class CoreFilepoolProvider {
     /**
      * Process a queue item.
      *
-     * @param {CoreFilepoolQueueEntry} item The object from the queue store.
-     * @return {Promise<any>} Resolved on success. Rejected on failure.
+     * @param item The object from the queue store.
+     * @return Resolved on success. Rejected on failure.
      */
     protected processQueueItem(item: CoreFilepoolQueueEntry): Promise<any> {
         // Cast optional fields to undefined instead of null.
@@ -2619,9 +2589,9 @@ export class CoreFilepoolProvider {
     /**
      * Remove a file from the queue.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
-     * @return {Promise<any>} Resolved on success. Rejected on failure. It is advised to silently ignore failures.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
+     * @return Resolved on success. Rejected on failure. It is advised to silently ignore failures.
      */
     protected removeFromQueue(siteId: string, fileId: string): Promise<any> {
         return this.appDB.deleteRecords(this.QUEUE_TABLE, { siteId: siteId, fileId: fileId });
@@ -2630,9 +2600,9 @@ export class CoreFilepoolProvider {
     /**
      * Remove a file from the pool.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
-     * @return {Promise<any>} Resolved on success.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
+     * @return Resolved on success.
      */
     protected removeFileById(siteId: string, fileId: string): Promise<any> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
@@ -2667,10 +2637,10 @@ export class CoreFilepoolProvider {
     /**
      * Delete all the matching files from a component.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} component The component to link the file to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @return {Promise<any>} Resolved on success.
+     * @param siteId The site ID.
+     * @param component The component to link the file to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @return Resolved on success.
      */
     removeFilesByComponent(siteId: string, component: string, componentId?: string | number): Promise<any> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
@@ -2685,9 +2655,9 @@ export class CoreFilepoolProvider {
     /**
      * Remove a file from the pool.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileUrl The file URL.
-     * @return {Promise<any>} Resolved on success, rejected on failure.
+     * @param siteId The site ID.
+     * @param fileUrl The file URL.
+     * @return Resolved on success, rejected on failure.
      */
     removeFileByUrl(siteId: string, fileUrl: string): Promise<any> {
         return this.fixPluginfileURL(siteId, fileUrl).then((fileUrl) => {
@@ -2700,8 +2670,8 @@ export class CoreFilepoolProvider {
     /**
      * Removes the revision number from a file URL.
      *
-     * @param {string} url URL to remove the revision number.
-     * @return {string} URL without revision number.
+     * @param url URL to remove the revision number.
+     * @return URL without revision number.
      * @description
      * The revision is used to know if a file has changed. We remove it from the URL to prevent storing a file per revision.
      */
@@ -2718,10 +2688,10 @@ export class CoreFilepoolProvider {
     /**
      * Change the package status, setting it to the previous status.
      *
-     * @param {string} siteId Site ID.
-     * @param {string} component Package's component.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @return {Promise<string>} Promise resolved when the status is changed. Resolve param: new status.
+     * @param siteId Site ID.
+     * @param component Package's component.
+     * @param componentId An ID to use in conjunction with the component.
+     * @return Promise resolved when the status is changed. Resolve param: new status.
      */
     setPackagePreviousStatus(siteId: string, component: string, componentId?: string | number): Promise<any> {
         componentId = this.fixComponentId(componentId);
@@ -2754,9 +2724,9 @@ export class CoreFilepoolProvider {
     /**
      * Convenience function to check if a file should be downloaded before opening it.
      *
-     * @param {string} url File online URL.
-     * @param {number} size File size.
-     * @return {Promise}     Promise resolved if should download before open, rejected otherwise.
+     * @param url File online URL.
+     * @param size File size.
+     * @return Promise resolved if should download before open, rejected otherwise.
      * @description
      * Convenience function to check if a file should be downloaded before opening it.
      *
@@ -2787,12 +2757,12 @@ export class CoreFilepoolProvider {
     /**
      * Store package status.
      *
-     * @param {string} siteId Site ID.
-     * @param {string} status New package status.
-     * @param {string} component Package's component.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @param {string} [extra] Extra data to store for the package. If you want to store more than 1 value, use JSON.stringify.
-     * @return {Promise<any>} Promise resolved when status is stored.
+     * @param siteId Site ID.
+     * @param status New package status.
+     * @param component Package's component.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param extra Extra data to store for the package. If you want to store more than 1 value, use JSON.stringify.
+     * @return Promise resolved when status is stored.
      */
     storePackageStatus(siteId: string, status: string, component: string, componentId?: string | number, extra?: string)
             : Promise<any> {
@@ -2859,13 +2829,13 @@ export class CoreFilepoolProvider {
      * Search for files in a CSS code and try to download them. Once downloaded, replace their URLs
      * and store the result in the CSS file.
      *
-     * @param {string} siteId  Site ID.
-     * @param {string} fileUrl CSS file URL.
-     * @param {string} cssCode CSS code.
-     * @param {string} [component] The component to link the file to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @param {number} [revision] Revision to use in all files. If not defined, it will be calculated using the URL of each file.
-     * @return {Promise<string>} Promise resolved with the CSS code.
+     * @param siteId Site ID.
+     * @param fileUrl CSS file URL.
+     * @param cssCode CSS code.
+     * @param component The component to link the file to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param revision Revision to use in all files. If not defined, it will be calculated using the URL of each file.
+     * @return Promise resolved with the CSS code.
      */
     treatCSSCode(siteId: string, fileUrl: string, cssCode: string, component?: string, componentId?: string | number,
             revision?: number): Promise<string> {
@@ -2910,7 +2880,7 @@ export class CoreFilepoolProvider {
     /**
      * Remove extension from fileId in queue, used to migrate from previous file handling.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     treatExtensionInQueue(): Promise<any> {
         this.logger.debug('Treat extensions in queue');
@@ -2938,10 +2908,10 @@ export class CoreFilepoolProvider {
     /**
      * Resolves or rejects a queue deferred and removes it from the list.
      *
-     * @param {string} siteId The site ID.
-     * @param {string} fileId The file ID.
-     * @param {boolean} resolve True if promise should be resolved, false if it should be rejected.
-     * @param {string} error String identifier for error message, if rejected.
+     * @param siteId The site ID.
+     * @param fileId The file ID.
+     * @param resolve True if promise should be resolved, false if it should be rejected.
+     * @param error String identifier for error message, if rejected.
      */
     protected treatQueueDeferred(siteId: string, fileId: string, resolve: boolean, error?: string): void {
         if (this.queueDeferreds[siteId] && this.queueDeferreds[siteId][fileId]) {
@@ -2957,10 +2927,10 @@ export class CoreFilepoolProvider {
     /**
      * Trigger mmCoreEventPackageStatusChanged with the right data.
      *
-     * @param {string} siteId Site ID.
-     * @param {string} status New package status.
-     * @param {string} component  Package's component.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
+     * @param siteId Site ID.
+     * @param status New package status.
+     * @param component Package's component.
+     * @param componentId An ID to use in conjunction with the component.
      */
     protected triggerPackageStatusChanged(siteId: string, status: string, component: string, componentId?: string | number): void {
         const data = {
@@ -2976,10 +2946,10 @@ export class CoreFilepoolProvider {
      * This function should be used if a package generates some new data during a download. Calling this function
      * right after generating the data in the download will prevent detecting this data as an update.
      *
-     * @param {string} siteId Site ID.
-     * @param {string} component Package's component.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @return {Promise<any>} Promise resolved when status is stored.
+     * @param siteId Site ID.
+     * @param component Package's component.
+     * @param componentId An ID to use in conjunction with the component.
+     * @return Promise resolved when status is stored.
      */
     updatePackageDownloadTime(siteId: string, component: string, componentId?: string | number): Promise<any> {
         componentId = this.fixComponentId(componentId);
diff --git a/src/providers/groups.ts b/src/providers/groups.ts
index 35d0d2e11..f4bf56593 100644
--- a/src/providers/groups.ts
+++ b/src/providers/groups.ts
@@ -24,25 +24,21 @@ import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 export interface CoreGroupInfo {
     /**
      * List of groups.
-     * @type {any[]}
      */
     groups?: any[];
 
     /**
      * Whether it's separate groups.
-     * @type {boolean}
      */
     separateGroups?: boolean;
 
     /**
      * Whether it's visible groups.
-     * @type {boolean}
      */
     visibleGroups?: boolean;
 
     /**
      * The group ID to use by default. If all participants is visible, 0 will be used. First group ID otherwise.
-     * @type {number}
      */
     defaultGroupId?: number;
 }
@@ -64,10 +60,10 @@ export class CoreGroupsProvider {
     /**
      * Check if group mode of an activity is enabled.
      *
-     * @param {number} cmId Course module ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<boolean>} Promise resolved with true if the activity has groups, resolved with false otherwise.
+     * @param cmId Course module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise resolved with true if the activity has groups, resolved with false otherwise.
      */
     activityHasGroups(cmId: number, siteId?: string, ignoreCache?: boolean): Promise<boolean> {
         return this.getActivityGroupMode(cmId, siteId, ignoreCache).then((groupmode) => {
@@ -80,11 +76,11 @@ export class CoreGroupsProvider {
     /**
      * Get the groups allowed in an activity.
      *
-     * @param {number} cmId Course module ID.
-     * @param {number} [userId] User ID. If not defined, use current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<any>} Promise resolved when the groups are retrieved.
+     * @param cmId Course module ID.
+     * @param userId User ID. If not defined, use current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise resolved when the groups are retrieved.
      */
     getActivityAllowedGroups(cmId: number, userId?: number, siteId?: string, ignoreCache?: boolean): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -117,9 +113,9 @@ export class CoreGroupsProvider {
     /**
      * Get cache key for group mode WS calls.
      *
-     * @param {number} cmId Course module ID.
-     * @param {number} userId User ID.
-     * @return {string} Cache key.
+     * @param cmId Course module ID.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getActivityAllowedGroupsCacheKey(cmId: number, userId: number): string {
         return this.ROOT_CACHE_KEY + 'allowedgroups:' + cmId + ':' + userId;
@@ -128,11 +124,11 @@ export class CoreGroupsProvider {
     /**
      * Get the groups allowed in an activity if they are allowed.
      *
-     * @param {number} cmId Course module ID.
-     * @param {number} [userId] User ID. If not defined, use current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<any[]>} Promise resolved when the groups are retrieved. If not allowed, empty array will be returned.
+     * @param cmId Course module ID.
+     * @param userId User ID. If not defined, use current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise resolved when the groups are retrieved. If not allowed, empty array will be returned.
      */
     getActivityAllowedGroupsIfEnabled(cmId: number, userId?: number, siteId?: string, ignoreCache?: boolean): Promise<any[]> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -153,12 +149,12 @@ export class CoreGroupsProvider {
     /**
      * Helper function to get activity group info (group mode and list of groups).
      *
-     * @param {number} cmId Course module ID.
-     * @param {boolean} [addAllParts] Deprecated.
-     * @param {number} [userId] User ID. If not defined, use current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<CoreGroupInfo>} Promise resolved with the group info.
+     * @param cmId Course module ID.
+     * @param addAllParts Deprecated.
+     * @param userId User ID. If not defined, use current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise resolved with the group info.
      */
     getActivityGroupInfo(cmId: number, addAllParts?: boolean, userId?: number, siteId?: string, ignoreCache?: boolean)
             : Promise<CoreGroupInfo> {
@@ -203,10 +199,10 @@ export class CoreGroupsProvider {
     /**
      * Get the group mode of an activity.
      *
-     * @param {number} cmId Course module ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {boolean} [ignoreCache] True if it should ignore cached data (it will always fail in offline or server down).
-     * @return {Promise<number>} Promise resolved when the group mode is retrieved.
+     * @param cmId Course module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
+     * @return Promise resolved when the group mode is retrieved.
      */
     getActivityGroupMode(cmId: number, siteId?: string, ignoreCache?: boolean): Promise<number> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -236,8 +232,8 @@ export class CoreGroupsProvider {
     /**
      * Get cache key for group mode WS calls.
      *
-     * @param {number} cmId Course module ID.
-     * @return {string} Cache key.
+     * @param cmId Course module ID.
+     * @return Cache key.
      */
     protected getActivityGroupModeCacheKey(cmId: number): string {
         return this.ROOT_CACHE_KEY + 'groupmode:' + cmId;
@@ -246,8 +242,8 @@ export class CoreGroupsProvider {
     /**
      * Get user groups in all the user enrolled courses.
      *
-     * @param {string} [siteId] Site to get the groups from. If not defined, use current site.
-     * @return {Promise<any[]>} Promise resolved when the groups are retrieved.
+     * @param siteId Site to get the groups from. If not defined, use current site.
+     * @return Promise resolved when the groups are retrieved.
      */
     getAllUserGroups(siteId?: string): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -268,10 +264,10 @@ export class CoreGroupsProvider {
     /**
      * Get user groups in all the supplied courses.
      *
-     * @param {any[]} courses List of courses or course ids to get the groups from.
-     * @param {string} [siteId] Site to get the groups from. If not defined, use current site.
-     * @param {number} [userId] ID of the user. If not defined, use the userId related to siteId.
-     * @return {Promise<any[]>} Promise resolved when the groups are retrieved.
+     * @param courses List of courses or course ids to get the groups from.
+     * @param siteId Site to get the groups from. If not defined, use current site.
+     * @param userId ID of the user. If not defined, use the userId related to siteId.
+     * @return Promise resolved when the groups are retrieved.
      */
     getUserGroups(courses: any[], siteId?: string, userId?: number): Promise<any[]> {
         // Get all courses one by one.
@@ -289,10 +285,10 @@ export class CoreGroupsProvider {
     /**
      * Get user groups in a course.
      *
-     * @param {number} courseId ID of the course. 0 to get all enrolled courses groups (Moodle version > 3.6).
-     * @param {string} [siteId] Site to get the groups from. If not defined, use current site.
-     * @param {number} [userId] ID of the user. If not defined, use ID related to siteid.
-     * @return {Promise<any[]>} Promise resolved when the groups are retrieved.
+     * @param courseId ID of the course. 0 to get all enrolled courses groups (Moodle version > 3.6).
+     * @param siteId Site to get the groups from. If not defined, use current site.
+     * @param userId ID of the user. If not defined, use ID related to siteid.
+     * @return Promise resolved when the groups are retrieved.
      */
     getUserGroupsInCourse(courseId: number, siteId?: string, userId?: number): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -319,7 +315,7 @@ export class CoreGroupsProvider {
     /**
      * Get prefix cache key for  user groups in course WS calls.
      *
-     * @return {string} Prefix Cache key.
+     * @return Prefix Cache key.
      */
     protected getUserGroupsInCoursePrefixCacheKey(): string {
         return this.ROOT_CACHE_KEY + 'courseGroups:';
@@ -328,9 +324,9 @@ export class CoreGroupsProvider {
     /**
      * Get cache key for user groups in course WS calls.
      *
-     * @param {number} courseId Course ID.
-     * @param {number} userId User ID.
-     * @return {string} Cache key.
+     * @param courseId Course ID.
+     * @param userId User ID.
+     * @return Cache key.
      */
     protected getUserGroupsInCourseCacheKey(courseId: number, userId: number): string {
         return this.getUserGroupsInCoursePrefixCacheKey() + courseId + ':' + userId;
@@ -339,10 +335,10 @@ export class CoreGroupsProvider {
     /**
      * Invalidates activity allowed groups.
      *
-     * @param {number} cmId Course module ID.
-     * @param {number} [userId] User ID. If not defined, use current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param cmId Course module ID.
+     * @param userId User ID. If not defined, use current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateActivityAllowedGroups(cmId: number, userId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -355,9 +351,9 @@ export class CoreGroupsProvider {
     /**
      * Invalidates activity group mode.
      *
-     * @param {number} cmId Course module ID.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param cmId Course module ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateActivityGroupMode(cmId: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -368,10 +364,10 @@ export class CoreGroupsProvider {
     /**
      * Invalidates all activity group info: mode and allowed groups.
      *
-     * @param {number} cmId Course module ID.
-     * @param {number} [userId] User ID. If not defined, use current user.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param cmId Course module ID.
+     * @param userId User ID. If not defined, use current user.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateActivityGroupInfo(cmId: number, userId?: number, siteId?: string): Promise<any> {
         const promises = [];
@@ -384,8 +380,8 @@ export class CoreGroupsProvider {
     /**
      * Invalidates user groups in all user enrolled courses.
      *
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateAllUserGroups(siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -400,10 +396,10 @@ export class CoreGroupsProvider {
     /**
      * Invalidates user groups in courses.
      *
-     * @param {any[]} courses List of courses or course ids.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined, use current user.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courses List of courses or course ids.
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined, use current user.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateUserGroups(courses: any[], siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -422,10 +418,10 @@ export class CoreGroupsProvider {
     /**
      * Invalidates user groups in course.
      *
-     * @param {number} courseId ID of the course. 0 to get all enrolled courses groups (Moodle version > 3.6).
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @param {number} [userId] User ID. If not defined, use current user.
-     * @return {Promise<any>} Promise resolved when the data is invalidated.
+     * @param courseId ID of the course. 0 to get all enrolled courses groups (Moodle version > 3.6).
+     * @param siteId Site ID. If not defined, current site.
+     * @param userId User ID. If not defined, use current user.
+     * @return Promise resolved when the data is invalidated.
      */
     invalidateUserGroupsInCourse(courseId: number, siteId?: string, userId?: number): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -438,9 +434,9 @@ export class CoreGroupsProvider {
     /**
      * Validate a group ID. If the group is not visible by the user, it will return the first group ID.
      *
-     * @param {number} groupId Group ID to validate.
-     * @param {CoreGroupInfo} groupInfo Group info.
-     * @return {number} Group ID to use.
+     * @param groupId Group ID to validate.
+     * @param groupInfo Group info.
+     * @return Group ID to use.
      */
     validateGroupId(groupId: number, groupInfo: CoreGroupInfo): number {
         if (groupId > 0 && groupInfo && groupInfo.groups && groupInfo.groups.length > 0) {
diff --git a/src/providers/init.ts b/src/providers/init.ts
index e06ce450d..e0a8d331d 100644
--- a/src/providers/init.ts
+++ b/src/providers/init.ts
@@ -23,26 +23,23 @@ import { CoreUtilsProvider } from './utils/utils';
 export interface CoreInitHandler {
     /**
      * A name to identify the handler.
-     * @type {string}
      */
     name: string;
 
     /**
      * Function to execute during the init process.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     load(): Promise<any>;
 
     /**
      * The highest priority is executed first. You should use values lower than MAX_RECOMMENDED_PRIORITY.
-     * @type {number}
      */
     priority?: number;
 
     /**
      * Set this to true when this process should be resolved before any following one.
-     * @type {boolean}
      */
     blocking?: boolean;
 }
@@ -107,7 +104,7 @@ export class CoreInitDelegate {
     /**
      * Instantly returns if the app is ready.
      *
-     * @return {boolean} Whether it's ready.
+     * @return Whether it's ready.
      */
     isReady(): boolean {
         return this.readiness.resolved;
@@ -116,8 +113,8 @@ export class CoreInitDelegate {
     /**
      * Convenience function to return a function that executes the process.
      *
-     * @param {CoreInitHandler} data The data of the process.
-     * @return {Promise<any>} Promise of the process.
+     * @param data The data of the process.
+     * @return Promise of the process.
      */
     protected prepareProcess(data: CoreInitHandler): Promise<any> {
         let promise;
@@ -138,7 +135,7 @@ export class CoreInitDelegate {
     /**
      * Notifies when the app is ready. This returns a promise that is resolved when the app is initialised.
      *
-     * @return {Promise<any>} Resolved when the app is initialised. Never rejected.
+     * @return Resolved when the app is initialised. Never rejected.
      */
     ready(): Promise<any> {
         if (typeof this.readiness === 'undefined') {
@@ -161,7 +158,7 @@ export class CoreInitDelegate {
      *
      * This delegate cannot be used by site plugins.
      *
-     * @param {CoreInitHandler} instance The instance of the handler.
+     * @param instance The instance of the handler.
      */
     registerProcess(handler: CoreInitHandler): void {
         if (typeof handler.priority == 'undefined') {
diff --git a/src/providers/lang.ts b/src/providers/lang.ts
index 68463d4e3..acf8ec8ca 100644
--- a/src/providers/lang.ts
+++ b/src/providers/lang.ts
@@ -53,9 +53,9 @@ export class CoreLangProvider {
     /**
      * Add a set of site plugins strings for a certain language.
      *
-     * @param {string} lang The language where to add the strings.
-     * @param {any} strings Object with the strings to add.
-     * @param {string} [prefix] A prefix to add to all keys.
+     * @param lang The language where to add the strings.
+     * @param strings Object with the strings to add.
+     * @param prefix A prefix to add to all keys.
      */
     addSitePluginsStrings(lang: string, strings: any, prefix?: string): void {
         lang = lang.replace(/_/g, '-'); // Use the app format instead of Moodle format.
@@ -90,8 +90,8 @@ export class CoreLangProvider {
      * Capitalize a string (make the first letter uppercase).
      * We cannot use a function from text utils because it would cause a circular dependency.
      *
-     * @param {string} value String to capitalize.
-     * @return {string} Capitalized string.
+     * @param value String to capitalize.
+     * @return Capitalized string.
      */
     protected capitalize(value: string): string {
         return value.charAt(0).toUpperCase() + value.slice(1);
@@ -100,8 +100,8 @@ export class CoreLangProvider {
     /**
      * Change current language.
      *
-     * @param {string} language New language to use.
-     * @return {Promise<any>} Promise resolved when the change is finished.
+     * @param language New language to use.
+     * @return Promise resolved when the change is finished.
      */
     changeCurrentLanguage(language: string): Promise<any> {
         const promises = [];
@@ -191,7 +191,7 @@ export class CoreLangProvider {
     /**
      * Get all current custom strings.
      *
-     * @return {any} Custom strings.
+     * @return Custom strings.
      */
     getAllCustomStrings(): any {
         return this.customStrings;
@@ -200,7 +200,7 @@ export class CoreLangProvider {
     /**
      * Get all current site plugins strings.
      *
-     * @return {any} Site plugins strings.
+     * @return Site plugins strings.
      */
     getAllSitePluginsStrings(): any {
         return this.sitePluginsStrings;
@@ -209,7 +209,7 @@ export class CoreLangProvider {
     /**
      * Get current language.
      *
-     * @return {Promise<string>} Promise resolved with the current language.
+     * @return Promise resolved with the current language.
      */
     getCurrentLanguage(): Promise<string> {
 
@@ -263,7 +263,7 @@ export class CoreLangProvider {
     /**
      * Get the default language.
      *
-     * @return {string} Default language.
+     * @return Default language.
      */
     getDefaultLanguage(): string {
         return this.defaultLanguage;
@@ -272,7 +272,7 @@ export class CoreLangProvider {
     /**
      * Get the fallback language.
      *
-     * @return {string} Fallback language.
+     * @return Fallback language.
      */
     getFallbackLanguage(): string {
         return this.fallbackLanguage;
@@ -281,8 +281,8 @@ export class CoreLangProvider {
     /**
      * Get the full list of translations for a certain language.
      *
-     * @param {string} lang The language to check.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param lang The language to check.
+     * @return Promise resolved when done.
      */
     getTranslationTable(lang: string): Promise<any> {
         // Create a promise to convert the observable into a promise.
@@ -300,7 +300,7 @@ export class CoreLangProvider {
     /**
      * Load certain custom strings.
      *
-     * @param {string} strings Custom strings to load (tool_mobile_customlangstrings).
+     * @param strings Custom strings to load (tool_mobile_customlangstrings).
      */
     loadCustomStrings(strings: string): void {
         if (strings == this.customStringsRaw) {
@@ -345,9 +345,9 @@ export class CoreLangProvider {
     /**
      * Load custom strings for a certain language that weren't loaded because the language wasn't active.
      *
-     * @param {any} langObject The object with the strings to load.
-     * @param {string} lang Language to load.
-     * @return {boolean} Whether the translation table was modified.
+     * @param langObject The object with the strings to load.
+     * @param lang Language to load.
+     * @return Whether the translation table was modified.
      */
     loadLangStrings(langObject: any, lang: string): boolean {
         let langApplied = false;
@@ -375,10 +375,10 @@ export class CoreLangProvider {
     /**
      * Load a string in a certain lang object and in the translate table if the lang is loaded.
      *
-     * @param {any} langObject The object where to store the lang.
-     * @param {string} lang Language code.
-     * @param {string} key String key.
-     * @param {string} value String value.
+     * @param langObject The object where to store the lang.
+     * @param lang Language code.
+     * @param key String key.
+     * @param value String value.
      */
     loadString(langObject: any, lang: string, key: string, value: string): void {
         lang = lang.replace(/_/g, '-'); // Use the app format instead of Moodle format.
@@ -407,7 +407,7 @@ export class CoreLangProvider {
     /**
      * Unload custom or site plugin strings, removing them from the translations table.
      *
-     * @param {any} strings Strings to unload.
+     * @param strings Strings to unload.
      */
     protected unloadStrings(strings: any): void {
         // Iterate over all languages and strings.
diff --git a/src/providers/local-notifications.ts b/src/providers/local-notifications.ts
index ae9de1652..712f3eac8 100644
--- a/src/providers/local-notifications.ts
+++ b/src/providers/local-notifications.ts
@@ -163,10 +163,10 @@ export class CoreLocalNotificationsProvider {
     /**
      * Cancel a local notification.
      *
-     * @param {number} id Notification id.
-     * @param {string} component Component of the notification.
-     * @param {string} siteId Site ID.
-     * @return {Promise<any>} Promise resolved when the notification is cancelled.
+     * @param id Notification id.
+     * @param component Component of the notification.
+     * @param siteId Site ID.
+     * @return Promise resolved when the notification is cancelled.
      */
     cancel(id: number, component: string, siteId: string): Promise<any> {
         return this.getUniqueNotificationId(id, component, siteId).then((uniqueId) => {
@@ -177,8 +177,8 @@ export class CoreLocalNotificationsProvider {
     /**
      * Cancel all the scheduled notifications belonging to a certain site.
      *
-     * @param {string} siteId Site ID.
-     * @return {Promise<any>} Promise resolved when the notifications are cancelled.
+     * @param siteId Site ID.
+     * @return Promise resolved when the notifications are cancelled.
      */
     cancelSiteNotifications(siteId: string): Promise<any> {
 
@@ -208,7 +208,7 @@ export class CoreLocalNotificationsProvider {
     /**
      * Check whether sound can be disabled for notifications.
      *
-     * @return {boolean} Whether sound can be disabled for notifications.
+     * @return Whether sound can be disabled for notifications.
      */
     canDisableSound(): boolean {
         // Only allow disabling sound in Android 7 or lower. In iOS and Android 8+ it can easily be done with system settings.
@@ -219,7 +219,7 @@ export class CoreLocalNotificationsProvider {
     /**
      * Create the default channel. It is used to change the name.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected createDefaultChannel(): Promise<any> {
         if (!this.platform.is('android')) {
@@ -238,9 +238,9 @@ export class CoreLocalNotificationsProvider {
     /**
      * Get a code to create unique notifications. If there's no code assigned, create a new one.
      *
-     * @param {string} table Table to search in local DB.
-     * @param {string} id ID of the element to get its code.
-     * @return {Promise<number>} Promise resolved when the code is retrieved.
+     * @param table Table to search in local DB.
+     * @param id ID of the element to get its code.
+     * @return Promise resolved when the code is retrieved.
      */
     protected getCode(table: string, id: string): Promise<number> {
         const key = table + '#' + id;
@@ -276,8 +276,8 @@ export class CoreLocalNotificationsProvider {
      * Get a notification component code to be used.
      * If it's the first time this component is used to send notifications, create a new code for it.
      *
-     * @param {string} component Component name.
-     * @return {Promise<number>} Promise resolved when the component code is retrieved.
+     * @param component Component name.
+     * @return Promise resolved when the component code is retrieved.
      */
     protected getComponentCode(component: string): Promise<number> {
         return this.requestCode(this.COMPONENTS_TABLE, component);
@@ -287,8 +287,8 @@ export class CoreLocalNotificationsProvider {
      * Get a site code to be used.
      * If it's the first time this site is used to send notifications, create a new code for it.
      *
-     * @param {string} siteId Site ID.
-     * @return {Promise<number>} Promise resolved when the site code is retrieved.
+     * @param siteId Site ID.
+     * @return Promise resolved when the site code is retrieved.
      */
     protected getSiteCode(siteId: string): Promise<number> {
         return this.requestCode(this.SITES_TABLE, siteId);
@@ -302,10 +302,10 @@ export class CoreLocalNotificationsProvider {
      *     -There are less than 11 components.
      *     -The notificationId passed as parameter is lower than 10000000.
      *
-     * @param {number} notificationId Notification ID.
-     * @param {string} component Component triggering the notification.
-     * @param {string} siteId Site ID.
-     * @return {Promise<number>} Promise resolved when the notification ID is generated.
+     * @param notificationId Notification ID.
+     * @param component Component triggering the notification.
+     * @param siteId Site ID.
+     * @return Promise resolved when the notification ID is generated.
      */
     protected getUniqueNotificationId(notificationId: number, component: string, siteId: string): Promise<number> {
         if (!siteId || !component) {
@@ -323,8 +323,8 @@ export class CoreLocalNotificationsProvider {
     /**
      * Handle an event triggered by the local notifications plugin.
      *
-     * @param {string} eventName Name of the event.
-     * @param {any} notification Notification.
+     * @param eventName Name of the event.
+     * @param notification Notification.
      */
     protected handleEvent(eventName: string, notification: any): void {
         if (notification && notification.data) {
@@ -337,7 +337,7 @@ export class CoreLocalNotificationsProvider {
     /**
      * Returns whether local notifications plugin is installed.
      *
-     * @return {boolean} Whether local notifications plugin is installed.
+     * @return Whether local notifications plugin is installed.
      */
     isAvailable(): boolean {
         const win = <any> window;
@@ -349,8 +349,8 @@ export class CoreLocalNotificationsProvider {
     /**
      * Check if a notification has been triggered with the same trigger time.
      *
-     * @param {ILocalNotification} notification Notification to check.
-     * @return {Promise<any>} Promise resolved with a boolean indicating if promise is triggered (true) or not.
+     * @param notification Notification to check.
+     * @return Promise resolved with a boolean indicating if promise is triggered (true) or not.
      */
     isTriggered(notification: ILocalNotification): Promise<any> {
         return this.appDB.getRecord(this.TRIGGERED_TABLE, { id: notification.id }).then((stored) => {
@@ -369,7 +369,7 @@ export class CoreLocalNotificationsProvider {
     /**
      * Notify notification click to observers. Only the observers with the same component as the notification will be notified.
      *
-     * @param {any} data Data received by the notification.
+     * @param data Data received by the notification.
      */
     notifyClick(data: any): void {
         this.notifyEvent('click', data);
@@ -378,8 +378,8 @@ export class CoreLocalNotificationsProvider {
     /**
      * Notify a certain event to observers. Only the observers with the same component as the notification will be notified.
      *
-     * @param {string} eventName Name of the event to notify.
-     * @param {any} data Data received by the notification.
+     * @param eventName Name of the event to notify.
+     * @param data Data received by the notification.
      */
     notifyEvent(eventName: string, data: any): void {
         // Execute the code in the Angular zone, so change detection doesn't stop working.
@@ -434,9 +434,9 @@ export class CoreLocalNotificationsProvider {
     /**
      * Register an observer to be notified when a notification belonging to a certain component is clicked.
      *
-     * @param {string} component Component to listen notifications for.
-     * @param {Function} callback Function to call with the data received by the notification.
-     * @return {any} Object with an "off" property to stop listening for clicks.
+     * @param component Component to listen notifications for.
+     * @param callback Function to call with the data received by the notification.
+     * @return Object with an "off" property to stop listening for clicks.
      */
     registerClick(component: string, callback: Function): any {
         return this.registerObserver('click', component, callback);
@@ -445,10 +445,10 @@ export class CoreLocalNotificationsProvider {
     /**
      * Register an observer to be notified when a certain event is fired for a notification belonging to a certain component.
      *
-     * @param {string} eventName Name of the event to listen to.
-     * @param {string} component Component to listen notifications for.
-     * @param {Function} callback Function to call with the data received by the notification.
-     * @return {any} Object with an "off" property to stop listening for events.
+     * @param eventName Name of the event to listen to.
+     * @param component Component to listen notifications for.
+     * @param callback Function to call with the data received by the notification.
+     * @return Object with an "off" property to stop listening for events.
      */
     registerObserver(eventName: string, component: string, callback: Function): any {
         this.logger.debug(`Register observer '${component}' for event '${eventName}'.`);
@@ -474,8 +474,8 @@ export class CoreLocalNotificationsProvider {
     /**
      * Remove a notification from triggered store.
      *
-     * @param {number} id Notification ID.
-     * @return {Promise<any>} Promise resolved when it is removed.
+     * @param id Notification ID.
+     * @return Promise resolved when it is removed.
      */
     removeTriggered(id: number): Promise<any> {
         return this.appDB.deleteRecords(this.TRIGGERED_TABLE, { id: id });
@@ -484,9 +484,9 @@ export class CoreLocalNotificationsProvider {
     /**
      * Request a unique code. The request will be added to the queue and the queue is going to be started if it's paused.
      *
-     * @param {string} table Table to search in local DB.
-     * @param {string} id ID of the element to get its code.
-     * @return {Promise}      Promise resolved when the code is retrieved.
+     * @param table Table to search in local DB.
+     * @param id ID of the element to get its code.
+     * @return Promise resolved when the code is retrieved.
      */
     protected requestCode(table: string, id: string): Promise<number> {
         const deferred = this.utils.promiseDefer(),
@@ -515,7 +515,7 @@ export class CoreLocalNotificationsProvider {
     /**
      * Reschedule all notifications that are already scheduled.
      *
-     * @return {Promise<any>} Promise resolved when all notifications have been rescheduled.
+     * @return Promise resolved when all notifications have been rescheduled.
      */
     rescheduleAll(): Promise<any> {
         // Get all the scheduled notifications.
@@ -536,12 +536,12 @@ export class CoreLocalNotificationsProvider {
     /**
      * Schedule a local notification.
      *
-     * @param {ILocalNotification} notification Notification to schedule. Its ID should be lower than 10000000 and it should
-     *                                          be unique inside its component and site.
-     * @param {string} component Component triggering the notification. It is used to generate unique IDs.
-     * @param {string} siteId Site ID.
-     * @param {boolean} [alreadyUnique] Whether the ID is already unique.
-     * @return {Promise<any>} Promise resolved when the notification is scheduled.
+     * @param notification Notification to schedule. Its ID should be lower than 10000000 and it should
+     *                     be unique inside its component and site.
+     * @param component Component triggering the notification. It is used to generate unique IDs.
+     * @param siteId Site ID.
+     * @param alreadyUnique Whether the ID is already unique.
+     * @return Promise resolved when the notification is scheduled.
      */
     schedule(notification: ILocalNotification, component: string, siteId: string, alreadyUnique?: boolean): Promise<any> {
         let promise;
@@ -578,8 +578,8 @@ export class CoreLocalNotificationsProvider {
     /**
      * Helper function to schedule a notification object if it hasn't been triggered already.
      *
-     * @param {ILocalNotification} notification Notification to schedule.
-     * @return {Promise<any>} Promise resolved when scheduled.
+     * @param notification Notification to schedule.
+     * @return Promise resolved when scheduled.
      */
     protected scheduleNotification(notification: ILocalNotification): Promise<any> {
         // Check if the notification has been triggered already.
@@ -619,7 +619,7 @@ export class CoreLocalNotificationsProvider {
      * This function was used because local notifications weren't displayed when the app was in foreground in iOS10+,
      * but the issue was fixed in the plugin and this function is no longer used.
      *
-     * @param {ILocalNotification} notification Notification.
+     * @param notification Notification.
      */
     showNotificationPopover(notification: ILocalNotification): void {
 
@@ -711,8 +711,8 @@ export class CoreLocalNotificationsProvider {
      * Function to call when a notification is triggered. Stores the notification so it's not scheduled again unless the
      * time is changed.
      *
-     * @param {ILocalNotification} notification Triggered notification.
-     * @return {Promise<any>} Promise resolved when stored, rejected otherwise.
+     * @param notification Triggered notification.
+     * @return Promise resolved when stored, rejected otherwise.
      */
     trigger(notification: ILocalNotification): Promise<any> {
         const entry = {
@@ -726,9 +726,9 @@ export class CoreLocalNotificationsProvider {
     /**
      * Update a component name.
      *
-     * @param {string} oldName The old name.
-     * @param {string}  newName The new name.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param oldName The old name.
+     * @param newName The new name.
+     * @return Promise resolved when done.
      */
     updateComponentName(oldName: string, newName: string): Promise<any> {
         const oldId = this.COMPONENTS_TABLE + '#' + oldName,
diff --git a/src/providers/logger.ts b/src/providers/logger.ts
index 85a74e4d3..f3d989b32 100644
--- a/src/providers/logger.ts
+++ b/src/providers/logger.ts
@@ -38,8 +38,8 @@ export class CoreLoggerProvider {
     /**
      * Get a logger instance for a certain class, service or component.
      *
-     * @param {string} className Name to use in the messages.
-     * @return {ant} Instance.
+     * @param className Name to use in the messages.
+     * @return Instance.
      */
     getInstance(className: string): any {
         className = className || '';
@@ -57,9 +57,9 @@ export class CoreLoggerProvider {
     /**
      * Prepare a logging function, concatenating the timestamp and class name to all messages.
      *
-     * @param {Function} logFn Log function to use.
-     * @param {string} className Name to use in the messages.
-     * @return {Function} Prepared function.
+     * @param logFn Log function to use.
+     * @param className Name to use in the messages.
+     * @return Prepared function.
      */
     private prepareLogFn(logFn: Function, className: string): Function {
         // Return our own function that will call the logging function with the treated message.
diff --git a/src/providers/plugin-file-delegate.ts b/src/providers/plugin-file-delegate.ts
index 6f1e3e902..8708e7810 100644
--- a/src/providers/plugin-file-delegate.ts
+++ b/src/providers/plugin-file-delegate.ts
@@ -21,29 +21,27 @@ import { CoreLoggerProvider } from './logger';
 export interface CorePluginFileHandler {
     /**
      * A name to identify the handler.
-     * @type {string}
      */
     name: string;
 
     /**
      * The "component" of the handler. It should match the "component" of pluginfile URLs.
-     * @type {string}
      */
     component: string;
 
     /**
      * Return the RegExp to match the revision on pluginfile URLs.
      *
-     * @param {string[]} args Arguments of the pluginfile URL defining component and filearea at least.
-     * @return {RegExp} RegExp to match the revision on pluginfile URLs.
+     * @param args Arguments of the pluginfile URL defining component and filearea at least.
+     * @return RegExp to match the revision on pluginfile URLs.
      */
     getComponentRevisionRegExp?(args: string[]): RegExp;
 
     /**
      * Should return the string to remove the revision on pluginfile url.
      *
-     * @param {string[]} args Arguments of the pluginfile URL defining component and filearea at least.
-     * @return {string} String to remove the revision on pluginfile url.
+     * @param args Arguments of the pluginfile URL defining component and filearea at least.
+     * @return String to remove the revision on pluginfile url.
      */
     getComponentRevisionReplace?(args: string[]): string;
 }
@@ -63,8 +61,8 @@ export class CorePluginFileDelegate {
     /**
      * Get the handler for a certain pluginfile url.
      *
-     * @param {string} component Component of the plugin.
-     * @return {CorePluginFileHandler} Handler. Undefined if no handler found for the plugin.
+     * @param component Component of the plugin.
+     * @return Handler. Undefined if no handler found for the plugin.
      */
     protected getPluginHandler(component: string): CorePluginFileHandler {
         if (typeof this.handlers[component] != 'undefined') {
@@ -75,8 +73,8 @@ export class CorePluginFileDelegate {
     /**
      * Get the RegExp of the component and filearea described in the URL.
      *
-     * @param {string[]} args Arguments of the pluginfile URL defining component and filearea at least.
-     * @return {RegExp}  RegExp to match the revision or undefined if not found.
+     * @param args Arguments of the pluginfile URL defining component and filearea at least.
+     * @return RegExp to match the revision or undefined if not found.
      */
     getComponentRevisionRegExp(args: string[]): RegExp {
         // Get handler based on component (args[1]).
@@ -90,8 +88,8 @@ export class CorePluginFileDelegate {
     /**
      * Register a handler.
      *
-     * @param {CorePluginFileHandler} handler The handler to register.
-     * @return {boolean} True if registered successfully, false otherwise.
+     * @param handler The handler to register.
+     * @return True if registered successfully, false otherwise.
      */
     registerHandler(handler: CorePluginFileHandler): boolean {
         if (typeof this.handlers[handler.component] !== 'undefined') {
@@ -109,9 +107,9 @@ export class CorePluginFileDelegate {
     /**
      * Removes the revision number from a file URL.
      *
-     * @param {string} url URL to be replaced.
-     * @param {string[]} args Arguments of the pluginfile URL defining component and filearea at least.
-     * @return {string} Replaced URL without revision.
+     * @param url URL to be replaced.
+     * @param args Arguments of the pluginfile URL defining component and filearea at least.
+     * @return Replaced URL without revision.
      */
     removeRevisionFromUrl(url: string, args: string[]): string {
         // Get handler based on component (args[1]).
diff --git a/src/providers/sites-factory.ts b/src/providers/sites-factory.ts
index dda512f8c..5bb68cd11 100644
--- a/src/providers/sites-factory.ts
+++ b/src/providers/sites-factory.ts
@@ -26,14 +26,14 @@ export class CoreSitesFactoryProvider {
     /**
      * Make a site object.
      *
-     * @param {string} id Site ID.
-     * @param {string} siteUrl Site URL.
-     * @param {string} [token] Site's WS token.
-     * @param {any} [info] Site info.
-     * @param {string} [privateToken] Private token.
-     * @param {any} [config] Site public config.
-     * @param {boolean} [loggedOut] Whether user is logged out.
-     * @return {CoreSite} Site instance.
+     * @param id Site ID.
+     * @param siteUrl Site URL.
+     * @param token Site's WS token.
+     * @param info Site info.
+     * @param privateToken Private token.
+     * @param config Site public config.
+     * @param loggedOut Whether user is logged out.
+     * @return Site instance.
      * @description
      * This returns a site object.
      */
@@ -45,7 +45,7 @@ export class CoreSitesFactoryProvider {
     /**
      * Gets the list of Site methods.
      *
-     * @return {string[]} List of methods.
+     * @return List of methods.
      */
     getSiteMethods(): string[] {
         const methods = [];
diff --git a/src/providers/sites.ts b/src/providers/sites.ts
index 515d7117a..5eafef8d8 100644
--- a/src/providers/sites.ts
+++ b/src/providers/sites.ts
@@ -36,31 +36,26 @@ import { WP_PROVIDER } from '@app/app.module';
 export interface CoreSiteCheckResponse {
     /**
      * Code to identify the authentication method to use.
-     * @type {number}
      */
     code: number;
 
     /**
      * Site url to use (might have changed during the process).
-     * @type {string}
      */
     siteUrl: string;
 
     /**
      * Service used.
-     * @type {string}
      */
     service: string;
 
     /**
      * Code of the warning message to show to the user.
-     * @type {string}
      */
     warning?: string;
 
     /**
      * Site public config (if available).
-     * @type {any}
      */
     config?: any;
 }
@@ -71,19 +66,16 @@ export interface CoreSiteCheckResponse {
 export interface CoreSiteUserTokenResponse {
     /**
      * User token.
-     * @type {string}
      */
     token: string;
 
     /**
      * Site URL to use.
-     * @type {string}
      */
     siteUrl: string;
 
     /**
      * User private token.
-     * @type {string}
      */
     privateToken?: string;
 }
@@ -94,37 +86,31 @@ export interface CoreSiteUserTokenResponse {
 export interface CoreSiteBasicInfo {
     /**
      * Site ID.
-     * @type {string}
      */
     id: string;
 
     /**
      * Site URL.
-     * @type {string}
      */
     siteUrl: string;
 
     /**
      * User's full name.
-     * @type {string}
      */
     fullName: string;
 
     /**
      * Site's name.
-     * @type {string}
      */
     siteName: string;
 
     /**
      * User's avatar.
-     * @type {string}
      */
     avatar: string;
 
     /**
      * Badge to display in the site.
-     * @type {number}
      */
     badge?: number;
 }
@@ -135,22 +121,16 @@ export interface CoreSiteBasicInfo {
 export interface CoreSiteSchema {
     /**
      * Name of the schema.
-     *
-     * @type {string}
      */
     name: string;
 
     /**
      * Latest version of the schema (integer greater than 0).
-     *
-     * @type {number}
      */
     version: number;
 
     /**
      * Names of the tables of the site schema that can be cleared.
-     *
-     * @type {string[]}
      */
     canBeCleared?: string[];
 
@@ -164,10 +144,10 @@ export interface CoreSiteSchema {
      *
      * Called when installing and upgrading the schema, after creating the defined tables.
      *
-     * @param {SQLiteDB} db Site database.
-     * @param {number} oldVersion Old version of the schema or 0 if not installed.
-     * @param {string} siteId Site Id to migrate.
-     * @return {Promise<any> | void} Promise resolved when done.
+     * @param db Site database.
+     * @param oldVersion Old version of the schema or 0 if not installed.
+     * @param siteId Site Id to migrate.
+     * @return Promise resolved when done.
      */
     migrate?(db: SQLiteDB, oldVersion: number, siteId: string): Promise<any> | void;
 }
@@ -338,8 +318,8 @@ export class CoreSitesProvider {
     /**
      * Get the demo data for a certain "name" if it is a demo site.
      *
-     * @param {string} name Name of the site to check.
-     * @return {any} Site data if it's a demo site, undefined otherwise.
+     * @param name Name of the site to check.
+     * @return Site data if it's a demo site, undefined otherwise.
      */
     getDemoSiteData(name: string): any {
         const demoSites = CoreConfigConstants.demo_sites;
@@ -352,9 +332,9 @@ export class CoreSitesProvider {
      * Check if a site is valid and if it has specifics settings for authentication (like force to log in using the browser).
      * It will test both protocols if the first one fails: http and https.
      *
-     * @param {string} siteUrl URL of the site to check.
-     * @param {string} [protocol=https://] Protocol to use first.
-     * @return {Promise<CoreSiteCheckResponse>} A promise resolved when the site is checked.
+     * @param siteUrl URL of the site to check.
+     * @param protocol Protocol to use first.
+     * @return A promise resolved when the site is checked.
      */
     checkSite(siteUrl: string, protocol: string = 'https://'): Promise<CoreSiteCheckResponse> {
         // The formatURL function adds the protocol if is missing.
@@ -395,9 +375,9 @@ export class CoreSitesProvider {
     /**
      * Helper function to check if a site is valid and if it has specifics settings for authentication.
      *
-     * @param {string} siteUrl URL of the site to check.
-     * @param {string} protocol Protocol to use.
-     * @return {Promise<CoreSiteCheckResponse>} A promise resolved when the site is checked.
+     * @param siteUrl URL of the site to check.
+     * @param protocol Protocol to use.
+     * @return A promise resolved when the site is checked.
      */
     checkSiteWithProtocol(siteUrl: string, protocol: string): Promise<CoreSiteCheckResponse> {
         let publicConfig;
@@ -515,8 +495,8 @@ export class CoreSitesProvider {
     /**
      * Check if a site exists.
      *
-     * @param  {string} siteUrl URL of the site to check.
-     * @return {Promise} A promise to be resolved if the site exists.
+     * @param siteUrl URL of the site to check.
+     * @return A promise to be resolved if the site exists.
      */
     siteExists(siteUrl: string): Promise<void> {
         return this.http.post(siteUrl + '/login/token.php', {}).timeout(this.wsProvider.getRequestTimeout()).toPromise()
@@ -537,12 +517,12 @@ export class CoreSitesProvider {
     /**
      * Gets a user token from the server.
      *
-     * @param {string} siteUrl The site url.
-     * @param {string} username User name.
-     * @param {string} password Password.
-     * @param {string} [service] Service to use. If not defined, it will be searched in memory.
-     * @param {boolean} [retry] Whether we are retrying with a prefixed URL.
-     * @return {Promise<CoreSiteUserTokenResponse>} A promise resolved when the token is retrieved.
+     * @param siteUrl The site url.
+     * @param username User name.
+     * @param password Password.
+     * @param service Service to use. If not defined, it will be searched in memory.
+     * @param retry Whether we are retrying with a prefixed URL.
+     * @return A promise resolved when the token is retrieved.
      */
     getUserToken(siteUrl: string, username: string, password: string, service?: string, retry?: boolean)
             : Promise<CoreSiteUserTokenResponse> {
@@ -603,11 +583,11 @@ export class CoreSitesProvider {
     /**
      * Add a new site to the site list and authenticate the user in this site.
      *
-     * @param {string} siteUrl The site url.
-     * @param {string} token User's token.
-     * @param {string} [privateToken=''] User's private token.
-     * @param {boolean} [login=true] Whether to login the user in the site. Defaults to true.
-     * @return {Promise<string>} A promise resolved with siteId when the site is added and the user is authenticated.
+     * @param siteUrl The site url.
+     * @param token User's token.
+     * @param privateToken User's private token.
+     * @param login Whether to login the user in the site. Defaults to true.
+     * @return A promise resolved with siteId when the site is added and the user is authenticated.
      */
     newSite(siteUrl: string, token: string, privateToken: string = '', login: boolean = true): Promise<string> {
         if (typeof login != 'boolean') {
@@ -683,10 +663,10 @@ export class CoreSitesProvider {
     /**
      * Having the result of isValidMoodleVersion, it treats the error message to be shown.
      *
-     * @param {number} result Result returned by isValidMoodleVersion function.
-     * @param {string} siteUrl The site url.
-     * @param  {string} siteId If site is already added, it will invalidate the token.
-     * @return {Promise<any>} A promise rejected with the error info.
+     * @param result Result returned by isValidMoodleVersion function.
+     * @param siteUrl The site url.
+     * @param siteId If site is already added, it will invalidate the token.
+     * @return A promise rejected with the error info.
      */
     protected treatInvalidAppVersion(result: number, siteUrl: string, siteId?: string): Promise<any> {
         let errorCode,
@@ -742,9 +722,9 @@ export class CoreSitesProvider {
     /**
      * Create a site ID based on site URL and username.
      *
-     * @param {string} siteUrl The site url.
-     * @param {string} username Username.
-     * @return {string} Site ID.
+     * @param siteUrl The site url.
+     * @param username Username.
+     * @return Site ID.
      */
     createSiteID(siteUrl: string, username: string): string {
         return <string> Md5.hashAsciiStr(siteUrl + username);
@@ -753,8 +733,8 @@ export class CoreSitesProvider {
     /**
      * Function for determine which service we should use (default or extended plugin).
      *
-     * @param {string} siteUrl The site URL.
-     * @return {string} The service shortname.
+     * @param siteUrl The site URL.
+     * @return The service shortname.
      */
     determineService(siteUrl: string): string {
         // We need to try siteUrl in both https or http (due to loginhttps setting).
@@ -778,8 +758,8 @@ export class CoreSitesProvider {
     /**
      * Check for the minimum required version.
      *
-     * @param {any} info Site info.
-     * @return {number} Either VALID_VERSION, LEGACY_APP_VERSION, WORKPLACE_APP, MOODLE_APP or INVALID_VERSION.
+     * @param info Site info.
+     * @return Either VALID_VERSION, LEGACY_APP_VERSION, WORKPLACE_APP, MOODLE_APP or INVALID_VERSION.
      */
     protected isValidMoodleVersion(info: any): number {
         if (!info) {
@@ -821,8 +801,8 @@ export class CoreSitesProvider {
     /**
      * Check if needs to be redirected to specific Workplace App or general Moodle App.
      *
-     * @param {any} info Site info.
-     * @return {number} Either VALID_VERSION, WORKPLACE_APP or MOODLE_APP.
+     * @param info Site info.
+     * @return Either VALID_VERSION, WORKPLACE_APP or MOODLE_APP.
      */
     protected validateWorkplaceVersion(info: any): number {
         const isWorkplace = !!info.functions && info.functions.some((func) => {
@@ -848,8 +828,8 @@ export class CoreSitesProvider {
     /**
      * Returns the release number from site release info.
      *
-     * @param  {string}  rawRelease Raw release info text.
-     * @return {string}   Release number or empty.
+     * @param rawRelease Raw release info text.
+     * @return Release number or empty.
      */
     getReleaseNumber(rawRelease: string): string {
         const matches = rawRelease.match(/^\d(\.\d(\.\d+)?)?/);
@@ -863,8 +843,8 @@ export class CoreSitesProvider {
     /**
      * Check if site info is valid. If it's not, return error message.
      *
-     * @param {any} info Site info.
-     * @return {any} True if valid, object with error message to show and its params if not valid.
+     * @param info Site info.
+     * @return True if valid, object with error message to show and its params if not valid.
      */
     protected validateSiteInfo(info: any): any {
         if (!info.firstname || !info.lastname) {
@@ -879,13 +859,13 @@ export class CoreSitesProvider {
     /**
      * Saves a site in local DB.
      *
-     * @param {string} id Site ID.
-     * @param {string} siteUrl Site URL.
-     * @param {string} token User's token in the site.
-     * @param {any} info Site's info.
-     * @param {string} [privateToken=''] User's private token.
-     * @param {any} [config] Site config (from tool_mobile_get_config).
-     * @return {Promise<any>} Promise resolved when done.
+     * @param id Site ID.
+     * @param siteUrl Site URL.
+     * @param token User's token in the site.
+     * @param info Site's info.
+     * @param privateToken User's private token.
+     * @param config Site config (from tool_mobile_get_config).
+     * @return Promise resolved when done.
      */
     addSite(id: string, siteUrl: string, token: string, info: any, privateToken: string = '', config?: any): Promise<any> {
         const entry = {
@@ -904,10 +884,10 @@ export class CoreSitesProvider {
     /**
      * Login a user to a site from the list of sites.
      *
-     * @param {string} siteId ID of the site to load.
-     * @param {string} [pageName] Name of the page to go once authenticated if logged out. If not defined, site initial page.
-     * @param {any} [params] Params of the page to go once authenticated if logged out.
-     * @return {Promise<boolean>} Promise resolved with true if site is loaded, resolved with false if cannot login.
+     * @param siteId ID of the site to load.
+     * @param pageName Name of the page to go once authenticated if logged out. If not defined, site initial page.
+     * @param params Params of the page to go once authenticated if logged out.
+     * @return Promise resolved with true if site is loaded, resolved with false if cannot login.
      */
     loadSite(siteId: string, pageName?: string, params?: any): Promise<boolean> {
         this.logger.debug(`Load site ${siteId}`);
@@ -948,7 +928,7 @@ export class CoreSitesProvider {
     /**
      * Get current site.
      *
-     * @return {CoreSite} Current site.
+     * @return Current site.
      */
     getCurrentSite(): CoreSite {
         return this.currentSite;
@@ -957,7 +937,7 @@ export class CoreSitesProvider {
     /**
      * Get the site home ID of the current site.
      *
-     * @return {number} Current site home ID.
+     * @return Current site home ID.
      */
     getCurrentSiteHomeId(): number {
         if (this.currentSite) {
@@ -970,7 +950,7 @@ export class CoreSitesProvider {
     /**
      * Get current site ID.
      *
-     * @return {string} Current site ID.
+     * @return Current site ID.
      */
     getCurrentSiteId(): string {
         if (this.currentSite) {
@@ -983,7 +963,7 @@ export class CoreSitesProvider {
     /**
      * Get current site User ID.
      *
-     * @return {number} Current site User ID.
+     * @return Current site User ID.
      */
     getCurrentSiteUserId(): number {
         if (this.currentSite) {
@@ -996,7 +976,7 @@ export class CoreSitesProvider {
     /**
      * Check if the user is logged in a site.
      *
-     * @return {boolean} Whether the user is logged in a site.
+     * @return Whether the user is logged in a site.
      */
     isLoggedIn(): boolean {
         return typeof this.currentSite != 'undefined' && typeof this.currentSite.token != 'undefined' &&
@@ -1006,8 +986,8 @@ export class CoreSitesProvider {
     /**
      * Delete a site from the sites list.
      *
-     * @param {string} siteId ID of the site to delete.
-     * @return {Promise<any>} Promise to be resolved when the site is deleted.
+     * @param siteId ID of the site to delete.
+     * @return Promise to be resolved when the site is deleted.
      */
     deleteSite(siteId: string): Promise<any> {
         this.logger.debug(`Delete site ${siteId}`);
@@ -1037,7 +1017,7 @@ export class CoreSitesProvider {
     /**
      * Check if there are sites stored.
      *
-     * @return {Promise<boolean>} Promise resolved with true if there are sites and false if there aren't.
+     * @return Promise resolved with true if there are sites and false if there aren't.
      */
     hasSites(): Promise<boolean> {
         return this.appDB.countRecords(this.SITES_TABLE).then((count) => {
@@ -1048,8 +1028,8 @@ export class CoreSitesProvider {
     /**
      * Returns a site object.
      *
-     * @param {string} [siteId] The site ID. If not defined, current site (if available).
-     * @return {Promise<CoreSite>} Promise resolved with the site.
+     * @param siteId The site ID. If not defined, current site (if available).
+     * @return Promise resolved with the site.
      */
     getSite(siteId?: string): Promise<CoreSite> {
         if (!siteId) {
@@ -1069,8 +1049,8 @@ export class CoreSitesProvider {
     /**
      * Create a site from an entry of the sites list DB. The new site is added to the list of "cached" sites: this.sites.
      *
-     * @param {any} entry Site list entry.
-     * @return {Promise<CoreSite>} Promised resolved with the created site.
+     * @param entry Site list entry.
+     * @return Promised resolved with the created site.
      */
     makeSiteFromSiteListEntry(entry: any): Promise<CoreSite> {
         let site: CoreSite,
@@ -1095,8 +1075,8 @@ export class CoreSitesProvider {
     /**
      * Returns if the site is the current one.
      *
-     * @param {string|CoreSite} [site] Site object or siteId to be compared. If not defined, use current site.
-     * @return {boolean} Whether site or siteId is the current one.
+     * @param site Site object or siteId to be compared. If not defined, use current site.
+     * @return Whether site or siteId is the current one.
      */
     isCurrentSite(site: string | CoreSite): boolean {
         if (!site || !this.currentSite) {
@@ -1111,8 +1091,8 @@ export class CoreSitesProvider {
     /**
      * Returns the database object of a site.
      *
-     * @param {string} [siteId] The site ID. If not defined, current site (if available).
-     * @return {Promise<SQLiteDB>} Promise resolved with the database.
+     * @param siteId The site ID. If not defined, current site (if available).
+     * @return Promise resolved with the database.
      */
     getSiteDb(siteId: string): Promise<SQLiteDB> {
         return this.getSite(siteId).then((site) => {
@@ -1123,8 +1103,8 @@ export class CoreSitesProvider {
     /**
      * Returns the site home ID of a site.
      *
-     * @param  {number} [siteId] The site ID. If not defined, current site (if available).
-     * @return {Promise}         Promise resolved with site home ID.
+     * @param siteId The site ID. If not defined, current site (if available).
+     * @return Promise resolved with site home ID.
      */
     getSiteHomeId(siteId?: string): Promise<number> {
         return this.getSite(siteId).then((site) => {
@@ -1135,8 +1115,8 @@ export class CoreSitesProvider {
     /**
      * Get the list of sites stored.
      *
-     * @param {String[]} [ids] IDs of the sites to get. If not defined, return all sites.
-     * @return {Promise<CoreSiteBasicInfo[]>} Promise resolved when the sites are retrieved.
+     * @param ids IDs of the sites to get. If not defined, return all sites.
+     * @return Promise resolved when the sites are retrieved.
      */
     getSites(ids?: string[]): Promise<CoreSiteBasicInfo[]> {
         return this.appDB.getAllRecords(this.SITES_TABLE).then((sites) => {
@@ -1163,8 +1143,8 @@ export class CoreSitesProvider {
     /**
      * Get the list of sites stored, sorted by URL and full name.
      *
-     * @param {String[]} [ids] IDs of the sites to get. If not defined, return all sites.
-     * @return {Promise<CoreSiteBasicInfo[]>} Promise resolved when the sites are retrieved.
+     * @param ids IDs of the sites to get. If not defined, return all sites.
+     * @return Promise resolved when the sites are retrieved.
      */
     getSortedSites(ids?: string[]): Promise<CoreSiteBasicInfo[]> {
         return this.getSites(ids).then((sites) => {
@@ -1193,7 +1173,7 @@ export class CoreSitesProvider {
     /**
      * Get the list of IDs of sites stored and not logged out.
      *
-     * @return {Promise<string[]>} Promise resolved when the sites IDs are retrieved.
+     * @return Promise resolved when the sites IDs are retrieved.
      */
     getLoggedInSitesIds(): Promise<string[]> {
         return this.appDB.getRecords(this.SITES_TABLE, {loggedOut : 0}).then((sites) => {
@@ -1206,7 +1186,7 @@ export class CoreSitesProvider {
     /**
      * Get the list of IDs of sites stored.
      *
-     * @return {Promise<string[]>} Promise resolved when the sites IDs are retrieved.
+     * @return Promise resolved when the sites IDs are retrieved.
      */
     getSitesIds(): Promise<string[]> {
         return this.appDB.getAllRecords(this.SITES_TABLE).then((sites) => {
@@ -1219,8 +1199,8 @@ export class CoreSitesProvider {
     /**
      * Login the user in a site.
      *
-     * @param {string} siteid ID of the site the user is accessing.
-     * @return {Promise<void>} Promise resolved when current site is stored.
+     * @param siteid ID of the site the user is accessing.
+     * @return Promise resolved when current site is stored.
      */
     login(siteId: string): Promise<void> {
         const entry = {
@@ -1236,7 +1216,7 @@ export class CoreSitesProvider {
     /**
      * Logout the user.
      *
-     * @return {Promise<any>} Promise resolved when the user is logged out.
+     * @return Promise resolved when the user is logged out.
      */
     logout(): Promise<any> {
         let siteId;
@@ -1263,7 +1243,7 @@ export class CoreSitesProvider {
     /**
      * Restores the session to the previous one so the user doesn't has to login everytime the app is started.
      *
-     * @return {Promise<any>} Promise resolved if a session is restored.
+     * @return Promise resolved if a session is restored.
      */
     restoreSession(): Promise<any> {
         if (this.sessionRestored) {
@@ -1285,9 +1265,9 @@ export class CoreSitesProvider {
     /**
      * Mark or unmark a site as logged out so the user needs to authenticate again.
      *
-     * @param {string} siteId ID of the site.
-     * @param {boolean} loggedOut True to set the site as logged out, false otherwise.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param siteId ID of the site.
+     * @param loggedOut True to set the site as logged out, false otherwise.
+     * @return Promise resolved when done.
      */
     setSiteLoggedOut(siteId: string, loggedOut: boolean): Promise<any> {
         return this.getSite(siteId).then((site) => {
@@ -1312,11 +1292,11 @@ export class CoreSitesProvider {
     /**
      * Updates a site's token.
      *
-     * @param {string} siteUrl Site's URL.
-     * @param {string} username Username.
-     * @param {string} token User's new token.
-     * @param {string} [privateToken=''] User's private token.
-     * @return {Promise<any>} A promise resolved when the site is updated.
+     * @param siteUrl Site's URL.
+     * @param username Username.
+     * @param token User's new token.
+     * @param privateToken User's private token.
+     * @return A promise resolved when the site is updated.
      */
     updateSiteToken(siteUrl: string, username: string, token: string, privateToken: string = ''): Promise<any> {
         const siteId = this.createSiteID(siteUrl, username);
@@ -1329,10 +1309,10 @@ export class CoreSitesProvider {
     /**
      * Updates a site's token using siteId.
      *
-     * @param {string} siteId Site Id.
-     * @param {string} token User's new token.
-     * @param {string} [privateToken=''] User's private token.
-     * @return {Promise<any>} A promise resolved when the site is updated.
+     * @param siteId Site Id.
+     * @param token User's new token.
+     * @param privateToken User's private token.
+     * @return A promise resolved when the site is updated.
      */
     updateSiteTokenBySiteId(siteId: string, token: string, privateToken: string = ''): Promise<any> {
         return this.getSite(siteId).then((site) => {
@@ -1353,8 +1333,8 @@ export class CoreSitesProvider {
     /**
      * Updates a site's info.
      *
-     * @param {string} siteid Site's ID.
-     * @return {Promise<any>} A promise resolved when the site is updated.
+     * @param siteid Site's ID.
+     * @return A promise resolved when the site is updated.
      */
     updateSiteInfo(siteId: string): Promise<any> {
         return this.getSite(siteId).then((site) => {
@@ -1394,9 +1374,9 @@ export class CoreSitesProvider {
     /**
      * Updates a site's info.
      *
-     * @param {string} siteUrl  Site's URL.
-     * @param {string} username Username.
-     * @return {Promise<any>} A promise to be resolved when the site is updated.
+     * @param siteUrl Site's URL.
+     * @param username Username.
+     * @return A promise to be resolved when the site is updated.
      */
     updateSiteInfoByUrl(siteUrl: string, username: string): Promise<any> {
         const siteId = this.createSiteID(siteUrl, username);
@@ -1408,11 +1388,11 @@ export class CoreSitesProvider {
      * Get the site IDs a URL belongs to.
      * Someone can have more than one account in the same site, that's why this function returns an array of IDs.
      *
-     * @param {string} url URL to check.
-     * @param {boolean} [prioritize] True if it should prioritize current site. If the URL belongs to current site then it won't
-     *                               check any other site, it will only return current site.
-     * @param {string} [username] If set, it will return only the sites where the current user has this username.
-     * @return {Promise<string[]>} Promise resolved with the site IDs (array).
+     * @param url URL to check.
+     * @param prioritize True if it should prioritize current site. If the URL belongs to current site then it won't
+     *                   check any other site, it will only return current site.
+     * @param username If set, it will return only the sites where the current user has this username.
+     * @return Promise resolved with the site IDs (array).
      */
     getSiteIdsFromUrl(url: string, prioritize?: boolean, username?: string): Promise<string[]> {
         // If prioritize is true, check current site first.
@@ -1466,7 +1446,7 @@ export class CoreSitesProvider {
     /**
      * Get the site ID stored in DB as current site.
      *
-     * @return {Promise<string>} Promise resolved with the site ID.
+     * @return Promise resolved with the site ID.
      */
     getStoredCurrentSiteId(): Promise<string> {
         return this.appDB.getRecord(this.CURRENT_SITE_TABLE, { id: 1 }).then((currentSite) => {
@@ -1477,8 +1457,8 @@ export class CoreSitesProvider {
     /**
      * Get the public config of a certain site.
      *
-     * @param {string} siteUrl URL of the site.
-     * @return {Promise<any>} Promise resolved with the public config.
+     * @param siteUrl URL of the site.
+     * @return Promise resolved with the public config.
      */
     getSitePublicConfig(siteUrl: string): Promise<any> {
         const temporarySite = this.sitesFactory.makeSite(undefined, siteUrl);
@@ -1489,8 +1469,8 @@ export class CoreSitesProvider {
     /**
      * Get site config.
      *
-     * @param {any} site The site to get the config.
-     * @return {Promise<any>} Promise resolved with config if available.
+     * @param site The site to get the config.
+     * @return Promise resolved with config if available.
      */
     protected getSiteConfig(site: CoreSite): Promise<any> {
         if (!site.wsAvailable('tool_mobile_get_config')) {
@@ -1504,9 +1484,9 @@ export class CoreSitesProvider {
     /**
      * Check if a certain feature is disabled in a site.
      *
-     * @param {string} name Name of the feature to check.
-     * @param {string} [siteId] The site ID. If not defined, current site (if available).
-     * @return {Promise<boolean>} Promise resolved with true if disabled.
+     * @param name Name of the feature to check.
+     * @param siteId The site ID. If not defined, current site (if available).
+     * @return Promise resolved with true if disabled.
      */
     isFeatureDisabled(name: string, siteId?: string): Promise<boolean> {
         return this.getSite(siteId).then((site) => {
@@ -1517,7 +1497,7 @@ export class CoreSitesProvider {
     /**
      * Create a table in all the sites databases.
      *
-     * @param {SQLiteDBTamableSchema} table Table schema.
+     * @param table Table schema.
      */
     createTableFromSchema(table: SQLiteDBTableSchema): void {
         this.createTablesFromSchema([table]);
@@ -1526,7 +1506,7 @@ export class CoreSitesProvider {
     /**
      * Create several tables in all the sites databases.
      *
-     * @param {SQLiteDBTamableSchema[]} tables List of tables schema.
+     * @param tables List of tables schema.
      */
     createTablesFromSchema(tables: SQLiteDBTableSchema[]): void {
         // Add the tables to the list of schemas. This list is to create all the tables in new sites.
@@ -1541,9 +1521,9 @@ export class CoreSitesProvider {
     /**
      * Check if a WS is available in the current site, if any.
      *
-     * @param {string} method WS name.
-     * @param {boolean} [checkPrefix=true] When true also checks with the compatibility prefix.
-     * @return {boolean} Whether the WS is available.
+     * @param method WS name.
+     * @param checkPrefix When true also checks with the compatibility prefix.
+     * @return Whether the WS is available.
      */
     wsAvailableInCurrentSite(method: string, checkPrefix: boolean = true): boolean {
         const site = this.getCurrentSite();
@@ -1554,8 +1534,8 @@ export class CoreSitesProvider {
     /**
      * Check if a site is a legacy site by its info.
      *
-     * @param {any} info The site info.
-     * @return {boolean} Whether it's a legacy Moodle.
+     * @param info The site info.
+     * @return Whether it's a legacy Moodle.
      */
     isLegacyMoodleByInfo(info: any): boolean {
         return this.isValidMoodleVersion(info) == this.LEGACY_APP_VERSION;
@@ -1571,8 +1551,8 @@ export class CoreSitesProvider {
     /**
      * Install and upgrade all the registered schemas and tables.
      *
-     * @param {CoreSite} site Site.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param site Site.
+     * @return Promise resolved when done.
      */
     migrateSiteSchemas(site: CoreSite): Promise<any> {
         const db = site.getDb();
@@ -1630,10 +1610,10 @@ export class CoreSitesProvider {
     /**
      * Check if a URL is the root URL of any of the stored sites.
      *
-     * @param {string} url URL to check.
-     * @param {string} [username] Username to check.
-     * @return {Promise<{site: CoreSite, siteIds: string[]}>} Promise resolved with site to use and the list of sites that have
-     *                                   the URL. Site will be undefined if it isn't the root URL of any stored site.
+     * @param url URL to check.
+     * @param username Username to check.
+     * @return Promise resolved with site to use and the list of sites that have
+     *         the URL. Site will be undefined if it isn't the root URL of any stored site.
      */
     isStoredRootURL(url: string, username?: string): Promise<{site: CoreSite, siteIds: string[]}> {
         // Check if the site is stored.
@@ -1664,7 +1644,7 @@ export class CoreSitesProvider {
     /**
      * Returns the Site Schema names that can be cleared on space storage.
      *
-     * @return {string[]} Name of the site schemas.
+     * @return Name of the site schemas.
      */
     getSiteTableSchemasToClear(): string[] {
         let reset = [];
diff --git a/src/providers/sync.ts b/src/providers/sync.ts
index a248c2ad1..ec8f91653 100644
--- a/src/providers/sync.ts
+++ b/src/providers/sync.ts
@@ -70,10 +70,10 @@ export class CoreSyncProvider {
     /**
      * Block a component and ID so it cannot be synchronized.
      *
-     * @param {string} component Component name.
-     * @param {string | number} id Unique ID per component.
-     * @param {string} [operation] Operation name. If not defined, a default text is used.
-     * @param {string} [siteId] Site ID. If not defined, current site.
+     * @param component Component name.
+     * @param id Unique ID per component.
+     * @param operation Operation name. If not defined, a default text is used.
+     * @param siteId Site ID. If not defined, current site.
      */
     blockOperation(component: string, id: string | number, operation?: string, siteId?: string): void {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -96,7 +96,7 @@ export class CoreSyncProvider {
     /**
      * Clear all blocks for a site or all sites.
      *
-     * @param {string} [siteId] If set, clear the blocked objects only for this site. Otherwise clear them for all sites.
+     * @param siteId If set, clear the blocked objects only for this site. Otherwise clear them for all sites.
      */
     clearAllBlocks(siteId?: string): void {
         if (siteId) {
@@ -109,9 +109,9 @@ export class CoreSyncProvider {
     /**
      * Clear all blocks for a certain component.
      *
-     * @param {string} component Component name.
-     * @param {string | number} id Unique ID per component.
-     * @param {string} [siteId] Site ID. If not defined, current site.
+     * @param component Component name.
+     * @param id Unique ID per component.
+     * @param siteId Site ID. If not defined, current site.
      */
     clearBlocks(component: string, id: string | number, siteId?: string): void {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -124,10 +124,10 @@ export class CoreSyncProvider {
 
     /**
      * Returns a sync record.
-     * @param  {string}           component Component name.
-     * @param  {string | number}  id        Unique ID per component.
-     * @param  {string}           [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<any>}     Record if found or reject.
+     * @param component Component name.
+     * @param id Unique ID per component.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Record if found or reject.
      */
     getSyncRecord(component: string, id: string | number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
@@ -137,11 +137,11 @@ export class CoreSyncProvider {
 
     /**
      * Inserts or Updates info of a sync record.
-     * @param  {string}           component Component name.
-     * @param  {string | number}  id        Unique ID per component.
-     * @param  {any}              data      Data that updates the record.
-     * @param  {string}           [siteId]  Site ID. If not defined, current site.
-     * @return {Promise<any>}     Promise resolved with done.
+     * @param component Component name.
+     * @param id Unique ID per component.
+     * @param data Data that updates the record.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with done.
      */
     insertOrUpdateSyncRecord(component: string, id: string | number, data: any, siteId?: string): Promise<any> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
@@ -155,9 +155,9 @@ export class CoreSyncProvider {
     /**
      * Convenience function to create unique identifiers for a component and id.
      *
-     * @param {string} component Component name.
-     * @param {string | number} id Unique ID per component.
-     * @return {string} Unique sync id.
+     * @param component Component name.
+     * @param id Unique ID per component.
+     * @return Unique sync id.
      */
     protected getUniqueSyncBlockId(component: string, id: string | number): string {
         return component + '#' + id;
@@ -167,10 +167,10 @@ export class CoreSyncProvider {
      * Check if a component is blocked.
      * One block can have different operations. Here we check how many operations are being blocking the object.
      *
-     * @param {string} component Component name.
-     * @param {string | number} id Unique ID per component.
-     * @param {string} [siteId] Site ID. If not defined, current site.
-     * @return {boolean} Whether it's blocked.
+     * @param component Component name.
+     * @param id Unique ID per component.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Whether it's blocked.
      */
     isBlocked(component: string, id: string | number, siteId?: string): boolean {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -190,10 +190,10 @@ export class CoreSyncProvider {
     /**
      * Unblock an operation on a component and ID.
      *
-     * @param {string} component Component name.
-     * @param {string | number} id Unique ID per component.
-     * @param {string} [operation] Operation name. If not defined, a default text is used.
-     * @param {string} [siteId] Site ID. If not defined, current site.
+     * @param component Component name.
+     * @param id Unique ID per component.
+     * @param operation Operation name. If not defined, a default text is used.
+     * @param siteId Site ID. If not defined, current site.
      */
     unblockOperation(component: string, id: string | number, operation?: string, siteId?: string): void {
         operation = operation || '-';
diff --git a/src/providers/update-manager.ts b/src/providers/update-manager.ts
index 37ed1c0e8..d8a27d5bf 100644
--- a/src/providers/update-manager.ts
+++ b/src/providers/update-manager.ts
@@ -32,19 +32,16 @@ import { SQLiteDB } from '@classes/sqlitedb';
 export interface CoreUpdateManagerMigrateTable {
     /**
      * Current name of the store/table.
-     * @type {string}
      */
     name: string;
 
     /**
      * New name of the table. If not defined, "name" will be used.
-     * @type {string}
      */
     newName?: string;
 
     /**
      * An object to rename and convert some fields of the table/store.
-     * @type {object}
      */
     fields?: {
         name: string, // Field name in the old app.
@@ -77,8 +74,6 @@ export class CoreUpdateManagerProvider implements CoreInitHandler {
 
     /**
      * Tables to migrate from app DB ('MoodleMobile'). Include all the core ones to decrease the dependencies.
-     *
-     * @type {CoreUpdateManagerMigrateTable[]}
      */
     protected appDBTables: CoreUpdateManagerMigrateTable[] = [
         {
@@ -177,8 +172,6 @@ export class CoreUpdateManagerProvider implements CoreInitHandler {
 
     /**
      * Tables to migrate from each site DB. Include all the core ones to decrease the dependencies.
-     *
-     * @type {CoreUpdateManagerMigrateTable[]}
      */
     protected siteDBTables: CoreUpdateManagerMigrateTable[] = [
         {
@@ -331,7 +324,7 @@ export class CoreUpdateManagerProvider implements CoreInitHandler {
      * Check if the app has been updated and performs the needed processes.
      * This function shouldn't be used outside of core.
      *
-     * @return {Promise<any>} Promise resolved when the update process finishes.
+     * @return Promise resolved when the update process finishes.
      */
     load(): Promise<any> {
         const promises = [],
@@ -379,7 +372,7 @@ export class CoreUpdateManagerProvider implements CoreInitHandler {
     /**
      * Register several app tables to be migrated to the new schema.
      *
-     * @param {CoreUpdateManagerMigrateTable[]} tables The tables to migrate.
+     * @param tables The tables to migrate.
      */
     registerAppTablesMigration(tables: CoreUpdateManagerMigrateTable[]): void {
         tables.forEach((table) => {
@@ -390,7 +383,7 @@ export class CoreUpdateManagerProvider implements CoreInitHandler {
     /**
      * Register an app table to be migrated to the new schema.
      *
-     * @param {CoreUpdateManagerMigrateTable} table The table to migrate.
+     * @param table The table to migrate.
      */
     registerAppTableMigration(table: CoreUpdateManagerMigrateTable): void {
         this.appDBTables.push(table);
@@ -399,7 +392,7 @@ export class CoreUpdateManagerProvider implements CoreInitHandler {
     /**
      * Register several site tables to be migrated to the new schema.
      *
-     * @param {CoreUpdateManagerMigrateTable[]} tables The tables to migrate.
+     * @param tables The tables to migrate.
      */
     registerSiteTablesMigration(tables: CoreUpdateManagerMigrateTable[]): void {
         tables.forEach((table) => {
@@ -410,7 +403,7 @@ export class CoreUpdateManagerProvider implements CoreInitHandler {
     /**
      * Register a site table to be migrated to the new schema.
      *
-     * @param {CoreUpdateManagerMigrateTable} table The table to migrate.
+     * @param table The table to migrate.
      */
     registerSiteTableMigration(table: CoreUpdateManagerMigrateTable): void {
         this.siteDBTables.push(table);
@@ -419,8 +412,8 @@ export class CoreUpdateManagerProvider implements CoreInitHandler {
     /**
      * Register a migration of component name for local notifications.
      *
-     * @param {string} oldName The old name.
-     * @param {string} newName The new name.
+     * @param oldName The old name.
+     * @param newName The new name.
      */
     registerLocalNotifComponentMigration(oldName: string, newName: string): void {
         this.localNotificationsComponentsMigrate[oldName] = newName;
@@ -429,7 +422,7 @@ export class CoreUpdateManagerProvider implements CoreInitHandler {
     /**
      * Migrate all DBs and tables from the old format to SQLite.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected migrateAllDBs(): Promise<any> {
         if (!(<any> window).ydn) {
@@ -455,7 +448,7 @@ export class CoreUpdateManagerProvider implements CoreInitHandler {
     /**
      * Migrate the app DB.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected migrateAppDB(): Promise<any> {
         const oldDb = new (<any> window).ydn.db.Storage('MoodleMobile'),
@@ -467,8 +460,8 @@ export class CoreUpdateManagerProvider implements CoreInitHandler {
     /**
      * Migrate the DB of a certain site.
      *
-     * @param {string} siteId The site ID.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param siteId The site ID.
+     * @return Promise resolved when done.
      */
     protected migrateSiteDB(siteId: string): Promise<any> {
         // Get the site DB.
@@ -482,10 +475,10 @@ export class CoreUpdateManagerProvider implements CoreInitHandler {
     /**
      * Migrate all the tables of a certain DB to the SQLite DB.
      *
-     * @param {any} oldDb The old DB (created using ydn-db).
-     * @param {SQLiteDB} newDb The new DB.
-     * @param {CoreUpdateManagerMigrateTable[]} tables The tables to migrate.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param oldDb The old DB (created using ydn-db).
+     * @param newDb The new DB.
+     * @param tables The tables to migrate.
+     * @return Promise resolved when done.
      */
     protected migrateDB(oldDb: any, newDb: SQLiteDB, tables: CoreUpdateManagerMigrateTable[]): Promise<any> {
         if (!oldDb || !newDb) {
@@ -557,7 +550,7 @@ export class CoreUpdateManagerProvider implements CoreInitHandler {
     /**
      * Migrates files filling extensions.
      *
-     * @return {Promise<any>} Promise resolved when the site migration is finished.
+     * @return Promise resolved when the site migration is finished.
      */
     protected migrateFileExtensions(): Promise<any> {
         return this.sitesProvider.getSitesIds().then((sites) => {
@@ -574,7 +567,7 @@ export class CoreUpdateManagerProvider implements CoreInitHandler {
     /**
      * Migrate local notifications components from the old nomenclature to the new one.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected migrateLocalNotificationsComponents(): Promise<any> {
         if (!this.notifProvider.isAvailable()) {
@@ -599,7 +592,7 @@ export class CoreUpdateManagerProvider implements CoreInitHandler {
      * Calendar default notification time is configurable from version 3.2.1, and a new option "Default" is added.
      * All events that were configured to use the fixed default time should now be configured to use "Default" option.
      *
-     * @return {Promise<any>} Promise resolved when the events are configured.
+     * @return Promise resolved when the events are configured.
      */
     protected setCalendarDefaultNotifTime(): Promise<any> {
         if (!this.notifProvider.isAvailable()) {
@@ -643,7 +636,7 @@ export class CoreUpdateManagerProvider implements CoreInitHandler {
      * In version 3.2.1 we want the site config to be stored in each site if available.
      * Since it can be slow, we'll only block retrieving the config of current site, the rest will be in background.
      *
-     * @return {Promise<any>} Promise resolved when the config is loaded for the current site (if any).
+     * @return Promise resolved when the config is loaded for the current site (if any).
      */
     protected setSitesConfig(): Promise<any> {
         return this.sitesProvider.getSitesIds().then((siteIds) => {
@@ -675,8 +668,8 @@ export class CoreUpdateManagerProvider implements CoreInitHandler {
     /**
      * Store the config of a site.
      *
-     * @param {String} siteId Site ID.
-     * @return {Promise<any>} Promise resolved when the config is loaded for the site.
+     * @param siteId Site ID.
+     * @return Promise resolved when the config is loaded for the site.
      */
     protected setSiteConfig(siteId: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -698,7 +691,7 @@ export class CoreUpdateManagerProvider implements CoreInitHandler {
     /**
      * Logout from legacy sites.
      *
-     * @return {Promise<any>} Promise resolved when done.
+     * @return Promise resolved when done.
      */
     protected logoutLegacySites(): Promise<any> {
         return this.sitesProvider.getSitesIds().then((siteIds) => {
diff --git a/src/providers/urlschemes.ts b/src/providers/urlschemes.ts
index 83b189c3a..74e0da4ee 100644
--- a/src/providers/urlschemes.ts
+++ b/src/providers/urlschemes.ts
@@ -35,43 +35,36 @@ import { CoreConstants } from '@core/constants';
 export interface CoreCustomURLSchemesParams {
     /**
      * The site's URL.
-     * @type {string}
      */
     siteUrl: string;
 
     /**
      * User's token. If set, user will be authenticated.
-     * @type {string}
      */
     token?: string;
 
     /**
      * User's private token.
-     * @type {string}
      */
     privateToken?: string;
 
     /**
      * Username.
-     * @type {string}
      */
     username?: string;
 
     /**
      * URL to open once authenticated.
-     * @type {string}
      */
     redirect?: any;
 
     /**
      * Name of the page to go once authenticated.
-     * @type {string}
      */
     pageName?: string;
 
     /**
      * Params to pass to the page.
-     * @type {string}
      */
     pageParams?: any;
 }
@@ -96,8 +89,8 @@ export class CoreCustomURLSchemesProvider {
     /**
      * Handle an URL received by custom URL scheme.
      *
-     * @param {string} url URL to treat.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param url URL to treat.
+     * @return Promise resolved when done.
      */
     handleCustomURL(url: string): Promise<any> {
         if (!this.isCustomURL(url)) {
@@ -307,8 +300,8 @@ export class CoreCustomURLSchemesProvider {
      * Get the data from a custom URL scheme. The structure of the URL is:
      * moodlemobile://username@domain.com?token=TOKEN&privatetoken=PRIVATETOKEN&redirect=http://domain.com/course/view.php?id=2
      *
-     * @param {string} url URL to treat.
-     * @return {Promise<CoreCustomURLSchemesParams>} Promise resolved with the data.
+     * @param url URL to treat.
+     * @return Promise resolved with the data.
      */
     protected getCustomURLData(url: string): Promise<CoreCustomURLSchemesParams> {
         const urlScheme = CoreConfigConstants.customurlscheme + '://';
@@ -369,8 +362,8 @@ export class CoreCustomURLSchemesProvider {
     /**
      * Get the data from a "link" custom URL scheme. This kind of URL is deprecated.
      *
-     * @param {string} url URL to treat.
-     * @return {Promise<CoreCustomURLSchemesParams>} Promise resolved with the data.
+     * @param url URL to treat.
+     * @return Promise resolved with the data.
      */
     protected getCustomURLLinkData(url: string): Promise<CoreCustomURLSchemesParams> {
         const contentLinksScheme = CoreConfigConstants.customurlscheme + '://link=';
@@ -433,8 +426,8 @@ export class CoreCustomURLSchemesProvider {
     /**
      * Get the data from a "token" custom URL scheme. This kind of URL is deprecated.
      *
-     * @param {string} url URL to treat.
-     * @return {Promise<CoreCustomURLSchemesParams>} Promise resolved with the data.
+     * @param url URL to treat.
+     * @return Promise resolved with the data.
      */
     protected getCustomURLTokenData(url: string): Promise<CoreCustomURLSchemesParams> {
         const ssoScheme = CoreConfigConstants.customurlscheme + '://token=';
@@ -479,8 +472,8 @@ export class CoreCustomURLSchemesProvider {
     /**
      * Check whether a URL is a custom URL scheme.
      *
-     * @param {string} url URL to check.
-     * @return {boolean} Whether it's a custom URL scheme.
+     * @param url URL to check.
+     * @return Whether it's a custom URL scheme.
      */
     isCustomURL(url: string): boolean {
         if (!url) {
@@ -493,8 +486,8 @@ export class CoreCustomURLSchemesProvider {
     /**
      * Check whether a URL is a custom URL scheme with the "link" param (deprecated).
      *
-     * @param {string} url URL to check.
-     * @return {boolean} Whether it's a custom URL scheme.
+     * @param url URL to check.
+     * @return Whether it's a custom URL scheme.
      */
     isCustomURLLink(url: string): boolean {
         if (!url) {
@@ -507,8 +500,8 @@ export class CoreCustomURLSchemesProvider {
     /**
      * Check whether a URL is a custom URL scheme with a "token" param (deprecated).
      *
-     * @param {string} url URL to check.
-     * @return {boolean} Whether it's a custom URL scheme.
+     * @param url URL to check.
+     * @return Whether it's a custom URL scheme.
      */
     isCustomURLToken(url: string): boolean {
         if (!url) {
diff --git a/src/providers/utils/dom.ts b/src/providers/utils/dom.ts
index 8776024e7..fb91e5532 100644
--- a/src/providers/utils/dom.ts
+++ b/src/providers/utils/dom.ts
@@ -36,13 +36,11 @@ import { Subject } from 'rxjs';
 export interface CoreAlert extends Alert {
     /**
      * Observable that will notify when the alert is dismissed.
-     * @type {Subject<{data: any, role: string}>}
      */
     didDismiss: Subject<{data: any, role: string}>;
 
     /**
      * Observable that will notify when the alert will be dismissed.
-     * @type {Subject<{data: any, role: string}>}
      */
     willDismiss: Subject<{data: any, role: string}>;
 }
@@ -86,9 +84,9 @@ export class CoreDomUtilsProvider {
      * traverse the parents to achieve the same functionality.
      * Returns the closest ancestor of the current element (or the current element itself) which matches the selector.
      *
-     * @param {HTMLElement} element DOM Element.
-     * @param {string} selector Selector to search.
-     * @return {Element} Closest ancestor.
+     * @param element DOM Element.
+     * @param selector Selector to search.
+     * @return Closest ancestor.
      */
     closest(element: HTMLElement, selector: string): Element {
         // Try to use closest if the browser supports it.
@@ -125,13 +123,13 @@ export class CoreDomUtilsProvider {
     /**
      * If the download size is higher than a certain threshold shows a confirm dialog.
      *
-     * @param {any} size Object containing size to download and a boolean to indicate if its totally or partialy calculated.
-     * @param {string} [message] Code of the message to show. Default: 'core.course.confirmdownload'.
-     * @param {string} [unknownMessage] ID of the message to show if size is unknown.
-     * @param {number} [wifiThreshold] Threshold to show confirm in WiFi connection. Default: CoreWifiDownloadThreshold.
-     * @param {number} [limitedThreshold] Threshold to show confirm in limited connection. Default: CoreDownloadThreshold.
-     * @param {boolean} [alwaysConfirm] True to show a confirm even if the size isn't high, false otherwise.
-     * @return {Promise<void>} Promise resolved when the user confirms or if no confirm needed.
+     * @param size Object containing size to download and a boolean to indicate if its totally or partialy calculated.
+     * @param message Code of the message to show. Default: 'core.course.confirmdownload'.
+     * @param unknownMessage ID of the message to show if size is unknown.
+     * @param wifiThreshold Threshold to show confirm in WiFi connection. Default: CoreWifiDownloadThreshold.
+     * @param limitedThreshold Threshold to show confirm in limited connection. Default: CoreDownloadThreshold.
+     * @param alwaysConfirm True to show a confirm even if the size isn't high, false otherwise.
+     * @return Promise resolved when the user confirms or if no confirm needed.
      */
     confirmDownloadSize(size: any, message?: string, unknownMessage?: string, wifiThreshold?: number, limitedThreshold?: number,
             alwaysConfirm?: boolean): Promise<void> {
@@ -207,8 +205,8 @@ export class CoreDomUtilsProvider {
     /**
      * Convert some HTML as text into an HTMLElement. This HTML is put inside a div or a body.
      *
-     * @param {string} html Text to convert.
-     * @return {HTMLElement} Element.
+     * @param html Text to convert.
+     * @return Element.
      */
     convertToElement(html: string): HTMLElement {
         // Add a div to hold the content, that's the element that will be returned.
@@ -220,7 +218,7 @@ export class CoreDomUtilsProvider {
     /**
      * Create a "cancelled" error. These errors won't display an error message in showErrorModal functions.
      *
-     * @return {any} The error object.
+     * @return The error object.
      */
     createCanceledError(): any {
         return {coreCanceled: true};
@@ -230,8 +228,8 @@ export class CoreDomUtilsProvider {
      * Given a list of changes for a component input detected by a KeyValueDiffers, create an object similar to the one
      * passed to the ngOnChanges functions.
      *
-     * @param {any} changes Changes detected by KeyValueDiffer.
-     * @return {{[name: string]: SimpleChange}} Changes in a format like ngOnChanges.
+     * @param changes Changes detected by KeyValueDiffer.
+     * @return Changes in a format like ngOnChanges.
      */
     createChangesFromKeyValueDiff(changes: any): { [name: string]: SimpleChange } {
         const newChanges: { [name: string]: SimpleChange } = {};
@@ -255,8 +253,8 @@ export class CoreDomUtilsProvider {
     /**
      * Extract the downloadable URLs from an HTML code.
      *
-     * @param {string} html HTML code.
-     * @return {string[]} List of file urls.
+     * @param html HTML code.
+     * @return List of file urls.
      */
     extractDownloadableFilesFromHtml(html: string): string[] {
         const urls = [];
@@ -288,8 +286,8 @@ export class CoreDomUtilsProvider {
     /**
      * Extract the downloadable URLs from an HTML code and returns them in fake file objects.
      *
-     * @param {string} html HTML code.
-     * @return {any[]} List of fake file objects with file URLs.
+     * @param html HTML code.
+     * @return List of fake file objects with file URLs.
      */
     extractDownloadableFilesFromHtmlAsFakeFileObjects(html: string): any[] {
         const urls = this.extractDownloadableFilesFromHtml(html);
@@ -305,8 +303,8 @@ export class CoreDomUtilsProvider {
     /**
      * Search all the URLs in a CSS file content.
      *
-     * @param {string} code CSS code.
-     * @return {string[]} List of URLs.
+     * @param code CSS code.
+     * @return List of URLs.
      */
     extractUrlsFromCSS(code: string): string[] {
         // First of all, search all the url(...) occurrences that don't include "data:".
@@ -331,8 +329,8 @@ export class CoreDomUtilsProvider {
     /**
      * Fix syntax errors in HTML.
      *
-     * @param {string} html HTML text.
-     * @return {string} Fixed HTML text.
+     * @param html HTML text.
+     * @return Fixed HTML text.
      */
     fixHtml(html: string): string {
         this.template.innerHTML = html;
@@ -358,7 +356,7 @@ export class CoreDomUtilsProvider {
     /**
      * Focus an element and open keyboard.
      *
-     * @param {HTMLElement} el HTML element to focus.
+     * @param el HTML element to focus.
      */
     focusElement(el: HTMLElement): void {
         if (el && el.focus) {
@@ -375,8 +373,8 @@ export class CoreDomUtilsProvider {
      * If the size is already valid (like '500px' or '50%') it won't be modified.
      * Returned size will have a format like '500px'.
      *
-     * @param {any} size Size to format.
-     * @return {string} Formatted size. If size is not valid, returns an empty string.
+     * @param size Size to format.
+     * @return Formatted size. If size is not valid, returns an empty string.
      */
     formatPixelsSize(size: any): string {
         if (typeof size == 'string' && (size.indexOf('px') > -1 || size.indexOf('%') > -1)) {
@@ -395,9 +393,9 @@ export class CoreDomUtilsProvider {
     /**
      * Returns the contents of a certain selection in a DOM element.
      *
-     * @param {HTMLElement} element DOM element to search in.
-     * @param {string} selector Selector to search.
-     * @return {string} Selection contents. Undefined if not found.
+     * @param element DOM element to search in.
+     * @param selector Selector to search.
+     * @return Selection contents. Undefined if not found.
      */
     getContentsOfElement(element: HTMLElement, selector: string): string {
         if (element) {
@@ -411,8 +409,8 @@ export class CoreDomUtilsProvider {
     /**
      * Get the data from a form. It will only collect elements that have a name.
      *
-     * @param {HTMLFormElement} form The form to get the data from.
-     * @return {any} Object with the data. The keys are the names of the inputs.
+     * @param form The form to get the data from.
+     * @return Object with the data. The keys are the names of the inputs.
      */
     getDataFromForm(form: HTMLFormElement): any {
         if (!form || !form.elements) {
@@ -448,9 +446,9 @@ export class CoreDomUtilsProvider {
     /**
      * Returns the attribute value of a string element. Only the first element will be selected.
      *
-     * @param  {string} html      HTML element in string.
-     * @param  {string} attribute Attribute to get.
-     * @return {string}           Attribute value.
+     * @param html HTML element in string.
+     * @param attribute Attribute to get.
+     * @return Attribute value.
      */
     getHTMLElementAttribute(html: string, attribute: string): string {
         return this.convertToElement(html).children[0].getAttribute('src');
@@ -459,12 +457,12 @@ export class CoreDomUtilsProvider {
     /**
      * Returns height of an element.
      *
-     * @param {any} element DOM element to measure.
-     * @param {boolean} [usePadding] Whether to use padding to calculate the measure.
-     * @param {boolean} [useMargin] Whether to use margin to calculate the measure.
-     * @param {boolean} [useBorder] Whether to use borders to calculate the measure.
-     * @param {boolean} [innerMeasure] If inner measure is needed: padding, margin or borders will be substracted.
-     * @return {number} Height in pixels.
+     * @param element DOM element to measure.
+     * @param usePadding Whether to use padding to calculate the measure.
+     * @param useMargin Whether to use margin to calculate the measure.
+     * @param useBorder Whether to use borders to calculate the measure.
+     * @param innerMeasure If inner measure is needed: padding, margin or borders will be substracted.
+     * @return Height in pixels.
      */
     getElementHeight(element: any, usePadding?: boolean, useMargin?: boolean, useBorder?: boolean,
             innerMeasure?: boolean): number {
@@ -474,13 +472,13 @@ export class CoreDomUtilsProvider {
     /**
      * Returns height or width of an element.
      *
-     * @param {any} element DOM element to measure.
-     * @param {boolean} [getWidth] Whether to get width or height.
-     * @param {boolean} [usePadding] Whether to use padding to calculate the measure.
-     * @param {boolean} [useMargin] Whether to use margin to calculate the measure.
-     * @param {boolean} [useBorder] Whether to use borders to calculate the measure.
-     * @param {boolean} [innerMeasure] If inner measure is needed: padding, margin or borders will be substracted.
-     * @return {number} Measure in pixels.
+     * @param element DOM element to measure.
+     * @param getWidth Whether to get width or height.
+     * @param usePadding Whether to use padding to calculate the measure.
+     * @param useMargin Whether to use margin to calculate the measure.
+     * @param useBorder Whether to use borders to calculate the measure.
+     * @param innerMeasure If inner measure is needed: padding, margin or borders will be substracted.
+     * @return Measure in pixels.
      */
     getElementMeasure(element: any, getWidth?: boolean, usePadding?: boolean, useMargin?: boolean, useBorder?: boolean,
             innerMeasure?: boolean): number {
@@ -531,9 +529,9 @@ export class CoreDomUtilsProvider {
     /**
      * Returns the computed style measure or 0 if not found or NaN.
      *
-     * @param  {any}    style   Style from getComputedStyle.
-     * @param  {string} measure Measure to get.
-     * @return {number}         Result of the measure.
+     * @param style Style from getComputedStyle.
+     * @param measure Measure to get.
+     * @return Result of the measure.
      */
     getComputedStyleMeasure(style: any, measure: string): number {
         return parseInt(style[measure], 10) || 0;
@@ -542,7 +540,7 @@ export class CoreDomUtilsProvider {
     /**
      * Get the HTML code to render a connection warning icon.
      *
-     * @return {string} HTML Code.
+     * @return HTML Code.
      */
     getConnectionWarningIconHtml(): string {
         return '<div text-center><span class="core-icon-with-badge">' +
@@ -554,12 +552,12 @@ export class CoreDomUtilsProvider {
     /**
      * Returns width of an element.
      *
-     * @param {any} element DOM element to measure.
-     * @param {boolean} [usePadding] Whether to use padding to calculate the measure.
-     * @param {boolean} [useMargin] Whether to use margin to calculate the measure.
-     * @param {boolean} [useBorder] Whether to use borders to calculate the measure.
-     * @param {boolean} [innerMeasure] If inner measure is needed: padding, margin or borders will be substracted.
-     * @return {number} Width in pixels.
+     * @param element DOM element to measure.
+     * @param usePadding Whether to use padding to calculate the measure.
+     * @param useMargin Whether to use margin to calculate the measure.
+     * @param useBorder Whether to use borders to calculate the measure.
+     * @param innerMeasure If inner measure is needed: padding, margin or borders will be substracted.
+     * @return Width in pixels.
      */
     getElementWidth(element: any, usePadding?: boolean, useMargin?: boolean, useBorder?: boolean,
             innerMeasure?: boolean): number {
@@ -569,10 +567,10 @@ export class CoreDomUtilsProvider {
     /**
      * Retrieve the position of a element relative to another element.
      *
-     * @param {HTMLElement} container Element to search in.
-     * @param {string} [selector] Selector to find the element to gets the position.
-     * @param {string} [positionParentClass] Parent Class where to stop calculating the position. Default scroll-content.
-     * @return {number[]} positionLeft, positionTop of the element relative to.
+     * @param container Element to search in.
+     * @param selector Selector to find the element to gets the position.
+     * @param positionParentClass Parent Class where to stop calculating the position. Default scroll-content.
+     * @return positionLeft, positionTop of the element relative to.
      */
     getElementXY(container: HTMLElement, selector?: string, positionParentClass?: string): number[] {
         let element: HTMLElement = <HTMLElement> (selector ? container.querySelector(selector) : container),
@@ -617,8 +615,8 @@ export class CoreDomUtilsProvider {
     /**
      * Given an error message, return a suitable error title.
      *
-     * @param {string} message The error message.
-     * @return {any} Title.
+     * @param message The error message.
+     * @return Title.
      */
     private getErrorTitle(message: string): any {
         if (message == this.translate.instant('core.networkerrormsg') ||
@@ -633,9 +631,9 @@ export class CoreDomUtilsProvider {
     /**
      * Get the error message from an error, including debug data if needed.
      *
-     * @param {any} error Message to show.
-     * @param {boolean} [needsTranslate] Whether the error needs to be translated.
-     * @return {string} Error message, null if no error should be displayed.
+     * @param error Message to show.
+     * @param needsTranslate Whether the error needs to be translated.
+     * @return Error message, null if no error should be displayed.
      */
     getErrorMessage(error: any, needsTranslate?: boolean): string {
         let extraInfo = '';
@@ -693,8 +691,8 @@ export class CoreDomUtilsProvider {
      * Please use this function only if you cannot retrieve the instance using parent/child methods: ViewChild (or similar)
      * or Angular's injection.
      *
-     * @param {Element} element The root element of the component/directive.
-     * @return {any} The instance, undefined if not found.
+     * @param element The root element of the component/directive.
+     * @return The instance, undefined if not found.
      */
     getInstanceByElement(element: Element): any {
         const id = element.getAttribute(this.INSTANCE_ID_ATTR_NAME);
@@ -705,8 +703,8 @@ export class CoreDomUtilsProvider {
     /**
      * Wait an element to exists using the findFunction.
      *
-     * @param {Function} findFunction The function used to find the element.
-     * @return {Promise<HTMLElement>} Resolved if found, rejected if too many tries.
+     * @param findFunction The function used to find the element.
+     * @return Resolved if found, rejected if too many tries.
      */
     waitElementToExist(findFunction: Function): Promise<HTMLElement> {
         const promiseInterval = {
@@ -744,7 +742,7 @@ export class CoreDomUtilsProvider {
     /**
      * Handle bootstrap tooltips in a certain element.
      *
-     * @param {HTMLElement} element Element to check.
+     * @param element Element to check.
      */
     handleBootstrapTooltips(element: HTMLElement): void {
         const els = Array.from(element.querySelectorAll('[data-toggle="tooltip"]'));
@@ -783,9 +781,9 @@ export class CoreDomUtilsProvider {
     /**
      * Check if an element is outside of screen (viewport).
      *
-     * @param {HTMLElement} scrollEl The element that must be scrolled.
-     * @param {HTMLElement} element DOM element to check.
-     * @return {boolean} Whether the element is outside of the viewport.
+     * @param scrollEl The element that must be scrolled.
+     * @param element DOM element to check.
+     * @return Whether the element is outside of the viewport.
      */
     isElementOutsideOfScreen(scrollEl: HTMLElement, element: HTMLElement): boolean {
         const elementRect = element.getBoundingClientRect();
@@ -808,7 +806,7 @@ export class CoreDomUtilsProvider {
     /**
      * Check if rich text editor is enabled.
      *
-     * @return {Promise<boolean>} Promise resolved with boolean: true if enabled, false otherwise.
+     * @return Promise resolved with boolean: true if enabled, false otherwise.
      */
     isRichTextEditorEnabled(): Promise<boolean> {
         if (this.isRichTextEditorSupported()) {
@@ -823,7 +821,7 @@ export class CoreDomUtilsProvider {
     /**
      * Check if rich text editor is supported in the platform.
      *
-     * @return {boolean} Whether it's supported.
+     * @return Whether it's supported.
      */
     isRichTextEditorSupported(): boolean {
         return true;
@@ -832,10 +830,10 @@ export class CoreDomUtilsProvider {
     /**
      * Move children from one HTMLElement to another.
      *
-     * @param {HTMLElement} oldParent The old parent.
-     * @param {HTMLElement} newParent The new parent.
-     * @param {boolean} [prepend] If true, adds the children to the beginning of the new parent.
-     * @return {Node[]} List of moved children.
+     * @param oldParent The old parent.
+     * @param newParent The new parent.
+     * @param prepend If true, adds the children to the beginning of the new parent.
+     * @return List of moved children.
      */
     moveChildren(oldParent: HTMLElement, newParent: HTMLElement, prepend?: boolean): Node[] {
         const movedChildren: Node[] = [];
@@ -854,8 +852,8 @@ export class CoreDomUtilsProvider {
     /**
      * Search and remove a certain element from inside another element.
      *
-     * @param {HTMLElement} element DOM element to search in.
-     * @param {string} selector Selector to search.
+     * @param element DOM element to search in.
+     * @param selector Selector to search.
      */
     removeElement(element: HTMLElement, selector: string): void {
         if (element) {
@@ -869,10 +867,10 @@ export class CoreDomUtilsProvider {
     /**
      * Search and remove a certain element from an HTML code.
      *
-     * @param {string} html HTML code to change.
-     * @param {string} selector Selector to search.
-     * @param {boolean} [removeAll] True if it should remove all matches found, false if it should only remove the first one.
-     * @return {string} HTML without the element.
+     * @param html HTML code to change.
+     * @param selector Selector to search.
+     * @param removeAll True if it should remove all matches found, false if it should only remove the first one.
+     * @return HTML without the element.
      */
     removeElementFromHtml(html: string, selector: string, removeAll?: boolean): string {
         let selected;
@@ -897,7 +895,7 @@ export class CoreDomUtilsProvider {
     /**
      * Remove a component/directive instance using the DOM Element.
      *
-     * @param {Element} element The root element of the component/directive.
+     * @param element The root element of the component/directive.
      */
     removeInstanceByElement(element: Element): void {
         const id = element.getAttribute(this.INSTANCE_ID_ATTR_NAME);
@@ -907,7 +905,7 @@ export class CoreDomUtilsProvider {
     /**
      * Remove a component/directive instance using the ID.
      *
-     * @param {string} id The ID to remove.
+     * @param id The ID to remove.
      */
     removeInstanceById(id: string): void {
         delete this.instances[id];
@@ -916,8 +914,8 @@ export class CoreDomUtilsProvider {
     /**
      * Search for certain classes in an element contents and replace them with the specified new values.
      *
-     * @param {HTMLElement} element DOM element.
-     * @param {any} map Mapping of the classes to replace. Keys must be the value to replace, values must be
+     * @param element DOM element.
+     * @param map Mapping of the classes to replace. Keys must be the value to replace, values must be
      *            the new class name. Example: {'correct': 'core-question-answer-correct'}.
      */
     replaceClassesInElement(element: HTMLElement, map: any): void {
@@ -934,10 +932,10 @@ export class CoreDomUtilsProvider {
     /**
      * Given an HTML, search all links and media and tries to restore original sources using the paths object.
      *
-     * @param {string} html HTML code.
-     * @param {object} paths Object linking URLs in the html code with the real URLs to use.
-     * @param {Function} [anchorFn] Function to call with each anchor. Optional.
-     * @return {string} Treated HTML code.
+     * @param html HTML code.
+     * @param paths Object linking URLs in the html code with the real URLs to use.
+     * @param anchorFn Function to call with each anchor. Optional.
+     * @return Treated HTML code.
      */
     restoreSourcesInHtml(html: string, paths: object, anchorFn?: Function): string {
         let media,
@@ -985,11 +983,11 @@ export class CoreDomUtilsProvider {
      * Scroll to somehere in the content.
      * Checks hidden property _scroll to avoid errors if view is not active.
      *
-     * @param {Content} content Content where to execute the function.
-     * @param {number} x  The x-value to scroll to.
-     * @param {number} y  The y-value to scroll to.
-     * @param {number} [duration]  Duration of the scroll animation in milliseconds. Defaults to `300`.
-     * @returns {Promise} Returns a promise which is resolved when the scroll has completed.
+     * @param content Content where to execute the function.
+     * @param x The x-value to scroll to.
+     * @param y The y-value to scroll to.
+     * @param duration Duration of the scroll animation in milliseconds. Defaults to `300`.
+     * @return Returns a promise which is resolved when the scroll has completed.
      */
     scrollTo(content: Content, x: number, y: number, duration?: number, done?: Function): Promise<any> {
         return content && content._scroll && content.scrollTo(x, y, duration, done);
@@ -999,9 +997,9 @@ export class CoreDomUtilsProvider {
      * Scroll to Bottom of the content.
      * Checks hidden property _scroll to avoid errors if view is not active.
      *
-     * @param {Content} content Content where to execute the function.
-     * @param {number} [duration]  Duration of the scroll animation in milliseconds. Defaults to `300`.
-     * @returns {Promise} Returns a promise which is resolved when the scroll has completed.
+     * @param content Content where to execute the function.
+     * @param duration Duration of the scroll animation in milliseconds. Defaults to `300`.
+     * @return Returns a promise which is resolved when the scroll has completed.
      */
     scrollToBottom(content: Content, duration?: number): Promise<any> {
         return content && content._scroll && content.scrollToBottom(duration);
@@ -1011,9 +1009,9 @@ export class CoreDomUtilsProvider {
      * Scroll to Top of the content.
      * Checks hidden property _scroll to avoid errors if view is not active.
      *
-     * @param {Content} content Content where to execute the function.
-     * @param {number} [duration]  Duration of the scroll animation in milliseconds. Defaults to `300`.
-     * @returns {Promise} Returns a promise which is resolved when the scroll has completed.
+     * @param content Content where to execute the function.
+     * @param duration Duration of the scroll animation in milliseconds. Defaults to `300`.
+     * @return Returns a promise which is resolved when the scroll has completed.
      */
     scrollToTop(content: Content, duration?: number): Promise<any> {
         return content && content._scroll && content.scrollToTop(duration);
@@ -1023,8 +1021,8 @@ export class CoreDomUtilsProvider {
      * Returns contentHeight of the content.
      * Checks hidden property _scroll to avoid errors if view is not active.
      *
-     * @param {Content} content Content where to execute the function.
-     * @return {number}         Content contentHeight or 0.
+     * @param content Content where to execute the function.
+     * @return Content contentHeight or 0.
      */
     getContentHeight(content: Content): number {
         return (content && content._scroll && content.contentHeight) || 0;
@@ -1034,8 +1032,8 @@ export class CoreDomUtilsProvider {
      * Returns scrollHeight of the content.
      * Checks hidden property _scroll to avoid errors if view is not active.
      *
-     * @param {Content} content Content where to execute the function.
-     * @return {number}         Content scrollHeight or 0.
+     * @param content Content where to execute the function.
+     * @return Content scrollHeight or 0.
      */
     getScrollHeight(content: Content): number {
         return (content && content._scroll && content.scrollHeight) || 0;
@@ -1045,8 +1043,8 @@ export class CoreDomUtilsProvider {
      * Returns scrollTop of the content.
      * Checks hidden property _scroll to avoid errors if view is not active.
      *
-     * @param {Content} content Content where to execute the function.
-     * @return {number}         Content scrollTop or 0.
+     * @param content Content where to execute the function.
+     * @return Content scrollTop or 0.
      */
     getScrollTop(content: Content): number {
         return (content && content._scroll && content.scrollTop) || 0;
@@ -1055,10 +1053,10 @@ export class CoreDomUtilsProvider {
     /**
      * Scroll to a certain element.
      *
-     * @param {Content} content The content that must be scrolled.
-     * @param {HTMLElement} element The element to scroll to.
-     * @param {string} [scrollParentClass] Parent class where to stop calculating the position. Default scroll-content.
-     * @return {boolean} True if the element is found, false otherwise.
+     * @param content The content that must be scrolled.
+     * @param element The element to scroll to.
+     * @param scrollParentClass Parent class where to stop calculating the position. Default scroll-content.
+     * @return True if the element is found, false otherwise.
      */
     scrollToElement(content: Content, element: HTMLElement, scrollParentClass?: string): boolean {
         const position = this.getElementXY(element, undefined, scrollParentClass);
@@ -1074,10 +1072,10 @@ export class CoreDomUtilsProvider {
     /**
      * Scroll to a certain element using a selector to find it.
      *
-     * @param {Content} content The content that must be scrolled.
-     * @param {string} selector Selector to find the element to scroll to.
-     * @param {string} [scrollParentClass] Parent class where to stop calculating the position. Default scroll-content.
-     * @return {boolean} True if the element is found, false otherwise.
+     * @param content The content that must be scrolled.
+     * @param selector Selector to find the element to scroll to.
+     * @param scrollParentClass Parent class where to stop calculating the position. Default scroll-content.
+     * @return True if the element is found, false otherwise.
      */
     scrollToElementBySelector(content: Content, selector: string, scrollParentClass?: string): boolean {
         const position = this.getElementXY(content.getScrollElement(), selector, scrollParentClass);
@@ -1093,9 +1091,9 @@ export class CoreDomUtilsProvider {
     /**
      * Search for an input with error (core-input-error directive) and scrolls to it if found.
      *
-     * @param {Content} content The content that must be scrolled.
+     * @param content The content that must be scrolled.
      * @param [scrollParentClass] Parent class where to stop calculating the position. Default scroll-content.
-     * @return {boolean} True if the element is found, false otherwise.
+     * @return True if the element is found, false otherwise.
      */
     scrollToInputError(content: Content, scrollParentClass?: string): boolean {
         if (!content) {
@@ -1108,7 +1106,7 @@ export class CoreDomUtilsProvider {
     /**
      * Set whether debug messages should be displayed.
      *
-     * @param {boolean} value Whether to display or not.
+     * @param value Whether to display or not.
      */
     setDebugDisplay(value: boolean): void {
         this.debugDisplay = value;
@@ -1117,11 +1115,11 @@ export class CoreDomUtilsProvider {
     /**
      * Show an alert modal with a button to close it.
      *
-     * @param {string} title Title to show.
-     * @param {string} message Message to show.
-     * @param {string} [buttonText] Text of the button.
-     * @param {number} [autocloseTime] Number of milliseconds to wait to close the modal. If not defined, modal won't be closed.
-     * @return {Promise<CoreAlert>} Promise resolved with the alert modal.
+     * @param title Title to show.
+     * @param message Message to show.
+     * @param buttonText Text of the button.
+     * @param autocloseTime Number of milliseconds to wait to close the modal. If not defined, modal won't be closed.
+     * @return Promise resolved with the alert modal.
      */
     showAlert(title: string, message: string, buttonText?: string, autocloseTime?: number): Promise<CoreAlert> {
         const hasHTMLTags = this.textUtils.hasHTMLTags(message);
@@ -1187,11 +1185,11 @@ export class CoreDomUtilsProvider {
     /**
      * Show an alert modal with a button to close it, translating the values supplied.
      *
-     * @param {string} title Title to show.
-     * @param {string} message Message to show.
-     * @param {string} [buttonText] Text of the button.
-     * @param {number} [autocloseTime] Number of milliseconds to wait to close the modal. If not defined, modal won't be closed.
-     * @return {Promise<Alert>} Promise resolved with the alert modal.
+     * @param title Title to show.
+     * @param message Message to show.
+     * @param buttonText Text of the button.
+     * @param autocloseTime Number of milliseconds to wait to close the modal. If not defined, modal won't be closed.
+     * @return Promise resolved with the alert modal.
      */
     showAlertTranslated(title: string, message: string, buttonText?: string, autocloseTime?: number): Promise<Alert> {
         title = title ? this.translate.instant(title) : title;
@@ -1204,12 +1202,12 @@ export class CoreDomUtilsProvider {
     /**
      * Show a confirm modal.
      *
-     * @param {string} message Message to show in the modal body.
-     * @param {string} [title] Title of the modal.
-     * @param {string} [okText] Text of the OK button.
-     * @param {string} [cancelText] Text of the Cancel button.
-     * @param {any} [options] More options. See https://ionicframework.com/docs/v3/api/components/alert/AlertController/
-     * @return {Promise<any>} Promise resolved if the user confirms and rejected with a canceled error if he cancels.
+     * @param message Message to show in the modal body.
+     * @param title Title of the modal.
+     * @param okText Text of the OK button.
+     * @param cancelText Text of the Cancel button.
+     * @param options More options. See https://ionicframework.com/docs/v3/api/components/alert/AlertController/
+     * @return Promise resolved if the user confirms and rejected with a canceled error if he cancels.
      */
     showConfirm(message: string, title?: string, okText?: string, cancelText?: string, options?: any): Promise<any> {
         return new Promise<void>((resolve, reject): void => {
@@ -1263,10 +1261,10 @@ export class CoreDomUtilsProvider {
     /**
      * Show an alert modal with an error message.
      *
-     * @param {any} error Message to show.
-     * @param {boolean} [needsTranslate] Whether the error needs to be translated.
-     * @param {number} [autocloseTime] Number of milliseconds to wait to close the modal. If not defined, modal won't be closed.
-     * @return {Promise<Alert>} Promise resolved with the alert modal.
+     * @param error Message to show.
+     * @param needsTranslate Whether the error needs to be translated.
+     * @param autocloseTime Number of milliseconds to wait to close the modal. If not defined, modal won't be closed.
+     * @return Promise resolved with the alert modal.
      */
     showErrorModal(error: any, needsTranslate?: boolean, autocloseTime?: number): Promise<Alert> {
         const message = this.getErrorMessage(error, needsTranslate);
@@ -1282,11 +1280,11 @@ export class CoreDomUtilsProvider {
     /**
      * Show an alert modal with an error message. It uses a default message if error is not a string.
      *
-     * @param {any} error Message to show.
-     * @param {any} [defaultError] Message to show if the error is not a string.
-     * @param {boolean} [needsTranslate] Whether the error needs to be translated.
-     * @param {number} [autocloseTime] Number of milliseconds to wait to close the modal. If not defined, modal won't be closed.
-     * @return {Promise<Alert>} Promise resolved with the alert modal.
+     * @param error Message to show.
+     * @param defaultError Message to show if the error is not a string.
+     * @param needsTranslate Whether the error needs to be translated.
+     * @param autocloseTime Number of milliseconds to wait to close the modal. If not defined, modal won't be closed.
+     * @return Promise resolved with the alert modal.
      */
     showErrorModalDefault(error: any, defaultError: any, needsTranslate?: boolean, autocloseTime?: number): Promise<Alert> {
         if (error && error.coreCanceled) {
@@ -1306,11 +1304,11 @@ export class CoreDomUtilsProvider {
     /**
      * Show an alert modal with the first warning error message. It uses a default message if error is not a string.
      *
-     * @param {any} warnings Warnings returned.
-     * @param {any} [defaultError] Message to show if the error is not a string.
-     * @param {boolean} [needsTranslate] Whether the error needs to be translated.
-     * @param {number} [autocloseTime] Number of milliseconds to wait to close the modal. If not defined, modal won't be closed.
-     * @return {Promise<Alert>} Promise resolved with the alert modal.
+     * @param warnings Warnings returned.
+     * @param defaultError Message to show if the error is not a string.
+     * @param needsTranslate Whether the error needs to be translated.
+     * @param autocloseTime Number of milliseconds to wait to close the modal. If not defined, modal won't be closed.
+     * @return Promise resolved with the alert modal.
      */
     showErrorModalFirstWarning(warnings: any, defaultError: any, needsTranslate?: boolean, autocloseTime?: number): Promise<Alert> {
         const error = warnings && warnings.length && warnings[0].message;
@@ -1321,9 +1319,9 @@ export class CoreDomUtilsProvider {
     /**
      * Displays a loading modal window.
      *
-     * @param {string} [text] The text of the modal window. Default: core.loading.
-     * @param {boolean} [needsTranslate] Whether the 'text' needs to be translated.
-     * @return {Loading} Loading modal instance.
+     * @param text The text of the modal window. Default: core.loading.
+     * @param needsTranslate Whether the 'text' needs to be translated.
+     * @return Loading modal instance.
      * @description
      * Usage:
      *     let modal = domUtils.showModalLoading(myText);
@@ -1371,11 +1369,11 @@ export class CoreDomUtilsProvider {
     /**
      * Show a prompt modal to input some data.
      *
-     * @param {string} message Modal message.
-     * @param {string} [title] Modal title.
-     * @param {string} [placeholder] Placeholder of the input element. By default, "Password".
-     * @param {string} [type] Type of the input element. By default, password.
-     * @return {Promise<any>} Promise resolved with the input data if the user clicks OK, rejected if cancels.
+     * @param message Modal message.
+     * @param title Modal title.
+     * @param placeholder Placeholder of the input element. By default, "Password".
+     * @param type Type of the input element. By default, password.
+     * @return Promise resolved with the input data if the user clicks OK, rejected if cancels.
      */
     showPrompt(message: string, title?: string, placeholder?: string, type: string = 'password'): Promise<any> {
         return new Promise((resolve, reject): void => {
@@ -1431,12 +1429,12 @@ export class CoreDomUtilsProvider {
     /**
      * Displays an autodimissable toast modal window.
      *
-     * @param {string} text The text of the toast.
-     * @param {boolean} [needsTranslate] Whether the 'text' needs to be translated.
-     * @param {number} [duration=2000] Duration in ms of the dimissable toast.
-     * @param {string} [cssClass=""] Class to add to the toast.
-     * @param {boolean} [dismissOnPageChange=true] Dismiss the Toast on page change.
-     * @return {Toast} Toast instance.
+     * @param text The text of the toast.
+     * @param needsTranslate Whether the 'text' needs to be translated.
+     * @param duration Duration in ms of the dimissable toast.
+     * @param cssClass Class to add to the toast.
+     * @param dismissOnPageChange Dismiss the Toast on page change.
+     * @return Toast instance.
      */
     showToast(text: string, needsTranslate?: boolean, duration: number = 2000, cssClass: string = '',
             dismissOnPageChange: boolean = true): Toast {
@@ -1461,9 +1459,9 @@ export class CoreDomUtilsProvider {
     /**
      * Stores a component/directive instance.
      *
-     * @param {Element} element The root element of the component/directive.
-     * @param {any} instance The instance to store.
-     * @return {string} ID to identify the instance.
+     * @param element The root element of the component/directive.
+     * @param instance The instance to store.
+     * @return ID to identify the instance.
      */
     storeInstanceByElement(element: Element, instance: any): string {
         const id = String(this.lastInstanceId++);
@@ -1477,8 +1475,8 @@ export class CoreDomUtilsProvider {
     /**
      * Check if an element supports input via keyboard.
      *
-     * @param {any} el HTML element to check.
-     * @return {boolean} Whether it supports input using keyboard.
+     * @param el HTML element to check.
+     * @return Whether it supports input using keyboard.
      */
     supportsInputKeyboard(el: any): boolean {
         return el && !el.disabled && (el.tagName.toLowerCase() == 'textarea' ||
@@ -1488,8 +1486,8 @@ export class CoreDomUtilsProvider {
     /**
      * Converts HTML formatted text to DOM element(s).
      *
-     * @param {string} text HTML text.
-     * @return {HTMLCollection} Same text converted to HTMLCollection.
+     * @param text HTML text.
+     * @return Same text converted to HTMLCollection.
      */
     toDom(text: string): HTMLCollection {
         const element = this.convertToElement(text);
@@ -1500,7 +1498,7 @@ export class CoreDomUtilsProvider {
     /**
      * Treat anchors inside alert/modals.
      *
-     * @param {HTMLElement} container The HTMLElement that can contain anchors.
+     * @param container The HTMLElement that can contain anchors.
      */
     treatAnchors(container: HTMLElement): void {
         const anchors = Array.from(container.querySelectorAll('a'));
@@ -1536,10 +1534,10 @@ export class CoreDomUtilsProvider {
     /**
      * View an image in a new page or modal.
      *
-     * @param {string} image URL of the image.
-     * @param {string} title Title of the page or modal.
-     * @param {string} [component] Component to link the image to if needed.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
+     * @param image URL of the image.
+     * @param title Title of the page or modal.
+     * @param component Component to link the image to if needed.
+     * @param componentId An ID to use in conjunction with the component.
      */
     viewImage(image: string, title?: string, component?: string, componentId?: string | number): void {
         if (image) {
@@ -1558,8 +1556,8 @@ export class CoreDomUtilsProvider {
     /**
      * Wait for images to load.
      *
-     * @param {HTMLElement} element The element to search in.
-     * @return {Promise<boolean>} Promise resolved with a boolean: whether there was any image to load.
+     * @param element The element to search in.
+     * @return Promise resolved with a boolean: whether there was any image to load.
      */
     waitForImages(element: HTMLElement): Promise<boolean> {
         const imgs = Array.from(element.querySelectorAll('img')),
@@ -1592,8 +1590,8 @@ export class CoreDomUtilsProvider {
     /**
      * Wrap an HTMLElement with another element.
      *
-     * @param {HTMLElement} el The element to wrap.
-     * @param {HTMLElement} wrapper Wrapper.
+     * @param el The element to wrap.
+     * @param wrapper Wrapper.
      */
     wrapElement(el: HTMLElement, wrapper: HTMLElement): void {
         // Insert the wrapper before the element.
diff --git a/src/providers/utils/iframe.ts b/src/providers/utils/iframe.ts
index 2952c22b1..5ccbab10b 100644
--- a/src/providers/utils/iframe.ts
+++ b/src/providers/utils/iframe.ts
@@ -46,9 +46,9 @@ export class CoreIframeUtilsProvider {
     /**
      * Check if a frame uses an online URL but the app is offline. If it does, the iframe is hidden and a warning is shown.
      *
-     * @param {any} element The frame to check (iframe, embed, ...).
-     * @param {boolean} [isSubframe] Whether it's a frame inside another frame.
-     * @return {boolean} True if frame is online and the app is offline, false otherwise.
+     * @param element The frame to check (iframe, embed, ...).
+     * @param isSubframe Whether it's a frame inside another frame.
+     * @return True if frame is online and the app is offline, false otherwise.
      */
     checkOnlineFrameInOffline(element: any, isSubframe?: boolean): boolean {
         const src = element.src || element.data;
@@ -146,8 +146,8 @@ export class CoreIframeUtilsProvider {
      * Given an element, return the content window and document.
      * Please notice that the element should be an iframe, embed or similar.
      *
-     * @param {any} element Element to treat (iframe, embed, ...).
-     * @return {{ window: Window, document: Document }} Window and Document.
+     * @param element Element to treat (iframe, embed, ...).
+     * @return Window and Document.
      */
     getContentWindowAndDocument(element: any): { window: Window, document: Document } {
         let contentWindow: Window = element.contentWindow,
@@ -188,10 +188,10 @@ export class CoreIframeUtilsProvider {
      * Redefine the open method in the contentWindow of an element and the sub frames.
      * Please notice that the element should be an iframe, embed or similar.
      *
-     * @param {any} element Element to treat (iframe, embed, ...).
-     * @param {Window} contentWindow The window of the element contents.
-     * @param {Document} contentDocument The document of the element contents.
-     * @param {NavController} [navCtrl] NavController to use if a link can be opened in the app.
+     * @param element Element to treat (iframe, embed, ...).
+     * @param contentWindow The window of the element contents.
+     * @param contentDocument The document of the element contents.
+     * @param navCtrl NavController to use if a link can be opened in the app.
      */
     redefineWindowOpen(element: any, contentWindow: Window, contentDocument: Document, navCtrl?: NavController): void {
         if (contentWindow) {
@@ -264,9 +264,9 @@ export class CoreIframeUtilsProvider {
      * Intercept window.open in a frame and its subframes, shows an error modal instead.
      * Search links (<a>) and open them in browser or InAppBrowser if needed.
      *
-     * @param {any} element Element to treat (iframe, embed, ...).
-     * @param {boolean} [isSubframe] Whether it's a frame inside another frame.
-     * @param {NavController} [navCtrl] NavController to use if a link can be opened in the app.
+     * @param element Element to treat (iframe, embed, ...).
+     * @param isSubframe Whether it's a frame inside another frame.
+     * @param navCtrl NavController to use if a link can be opened in the app.
      */
     treatFrame(element: any, isSubframe?: boolean, navCtrl?: NavController): void {
         if (element) {
@@ -300,8 +300,8 @@ export class CoreIframeUtilsProvider {
      * Search links (<a>) in a frame and open them in browser or InAppBrowser if needed.
      * Only links that haven't been treated by the frame's Javascript will be treated.
      *
-     * @param {any} element Element to treat (iframe, embed, ...).
-     * @param {Document} contentDocument The document of the element contents.
+     * @param element Element to treat (iframe, embed, ...).
+     * @param contentDocument The document of the element contents.
      */
     treatFrameLinks(element: any, contentDocument: Document): void {
         if (!contentDocument) {
diff --git a/src/providers/utils/mimetype.ts b/src/providers/utils/mimetype.ts
index cac90bcb0..0e6e82d63 100644
--- a/src/providers/utils/mimetype.ts
+++ b/src/providers/utils/mimetype.ts
@@ -49,8 +49,8 @@ export class CoreMimetypeUtilsProvider {
     /**
      * Check if a file extension can be embedded without using iframes.
      *
-     * @param {string} extension Extension.
-     * @return {boolean} Whether it can be embedded.
+     * @param extension Extension.
+     * @return Whether it can be embedded.
      */
     canBeEmbedded(extension: string): boolean {
         return this.isExtensionInGroup(extension, ['web_image', 'web_video', 'web_audio']);
@@ -59,8 +59,8 @@ export class CoreMimetypeUtilsProvider {
     /**
      * Clean a extension, removing the dot, hash, extra params...
      *
-     * @param {string} extension Extension to clean.
-     * @return {string} Clean extension.
+     * @param extension Extension to clean.
+     * @return Clean extension.
      */
     cleanExtension(extension: string): string {
         if (!extension) {
@@ -87,7 +87,7 @@ export class CoreMimetypeUtilsProvider {
     /**
      * Fill the mimetypes and extensions info for a certain group.
      *
-     * @param {string} group Group name.
+     * @param group Group name.
      */
     protected fillGroupMimeInfo(group: string): void {
         const mimetypes = {}, // Use an object to prevent duplicates.
@@ -111,9 +111,9 @@ export class CoreMimetypeUtilsProvider {
     /**
      * Get the extension of a mimetype. Returns undefined if not found.
      *
-     * @param {string} mimetype Mimetype.
-     * @param {string} [url] URL of the file. It will be used if there's more than one possible extension.
-     * @return {string} Extension.
+     * @param mimetype Mimetype.
+     * @param url URL of the file. It will be used if there's more than one possible extension.
+     * @return Extension.
      */
     getExtension(mimetype: string, url?: string): string {
         mimetype = mimetype || '';
@@ -141,8 +141,8 @@ export class CoreMimetypeUtilsProvider {
     /**
      * Get the URL of the icon of an extension.
      *
-     * @param {string} extension Extension.
-     * @return {string} Icon URL.
+     * @param extension Extension.
+     * @return Icon URL.
      */
     getExtensionIcon(extension: string): string {
         const icon = this.getExtensionIconName(extension) || 'unknown';
@@ -153,8 +153,8 @@ export class CoreMimetypeUtilsProvider {
     /**
      * Get the name of the icon of an extension.
      *
-     * @param {string} extension Extension.
-     * @return {string} Icon. Undefined if not found.
+     * @param extension Extension.
+     * @return Icon. Undefined if not found.
      */
     getExtensionIconName(extension: string): string {
         if (this.extToMime[extension]) {
@@ -172,8 +172,8 @@ export class CoreMimetypeUtilsProvider {
     /**
      * Get the "type" (string) of an extension, something like "image", "video" or "audio".
      *
-     * @param {string} extension Extension.
-     * @return {string} Type of the extension.
+     * @param extension Extension.
+     * @return Type of the extension.
      */
     getExtensionType(extension: string): string {
         extension = this.cleanExtension(extension);
@@ -186,8 +186,8 @@ export class CoreMimetypeUtilsProvider {
     /**
      * Get all the possible extensions of a mimetype. Returns empty array if not found.
      *
-     * @param {string} mimetype Mimetype.
-     * @return {string[]} Extensions.
+     * @param mimetype Mimetype.
+     * @return Extensions.
      */
     getExtensions(mimetype: string): string[] {
         mimetype = mimetype || '';
@@ -199,8 +199,8 @@ export class CoreMimetypeUtilsProvider {
     /**
      * Get a file icon URL based on its file name.
      *
-     * @param {string} The name of the file.
-     * @return {string} The path to a file icon.
+     * @param The name of the file.
+     * @return The path to a file icon.
      */
     getFileIcon(filename: string): string {
         const ext = this.getFileExtension(filename),
@@ -212,7 +212,7 @@ export class CoreMimetypeUtilsProvider {
     /**
      * Get the folder icon URL.
      *
-     * @return {string} The path to a folder icon.
+     * @return The path to a folder icon.
      */
     getFolderIcon(): string {
         return 'assets/img/files/folder-64.png';
@@ -221,8 +221,8 @@ export class CoreMimetypeUtilsProvider {
     /**
      * Given a type (audio, video, html, ...), return its file icon path.
      *
-     * @param {string} type The type to get the icon.
-     * @return {string} The icon path.
+     * @param type The type to get the icon.
+     * @return The icon path.
      */
     getFileIconForType(type: string): string {
         return 'assets/img/files/' + type + '-64.png';
@@ -232,8 +232,8 @@ export class CoreMimetypeUtilsProvider {
      * Guess the extension of a file from its URL.
      * This is very weak and unreliable.
      *
-     * @param {string} fileUrl The file URL.
-     * @return {string} The lowercased extension without the dot, or undefined.
+     * @param fileUrl The file URL.
+     * @return The lowercased extension without the dot, or undefined.
      */
     guessExtensionFromUrl(fileUrl: string): string {
         const split = fileUrl.split('.');
@@ -268,8 +268,8 @@ export class CoreMimetypeUtilsProvider {
      * Returns the file extension of a file.
      * When the file does not have an extension, it returns undefined.
      *
-     * @param {string} filename The file name.
-     * @return {string} The lowercased extension, or undefined.
+     * @param filename The file name.
+     * @return The lowercased extension, or undefined.
      */
     getFileExtension(filename: string): string {
         const dot = filename.lastIndexOf('.');
@@ -293,9 +293,9 @@ export class CoreMimetypeUtilsProvider {
     /**
      * Get the mimetype/extension info belonging to a certain group.
      *
-     * @param {string} group Group name.
-     * @param {string} [field] The field to get. If not supplied, all the info will be returned.
-     * @return {any} Info for the group.
+     * @param group Group name.
+     * @param field The field to get. If not supplied, all the info will be returned.
+     * @return Info for the group.
      */
     getGroupMimeInfo(group: string, field?: string): any {
         if (typeof this.groupsMimeInfo[group] == 'undefined') {
@@ -312,8 +312,8 @@ export class CoreMimetypeUtilsProvider {
     /**
      * Get the mimetype of an extension. Returns undefined if not found.
      *
-     * @param {string} extension Extension.
-     * @return {string} Mimetype.
+     * @param extension Extension.
+     * @return Mimetype.
      */
     getMimeType(extension: string): string {
         extension = this.cleanExtension(extension);
@@ -327,9 +327,9 @@ export class CoreMimetypeUtilsProvider {
      * Obtains descriptions for file types (e.g. 'Microsoft Word document') from the language file.
      * Based on Moodle's get_mimetype_description.
      *
-     * @param {any} obj Instance of FileEntry OR object with 'filename' and 'mimetype' OR string with mimetype.
-     * @param {boolean} [capitalise] If true, capitalises first character of result.
-     * @return {string} Type description.
+     * @param obj Instance of FileEntry OR object with 'filename' and 'mimetype' OR string with mimetype.
+     * @param capitalise If true, capitalises first character of result.
+     * @return Type description.
      */
     getMimetypeDescription(obj: any, capitalise?: boolean): string {
         const langPrefix = 'assets.mimetypes.';
@@ -408,8 +408,8 @@ export class CoreMimetypeUtilsProvider {
     /**
      * Get the "type" (string) of a mimetype, something like "image", "video" or "audio".
      *
-     * @param {string} mimetype Mimetype.
-     * @return {string} Type of the mimetype.
+     * @param mimetype Mimetype.
+     * @return Type of the mimetype.
      */
     getMimetypeType(mimetype: string): string {
         mimetype = mimetype.split(';')[0]; // Remove codecs from the mimetype if any.
@@ -430,8 +430,8 @@ export class CoreMimetypeUtilsProvider {
     /**
      * Get the icon of a mimetype.
      *
-     * @param {string} mimetype Mimetype.
-     * @return {string} Type of the mimetype.
+     * @param mimetype Mimetype.
+     * @return Type of the mimetype.
      */
     getMimetypeIcon(mimetype: string): string {
         mimetype = mimetype.split(';')[0]; // Remove codecs from the mimetype if any.
@@ -454,8 +454,8 @@ export class CoreMimetypeUtilsProvider {
     /**
      * Given a group name, return the translated name.
      *
-     * @param {string} name Group name.
-     * @return {string} Translated name.
+     * @param name Group name.
+     * @return Translated name.
      */
     getTranslatedGroupName(name: string): string {
         const key = 'assets.mimetypes.group:' + name,
@@ -468,9 +468,9 @@ export class CoreMimetypeUtilsProvider {
      * Check if an extension belongs to at least one of the groups.
      * Similar to Moodle's file_mimetype_in_typegroup, but using the extension instead of mimetype.
      *
-     * @param {string} extension Extension.
-     * @param {string[]} groups List of groups to check.
-     * @return {boolean} Whether the extension belongs to any of the groups.
+     * @param extension Extension.
+     * @param groups List of groups to check.
+     * @return Whether the extension belongs to any of the groups.
      */
     isExtensionInGroup(extension: string, groups: string[]): boolean {
         extension = this.cleanExtension(extension);
@@ -490,8 +490,8 @@ export class CoreMimetypeUtilsProvider {
     /**
      * Remove the extension from a path (if any).
      *
-     * @param {string} path Path.
-     * @return {string} Path without extension.
+     * @param path Path.
+     * @return Path without extension.
      */
     removeExtension(path: string): string {
         const position = path.lastIndexOf('.');
diff --git a/src/providers/utils/text.ts b/src/providers/utils/text.ts
index a21ba8838..a33025210 100644
--- a/src/providers/utils/text.ts
+++ b/src/providers/utils/text.ts
@@ -78,8 +78,8 @@ export class CoreTextUtilsProvider {
     /**
      * Given an address as a string, return a URL to open the address in maps.
      *
-     * @param {string} address The address.
-     * @return {SafeUrl} URL to view the address.
+     * @param address The address.
+     * @return URL to view the address.
      */
     buildAddressURL(address: string): SafeUrl {
         return this.sanitizer.bypassSecurityTrustUrl((this.platform.is('android') ? 'geo:0,0?q=' : 'http://maps.google.com?q=') +
@@ -89,8 +89,8 @@ export class CoreTextUtilsProvider {
     /**
      * Given a list of sentences, build a message with all of them wrapped in <p>.
      *
-     * @param {string[]} messages Messages to show.
-     * @return {string} Message with all the messages.
+     * @param messages Messages to show.
+     * @return Message with all the messages.
      */
     buildMessage(messages: string[]): string {
         let result = '';
@@ -107,9 +107,9 @@ export class CoreTextUtilsProvider {
     /**
      * Convert size in bytes into human readable format
      *
-     * @param {number} bytes Number of bytes to convert.
-     * @param {number} [precision=2] Number of digits after the decimal separator.
-     * @return {string} Size in human readable format.
+     * @param bytes Number of bytes to convert.
+     * @param precision Number of digits after the decimal separator.
+     * @return Size in human readable format.
      */
     bytesToSize(bytes: number, precision: number = 2): string {
 
@@ -140,9 +140,9 @@ export class CoreTextUtilsProvider {
     /**
      * Clean HTML tags.
      *
-     * @param {string} text The text to be cleaned.
-     * @param {boolean} [singleLine] True if new lines should be removed (all the text in a single line).
-     * @return {string} Clean text.
+     * @param text The text to be cleaned.
+     * @param singleLine True if new lines should be removed (all the text in a single line).
+     * @return Clean text.
      */
     cleanTags(text: string, singleLine?: boolean): string {
         if (typeof text != 'string') {
@@ -167,9 +167,9 @@ export class CoreTextUtilsProvider {
     /**
      * Concatenate two paths, adding a slash between them if needed.
      *
-     * @param {string} leftPath Left path.
-     * @param {string} rightPath Right path.
-     * @return {string} Concatenated path.
+     * @param leftPath Left path.
+     * @param rightPath Right path.
+     * @return Concatenated path.
      */
     concatenatePaths(leftPath: string, rightPath: string): string {
         if (!leftPath) {
@@ -194,8 +194,8 @@ export class CoreTextUtilsProvider {
      * Convert some HTML as text into an HTMLElement. This HTML is put inside a div or a body.
      * This function is the same as in DomUtils, but we cannot use that one because of circular dependencies.
      *
-     * @param {string} html Text to convert.
-     * @return {HTMLElement} Element.
+     * @param html Text to convert.
+     * @return Element.
      */
     protected convertToElement(html: string): HTMLElement {
         // Add a div to hold the content, that's the element that will be returned.
@@ -207,8 +207,8 @@ export class CoreTextUtilsProvider {
     /**
      * Count words in a text.
      *
-     * @param {string} text Text to count.
-     * @return {number} Number of words.
+     * @param text Text to count.
+     * @return Number of words.
      */
     countWords(text: string): number {
         if (!text || typeof text != 'string') {
@@ -240,8 +240,8 @@ export class CoreTextUtilsProvider {
     /**
      * Decode an escaped HTML text. This implementation is based on PHP's htmlspecialchars_decode.
      *
-     * @param {string|number} text Text to decode.
-     * @return {string} Decoded text.
+     * @param text Text to decode.
+     * @return Decoded text.
      */
     decodeHTML(text: string | number): string {
         if (typeof text == 'undefined' || text === null || (typeof text == 'number' && isNaN(text))) {
@@ -262,8 +262,8 @@ export class CoreTextUtilsProvider {
     /**
      * Decode HTML entities in a text. Equivalent to PHP html_entity_decode.
      *
-     * @param {string} text Text to decode.
-     * @return {string} Decoded text.
+     * @param text Text to decode.
+     * @return Decoded text.
      */
     decodeHTMLEntities(text: string): string {
         if (text) {
@@ -277,8 +277,8 @@ export class CoreTextUtilsProvider {
     /**
      * Same as Javascript's decodeURI, but if an exception is thrown it will return the original URI.
      *
-     * @param {string} uri URI to decode.
-     * @return {string} Decoded URI, or original URI if an exception is thrown.
+     * @param uri URI to decode.
+     * @return Decoded URI, or original URI if an exception is thrown.
      */
     decodeURI(uri: string): string {
         try {
@@ -293,8 +293,8 @@ export class CoreTextUtilsProvider {
     /**
      * Same as Javascript's decodeURIComponent, but if an exception is thrown it will return the original URI.
      *
-     * @param {string} uri URI to decode.
-     * @return {string} Decoded URI, or original URI if an exception is thrown.
+     * @param uri URI to decode.
+     * @return Decoded URI, or original URI if an exception is thrown.
      */
     decodeURIComponent(uri: string): string {
         try {
@@ -309,8 +309,8 @@ export class CoreTextUtilsProvider {
     /**
      * Escapes some characters in a string to be used as a regular expression.
      *
-     * @param {string} text Text to escape.
-     * @return {string} Escaped text.
+     * @param text Text to escape.
+     * @return Escaped text.
      */
     escapeForRegex(text: string): string {
         if (!text || typeof text != 'string') {
@@ -323,8 +323,8 @@ export class CoreTextUtilsProvider {
     /**
      * Escape an HTML text. This implementation is based on PHP's htmlspecialchars.
      *
-     * @param {string|number} text Text to escape.
-     * @return {string} Escaped text.
+     * @param text Text to escape.
+     * @return Escaped text.
      */
     escapeHTML(text: string | number): string {
         if (typeof text == 'undefined' || text === null || (typeof text == 'number' && isNaN(text))) {
@@ -344,11 +344,11 @@ export class CoreTextUtilsProvider {
     /**
      * Shows a text on a new page.
      *
-     * @param {string} title Title of the new state.
-     * @param {string} text Content of the text to be expanded.
-     * @param {string} [component] Component to link the embedded files to.
-     * @param {string|number} [componentId] An ID to use in conjunction with the component.
-     * @param {any[]} [files] List of files to display along with the text.
+     * @param title Title of the new state.
+     * @param text Content of the text to be expanded.
+     * @param component Component to link the embedded files to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param files List of files to display along with the text.
      */
     expandText(title: string, text: string, component?: string, componentId?: string | number, files?: any[]): void {
         if (text.length > 0) {
@@ -371,8 +371,8 @@ export class CoreTextUtilsProvider {
     /**
      * Formats a text, in HTML replacing new lines by correct html new lines.
      *
-     * @param {string} text Text to format.
-     * @return {string} Formatted text.
+     * @param text Text to format.
+     * @return Formatted text.
      */
     formatHtmlLines(text: string): string {
         const hasHTMLTags = this.hasHTMLTags(text);
@@ -392,12 +392,12 @@ export class CoreTextUtilsProvider {
     /**
      * Formats a text, treating multilang tags and cleaning HTML if needed.
      *
-     * @param {string} text Text to format.
-     * @param {boolean} [clean] Whether HTML tags should be removed.
-     * @param {boolean} [singleLine] Whether new lines should be removed. Only valid if clean is true.
-     * @param {number} [shortenLength] Number of characters to shorten the text.
-     * @param {number} [highlight] Text to highlight.
-     * @return {Promise<string>} Promise resolved with the formatted text.
+     * @param text Text to format.
+     * @param clean Whether HTML tags should be removed.
+     * @param singleLine Whether new lines should be removed. Only valid if clean is true.
+     * @param shortenLength Number of characters to shorten the text.
+     * @param highlight Text to highlight.
+     * @return Promise resolved with the formatted text.
      */
     formatText(text: string, clean?: boolean, singleLine?: boolean, shortenLength?: number, highlight?: string): Promise<string> {
         return this.treatMultilangTags(text).then((formatted) => {
@@ -418,8 +418,8 @@ export class CoreTextUtilsProvider {
     /**
      * Get the error message from an error object.
      *
-     * @param {any} error Error object.
-     * @return {string} Error message, undefined if not found.
+     * @param error Error object.
+     * @return Error message, undefined if not found.
      */
     getErrorMessageFromError(error: any): string {
         if (typeof error == 'string') {
@@ -432,8 +432,8 @@ export class CoreTextUtilsProvider {
     /**
      * Get the pluginfile URL to replace @@PLUGINFILE@@ wildcards.
      *
-     * @param {any[]} files Files to extract the URL from. They need to have the URL in a 'url' or 'fileurl' attribute.
-     * @return {string} Pluginfile URL, undefined if no files found.
+     * @param files Files to extract the URL from. They need to have the URL in a 'url' or 'fileurl' attribute.
+     * @return Pluginfile URL, undefined if no files found.
      */
     getTextPluginfileUrl(files: any[]): string {
         if (files && files.length) {
@@ -449,8 +449,8 @@ export class CoreTextUtilsProvider {
     /**
      * Check if a text contains HTML tags.
      *
-     * @param {string} text Text to check.
-     * @return {boolean} Whether it has HTML tags.
+     * @param text Text to check.
+     * @return Whether it has HTML tags.
      */
     hasHTMLTags(text: string): boolean {
         return /<[a-z][\s\S]*>/i.test(text);
@@ -459,9 +459,9 @@ export class CoreTextUtilsProvider {
     /**
      * Highlight all occurrences of a certain text inside another text. It will add some HTML code to highlight it.
      *
-     * @param {string} text Full text.
-     * @param {string} searchText Text to search and highlight.
-     * @return {string} Highlighted text.
+     * @param text Full text.
+     * @param searchText Text to search and highlight.
+     * @return Highlighted text.
      */
     highlightText(text: string, searchText: string): string {
         if (!text || typeof text != 'string') {
@@ -478,8 +478,8 @@ export class CoreTextUtilsProvider {
     /**
      * Check if HTML content is blank.
      *
-     * @param {string} content HTML content.
-     * @return {boolean} True if the string does not contain actual content: text, images, etc.
+     * @param content HTML content.
+     * @return True if the string does not contain actual content: text, images, etc.
      */
     htmlIsBlank(content: string): boolean {
         if (!content) {
@@ -496,8 +496,8 @@ export class CoreTextUtilsProvider {
      * Check if a text contains Unicode long chars.
      * Using as threshold Hex value D800
      *
-     * @param {string} text Text to check.
-     * @return {boolean} True if has Unicode chars, false otherwise.
+     * @param text Text to check.
+     * @return True if has Unicode chars, false otherwise.
      */
     hasUnicode(text: string): boolean {
         for (let x = 0; x < text.length; x++) {
@@ -512,8 +512,8 @@ export class CoreTextUtilsProvider {
     /**
      * Check if an object has any long Unicode char.
      *
-     * @param {object} data Object to be checked.
-     * @return {boolean} If the data has any long Unicode char on it.
+     * @param data Object to be checked.
+     * @return If the data has any long Unicode char on it.
      */
     hasUnicodeData(data: object): boolean {
         for (const el in data) {
@@ -532,10 +532,10 @@ export class CoreTextUtilsProvider {
     /**
      * Same as Javascript's JSON.parse, but it will handle errors.
      *
-     * @param {string} json JSON text.
-     * @param {any} [defaultValue] Default value t oreturn if the parse fails. Defaults to the original value.
-     * @param {Function} [logErrorFn] An error to call with the exception to log the error. If not supplied, no error.
-     * @return {any} JSON parsed as object or what it gets.
+     * @param json JSON text.
+     * @param defaultValue Default value t oreturn if the parse fails. Defaults to the original value.
+     * @param logErrorFn An error to call with the exception to log the error. If not supplied, no error.
+     * @return JSON parsed as object or what it gets.
      */
     parseJSON(json: string, defaultValue?: any, logErrorFn?: Function): any {
         try {
@@ -554,8 +554,8 @@ export class CoreTextUtilsProvider {
     /**
      * Remove ending slash from a path or URL.
      *
-     * @param {string} text Text to treat.
-     * @return {string} Treated text.
+     * @param text Text to treat.
+     * @return Treated text.
      */
     removeEndingSlash(text: string): string {
         if (!text) {
@@ -572,8 +572,8 @@ export class CoreTextUtilsProvider {
     /**
      * Replace all characters that cause problems with files in Android and iOS.
      *
-     * @param {string} text Text to treat.
-     * @return {string} Treated text.
+     * @param text Text to treat.
+     * @return Treated text.
      */
     removeSpecialCharactersForFiles(text: string): string {
         if (!text || typeof text != 'string') {
@@ -586,9 +586,9 @@ export class CoreTextUtilsProvider {
     /**
      * Replace all the new lines on a certain text.
      *
-     * @param {string} text The text to be treated.
-     * @param {string} newValue Text to use instead of new lines.
-     * @return {string} Treated text.
+     * @param text The text to be treated.
+     * @param newValue Text to use instead of new lines.
+     * @return Treated text.
      */
     replaceNewLines(text: string, newValue: string): string {
         if (!text || typeof text != 'string') {
@@ -601,9 +601,9 @@ export class CoreTextUtilsProvider {
     /**
      * Replace @@PLUGINFILE@@ wildcards with the real URL in a text.
      *
-     * @param {string} Text to treat.
-     * @param {any[]} files Files to extract the pluginfile URL from. They need to have the URL in a url or fileurl attribute.
-     * @return {string} Treated text.
+     * @param Text to treat.
+     * @param files Files to extract the pluginfile URL from. They need to have the URL in a url or fileurl attribute.
+     * @return Treated text.
      */
     replacePluginfileUrls(text: string, files: any[]): string {
         if (text && typeof text == 'string') {
@@ -619,9 +619,9 @@ export class CoreTextUtilsProvider {
     /**
      * Replace pluginfile URLs with @@PLUGINFILE@@ wildcards.
      *
-     * @param {string} text Text to treat.
-     * @param {any[]} files Files to extract the pluginfile URL from. They need to have the URL in a url or fileurl attribute.
-     * @return {string} Treated text.
+     * @param text Text to treat.
+     * @param files Files to extract the pluginfile URL from. They need to have the URL in a url or fileurl attribute.
+     * @return Treated text.
      */
     restorePluginfileUrls(text: string, files: any[]): string {
         if (text && typeof text == 'string') {
@@ -640,9 +640,9 @@ export class CoreTextUtilsProvider {
      * 7.toFixed(2) -> 7.00
      * roundToDecimals(7, 2) -> 7
      *
-     * @param {number} num Number to round.
-     * @param {number} [decimals=2] Number of decimals. By default, 2.
-     * @return {number} Rounded number.
+     * @param num Number to round.
+     * @param decimals Number of decimals. By default, 2.
+     * @return Rounded number.
      */
     roundToDecimals(num: number, decimals: number = 2): number {
         const multiplier = Math.pow(10, decimals);
@@ -656,8 +656,8 @@ export class CoreTextUtilsProvider {
      * Returns text with HTML characters (like "<", ">", etc.) properly quoted.
      * Based on Moodle's s() function.
      *
-     * @param {string} text Text to treat.
-     * @return {string} Treated text.
+     * @param text Text to treat.
+     * @return Treated text.
      */
     s(text: string): string {
         if (!text) {
@@ -670,9 +670,9 @@ export class CoreTextUtilsProvider {
     /**
      * Shortens a text to length and adds an ellipsis.
      *
-     * @param {string} text The text to be shortened.
-     * @param {number} length The desired length.
-     * @return {string} Shortened text.
+     * @param text The text to be shortened.
+     * @param length The desired length.
+     * @return Shortened text.
      */
     shortenText(text: string, length: number): string {
         if (text.length > length) {
@@ -693,8 +693,8 @@ export class CoreTextUtilsProvider {
      * Strip Unicode long char of a given text.
      * Using as threshold Hex value D800
      *
-     * @param {string} text Text to check.
-     * @return {string} Without the Unicode chars.
+     * @param text Text to check.
+     * @return Without the Unicode chars.
      */
     stripUnicode(text: string): string {
         let stripped = '';
@@ -710,8 +710,8 @@ export class CoreTextUtilsProvider {
     /**
      * Treat the list of disabled features, replacing old nomenclature with the new one.
      *
-     * @param {string} features List of disabled features.
-     * @return {string} Treated list.
+     * @param features List of disabled features.
+     * @return Treated list.
      */
     treatDisabledFeatures(features: string): string {
         if (!features) {
@@ -730,8 +730,8 @@ export class CoreTextUtilsProvider {
     /**
      * Treat the multilang tags from a HTML code, leaving only the current language.
      *
-     * @param {string} text The text to be treated.
-     * @return {Promise<string>} Promise resolved with the formatted text.
+     * @param text The text to be treated.
+     * @return Promise resolved with the formatted text.
      */
     treatMultilangTags(text: string): Promise<string> {
         if (!text || typeof text != 'string') {
@@ -766,8 +766,8 @@ export class CoreTextUtilsProvider {
     /**
      * If a number has only 1 digit, add a leading zero to it.
      *
-     * @param {string|number} num Number to convert.
-     * @return {string} Number with leading zeros.
+     * @param num Number to convert.
+     * @return Number with leading zeros.
      */
     twoDigits(num: string | number): string {
         if (num < 10) {
@@ -780,8 +780,8 @@ export class CoreTextUtilsProvider {
     /**
      * Make a string's first character uppercase.
      *
-     * @param {string} text Text to treat.
-     * @return {string} Treated text.
+     * @param text Text to treat.
+     * @return Treated text.
      */
     ucFirst(text: string): string {
         return text.charAt(0).toUpperCase() + text.slice(1);
@@ -791,9 +791,9 @@ export class CoreTextUtilsProvider {
      * Unserialize Array from PHP.
      * Taken from: https://github.com/kvz/locutus/blob/master/src/php/var/unserialize.js
      *
-     * @param  {string} data String to unserialize.
-     * @param {Function} [logErrorFn] An error to call with the exception to log the error. If not supplied, no error.
-     * @return {any}         Unserialized data.
+     * @param data String to unserialize.
+     * @param logErrorFn An error to call with the exception to log the error. If not supplied, no error.
+     * @return Unserialized data.
      */
     unserialize (data: string, logErrorFn?: Function): any {
         //  Discuss at: http://locutus.io/php/unserialize/
diff --git a/src/providers/utils/time.ts b/src/providers/utils/time.ts
index 9be16dd58..a35317c34 100644
--- a/src/providers/utils/time.ts
+++ b/src/providers/utils/time.ts
@@ -72,8 +72,8 @@ export class CoreTimeUtilsProvider {
     /**
      * Convert a PHP format to a Moment format.
      *
-     * @param {string} format PHP format.
-     * @return {string} Converted format.
+     * @param format PHP format.
+     * @return Converted format.
      */
     convertPHPToMoment(format: string): string {
         if (typeof format != 'string') {
@@ -121,8 +121,8 @@ export class CoreTimeUtilsProvider {
     /**
      * Fix format to use in an ion-datetime.
      *
-     * @param {string} format Format to use.
-     * @return {string} Fixed format.
+     * @param format Format to use.
+     * @return Fixed format.
      */
     fixFormatForDatetime(format: string): string {
         if (!format) {
@@ -144,8 +144,8 @@ export class CoreTimeUtilsProvider {
     /**
      * Returns hours, minutes and seconds in a human readable format
      *
-     * @param {number} seconds A number of seconds
-     * @return {string} Seconds in a human readable format.
+     * @param seconds A number of seconds
+     * @return Seconds in a human readable format.
      */
     formatTime(seconds: number): string {
         let totalSecs,
@@ -218,9 +218,9 @@ export class CoreTimeUtilsProvider {
     /**
      * Returns hours, minutes and seconds in a human readable format.
      *
-     * @param {number} duration Duration in seconds
-     * @param {number} [precision] Number of elements to have in precission. 0 or undefined to full precission.
-     * @return {string} Duration in a human readable format.
+     * @param duration Duration in seconds
+     * @param precision Number of elements to have in precission. 0 or undefined to full precission.
+     * @return Duration in a human readable format.
      */
     formatDuration(duration: number, precision?: number): string {
         precision = precision || 5;
@@ -255,7 +255,7 @@ export class CoreTimeUtilsProvider {
     /**
      * Return the current timestamp in a "readable" format: YYYYMMDDHHmmSS.
      *
-     * @return {string} The readable timestamp.
+     * @return The readable timestamp.
      */
     readableTimestamp(): string {
         return moment(Date.now()).format('YYYYMMDDHHmmSS');
@@ -264,7 +264,7 @@ export class CoreTimeUtilsProvider {
     /**
      * Return the current timestamp (UNIX format, seconds).
      *
-     * @return {number} The current timestamp in seconds.
+     * @return The current timestamp in seconds.
      */
     timestamp(): number {
         return Math.round(Date.now() / 1000);
@@ -273,12 +273,12 @@ export class CoreTimeUtilsProvider {
     /**
      * Convert a timestamp into a readable date.
      *
-     * @param {number} timestamp Timestamp in milliseconds.
-     * @param {string} [format] The format to use (lang key). Defaults to core.strftimedaydatetime.
-     * @param {boolean} [convert=true] If true (default), convert the format from PHP to Moment. Set it to false for Moment formats.
-     * @param {boolean} [fixDay=true] If true (default) then the leading zero from %d is removed.
-     * @param {boolean} [fixHour=true] If true (default) then the leading zero from %I is removed.
-     * @return {string} Readable date.
+     * @param timestamp Timestamp in milliseconds.
+     * @param format The format to use (lang key). Defaults to core.strftimedaydatetime.
+     * @param convert If true (default), convert the format from PHP to Moment. Set it to false for Moment formats.
+     * @param fixDay If true (default) then the leading zero from %d is removed.
+     * @param fixHour If true (default) then the leading zero from %I is removed.
+     * @return Readable date.
      */
     userDate(timestamp: number, format?: string, convert: boolean = true, fixDay: boolean = true, fixHour: boolean = true): string {
         format = this.translate.instant(format ? format : 'core.strftimedaydatetime');
@@ -302,8 +302,8 @@ export class CoreTimeUtilsProvider {
     /**
      * Convert a timestamp to the format to set to a datetime input.
      *
-     * @param {number} [timestamp] Timestamp to convert (in ms). If not provided, current time.
-     * @return {string} Formatted time.
+     * @param timestamp Timestamp to convert (in ms). If not provided, current time.
+     * @return Formatted time.
      */
     toDatetimeFormat(timestamp?: number): string {
         timestamp = timestamp || Date.now();
@@ -314,8 +314,8 @@ export class CoreTimeUtilsProvider {
     /**
      * Convert a text into user timezone timestamp.
      *
-     * @param {number} date To convert to timestamp.
-     * @return {number} Converted timestamp.
+     * @param date To convert to timestamp.
+     * @return Converted timestamp.
      */
     convertToTimestamp(date: string): number {
         if (typeof date == 'string' && date.slice(-1) == 'Z') {
@@ -329,8 +329,8 @@ export class CoreTimeUtilsProvider {
      * Return the localized ISO format (i.e DDMMYY) from the localized moment format. Useful for translations.
      * DO NOT USE this function for ion-datetime format. Moment escapes characters with [], but ion-datetime doesn't support it.
      *
-     * @param {any} localizedFormat Format to use.
-     * @return {string} Localized ISO format
+     * @param localizedFormat Format to use.
+     * @return Localized ISO format
      */
     getLocalizedDateFormat(localizedFormat: any): string {
         return moment.localeData().longDateFormat(localizedFormat);
@@ -342,8 +342,8 @@ export class CoreTimeUtilsProvider {
      * The calculation is performed relative to the user's midnight timestamp
      * for today to ensure that timezones are preserved.
      *
-     * @param {number} [timestamp] The timestamp to calculate from. If not defined, return today's midnight.
-     * @return {number} The midnight value of the user's timestamp.
+     * @param timestamp The timestamp to calculate from. If not defined, return today's midnight.
+     * @return The midnight value of the user's timestamp.
      */
     getMidnightForTimestamp(timestamp?: number): number {
         if (timestamp) {
diff --git a/src/providers/utils/url.ts b/src/providers/utils/url.ts
index a7b47de34..7edd7174f 100644
--- a/src/providers/utils/url.ts
+++ b/src/providers/utils/url.ts
@@ -27,8 +27,8 @@ export class CoreUrlUtilsProvider {
     /**
      * Add or remove 'www' from a URL. The url needs to have http or https protocol.
      *
-     * @param {string} url URL to modify.
-     * @return {string} Modified URL.
+     * @param url URL to modify.
+     * @return Modified URL.
      */
     addOrRemoveWWW(url: string): string {
         if (url) {
@@ -47,9 +47,9 @@ export class CoreUrlUtilsProvider {
     /**
      * Given a URL and a text, return an HTML link.
      *
-     * @param {string} url URL.
-     * @param {string} text Text of the link.
-     * @return {string} Link.
+     * @param url URL.
+     * @param text Text of the link.
+     * @return Link.
      */
     buildLink(url: string, text: string): string {
         return '<a href="' + url + '">' + text + '</a>';
@@ -58,8 +58,8 @@ export class CoreUrlUtilsProvider {
     /**
      * Extracts the parameters from a URL and stores them in an object.
      *
-     * @param {string} url URL to treat.
-     * @return {any} Object with the params.
+     * @param url URL to treat.
+     * @return Object with the params.
      */
     extractUrlParams(url: string): any {
         const regex = /[?&]+([^=&]+)=?([^&]*)?/gi,
@@ -104,10 +104,10 @@ export class CoreUrlUtilsProvider {
      * For download remote files from Moodle we need to use the special /webservice/pluginfile passing
      * the ws token as a get parameter.
      *
-     * @param {string} url The url to be fixed.
-     * @param {string} token Token to use.
-     * @param {string} siteUrl The URL of the site the URL belongs to.
-     * @return {string} Fixed URL.
+     * @param url The url to be fixed.
+     * @param token Token to use.
+     * @param siteUrl The URL of the site the URL belongs to.
+     * @return Fixed URL.
      */
     fixPluginfileURL(url: string, token: string, siteUrl: string): string {
         if (!url) {
@@ -146,8 +146,8 @@ export class CoreUrlUtilsProvider {
     /**
      * Formats a URL, trim, lowercase, etc...
      *
-     * @param {string} url The url to be formatted.
-     * @return {string} Fromatted url.
+     * @param url The url to be formatted.
+     * @return Fromatted url.
      */
     formatURL(url: string): string {
         url = url.trim();
@@ -171,9 +171,9 @@ export class CoreUrlUtilsProvider {
     /**
      * Returns the URL to the documentation of the app, based on Moodle version and current language.
      *
-     * @param {string} [release] Moodle release.
-     * @param {string} [page=Mobile_app] Docs page to go to.
-     * @return {Promise<string>} Promise resolved with the Moodle docs URL.
+     * @param release Moodle release.
+     * @param page Docs page to go to.
+     * @return Promise resolved with the Moodle docs URL.
      */
     getDocsUrl(release?: string, page: string = 'Mobile_app'): Promise<string> {
         let docsUrl = 'https://docs.moodle.org/en/' + page;
@@ -199,8 +199,8 @@ export class CoreUrlUtilsProvider {
      * Example:
      * http://mysite.com/a/course.html?id=1 -> course.html
      *
-     * @param {string} url URL to treat.
-     * @return {string} Last file without params.
+     * @param url URL to treat.
+     * @return Last file without params.
      */
     getLastFileWithoutParams(url: string): string {
         let filename = url.substr(url.lastIndexOf('/') + 1);
@@ -215,8 +215,8 @@ export class CoreUrlUtilsProvider {
      * Get the protocol from a URL.
      * E.g. http://www.google.com returns 'http'.
      *
-     * @param {string} url URL to treat.
-     * @return {string} Protocol, undefined if no protocol found.
+     * @param url URL to treat.
+     * @return Protocol, undefined if no protocol found.
      */
     getUrlProtocol(url: string): string {
         if (!url) {
@@ -233,8 +233,8 @@ export class CoreUrlUtilsProvider {
      * Get the scheme from a URL. Please notice that, if a URL has protocol, it will return the protocol.
      * E.g. javascript:doSomething() returns 'javascript'.
      *
-     * @param {string} url URL to treat.
-     * @return {string} Scheme, undefined if no scheme found.
+     * @param url URL to treat.
+     * @return Scheme, undefined if no scheme found.
      */
     getUrlScheme(url: string): string {
         if (!url) {
@@ -250,8 +250,8 @@ export class CoreUrlUtilsProvider {
     /*
      * Gets a username from a URL like: user@mysite.com.
      *
-     * @param {string} url URL to treat.
-     * @return {string} Username. Undefined if no username found.
+     * @param url URL to treat.
+     * @return Username. Undefined if no username found.
      */
     getUsernameFromUrl(url: string): string {
         if (url.indexOf('@') > -1) {
@@ -269,8 +269,8 @@ export class CoreUrlUtilsProvider {
     /**
      * Returns if a URL has any protocol (not a relative URL).
      *
-     * @param {string} url The url to test against the pattern.
-     * @return {boolean} Whether the url is absolute.
+     * @param url The url to test against the pattern.
+     * @return Whether the url is absolute.
      */
     isAbsoluteURL(url: string): boolean {
         return /^[^:]{2,}:\/\//i.test(url) || /^(tel:|mailto:|geo:)/.test(url);
@@ -279,8 +279,8 @@ export class CoreUrlUtilsProvider {
     /**
      * Returns if a URL is downloadable: plugin file OR theme/image.php OR gravatar.
      *
-     * @param {string} url The URL to test.
-     * @return {boolean} Whether the URL is downloadable.
+     * @param url The URL to test.
+     * @return Whether the URL is downloadable.
      */
     isDownloadableUrl(url: string): boolean {
         return this.isPluginFileUrl(url) || this.isThemeImageUrl(url) || this.isGravatarUrl(url);
@@ -289,8 +289,8 @@ export class CoreUrlUtilsProvider {
     /**
      * Returns if a URL is a gravatar URL.
      *
-     * @param {string} url The URL to test.
-     * @return {boolean} Whether the URL is a gravatar URL.
+     * @param url The URL to test.
+     * @return Whether the URL is a gravatar URL.
      */
     isGravatarUrl(url: string): boolean {
         return url && url.indexOf('gravatar.com/avatar') !== -1;
@@ -299,8 +299,8 @@ export class CoreUrlUtilsProvider {
     /**
      * Check if a URL uses http or https protocol.
      *
-     * @param {string} url The url to test.
-     * @return {boolean} Whether the url uses http or https protocol.
+     * @param url The url to test.
+     * @return Whether the url uses http or https protocol.
      */
     isHttpURL(url: string): boolean {
         return /^https?\:\/\/.+/i.test(url);
@@ -309,8 +309,8 @@ export class CoreUrlUtilsProvider {
     /**
      * Returns if a URL is a pluginfile URL.
      *
-     * @param {string} url The URL to test.
-     * @return {boolean} Whether the URL is a pluginfile URL.
+     * @param url The URL to test.
+     * @return Whether the URL is a pluginfile URL.
      */
     isPluginFileUrl(url: string): boolean {
         return url && url.indexOf('/pluginfile.php') !== -1;
@@ -319,8 +319,8 @@ export class CoreUrlUtilsProvider {
     /**
      * Returns if a URL is a theme image URL.
      *
-     * @param {string} url The URL to test.
-     * @return {boolean} Whether the URL is a theme image URL.
+     * @param url The URL to test.
+     * @return Whether the URL is a theme image URL.
      */
     isThemeImageUrl(url: string): boolean {
         return url && url.indexOf('/theme/image.php') !== -1;
@@ -329,8 +329,8 @@ export class CoreUrlUtilsProvider {
     /**
      * Remove protocol and www from a URL.
      *
-     * @param {string} url URL to treat.
-     * @return {string} Treated URL.
+     * @param url URL to treat.
+     * @return Treated URL.
      */
     removeProtocolAndWWW(url: string): string {
         // Remove protocol.
@@ -344,8 +344,8 @@ export class CoreUrlUtilsProvider {
     /**
      * Remove the parameters from a URL, returning the URL without them.
      *
-     * @param {string} url URL to treat.
-     * @return {string} URL without params.
+     * @param url URL to treat.
+     * @return URL without params.
      */
     removeUrlParams(url: string): string {
         const matches = url.match(/^[^\?]+/);
diff --git a/src/providers/utils/utils.ts b/src/providers/utils/utils.ts
index bc73ce6ca..5b9d3b70f 100644
--- a/src/providers/utils/utils.ts
+++ b/src/providers/utils/utils.ts
@@ -34,21 +34,20 @@ import { CoreWSProvider, CoreWSError } from '../ws';
 export interface PromiseDefer {
     /**
      * The promise.
-     * @type {Promise<any>}
      */
     promise?: Promise<any>;
 
     /**
      * Function to resolve the promise.
      *
-     * @param {any} [value] The resolve value.
+     * @param value The resolve value.
      */
     resolve?: (value?: any) => void; // Function to resolve the promise.
 
     /**
      * Function to reject the promise.
      *
-     * @param {any} [reason] The reject param.
+     * @param reason The reject param.
      */
     reject?: (reason?: any) => void;
 }
@@ -74,9 +73,9 @@ export class CoreUtilsProvider {
     /**
      * Given an error, add an extra warning to the error message and return the new error message.
      *
-     * @param {any} error Error object or message.
-     * @param {any} [defaultError] Message to show if the error is not a string.
-     * @return {string} New error message.
+     * @param error Error object or message.
+     * @param defaultError Message to show if the error is not a string.
+     * @return New error message.
      */
     addDataNotDownloadedError(error: any, defaultError?: string): string {
         let errorMessage = error;
@@ -100,8 +99,8 @@ export class CoreUtilsProvider {
     /**
      * Similar to Promise.all, but if a promise fails this function's promise won't be rejected until ALL promises have finished.
      *
-     * @param {Promise<any>[]} promises Promises.
-     * @return {Promise<any>} Promise resolved if all promises are resolved and rejected if at least 1 promise fails.
+     * @param promises Promises.
+     * @return Promise resolved if all promises are resolved and rejected if at least 1 promise fails.
      */
     allPromises(promises: Promise<any>[]): Promise<any> {
         if (!promises || !promises.length) {
@@ -138,10 +137,10 @@ export class CoreUtilsProvider {
      * Converts an array of objects to an object, using a property of each entry as the key.
      * E.g. [{id: 10, name: 'A'}, {id: 11, name: 'B'}] => {10: {id: 10, name: 'A'}, 11: {id: 11, name: 'B'}}
      *
-     * @param {any[]} array The array to convert.
-     * @param {string} propertyName The name of the property to use as the key.
-     * @param {any} [result] Object where to put the properties. If not defined, a new object will be created.
-     * @return {any} The object.
+     * @param array The array to convert.
+     * @param propertyName The name of the property to use as the key.
+     * @param result Object where to put the properties. If not defined, a new object will be created.
+     * @return The object.
      */
     arrayToObject(array: any[], propertyName: string, result?: any): any {
         result = result || {};
@@ -157,12 +156,12 @@ export class CoreUtilsProvider {
      * Also, this will only check if itemA's properties are in itemB with same value. This function will still
      * return true if itemB has more properties than itemA.
      *
-     * @param {any} itemA First object.
-     * @param {any} itemB Second object.
-     * @param {number} [maxLevels=0] Number of levels to reach if 2 objects are compared.
-     * @param {number} [level=0] Current deep level (when comparing objects).
-     * @param {boolean} [undefinedIsNull=true] True if undefined is equal to null. Defaults to true.
-     * @return {boolean} Whether both items are equal.
+     * @param itemA First object.
+     * @param itemB Second object.
+     * @param maxLevels Number of levels to reach if 2 objects are compared.
+     * @param level Current deep level (when comparing objects).
+     * @param undefinedIsNull True if undefined is equal to null. Defaults to true.
+     * @return Whether both items are equal.
      */
     basicLeftCompare(itemA: any, itemB: any, maxLevels: number = 0, level: number = 0, undefinedIsNull: boolean = true): boolean {
         if (typeof itemA == 'function' || typeof itemB == 'function') {
@@ -215,8 +214,8 @@ export class CoreUtilsProvider {
     /**
      * Check if a URL has a redirect.
      *
-     * @param {string} url The URL to check.
-     * @return {Promise<boolean>} Promise resolved with boolean_ whether there is a redirect.
+     * @param url The URL to check.
+     * @return Promise resolved with boolean_ whether there is a redirect.
      */
     checkRedirect(url: string): Promise<boolean> {
         if (window.fetch) {
@@ -253,7 +252,7 @@ export class CoreUtilsProvider {
     /**
      * Close the InAppBrowser window.
      *
-     * @param {boolean} [closeAll] Desktop only. True to close all secondary windows, false to close only the "current" one.
+     * @param closeAll Desktop only. True to close all secondary windows, false to close only the "current" one.
      */
     closeInAppBrowser(closeAll?: boolean): void {
         if (this.iabInstance) {
@@ -267,9 +266,9 @@ export class CoreUtilsProvider {
     /**
      * Clone a variable. It should be an object, array or primitive type.
      *
-     * @param {any} source The variable to clone.
-     * @param {number} [level=0] Depth we are right now inside a cloned object. It's used to prevent reaching max call stack size.
-     * @return {any} Cloned variable.
+     * @param source The variable to clone.
+     * @param level Depth we are right now inside a cloned object. It's used to prevent reaching max call stack size.
+     * @return Cloned variable.
      */
     clone(source: any, level: number = 0): any {
         if (level >= 20) {
@@ -310,9 +309,9 @@ export class CoreUtilsProvider {
     /**
      * Copy properties from one object to another.
      *
-     * @param {any} from Object to copy the properties from.
-     * @param {any} to Object where to store the properties.
-     * @param {boolean} [clone=true] Whether the properties should be cloned (so they are different instances).
+     * @param from Object to copy the properties from.
+     * @param to Object where to store the properties.
+     * @param clone Whether the properties should be cloned (so they are different instances).
      */
     copyProperties(from: any, to: any, clone: boolean = true): void {
         for (const name in from) {
@@ -327,8 +326,8 @@ export class CoreUtilsProvider {
     /**
      * Copies a text to clipboard and shows a toast message.
      *
-     * @param {string} text Text to be copied
-     * @return {Promise<any>} Promise resolved when text is copied.
+     * @param text Text to be copied
+     * @return Promise resolved when text is copied.
      */
     copyToClipboard(text: string): Promise<any> {
         return this.clipboard.copy(text).then(() => {
@@ -342,9 +341,9 @@ export class CoreUtilsProvider {
     /**
      * Create a "fake" WS error for local errors.
      *
-     * @param {string} message The message to include in the error.
-     * @param {boolean} [needsTranslate] If the message needs to be translated.
-     * @return {CoreWSError} Fake WS error.
+     * @param message The message to include in the error.
+     * @param needsTranslate If the message needs to be translated.
+     * @return Fake WS error.
      */
     createFakeWSError(message: string, needsTranslate?: boolean): CoreWSError {
         return this.wsProvider.createFakeWSError(message, needsTranslate);
@@ -353,7 +352,7 @@ export class CoreUtilsProvider {
     /**
      * Empties an array without losing its reference.
      *
-     * @param {any[]} array Array to empty.
+     * @param array Array to empty.
      */
     emptyArray(array: any[]): void {
         array.length = 0; // Empty array without losing its reference.
@@ -362,7 +361,7 @@ export class CoreUtilsProvider {
     /**
      * Removes all properties from an object without losing its reference.
      *
-     * @param {object} object Object to remove the properties.
+     * @param object Object to remove the properties.
      */
     emptyObject(object: object): void {
         for (const key in object) {
@@ -375,12 +374,12 @@ export class CoreUtilsProvider {
     /**
      * Execute promises one depending on the previous.
      *
-     * @param {any[]} orderedPromisesData Data to be executed including the following values:
-     *                                 - func: Function to be executed.
-     *                                 - context: Context to pass to the function. This allows using "this" inside the function.
-     *                                 - params: Array of data to be sent to the function.
-     *                                 - blocking: Boolean. If promise should block the following.
-     * @return {Promise<any>} Promise resolved when all promises are resolved.
+     * @param orderedPromisesData Data to be executed including the following values:
+     *                            - func: Function to be executed.
+     *                            - context: Context to pass to the function. This allows using "this" inside the function.
+     *                            - params: Array of data to be sent to the function.
+     *                            - blocking: Boolean. If promise should block the following.
+     * @return Promise resolved when all promises are resolved.
      */
     executeOrderedPromises(orderedPromisesData: any[]): Promise<any> {
         const promises = [];
@@ -422,9 +421,9 @@ export class CoreUtilsProvider {
      * It supports 2 notations: dot notation and square brackets.
      * E.g.: {a: {b: 1, c: 2}, d: 3} -> {'a.b': 1, 'a.c': 2, d: 3}
      *
-     * @param {object} obj Object to flatten.
-     * @param {boolean} [useDotNotation] Whether to use dot notation '.' or square brackets '['.
-     * @return {object} Flattened object.
+     * @param obj Object to flatten.
+     * @param useDotNotation Whether to use dot notation '.' or square brackets '['.
+     * @return Flattened object.
      */
     flattenObject(obj: object, useDotNotation?: boolean): object {
         const toReturn = {};
@@ -456,9 +455,9 @@ export class CoreUtilsProvider {
     /**
      * Given an array of strings, return only the ones that match a regular expression.
      *
-     * @param {string[]} array Array to filter.
-     * @param {RegExp} regex RegExp to apply to each string.
-     * @return {string[]} Filtered array.
+     * @param array Array to filter.
+     * @param regex RegExp to apply to each string.
+     * @return Filtered array.
      */
     filterByRegexp(array: string[], regex: RegExp): string[] {
         if (!array || !array.length) {
@@ -475,13 +474,13 @@ export class CoreUtilsProvider {
     /**
      * Filter the list of site IDs based on a isEnabled function.
      *
-     * @param {string[]} siteIds Site IDs to filter.
-     * @param {Function} isEnabledFn Function to call for each site. Must return true or a promise resolved with true if enabled.
+     * @param siteIds Site IDs to filter.
+     * @param isEnabledFn Function to call for each site. Must return true or a promise resolved with true if enabled.
      *                    It receives a siteId param and all the params sent to this function after 'checkAll'.
-     * @param {boolean} [checkAll] True if it should check all the sites, false if it should check only 1 and treat them all
-     *                   depending on this result.
-     * @param {any} ...args All the params sent after checkAll will be passed to isEnabledFn.
-     * @return {Promise<string[]>} Promise resolved with the list of enabled sites.
+     * @param checkAll True if it should check all the sites, false if it should check only 1 and treat them all
+     *                 depending on this result.
+     * @param ...args All the params sent after checkAll will be passed to isEnabledFn.
+     * @return Promise resolved with the list of enabled sites.
      */
     filterEnabledSites(siteIds: string[], isEnabledFn: Function, checkAll?: boolean, ...args: any[]): Promise<string[]> {
         const promises = [],
@@ -514,8 +513,8 @@ export class CoreUtilsProvider {
      * Given a float, prints it nicely. Localized floats must not be used in calculations!
      * Based on Moodle's format_float.
      *
-     * @param {any} float The float to print.
-     * @return {string} Locale float.
+     * @param float The float to print.
+     * @return Locale float.
      */
     formatFloat(float: any): string {
         if (typeof float == 'undefined' || float === null || typeof float == 'boolean') {
@@ -535,12 +534,12 @@ export class CoreUtilsProvider {
      * List has to be sorted by depth to allow this function to work correctly. Errors can be thrown if a child node is
      * processed before a parent node.
      *
-     * @param {any[]} list List to format.
-     * @param {string} [parentFieldName=parent] Name of the parent field to match with children.
-     * @param {string} [idFieldName=id] Name of the children field to match with parent.
-     * @param {number} [rootParentId=0] The id of the root.
-     * @param {number} [maxDepth=5] Max Depth to convert to tree. Children found will be in the last level of depth.
-     * @return {any[]} Array with the formatted tree, children will be on each node under children field.
+     * @param list List to format.
+     * @param parentFieldName Name of the parent field to match with children.
+     * @param idFieldName Name of the children field to match with parent.
+     * @param rootParentId The id of the root.
+     * @param maxDepth Max Depth to convert to tree. Children found will be in the last level of depth.
+     * @return Array with the formatted tree, children will be on each node under children field.
      */
     formatTree(list: any[], parentFieldName: string = 'parent', idFieldName: string = 'id', rootParentId: number = 0,
             maxDepth: number = 5): any[] {
@@ -592,8 +591,8 @@ export class CoreUtilsProvider {
     /**
      * Get country name based on country code.
      *
-     * @param {string} code Country code (AF, ES, US, ...).
-     * @return {string} Country name. If the country is not found, return the country code.
+     * @param code Country code (AF, ES, US, ...).
+     * @return Country name. If the country is not found, return the country code.
      */
     getCountryName(code: string): string {
         const countryKey = 'assets.countries.' + code,
@@ -605,7 +604,7 @@ export class CoreUtilsProvider {
     /**
      * Get list of countries with their code and translated name.
      *
-     * @return {Promise<any>} Promise resolved with the list of countries.
+     * @return Promise resolved with the list of countries.
      */
     getCountryList(): Promise<any> {
         // Get the keys of the countries.
@@ -627,7 +626,7 @@ export class CoreUtilsProvider {
     /**
      * Get the list of language keys of the countries.
      *
-     * @return {Promise<string[]>} Promise resolved with the countries list. Rejected if not translated.
+     * @return Promise resolved with the countries list. Rejected if not translated.
      */
     protected getCountryKeysList(): Promise<string[]> {
         // It's possible that the current language isn't translated, so try with default language first.
@@ -649,8 +648,8 @@ export class CoreUtilsProvider {
     /**
      * Get the list of language keys of the countries, based on the translation table for a certain language.
      *
-     * @param {string} lang Language to check.
-     * @return {Promise<string[]>} Promise resolved with the countries list. Rejected if not translated.
+     * @param lang Language to check.
+     * @return Promise resolved with the countries list. Rejected if not translated.
      */
     protected getCountryKeysListForLanguage(lang: string): Promise<string[]> {
         // Get the translation table for the language.
@@ -678,8 +677,8 @@ export class CoreUtilsProvider {
      * perform a HEAD request to get it. It's done in this order because pluginfile.php can return wrong mimetypes.
      * This function is in here instead of MimetypeUtils to prevent circular dependencies.
      *
-     * @param {string} url The URL of the file.
-     * @return {Promise<string>} Promise resolved with the mimetype.
+     * @param url The URL of the file.
+     * @return Promise resolved with the mimetype.
      */
     getMimeTypeFromUrl(url: string): Promise<string> {
         // First check if it can be guessed from the URL.
@@ -699,8 +698,8 @@ export class CoreUtilsProvider {
     /**
      * Get a unique ID for a certain name.
      *
-     * @param {string} name The name to get the ID for.
-     * @return {number} Unique ID.
+     * @param name The name to get the ID for.
+     * @return Unique ID.
      */
     getUniqueId(name: string): number {
         if (!this.uniqueIds[name]) {
@@ -713,8 +712,8 @@ export class CoreUtilsProvider {
     /**
      * Given a list of files, check if there are repeated names.
      *
-     * @param {any[]} files List of files.
-     * @return {string|boolean} String with error message if repeated, false if no repeated.
+     * @param files List of files.
+     * @return String with error message if repeated, false if no repeated.
      */
     hasRepeatedFilenames(files: any[]): string | boolean {
         if (!files || !files.length) {
@@ -739,9 +738,9 @@ export class CoreUtilsProvider {
     /**
      * Gets the index of the first string that matches a regular expression.
      *
-     * @param {string[]} array Array to search.
-     * @param {RegExp} regex RegExp to apply to each string.
-     * @return {number} Index of the first string that matches the RegExp. -1 if not found.
+     * @param array Array to search.
+     * @param regex RegExp to apply to each string.
+     * @return Index of the first string that matches the RegExp. -1 if not found.
      */
     indexOfRegexp(array: string[], regex: RegExp): number {
         if (!array || !array.length) {
@@ -763,8 +762,8 @@ export class CoreUtilsProvider {
     /**
      * Return true if the param is false (bool), 0 (number) or "0" (string).
      *
-     * @param {any} value Value to check.
-     * @return {boolean} Whether the value is false, 0 or "0".
+     * @param value Value to check.
+     * @return Whether the value is false, 0 or "0".
      */
     isFalseOrZero(value: any): boolean {
         return typeof value != 'undefined' && (value === false || value === 'false' || parseInt(value, 10) === 0);
@@ -773,8 +772,8 @@ export class CoreUtilsProvider {
     /**
      * Return true if the param is true (bool), 1 (number) or "1" (string).
      *
-     * @param {any} value Value to check.
-     * @return {boolean} Whether the value is true, 1 or "1".
+     * @param value Value to check.
+     * @return Whether the value is true, 1 or "1".
      */
     isTrueOrOne(value: any): boolean {
         return typeof value != 'undefined' && (value === true || value === 'true' || parseInt(value, 10) === 1);
@@ -783,8 +782,8 @@ export class CoreUtilsProvider {
     /**
      * Given an error returned by a WS call, check if the error is generated by the app or it has been returned by the WebSwervice.
      *
-     * @param {any} error Error to check.
-     * @return {boolean} Whether the error was returned by the WebService.
+     * @param error Error to check.
+     * @return Whether the error was returned by the WebService.
      */
     isWebServiceError(error: any): boolean {
         return error && (typeof error.warningcode != 'undefined' || (typeof error.errorcode != 'undefined' &&
@@ -798,11 +797,11 @@ export class CoreUtilsProvider {
      * Given a list (e.g. a,b,c,d,e) this function returns an array of 1->a, 2->b, 3->c etc.
      * Taken from make_menu_from_list on moodlelib.php (not the same but similar).
      *
-     * @param {string} list The string to explode into array bits
-     * @param {string} [defaultLabel] Element that will become default option, if not defined, it won't be added.
-     * @param {string} [separator] The separator used within the list string. Default ','.
-     * @param {any}  [defaultValue] Element that will become default option value. Default 0.
-     * @return {any[]} The now assembled array
+     * @param list The string to explode into array bits
+     * @param defaultLabel Element that will become default option, if not defined, it won't be added.
+     * @param separator The separator used within the list string. Default ','.
+     * @param defaultValue Element that will become default option value. Default 0.
+     * @return The now assembled array
      */
     makeMenuFromList(list: string, defaultLabel?: string, separator: string = ',', defaultValue?: any): any[] {
         // Split and format the list.
@@ -826,10 +825,10 @@ export class CoreUtilsProvider {
     /**
      * Merge two arrays, removing duplicate values.
      *
-     * @param {any[]} array1 The first array.
-     * @param {any[]} array2 The second array.
+     * @param array1 The first array.
+     * @param array2 The second array.
      * @param [key] Key of the property that must be unique. If not specified, the whole entry.
-     * @return {any[]} Merged array.
+     * @return Merged array.
      */
     mergeArraysWithoutDuplicates(array1: any[], array2: any[], key?: string): any[] {
         return this.uniqueArray(array1.concat(array2), key);
@@ -838,8 +837,8 @@ export class CoreUtilsProvider {
     /**
      * Open a file using platform specific method.
      *
-     * @param {string} path The local path of the file to be open.
-     * @return {Promise<any>} Promise resolved when done.
+     * @param path The local path of the file to be open.
+     * @return Promise resolved when done.
      */
     openFile(path: string): Promise<any> {
         const extension = this.mimetypeUtils.getFileExtension(path),
@@ -871,9 +870,9 @@ export class CoreUtilsProvider {
      * Open a URL using InAppBrowser.
      * Do not use for files, refer to {@link openFile}.
      *
-     * @param {string} url The URL to open.
-     * @param {any} [options] Override default options passed to InAppBrowser.
-     * @return {InAppBrowserObject} The opened window.
+     * @param url The URL to open.
+     * @param options Override default options passed to InAppBrowser.
+     * @return The opened window.
      */
     openInApp(url: string, options?: any): InAppBrowserObject {
         if (!url) {
@@ -943,7 +942,7 @@ export class CoreUtilsProvider {
      * Open a URL using a browser.
      * Do not use for files, refer to {@link openFile}.
      *
-     * @param {string} url The URL to open.
+     * @param url The URL to open.
      */
     openInBrowser(url: string): void {
         if (this.appProvider.isDesktop()) {
@@ -962,8 +961,8 @@ export class CoreUtilsProvider {
      * Open an online file using platform specific method.
      * Specially useful for audio and video since they can be streamed.
      *
-     * @param {string} url The URL of the file.
-     * @return {Promise<void>} Promise resolved when opened.
+     * @param url The URL of the file.
+     * @return Promise resolved when opened.
      */
     openOnlineFile(url: string): Promise<void> {
         if (this.platform.is('android')) {
@@ -1000,8 +999,8 @@ export class CoreUtilsProvider {
     /**
      * Converts an object into an array, losing the keys.
      *
-     * @param {object} obj Object to convert.
-     * @return {any[]} Array with the values of the object but losing the keys.
+     * @param obj Object to convert.
+     * @return Array with the values of the object but losing the keys.
      */
     objectToArray(obj: object): any[] {
         return Object.keys(obj).map((key) => {
@@ -1014,12 +1013,12 @@ export class CoreUtilsProvider {
      * the key and value of the original object.
      * For example, it can convert {size: 2} into [{name: 'size', value: 2}].
      *
-     * @param {object} obj Object to convert.
-     * @param {string} keyName Name of the properties where to store the keys.
-     * @param {string} valueName Name of the properties where to store the values.
-     * @param {boolean} [sortByKey] True to sort keys alphabetically, false otherwise. Has priority over sortByValue.
-     * @param {boolean} [sortByValue] True to sort values alphabetically, false otherwise.
-     * @return {any[]} Array of objects with the name & value of each property.
+     * @param obj Object to convert.
+     * @param keyName Name of the properties where to store the keys.
+     * @param valueName Name of the properties where to store the values.
+     * @param sortByKey True to sort keys alphabetically, false otherwise. Has priority over sortByValue.
+     * @param sortByValue True to sort values alphabetically, false otherwise.
+     * @return Array of objects with the name & value of each property.
      */
     objectToArrayOfObjects(obj: object, keyName: string, valueName: string, sortByKey?: boolean, sortByValue?: boolean): any[] {
         // Get the entries from an object or primitive value.
@@ -1075,11 +1074,11 @@ export class CoreUtilsProvider {
      * Converts an array of objects into an object with key and value. The opposite of objectToArrayOfObjects.
      * For example, it can convert [{name: 'size', value: 2}] into {size: 2}.
      *
-     * @param {object[]} objects List of objects to convert.
-     * @param {string} keyName Name of the properties where the keys are stored.
-     * @param {string} valueName Name of the properties where the values are stored.
-     * @param {string} [keyPrefix] Key prefix if neededs to delete it.
-     * @return {object} Object.
+     * @param objects List of objects to convert.
+     * @param keyName Name of the properties where the keys are stored.
+     * @param valueName Name of the properties where the values are stored.
+     * @param keyPrefix Key prefix if neededs to delete it.
+     * @return Object.
      */
     objectToKeyValueMap(objects: object[], keyName: string, valueName: string, keyPrefix?: string): object {
         if (!objects) {
@@ -1099,9 +1098,9 @@ export class CoreUtilsProvider {
     /**
      * Convert an object to a format of GET param. E.g.: {a: 1, b: 2} -> a=1&b=2
      *
-     * @param {any} object Object to convert.
-     * @param {boolean} [removeEmpty=true] Whether to remove params whose value is null/undefined.
-     * @return {string} GET params.
+     * @param object Object to convert.
+     * @param removeEmpty Whether to remove params whose value is null/undefined.
+     * @return GET params.
      */
     objectToGetParams(object: any, removeEmpty: boolean = true): string {
         // First of all, flatten the object so all properties are in the first level.
@@ -1130,9 +1129,9 @@ export class CoreUtilsProvider {
     /**
      * Add a prefix to all the keys in an object.
      *
-     * @param {any} data Object.
-     * @param {string} prefix Prefix to add.
-     * @return {any} Prefixed object.
+     * @param data Object.
+     * @param prefix Prefix to add.
+     * @return Prefixed object.
      */
     prefixKeys(data: any, prefix: string): any {
         const newObj = {},
@@ -1148,7 +1147,7 @@ export class CoreUtilsProvider {
     /**
      * Similar to AngularJS $q.defer().
      *
-     * @return {PromiseDefer} The deferred promise.
+     * @return The deferred promise.
      */
     promiseDefer(): PromiseDefer {
         const deferred: PromiseDefer = {};
@@ -1163,8 +1162,8 @@ export class CoreUtilsProvider {
     /**
      * Given a promise, returns true if it's rejected or false if it's resolved.
      *
-     * @param {Promise<any>} promise Promise to check
-     * @return {Promise<boolean>} Promise resolved with boolean: true if the promise is rejected or false if it's resolved.
+     * @param promise Promise to check
+     * @return Promise resolved with boolean: true if the promise is rejected or false if it's resolved.
      */
     promiseFails(promise: Promise<any>): Promise<boolean> {
         return promise.then(() => {
@@ -1177,8 +1176,8 @@ export class CoreUtilsProvider {
     /**
      * Given a promise, returns true if it's resolved or false if it's rejected.
      *
-     * @param {Promise<any>} promise Promise to check
-     * @return {Promise<boolean>} Promise resolved with boolean: true if the promise it's resolved or false if it's rejected.
+     * @param promise Promise to check
+     * @return Promise resolved with boolean: true if the promise it's resolved or false if it's rejected.
      */
     promiseWorks(promise: Promise<any>): Promise<boolean> {
         return promise.then(() => {
@@ -1193,10 +1192,10 @@ export class CoreUtilsProvider {
      * Missing values are replaced by '', and the values are compared with ===.
      * Booleans and numbers are cast to string before comparing.
      *
-     * @param {any} obj1 The first object or array.
-     * @param {any} obj2 The second object or array.
-     * @param {string} key Key to check.
-     * @return {boolean} Whether the two objects/arrays have the same value (or lack of one) for a given key.
+     * @param obj1 The first object or array.
+     * @param obj2 The second object or array.
+     * @param key Key to check.
+     * @return Whether the two objects/arrays have the same value (or lack of one) for a given key.
      */
     sameAtKeyMissingIsBlank(obj1: any, obj2: any, key: string): boolean {
         let value1 = typeof obj1[key] != 'undefined' ? obj1[key] : '',
@@ -1216,8 +1215,8 @@ export class CoreUtilsProvider {
      * Stringify an object, sorting the properties. It doesn't sort arrays, only object properties. E.g.:
      * {b: 2, a: 1} -> '{"a":1,"b":2}'
      *
-     * @param {object} obj Object to stringify.
-     * @return {string} Stringified object.
+     * @param obj Object to stringify.
+     * @return Stringified object.
      */
     sortAndStringify(obj: object): string {
         return JSON.stringify(this.sortProperties(obj));
@@ -1226,8 +1225,8 @@ export class CoreUtilsProvider {
     /**
      * Given an object, sort its properties and the properties of all the nested objects.
      *
-     * @param {object} obj The object to sort. If it isn't an object, the original value will be returned.
-     * @return {object} Sorted object.
+     * @param obj The object to sort. If it isn't an object, the original value will be returned.
+     * @return Sorted object.
      */
     sortProperties(obj: object): object {
         if (typeof obj == 'object' && !Array.isArray(obj)) {
@@ -1246,8 +1245,8 @@ export class CoreUtilsProvider {
     /**
      * Given an object, sort its values. Values need to be primitive values, it cannot have subobjects.
      *
-     * @param {object} obj The object to sort. If it isn't an object, the original value will be returned.
-     * @return {object} Sorted object.
+     * @param obj The object to sort. If it isn't an object, the original value will be returned.
+     * @return Sorted object.
      */
     sortValues(obj: object): object {
         if (typeof obj == 'object' && !Array.isArray(obj)) {
@@ -1263,8 +1262,8 @@ export class CoreUtilsProvider {
     /**
      * Sum the filesizes from a list of files checking if the size will be partial or totally calculated.
      *
-     * @param {any[]} files List of files to sum its filesize.
-     * @return {{size: number, total: boolean}} File size and a boolean to indicate if it is the total size or only partial.
+     * @param files List of files to sum its filesize.
+     * @return File size and a boolean to indicate if it is the total size or only partial.
      */
     sumFileSizes(files: any[]): { size: number, total: boolean } {
         const result = {
@@ -1288,9 +1287,9 @@ export class CoreUtilsProvider {
      * Set a timeout to a Promise. If the time passes before the Promise is resolved or rejected, it will be automatically
      * rejected.
      *
-     * @param {Promise<T>} promise The promise to timeout.
-     * @param {number} time Number of milliseconds of the timeout.
-     * @return {Promise<T>} Promise with the timeout.
+     * @param promise The promise to timeout.
+     * @param time Number of milliseconds of the timeout.
+     * @return Promise with the timeout.
      */
     timeoutPromise<T>(promise: Promise<T>, time: number): Promise<T> {
         return new Promise((resolve, reject): void => {
@@ -1309,9 +1308,9 @@ export class CoreUtilsProvider {
      * Do NOT try to do any math operations before this conversion on any user submitted floats!
      * Based on Moodle's unformat_float function.
      *
-     * @param {any} localeFloat Locale aware float representation.
-     * @param {boolean} [strict] If true, then check the input and return false if it is not a valid number.
-     * @return {any} False if bad format, empty string if empty value or the parsed float if not.
+     * @param localeFloat Locale aware float representation.
+     * @param strict If true, then check the input and return false if it is not a valid number.
+     * @return False if bad format, empty string if empty value or the parsed float if not.
      */
     unformatFloat(localeFloat: any, strict?: boolean): any {
         // Bad format on input type number.
@@ -1348,9 +1347,9 @@ export class CoreUtilsProvider {
     /**
      * Return an array without duplicate values.
      *
-     * @param {any[]} array The array to treat.
+     * @param array The array to treat.
      * @param [key] Key of the property that must be unique. If not specified, the whole entry.
-     * @return {any[]} Array without duplicate values.
+     * @return Array without duplicate values.
      */
     uniqueArray(array: any[], key?: string): any[] {
         const filtered = [],
diff --git a/src/providers/ws.ts b/src/providers/ws.ts
index 636b00e0b..1d891cfa3 100644
--- a/src/providers/ws.ts
+++ b/src/providers/ws.ts
@@ -32,31 +32,26 @@ import { CoreInterceptor } from '@classes/interceptor';
 export interface CoreWSPreSets {
     /**
      * The site URL.
-     * @type {string}
      */
     siteUrl: string;
 
     /**
      * The Webservice token.
-     * @type {string}
      */
     wsToken: string;
 
     /**
      * Defaults to true. Set to false when the expected response is null.
-     * @type {boolean}
      */
     responseExpected?: boolean;
 
     /**
      * Defaults to 'object'. Use it when you expect a type that's not an object|array.
-     * @type {string}
      */
     typeExpected?: string;
 
     /**
      * Defaults to false. Clean multibyte Unicode chars from data.
-     * @type {string}
      */
     cleanUnicode?: boolean;
 }
@@ -67,25 +62,21 @@ export interface CoreWSPreSets {
 export interface CoreWSAjaxPreSets {
     /**
      * The site URL.
-     * @type {string}
      */
     siteUrl: string;
 
     /**
      * Defaults to true. Set to false when the expected response is null.
-     * @type {boolean}
      */
     responseExpected?: boolean;
 
     /**
      * Whether to use the no-login endpoint instead of the normal one. Use it for requests that don't require authentication.
-     * @type {boolean}
      */
     noLogin?: boolean;
 
     /**
      * Whether to send the parameters via GET. Only if noLogin is true.
-     * @type {boolean}
      */
     useGet?: boolean;
 }
@@ -96,19 +87,16 @@ export interface CoreWSAjaxPreSets {
 export interface CoreWSError {
     /**
      * The error message.
-     * @type {string}
      */
     message: string;
 
     /**
      * Name of the exception. Undefined for local errors (fake WS errors).
-     * @type {string}
      */
     exception?: string;
 
     /**
      * The error code. Undefined for local errors (fake WS errors).
-     * @type {string}
      */
     errorcode?: string;
 }
@@ -119,13 +107,11 @@ export interface CoreWSError {
 export interface CoreWSFileUploadOptions extends FileUploadOptions {
     /**
      * The file area where to put the file. By default, 'draft'.
-     * @type {string}
      */
     fileArea?: string;
 
     /**
      * Item ID of the area where to put the file. By default, 0.
-     * @type {number}
      */
     itemId?: number;
 }
@@ -151,12 +137,12 @@ export class CoreWSProvider {
     /**
      * Adds the call data to an special queue to be processed when retrying.
      *
-     * @param {string} method The WebService method to be called.
-     * @param {string} siteUrl Complete site url to perform the call.
-     * @param {any} ajaxData Arguments to pass to the method.
-     * @param {CoreWSPreSets} preSets Extra settings and information.
-     * @return {Promise<any>} Deferred promise resolved with the response data in success and rejected with the error message
-     *                        if it fails.
+     * @param method The WebService method to be called.
+     * @param siteUrl Complete site url to perform the call.
+     * @param ajaxData Arguments to pass to the method.
+     * @param preSets Extra settings and information.
+     * @return Deferred promise resolved with the response data in success and rejected with the error message
+     *         if it fails.
      */
     protected addToRetryQueue(method: string, siteUrl: string, ajaxData: any, preSets: CoreWSPreSets): Promise<any> {
         const call: any = {
@@ -180,10 +166,10 @@ export class CoreWSProvider {
     /**
      * A wrapper function for a moodle WebService call.
      *
-     * @param {string} method The WebService method to be called.
-     * @param {any} data Arguments to pass to the method. It's recommended to call convertValuesToString before passing the data.
-     * @param {CoreWSPreSets} preSets Extra settings and information.
-     * @return {Promise<any>} Promise resolved with the response data in success and rejected if it fails.
+     * @param method The WebService method to be called.
+     * @param data Arguments to pass to the method. It's recommended to call convertValuesToString before passing the data.
+     * @param preSets Extra settings and information.
+     * @return Promise resolved with the response data in success and rejected if it fails.
      */
     call(method: string, data: any, preSets: CoreWSPreSets): Promise<any> {
 
@@ -218,13 +204,13 @@ export class CoreWSProvider {
     /**
      * Call a Moodle WS using the AJAX API. Please use it if the WS layer is not an option.
      *
-     * @param {string} method The WebService method to be called.
-     * @param {any} data Arguments to pass to the method.
-     * @param {CoreWSAjaxPreSets} preSets Extra settings and information. Only some
-     * @return {Promise<any>} Promise resolved with the response data in success and rejected with an object containing:
-     *                                 - error: Error message.
-     *                                 - errorcode: Error code returned by the site (if any).
-     *                                 - available: 0 if unknown, 1 if available, -1 if not available.
+     * @param method The WebService method to be called.
+     * @param data Arguments to pass to the method.
+     * @param preSets Extra settings and information. Only some
+     * @return Promise resolved with the response data in success and rejected with an object containing:
+     *         - error: Error message.
+     *         - errorcode: Error code returned by the site (if any).
+     *         - available: 0 if unknown, 1 if available, -1 if not available.
      */
     callAjax(method: string, data: any, preSets: CoreWSAjaxPreSets): Promise<any> {
         let promise;
@@ -306,9 +292,9 @@ export class CoreWSProvider {
      * Converts an objects values to strings where appropriate.
      * Arrays (associative or otherwise) will be maintained, null values will be removed.
      *
-     * @param {object} data The data that needs all the non-object values set to strings.
-     * @param {boolean} [stripUnicode] If Unicode long chars need to be stripped.
-     * @return {object} The cleaned object or null if some strings becomes empty after stripping Unicode.
+     * @param data The data that needs all the non-object values set to strings.
+     * @param stripUnicode If Unicode long chars need to be stripped.
+     * @return The cleaned object or null if some strings becomes empty after stripping Unicode.
      */
     convertValuesToString(data: any, stripUnicode?: boolean): any {
         const result: any = Array.isArray(data) ? [] : {};
@@ -362,9 +348,9 @@ export class CoreWSProvider {
     /**
      * Create a "fake" WS error for local errors.
      *
-     * @param {string} message The message to include in the error.
-     * @param {boolean} [needsTranslate] If the message needs to be translated.
-     * @return {CoreWSError} Fake WS error.
+     * @param message The message to include in the error.
+     * @param needsTranslate If the message needs to be translated.
+     * @return Fake WS error.
      */
     createFakeWSError(message: string, needsTranslate?: boolean): CoreWSError {
         if (needsTranslate) {
@@ -379,11 +365,11 @@ export class CoreWSProvider {
     /**
      * Downloads a file from Moodle using Cordova File API.
      *
-     * @param {string} url Download url.
-     * @param {string} path Local path to store the file.
-     * @param {boolean} [addExtension] True if extension need to be added to the final path.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @return {Promise<any>} Promise resolved with the downloaded file.
+     * @param url Download url.
+     * @param path Local path to store the file.
+     * @param addExtension True if extension need to be added to the final path.
+     * @param onProgress Function to call on progress.
+     * @return Promise resolved with the downloaded file.
      */
     downloadFile(url: string, path: string, addExtension?: boolean, onProgress?: (event: ProgressEvent) => any): Promise<any> {
         this.logger.debug('Downloading file', url, path, addExtension);
@@ -455,9 +441,9 @@ export class CoreWSProvider {
     /**
      * Get a promise from the cache.
      *
-     * @param {string} method Method of the HTTP request.
-     * @param {string} url Base URL of the HTTP request.
-     * @param {any} [params] Params of the HTTP request.
+     * @param method Method of the HTTP request.
+     * @param url Base URL of the HTTP request.
+     * @param params Params of the HTTP request.
      */
     protected getPromiseHttp(method: string, url: string, params?: any): any {
         const queueItemId = this.getQueueItemId(method, url, params);
@@ -471,9 +457,9 @@ export class CoreWSProvider {
     /**
      * Perform a HEAD request to get the mimetype of a remote file.
      *
-     * @param {string} url File URL.
-     * @param {boolean} [ignoreCache] True to ignore cache, false otherwise.
-     * @return {Promise<string>} Promise resolved with the mimetype or '' if failure.
+     * @param url File URL.
+     * @param ignoreCache True to ignore cache, false otherwise.
+     * @return Promise resolved with the mimetype or '' if failure.
      */
     getRemoteFileMimeType(url: string, ignoreCache?: boolean): Promise<string> {
         if (this.mimeTypeCache[url] && !ignoreCache) {
@@ -498,8 +484,8 @@ export class CoreWSProvider {
     /**
      * Perform a HEAD request to get the size of a remote file.
      *
-     * @param {string} url File URL.
-     * @return {Promise<number>} Promise resolved with the size or -1 if failure.
+     * @param url File URL.
+     * @return Promise resolved with the size or -1 if failure.
      */
     getRemoteFileSize(url: string): Promise<number> {
         return this.performHead(url).then((data) => {
@@ -519,7 +505,7 @@ export class CoreWSProvider {
     /**
      * Get a request timeout based on the network connection.
      *
-     * @return {number} Timeout in ms.
+     * @return Timeout in ms.
      */
     getRequestTimeout(): number {
         return this.appProvider.isNetworkAccessLimited() ? CoreConstants.WS_TIMEOUT : CoreConstants.WS_TIMEOUT_WIFI;
@@ -528,10 +514,10 @@ export class CoreWSProvider {
     /**
      * Get the unique queue item id of the cache for a HTTP request.
      *
-     * @param {string} method Method of the HTTP request.
-     * @param {string} url Base URL of the HTTP request.
-     * @param {object} [params] Params of the HTTP request.
-     * @return {string} Queue item ID.
+     * @param method Method of the HTTP request.
+     * @param url Base URL of the HTTP request.
+     * @param params Params of the HTTP request.
+     * @return Queue item ID.
      */
     protected getQueueItemId(method: string, url: string, params?: any): string {
         if (params) {
@@ -544,8 +530,8 @@ export class CoreWSProvider {
     /**
      * Perform a HEAD request and save the promise while waiting to be resolved.
      *
-     * @param {string} url URL to perform the request.
-     * @return {Promise<any>} Promise resolved with the response.
+     * @param url URL to perform the request.
+     * @return Promise resolved with the response.
      */
     performHead(url: string): Promise<any> {
         let promise = this.getPromiseHttp('head', url);
@@ -561,11 +547,11 @@ export class CoreWSProvider {
     /**
      * Perform the post call and save the promise while waiting to be resolved.
      *
-     * @param {string} method The WebService method to be called.
-     * @param {string} siteUrl Complete site url to perform the call.
-     * @param {any} ajaxData Arguments to pass to the method.
-     * @param {CoreWSPreSets} preSets Extra settings and information.
-     * @return {Promise<any>} Promise resolved with the response data in success and rejected with CoreWSError if it fails.
+     * @param method The WebService method to be called.
+     * @param siteUrl Complete site url to perform the call.
+     * @param ajaxData Arguments to pass to the method.
+     * @param preSets Extra settings and information.
+     * @return Promise resolved with the response data in success and rejected with CoreWSError if it fails.
      */
     performPost(method: string, siteUrl: string, ajaxData: any, preSets: CoreWSPreSets): Promise<any> {
         const options = {};
@@ -687,11 +673,11 @@ export class CoreWSProvider {
     /**
      * Save promise on the cache.
      *
-     * @param {Promise<any>} promise Promise to be saved.
-     * @param {string} method Method of the HTTP request.
-     * @param {string} url Base URL of the HTTP request.
-     * @param {any} [params] Params of the HTTP request.
-     * @return {Promise<any>} The promise saved.
+     * @param promise Promise to be saved.
+     * @param method Method of the HTTP request.
+     * @param url Base URL of the HTTP request.
+     * @param params Params of the HTTP request.
+     * @return The promise saved.
      */
     protected setPromiseHttp(promise: Promise<any>, method: string, url: string, params?: any): Promise<any> {
         const queueItemId = this.getQueueItemId(method, url, params);
@@ -716,11 +702,11 @@ export class CoreWSProvider {
      * A wrapper function for a synchronous Moodle WebService call.
      * Warning: This function should only be used if synchronous is a must. It's recommended to use call.
      *
-     * @param {string} method The WebService method to be called.
-     * @param {any} data Arguments to pass to the method.
-     * @param {CoreWSPreSets} preSets Extra settings and information.
-     * @return {Promise} Promise resolved with the response data in success and rejected with the error message if it fails.
-     * @return {any} Request response. If the request fails, returns an object with 'error'=true and 'message' properties.
+     * @param method The WebService method to be called.
+     * @param data Arguments to pass to the method.
+     * @param preSets Extra settings and information.
+     * @return Promise resolved with the response data in success and rejected with the error message if it fails.
+     * @return Request response. If the request fails, returns an object with 'error'=true and 'message' properties.
      */
     syncCall(method: string, data: any, preSets: CoreWSPreSets): any {
         const errorResponse = {
@@ -809,11 +795,11 @@ export class CoreWSProvider {
     /*
      * Uploads a file.
      *
-     * @param {string} filePath File path.
-     * @param {CoreWSFileUploadOptions} options File upload options.
-     * @param {CoreWSPreSets} preSets Must contain siteUrl and wsToken.
-     * @param {Function} [onProgress] Function to call on progress.
-     * @return {Promise<any>} Promise resolved when uploaded.
+     * @param filePath File path.
+     * @param options File upload options.
+     * @param preSets Must contain siteUrl and wsToken.
+     * @param onProgress Function to call on progress.
+     * @return Promise resolved when uploaded.
      */
     uploadFile(filePath: string, options: CoreWSFileUploadOptions, preSets: CoreWSPreSets,
             onProgress?: (event: ProgressEvent) => any): Promise<any> {

From 31c5990593ba2aa0f4bf585669354c880372b2f4 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Fri, 13 Sep 2019 12:06:09 +0200
Subject: [PATCH 010/257] MOBILE-3147 doc: Fix typos

---
 src/addon/messages/pages/conversation-info/conversation-info.ts | 2 +-
 .../messages/pages/group-conversations/group-conversations.ts   | 2 +-
 src/components/infinite-loading/infinite-loading.ts             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/addon/messages/pages/conversation-info/conversation-info.ts b/src/addon/messages/pages/conversation-info/conversation-info.ts
index f28253463..eb8046fc1 100644
--- a/src/addon/messages/pages/conversation-info/conversation-info.ts
+++ b/src/addon/messages/pages/conversation-info/conversation-info.ts
@@ -69,7 +69,7 @@ export class AddonMessagesConversationInfoPage implements OnInit {
     /**
      * Get conversation members.
      *
-     * @param [loadingMore} Whether we are loading more data or just the first ones.
+     * @param loadingMore Whether we are loading more data or just the first ones.
      * @return Promise resolved when done.
      */
     protected fetchMembers(loadingMore?: boolean): Promise<any> {
diff --git a/src/addon/messages/pages/group-conversations/group-conversations.ts b/src/addon/messages/pages/group-conversations/group-conversations.ts
index de862bc39..e35485724 100644
--- a/src/addon/messages/pages/group-conversations/group-conversations.ts
+++ b/src/addon/messages/pages/group-conversations/group-conversations.ts
@@ -345,7 +345,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
      * Fetch data for a certain option.
      *
      * @param option The option to fetch data for.
-     * @param [loadingMore} Whether we are loading more data or just the first ones.
+     * @param loadingMore Whether we are loading more data or just the first ones.
      * @param getCounts Whether to get counts data.
      * @return Promise resolved when done.
      */
diff --git a/src/components/infinite-loading/infinite-loading.ts b/src/components/infinite-loading/infinite-loading.ts
index 5c5a3ff18..5d19ac215 100644
--- a/src/components/infinite-loading/infinite-loading.ts
+++ b/src/components/infinite-loading/infinite-loading.ts
@@ -48,7 +48,7 @@ export class CoreInfiniteLoadingComponent implements OnChanges {
     /**
      * Detect changes on input properties.
      *
-     * @param } changes Changes.
+     * @param changes Changes.
      */
     ngOnChanges(changes: {[name: string]: SimpleChange}): void {
         if (changes.enabled && this.enabled && this.position == 'bottom') {

From 6c56a83edeeacacd7803c05f207329a85eefcf10 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 23 Sep 2019 10:16:42 +0200
Subject: [PATCH 011/257] MOBILE-3173 quiz: Fix get amd data in ddmarker
 questions

---
 src/core/question/providers/helper.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/question/providers/helper.ts b/src/core/question/providers/helper.ts
index e564a97d8..3f06e0929 100644
--- a/src/core/question/providers/helper.ts
+++ b/src/core/question/providers/helper.ts
@@ -275,9 +275,9 @@ export class CoreQuestionHelperProvider {
                     question.initObjects = this.textUtils.parseJSON(initMatch, null);
                 }
 
-                const amdRegExp = new RegExp('require\\(\\["qtype_' + question.type + '/question"\\], ' +
-                    'function\\(amd\\) \\{ amd\.init\\(("(q|question-' + usageId + '-)' + question.slot +
-                    '".*?)\\); \\}\\);;', 'm');
+                const amdRegExp = new RegExp('require\\(\\[["\']qtype_' + question.type + '/question["\']\\], ?' +
+                    'function\\(amd\\) ?\\{ ?amd\\.init\\((["\'](q|question-' + usageId + '-)' + question.slot +
+                    '["\'].*?)\\);', 'm');
                 const amdMatch = match.match(amdRegExp);
                 if (amdMatch) {
                     // Try to convert the arguments to an array and add them to the question.

From 0c6c1b6383605074c9fb6ffffb64bf0126b35b43 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 2 Aug 2019 11:53:48 +0200
Subject: [PATCH 012/257] MOBILE-3109 scripts: Create a script to convert PHP
 to TS

---
 scripts/functions.sh           |   4 +
 scripts/get_ws_ts.php          |  69 +++++++++++++++++
 scripts/ws_to_ts_functions.php | 138 +++++++++++++++++++++++++++++++++
 src/providers/ws.ts            |  85 ++++++++++++++++++++
 4 files changed, 296 insertions(+)
 create mode 100644 scripts/get_ws_ts.php
 create mode 100644 scripts/ws_to_ts_functions.php

diff --git a/scripts/functions.sh b/scripts/functions.sh
index ed1472357..87e5e5c43 100644
--- a/scripts/functions.sh
+++ b/scripts/functions.sh
@@ -21,16 +21,19 @@ function print_success {
 
 function print_error {
     tput setaf 1; echo "  ERROR:  $1"
+    tput setaf 0
 }
 
 function print_ok {
     tput setaf 2; echo "     OK:  $1"
     echo
+    tput setaf 0
 }
 
 function print_message {
     tput setaf 3; echo "--------  $1"
     echo
+    tput setaf 0
 }
 
 function print_title {
@@ -38,4 +41,5 @@ function print_title {
     echo
     tput setaf 5; echo "$stepnumber $1"
     tput setaf 5; echo '=================='
+    tput setaf 0
 }
\ No newline at end of file
diff --git a/scripts/get_ws_ts.php b/scripts/get_ws_ts.php
new file mode 100644
index 000000000..4c93260ec
--- /dev/null
+++ b/scripts/get_ws_ts.php
@@ -0,0 +1,69 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Script for converting a PHP WS structure to a TS type.
+ *
+ * The first parameter (required) is the path to the Moodle installation to use.
+ * The second parameter (required) is the name to the WS to convert.
+ * The third parameter (optional) is the name to put to the TS type. Defaults to "TypeName".
+ * The fourth parameter (optional) is a boolean: true to convert the params structure,
+ * false to convert the returns structure. Defaults to false.
+ */
+
+if (!isset($argv[1])) {
+    echo "ERROR: Please pass the Moodle path as the first parameter.\n";
+    die();
+}
+
+
+if (!isset($argv[2])) {
+    echo "ERROR: Please pass the WS name as the second parameter.\n";
+    die();
+}
+
+$moodlepath = $argv[1];
+$wsname = $argv[2];
+$typename = isset($argv[3]) ? $argv[3] : 'TypeName';
+$useparams = !!(isset($argv[4]) && $argv[4]);
+
+define('CLI_SCRIPT', true);
+
+require($moodlepath . '/config.php');
+require($CFG->dirroot . '/webservice/lib.php');
+require_once('ws_to_ts_functions.php');
+
+// get all the function descriptions
+$functions = $DB->get_records('external_functions', array(), 'name');
+$functiondescs = array();
+foreach ($functions as $function) {
+    $functiondescs[$function->name] = external_api::external_function_info($function);
+}
+
+if (!isset($functiondescs[$wsname])) {
+    echo "ERROR: The WS wasn't found in this Moodle installation.\n";
+    die();
+}
+
+if ($useparams) {
+    $structure = $functiondescs[$wsname]->parameters_desc;
+    $description = "Params of WS $wsname.";
+} else {
+    $structure = $functiondescs[$wsname]->returns_desc;
+    $description = "Result of WS $wsname.";
+}
+
+echo get_ts_doc(null, $description, '') . "export type $typename = " . convert_to_ts(null, $structure, $useparams) . ";\n";
diff --git a/scripts/ws_to_ts_functions.php b/scripts/ws_to_ts_functions.php
new file mode 100644
index 000000000..c6eb60332
--- /dev/null
+++ b/scripts/ws_to_ts_functions.php
@@ -0,0 +1,138 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Helper functions for converting a Moodle WS structure to a TS type.
+ */
+
+/**
+ * Fix a comment: make sure first letter is uppercase and add a dot at the end if needed.
+ */
+function fix_comment($desc) {
+    $desc = trim($desc);
+    $desc = ucfirst($desc);
+
+    if (substr($desc, -1) !== '.') {
+        $desc .= '.';
+    }
+
+    return $desc;
+}
+
+/**
+ * Get an inline comment based on a certain text.
+ */
+function get_inline_comment($desc) {
+    if (empty($desc)) {
+        return '';
+    }
+
+    return ' // ' . fix_comment($desc);
+}
+
+/**
+ * Add the TS documentation of a certain element.
+ */
+function get_ts_doc($type, $desc, $indentation) {
+    if (empty($desc)) {
+        // If no key, it's probably in an array. We only document object properties.
+        return '';
+    }
+
+    return $indentation . "/**\n" .
+           $indentation . " * " . fix_comment($desc) . "\n" .
+           (!empty($type) ? ($indentation . " * @type {" . $type . "}\n") : '') .
+           $indentation . " */\n";
+}
+
+/**
+ * Specify a certain type, with or without a key.
+ */
+function convert_key_type($key, $type, $required, $indentation) {
+    if ($key) {
+        // It has a key, it's inside an object.
+        return $indentation . "$key" . ($required == VALUE_OPTIONAL ? '?' : '') . ": $type";
+    } else {
+        // No key, it's probably in an array. Just include the type.
+        return $type;
+    }
+}
+
+/**
+ * Convert a certain element into a TS structure.
+ */
+function convert_to_ts($key, $value, $boolisnumber = false, $indentation = '', $arraydesc = '') {
+    if ($value instanceof external_value || $value instanceof external_warnings || $value instanceof external_files) {
+        // It's a basic field or a pre-defined type like warnings.
+        $type = 'string';
+
+        if ($value instanceof external_warnings) {
+            $type = 'CoreWSExternalWarning[]';
+        } else if ($value instanceof external_files) {
+            $type = 'CoreWSExternalFile[]';
+        } else if ($value->type == PARAM_BOOL && !$boolisnumber) {
+            $type = 'boolean';
+        } else if (($value->type == PARAM_BOOL && $boolisnumber) || $value->type == PARAM_INT || $value->type == PARAM_FLOAT ||
+                $value->type == PARAM_LOCALISEDFLOAT || $value->type == PARAM_PERMISSION || $value->type == PARAM_INTEGER ||
+                $value->type == PARAM_NUMBER) {
+            $type = 'number';
+        }
+
+        $result = convert_key_type($key, $type, $value->required, $indentation);
+
+        return $result;
+
+    } else if ($value instanceof external_single_structure) {
+        // It's an object.
+        $result = convert_key_type($key, '{', $value->required, $indentation);
+
+        if ($arraydesc) {
+            // It's an array of objects. Print the array description now.
+            $result .= get_inline_comment($arraydesc);
+        }
+
+        $result .= "\n";
+
+        foreach ($value->keys as $key => $value) {
+            $result .= convert_to_ts($key, $value, $boolisnumber, $indentation . '    ') . ';';
+
+            if (!$value instanceof external_multiple_structure || !$value->content instanceof external_single_structure) {
+                // Add inline comments after the field, except for arrays of objects where it's added at the start.
+                $result .= get_inline_comment($value->desc);
+            }
+
+            $result .= "\n";
+        }
+
+        $result .= "$indentation}";
+
+        return $result;
+
+    } else if ($value instanceof external_multiple_structure) {
+        // It's an array.
+        $result = convert_key_type($key, '', $value->required, $indentation);
+
+        $result .= convert_to_ts(null, $value->content, $boolisnumber, $indentation, $value->desc);
+
+        $result .= "[]";
+
+        return $result;
+    } else {
+        echo "WARNING: Unknown structure: $key " . get_class($value) . " \n";
+
+        return "";
+    }
+}
diff --git a/src/providers/ws.ts b/src/providers/ws.ts
index 1d891cfa3..cb8aa6eed 100644
--- a/src/providers/ws.ts
+++ b/src/providers/ws.ts
@@ -116,6 +116,91 @@ export interface CoreWSFileUploadOptions extends FileUploadOptions {
     itemId?: number;
 }
 
+
+/**
+ * Structure of warnings returned by WS.
+ */
+export type CoreWSExternalWarning = {
+    /**
+     * Item.
+     * @type {string}
+     */
+    item?: string;
+
+    /**
+     * Item id.
+     * @type {number}
+     */
+    itemid?: number;
+
+    /**
+     * The warning code can be used by the client app to implement specific behaviour.
+     * @type {string}
+     */
+    warningcode: string;
+
+    /**
+     * Untranslated english message to explain the warning.
+     * @type {string}
+     */
+    message: string;
+
+};
+
+/**
+ * Structure of files returned by WS.
+ */
+export type CoreWSExternalFile = {
+    /**
+     * File name.
+     * @type {string}
+     */
+    filename?: string;
+
+    /**
+     * File path.
+     * @type {string}
+     */
+    filepath?: string;
+
+    /**
+     * File size.
+     * @type {number}
+     */
+    filesize?: number;
+
+    /**
+     * Downloadable file url.
+     * @type {string}
+     */
+    fileurl?: string;
+
+    /**
+     * Time modified.
+     * @type {number}
+     */
+    timemodified?: number;
+
+    /**
+     * File mime type.
+     * @type {string}
+     */
+    mimetype?: string;
+
+    /**
+     * Whether is an external file.
+     * @type {number}
+     */
+    isexternalfile?: number;
+
+    /**
+     * The repository type for external files.
+     * @type {string}
+     */
+    repositorytype?: string;
+
+};
+
 /**
  * This service allows performing WS calls and download/upload files.
  */

From b2497a1dd0ccbafda6dea4cebc7acedd2a55ba2c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 2 Sep 2019 11:34:48 +0200
Subject: [PATCH 013/257] MOBILE-3109 addon: Add return types to all addons
 except mod

---
 .../pages/issued-badge/issued-badge.html      |  16 +-
 .../badges/pages/issued-badge/issued-badge.ts |   4 +-
 .../badges/pages/user-badges/user-badges.ts   |   4 +-
 src/addon/badges/providers/badges.ts          |  76 ++-
 .../recentlyaccesseditems.ts                  |   6 +-
 .../providers/recentlyaccesseditems.ts        |  30 +-
 .../timeline/components/timeline/timeline.ts  |   5 +-
 .../block/timeline/providers/timeline.ts      |  34 +-
 src/addon/blog/components/entries/entries.ts  |  15 +-
 src/addon/blog/providers/blog.ts              |  51 +-
 .../blog/providers/course-option-handler.ts   |   3 +-
 .../calendar/components/calendar/calendar.ts  |   4 +-
 .../addon-calendar-upcoming-events.html       |   2 +-
 .../upcoming-events/upcoming-events.ts        |   6 +-
 src/addon/calendar/pages/day/day.html         |   2 +-
 src/addon/calendar/pages/day/day.ts           |   6 +-
 .../calendar/pages/edit-event/edit-event.html |   2 +-
 .../calendar/pages/edit-event/edit-event.ts   |  15 +-
 src/addon/calendar/pages/event/event.html     |   4 +-
 src/addon/calendar/pages/list/list.html       |   2 +-
 src/addon/calendar/pages/list/list.ts         |  10 +-
 src/addon/calendar/providers/calendar.ts      | 421 +++++++++++--
 src/addon/calendar/providers/helper.ts        |  14 +-
 .../competency/components/course/course.ts    |   4 +-
 .../pages/competencies/competencies.ts        |  24 +-
 .../pages/competency/competency.html          |  10 +-
 .../competency/pages/competency/competency.ts |  32 +-
 .../competencysummary/competencysummary.ts    |   7 +-
 src/addon/competency/pages/plan/plan.html     |   3 +-
 src/addon/competency/pages/plan/plan.ts       |   7 +-
 .../competency/pages/planlist/planlist.ts     |  13 +-
 src/addon/competency/providers/competency.ts  | 470 +++++++++++++-
 .../addon-course-completion-report.html       |   2 +-
 .../components/report/report.ts               |   7 +-
 .../providers/coursecompletion.ts             |  58 +-
 src/addon/files/pages/list/list.ts            |   8 +-
 src/addon/files/providers/files.ts            |  77 ++-
 .../airnotifier/pages/devices/devices.ts      |  17 +-
 .../airnotifier/providers/airnotifier.ts      |  45 +-
 .../confirmed-contacts/confirmed-contacts.ts  |   4 +-
 .../contact-requests/contact-requests.ts      |   4 +-
 .../messages/components/contacts/contacts.ts  |  18 +-
 .../conversation-info/conversation-info.ts    |   8 +-
 .../messages/pages/discussion/discussion.ts   | 127 ++--
 .../group-conversations.ts                    |  62 +-
 src/addon/messages/pages/search/search.ts     |  14 +-
 src/addon/messages/pages/settings/settings.ts |  40 +-
 .../messages/providers/mainmenu-handler.ts    |   2 +-
 src/addon/messages/providers/messages.ts      | 595 +++++++++++++++---
 src/addon/messages/providers/sync.ts          |   4 +-
 src/addon/notes/components/list/list.ts       |  22 +-
 src/addon/notes/providers/notes.ts            |  79 ++-
 src/addon/notifications/pages/list/list.ts    |  11 +-
 .../notifications/pages/settings/settings.ts  |  44 +-
 src/addon/notifications/providers/helper.ts   |   8 +-
 .../notifications/providers/notifications.ts  | 226 ++++++-
 src/core/comments/providers/comments.ts       |  24 +
 src/core/course/providers/course.ts           |  35 ++
 src/core/tag/providers/tag.ts                 | 136 ++--
 src/core/user/providers/user.ts               |  18 +
 src/providers/ws.ts                           | 244 +++----
 61 files changed, 2607 insertions(+), 634 deletions(-)

diff --git a/src/addon/badges/pages/issued-badge/issued-badge.html b/src/addon/badges/pages/issued-badge/issued-badge.html
index 111cc8a8f..565993bec 100644
--- a/src/addon/badges/pages/issued-badge/issued-badge.html
+++ b/src/addon/badges/pages/issued-badge/issued-badge.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title>{{badge.name}}</ion-title>
+        <ion-title>{{badge && badge.name}}</ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>
@@ -9,7 +9,7 @@
     </ion-refresher>
     <core-loading [hideUntil]="badgeLoaded">
 
-        <ion-item-group>
+        <ion-item-group *ngIf="badge">
             <ion-item text-wrap class="item-avatar-center">
                 <img *ngIf="badge.badgeurl" class="avatar" [src]="badge.badgeurl" core-external-content [alt]="badge.name">
                 <ion-badge color="danger" *ngIf="badge.dateexpire && currentTime >= badge.dateexpire">
@@ -30,7 +30,7 @@
             </ion-item>
         </ion-item-group>
 
-        <ion-item-group>
+        <ion-item-group *ngIf="badge">
             <ion-item-divider>
                 <h2>{{ 'addon.badges.issuerdetails' | translate}}</h2>
             </ion-item-divider>
@@ -48,7 +48,7 @@
             </ion-item>
         </ion-item-group>
 
-        <ion-item-group>
+        <ion-item-group *ngIf="badge">
             <ion-item-divider>
                 <h2>{{ 'addon.badges.badgedetails' | translate}}</h2>
             </ion-item-divider>
@@ -99,7 +99,7 @@
             <!-- Criteria (not yet avalaible) -->
         </ion-item-group>
 
-        <ion-item-group>
+        <ion-item-group *ngIf="badge">
             <ion-item-divider>
                 <h2>{{ 'addon.badges.issuancedetails' | translate}}</h2>
             </ion-item-divider>
@@ -120,7 +120,7 @@
         </ion-item-group>
 
         <!-- Endorsement -->
-        <ion-item-group *ngIf="badge.endorsement">
+        <ion-item-group *ngIf="badge && badge.endorsement">
             <ion-item-divider>
                 <h2>{{ 'addon.badges.bendorsement' | translate}}</h2>
             </ion-item-divider>
@@ -159,7 +159,7 @@
         </ion-item-group>
 
         <!-- Related badges -->
-        <ion-item-group *ngIf="badge.relatedbadges">
+        <ion-item-group *ngIf="badge && badge.relatedbadges">
             <ion-item-divider>
                 <h2>{{ 'addon.badges.relatedbages' | translate}}</h2>
             </ion-item-divider>
@@ -172,7 +172,7 @@
         </ion-item-group>
 
         <!-- Competencies alignment -->
-        <ion-item-group *ngIf="badge.competencies">
+        <ion-item-group *ngIf="badge && badge.competencies">
             <ion-item-divider>
                 <h2>{{ 'addon.badges.alignment' | translate}}</h2>
             </ion-item-divider>
diff --git a/src/addon/badges/pages/issued-badge/issued-badge.ts b/src/addon/badges/pages/issued-badge/issued-badge.ts
index d33990ddb..ba99f1bc2 100644
--- a/src/addon/badges/pages/issued-badge/issued-badge.ts
+++ b/src/addon/badges/pages/issued-badge/issued-badge.ts
@@ -19,7 +19,7 @@ import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreUserProvider } from '@core/user/providers/user';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
-import { AddonBadgesProvider } from '../../providers/badges';
+import { AddonBadgesProvider, AddonBadgesUserBadge } from '../../providers/badges';
 
 /**
  * Page that displays the list of calendar events.
@@ -38,7 +38,7 @@ export class AddonBadgesIssuedBadgePage {
 
     user: any = {};
     course: any = {};
-    badge: any = {};
+    badge: AddonBadgesUserBadge;
 
     badgeLoaded = false;
     currentTime = 0;
diff --git a/src/addon/badges/pages/user-badges/user-badges.ts b/src/addon/badges/pages/user-badges/user-badges.ts
index fe5ea5c1c..d25b88627 100644
--- a/src/addon/badges/pages/user-badges/user-badges.ts
+++ b/src/addon/badges/pages/user-badges/user-badges.ts
@@ -14,7 +14,7 @@
 
 import { Component, ViewChild } from '@angular/core';
 import { IonicPage, Content, NavParams } from 'ionic-angular';
-import { AddonBadgesProvider } from '../../providers/badges';
+import { AddonBadgesProvider, AddonBadgesUserBadge } from '../../providers/badges';
 import { CoreTimeUtilsProvider } from '@providers/utils/time';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreSitesProvider } from '@providers/sites';
@@ -36,7 +36,7 @@ export class AddonBadgesUserBadgesPage {
     userId: number;
 
     badgesLoaded = false;
-    badges = [];
+    badges: AddonBadgesUserBadge[] = [];
     currentTime = 0;
     badgeHash: string;
 
diff --git a/src/addon/badges/providers/badges.ts b/src/addon/badges/providers/badges.ts
index f2b16814b..6cf3a29bf 100644
--- a/src/addon/badges/providers/badges.ts
+++ b/src/addon/badges/providers/badges.ts
@@ -15,6 +15,7 @@
 import { Injectable } from '@angular/core';
 import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider } from '@providers/sites';
+import { CoreWSExternalWarning } from '@providers/ws';
 import { CoreSite } from '@classes/site';
 
 /**
@@ -70,7 +71,7 @@ export class AddonBadgesProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise to be resolved when the badges are retrieved.
      */
-    getUserBadges(courseId: number, userId: number, siteId?: string): Promise<any> {
+    getUserBadges(courseId: number, userId: number, siteId?: string): Promise<AddonBadgesUserBadge[]> {
 
         this.logger.debug('Get badges for course ' + courseId);
 
@@ -110,3 +111,76 @@ export class AddonBadgesProvider {
         });
     }
 }
+
+/**
+ * Result of WS core_badges_get_user_badges.
+ */
+export type AddonBadgesGetUserBadgesResult = {
+    badges: AddonBadgesUserBadge[]; // List of badges.
+    warnings?: CoreWSExternalWarning[]; // List of warnings.
+};
+
+/**
+ * Badge data returned by WS core_badges_get_user_badges.
+ */
+export type AddonBadgesUserBadge = {
+    id?: number; // Badge id.
+    name: string; // Badge name.
+    description: string; // Badge description.
+    timecreated?: number; // Time created.
+    timemodified?: number; // Time modified.
+    usercreated?: number; // User created.
+    usermodified?: number; // User modified.
+    issuername: string; // Issuer name.
+    issuerurl: string; // Issuer URL.
+    issuercontact: string; // Issuer contact.
+    expiredate?: number; // Expire date.
+    expireperiod?: number; // Expire period.
+    type?: number; // Type.
+    courseid?: number; // Course id.
+    message?: string; // Message.
+    messagesubject?: string; // Message subject.
+    attachment?: number; // Attachment.
+    notification?: number; // @since 3.6. Whether to notify when badge is awarded.
+    nextcron?: number; // @since 3.6. Next cron.
+    status?: number; // Status.
+    issuedid?: number; // Issued id.
+    uniquehash: string; // Unique hash.
+    dateissued: number; // Date issued.
+    dateexpire: number; // Date expire.
+    visible?: number; // Visible.
+    email?: string; // @since 3.6. User email.
+    version?: string; // @since 3.6. Version.
+    language?: string; // @since 3.6. Language.
+    imageauthorname?: string; // @since 3.6. Name of the image author.
+    imageauthoremail?: string; // @since 3.6. Email of the image author.
+    imageauthorurl?: string; // @since 3.6. URL of the image author.
+    imagecaption?: string; // @since 3.6. Caption of the image.
+    badgeurl: string; // Badge URL.
+    endorsement?: { // @since 3.6.
+        id: number; // Endorsement id.
+        badgeid: number; // Badge id.
+        issuername: string; // Endorsement issuer name.
+        issuerurl: string; // Endorsement issuer URL.
+        issueremail: string; // Endorsement issuer email.
+        claimid: string; // Claim URL.
+        claimcomment: string; // Claim comment.
+        dateissued: number; // Date issued.
+    };
+    alignment: { // @since 3.6. Badge alignments.
+        id?: number; // Alignment id.
+        badgeid?: number; // Badge id.
+        targetName?: string; // Target name.
+        targetUrl?: string; // Target URL.
+        targetDescription?: string; // Target description.
+        targetFramework?: string; // Target framework.
+        targetCode?: string; // Target code.
+    }[];
+    relatedbadges: { // @since 3.6. Related badges.
+        id: number; // Badge id.
+        name: string; // Badge name.
+        version?: string; // Version.
+        language?: string; // Language.
+        type?: number; // Type.
+    }[];
+};
diff --git a/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts b/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts
index 6aa7b3650..4c232f39f 100644
--- a/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts
+++ b/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts
@@ -16,7 +16,9 @@ import { Component, OnInit, Injector, Optional } from '@angular/core';
 import { NavController } from 'ionic-angular';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreBlockBaseComponent } from '@core/block/classes/base-block-component';
-import { AddonBlockRecentlyAccessedItemsProvider } from '../../providers/recentlyaccesseditems';
+import {
+    AddonBlockRecentlyAccessedItemsProvider, AddonBlockRecentlyAccessedItemsItem
+} from '../../providers/recentlyaccesseditems';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
 import { CoreContentLinksHelperProvider } from '@core/contentlinks/providers/helper';
 
@@ -28,7 +30,7 @@ import { CoreContentLinksHelperProvider } from '@core/contentlinks/providers/hel
     templateUrl: 'addon-block-recentlyaccesseditems.html'
 })
 export class AddonBlockRecentlyAccessedItemsComponent extends CoreBlockBaseComponent implements OnInit {
-    items = [];
+    items: AddonBlockRecentlyAccessedItemsItem[] = [];
 
     protected fetchContentDefaultError = 'Error getting recently accessed items data.';
 
diff --git a/src/addon/block/recentlyaccesseditems/providers/recentlyaccesseditems.ts b/src/addon/block/recentlyaccesseditems/providers/recentlyaccesseditems.ts
index a24bc035c..414b2366f 100644
--- a/src/addon/block/recentlyaccesseditems/providers/recentlyaccesseditems.ts
+++ b/src/addon/block/recentlyaccesseditems/providers/recentlyaccesseditems.ts
@@ -42,14 +42,16 @@ export class AddonBlockRecentlyAccessedItemsProvider {
      * @param siteId Site ID. If not defined, use current site.
      * @return Promise resolved when the info is retrieved.
      */
-    getRecentItems(siteId?: string): Promise<any[]> {
+    getRecentItems(siteId?: string): Promise<AddonBlockRecentlyAccessedItemsItem[]> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             const preSets = {
                     cacheKey: this.getRecentItemsCacheKey()
                 };
 
-            return site.read('block_recentlyaccesseditems_get_recent_items', undefined, preSets).then((items) => {
+            return site.read('block_recentlyaccesseditems_get_recent_items', undefined, preSets)
+                    .then((items: AddonBlockRecentlyAccessedItemsItem[]) => {
+
                 return items.map((item) => {
                     const modicon = item.icon && this.domUtils.getHTMLElementAttribute(item.icon, 'src');
                     item.iconUrl = this.courseProvider.getModuleIconSrc(item.modname, modicon);
@@ -72,3 +74,27 @@ export class AddonBlockRecentlyAccessedItemsProvider {
         });
     }
 }
+
+/**
+ * Result of WS block_recentlyaccesseditems_get_recent_items.
+ */
+export type AddonBlockRecentlyAccessedItemsItem = {
+    id: number; // Id.
+    courseid: number; // Courseid.
+    cmid: number; // Cmid.
+    userid: number; // Userid.
+    modname: string; // Modname.
+    name: string; // Name.
+    coursename: string; // Coursename.
+    timeaccess: number; // Timeaccess.
+    viewurl: string; // Viewurl.
+    courseviewurl: string; // Courseviewurl.
+    icon: string; // Icon.
+} & AddonBlockRecentlyAccessedItemsItemCalculatedData;
+
+/**
+ * Calculated data for recently accessed item.
+ */
+export type AddonBlockRecentlyAccessedItemsItemCalculatedData = {
+    iconUrl: string; // Icon URL. Calculated by the app.
+};
diff --git a/src/addon/block/timeline/components/timeline/timeline.ts b/src/addon/block/timeline/components/timeline/timeline.ts
index 8325cbcf3..68e104bbe 100644
--- a/src/addon/block/timeline/components/timeline/timeline.ts
+++ b/src/addon/block/timeline/components/timeline/timeline.ts
@@ -21,6 +21,7 @@ import { CoreCoursesHelperProvider } from '@core/courses/providers/helper';
 import { CoreCourseOptionsDelegate } from '@core/course/providers/options-delegate';
 import { CoreBlockBaseComponent } from '@core/block/classes/base-block-component';
 import { AddonBlockTimelineProvider } from '../../providers/timeline';
+import { AddonCalendarEvent } from '@addon/calendar/providers/calendar';
 
 /**
  * Component to render a timeline block.
@@ -34,9 +35,9 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
     filter = 'next30days';
     currentSite: any;
     timeline = {
-        events: [],
+        events: <AddonCalendarEvent[]> [],
         loaded: false,
-        canLoadMore: undefined
+        canLoadMore: <number> undefined
     };
     timelineCourses = {
         courses: [],
diff --git a/src/addon/block/timeline/providers/timeline.ts b/src/addon/block/timeline/providers/timeline.ts
index 6f90184e8..66d4bcd43 100644
--- a/src/addon/block/timeline/providers/timeline.ts
+++ b/src/addon/block/timeline/providers/timeline.ts
@@ -15,6 +15,7 @@
 import { Injectable } from '@angular/core';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreCoursesDashboardProvider } from '@core/courses/providers/dashboard';
+import { AddonCalendarEvents, AddonCalendarEventsGroupedByCourse, AddonCalendarEvent } from '@addon/calendar/providers/calendar';
 import * as moment from 'moment';
 
 /**
@@ -38,7 +39,7 @@ export class AddonBlockTimelineProvider {
      * @return Promise resolved when the info is retrieved.
      */
     getActionEventsByCourse(courseId: number, afterEventId?: number, siteId?: string):
-            Promise<{ events: any[], canLoadMore: number }> {
+            Promise<{ events: AddonCalendarEvent[], canLoadMore: number }> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             const time = moment().subtract(14, 'days').unix(), // Check two weeks ago.
@@ -55,7 +56,9 @@ export class AddonBlockTimelineProvider {
                 data.aftereventid = afterEventId;
             }
 
-            return site.read('core_calendar_get_action_events_by_course', data, preSets).then((courseEvents): any => {
+            return site.read('core_calendar_get_action_events_by_course', data, preSets)
+                    .then((courseEvents: AddonCalendarEvents): any => {
+
                 if (courseEvents && courseEvents.events) {
                     return this.treatCourseEvents(courseEvents, time);
                 }
@@ -82,8 +85,9 @@ export class AddonBlockTimelineProvider {
      * @param siteId Site ID. If not defined, use current site.
      * @return Promise resolved when the info is retrieved.
      */
-    getActionEventsByCourses(courseIds: number[], siteId?: string): Promise<{ [s: string]:
-            { events: any[], canLoadMore: number } }> {
+    getActionEventsByCourses(courseIds: number[], siteId?: string): Promise<{ [courseId: string]:
+            { events: AddonCalendarEvent[], canLoadMore: number } }> {
+
         return this.sitesProvider.getSite(siteId).then((site) => {
             const time = moment().subtract(14, 'days').unix(), // Check two weeks ago.
                 data = {
@@ -95,7 +99,9 @@ export class AddonBlockTimelineProvider {
                     cacheKey: this.getActionEventsByCoursesCacheKey()
                 };
 
-            return site.read('core_calendar_get_action_events_by_courses', data, preSets).then((events): any => {
+            return site.read('core_calendar_get_action_events_by_courses', data, preSets)
+                    .then((events: AddonCalendarEventsGroupedByCourse): any => {
+
                 if (events && events.groupedbycourse) {
                     const courseEvents = {};
 
@@ -127,7 +133,9 @@ export class AddonBlockTimelineProvider {
      * @param siteId Site ID. If not defined, use current site.
      * @return Promise resolved when the info is retrieved.
      */
-    getActionEventsByTimesort(afterEventId: number, siteId?: string): Promise<{ events: any[], canLoadMore: number }> {
+    getActionEventsByTimesort(afterEventId: number, siteId?: string):
+            Promise<{ events: AddonCalendarEvent[], canLoadMore: number }> {
+
         return this.sitesProvider.getSite(siteId).then((site) => {
             const time = moment().subtract(14, 'days').unix(), // Check two weeks ago.
                 data: any = {
@@ -144,12 +152,14 @@ export class AddonBlockTimelineProvider {
                 data.aftereventid = afterEventId;
             }
 
-            return site.read('core_calendar_get_action_events_by_timesort', data, preSets).then((events): any => {
-                if (events && events.events) {
-                    const canLoadMore = events.events.length >= data.limitnum ? events.lastid : undefined;
+            return site.read('core_calendar_get_action_events_by_timesort', data, preSets)
+                    .then((result: AddonCalendarEvents): any => {
+
+                if (result && result.events) {
+                    const canLoadMore = result.events.length >= data.limitnum ? result.lastid : undefined;
 
                     // Filter events by time in case it uses cache.
-                    events = events.events.filter((element) => {
+                    const events = result.events.filter((element) => {
                         return element.timesort >= time;
                     });
 
@@ -236,7 +246,9 @@ export class AddonBlockTimelineProvider {
      * @param timeFrom Current time to filter events from.
      * @return Object with course events and last loaded event id if more can be loaded.
      */
-    protected treatCourseEvents(course: any, timeFrom: number): { events: any[], canLoadMore: number } {
+    protected treatCourseEvents(course: AddonCalendarEvents, timeFrom: number):
+            { events: AddonCalendarEvent[], canLoadMore: number } {
+
         const canLoadMore: number =
             course.events.length >= AddonBlockTimelineProvider.EVENTS_LIMIT_PER_COURSE ? course.lastid : undefined;
 
diff --git a/src/addon/blog/components/entries/entries.ts b/src/addon/blog/components/entries/entries.ts
index 3cd10ebd6..e0e022245 100644
--- a/src/addon/blog/components/entries/entries.ts
+++ b/src/addon/blog/components/entries/entries.ts
@@ -18,7 +18,7 @@ import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreUserProvider } from '@core/user/providers/user';
-import { AddonBlogProvider } from '../../providers/blog';
+import { AddonBlogProvider, AddonBlogPost } from '../../providers/blog';
 import { CoreCommentsProvider } from '@core/comments/providers/comments';
 import { CoreTagProvider } from '@core/tag/providers/tag';
 
@@ -48,7 +48,7 @@ export class AddonBlogEntriesComponent implements OnInit {
     loaded = false;
     canLoadMore = false;
     loadMoreError = false;
-    entries = [];
+    entries: AddonBlogPostFormatted[] = [];
     currentUserId: number;
     showMyEntriesToggle = false;
     onlyMyEntries = false;
@@ -118,7 +118,7 @@ export class AddonBlogEntriesComponent implements OnInit {
         const loadPage = this.onlyMyEntries ? this.userPageLoaded : this.pageLoaded;
 
         return this.blogProvider.getEntries(this.filter, loadPage).then((result) => {
-            const promises = result.entries.map((entry) => {
+            const promises = result.entries.map((entry: AddonBlogPostFormatted) => {
                 switch (entry.publishstate) {
                     case 'draft':
                         entry.publishTranslated = 'publishtonoone';
@@ -237,5 +237,12 @@ export class AddonBlogEntriesComponent implements OnInit {
             });
         });
     }
-
 }
+
+/**
+ * Blog post with some calculated data.
+ */
+type AddonBlogPostFormatted = AddonBlogPost & {
+    publishTranslated?: string; // Calculated in the app. Key of the string to translate the publish state of the post.
+    user?: any; // Calculated in the app. Data of the user that wrote the post.
+};
diff --git a/src/addon/blog/providers/blog.ts b/src/addon/blog/providers/blog.ts
index a816fd9d3..ab3cf1935 100644
--- a/src/addon/blog/providers/blog.ts
+++ b/src/addon/blog/providers/blog.ts
@@ -18,6 +18,8 @@ import { CoreSitesProvider } from '@providers/sites';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CorePushNotificationsProvider } from '@core/pushnotifications/providers/pushnotifications';
 import { CoreSite } from '@classes/site';
+import { CoreWSExternalWarning, CoreWSExternalFile } from '@providers/ws';
+import { CoreTagItem } from '@core/tag/providers/tag';
 
 /**
  * Service to handle blog entries.
@@ -68,7 +70,7 @@ export class AddonBlogProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise to be resolved when the entries are retrieved.
      */
-    getEntries(filter: any = {}, page: number = 0, siteId?: string): Promise<any> {
+    getEntries(filter: any = {}, page: number = 0, siteId?: string): Promise<AddonBlogGetEntriesResult> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const data = {
                 filters: this.utils.objectToArrayOfObjects(filter, 'name', 'value'),
@@ -105,7 +107,7 @@ export class AddonBlogProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise to be resolved when done.
      */
-    logView(filter: any = {}, siteId?: string): Promise<any> {
+    logView(filter: any = {}, siteId?: string): Promise<AddonBlogViewEntriesResult> {
         this.pushNotificationsProvider.logViewListEvent('blog', 'core_blog_view_entries', filter, siteId);
 
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -117,3 +119,48 @@ export class AddonBlogProvider {
         });
     }
 }
+
+/**
+ * Data returned by blog's post_exporter.
+ */
+export type AddonBlogPost = {
+    id: number; // Post/entry id.
+    module: string; // Where it was published the post (blog, blog_external...).
+    userid: number; // Post author.
+    courseid: number; // Course where the post was created.
+    groupid: number; // Group post was created for.
+    moduleid: number; // Module id where the post was created (not used anymore).
+    coursemoduleid: number; // Course module id where the post was created.
+    subject: string; // Post subject.
+    summary: string; // Post summary.
+    summaryformat: number; // Summary format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    content: string; // Post content.
+    uniquehash: string; // Post unique hash.
+    rating: number; // Post rating.
+    format: number; // Post content format.
+    attachment: string; // Post atachment.
+    publishstate: string; // Post publish state.
+    lastmodified: number; // When it was last modified.
+    created: number; // When it was created.
+    usermodified: number; // User that updated the post.
+    summaryfiles: CoreWSExternalFile[]; // Summaryfiles.
+    attachmentfiles?: CoreWSExternalFile[]; // Attachmentfiles.
+    tags?: CoreTagItem[]; // @since 3.7. Tags.
+};
+
+/**
+ * Result of WS core_blog_get_entries.
+ */
+export type AddonBlogGetEntriesResult = {
+    entries: AddonBlogPost[];
+    totalentries: number; // The total number of entries found.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS core_blog_view_entries.
+ */
+export type AddonBlogViewEntriesResult = {
+    status: boolean; // Status: true if success.
+    warnings?: CoreWSExternalWarning[];
+};
diff --git a/src/addon/blog/providers/course-option-handler.ts b/src/addon/blog/providers/course-option-handler.ts
index 34140ca2a..769a75f5f 100644
--- a/src/addon/blog/providers/course-option-handler.ts
+++ b/src/addon/blog/providers/course-option-handler.ts
@@ -21,6 +21,7 @@ import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseHelperProvider } from '@core/course/providers/helper';
 import { AddonBlogEntriesComponent } from '../components/entries/entries';
 import { AddonBlogProvider } from './blog';
+import { CoreWSExternalFile } from '@providers/ws';
 
 /**
  * Course nav handler.
@@ -100,7 +101,7 @@ export class AddonBlogCourseOptionHandler implements CoreCourseOptionsHandler {
 
         return this.blogProvider.getEntries({courseid: course.id}).then((result) => {
             return result.entries.map((entry) => {
-                let files = [];
+                let files: CoreWSExternalFile[] = [];
 
                 if (entry.attachmentfiles && entry.attachmentfiles.length) {
                     files = entry.attachmentfiles;
diff --git a/src/addon/calendar/components/calendar/calendar.ts b/src/addon/calendar/components/calendar/calendar.ts
index 391116337..cd9e1deda 100644
--- a/src/addon/calendar/components/calendar/calendar.ts
+++ b/src/addon/calendar/components/calendar/calendar.ts
@@ -19,7 +19,7 @@ import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreTimeUtilsProvider } from '@providers/utils/time';
 import { CoreUtilsProvider } from '@providers/utils/utils';
-import { AddonCalendarProvider } from '../../providers/calendar';
+import { AddonCalendarProvider, AddonCalendarWeek } from '../../providers/calendar';
 import { AddonCalendarHelperProvider } from '../../providers/helper';
 import { AddonCalendarOfflineProvider } from '../../providers/calendar-offline';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
@@ -44,7 +44,7 @@ export class AddonCalendarCalendarComponent implements OnInit, OnChanges, OnDest
 
     periodName: string;
     weekDays: any[];
-    weeks: any[];
+    weeks: AddonCalendarWeek[];
     loaded = false;
     timeFormat: string;
     isCurrentMonth: boolean;
diff --git a/src/addon/calendar/components/upcoming-events/addon-calendar-upcoming-events.html b/src/addon/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
index 68f174608..c9ff2ded7 100644
--- a/src/addon/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
+++ b/src/addon/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
@@ -6,7 +6,7 @@
         <ng-container *ngFor="let event of filteredEvents">
             <a ion-item text-wrap [title]="event.name" (click)="eventClicked(event)" [class.core-split-item-selected]="event.id == eventId" class="addon-calendar-event" [ngClass]="['addon-calendar-eventtype-'+event.eventtype]">
                 <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" item-start class="core-module-icon">
-                <core-icon *ngIf="event.icon && !event.moduleIcon" [name]="event.icon" item-start></core-icon>
+                <core-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" item-start></core-icon>
                 <h2><core-format-text [text]="event.name"></core-format-text></h2>
                 <p><core-format-text [text]="event.formattedtime"></core-format-text></p>
                 <ion-note *ngIf="event.offline && !event.deleted" item-end>
diff --git a/src/addon/calendar/components/upcoming-events/upcoming-events.ts b/src/addon/calendar/components/upcoming-events/upcoming-events.ts
index 43489bd80..2dae78490 100644
--- a/src/addon/calendar/components/upcoming-events/upcoming-events.ts
+++ b/src/addon/calendar/components/upcoming-events/upcoming-events.ts
@@ -17,7 +17,7 @@ import { CoreEventsProvider } from '@providers/events';
 import { CoreLocalNotificationsProvider } from '@providers/local-notifications';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
-import { AddonCalendarProvider } from '../../providers/calendar';
+import { AddonCalendarProvider, AddonCalendarCalendarEvent } from '../../providers/calendar';
 import { AddonCalendarHelperProvider } from '../../providers/helper';
 import { AddonCalendarOfflineProvider } from '../../providers/calendar-offline';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
@@ -43,8 +43,8 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, OnChanges,
     protected categoriesRetrieved = false;
     protected categories = {};
     protected currentSiteId: string;
-    protected events = []; // Events (both online and offline).
-    protected onlineEvents = [];
+    protected events: AddonCalendarCalendarEvent[] = []; // Events (both online and offline).
+    protected onlineEvents: AddonCalendarCalendarEvent[] = [];
     protected offlineEvents = []; // Offline events.
     protected deletedEvents = []; // Events deleted in offline.
     protected lookAhead: number;
diff --git a/src/addon/calendar/pages/day/day.html b/src/addon/calendar/pages/day/day.html
index 34335a7de..cb9102207 100644
--- a/src/addon/calendar/pages/day/day.html
+++ b/src/addon/calendar/pages/day/day.html
@@ -50,7 +50,7 @@
             <ng-container *ngFor="let event of filteredEvents">
                 <ion-item text-wrap [title]="event.name" (click)="gotoEvent(event.id)" [class.item-dimmed]="event.ispast" class="addon-calendar-event" [ngClass]="['addon-calendar-eventtype-'+event.eventtype]">
                     <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" item-start class="core-module-icon">
-                    <core-icon *ngIf="event.icon && !event.moduleIcon" [name]="event.icon" item-start></core-icon>
+                    <core-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" item-start></core-icon>
                     <h2><core-format-text [text]="event.name"></core-format-text></h2>
                     <p><core-format-text [text]="event.formattedtime"></core-format-text></p>
                     <ion-note *ngIf="event.offline && !event.deleted" item-end>
diff --git a/src/addon/calendar/pages/day/day.ts b/src/addon/calendar/pages/day/day.ts
index d87725e8f..87936754d 100644
--- a/src/addon/calendar/pages/day/day.ts
+++ b/src/addon/calendar/pages/day/day.ts
@@ -20,7 +20,7 @@ import { CoreLocalNotificationsProvider } from '@providers/local-notifications';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreTimeUtilsProvider } from '@providers/utils/time';
-import { AddonCalendarProvider } from '../../providers/calendar';
+import { AddonCalendarProvider, AddonCalendarCalendarEvent } from '../../providers/calendar';
 import { AddonCalendarOfflineProvider } from '../../providers/calendar-offline';
 import { AddonCalendarHelperProvider } from '../../providers/helper';
 import { AddonCalendarSyncProvider } from '../../providers/calendar-sync';
@@ -45,7 +45,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     protected day: number;
     protected categories = {};
     protected events = []; // Events (both online and offline).
-    protected onlineEvents = [];
+    protected onlineEvents: AddonCalendarCalendarEvent[] = [];
     protected offlineEvents = {}; // Offline events.
     protected offlineEditedEventsIds = []; // IDs of events edited in offline.
     protected deletedEvents = []; // Events deleted in offline.
@@ -287,7 +287,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
         return this.calendarProvider.getDayEvents(this.year, this.month, this.day).catch((error) => {
             if (!this.appProvider.isOnline()) {
                 // Allow navigating to non-cached days in offline (behave as if using emergency cache).
-                return Promise.resolve({ events: [] });
+                return Promise.resolve({ events: <AddonCalendarCalendarEvent[]> [] });
             } else {
                 return Promise.reject(error);
             }
diff --git a/src/addon/calendar/pages/edit-event/edit-event.html b/src/addon/calendar/pages/edit-event/edit-event.html
index 9d79a7e5d..9eae210f8 100644
--- a/src/addon/calendar/pages/edit-event/edit-event.html
+++ b/src/addon/calendar/pages/edit-event/edit-event.html
@@ -134,7 +134,7 @@
                 <div *ngIf="event && event.repeatid" text-wrap radio-group [formControlName]="'repeateditall'" class="addon-calendar-radio-container">
                     <ion-item class="addon-calendar-radio-title"><h2>{{ 'addon.calendar.repeatedevents' | translate }}</h2></ion-item>
                     <ion-item>
-                        <ion-label>{{ 'addon.calendar.repeateditall' | translate:{$a: event.othereventscount} }}</ion-label>
+                        <ion-label>{{ 'addon.calendar.repeateditall' | translate:{$a: otherEventsCount} }}</ion-label>
                         <ion-radio [value]="1"></ion-radio>
                     </ion-item>
                     <ion-item>
diff --git a/src/addon/calendar/pages/edit-event/edit-event.ts b/src/addon/calendar/pages/edit-event/edit-event.ts
index df1f0f8c7..a17e5cd5a 100644
--- a/src/addon/calendar/pages/edit-event/edit-event.ts
+++ b/src/addon/calendar/pages/edit-event/edit-event.ts
@@ -27,7 +27,7 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreRichTextEditorComponent } from '@components/rich-text-editor/rich-text-editor.ts';
-import { AddonCalendarProvider } from '../../providers/calendar';
+import { AddonCalendarProvider, AddonCalendarGetAccessInfoResult, AddonCalendarEvent } from '../../providers/calendar';
 import { AddonCalendarOfflineProvider } from '../../providers/calendar-offline';
 import { AddonCalendarHelperProvider } from '../../providers/helper';
 import { AddonCalendarSyncProvider } from '../../providers/calendar-sync';
@@ -58,7 +58,8 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
     courseGroupSet = false;
     advanced = false;
     errors: any;
-    event: any; // The event object (when editing an event).
+    event: AddonCalendarEvent; // The event object (when editing an event).
+    otherEventsCount: number;
 
     // Form variables.
     eventForm: FormGroup;
@@ -70,7 +71,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
     protected courseId: number;
     protected originalData: any;
     protected currentSite: CoreSite;
-    protected types: any; // Object with the supported types.
+    protected types: {[name: string]: boolean}; // Object with the supported types.
     protected showAll: boolean;
     protected isDestroyed = false;
     protected error = false;
@@ -152,7 +153,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
      * @return Promise resolved when done.
      */
     protected fetchData(refresh?: boolean): Promise<any> {
-        let accessInfo;
+        let accessInfo: AddonCalendarGetAccessInfoResult;
 
         this.error = false;
 
@@ -197,7 +198,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
                         promises.push(this.calendarProvider.getEventById(this.eventId).then((event) => {
                             this.event = event;
                             if (event && event.repeatid) {
-                                event.othereventscount = event.eventcount ? event.eventcount - 1 : '';
+                                this.otherEventsCount = event.eventcount ? event.eventcount - 1 : 0;
                             }
 
                             return event;
@@ -489,7 +490,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
 
         // Send the data.
         const modal = this.domUtils.showModalLoading('core.sending', true);
-        let event;
+        let event: AddonCalendarEvent;
 
         this.calendarProvider.submitEvent(this.eventId, data).then((result) => {
             event = result.event;
@@ -497,7 +498,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
             if (result.sent) {
                 // Event created or edited, invalidate right days & months.
                 const numberOfRepetitions = formData.repeat ? formData.repeats :
-                    (data.repeateditall && this.event.othereventscount ? this.event.othereventscount + 1 : 1);
+                    (data.repeateditall && this.otherEventsCount ? this.otherEventsCount + 1 : 1);
 
                 return this.calendarHelper.refreshAfterChangeEvent(result.event, numberOfRepetitions).catch(() => {
                     // Ignore errors.
diff --git a/src/addon/calendar/pages/event/event.html b/src/addon/calendar/pages/event/event.html
index 366327f66..176250dec 100644
--- a/src/addon/calendar/pages/event/event.html
+++ b/src/addon/calendar/pages/event/event.html
@@ -2,7 +2,7 @@
     <ion-navbar core-back-button>
         <ion-title>
             <img *ngIf="event && event.moduleIcon" src="{{event.moduleIcon}}" alt="" role="presentation" class="core-module-icon">
-            <core-icon *ngIf="event && event.icon && !event.moduleIcon" [name]="event.icon" item-start></core-icon>
+            <core-icon *ngIf="event && event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" item-start></core-icon>
             <core-format-text *ngIf="event" [text]="event.name"></core-format-text>
         </ion-title>
         <ion-buttons end>
@@ -32,7 +32,7 @@
             <ion-card-content *ngIf="event">
                 <ion-item text-wrap *ngIf="isSplitViewOn">
                     <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" item-start alt="" role="presentation" class="core-module-icon">
-                    <core-icon *ngIf="event.icon && !event.moduleIcon" [name]="event.icon" item-start></core-icon>
+                    <core-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" item-start></core-icon>
                     <h2>{{ 'addon.calendar.eventname' | translate }}</h2>
                     <p><core-format-text [text]="event.name"></core-format-text></p>
                     <ion-note item-end *ngIf="event.deleted">
diff --git a/src/addon/calendar/pages/list/list.html b/src/addon/calendar/pages/list/list.html
index 3ae4f4c0d..a400360b4 100644
--- a/src/addon/calendar/pages/list/list.html
+++ b/src/addon/calendar/pages/list/list.html
@@ -34,7 +34,7 @@
                     </ion-item-divider>
                     <a ion-item text-wrap [title]="event.name" (click)="gotoEvent(event.id)" [class.core-split-item-selected]="event.id == eventId" class="addon-calendar-event" [ngClass]="['addon-calendar-eventtype-'+event.eventtype]">
                         <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" item-start class="core-module-icon">
-                        <core-icon *ngIf="event.icon && !event.moduleIcon" [name]="event.icon" item-start></core-icon>
+                        <core-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" item-start></core-icon>
                         <h2><core-format-text [text]="event.name"></core-format-text></h2>
                         <p>
                             {{ event.timestart * 1000 | coreFormatDate: "strftimetime" }}
diff --git a/src/addon/calendar/pages/list/list.ts b/src/addon/calendar/pages/list/list.ts
index 77b8922d1..2bb675eda 100644
--- a/src/addon/calendar/pages/list/list.ts
+++ b/src/addon/calendar/pages/list/list.ts
@@ -14,7 +14,7 @@
 
 import { Component, ViewChild, OnDestroy, NgZone } from '@angular/core';
 import { IonicPage, Content, NavParams, NavController } from 'ionic-angular';
-import { AddonCalendarProvider } from '../../providers/calendar';
+import { AddonCalendarProvider, AddonCalendarGetEventsEvent } from '../../providers/calendar';
 import { AddonCalendarOfflineProvider } from '../../providers/calendar-offline';
 import { AddonCalendarHelperProvider } from '../../providers/helper';
 import { AddonCalendarSyncProvider } from '../../providers/calendar-sync';
@@ -62,7 +62,7 @@ export class AddonCalendarListPage implements OnDestroy {
     protected manualSyncObserver: any;
     protected onlineObserver: any;
     protected currentSiteId: string;
-    protected onlineEvents = [];
+    protected onlineEvents: AddonCalendarGetEventsEvent[] = [];
     protected offlineEvents = [];
     protected deletedEvents = [];
 
@@ -70,7 +70,7 @@ export class AddonCalendarListPage implements OnDestroy {
     eventsLoaded = false;
     events = []; // Events (both online and offline).
     notificationsEnabled = false;
-    filteredEvents = [];
+    filteredEvents: AddonCalendarGetEventsEvent[] = [];
     canLoadMore = false;
     loadMoreError = false;
     courseId: number;
@@ -402,7 +402,7 @@ export class AddonCalendarListPage implements OnDestroy {
      *
      * @return Filtered events.
      */
-    protected getFilteredEvents(): any[] {
+    protected getFilteredEvents(): AddonCalendarGetEventsEvent[] {
         if (!this.courseId) {
             // No filter, display everything.
             return this.events;
@@ -581,7 +581,7 @@ export class AddonCalendarListPage implements OnDestroy {
      * @param event Event info.
      * @return If date has changed and should be shown.
      */
-    protected endsSameDay(event: any): boolean {
+    protected endsSameDay(event: AddonCalendarGetEventsEvent): boolean {
         if (!event.timeduration) {
             // No duration.
             return true;
diff --git a/src/addon/calendar/providers/calendar.ts b/src/addon/calendar/providers/calendar.ts
index c518a989d..eb45fe61a 100644
--- a/src/addon/calendar/providers/calendar.ts
+++ b/src/addon/calendar/providers/calendar.ts
@@ -31,6 +31,7 @@ import { SQLiteDB } from '@classes/sqlitedb';
 import { AddonCalendarOfflineProvider } from './calendar-offline';
 import { CoreUserProvider } from '@core/user/providers/user';
 import { TranslateService } from '@ngx-translate/core';
+import { CoreWSExternalWarning, CoreWSDate } from '@providers/ws';
 import * as moment from 'moment';
 
 /**
@@ -489,7 +490,7 @@ export class AddonCalendarProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    deleteEventOnline(eventId: number, deleteAll?: boolean, siteId?: string): Promise<any> {
+    deleteEventOnline(eventId: number, deleteAll?: boolean, siteId?: string): Promise<null> {
         return this.sitesProvider.getSite(siteId).then((site) => {
 
             const params = {
@@ -535,22 +536,6 @@ export class AddonCalendarProvider {
         });
     }
 
-    /**
-     * Check if event ends the same day or not.
-     *
-     * @param event Event info.
-     * @return If the .
-     */
-    endsSameDay(event: any): boolean {
-        if (!event.timeduration) {
-            // No duration.
-            return true;
-        }
-
-        // Check if day has changed.
-        return moment(event.timestart * 1000).isSame((event.timestart + event.timeduration) * 1000, 'day');
-    }
-
     /**
      * Format event time. Similar to calendar_format_event_time.
      *
@@ -562,8 +547,8 @@ export class AddonCalendarProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the formatted event time.
      */
-    formatEventTime(event: any, format: string, useCommonWords: boolean = true, seenDay?: number, showTime: number = 0,
-            siteId?: string): Promise<string> {
+    formatEventTime(event: AddonCalendarAnyEvent, format: string, useCommonWords: boolean = true, seenDay?: number,
+            showTime: number = 0, siteId?: string): Promise<string> {
 
         const start = event.timestart * 1000,
             end = (event.timestart + event.timeduration) * 1000;
@@ -635,7 +620,7 @@ export class AddonCalendarProvider {
      * @return Promise resolved with object with access information.
      * @since 3.7
      */
-    getAccessInformation(courseId?: number, siteId?: string): Promise<any> {
+    getAccessInformation(courseId?: number, siteId?: string): Promise<AddonCalendarGetAccessInfoResult> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params: any = {},
                 preSets = {
@@ -680,7 +665,7 @@ export class AddonCalendarProvider {
      * @return Promise resolved with an object indicating the types.
      * @since 3.7
      */
-    getAllowedEventTypes(courseId?: number, siteId?: string): Promise<any> {
+    getAllowedEventTypes(courseId?: number, siteId?: string): Promise<{[name: string]: boolean}> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params: any = {},
                 preSets = {
@@ -691,7 +676,8 @@ export class AddonCalendarProvider {
                 params.courseid = courseId;
             }
 
-            return site.read('core_calendar_get_allowed_event_types', params, preSets).then((response) => {
+            return site.read('core_calendar_get_allowed_event_types', params, preSets)
+                    .then((response: AddonCalendarGetAllowedEventTypesResult) => {
                 // Convert the array to an object.
                 const result = {};
 
@@ -812,11 +798,10 @@ export class AddonCalendarProvider {
      * Get a calendar event. If the server request fails and data is not cached, try to get it from local DB.
      *
      * @param id Event ID.
-     * @param refresh True when we should update the event data.
      * @param siteId ID of the site. If not defined, use current site.
      * @return Promise resolved when the event data is retrieved.
      */
-    getEvent(id: number, siteId?: string): Promise<any> {
+    getEvent(id: number, siteId?: string): Promise<AddonCalendarGetEventsEvent> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const preSets = {
                     cacheKey: this.getEventCacheKey(id),
@@ -834,7 +819,8 @@ export class AddonCalendarProvider {
                     }
                 };
 
-            return site.read('core_calendar_get_calendar_events', data, preSets).then((response) => {
+            return site.read('core_calendar_get_calendar_events', data, preSets)
+                    .then((response: AddonCalendarGetEventsResult) => {
                 // The WebService returns all category events. Check the response to search for the event we want.
                 const event = response.events.find((e) => { return e.id == id; });
 
@@ -849,12 +835,11 @@ export class AddonCalendarProvider {
      * Get a calendar event by ID. This function returns more data than getEvent, but it isn't available in all Moodles.
      *
      * @param id Event ID.
-     * @param refresh True when we should update the event data.
      * @param siteId ID of the site. If not defined, use current site.
      * @return Promise resolved when the event data is retrieved.
      * @since 3.4
      */
-    getEventById(id: number, siteId?: string): Promise<any> {
+    getEventById(id: number, siteId?: string): Promise<AddonCalendarEvent> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const preSets = {
                     cacheKey: this.getEventCacheKey(id),
@@ -864,7 +849,8 @@ export class AddonCalendarProvider {
                     eventid: id
                 };
 
-            return site.read('core_calendar_get_calendar_event_by_id', data, preSets).then((response) => {
+            return site.read('core_calendar_get_calendar_event_by_id', data, preSets)
+                    .then((response: AddonCalendarGetEventByIdResult) => {
                 return response.event;
             }).catch((error) => {
                 return this.getEventFromLocalDb(id).catch(() => {
@@ -918,7 +904,7 @@ export class AddonCalendarProvider {
      * @param siteId ID of the site the event belongs to. If not defined, use current site.
      * @return Promise resolved when the notification is updated.
      */
-    addEventReminder(event: any, time: number, siteId?: string): Promise<any> {
+    addEventReminder(event: AddonCalendarAnyEvent, time: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const reminder = {
                 eventid: event.id,
@@ -976,7 +962,7 @@ export class AddonCalendarProvider {
      * @return Promise resolved with the response.
      */
     getDayEvents(year: number, month: number, day: number, courseId?: number, categoryId?: number, ignoreCache?: boolean,
-            siteId?: string): Promise<any> {
+            siteId?: string): Promise<AddonCalendarCalendarDay> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
 
@@ -1003,7 +989,7 @@ export class AddonCalendarProvider {
                 preSets.emergencyCache = false;
             }
 
-            return site.read('core_calendar_get_calendar_day_view', data, preSets).then((response) => {
+            return site.read('core_calendar_get_calendar_day_view', data, preSets).then((response: AddonCalendarCalendarDay) => {
                 this.storeEventsInLocalDB(response.events, siteId);
 
                 return response;
@@ -1071,10 +1057,10 @@ export class AddonCalendarProvider {
      * @param daysToStart Number of days from now to start getting events.
      * @param daysInterval Number of days between timestart and timeend.
      * @param siteId Site to get the events from. If not defined, use current site.
-     * @return Promise to be resolved when the participants are retrieved.
+     * @return Promise to be resolved when the events are retrieved.
      */
     getEventsList(initialTime?: number, daysToStart: number = 0, daysInterval: number = AddonCalendarProvider.DAYS_INTERVAL,
-            siteId?: string): Promise<any[]> {
+            siteId?: string): Promise<AddonCalendarGetEventsEvent[]> {
 
         initialTime = initialTime || this.timeUtils.timestamp();
 
@@ -1122,7 +1108,9 @@ export class AddonCalendarProvider {
                     updateFrequency: CoreSite.FREQUENCY_SOMETIMES
                 };
 
-                return site.read('core_calendar_get_calendar_events', data, preSets).then((response) => {
+                return site.read('core_calendar_get_calendar_events', data, preSets)
+                        .then((response: AddonCalendarGetEventsResult) => {
+
                     if (!this.canViewMonthInSite(site)) {
                         // Store events only in 3.1-3.3. In 3.4+ we'll use the new WS that return more info.
                         this.storeEventsInLocalDB(response.events, siteId);
@@ -1178,7 +1166,7 @@ export class AddonCalendarProvider {
      * @return Promise resolved with the response.
      */
     getMonthlyEvents(year: number, month: number, courseId?: number, categoryId?: number, ignoreCache?: boolean, siteId?: string)
-            : Promise<any> {
+            : Promise<AddonCalendarMonth> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
 
@@ -1210,7 +1198,9 @@ export class AddonCalendarProvider {
                 preSets.emergencyCache = false;
             }
 
-            return site.read('core_calendar_get_calendar_monthly_view', data, preSets).then((response) => {
+            return site.read('core_calendar_get_calendar_monthly_view', data, preSets)
+                    .then((response: AddonCalendarMonth) => {
+
                 response.weeks.forEach((week) => {
                     week.days.forEach((day) => {
                         this.storeEventsInLocalDB(day.events, siteId);
@@ -1270,7 +1260,8 @@ export class AddonCalendarProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the response.
      */
-    getUpcomingEvents(courseId?: number, categoryId?: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
+    getUpcomingEvents(courseId?: number, categoryId?: number, ignoreCache?: boolean, siteId?: string)
+            : Promise<AddonCalendarUpcoming> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
 
@@ -1293,7 +1284,7 @@ export class AddonCalendarProvider {
                 preSets.emergencyCache = false;
             }
 
-            return site.read('core_calendar_get_calendar_upcoming_view', data, preSets).then((response) => {
+            return site.read('core_calendar_get_calendar_upcoming_view', data, preSets).then((response: AddonCalendarUpcoming) => {
                 this.storeEventsInLocalDB(response.events, siteId);
 
                 return response;
@@ -1604,11 +1595,14 @@ export class AddonCalendarProvider {
      * If local notification plugin is not enabled, resolve the promise.
      *
      * @param event Event to schedule.
+     * @param reminderId The reminder ID.
      * @param time Notification setting time (in minutes). E.g. 10 means "notificate 10 minutes before start".
      * @param siteId Site ID the event belongs to. If not defined, use current site.
      * @return Promise resolved when the notification is scheduled.
      */
-    protected scheduleEventNotification(event: any, reminderId: number, time: number, siteId?: string): Promise<void> {
+    protected scheduleEventNotification(event: AddonCalendarAnyEvent, reminderId: number, time: number, siteId?: string)
+            : Promise<void> {
+
         if (this.localNotificationsProvider.isAvailable()) {
             siteId = siteId || this.sitesProvider.getCurrentSiteId();
 
@@ -1672,7 +1666,7 @@ export class AddonCalendarProvider {
      * @param siteId ID of the site the events belong to. If not defined, use current site.
      * @return Promise resolved when all the notifications have been scheduled.
      */
-    scheduleEventsNotifications(events: any[], siteId?: string): Promise<any[]> {
+    scheduleEventsNotifications(events: AddonCalendarAnyEvent[], siteId?: string): Promise<any[]> {
 
         if (this.localNotificationsProvider.isAvailable()) {
             siteId = siteId || this.sitesProvider.getCurrentSiteId();
@@ -1803,11 +1797,10 @@ export class AddonCalendarProvider {
      * @param timeCreated The time the event was created. Only if modifying a new offline event.
      * @param forceOffline True to always save it in offline.
      * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with the event and a boolean indicating if data was
-     *         sent to server or stored in offline.
+     * @return Promise resolved with the event and a boolean indicating if data was sent to server or stored in offline.
      */
     submitEvent(eventId: number, formData: any, timeCreated?: number, forceOffline?: boolean, siteId?: string):
-            Promise<{sent: boolean, event: any}> {
+            Promise<{sent: boolean, event: AddonCalendarEvent}> {
 
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
 
@@ -1847,7 +1840,7 @@ export class AddonCalendarProvider {
      * @param siteId Site ID. If not provided, current site.
      * @return Promise resolved when done.
      */
-    submitEventOnline(eventId: number, formData: any, siteId?: string): Promise<any> {
+    submitEventOnline(eventId: number, formData: any, siteId?: string): Promise<AddonCalendarEvent> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             // Add data that is "hidden" in web.
             formData.id = eventId || 0;
@@ -1865,10 +1858,12 @@ export class AddonCalendarProvider {
                 formdata: this.utils.objectToGetParams(formData)
             };
 
-            return site.write('core_calendar_submit_create_update_form', params).then((result) => {
+            return site.write('core_calendar_submit_create_update_form', params)
+                    .then((result: AddonCalendarSubmitCreateUpdateFormResult): AddonCalendarEvent => {
+
                 if (result.validationerror) {
                     // Simulate a WS error.
-                    return Promise.reject({
+                    return <any> Promise.reject({
                         message: this.translate.instant('core.invalidformdata'),
                         errorcode: 'validationerror'
                     });
@@ -1879,3 +1874,337 @@ export class AddonCalendarProvider {
         });
     }
 }
+
+/**
+ * Data returned by calendar's events_exporter.
+ */
+export type AddonCalendarEvents = {
+    events: AddonCalendarEvent[]; // Events.
+    firstid: number; // Firstid.
+    lastid: number; // Lastid.
+};
+
+/**
+ * Data returned by calendar's events_grouped_by_course_exporter.
+ */
+export type AddonCalendarEventsGroupedByCourse = {
+    groupedbycourse: AddonCalendarEventsSameCourse[]; // Groupped by course.
+};
+
+/**
+ * Data returned by calendar's events_same_course_exporter.
+ */
+export type AddonCalendarEventsSameCourse = AddonCalendarEvents & {
+    courseid: number; // Courseid.
+};
+
+/**
+ * Data returned by calendar's event_exporter_base.
+ */
+export type AddonCalendarEventBase = {
+    id: number; // Id.
+    name: string; // Name.
+    description?: string; // Description.
+    descriptionformat: number; // Description format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    location?: string; // Location.
+    categoryid?: number; // Categoryid.
+    groupid?: number; // Groupid.
+    userid?: number; // Userid.
+    repeatid?: number; // Repeatid.
+    eventcount?: number; // Eventcount.
+    modulename?: string; // Modulename.
+    instance?: number; // Instance.
+    eventtype: string; // Eventtype.
+    timestart: number; // Timestart.
+    timeduration: number; // Timeduration.
+    timesort: number; // Timesort.
+    visible: number; // Visible.
+    timemodified: number; // Timemodified.
+    icon: {
+        key: string; // Key.
+        component: string; // Component.
+        alttext: string; // Alttext.
+    };
+    category?: {
+        id: number; // Id.
+        name: string; // Name.
+        idnumber: string; // Idnumber.
+        description?: string; // Description.
+        parent: number; // Parent.
+        coursecount: number; // Coursecount.
+        visible: number; // Visible.
+        timemodified: number; // Timemodified.
+        depth: number; // Depth.
+        nestedname: string; // Nestedname.
+        url: string; // Url.
+    };
+    course?: {
+        id: number; // Id.
+        fullname: string; // Fullname.
+        shortname: string; // Shortname.
+        idnumber: string; // Idnumber.
+        summary: string; // Summary.
+        summaryformat: number; // Summary format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+        startdate: number; // Startdate.
+        enddate: number; // Enddate.
+        visible: boolean; // Visible.
+        fullnamedisplay: string; // Fullnamedisplay.
+        viewurl: string; // Viewurl.
+        courseimage: string; // Courseimage.
+        progress?: number; // Progress.
+        hasprogress: boolean; // Hasprogress.
+        isfavourite: boolean; // Isfavourite.
+        hidden: boolean; // Hidden.
+        timeaccess?: number; // Timeaccess.
+        showshortname: boolean; // Showshortname.
+        coursecategory: string; // Coursecategory.
+    };
+    subscription?: {
+        displayeventsource: boolean; // Displayeventsource.
+        subscriptionname?: string; // Subscriptionname.
+        subscriptionurl?: string; // Subscriptionurl.
+    };
+    canedit: boolean; // Canedit.
+    candelete: boolean; // Candelete.
+    deleteurl: string; // Deleteurl.
+    editurl: string; // Editurl.
+    viewurl: string; // Viewurl.
+    formattedtime: string; // Formattedtime.
+    isactionevent: boolean; // Isactionevent.
+    iscourseevent: boolean; // Iscourseevent.
+    iscategoryevent: boolean; // Iscategoryevent.
+    groupname?: string; // Groupname.
+    normalisedeventtype: string; // Normalisedeventtype.
+    normalisedeventtypetext: string; // Normalisedeventtypetext.
+};
+
+/**
+ * Data returned by calendar's event_exporter.  Don't confuse it with AddonCalendarCalendarEvent.
+ */
+export type AddonCalendarEvent = AddonCalendarEventBase & {
+    url: string; // Url.
+    action?: {
+        name: string; // Name.
+        url: string; // Url.
+        itemcount: number; // Itemcount.
+        actionable: boolean; // Actionable.
+        showitemcount: boolean; // Showitemcount.
+    };
+};
+
+/**
+ * Data returned by calendar's calendar_event_exporter. Don't confuse it with AddonCalendarEvent.
+ */
+export type AddonCalendarCalendarEvent = AddonCalendarEventBase & {
+    url: string; // Url.
+    islastday: boolean; // Islastday.
+    popupname: string; // Popupname.
+    mindaytimestamp?: number; // Mindaytimestamp.
+    mindayerror?: string; // Mindayerror.
+    maxdaytimestamp?: number; // Maxdaytimestamp.
+    maxdayerror?: string; // Maxdayerror.
+    draggable: boolean; // Draggable.
+} & AddonCalendarCalendarEventCalculatedData;
+
+/**
+ * Any of the possible types of events.
+ */
+export type AddonCalendarAnyEvent = AddonCalendarGetEventsEvent | AddonCalendarEvent | AddonCalendarCalendarEvent;
+
+/**
+ * Data returned by calendar's calendar_day_exporter. Don't confuse it with AddonCalendarDay.
+ */
+export type AddonCalendarCalendarDay = {
+    events: AddonCalendarCalendarEvent[]; // Events.
+    defaulteventcontext: number; // Defaulteventcontext.
+    filter_selector: string; // Filter_selector.
+    courseid: number; // Courseid.
+    categoryid?: number; // Categoryid.
+    neweventtimestamp: number; // Neweventtimestamp.
+    date: CoreWSDate;
+    periodname: string; // Periodname.
+    previousperiod: CoreWSDate;
+    previousperiodlink: string; // Previousperiodlink.
+    previousperiodname: string; // Previousperiodname.
+    nextperiod: CoreWSDate;
+    nextperiodname: string; // Nextperiodname.
+    nextperiodlink: string; // Nextperiodlink.
+    larrow: string; // Larrow.
+    rarrow: string; // Rarrow.
+};
+
+/**
+ * Data returned by calendar's month_exporter.
+ */
+export type AddonCalendarMonth = {
+    url: string; // Url.
+    courseid: number; // Courseid.
+    categoryid?: number; // Categoryid.
+    filter_selector?: string; // Filter_selector.
+    weeks: AddonCalendarWeek[]; // Weeks.
+    daynames: AddonCalendarDayName[]; // Daynames.
+    view: string; // View.
+    date: CoreWSDate;
+    periodname: string; // Periodname.
+    includenavigation: boolean; // Includenavigation.
+    initialeventsloaded: boolean; // Initialeventsloaded.
+    previousperiod: CoreWSDate;
+    previousperiodlink: string; // Previousperiodlink.
+    previousperiodname: string; // Previousperiodname.
+    nextperiod: CoreWSDate;
+    nextperiodname: string; // Nextperiodname.
+    nextperiodlink: string; // Nextperiodlink.
+    larrow: string; // Larrow.
+    rarrow: string; // Rarrow.
+    defaulteventcontext: number; // Defaulteventcontext.
+};
+
+/**
+ * Data returned by calendar's week_exporter.
+ */
+export type AddonCalendarWeek = {
+    prepadding: number[]; // Prepadding.
+    postpadding: number[]; // Postpadding.
+    days: AddonCalendarWeekDay[]; // Days.
+};
+
+/**
+ * Data returned by calendar's week_day_exporter.
+ */
+export type AddonCalendarWeekDay = AddonCalendarDay & {
+    istoday: boolean; // Istoday.
+    isweekend: boolean; // Isweekend.
+    popovertitle: string; // Popovertitle.
+    ispast?: boolean; // Calculated in the app. Whether the day is in the past.
+    filteredEvents?: AddonCalendarCalendarEvent[]; // Calculated in the app. Filtered events.
+};
+
+/**
+ * Data returned by calendar's day_exporter. Don't confuse it with AddonCalendarCalendarDay.
+ */
+export type AddonCalendarDay = {
+    seconds: number; // Seconds.
+    minutes: number; // Minutes.
+    hours: number; // Hours.
+    mday: number; // Mday.
+    wday: number; // Wday.
+    year: number; // Year.
+    yday: number; // Yday.
+    timestamp: number; // Timestamp.
+    neweventtimestamp: number; // Neweventtimestamp.
+    viewdaylink?: string; // Viewdaylink.
+    events: AddonCalendarCalendarEvent[]; // Events.
+    hasevents: boolean; // Hasevents.
+    calendareventtypes: string[]; // Calendareventtypes.
+    previousperiod: number; // Previousperiod.
+    nextperiod: number; // Nextperiod.
+    navigation: string; // Navigation.
+    haslastdayofevent: boolean; // Haslastdayofevent.
+};
+
+/**
+ * Data returned by calendar's day_name_exporter.
+ */
+export type AddonCalendarDayName = {
+    dayno: number; // Dayno.
+    shortname: string; // Shortname.
+    fullname: string; // Fullname.
+};
+
+/**
+ * Data returned by calendar's calendar_upcoming_exporter.
+ */
+export type AddonCalendarUpcoming = {
+    events: AddonCalendarCalendarEvent[]; // Events.
+    defaulteventcontext: number; // Defaulteventcontext.
+    filter_selector: string; // Filter_selector.
+    courseid: number; // Courseid.
+    categoryid?: number; // Categoryid.
+    isloggedin: boolean; // Isloggedin.
+    date: CoreWSDate; // Date.
+};
+
+/**
+ * Result of WS core_calendar_get_calendar_access_information.
+ */
+export type AddonCalendarGetAccessInfoResult = {
+    canmanageentries: boolean; // Whether the user can manage entries.
+    canmanageownentries: boolean; // Whether the user can manage its own entries.
+    canmanagegroupentries: boolean; // Whether the user can manage group entries.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS core_calendar_get_allowed_event_types.
+ */
+export type AddonCalendarGetAllowedEventTypesResult = {
+    allowedeventtypes: string[];
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS core_calendar_get_calendar_events.
+ */
+export type AddonCalendarGetEventsResult = {
+    events: AddonCalendarGetEventsEvent[];
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Event data returned by WS core_calendar_get_calendar_events.
+ */
+export type AddonCalendarGetEventsEvent = {
+    id: number; // Event id.
+    name: string; // Event name.
+    description?: string; // Description.
+    format: number; // Description format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    courseid: number; // Course id.
+    categoryid?: number; // @since 3.4. Category id (only for category events).
+    groupid: number; // Group id.
+    userid: number; // User id.
+    repeatid: number; // Repeat id.
+    modulename?: string; // Module name.
+    instance: number; // Instance id.
+    eventtype: string; // Event type.
+    timestart: number; // Timestart.
+    timeduration: number; // Time duration.
+    visible: number; // Visible.
+    uuid?: string; // Unique id of ical events.
+    sequence: number; // Sequence.
+    timemodified: number; // Time modified.
+    subscriptionid?: number; // Subscription id.
+    showDate?: boolean; // Calculated in the app. Whether date should be shown before this event.
+    endsSameDay?: boolean; // Calculated in the app. Whether the event finishes the same day it starts.
+    deleted?: boolean; // Calculated in the app. Whether it has been deleted in offline.
+};
+
+/**
+ * Result of WS core_calendar_get_calendar_event_by_id.
+ */
+export type AddonCalendarGetEventByIdResult = {
+    event: AddonCalendarEvent; // Event.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS core_calendar_submit_create_update_form.
+ */
+export type AddonCalendarSubmitCreateUpdateFormResult = {
+    event?: AddonCalendarEvent; // Event.
+    validationerror: boolean; // Invalid form data.
+};
+
+/**
+ * Calculated data for AddonCalendarCalendarEvent.
+ */
+export type AddonCalendarCalendarEventCalculatedData = {
+    eventIcon?: string; // Calculated in the app. Event icon.
+    moduleIcon?: string; // Calculated in the app. Module icon.
+    formattedType?: string; // Calculated in the app. Formatted type.
+    duration?: number; // Calculated in the app. Duration of offline event.
+    format?: number; // Calculated in the app. Format of offline event.
+    timedurationuntil?: number; // Calculated in the app. Time duration until of offline event.
+    timedurationminutes?: number; // Calculated in the app. Time duration in minutes of offline event.
+    deleted?: boolean; // Calculated in the app. Whether it has been deleted in offline.
+    ispast?: boolean; // Calculated in the app. Whether the event is in the past.
+};
diff --git a/src/addon/calendar/providers/helper.ts b/src/addon/calendar/providers/helper.ts
index 6c2cd8a6b..515ad44fa 100644
--- a/src/addon/calendar/providers/helper.ts
+++ b/src/addon/calendar/providers/helper.ts
@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
 import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreCourseProvider } from '@core/course/providers/course';
-import { AddonCalendarProvider } from './calendar';
+import { AddonCalendarProvider, AddonCalendarCalendarEvent } from './calendar';
 import { CoreConstants } from '@core/constants';
 import { CoreConfigProvider } from '@providers/config';
 import { CoreUtilsProvider } from '@providers/utils/utils';
@@ -130,11 +130,11 @@ export class AddonCalendarHelperProvider {
      *
      * @param e Event to format.
      */
-    formatEventData(e: any): void {
-        e.icon = this.EVENTICONS[e.eventtype] || false;
-        if (!e.icon) {
-            e.icon = this.courseProvider.getModuleIconSrc(e.modulename);
-            e.moduleIcon = e.icon;
+    formatEventData(e: AddonCalendarCalendarEvent): void {
+        e.eventIcon = this.EVENTICONS[e.eventtype] || '';
+        if (!e.eventIcon) {
+            e.eventIcon = this.courseProvider.getModuleIconSrc(e.modulename);
+            e.moduleIcon = e.eventIcon;
         }
 
         e.formattedType = this.calendarProvider.getEventType(e);
@@ -160,7 +160,7 @@ export class AddonCalendarHelperProvider {
      * @param eventTypes Result of getAllowedEventTypes.
      * @return Options.
      */
-    getEventTypeOptions(eventTypes: any): {name: string, value: string}[] {
+    getEventTypeOptions(eventTypes: {[name: string]: boolean}): {name: string, value: string}[] {
         const options = [];
 
         if (eventTypes.user) {
diff --git a/src/addon/competency/components/course/course.ts b/src/addon/competency/components/course/course.ts
index c9c2a0c15..d6cfb77c9 100644
--- a/src/addon/competency/components/course/course.ts
+++ b/src/addon/competency/components/course/course.ts
@@ -16,7 +16,7 @@ import { Component, ViewChild, Input } from '@angular/core';
 import { Content, NavController } from 'ionic-angular';
 import { CoreAppProvider } from '@providers/app';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
-import { AddonCompetencyProvider } from '../../providers/competency';
+import { AddonCompetencyProvider, AddonCompetencyDataForCourseCompetenciesPageResult } from '../../providers/competency';
 import { AddonCompetencyHelperProvider } from '../../providers/helper';
 
 /**
@@ -33,7 +33,7 @@ export class AddonCompetencyCourseComponent {
     @Input() userId: number;
 
     competenciesLoaded = false;
-    competencies: any;
+    competencies: AddonCompetencyDataForCourseCompetenciesPageResult;
     user: any;
 
     constructor(private navCtrl: NavController, private appProvider: CoreAppProvider, private domUtils: CoreDomUtilsProvider,
diff --git a/src/addon/competency/pages/competencies/competencies.ts b/src/addon/competency/pages/competencies/competencies.ts
index 40eed9b3d..c3f945bf3 100644
--- a/src/addon/competency/pages/competencies/competencies.ts
+++ b/src/addon/competency/pages/competencies/competencies.ts
@@ -17,7 +17,10 @@ import { IonicPage, NavParams } from 'ionic-angular';
 import { TranslateService } from '@ngx-translate/core';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
-import { AddonCompetencyProvider } from '../../providers/competency';
+import {
+    AddonCompetencyProvider, AddonCompetencyDataForCourseCompetenciesPageResult, AddonCompetencyDataForPlanPageResult,
+    AddonCompetencyDataForPlanPageCompetency, AddonCompetencyDataForCourseCompetenciesPageCompetency
+} from '../../providers/competency';
 
 /**
  * Page that displays the list of competencies of a learning plan.
@@ -36,7 +39,7 @@ export class AddonCompetencyCompetenciesPage {
     protected userId: number;
 
     competenciesLoaded = false;
-    competencies = [];
+    competencies: AddonCompetencyDataForPlanPageCompetency[] | AddonCompetencyDataForCourseCompetenciesPageCompetency[] = [];
     title: string;
 
     constructor(navParams: NavParams, private translate: TranslateService, private domUtils: CoreDomUtilsProvider,
@@ -59,7 +62,7 @@ export class AddonCompetencyCompetenciesPage {
         this.fetchCompetencies().then(() => {
             if (!this.competencyId && this.splitviewCtrl.isOn() && this.competencies.length > 0) {
                 // Take first and load it.
-                this.openCompetency(this.competencies[0].id);
+                this.openCompetency(this.competencies[0].competency.id);
             }
         }).finally(() => {
             this.competenciesLoaded = true;
@@ -72,7 +75,7 @@ export class AddonCompetencyCompetenciesPage {
      * @return Promise resolved when done.
      */
     protected fetchCompetencies(): Promise<void> {
-        let promise;
+        let promise: Promise<AddonCompetencyDataForPlanPageResult | AddonCompetencyDataForCourseCompetenciesPageResult>;
 
         if (this.planId) {
             promise = this.competencyProvider.getLearningPlan(this.planId);
@@ -83,13 +86,16 @@ export class AddonCompetencyCompetenciesPage {
         }
 
         return promise.then((response) => {
-            if (response.competencycount <= 0) {
-                return Promise.reject(this.translate.instant('addon.competency.errornocompetenciesfound'));
-            }
 
             if (this.planId) {
-                this.title = response.plan.name;
-                this.userId = response.plan.userid;
+                const resp = <AddonCompetencyDataForPlanPageResult> response;
+
+                if (resp.competencycount <= 0) {
+                    return Promise.reject(this.translate.instant('addon.competency.errornocompetenciesfound'));
+                }
+
+                this.title = resp.plan.name;
+                this.userId = resp.plan.userid;
             } else {
                 this.title = this.translate.instant('addon.competency.coursecompetencies');
             }
diff --git a/src/addon/competency/pages/competency/competency.html b/src/addon/competency/pages/competency/competency.html
index 4f66d9dc1..20b6876a2 100644
--- a/src/addon/competency/pages/competency/competency.html
+++ b/src/addon/competency/pages/competency/competency.html
@@ -51,22 +51,22 @@
                     <core-format-text [text]="activity.name"></core-format-text>
                 </a>
             </ion-item>
-            <ion-item text-wrap *ngIf="competency.usercompetency.status">
+            <ion-item text-wrap *ngIf="userCompetency.status">
                 <strong>{{ 'addon.competency.reviewstatus' | translate }}</strong>
-                {{ competency.usercompetency.statusname }}
+                {{ userCompetency.statusname }}
             </ion-item>
             <ion-item text-wrap>
                 <strong>{{ 'addon.competency.proficient' | translate }}</strong>
-                <ion-badge color="success" *ngIf="competency.usercompetency.proficiency">
+                <ion-badge color="success" *ngIf="userCompetency.proficiency">
                     {{ 'core.yes' | translate }}
                 </ion-badge>
-                <ion-badge color="danger" *ngIf="!competency.usercompetency.proficiency">
+                <ion-badge color="danger" *ngIf="!userCompetency.proficiency">
                     {{ 'core.no' | translate }}
                 </ion-badge>
             </ion-item>
             <ion-item text-wrap>
                 <strong>{{ 'addon.competency.rating' | translate }}</strong>
-                <ion-badge color="dark">{{ competency.usercompetency.gradename }}</ion-badge>
+                <ion-badge color="dark">{{ userCompetency.gradename }}</ion-badge>
             </ion-item>
         </ion-card>
 
diff --git a/src/addon/competency/pages/competency/competency.ts b/src/addon/competency/pages/competency/competency.ts
index a9999c740..c7265f4e2 100644
--- a/src/addon/competency/pages/competency/competency.ts
+++ b/src/addon/competency/pages/competency/competency.ts
@@ -18,8 +18,14 @@ import { TranslateService } from '@ngx-translate/core';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
-import { AddonCompetencyProvider } from '../../providers/competency';
+import {
+    AddonCompetencyProvider, AddonCompetencyUserCompetencySummary, AddonCompetencyUserCompetencySummaryInPlan,
+    AddonCompetencyUserCompetencySummaryInCourse, AddonCompetencyUserCompetencyPlan,
+    AddonCompetencyUserCompetency, AddonCompetencyUserCompetencyCourse
+} from '../../providers/competency';
 import { AddonCompetencyHelperProvider } from '../../providers/helper';
+import { CoreUserSummary } from '@core/user/providers/user';
+import { CoreCourseModuleSummary } from '@core/course/providers/course';
 
 /**
  * Page that displays a learning plan.
@@ -36,9 +42,10 @@ export class AddonCompetencyCompetencyPage {
     courseId: number;
     userId: number;
     planStatus: number;
-    coursemodules: any;
-    user: any;
-    competency: any;
+    coursemodules: CoreCourseModuleSummary[];
+    user: CoreUserSummary;
+    competency: AddonCompetencyUserCompetencySummary;
+    userCompetency: AddonCompetencyUserCompetencyPlan | AddonCompetencyUserCompetency | AddonCompetencyUserCompetencyCourse;
 
     constructor(private navCtrl: NavController, navParams: NavParams, private translate: TranslateService,
             private sitesProvider: CoreSitesProvider, private domUtils: CoreDomUtilsProvider,
@@ -79,7 +86,8 @@ export class AddonCompetencyCompetencyPage {
      * @return Promise resolved when done.
      */
     protected fetchCompetency(): Promise<void> {
-        let promise;
+        let promise: Promise<AddonCompetencyUserCompetencySummaryInPlan | AddonCompetencyUserCompetencySummaryInCourse>;
+
         if (this.planId) {
             this.planStatus = null;
             promise = this.competencyProvider.getCompetencyInPlan(this.planId, this.competencyId);
@@ -90,23 +98,21 @@ export class AddonCompetencyCompetencyPage {
         }
 
         return promise.then((competency) => {
-            competency.usercompetencysummary.usercompetency = competency.usercompetencysummary.usercompetencyplan ||
-                competency.usercompetencysummary.usercompetency;
+
             this.competency = competency.usercompetencysummary;
+            this.userCompetency = this.competency.usercompetencyplan || this.competency.usercompetency;
 
             if (this.planId) {
-                this.planStatus = competency.plan.status;
+                this.planStatus = (<AddonCompetencyUserCompetencySummaryInPlan> competency).plan.status;
                 this.competency.usercompetency.statusname =
                     this.competencyHelperProvider.getCompetencyStatusName(this.competency.usercompetency.status);
             } else {
-                this.competency.usercompetency = this.competency.usercompetencycourse;
-                this.coursemodules = competency.coursemodules;
+                this.userCompetency = this.competency.usercompetencycourse;
+                this.coursemodules = (<AddonCompetencyUserCompetencySummaryInCourse> competency).coursemodules;
             }
 
             if (this.competency.user.id != this.sitesProvider.getCurrentSiteUserId()) {
-                this.competency.user.profileimageurl = this.competency.user.profileimageurl || true;
-
-                // Get the user profile image from the returned object.
+                // Get the user profile from the returned object.
                 this.user = this.competency.user;
             }
 
diff --git a/src/addon/competency/pages/competencysummary/competencysummary.ts b/src/addon/competency/pages/competencysummary/competencysummary.ts
index fc81a80fc..27eccf836 100644
--- a/src/addon/competency/pages/competencysummary/competencysummary.ts
+++ b/src/addon/competency/pages/competencysummary/competencysummary.ts
@@ -16,7 +16,7 @@ import { Component, Optional } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
-import { AddonCompetencyProvider } from '../../providers/competency';
+import { AddonCompetencyProvider, AddonCompetencySummary } from '../../providers/competency';
 
 /**
  * Page that displays a learning plan.
@@ -29,7 +29,7 @@ import { AddonCompetencyProvider } from '../../providers/competency';
 export class AddonCompetencyCompetencySummaryPage {
     competencyLoaded = false;
     competencyId: number;
-    competency: any;
+    competency: AddonCompetencySummary;
 
     constructor(private navCtrl: NavController, navParams: NavParams, private domUtils: CoreDomUtilsProvider,
             @Optional() private svComponent: CoreSplitViewComponent, private competencyProvider: AddonCompetencyProvider) {
@@ -41,8 +41,7 @@ export class AddonCompetencyCompetencySummaryPage {
      */
     ionViewDidLoad(): void {
         this.fetchCompetency().then(() => {
-            const name = this.competency.competency && this.competency.competency.competency &&
-                    this.competency.competency.competency.shortname;
+            const name = this.competency.competency && this.competency.competency.shortname;
 
             this.competencyProvider.logCompetencyView(this.competencyId, name).catch(() => {
                 // Ignore errors.
diff --git a/src/addon/competency/pages/plan/plan.html b/src/addon/competency/pages/plan/plan.html
index f8c5a91da..1d965ebf2 100644
--- a/src/addon/competency/pages/plan/plan.html
+++ b/src/addon/competency/pages/plan/plan.html
@@ -46,7 +46,8 @@
                 </ion-item>
                 <a ion-item text-wrap *ngFor="let competency of plan.competencies" (click)="openCompetency(competency.competency.id)" [title]="competency.competency.shortname">
                     <h2>{{competency.competency.shortname}} <em>{{competency.competency.idnumber}}</em></h2>
-                    <ion-badge item-end [color]="competency.usercompetency.proficiency ? 'success' : 'danger'">{{ competency.usercompetency.gradename }}</ion-badge>
+                    <ion-badge *ngIf="competency.usercompetencyplan" item-end [color]="competency.usercompetencyplan.proficiency ? 'success' : 'danger'">{{ competency.usercompetencyplan.gradename }}</ion-badge>
+                    <ion-badge *ngIf="!competency.usercompetencyplan" item-end [color]="competency.usercompetency.proficiency ? 'success' : 'danger'">{{ competency.usercompetency.gradename }}</ion-badge>
                 </a>
             </ion-list>
         </ion-card>
diff --git a/src/addon/competency/pages/plan/plan.ts b/src/addon/competency/pages/plan/plan.ts
index acbb1e419..a5ef30d5a 100644
--- a/src/addon/competency/pages/plan/plan.ts
+++ b/src/addon/competency/pages/plan/plan.ts
@@ -17,7 +17,7 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import { CoreAppProvider } from '@providers/app';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
-import { AddonCompetencyProvider } from '../../providers/competency';
+import { AddonCompetencyProvider, AddonCompetencyDataForPlanPageResult } from '../../providers/competency';
 import { AddonCompetencyHelperProvider } from '../../providers/helper';
 
 /**
@@ -31,7 +31,7 @@ import { AddonCompetencyHelperProvider } from '../../providers/helper';
 export class AddonCompetencyPlanPage {
     protected planId: number;
     planLoaded = false;
-    plan: any;
+    plan: AddonCompetencyDataForPlanPageResult;
     user: any;
 
     constructor(private navCtrl: NavController, navParams: NavParams, private appProvider: CoreAppProvider,
@@ -62,9 +62,6 @@ export class AddonCompetencyPlanPage {
                 this.user = user;
             });
 
-            plan.competencies.forEach((competency) => {
-                competency.usercompetency = competency.usercompetencyplan || competency.usercompetency;
-            });
             this.plan = plan;
         }).catch((message) => {
             this.domUtils.showErrorModalDefault(message, 'Error getting learning plan data.');
diff --git a/src/addon/competency/pages/planlist/planlist.ts b/src/addon/competency/pages/planlist/planlist.ts
index 04994ac20..0774d66d2 100644
--- a/src/addon/competency/pages/planlist/planlist.ts
+++ b/src/addon/competency/pages/planlist/planlist.ts
@@ -16,7 +16,7 @@ import { Component, ViewChild } from '@angular/core';
 import { IonicPage, NavParams } from 'ionic-angular';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
-import { AddonCompetencyProvider } from '../../providers/competency';
+import { AddonCompetencyProvider, AddonCompetencyPlan } from '../../providers/competency';
 import { AddonCompetencyHelperProvider } from '../../providers/helper';
 
 /**
@@ -33,7 +33,7 @@ export class AddonCompetencyPlanListPage {
     protected userId: number;
     protected planId: number;
     plansLoaded = false;
-    plans = [];
+    plans: AddonCompetencyPlan[] = [];
 
     constructor(navParams: NavParams, private domUtils: CoreDomUtilsProvider, private competencyProvider: AddonCompetencyProvider,
             private competencyHelperProvider: AddonCompetencyHelperProvider) {
@@ -66,7 +66,7 @@ export class AddonCompetencyPlanListPage {
      */
     protected fetchLearningPlans(): Promise<void> {
         return this.competencyProvider.getLearningPlans(this.userId).then((plans) => {
-            plans.forEach((plan) => {
+            plans.forEach((plan: AddonCompetencyPlanFormatted) => {
                 plan.statusname = this.competencyHelperProvider.getPlanStatusName(plan.status);
                 switch (plan.status) {
                     case AddonCompetencyProvider.STATUS_ACTIVE:
@@ -109,3 +109,10 @@ export class AddonCompetencyPlanListPage {
         this.splitviewCtrl.push('AddonCompetencyPlanPage', { planId });
     }
 }
+
+/**
+ * Competency plan with some calculated data.
+ */
+type AddonCompetencyPlanFormatted = AddonCompetencyPlan & {
+    statuscolor?: string; // Calculated in the app. Color of the plan's status.
+};
diff --git a/src/addon/competency/providers/competency.ts b/src/addon/competency/providers/competency.ts
index ea0f6df89..5e4940dcc 100644
--- a/src/addon/competency/providers/competency.ts
+++ b/src/addon/competency/providers/competency.ts
@@ -17,6 +17,9 @@ import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider } from '@providers/sites';
 import { CorePushNotificationsProvider } from '@core/pushnotifications/providers/pushnotifications';
 import { CoreSite } from '@classes/site';
+import { CoreCommentsArea } from '@core/comments/providers/comments';
+import { CoreUserSummary } from '@core/user/providers/user';
+import { CoreCourseSummary, CoreCourseModuleSummary } from '@core/course/providers/course';
 
 /**
  * Service to handle caompetency learning plans.
@@ -147,7 +150,7 @@ export class AddonCompetencyProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise to be resolved when the plans are retrieved.
      */
-    getLearningPlans(userId?: number, siteId?: string): Promise<any> {
+    getLearningPlans(userId?: number, siteId?: string): Promise<AddonCompetencyPlan[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             userId = userId || site.getUserId();
 
@@ -161,7 +164,9 @@ export class AddonCompetencyProvider {
                     updateFrequency: CoreSite.FREQUENCY_RARELY
                 };
 
-            return site.read('tool_lp_data_for_plans_page', params, preSets).then((response) => {
+            return site.read('tool_lp_data_for_plans_page', params, preSets)
+                    .then((response: AddonCompetencyDataForPlansPageResult): any => {
+
                 if (response.plans) {
                     return response.plans;
                 }
@@ -176,9 +181,9 @@ export class AddonCompetencyProvider {
      *
      * @param planId ID of the plan.
      * @param siteId Site ID. If not defined, current site.
-     * @return Promise to be resolved when the plans are retrieved.
+     * @return Promise to be resolved when the plan is retrieved.
      */
-    getLearningPlan(planId: number, siteId?: string): Promise<any> {
+    getLearningPlan(planId: number, siteId?: string): Promise<AddonCompetencyDataForPlanPageResult> {
         return this.sitesProvider.getSite(siteId).then((site) => {
 
             this.logger.debug('Get plan ' + planId);
@@ -191,7 +196,9 @@ export class AddonCompetencyProvider {
                     updateFrequency: CoreSite.FREQUENCY_RARELY
                 };
 
-            return site.read('tool_lp_data_for_plan_page', params, preSets).then((response) => {
+            return site.read('tool_lp_data_for_plan_page', params, preSets)
+                    .then((response: AddonCompetencyDataForPlanPageResult): any => {
+
                 if (response.plan) {
                     return response;
                 }
@@ -207,9 +214,11 @@ export class AddonCompetencyProvider {
      * @param planId ID of the plan.
      * @param competencyId ID of the competency.
      * @param siteId Site ID. If not defined, current site.
-     * @return Promise to be resolved when the plans are retrieved.
+     * @return Promise to be resolved when the competency is retrieved.
      */
-    getCompetencyInPlan(planId: number, competencyId: number, siteId?: string): Promise<any> {
+    getCompetencyInPlan(planId: number, competencyId: number, siteId?: string)
+            : Promise<AddonCompetencyUserCompetencySummaryInPlan> {
+
         return this.sitesProvider.getSite(siteId).then((site) => {
 
             this.logger.debug('Get competency ' + competencyId + ' in plan ' + planId);
@@ -223,7 +232,9 @@ export class AddonCompetencyProvider {
                     updateFrequency: CoreSite.FREQUENCY_SOMETIMES
                 };
 
-            return site.read('tool_lp_data_for_user_competency_summary_in_plan', params, preSets).then((response) => {
+            return site.read('tool_lp_data_for_user_competency_summary_in_plan', params, preSets)
+                    .then((response: AddonCompetencyUserCompetencySummaryInPlan): any => {
+
                 if (response.usercompetencysummary) {
                     return response;
                 }
@@ -241,10 +252,10 @@ export class AddonCompetencyProvider {
      * @param userId ID of the user. If not defined, current user.
      * @param siteId Site ID. If not defined, current site.
      * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
-     * @return Promise to be resolved when the plans are retrieved.
+     * @return Promise to be resolved when the competency is retrieved.
      */
     getCompetencyInCourse(courseId: number, competencyId: number, userId?: number, siteId?: string, ignoreCache?: boolean)
-            : Promise<any> {
+            : Promise<AddonCompetencyUserCompetencySummaryInCourse> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             userId = userId || site.getUserId();
@@ -266,7 +277,9 @@ export class AddonCompetencyProvider {
                 preSets.emergencyCache = false;
             }
 
-            return site.read('tool_lp_data_for_user_competency_summary_in_course', params, preSets).then((response) => {
+            return site.read('tool_lp_data_for_user_competency_summary_in_course', params, preSets)
+                    .then((response: AddonCompetencyUserCompetencySummaryInCourse): any => {
+
                 if (response.usercompetencysummary) {
                     return response;
                 }
@@ -283,9 +296,11 @@ export class AddonCompetencyProvider {
      * @param userId ID of the user. If not defined, current user.
      * @param siteId Site ID. If not defined, current site.
      * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
-     * @return Promise to be resolved when the plans are retrieved.
+     * @return Promise to be resolved when the competency summary is retrieved.
      */
-    getCompetencySummary(competencyId: number, userId?: number, siteId?: string, ignoreCache?: boolean): Promise<any> {
+    getCompetencySummary(competencyId: number, userId?: number, siteId?: string, ignoreCache?: boolean)
+            : Promise<AddonCompetencySummary> {
+
         return this.sitesProvider.getSite(siteId).then((site) => {
             userId = userId || site.getUserId();
 
@@ -305,7 +320,9 @@ export class AddonCompetencyProvider {
                 preSets.emergencyCache = false;
             }
 
-            return site.read('tool_lp_data_for_user_competency_summary', params, preSets).then((response) => {
+            return site.read('tool_lp_data_for_user_competency_summary', params, preSets)
+                    .then((response: AddonCompetencyUserCompetencySummary): any => {
+
                 if (response.competency) {
                     return response.competency;
                 }
@@ -324,7 +341,9 @@ export class AddonCompetencyProvider {
      * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
      * @return Promise to be resolved when the course competencies are retrieved.
      */
-    getCourseCompetencies(courseId: number, userId?: number, siteId?: string, ignoreCache?: boolean): Promise<any> {
+    getCourseCompetencies(courseId: number, userId?: number, siteId?: string, ignoreCache?: boolean)
+            : Promise<AddonCompetencyDataForCourseCompetenciesPageResult> {
+
         return this.sitesProvider.getSite(siteId).then((site) => {
 
             this.logger.debug('Get course competencies for course ' + courseId);
@@ -342,7 +361,9 @@ export class AddonCompetencyProvider {
                 preSets.emergencyCache = false;
             }
 
-            return site.read('tool_lp_data_for_course_competencies_page', params, preSets).then((response) => {
+            return site.read('tool_lp_data_for_course_competencies_page', params, preSets)
+                    .then((response: AddonCompetencyDataForCourseCompetenciesPageResult): any => {
+
                 if (response.competencies) {
                     return response;
                 }
@@ -356,11 +377,13 @@ export class AddonCompetencyProvider {
                 return response;
             }
 
-            const promises = response.competencies.map((competency) =>
+            let promises: Promise<AddonCompetencyUserCompetencySummaryInCourse>[];
+
+            promises = response.competencies.map((competency) =>
                 this.getCompetencyInCourse(courseId, competency.competency.id, userId, siteId)
             );
 
-            return Promise.all(promises).then((responses: any[]) => {
+            return Promise.all(promises).then((responses: AddonCompetencyUserCompetencySummaryInCourse[]) => {
                 responses.forEach((resp, index) => {
                     response.competencies[index].usercompetencycourse = resp.usercompetencysummary.usercompetencycourse;
                 });
@@ -486,7 +509,7 @@ export class AddonCompetencyProvider {
      * @return Promise resolved when the WS call is successful.
      */
     logCompetencyInPlanView(planId: number, competencyId: number, planStatus: number, name?: string, userId?: number,
-            siteId?: string): Promise<any> {
+            siteId?: string): Promise<void> {
         if (planId && competencyId) {
 
             return this.sitesProvider.getSite(siteId).then((site) => {
@@ -509,7 +532,11 @@ export class AddonCompetencyProvider {
                     userid: userId
                 }, siteId);
 
-                return site.write(wsName, params, preSets);
+                return site.write(wsName, params, preSets).then((success: boolean) => {
+                    if (!success) {
+                        return Promise.reject(null);
+                    }
+                });
             });
         }
 
@@ -527,7 +554,7 @@ export class AddonCompetencyProvider {
      * @return Promise resolved when the WS call is successful.
      */
     logCompetencyInCourseView(courseId: number, competencyId: number, name?: string, userId?: number, siteId?: string)
-            : Promise<any> {
+            : Promise<void> {
 
         if (courseId && competencyId) {
             return this.sitesProvider.getSite(siteId).then((site) => {
@@ -548,7 +575,11 @@ export class AddonCompetencyProvider {
                     userid: userId
                 }, siteId);
 
-                return site.write(wsName, params, preSets);
+                return site.write(wsName, params, preSets).then((success: boolean) => {
+                    if (!success) {
+                        return Promise.reject(null);
+                    }
+                });
             });
         }
 
@@ -563,7 +594,7 @@ export class AddonCompetencyProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the WS call is successful.
      */
-    logCompetencyView(competencyId: number, name?: string, siteId?: string): Promise<any> {
+    logCompetencyView(competencyId: number, name?: string, siteId?: string): Promise<void> {
         if (competencyId) {
             return this.sitesProvider.getSite(siteId).then((site) => {
                 const params = {
@@ -576,10 +607,401 @@ export class AddonCompetencyProvider {
 
                 this.pushNotificationsProvider.logViewEvent(competencyId, name, 'competency', wsName, {}, siteId);
 
-                return site.write('core_competency_competency_viewed', params, preSets);
+                return site.write(wsName, params, preSets).then((success: boolean) => {
+                    if (!success) {
+                        return Promise.reject(null);
+                    }
+                });
             });
         }
 
         return Promise.reject(null);
     }
 }
+
+/**
+ * Data returned by competency's plan_exporter.
+ */
+export type AddonCompetencyPlan = {
+    name: string; // Name.
+    description: string; // Description.
+    descriptionformat: number; // Description format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    userid: number; // Userid.
+    templateid: number; // Templateid.
+    origtemplateid: number; // Origtemplateid.
+    status: number; // Status.
+    duedate: number; // Duedate.
+    reviewerid: number; // Reviewerid.
+    id: number; // Id.
+    timecreated: number; // Timecreated.
+    timemodified: number; // Timemodified.
+    usermodified: number; // Usermodified.
+    statusname: string; // Statusname.
+    isbasedontemplate: boolean; // Isbasedontemplate.
+    canmanage: boolean; // Canmanage.
+    canrequestreview: boolean; // Canrequestreview.
+    canreview: boolean; // Canreview.
+    canbeedited: boolean; // Canbeedited.
+    isactive: boolean; // Isactive.
+    isdraft: boolean; // Isdraft.
+    iscompleted: boolean; // Iscompleted.
+    isinreview: boolean; // Isinreview.
+    iswaitingforreview: boolean; // Iswaitingforreview.
+    isreopenallowed: boolean; // Isreopenallowed.
+    iscompleteallowed: boolean; // Iscompleteallowed.
+    isunlinkallowed: boolean; // Isunlinkallowed.
+    isrequestreviewallowed: boolean; // Isrequestreviewallowed.
+    iscancelreviewrequestallowed: boolean; // Iscancelreviewrequestallowed.
+    isstartreviewallowed: boolean; // Isstartreviewallowed.
+    isstopreviewallowed: boolean; // Isstopreviewallowed.
+    isapproveallowed: boolean; // Isapproveallowed.
+    isunapproveallowed: boolean; // Isunapproveallowed.
+    duedateformatted: string; // Duedateformatted.
+    commentarea: CoreCommentsArea;
+    reviewer?: CoreUserSummary;
+    template?: AddonCompetencyTemplate;
+    url: string; // Url.
+};
+
+/**
+ * Data returned by competency's template_exporter.
+ */
+export type AddonCompetencyTemplate = {
+    shortname: string; // Shortname.
+    description: string; // Description.
+    descriptionformat: number; // Description format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    duedate: number; // Duedate.
+    visible: boolean; // Visible.
+    contextid: number; // Contextid.
+    id: number; // Id.
+    timecreated: number; // Timecreated.
+    timemodified: number; // Timemodified.
+    usermodified: number; // Usermodified.
+    duedateformatted: string; // Duedateformatted.
+    cohortscount: number; // Cohortscount.
+    planscount: number; // Planscount.
+    canmanage: boolean; // Canmanage.
+    canread: boolean; // Canread.
+    contextname: string; // Contextname.
+    contextnamenoprefix: string; // Contextnamenoprefix.
+};
+
+/**
+ * Data returned by competency's competency_exporter.
+ */
+export type AddonCompetencyCompetency = {
+    shortname: string; // Shortname.
+    idnumber: string; // Idnumber.
+    description: string; // Description.
+    descriptionformat: number; // Description format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    sortorder: number; // Sortorder.
+    parentid: number; // Parentid.
+    path: string; // Path.
+    ruleoutcome: number; // Ruleoutcome.
+    ruletype: string; // Ruletype.
+    ruleconfig: string; // Ruleconfig.
+    scaleid: number; // Scaleid.
+    scaleconfiguration: string; // Scaleconfiguration.
+    competencyframeworkid: number; // Competencyframeworkid.
+    id: number; // Id.
+    timecreated: number; // Timecreated.
+    timemodified: number; // Timemodified.
+    usermodified: number; // Usermodified.
+};
+
+/**
+ * Data returned by competency's competency_path_exporter.
+ */
+export type AddonCompetencyPath = {
+    ancestors: AddonCompetencyPathNode[]; // Ancestors.
+    framework: AddonCompetencyPathNode;
+    pluginbaseurl: string; // Pluginbaseurl.
+    pagecontextid: number; // Pagecontextid.
+    showlinks: boolean; // Showlinks.
+};
+
+/**
+ * Data returned by competency's path_node_exporter.
+ */
+export type AddonCompetencyPathNode = {
+    id: number; // Id.
+    name: string; // Name.
+    first: boolean; // First.
+    last: boolean; // Last.
+    position: number; // Position.
+};
+
+/**
+ * Data returned by competency's user_competency_exporter.
+ */
+export type AddonCompetencyUserCompetency = {
+    userid: number; // Userid.
+    competencyid: number; // Competencyid.
+    status: number; // Status.
+    reviewerid: number; // Reviewerid.
+    proficiency: boolean; // Proficiency.
+    grade: number; // Grade.
+    id: number; // Id.
+    timecreated: number; // Timecreated.
+    timemodified: number; // Timemodified.
+    usermodified: number; // Usermodified.
+    canrequestreview: boolean; // Canrequestreview.
+    canreview: boolean; // Canreview.
+    gradename: string; // Gradename.
+    isrequestreviewallowed: boolean; // Isrequestreviewallowed.
+    iscancelreviewrequestallowed: boolean; // Iscancelreviewrequestallowed.
+    isstartreviewallowed: boolean; // Isstartreviewallowed.
+    isstopreviewallowed: boolean; // Isstopreviewallowed.
+    isstatusidle: boolean; // Isstatusidle.
+    isstatusinreview: boolean; // Isstatusinreview.
+    isstatuswaitingforreview: boolean; // Isstatuswaitingforreview.
+    proficiencyname: string; // Proficiencyname.
+    reviewer?: CoreUserSummary;
+    statusname: string; // Statusname.
+    url: string; // Url.
+};
+
+/**
+ * Data returned by competency's user_competency_plan_exporter.
+ */
+export type AddonCompetencyUserCompetencyPlan = {
+    userid: number; // Userid.
+    competencyid: number; // Competencyid.
+    proficiency: boolean; // Proficiency.
+    grade: number; // Grade.
+    planid: number; // Planid.
+    sortorder: number; // Sortorder.
+    id: number; // Id.
+    timecreated: number; // Timecreated.
+    timemodified: number; // Timemodified.
+    usermodified: number; // Usermodified.
+    gradename: string; // Gradename.
+    proficiencyname: string; // Proficiencyname.
+};
+
+/**
+ * Data returned by competency's user_competency_summary_in_plan_exporter.
+ */
+export type AddonCompetencyUserCompetencySummaryInPlan = {
+    usercompetencysummary: AddonCompetencyUserCompetencySummary;
+    plan: AddonCompetencyPlan;
+};
+
+/**
+ * Data returned by competency's user_competency_summary_exporter.
+ */
+export type AddonCompetencyUserCompetencySummary = {
+    showrelatedcompetencies: boolean; // Showrelatedcompetencies.
+    cangrade: boolean; // Cangrade.
+    competency: AddonCompetencySummary;
+    user: CoreUserSummary;
+    usercompetency?: AddonCompetencyUserCompetency;
+    usercompetencyplan?: AddonCompetencyUserCompetencyPlan;
+    usercompetencycourse?: AddonCompetencyUserCompetencyCourse;
+    evidence: AddonCompetencyEvidence[]; // Evidence.
+    commentarea?: CoreCommentsArea;
+};
+
+/**
+ * Data returned by competency's competency_summary_exporter.
+ */
+export type AddonCompetencySummary = {
+    linkedcourses: CoreCourseSummary; // Linkedcourses.
+    relatedcompetencies: AddonCompetencyCompetency[]; // Relatedcompetencies.
+    competency: AddonCompetencyCompetency;
+    framework: AddonCompetencyFramework;
+    hascourses: boolean; // Hascourses.
+    hasrelatedcompetencies: boolean; // Hasrelatedcompetencies.
+    scaleid: number; // Scaleid.
+    scaleconfiguration: string; // Scaleconfiguration.
+    taxonomyterm: string; // Taxonomyterm.
+    comppath: AddonCompetencyPath;
+    pluginbaseurl: string; // Pluginbaseurl.
+};
+
+/**
+ * Data returned by competency's competency_framework_exporter.
+ */
+export type AddonCompetencyFramework = {
+    shortname: string; // Shortname.
+    idnumber: string; // Idnumber.
+    description: string; // Description.
+    descriptionformat: number; // Description format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    visible: boolean; // Visible.
+    scaleid: number; // Scaleid.
+    scaleconfiguration: string; // Scaleconfiguration.
+    contextid: number; // Contextid.
+    taxonomies: string; // Taxonomies.
+    id: number; // Id.
+    timecreated: number; // Timecreated.
+    timemodified: number; // Timemodified.
+    usermodified: number; // Usermodified.
+    canmanage: boolean; // Canmanage.
+    competenciescount: number; // Competenciescount.
+    contextname: string; // Contextname.
+    contextnamenoprefix: string; // Contextnamenoprefix.
+};
+
+/**
+ * Data returned by competency's user_competency_course_exporter.
+ */
+export type AddonCompetencyUserCompetencyCourse = {
+    userid: number; // Userid.
+    courseid: number; // Courseid.
+    competencyid: number; // Competencyid.
+    proficiency: boolean; // Proficiency.
+    grade: number; // Grade.
+    id: number; // Id.
+    timecreated: number; // Timecreated.
+    timemodified: number; // Timemodified.
+    usermodified: number; // Usermodified.
+    gradename: string; // Gradename.
+    proficiencyname: string; // Proficiencyname.
+};
+
+/**
+ * Data returned by competency's evidence_exporter.
+ */
+export type AddonCompetencyEvidence = {
+    usercompetencyid: number; // Usercompetencyid.
+    contextid: number; // Contextid.
+    action: number; // Action.
+    actionuserid: number; // Actionuserid.
+    descidentifier: string; // Descidentifier.
+    desccomponent: string; // Desccomponent.
+    desca: string; // Desca.
+    url: string; // Url.
+    grade: number; // Grade.
+    note: string; // Note.
+    id: number; // Id.
+    timecreated: number; // Timecreated.
+    timemodified: number; // Timemodified.
+    usermodified: number; // Usermodified.
+    actionuser?: CoreUserSummary;
+    description: string; // Description.
+    gradename: string; // Gradename.
+    userdate: string; // Userdate.
+    candelete: boolean; // Candelete.
+};
+
+/**
+ * Data returned by competency's user_competency_summary_in_course_exporter.
+ */
+export type AddonCompetencyUserCompetencySummaryInCourse = {
+    usercompetencysummary: AddonCompetencyUserCompetencySummary;
+    course: CoreCourseSummary;
+    coursemodules: CoreCourseModuleSummary[]; // Coursemodules.
+    plans: AddonCompetencyPlan[]; // Plans.
+    pluginbaseurl: string; // Pluginbaseurl.
+};
+
+/**
+ * Data returned by competency's course_competency_settings_exporter.
+ */
+export type AddonCompetencyCourseCompetencySettings = {
+    courseid: number; // Courseid.
+    pushratingstouserplans: boolean; // Pushratingstouserplans.
+    id: number; // Id.
+    timecreated: number; // Timecreated.
+    timemodified: number; // Timemodified.
+    usermodified: number; // Usermodified.
+};
+
+/**
+ * Data returned by competency's course_competency_statistics_exporter.
+ */
+export type AddonCompetencyCourseCompetencyStatistics = {
+    competencycount: number; // Competencycount.
+    proficientcompetencycount: number; // Proficientcompetencycount.
+    proficientcompetencypercentage: number; // Proficientcompetencypercentage.
+    proficientcompetencypercentageformatted: string; // Proficientcompetencypercentageformatted.
+    leastproficient: AddonCompetencyCompetency[]; // Leastproficient.
+    leastproficientcount: number; // Leastproficientcount.
+    canbegradedincourse: boolean; // Canbegradedincourse.
+    canmanagecoursecompetencies: boolean; // Canmanagecoursecompetencies.
+};
+
+/**
+ * Data returned by competency's course_competency_exporter.
+ */
+export type AddonCompetencyCourseCompetency = {
+    courseid: number; // Courseid.
+    competencyid: number; // Competencyid.
+    sortorder: number; // Sortorder.
+    ruleoutcome: number; // Ruleoutcome.
+    id: number; // Id.
+    timecreated: number; // Timecreated.
+    timemodified: number; // Timemodified.
+    usermodified: number; // Usermodified.
+};
+
+/**
+ * Result of WS tool_lp_data_for_plans_page.
+ */
+export type AddonCompetencyDataForPlansPageResult = {
+    userid: number; // The learning plan user id.
+    plans: AddonCompetencyPlan[];
+    pluginbaseurl: string; // Url to the tool_lp plugin folder on this Moodle site.
+    navigation: string[];
+    canreaduserevidence: boolean; // Can the current user view the user's evidence.
+    canmanageuserplans: boolean; // Can the current user manage the user's plans.
+};
+
+/**
+ * Result of WS tool_lp_data_for_plan_page.
+ */
+export type AddonCompetencyDataForPlanPageResult = {
+    plan: AddonCompetencyPlan;
+    contextid: number; // Context ID.
+    pluginbaseurl: string; // Plugin base URL.
+    competencies: AddonCompetencyDataForPlanPageCompetency[];
+    competencycount: number; // Count of competencies.
+    proficientcompetencycount: number; // Count of proficientcompetencies.
+    proficientcompetencypercentage: number; // Percentage of competencies proficient.
+    proficientcompetencypercentageformatted: string; // Displayable percentage.
+};
+
+/**
+ * Competency data returned by tool_lp_data_for_plan_page.
+ */
+export type AddonCompetencyDataForPlanPageCompetency = {
+    competency: AddonCompetencyCompetency;
+    comppath: AddonCompetencyPath;
+    usercompetency?: AddonCompetencyUserCompetency;
+    usercompetencyplan?: AddonCompetencyUserCompetencyPlan;
+};
+
+/**
+ * Result of WS tool_lp_data_for_course_competencies_page.
+ */
+export type AddonCompetencyDataForCourseCompetenciesPageResult = {
+    courseid: number; // The current course id.
+    pagecontextid: number; // The current page context ID.
+    gradableuserid?: number; // Current user id, if the user is a gradable user.
+    canmanagecompetencyframeworks: boolean; // User can manage competency frameworks.
+    canmanagecoursecompetencies: boolean; // User can manage linked course competencies.
+    canconfigurecoursecompetencies: boolean; // User can configure course competency settings.
+    cangradecompetencies: boolean; // User can grade competencies.
+    settings: AddonCompetencyCourseCompetencySettings;
+    statistics: AddonCompetencyCourseCompetencyStatistics;
+    competencies: AddonCompetencyDataForCourseCompetenciesPageCompetency[];
+    manageurl: string; // Url to the manage competencies page.
+    pluginbaseurl: string; // Url to the course competencies page.
+};
+
+/**
+ * Competency data returned by tool_lp_data_for_course_competencies_page.
+ */
+export type AddonCompetencyDataForCourseCompetenciesPageCompetency = {
+    competency: AddonCompetencyCompetency;
+    coursecompetency: AddonCompetencyCourseCompetency;
+    coursemodules: CoreCourseModuleSummary[];
+    usercompetencycourse?: AddonCompetencyUserCompetencyCourse;
+    ruleoutcomeoptions: {
+        value: number; // The option value.
+        text: string; // The name of the option.
+        selected: boolean; // If this is the currently selected option.
+    }[];
+    comppath: AddonCompetencyPath;
+    plans: AddonCompetencyPlan[];
+};
diff --git a/src/addon/coursecompletion/components/report/addon-course-completion-report.html b/src/addon/coursecompletion/components/report/addon-course-completion-report.html
index 2b4b92070..54683082d 100644
--- a/src/addon/coursecompletion/components/report/addon-course-completion-report.html
+++ b/src/addon/coursecompletion/components/report/addon-course-completion-report.html
@@ -6,7 +6,7 @@
         <ion-card *ngIf="completion && tracked">
             <ion-item text-wrap>
                 <h2>{{ 'addon.coursecompletion.status' | translate }}</h2>
-                <p>{{ completion.statusText | translate }}</p>
+                <p>{{ statusText | translate }}</p>
             </ion-item>
             <ion-item text-wrap>
                 <h2>{{ 'addon.coursecompletion.required' | translate }}</h2>
diff --git a/src/addon/coursecompletion/components/report/report.ts b/src/addon/coursecompletion/components/report/report.ts
index 3b6371244..640def927 100644
--- a/src/addon/coursecompletion/components/report/report.ts
+++ b/src/addon/coursecompletion/components/report/report.ts
@@ -15,7 +15,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
-import { AddonCourseCompletionProvider } from '../../providers/coursecompletion';
+import { AddonCourseCompletionProvider, AddonCourseCompletionCourseCompletionStatus } from '../../providers/coursecompletion';
 
 /**
  * Component that displays the course completion report.
@@ -29,9 +29,10 @@ export class AddonCourseCompletionReportComponent implements OnInit {
     @Input() userId: number;
 
     completionLoaded = false;
-    completion: any;
+    completion: AddonCourseCompletionCourseCompletionStatus;
     showSelfComplete: boolean;
     tracked = true; // Whether completion is tracked.
+    statusText: string;
 
     constructor(
         private sitesProvider: CoreSitesProvider,
@@ -59,7 +60,7 @@ export class AddonCourseCompletionReportComponent implements OnInit {
     protected fetchCompletion(): Promise<any> {
         return this.courseCompletionProvider.getCompletion(this.courseId, this.userId).then((completion) => {
 
-            completion.statusText = this.courseCompletionProvider.getCompletedStatusText(completion);
+            this.statusText = this.courseCompletionProvider.getCompletedStatusText(completion);
 
             this.completion = completion;
             this.showSelfComplete = this.courseCompletionProvider.canMarkSelfCompleted(this.userId, completion);
diff --git a/src/addon/coursecompletion/providers/coursecompletion.ts b/src/addon/coursecompletion/providers/coursecompletion.ts
index 64b4c6f01..f303acddb 100644
--- a/src/addon/coursecompletion/providers/coursecompletion.ts
+++ b/src/addon/coursecompletion/providers/coursecompletion.ts
@@ -18,6 +18,7 @@ import { CoreSitesProvider } from '@providers/sites';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
 import { CoreSite } from '@classes/site';
+import { CoreWSExternalWarning } from '@providers/ws';
 
 /**
  * Service to handle course completion.
@@ -43,7 +44,7 @@ export class AddonCourseCompletionProvider {
      * @param completion Course completion.
      * @return True if user can mark course as self completed, false otherwise.
      */
-    canMarkSelfCompleted(userId: number, completion: any): boolean {
+    canMarkSelfCompleted(userId: number, completion: AddonCourseCompletionCourseCompletionStatus): boolean {
         let selfCompletionActive = false,
             alreadyMarked = false;
 
@@ -68,7 +69,7 @@ export class AddonCourseCompletionProvider {
      * @param completion Course completion.
      * @return Language code of the text to show.
      */
-    getCompletedStatusText(completion: any): string {
+    getCompletedStatusText(completion: AddonCourseCompletionCourseCompletionStatus): string {
         if (completion.completed) {
             return 'addon.coursecompletion.completed';
         } else {
@@ -96,7 +97,9 @@ export class AddonCourseCompletionProvider {
      * @param siteId Site ID. If not defined, use current site.
      * @return Promise to be resolved when the completion is retrieved.
      */
-    getCompletion(courseId: number, userId?: number, preSets?: any, siteId?: string): Promise<any> {
+    getCompletion(courseId: number, userId?: number, preSets?: any, siteId?: string)
+            : Promise<AddonCourseCompletionCourseCompletionStatus> {
+
         return this.sitesProvider.getSite(siteId).then((site) => {
             userId = userId || site.getUserId();
             preSets = preSets || {};
@@ -112,7 +115,9 @@ export class AddonCourseCompletionProvider {
             preSets.updateFrequency = preSets.updateFrequency || CoreSite.FREQUENCY_SOMETIMES;
             preSets.cacheErrors = ['notenroled'];
 
-            return site.read('core_completion_get_course_completion_status', data, preSets).then((data) => {
+            return site.read('core_completion_get_course_completion_status', data, preSets)
+                    .then((data: AddonCourseCompletionGetCourseCompletionStatusResult): any => {
+
                 if (data.completionstatus) {
                     return data.completionstatus;
                 }
@@ -243,17 +248,56 @@ export class AddonCourseCompletionProvider {
      * Mark a course as self completed.
      *
      * @param courseId Course ID.
-     * @return Resolved on success.
+     * @return Promise resolved on success.
      */
-    markCourseAsSelfCompleted(courseId: number): Promise<any> {
+    markCourseAsSelfCompleted(courseId: number): Promise<void> {
         const params = {
             courseid: courseId
         };
 
-        return this.sitesProvider.getCurrentSite().write('core_completion_mark_course_self_completed', params).then((response) => {
+        return this.sitesProvider.getCurrentSite().write('core_completion_mark_course_self_completed', params)
+                .then((response: AddonCourseCompletionMarkCourseSelfCompletedResult) => {
+
             if (!response.status) {
                 return Promise.reject(null);
             }
         });
     }
 }
+
+/**
+ * Completion status returned by core_completion_get_course_completion_status.
+ */
+export type AddonCourseCompletionCourseCompletionStatus = {
+    completed: boolean; // True if the course is complete, false otherwise.
+    aggregation: number; // Aggregation method 1 means all, 2 means any.
+    completions: {
+        type: number; // Completion criteria type.
+        title: string; // Completion criteria Title.
+        status: string; // Completion status (Yes/No) a % or number.
+        complete: boolean; // Completion status (true/false).
+        timecompleted: number; // Timestamp for criteria completetion.
+        details: {
+            type: string; // Type description.
+            criteria: string; // Criteria description.
+            requirement: string; // Requirement description.
+            status: string; // Status description, can be anything.
+        }; // Details.
+    }[];
+};
+
+/**
+ * Result of WS core_completion_get_course_completion_status.
+ */
+export type AddonCourseCompletionGetCourseCompletionStatusResult = {
+    completionstatus: AddonCourseCompletionCourseCompletionStatus; // Course status.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS core_completion_mark_course_self_completed.
+ */
+export type AddonCourseCompletionMarkCourseSelfCompletedResult = {
+    status: boolean; // Status, true if success.
+    warnings?: CoreWSExternalWarning[];
+};
diff --git a/src/addon/files/pages/list/list.ts b/src/addon/files/pages/list/list.ts
index 24aeb0390..061025ed0 100644
--- a/src/addon/files/pages/list/list.ts
+++ b/src/addon/files/pages/list/list.ts
@@ -20,7 +20,7 @@ import { CoreEventsProvider } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
-import { AddonFilesProvider } from '../../providers/files';
+import { AddonFilesProvider, AddonFilesFile, AddonFilesGetUserPrivateFilesInfoResult } from '../../providers/files';
 import { AddonFilesHelperProvider } from '../../providers/helper';
 
 /**
@@ -40,10 +40,10 @@ export class AddonFilesListPage implements OnDestroy {
     root: string; // The root of the files loaded: 'my' or 'site'.
     path: string; // The path of the directory being loaded. If empty path it means the root is being loaded.
     userQuota: number; // The user quota (in bytes).
-    filesInfo: any; // Info about private files (size, number of files, etc.).
+    filesInfo: AddonFilesGetUserPrivateFilesInfoResult; // Info about private files (size, number of files, etc.).
     spaceUsed: string; // Space used in a readable format.
     userQuotaReadable: string; // User quota in a readable format.
-    files: any[]; // List of files.
+    files: AddonFilesFile[]; // List of files.
     component: string; // Component to link the file downloads to.
     filesLoaded: boolean; // Whether the files are loaded.
 
@@ -147,7 +147,7 @@ export class AddonFilesListPage implements OnDestroy {
      * @return Promise resolved when done.
      */
     protected fetchFiles(): Promise<any> {
-        let promise;
+        let promise: Promise<AddonFilesFile[]>;
 
         if (!this.path) {
             // The path is unknown, the user must be requesting a root.
diff --git a/src/addon/files/providers/files.ts b/src/addon/files/providers/files.ts
index f9051494f..05613b992 100644
--- a/src/addon/files/providers/files.ts
+++ b/src/addon/files/providers/files.ts
@@ -16,6 +16,7 @@ import { Injectable } from '@angular/core';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreMimetypeUtilsProvider } from '@providers/utils/mimetype';
 import { CoreSite } from '@classes/site';
+import { CoreWSExternalWarning } from '@providers/ws';
 
 /**
  * Service to handle my files and site files.
@@ -73,7 +74,7 @@ export class AddonFilesProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the files.
      */
-    getFiles(params: any, siteId?: string): Promise<any[]> {
+    getFiles(params: any, siteId?: string): Promise<AddonFilesFile[]> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             const preSets = {
@@ -82,15 +83,15 @@ export class AddonFilesProvider {
             };
 
             return site.read('core_files_get_files', params, preSets);
-        }).then((result) => {
-            const entries = [];
+        }).then((result: AddonFilesGetFilesResult) => {
+            const entries: AddonFilesFile[] = [];
 
             if (result.files) {
                 result.files.forEach((entry) => {
                     if (entry.isdir) {
                         // Create a "link" to load the folder.
                         entry.link = {
-                            contextid: entry.contextid || '',
+                            contextid: entry.contextid || null,
                             component: entry.component || '',
                             filearea: entry.filearea || '',
                             itemid: entry.itemid || 0,
@@ -135,7 +136,7 @@ export class AddonFilesProvider {
      *
      * @return Promise resolved with the files.
      */
-    getPrivateFiles(): Promise<any[]> {
+    getPrivateFiles(): Promise<AddonFilesFile[]> {
         return this.getFiles(this.getPrivateFilesRootParams());
     }
 
@@ -164,7 +165,7 @@ export class AddonFilesProvider {
      * @param siteId Site ID. If not defined, use current site.
      * @return Promise resolved with the info.
      */
-    getPrivateFilesInfo(userId?: number, siteId?: string): Promise<any> {
+    getPrivateFilesInfo(userId?: number, siteId?: string): Promise<AddonFilesGetUserPrivateFilesInfoResult> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             userId = userId || site.getUserId();
 
@@ -204,7 +205,7 @@ export class AddonFilesProvider {
      *
      * @return Promise resolved with the files.
      */
-    getSiteFiles(): Promise<any[]> {
+    getSiteFiles(): Promise<AddonFilesFile[]> {
         return this.getFiles(this.getSiteFilesRootParams());
     }
 
@@ -388,7 +389,7 @@ export class AddonFilesProvider {
      * @param siteid ID of the site. If not defined, use current site.
      * @return Promise resolved in success, rejected otherwise.
      */
-    moveFromDraftToPrivate(draftId: number, siteId?: string): Promise<any> {
+    moveFromDraftToPrivate(draftId: number, siteId?: string): Promise<null> {
         const params = {
                 draftid: draftId
             },
@@ -414,3 +415,63 @@ export class AddonFilesProvider {
         });
     }
 }
+
+/**
+ * File data returned by core_files_get_files.
+ */
+export type AddonFilesFile = {
+    contextid: number;
+    component: string;
+    filearea: string;
+    itemid: number;
+    filepath: string;
+    filename: string;
+    isdir: boolean;
+    url: string;
+    timemodified: number;
+    timecreated?: number; // Time created.
+    filesize?: number; // File size.
+    author?: string; // File owner.
+    license?: string; // File license.
+} & AddonFilesFileCalculatedData;
+
+/**
+ * Result of WS core_files_get_files.
+ */
+export type AddonFilesGetFilesResult = {
+    parents: {
+        contextid: number;
+        component: string;
+        filearea: string;
+        itemid: number;
+        filepath: string;
+        filename: string;
+    }[];
+    files: AddonFilesFile[];
+};
+
+/**
+ * Result of WS core_user_get_private_files_info.
+ */
+export type AddonFilesGetUserPrivateFilesInfoResult = {
+    filecount: number; // Number of files in the area.
+    foldercount: number; // Number of folders in the area.
+    filesize: number; // Total size of the files in the area.
+    filesizewithoutreferences: number; // Total size of the area excluding file references.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Calculated data for AddonFilesFile.
+ */
+export type AddonFilesFileCalculatedData = {
+    link?: { // Calculated in the app. A link to open the folder.
+        contextid?: number; // Folder's contextid.
+        component?: string; // Folder's component.
+        filearea?: string; // Folder's filearea.
+        itemid?: number; // Folder's itemid.
+        filepath?: string; // Folder's filepath.
+        filename?: string; // Folder's filename.
+    };
+    imgPath?: string; // Path to file icon's image.
+};
diff --git a/src/addon/messageoutput/airnotifier/pages/devices/devices.ts b/src/addon/messageoutput/airnotifier/pages/devices/devices.ts
index a9b581f37..dfe0e5403 100644
--- a/src/addon/messageoutput/airnotifier/pages/devices/devices.ts
+++ b/src/addon/messageoutput/airnotifier/pages/devices/devices.ts
@@ -16,7 +16,7 @@ import { Component, OnDestroy } from '@angular/core';
 import { IonicPage } from 'ionic-angular';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CorePushNotificationsProvider } from '@core/pushnotifications/providers/pushnotifications';
-import { AddonMessageOutputAirnotifierProvider } from '../../providers/airnotifier';
+import { AddonMessageOutputAirnotifierProvider, AddonMessageOutputAirnotifierDevice } from '../../providers/airnotifier';
 
 /**
  * Page that displays the list of devices.
@@ -28,7 +28,7 @@ import { AddonMessageOutputAirnotifierProvider } from '../../providers/airnotifi
 })
 export class AddonMessageOutputAirnotifierDevicesPage implements OnDestroy {
 
-    devices = [];
+    devices: AddonMessageOutputAirnotifierDeviceFormatted[] = [];
     devicesLoaded = false;
 
     protected updateTimeout: any;
@@ -54,7 +54,7 @@ export class AddonMessageOutputAirnotifierDevicesPage implements OnDestroy {
             const pushId = this.pushNotificationsProvider.getPushId();
 
             // Convert enabled to boolean and search current device.
-            devices.forEach((device) => {
+            devices.forEach((device: AddonMessageOutputAirnotifierDeviceFormatted) => {
                 device.enable = !!device.enable;
                 device.current = pushId && pushId == device.pushid;
             });
@@ -110,8 +110,9 @@ export class AddonMessageOutputAirnotifierDevicesPage implements OnDestroy {
      * @param device The device object.
      * @param enable True to enable the device, false to disable it.
      */
-    enableDevice(device: any, enable: boolean): void {
+    enableDevice(device: AddonMessageOutputAirnotifierDeviceFormatted, enable: boolean): void {
         device.updating = true;
+
         this.airnotifierProivder.enableDevice(device.id, enable).then(() => {
             // Update the list of devices since it was modified.
             this.updateDevicesAfterDelay();
@@ -135,3 +136,11 @@ export class AddonMessageOutputAirnotifierDevicesPage implements OnDestroy {
         }
     }
 }
+
+/**
+ * User device with some calculated data.
+ */
+type AddonMessageOutputAirnotifierDeviceFormatted = AddonMessageOutputAirnotifierDevice & {
+    current?: boolean; // Calculated in the app. Whether it's the current device.
+    updating?: boolean; // Calculated in the app. Whether the device enable is being updated right now.
+};
diff --git a/src/addon/messageoutput/airnotifier/providers/airnotifier.ts b/src/addon/messageoutput/airnotifier/providers/airnotifier.ts
index e67e134bb..ff810dfc0 100644
--- a/src/addon/messageoutput/airnotifier/providers/airnotifier.ts
+++ b/src/addon/messageoutput/airnotifier/providers/airnotifier.ts
@@ -17,6 +17,7 @@ import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreConfigConstants } from '../../../../configconstants';
 import { CoreSite } from '@classes/site';
+import { CoreWSExternalWarning } from '@providers/ws';
 
 /**
  * Service to handle Airnotifier message output.
@@ -39,14 +40,16 @@ export class AddonMessageOutputAirnotifierProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved if success.
      */
-    enableDevice(deviceId: number, enable: boolean, siteId?: string): Promise<any> {
+    enableDevice(deviceId: number, enable: boolean, siteId?: string): Promise<void> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const data = {
                 deviceid: deviceId,
                 enable: enable ? 1 : 0
             };
 
-            return site.write('message_airnotifier_enable_device', data).then((result) => {
+            return site.write('message_airnotifier_enable_device', data)
+                    .then((result: AddonMessageOutputAirnotifierEnableDeviceResult) => {
+
                 if (!result.success) {
                     // Fail. Reject with warning message if any.
                     if (result.warnings && result.warnings.length) {
@@ -74,7 +77,7 @@ export class AddonMessageOutputAirnotifierProvider {
      * @param siteId Site ID. If not defined, use current site.
      * @return Promise resolved with the devices.
      */
-    getUserDevices(siteId?: string): Promise<any> {
+    getUserDevices(siteId?: string): Promise<AddonMessageOutputAirnotifierDevice[]> {
         this.logger.debug('Get user devices');
 
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -86,7 +89,8 @@ export class AddonMessageOutputAirnotifierProvider {
                 updateFrequency: CoreSite.FREQUENCY_RARELY
             };
 
-            return site.read('message_airnotifier_get_user_devices', data, preSets).then((data) => {
+            return site.read('message_airnotifier_get_user_devices', data, preSets)
+                    .then((data: AddonMessageOutputAirnotifierGetUserDevicesResult) => {
                 return data.devices;
             });
         });
@@ -115,3 +119,36 @@ export class AddonMessageOutputAirnotifierProvider {
                 this.sitesProvider.wsAvailableInCurrentSite('message_airnotifier_get_user_devices');
     }
 }
+
+/**
+ * Device data returned by WS message_airnotifier_get_user_devices.
+ */
+export type AddonMessageOutputAirnotifierDevice = {
+    id: number; // Device id (in the message_airnotifier table).
+    appid: string; // The app id, something like com.moodle.moodlemobile.
+    name: string; // The device name, 'occam' or 'iPhone' etc.
+    model: string; // The device model 'Nexus4' or 'iPad1,1' etc.
+    platform: string; // The device platform 'iOS' or 'Android' etc.
+    version: string; // The device version '6.1.2' or '4.2.2' etc.
+    pushid: string; // The device PUSH token/key/identifier/registration id.
+    uuid: string; // The device UUID.
+    enable: number | boolean; // Whether the device is enabled or not.
+    timecreated: number; // Time created.
+    timemodified: number; // Time modified.
+};
+
+/**
+ * Result of WS message_airnotifier_enable_device.
+ */
+export type AddonMessageOutputAirnotifierEnableDeviceResult = {
+    success: boolean; // True if success.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS message_airnotifier_get_user_devices.
+ */
+export type AddonMessageOutputAirnotifierGetUserDevicesResult = {
+    devices: AddonMessageOutputAirnotifierDevice[]; // List of devices.
+    warnings?: CoreWSExternalWarning[];
+};
diff --git a/src/addon/messages/components/confirmed-contacts/confirmed-contacts.ts b/src/addon/messages/components/confirmed-contacts/confirmed-contacts.ts
index 53983afe9..b367bdee3 100644
--- a/src/addon/messages/components/confirmed-contacts/confirmed-contacts.ts
+++ b/src/addon/messages/components/confirmed-contacts/confirmed-contacts.ts
@@ -16,7 +16,7 @@ import { Component, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@
 import { Content } from 'ionic-angular';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
-import { AddonMessagesProvider } from '../../providers/messages';
+import { AddonMessagesProvider, AddonMessagesConversationMember } from '../../providers/messages';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 
 /**
@@ -33,7 +33,7 @@ export class AddonMessagesConfirmedContactsComponent implements OnInit, OnDestro
     loaded = false;
     canLoadMore = false;
     loadMoreError = false;
-    contacts = [];
+    contacts: AddonMessagesConversationMember[] = [];
     selectedUserId: number;
 
     protected memberInfoObserver;
diff --git a/src/addon/messages/components/contact-requests/contact-requests.ts b/src/addon/messages/components/contact-requests/contact-requests.ts
index 1eb5aba36..50f1afffe 100644
--- a/src/addon/messages/components/contact-requests/contact-requests.ts
+++ b/src/addon/messages/components/contact-requests/contact-requests.ts
@@ -16,7 +16,7 @@ import { Component, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@
 import { Content } from 'ionic-angular';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
-import { AddonMessagesProvider } from '../../providers/messages';
+import { AddonMessagesProvider, AddonMessagesConversationMember } from '../../providers/messages';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 
 /**
@@ -33,7 +33,7 @@ export class AddonMessagesContactRequestsComponent implements OnInit, OnDestroy
     loaded = false;
     canLoadMore = false;
     loadMoreError = false;
-    requests = [];
+    requests: AddonMessagesConversationMember[] = [];
     selectedUserId: number;
 
     protected memberInfoObserver;
diff --git a/src/addon/messages/components/contacts/contacts.ts b/src/addon/messages/components/contacts/contacts.ts
index 311196532..16f5a62d3 100644
--- a/src/addon/messages/components/contacts/contacts.ts
+++ b/src/addon/messages/components/contacts/contacts.ts
@@ -16,7 +16,9 @@ import { Component } from '@angular/core';
 import { NavParams } from 'ionic-angular';
 import { TranslateService } from '@ngx-translate/core';
 import { CoreSitesProvider } from '@providers/sites';
-import { AddonMessagesProvider } from '../../providers/messages';
+import {
+    AddonMessagesProvider, AddonMessagesGetContactsResult, AddonMessagesSearchContactsContact
+} from '../../providers/messages';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreAppProvider } from '@providers/app';
 import { CoreEventsProvider } from '@providers/events';
@@ -42,7 +44,10 @@ export class AddonMessagesContactsComponent {
     searchType = 'search';
     loadingMessage = '';
     hasContacts = false;
-    contacts = {
+    contacts: AddonMessagesGetContactsFormatted = {
+        online: [],
+        offline: [],
+        strangers: [],
         search: []
     };
     searchString = '';
@@ -205,7 +210,7 @@ export class AddonMessagesContactsComponent {
             this.searchString = query;
             this.contactTypes = ['search'];
 
-            this.contacts['search'] = this.sortUsers(result);
+            this.contacts.search = this.sortUsers(result);
         }).catch((error) => {
             this.domUtils.showErrorModalDefault(error, 'addon.messages.errorwhileretrievingcontacts', true);
         });
@@ -234,3 +239,10 @@ export class AddonMessagesContactsComponent {
         this.memberInfoObserver && this.memberInfoObserver.off();
     }
 }
+
+/**
+ * Contacts with some calculated data.
+ */
+export type AddonMessagesGetContactsFormatted = AddonMessagesGetContactsResult & {
+    search?: AddonMessagesSearchContactsContact[]; // Calculated in the app. Result of searching users.
+};
diff --git a/src/addon/messages/pages/conversation-info/conversation-info.ts b/src/addon/messages/pages/conversation-info/conversation-info.ts
index eb8046fc1..c3d030c6f 100644
--- a/src/addon/messages/pages/conversation-info/conversation-info.ts
+++ b/src/addon/messages/pages/conversation-info/conversation-info.ts
@@ -14,7 +14,9 @@
 
 import { Component, OnInit } from '@angular/core';
 import { IonicPage, NavParams, ViewController } from 'ionic-angular';
-import { AddonMessagesProvider } from '../../providers/messages';
+import {
+    AddonMessagesProvider, AddonMessagesConversationFormatted, AddonMessagesConversationMember
+} from '../../providers/messages';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 
 /**
@@ -28,8 +30,8 @@ import { CoreDomUtilsProvider } from '@providers/utils/dom';
 export class AddonMessagesConversationInfoPage implements OnInit {
 
     loaded = false;
-    conversation: any;
-    members = [];
+    conversation: AddonMessagesConversationFormatted;
+    members: AddonMessagesConversationMember[] = [];
     canLoadMore = false;
     loadMoreError = false;
 
diff --git a/src/addon/messages/pages/discussion/discussion.ts b/src/addon/messages/pages/discussion/discussion.ts
index ef908e1c9..e6fed3ca2 100644
--- a/src/addon/messages/pages/discussion/discussion.ts
+++ b/src/addon/messages/pages/discussion/discussion.ts
@@ -17,7 +17,10 @@ import { IonicPage, NavParams, NavController, Content, ModalController } from 'i
 import { TranslateService } from '@ngx-translate/core';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
-import { AddonMessagesProvider } from '../../providers/messages';
+import {
+    AddonMessagesProvider, AddonMessagesConversationFormatted, AddonMessagesConversationMember, AddonMessagesConversationMessage,
+    AddonMessagesGetMessagesMessage
+} from '../../providers/messages';
 import { AddonMessagesOfflineProvider } from '../../providers/messages-offline';
 import { AddonMessagesSyncProvider } from '../../providers/sync';
 import { CoreUserProvider } from '@core/user/providers/user';
@@ -54,7 +57,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     protected messagesBeingSent = 0;
     protected pagesLoaded = 1;
     protected lastMessage = {text: '', timecreated: 0};
-    protected keepMessageMap = {};
+    protected keepMessageMap: {[hash: string]: boolean} = {};
     protected syncObserver: any;
     protected oldContentHeight = 0;
     protected keyboardObserver: any;
@@ -64,7 +67,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     protected showLoadingModal = false; // Whether to show a loading modal while fetching data.
 
     conversationId: number; // Conversation ID. Undefined if it's a new individual conversation.
-    conversation: any; // The conversation object (if it exists).
+    conversation: AddonMessagesConversationFormatted; // The conversation object (if it exists).
     userId: number; // User ID you're talking to (only if group messaging not enabled or it's a new individual conversation).
     currentUserId: number;
     title: string;
@@ -74,18 +77,18 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     showKeyboard = false;
     canLoadMore = false;
     loadMoreError = false;
-    messages = [];
+    messages: (AddonMessagesConversationMessageFormatted | AddonMessagesGetMessagesMessageFormatted)[] = [];
     showDelete = false;
     canDelete = false;
     groupMessagingEnabled: boolean;
     isGroup = false;
-    members: any = {}; // Members that wrote a message, indexed by ID.
+    members: {[id: number]: AddonMessagesConversationMember} = {}; // Members that wrote a message, indexed by ID.
     favouriteIcon = 'fa-star';
     favouriteIconSlash = false;
     deleteIcon = 'trash';
     blockIcon = 'close-circle';
     addRemoveIcon = 'person';
-    otherMember: any; // Other member information (individual conversations only).
+    otherMember: AddonMessagesConversationMember; // Other member information (individual conversations only).
     footerType: 'message' | 'blocked' | 'requiresContact' | 'requestSent' | 'requestReceived' | 'unable';
     requestContactSent = false;
     requestContactReceived = false;
@@ -139,7 +142,9 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
      * @param message Message to be added.
      * @param keep If set the keep flag or not.
      */
-    protected addMessage(message: any, keep: boolean = true): void {
+    protected addMessage(message: AddonMessagesConversationMessageFormatted | AddonMessagesGetMessagesMessageFormatted,
+            keep: boolean = true): void {
+
         /* Create a hash to identify the message. The text of online messages isn't reliable because it can have random data
            like VideoJS ID. Try to use id and fallback to text for offline messages. */
         message.hash = Md5.hashAsciiStr(String(message.id || message.text || '')) + '#' + message.timecreated + '#' +
@@ -158,7 +163,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
      *
      * @param hash Hash of the message to be removed.
      */
-    protected removeMessage(hash: any): void {
+    protected removeMessage(hash: string): void {
         if (this.keepMessageMap[hash]) {
             // Selected to keep it, clear the flag.
             this.keepMessageMap[hash] = false;
@@ -261,10 +266,11 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
                     if (!this.title && this.messages.length) {
                         // Didn't receive the fullname via argument. Try to get it from messages.
                         // It's possible that name cannot be resolved when no messages were yet exchanged.
-                        if (this.messages[0].useridto != this.currentUserId) {
-                            this.title = this.messages[0].usertofullname || '';
+                        const firstMessage = <AddonMessagesGetMessagesMessageFormatted> this.messages[0];
+                        if (firstMessage.useridto != this.currentUserId) {
+                            this.title = firstMessage.usertofullname || '';
                         } else {
-                            this.title = this.messages[0].userfromfullname || '';
+                            this.title = firstMessage.userfromfullname || '';
                         }
                     }
                 });
@@ -302,7 +308,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
      *
      * @return Resolved when done.
      */
-    protected fetchMessages(): Promise<any> {
+    protected fetchMessages(): Promise<void> {
         this.loadMoreError = false;
 
         if (this.messagesBeingSent > 0) {
@@ -341,7 +347,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
                     return this.getDiscussionMessages(this.pagesLoaded);
                 });
             }
-        }).then((messages) => {
+        }).then((messages: (AddonMessagesConversationMessageFormatted | AddonMessagesGetMessagesMessageFormatted)[]) => {
             this.loadMessages(messages);
         }).finally(() => {
             this.fetching = false;
@@ -353,7 +359,9 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
      *
      * @param messages Messages to load.
      */
-    protected loadMessages(messages: any[]): void {
+    protected loadMessages(messages: (AddonMessagesConversationMessageFormatted | AddonMessagesGetMessagesMessageFormatted)[])
+            : void {
+
         if (this.viewDestroyed) {
             return;
         }
@@ -382,7 +390,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
         this.messagesProvider.sortMessages(this.messages);
 
         // Calculate which messages need to display the date or user data.
-        this.messages.forEach((message, index): any => {
+        this.messages.forEach((message, index) => {
             message.showDate = this.showDate(message, this.messages[index - 1]);
             message.showUserData = this.showUserData(message, this.messages[index - 1]);
             message.showTail = this.showTail(message, this.messages[index + 1]);
@@ -411,20 +419,22 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
      * @return Promise resolved with a boolean: whether the conversation exists or not.
      */
     protected getConversation(conversationId: number, userId: number): Promise<boolean> {
-        let promise,
-            fallbackConversation;
+        let promise: Promise<number>,
+            fallbackConversation: AddonMessagesConversationFormatted;
 
         // Try to get the conversationId if we don't have it.
         if (conversationId) {
             promise = Promise.resolve(conversationId);
         } else {
+            let subPromise: Promise<AddonMessagesConversationFormatted>;
+
             if (userId == this.currentUserId && this.messagesProvider.isSelfConversationEnabled()) {
-                promise = this.messagesProvider.getSelfConversation();
+                subPromise = this.messagesProvider.getSelfConversation();
             } else {
-                promise = this.messagesProvider.getConversationBetweenUsers(userId, undefined, true);
+                subPromise = this.messagesProvider.getConversationBetweenUsers(userId, undefined, true);
             }
 
-            promise = promise.then((conversation) => {
+            promise = subPromise.then((conversation) => {
                 fallbackConversation = conversation;
 
                 return conversation.id;
@@ -437,14 +447,14 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
                 // Ignore errors.
             }).then(() => {
                 return this.messagesProvider.getConversation(conversationId, undefined, true);
-            }).catch((error) => {
+            }).catch((error): any => {
                 // Get conversation failed, use the fallback one if we have it.
                 if (fallbackConversation) {
                     return fallbackConversation;
                 }
 
                 return Promise.reject(error);
-            }).then((conversation) => {
+            }).then((conversation: AddonMessagesConversationFormatted) => {
                 this.conversation = conversation;
 
                 if (conversation) {
@@ -495,7 +505,9 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
      * @param offset Offset for message list.
      * @return Promise resolved with the list of messages.
      */
-    protected getConversationMessages(pagesToLoad: number, offset: number = 0): Promise<any[]> {
+    protected getConversationMessages(pagesToLoad: number, offset: number = 0)
+            : Promise<AddonMessagesConversationMessageFormatted[]> {
+
         const excludePending = offset > 0;
 
         return this.messagesProvider.getConversationMessages(this.conversationId, excludePending, offset).then((result) => {
@@ -535,7 +547,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
      * @return Resolved when done.
      */
     protected getDiscussionMessages(pagesToLoad: number, lfReceivedUnread: number = 0, lfReceivedRead: number = 0,
-            lfSentUnread: number = 0, lfSentRead: number = 0): Promise<any> {
+            lfSentUnread: number = 0, lfSentRead: number = 0): Promise<AddonMessagesGetMessagesMessageFormatted[]> {
 
         // Only get offline messages if we're loading the first "page".
         const excludePending = lfReceivedUnread > 0 || lfReceivedRead > 0 || lfSentUnread > 0 || lfSentRead > 0;
@@ -547,7 +559,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
             pagesToLoad--;
             if (pagesToLoad > 0 && result.canLoadMore) {
                 // More pages to load. Calculate new limit froms.
-                result.messages.forEach((message) => {
+                result.messages.forEach((message: AddonMessagesGetMessagesMessageFormatted) => {
                     if (!message.pending) {
                         if (message.useridfrom == this.userId) {
                             if (message.read) {
@@ -598,7 +610,8 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
                 for (const x in this.messages) {
                     const message = this.messages[x];
                     // If an unread message is found, mark all messages as read.
-                    if (message.useridfrom != this.currentUserId && message.read == 0) {
+                    if (message.useridfrom != this.currentUserId &&
+                            (<AddonMessagesGetMessagesMessageFormatted> message).read == 0) {
                         messageUnreadFound = true;
                         break;
                     }
@@ -616,7 +629,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
                     promise = this.messagesProvider.markAllMessagesRead(this.userId).then(() => {
                         // Mark all messages as read.
                         this.messages.forEach((message) => {
-                            message.read = 1;
+                            (<AddonMessagesGetMessagesMessageFormatted> message).read = 1;
                         });
                     });
                 }
@@ -630,10 +643,10 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
             // Mark each message as read one by one.
             this.messages.forEach((message) => {
                 // If the message is unread, call this.messagesProvider.markMessageRead.
-                if (message.useridfrom != this.currentUserId && message.read == 0) {
+                if (message.useridfrom != this.currentUserId && (<AddonMessagesGetMessagesMessageFormatted> message).read == 0) {
                     promises.push(this.messagesProvider.markMessageRead(message.id).then(() => {
                         readChanged = true;
-                        message.read = 1;
+                        (<AddonMessagesGetMessagesMessageFormatted> message).read = 1;
                     }));
                 }
             });
@@ -703,7 +716,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
                     if (!message.pending && message.useridfrom != this.currentUserId) {
                         found++;
                         if (found == this.conversation.unreadcount) {
-                            this.unreadMessageFrom = parseInt(message.id, 10);
+                            this.unreadMessageFrom = Number(message.id);
                             break;
                         }
                     }
@@ -713,13 +726,13 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
             let previousMessageRead = false;
 
             for (const x in this.messages) {
-                const message = this.messages[x];
+                const message = <AddonMessagesGetMessagesMessageFormatted> this.messages[x];
                 if (message.useridfrom != this.currentUserId) {
                     const unreadFrom = message.read == 0 && previousMessageRead;
 
                     if (unreadFrom) {
                         // Save where the label is placed.
-                        this.unreadMessageFrom = parseInt(message.id, 10);
+                        this.unreadMessageFrom = Number(message.id);
                         break;
                     }
 
@@ -808,8 +821,9 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
      *
      * @param message Message to be copied.
      */
-    copyMessage(message: any): void {
-        const text = this.textUtils.decodeHTMLEntities(message.smallmessage || message.text || '');
+    copyMessage(message: AddonMessagesConversationMessageFormatted | AddonMessagesGetMessagesMessageFormatted): void {
+        const text = this.textUtils.decodeHTMLEntities(
+                (<AddonMessagesGetMessagesMessageFormatted> message).smallmessage || message.text || '');
         this.utils.copyToClipboard(text);
     }
 
@@ -819,7 +833,9 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
      * @param message Message object to delete.
      * @param index Index where the message is to delete it from the view.
      */
-    deleteMessage(message: any, index: number): void {
+    deleteMessage(message: AddonMessagesConversationMessageFormatted | AddonMessagesGetMessagesMessageFormatted, index: number)
+            : void {
+
         const canDeleteAll = this.conversation && this.conversation.candeletemessagesforallusers,
             langKey = message.pending || canDeleteAll || this.isSelf ? 'core.areyousure' :
                     'addon.messages.deletemessageconfirmation',
@@ -860,7 +876,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
      * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
      * @return Resolved when done.
      */
-    loadPrevious(infiniteComplete?: any): Promise<any> {
+    loadPrevious(infiniteComplete?: any): Promise<void> {
         let infiniteHeight = this.infinite ? this.infinite.getHeight() : 0;
         const scrollHeight = this.domUtils.getScrollHeight(this.content);
 
@@ -962,7 +978,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
      * @param text Message text.
      */
     sendMessage(text: string): void {
-        let message;
+        let message: AddonMessagesConversationMessageFormatted | AddonMessagesGetMessagesMessageFormatted;
 
         this.hideUnreadLabel();
 
@@ -970,6 +986,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
         this.scrollBottom = true;
 
         message = {
+            id: null,
             pending: true,
             sending: true,
             useridfrom: this.currentUserId,
@@ -985,7 +1002,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
         // If there is an ongoing fetch, wait for it to finish.
         // Otherwise, if a message is sent while fetching it could disappear until the next fetch.
         this.waitForFetch().finally(() => {
-            let promise;
+            let promise: Promise<{sent: boolean, message: any}>;
 
             if (this.conversationId) {
                 promise = this.messagesProvider.sendMessageToConversation(this.conversation, text);
@@ -1050,7 +1067,9 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
      * @param prevMessage Previous message where to compare the date with.
      * @return If date has changed and should be shown.
      */
-    showDate(message: any, prevMessage?: any): boolean {
+    showDate(message: AddonMessagesConversationMessageFormatted | AddonMessagesGetMessagesMessageFormatted,
+            prevMessage?: AddonMessagesConversationMessageFormatted | AddonMessagesGetMessagesMessageFormatted): boolean {
+
         if (!prevMessage) {
             // First message, show it.
             return true;
@@ -1068,7 +1087,9 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
      * @param prevMessage Previous message.
      * @return Whether user data should be shown.
      */
-    showUserData(message: any, prevMessage?: any): boolean {
+    showUserData(message: AddonMessagesConversationMessageFormatted | AddonMessagesGetMessagesMessageFormatted,
+            prevMessage?: AddonMessagesConversationMessageFormatted | AddonMessagesGetMessagesMessageFormatted): boolean {
+
         return this.isGroup && message.useridfrom != this.currentUserId && this.members[message.useridfrom] &&
             (!prevMessage || prevMessage.useridfrom != message.useridfrom || message.showDate);
     }
@@ -1080,7 +1101,8 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
      * @param nextMessage Next message.
      * @return Whether user data should be shown.
      */
-    showTail(message: any, nextMessage?: any): boolean {
+    showTail(message: AddonMessagesConversationMessageFormatted | AddonMessagesGetMessagesMessageFormatted,
+            nextMessage?: AddonMessagesConversationMessageFormatted | AddonMessagesGetMessagesMessageFormatted): boolean {
         return !nextMessage || nextMessage.useridfrom != message.useridfrom || nextMessage.showDate;
     }
 
@@ -1422,3 +1444,26 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
         this.viewDestroyed = true;
     }
 }
+
+/**
+ * Conversation message with some calculated data.
+ */
+type AddonMessagesConversationMessageFormatted = AddonMessagesConversationMessage & {
+    pending?: boolean; // Calculated in the app. Whether the message is pending to be sent.
+    sending?: boolean; // Calculated in the app. Whether the message is being sent right now.
+    hash?: string; // Calculated in the app. A hash to identify the message.
+    showDate?: boolean; // Calculated in the app. Whether to show the date before the message.
+    showUserData?: boolean; // Calculated in the app. Whether to show the user data in the message.
+    showTail?: boolean; // Calculated in the app. Whether to show a "tail" in the message.
+};
+
+/**
+ * Message with some calculated data.
+ */
+type AddonMessagesGetMessagesMessageFormatted = AddonMessagesGetMessagesMessage & {
+    sending?: boolean; // Calculated in the app. Whether the message is being sent right now.
+    hash?: string; // Calculated in the app. A hash to identify the message.
+    showDate?: boolean; // Calculated in the app. Whether to show the date before the message.
+    showUserData?: boolean; // Calculated in the app. Whether to show the user data in the message.
+    showTail?: boolean; // Calculated in the app. Whether to show a "tail" in the message.
+};
diff --git a/src/addon/messages/pages/group-conversations/group-conversations.ts b/src/addon/messages/pages/group-conversations/group-conversations.ts
index e35485724..007d55b8f 100644
--- a/src/addon/messages/pages/group-conversations/group-conversations.ts
+++ b/src/addon/messages/pages/group-conversations/group-conversations.ts
@@ -17,7 +17,9 @@ import { IonicPage, Platform, NavController, NavParams, Content } from 'ionic-an
 import { TranslateService } from '@ngx-translate/core';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
-import { AddonMessagesProvider } from '../../providers/messages';
+import {
+    AddonMessagesProvider, AddonMessagesConversationFormatted, AddonMessagesConversationMessage
+} from '../../providers/messages';
 import { AddonMessagesOfflineProvider } from '../../providers/messages-offline';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreUtilsProvider } from '@providers/utils/utils';
@@ -45,19 +47,19 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     selectedConversationId: number;
     selectedUserId: number;
     contactRequestsCount = 0;
-    favourites: any = {
+    favourites: AddonMessagesGroupConversationOption = {
         type: null,
         favourites: true,
         count: 0,
-        unread: 0
+        unread: 0,
     };
-    group: any = {
+    group: AddonMessagesGroupConversationOption = {
         type: AddonMessagesProvider.MESSAGE_CONVERSATION_TYPE_GROUP,
         favourites: false,
         count: 0,
         unread: 0
     };
-    individual: any = {
+    individual: AddonMessagesGroupConversationOption = {
         type: AddonMessagesProvider.MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
         favourites: false,
         count: 0,
@@ -331,7 +333,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
      *
      * @return Promise resolved when done.
      */
-    protected fetchDataForExpandedOption(): Promise<any> {
+    protected fetchDataForExpandedOption(): Promise<void> {
         const expandedOption = this.getExpandedOption();
 
         if (expandedOption) {
@@ -349,12 +351,12 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
      * @param getCounts Whether to get counts data.
      * @return Promise resolved when done.
      */
-    fetchDataForOption(option: any, loadingMore?: boolean, getCounts?: boolean): Promise<void> {
+    fetchDataForOption(option: AddonMessagesGroupConversationOption, loadingMore?: boolean, getCounts?: boolean): Promise<void> {
         option.loadMoreError = false;
 
         const limitFrom = loadingMore ? option.conversations.length : 0,
             promises = [];
-        let data,
+        let data: {conversations: AddonMessagesConversationForList[], canLoadMore: boolean},
             offlineMessages;
 
         // Get the conversations and, if needed, the offline messages. Always try to get the latest data.
@@ -422,7 +424,9 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
      * @param option The option to search in. If not defined, search in all options.
      * @return Conversation.
      */
-    protected findConversation(conversationId: number, userId?: number, option?: any): any {
+    protected findConversation(conversationId: number, userId?: number, option?: AddonMessagesGroupConversationOption)
+            : AddonMessagesConversationForList {
+
         if (conversationId) {
             const conversations = option ? (option.conversations || []) : ((this.favourites.conversations || [])
                     .concat(this.group.conversations || []).concat(this.individual.conversations || []));
@@ -445,7 +449,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
      *
      * @return Option currently expanded.
      */
-    protected getExpandedOption(): any {
+    protected getExpandedOption(): AddonMessagesGroupConversationOption {
         if (this.favourites.expanded) {
             return this.favourites;
         } else if (this.group.expanded) {
@@ -495,9 +499,9 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
      *
      * @param option The option to fetch data for.
      * @param infiniteComplete Infinite scroll complete function. Only used from core-infinite-loading.
-     * @return Resolved when done.
+     * @return Promise resolved when done.
      */
-    loadMoreConversations(option: any, infiniteComplete?: any): Promise<any> {
+    loadMoreConversations(option: AddonMessagesGroupConversationOption, infiniteComplete?: any): Promise<void> {
         return this.fetchDataForOption(option, true).catch((error) => {
             this.domUtils.showErrorModalDefault(error, 'addon.messages.errorwhileretrievingdiscussions', true);
             option.loadMoreError = true;
@@ -513,7 +517,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
      * @param messages Offline messages.
      * @return Promise resolved when done.
      */
-    protected loadOfflineMessages(option: any, messages: any[]): Promise<any> {
+    protected loadOfflineMessages(option: AddonMessagesGroupConversationOption, messages: any[]): Promise<any> {
         const promises = [];
 
         messages.forEach((message) => {
@@ -588,7 +592,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
      * @param conversation Conversation where to put the last message.
      * @param message Offline message to add.
      */
-    protected addLastOfflineMessage(conversation: any, message: any): void {
+    protected addLastOfflineMessage(conversation: any, message: AddonMessagesConversationMessage): void {
         conversation.lastmessage = message.text;
         conversation.lastmessagedate = message.timecreated / 1000;
         conversation.lastmessagepending = true;
@@ -601,7 +605,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
      * @param conversation Conversation to check.
      * @return Option object.
      */
-    protected getConversationOption(conversation: any): any {
+    protected getConversationOption(conversation: AddonMessagesConversationForList): AddonMessagesGroupConversationOption {
         if (conversation.isfavourite) {
             return this.favourites;
         } else if (conversation.type == AddonMessagesProvider.MESSAGE_CONVERSATION_TYPE_GROUP) {
@@ -618,7 +622,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
      * @param refreshUnreadCounts Whether to refresh unread counts.
      * @return Promise resolved when done.
      */
-    refreshData(refresher?: any, refreshUnreadCounts: boolean = true): Promise<any> {
+    refreshData(refresher?: any, refreshUnreadCounts: boolean = true): Promise<void> {
         // Don't invalidate conversations and so, they always try to get latest data.
         const promises = [
             this.messagesProvider.invalidateContactRequestsCountCache(this.siteId)
@@ -638,7 +642,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
      *
      * @param option The option to expand/collapse.
      */
-    toggle(option: any): void {
+    toggle(option: AddonMessagesGroupConversationOption): void {
         if (option.expanded) {
             // Already expanded, close it.
             option.expanded = false;
@@ -658,7 +662,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
      * @param getCounts Whether to get counts data.
      * @return Promise resolved when done.
      */
-    protected expandOption(option: any, getCounts?: boolean): Promise<any> {
+    protected expandOption(option: AddonMessagesGroupConversationOption, getCounts?: boolean): Promise<void> {
         // Collapse all and expand the right one.
         this.favourites.expanded = false;
         this.group.expanded = false;
@@ -715,3 +719,25 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
         this.memberInfoObserver && this.memberInfoObserver.off();
     }
 }
+
+/**
+ * Conversation options.
+ */
+export type AddonMessagesGroupConversationOption = {
+    type: number; // Option type.
+    favourites: boolean; // Whether it contains favourites conversations.
+    count: number; // Number of conversations.
+    unread?: number; // Number of unread conversations.
+    expanded?: boolean; // Whether the option is currently expanded.
+    loading?: boolean; // Whether the option is being loaded.
+    canLoadMore?: boolean; // Whether it can load more data.
+    loadMoreError?: boolean; // Whether there was an error loading more conversations.
+    conversations?: AddonMessagesConversationForList[]; // List of conversations.
+};
+
+/**
+ * Formatted conversation with some calculated data for the list.
+ */
+export type AddonMessagesConversationForList = AddonMessagesConversationFormatted & {
+    lastmessagepending?: boolean; // Calculated in the app. Whether last message is pending to be sent.
+};
diff --git a/src/addon/messages/pages/search/search.ts b/src/addon/messages/pages/search/search.ts
index 54e5a74c7..9268f58f0 100644
--- a/src/addon/messages/pages/search/search.ts
+++ b/src/addon/messages/pages/search/search.ts
@@ -16,7 +16,7 @@ import { Component, OnDestroy, ViewChild } from '@angular/core';
 import { IonicPage } from 'ionic-angular';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
-import { AddonMessagesProvider } from '../../providers/messages';
+import { AddonMessagesProvider, AddonMessagesConversationMember, AddonMessagesMessageAreaContact } from '../../providers/messages';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreAppProvider } from '@providers/app';
@@ -38,21 +38,21 @@ export class AddonMessagesSearchPage implements OnDestroy {
     contacts = {
         type: 'contacts',
         titleString: 'addon.messages.contacts',
-        results: [],
+        results: <AddonMessagesConversationMember[]> [],
         canLoadMore: false,
         loadingMore: false
     };
     nonContacts = {
         type: 'noncontacts',
         titleString: 'addon.messages.noncontacts',
-        results: [],
+        results: <AddonMessagesConversationMember[]> [],
         canLoadMore: false,
         loadingMore: false
     };
     messages = {
         type: 'messages',
         titleString: 'addon.messages.messages',
-        results: [],
+        results: <AddonMessagesMessageAreaContact[]> [],
         canLoadMore: false,
         loadingMore: false,
         loadMoreError: false
@@ -116,9 +116,9 @@ export class AddonMessagesSearchPage implements OnDestroy {
         this.displaySearching = !loadMore;
 
         const promises = [];
-        let newContacts = [];
-        let newNonContacts = [];
-        let newMessages = [];
+        let newContacts: AddonMessagesConversationMember[] = [];
+        let newNonContacts: AddonMessagesConversationMember[] = [];
+        let newMessages: AddonMessagesMessageAreaContact[] = [];
         let canLoadMoreContacts = false;
         let canLoadMoreNonContacts = false;
         let canLoadMoreMessages = false;
diff --git a/src/addon/messages/pages/settings/settings.ts b/src/addon/messages/pages/settings/settings.ts
index b2eed0099..1a8d9de5e 100644
--- a/src/addon/messages/pages/settings/settings.ts
+++ b/src/addon/messages/pages/settings/settings.ts
@@ -14,7 +14,10 @@
 
 import { Component, OnDestroy } from '@angular/core';
 import { IonicPage } from 'ionic-angular';
-import { AddonMessagesProvider } from '../../providers/messages';
+import {
+    AddonMessagesProvider, AddonMessagesMessagePreferences, AddonMessagesMessagePreferencesNotification,
+    AddonMessagesMessagePreferencesNotificationProcessor
+} from '../../providers/messages';
 import { CoreUserProvider } from '@core/user/providers/user';
 import { CoreAppProvider } from '@providers/app';
 import { CoreConfigProvider } from '@providers/config';
@@ -34,7 +37,7 @@ import { CoreConstants } from '@core/constants';
 export class AddonMessagesSettingsPage implements OnDestroy {
     protected updateTimeout: any;
 
-    preferences: any;
+    preferences: AddonMessagesMessagePreferences;
     preferencesLoaded: boolean;
     contactablePrivacy: number | boolean;
     advancedContactable = false; // Whether the site supports "advanced" contactable privacy.
@@ -78,9 +81,9 @@ export class AddonMessagesSettingsPage implements OnDestroy {
     /**
      * Fetches preference data.
      *
-     * @return Resolved when done.
+     * @return Promise resolved when done.
      */
-    protected fetchPreferences(): Promise<any> {
+    protected fetchPreferences(): Promise<void> {
         return this.messagesProvider.getMessagePreferences().then((preferences) => {
             if (this.groupMessagingEnabled) {
                 // Simplify the preferences.
@@ -90,11 +93,12 @@ export class AddonMessagesSettingsPage implements OnDestroy {
                         return notification.preferencekey == AddonMessagesProvider.NOTIFICATION_PREFERENCES_KEY;
                     });
 
-                    for (const notification of component.notifications) {
-                        for (const processor of notification.processors) {
+                    component.notifications.forEach((notification) => {
+                        notification.processors.forEach(
+                                (processor: AddonMessagesMessagePreferencesNotificationProcessorFormatted) => {
                             processor.checked = processor.loggedin.checked || processor.loggedoff.checked;
-                        }
-                    }
+                        });
+                    });
                 }
             }
 
@@ -168,14 +172,16 @@ export class AddonMessagesSettingsPage implements OnDestroy {
      * @param state State name, ['loggedin', 'loggedoff'].
      * @param processor Notification processor.
      */
-    changePreference(notification: any, state: string, processor: any): void {
+    changePreference(notification: AddonMessagesMessagePreferencesNotificationFormatted, state: string,
+            processor: AddonMessagesMessagePreferencesNotificationProcessorFormatted): void {
+
         if (this.groupMessagingEnabled) {
             // Update both states at the same time.
             const valueArray = [],
                 promises = [];
             let value = 'none';
 
-            notification.processors.forEach((processor) => {
+            notification.processors.forEach((processor: AddonMessagesMessagePreferencesNotificationProcessorFormatted) => {
                 if (processor.checked) {
                     valueArray.push(processor.name);
                 }
@@ -268,3 +274,17 @@ export class AddonMessagesSettingsPage implements OnDestroy {
         }
     }
 }
+
+/**
+ * Message preferences notification with some caclulated data.
+ */
+type AddonMessagesMessagePreferencesNotificationFormatted = AddonMessagesMessagePreferencesNotification & {
+    updating?: boolean | {[state: string]: boolean}; // Calculated in the app. Whether the notification is being updated.
+};
+
+/**
+ * Message preferences notification processor with some caclulated data.
+ */
+type AddonMessagesMessagePreferencesNotificationProcessorFormatted = AddonMessagesMessagePreferencesNotificationProcessor & {
+    checked?: boolean; // Calculated in the app. Whether the processor is checked either for loggedin or loggedoff.
+};
diff --git a/src/addon/messages/providers/mainmenu-handler.ts b/src/addon/messages/providers/mainmenu-handler.ts
index b39725450..f7e0547f2 100644
--- a/src/addon/messages/providers/mainmenu-handler.ts
+++ b/src/addon/messages/providers/mainmenu-handler.ts
@@ -248,7 +248,7 @@ export class AddonMessagesMainMenuHandler implements CoreMainMenuHandler, CoreCr
                     }
 
                     const currentUserId = site.getUserId(),
-                        message = conv.messages[0]; // Treat only the last message, is the one we're interested.
+                        message: any = conv.messages[0]; // Treat only the last message, is the one we're interested.
 
                     if (!message || message.useridfrom == currentUserId) {
                         // No last message or not from current user. Return empty list.
diff --git a/src/addon/messages/providers/messages.ts b/src/addon/messages/providers/messages.ts
index a16d9810f..12c482b94 100644
--- a/src/addon/messages/providers/messages.ts
+++ b/src/addon/messages/providers/messages.ts
@@ -23,6 +23,7 @@ import { CoreTimeUtilsProvider } from '@providers/utils/time';
 import { CoreEmulatorHelperProvider } from '@core/emulator/providers/helper';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreSite } from '@classes/site';
+import { CoreWSExternalWarning } from '@providers/ws';
 
 /**
  * Service to handle messages.
@@ -89,9 +90,9 @@ export class AddonMessagesProvider {
      *
      * @param userId User ID of the person to block.
      * @param siteId Site ID. If not defined, use current site.
-     * @return Resolved when done.
+     * @return Promise resolved when done.
      */
-    blockContact(userId: number, siteId?: string): Promise<any> {
+    blockContact(userId: number, siteId?: string): Promise<void> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             let promise;
             if (site.wsAvailable('core_message_block_user')) {
@@ -313,7 +314,9 @@ export class AddonMessagesProvider {
      * @param userId User ID viewing the conversation.
      * @return Formatted conversation.
      */
-    protected formatConversation(conversation: any, userId: number): any {
+    protected formatConversation(conversation: AddonMessagesConversationFormatted, userId: number)
+            : AddonMessagesConversationFormatted {
+
         const numMessages = conversation.messages.length,
             lastMessage = numMessages ? conversation.messages[numMessages - 1] : null;
 
@@ -536,10 +539,10 @@ export class AddonMessagesProvider {
      * Get all the contacts of the current user.
      *
      * @param siteId Site ID. If not defined, use current site.
-     * @return Resolved with the WS data.
+     * @return Promise resolved with the WS data.
      * @deprecated since Moodle 3.6
      */
-    getAllContacts(siteId?: string): Promise<any> {
+    getAllContacts(siteId?: string): Promise<AddonMessagesGetContactsResult> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
 
         return this.getContacts(siteId).then((contacts) => {
@@ -562,9 +565,9 @@ export class AddonMessagesProvider {
      * Get all the users blocked by the current user.
      *
      * @param siteId Site ID. If not defined, use current site.
-     * @return Resolved with the WS data.
+     * @return Promise resolved with the WS data.
      */
-    getBlockedContacts(siteId?: string): Promise<any> {
+    getBlockedContacts(siteId?: string): Promise<AddonMessagesGetBlockedUsersResult> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const userId = site.getUserId(),
                 params = {
@@ -585,19 +588,24 @@ export class AddonMessagesProvider {
      * This excludes the blocked users.
      *
      * @param siteId Site ID. If not defined, use current site.
-     * @return Resolved with the WS data.
+     * @return Promise resolved with the WS data.
      * @deprecated since Moodle 3.6
      */
-    getContacts(siteId?: string): Promise<any> {
+    getContacts(siteId?: string): Promise<AddonMessagesGetContactsResult> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const preSets = {
                 cacheKey: this.getCacheKeyForContacts(),
                 updateFrequency: CoreSite.FREQUENCY_OFTEN
             };
 
-            return site.read('core_message_get_contacts', undefined, preSets).then((contacts) => {
+            return site.read('core_message_get_contacts', undefined, preSets).then((contacts: AddonMessagesGetContactsResult) => {
                 // Filter contacts with negative ID, they are notifications.
-                const validContacts = {};
+                const validContacts: AddonMessagesGetContactsResult = {
+                    online: [],
+                    offline: [],
+                    strangers: []
+                };
+
                 for (const typeName in contacts) {
                     if (!validContacts[typeName]) {
                         validContacts[typeName] = [];
@@ -621,11 +629,11 @@ export class AddonMessagesProvider {
      * @param limitFrom Position of the first contact to fetch.
      * @param limitNum Number of contacts to fetch. Default is AddonMessagesProvider.LIMIT_CONTACTS.
      * @param siteId Site ID. If not defined, use current site.
-     * @return Resolved with the list of user contacts.
+     * @return Promise resolved with the list of user contacts.
      * @since 3.6
      */
     getUserContacts(limitFrom: number = 0, limitNum: number = AddonMessagesProvider.LIMIT_CONTACTS , siteId?: string):
-            Promise<{contacts: any[], canLoadMore: boolean}> {
+            Promise<{contacts: AddonMessagesConversationMember[], canLoadMore: boolean}> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
@@ -638,7 +646,9 @@ export class AddonMessagesProvider {
                 updateFrequency: CoreSite.FREQUENCY_OFTEN
             };
 
-            return site.read('core_message_get_user_contacts', params, preSets).then((contacts) => {
+            return site.read('core_message_get_user_contacts', params, preSets)
+                    .then((contacts: AddonMessagesConversationMember[]) => {
+
                 if (!contacts || !contacts.length) {
                     return { contacts: [], canLoadMore: false };
                 }
@@ -663,11 +673,11 @@ export class AddonMessagesProvider {
      * @param limitFrom Position of the first contact request to fetch.
      * @param limitNum Number of contact requests to fetch. Default is AddonMessagesProvider.LIMIT_CONTACTS.
      * @param siteId Site ID. If not defined, use current site.
-     * @return Resolved with the list of contact requests.
+     * @return Promise resolved with the list of contact requests.
      * @since 3.6
      */
     getContactRequests(limitFrom: number = 0, limitNum: number =  AddonMessagesProvider.LIMIT_CONTACTS, siteId?: string):
-            Promise<{requests: any[], canLoadMore: boolean}> {
+            Promise<{requests: AddonMessagesConversationMember[], canLoadMore: boolean}> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             const data = {
@@ -680,7 +690,9 @@ export class AddonMessagesProvider {
                 updateFrequency: CoreSite.FREQUENCY_OFTEN
             };
 
-            return site.read('core_message_get_contact_requests', data, preSets).then((requests) => {
+            return site.read('core_message_get_contact_requests', data, preSets)
+                    .then((requests: AddonMessagesConversationMember[]) => {
+
                 if (!requests || !requests.length) {
                     return { requests: [], canLoadMore: false };
                 }
@@ -716,7 +728,7 @@ export class AddonMessagesProvider {
                 typeExpected: 'number'
             };
 
-            return site.read('core_message_get_received_contact_requests_count', data, preSets).then((count) => {
+            return site.read('core_message_get_received_contact_requests_count', data, preSets).then((count: number) => {
                 // Notify the new count so all badges are updated.
                 this.eventsProvider.trigger(AddonMessagesProvider.CONTACT_REQUESTS_COUNT_EVENT, { count }, site.id);
 
@@ -745,7 +757,7 @@ export class AddonMessagesProvider {
      */
     getConversation(conversationId: number, includeContactRequests?: boolean, includePrivacyInfo?: boolean,
             messageOffset: number = 0, messageLimit: number = 1, memberOffset: number = 0, memberLimit: number = 2,
-            newestFirst: boolean = true, siteId?: string, userId?: number): Promise<any> {
+            newestFirst: boolean = true, siteId?: string, userId?: number): Promise<AddonMessagesConversationFormatted> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             userId = userId || site.getUserId();
@@ -765,7 +777,7 @@ export class AddonMessagesProvider {
                     newestmessagesfirst: newestFirst ? 1 : 0
                 };
 
-            return site.read('core_message_get_conversation', params, preSets).then((conversation) => {
+            return site.read('core_message_get_conversation', params, preSets).then((conversation: AddonMessagesConversation) => {
                 return this.formatConversation(conversation, userId);
             });
         });
@@ -792,7 +804,8 @@ export class AddonMessagesProvider {
      */
     getConversationBetweenUsers(otherUserId: number, includeContactRequests?: boolean, includePrivacyInfo?: boolean,
             messageOffset: number = 0, messageLimit: number = 1, memberOffset: number = 0, memberLimit: number = 2,
-            newestFirst: boolean = true, siteId?: string, userId?: number, preferCache?: boolean): Promise<any> {
+            newestFirst: boolean = true, siteId?: string, userId?: number, preferCache?: boolean)
+            : Promise<AddonMessagesConversationFormatted> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             userId = userId || site.getUserId();
@@ -813,7 +826,8 @@ export class AddonMessagesProvider {
                     newestmessagesfirst: newestFirst ? 1 : 0
                 };
 
-            return site.read('core_message_get_conversation_between_users', params, preSets).then((conversation) => {
+            return site.read('core_message_get_conversation_between_users', params, preSets)
+                    .then((conversation: AddonMessagesConversation) => {
                 return this.formatConversation(conversation, userId);
             });
         });
@@ -826,12 +840,11 @@ export class AddonMessagesProvider {
      * @param limitFrom Offset for members list.
      * @param limitTo Limit of members.
      * @param siteId Site ID. If not defined, use current site.
-     * @param userId User ID. If not defined, current user in the site.
-     * @return Promise resolved with the response.
+     * @param userId User ID. If not defined, current user in
      * @since 3.6
      */
     getConversationMembers(conversationId: number, limitFrom: number = 0, limitTo?: number, includeContactRequests?: boolean,
-            siteId?: string, userId?: number): Promise<any> {
+            siteId?: string, userId?: number): Promise<{members: AddonMessagesConversationMember[], canLoadMore: boolean}> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             userId = userId || site.getUserId();
@@ -853,18 +866,21 @@ export class AddonMessagesProvider {
                     includeprivacyinfo: 1,
                 };
 
-            return site.read('core_message_get_conversation_members', params, preSets).then((members) => {
-                const result: any = {};
+            return site.read('core_message_get_conversation_members', params, preSets)
+                    .then((members: AddonMessagesConversationMember[]) => {
 
                 if (limitTo < 1) {
-                    result.canLoadMore = false;
-                    result.members = members;
+                    return {
+                        canLoadMore: false,
+                        members: members
+                    };
                 } else {
-                    result.canLoadMore = members.length > limitTo;
-                    result.members = members.slice(0, limitTo);
+                    return {
+                        canLoadMore: members.length > limitTo,
+                        members: members.slice(0, limitTo)
+                    };
                 }
 
-                return result;
             });
         });
     }
@@ -884,7 +900,8 @@ export class AddonMessagesProvider {
      * @since 3.6
      */
     getConversationMessages(conversationId: number, excludePending: boolean, limitFrom: number = 0, limitTo?: number,
-            newestFirst: boolean = true, timeFrom: number = 0, siteId?: string, userId?: number): Promise<any> {
+            newestFirst: boolean = true, timeFrom: number = 0, siteId?: string, userId?: number)
+            : Promise<AddonMessagesGetConversationMessagesResult> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             userId = userId || site.getUserId();
@@ -913,7 +930,9 @@ export class AddonMessagesProvider {
                 preSets['emergencyCache'] = false;
             }
 
-            return site.read('core_message_get_conversation_messages', params, preSets).then((result) => {
+            return site.read('core_message_get_conversation_messages', params, preSets)
+                    .then((result: AddonMessagesGetConversationMessagesResult) => {
+
                 if (limitTo < 1) {
                     result.canLoadMore = false;
                     result.messages = result.messages;
@@ -975,7 +994,8 @@ export class AddonMessagesProvider {
      * @since 3.6
      */
     getConversations(type?: number, favourites?: boolean, limitFrom: number = 0, siteId?: string, userId?: number,
-            forceCache?: boolean, ignoreCache?: boolean): Promise<{conversations: any[], canLoadMore: boolean}> {
+            forceCache?: boolean, ignoreCache?: boolean)
+            : Promise<{conversations: AddonMessagesConversationFormatted[], canLoadMore: boolean}> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             userId = userId || site.getUserId();
@@ -1017,7 +1037,7 @@ export class AddonMessagesProvider {
                 }
 
                 return Promise.reject(error);
-            }).then((response) => {
+            }).then((response: AddonMessagesGetConversationsResult) => {
                 // Format the conversations, adding some calculated fields.
                 const conversations = response.conversations.slice(0, this.LIMIT_MESSAGES).map((conversation) => {
                         return this.formatConversation(conversation, userId);
@@ -1053,7 +1073,9 @@ export class AddonMessagesProvider {
                 cacheKey: this.getCacheKeyForConversationCounts()
             };
 
-            return site.read('core_message_get_conversation_counts', {}, preSets).then((result) => {
+            return site.read('core_message_get_conversation_counts', {}, preSets)
+                    .then((result: AddonMessagesGetConversationCountsResult) => {
+
                 const counts = {
                     favourites: result.favourites,
                     individual: result.types[AddonMessagesProvider.MESSAGE_CONVERSATION_TYPE_INDIVIDUAL],
@@ -1080,10 +1102,14 @@ export class AddonMessagesProvider {
      * @return Promise resolved with messages and a boolean telling if can load more messages.
      */
     getDiscussion(userId: number, excludePending: boolean, lfReceivedUnread: number = 0, lfReceivedRead: number = 0,
-            lfSentUnread: number = 0, lfSentRead: number = 0, toDisplay: boolean = true, siteId?: string): Promise<any> {
+            lfSentUnread: number = 0, lfSentRead: number = 0, toDisplay: boolean = true, siteId?: string)
+            : Promise<{messages: AddonMessagesGetMessagesMessage[], canLoadMore: boolean}> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
-            const result = {},
+            const result = {
+                    messages: <AddonMessagesGetMessagesMessage[]> [],
+                    canLoadMore: false
+                },
                 preSets = {
                     cacheKey: this.getCacheKeyForDiscussion(userId)
                 },
@@ -1107,7 +1133,7 @@ export class AddonMessagesProvider {
             // Get message received by current user.
             return this.getRecentMessages(params, preSets, lfReceivedUnread, lfReceivedRead, toDisplay, site.getId())
                     .then((response) => {
-                result['messages'] = response;
+                result.messages = response;
                 params.useridto = userId;
                 params.useridfrom = site.getUserId();
                 hasReceived = response.length > 0;
@@ -1115,16 +1141,16 @@ export class AddonMessagesProvider {
                 // Get message sent by current user.
                 return this.getRecentMessages(params, preSets, lfSentUnread, lfSentRead, toDisplay, siteId);
             }).then((response) => {
-                result['messages'] = result['messages'].concat(response);
+                result.messages = result.messages.concat(response);
                 hasSent = response.length > 0;
 
-                if (result['messages'].length > this.LIMIT_MESSAGES) {
+                if (result.messages.length > this.LIMIT_MESSAGES) {
                     // Sort messages and get the more recent ones.
-                    result['canLoadMore'] = true;
-                    result['messages'] = this.sortMessages(result['messages']);
-                    result['messages'] = result['messages'].slice(-this.LIMIT_MESSAGES);
+                    result.canLoadMore = true;
+                    result.messages = this.sortMessages(result['messages']);
+                    result.messages = result.messages.slice(-this.LIMIT_MESSAGES);
                 } else {
-                    result['canLoadMore'] = result['messages'].length == this.LIMIT_MESSAGES && (!hasReceived || !hasSent);
+                    result.canLoadMore = result.messages.length == this.LIMIT_MESSAGES && (!hasReceived || !hasSent);
                 }
 
                 if (excludePending) {
@@ -1140,7 +1166,7 @@ export class AddonMessagesProvider {
                         message.text = message.smallmessage;
                     });
 
-                    result['messages'] = result['messages'].concat(offlineMessages);
+                    result.messages = result.messages.concat(offlineMessages);
 
                     return result;
                 });
@@ -1153,11 +1179,11 @@ export class AddonMessagesProvider {
      * If the site is 3.6 or higher, please use getConversations.
      *
      * @param siteId Site ID. If not defined, current site.
-     * @return Resolved with an object where the keys are the user ID of the other user.
+     * @return Promise resolved with an object where the keys are the user ID of the other user.
      */
-    getDiscussions(siteId?: string): Promise<any> {
+    getDiscussions(siteId?: string): Promise<{[userId: number]: AddonMessagesDiscussion}> {
         return this.sitesProvider.getSite(siteId).then((site) => {
-            const discussions = {},
+            const discussions: {[userId: number]: AddonMessagesDiscussion} = {},
                 currentUserId = site.getUserId(),
                 params = {
                     useridto: currentUserId,
@@ -1171,7 +1197,7 @@ export class AddonMessagesProvider {
             /**
              * Convenience function to treat a recent message, adding it to discussions list if needed.
              */
-            const treatRecentMessage = (message: any, userId: number, userFullname: string): void => {
+            const treatRecentMessage = (message: AddonMessagesGetMessagesMessage, userId: number, userFullname: string): void => {
                 if (typeof discussions[userId] === 'undefined') {
                     discussions[userId] = {
                         fullname: userFullname,
@@ -1272,7 +1298,7 @@ export class AddonMessagesProvider {
      * @return Promise resolved with the member info.
      * @since 3.6
      */
-    getMemberInfo(otherUserId: number, siteId?: string, userId?: number): Promise<any> {
+    getMemberInfo(otherUserId: number, siteId?: string, userId?: number): Promise<AddonMessagesConversationMember> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             userId = userId || site.getUserId();
 
@@ -1287,7 +1313,9 @@ export class AddonMessagesProvider {
                     includeprivacyinfo: 1,
                 };
 
-            return site.read('core_message_get_member_info', params, preSets).then((members) => {
+            return site.read('core_message_get_member_info', params, preSets)
+                    .then((members: AddonMessagesConversationMember[]): any => {
+
                 if (!members || members.length < 1) {
                     // Should never happen.
                     return Promise.reject(null);
@@ -1313,7 +1341,7 @@ export class AddonMessagesProvider {
      * @param siteId Site ID. If not defined, use current site.
      * @return Promise resolved with the message preferences.
      */
-    getMessagePreferences(siteId?: string): Promise<any> {
+    getMessagePreferences(siteId?: string): Promise<AddonMessagesMessagePreferences> {
         this.logger.debug('Get message preferences');
 
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1322,7 +1350,9 @@ export class AddonMessagesProvider {
                     updateFrequency: CoreSite.FREQUENCY_SOMETIMES
                 };
 
-            return site.read('core_message_get_user_message_preferences', {}, preSets).then((data) => {
+            return site.read('core_message_get_user_message_preferences', {}, preSets)
+                    .then((data: AddonMessagesGetUserMessagePreferencesResult): any => {
+
                 if (data.preferences) {
                     data.preferences.blocknoncontacts = data.blocknoncontacts;
 
@@ -1341,15 +1371,18 @@ export class AddonMessagesProvider {
      * @param preSets Set of presets for the WS.
      * @param toDisplay True if messages will be displayed to the user, either in view or in a notification.
      * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with the data.
      */
-    protected getMessages(params: any, preSets: any, toDisplay: boolean = true, siteId?: string): Promise<any> {
+    protected getMessages(params: any, preSets: any, toDisplay: boolean = true, siteId?: string)
+            : Promise<AddonMessagesGetMessagesResult> {
+
         params['type'] = 'conversations';
         params['newestfirst'] = 1;
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             const userId = site.getUserId();
 
-            return site.read('core_message_get_messages', params, preSets).then((response) => {
+            return site.read('core_message_get_messages', params, preSets).then((response: AddonMessagesGetMessagesResult) => {
                 response.messages.forEach((message) => {
                     message.read = params.read == 0 ? 0 : 1;
                     // Convert times to milliseconds.
@@ -1377,9 +1410,10 @@ export class AddonMessagesProvider {
      * @param limitFromRead Number of unread messages already fetched, so fetch will be done from this number.
      * @param toDisplay True if messages will be displayed to the user, either in view or in a notification.
      * @param siteId Site ID. If not defined, use current site.
+     * @return Promise resolved with the data.
      */
     protected getRecentMessages(params: any, preSets: any, limitFromUnread: number = 0, limitFromRead: number = 0,
-            toDisplay: boolean = true, siteId?: string): Promise<any> {
+            toDisplay: boolean = true, siteId?: string): Promise<AddonMessagesGetMessagesMessage[]> {
         limitFromUnread = limitFromUnread || 0;
         limitFromRead = limitFromRead || 0;
 
@@ -1427,7 +1461,7 @@ export class AddonMessagesProvider {
      * @since 3.7
      */
     getSelfConversation(messageOffset: number = 0, messageLimit: number = 1, newestFirst: boolean = true, siteId?: string,
-            userId?: number): Promise<any> {
+            userId?: number): Promise<AddonMessagesConversationFormatted> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             userId = userId || site.getUserId();
@@ -1442,7 +1476,8 @@ export class AddonMessagesProvider {
                     newestmessagesfirst: newestFirst ? 1 : 0
                 };
 
-            return site.read('core_message_get_self_conversation', params, preSets).then((conversation) => {
+            return site.read('core_message_get_self_conversation', params, preSets)
+                    .then((conversation: AddonMessagesConversation) => {
                 return this.formatConversation(conversation, userId);
             });
         });
@@ -1466,7 +1501,8 @@ export class AddonMessagesProvider {
                     cacheKey: this.getCacheKeyForUnreadConversationCounts()
                 };
 
-                promise = site.read('core_message_get_unread_conversation_counts', {}, preSets).then((result) => {
+                promise = site.read('core_message_get_unread_conversation_counts', {}, preSets)
+                        .then((result: AddonMessagesGetUnreadConversationCountsResult) => {
                     return {
                         favourites: result.favourites,
                         individual: result.types[AddonMessagesProvider.MESSAGE_CONVERSATION_TYPE_INDIVIDUAL],
@@ -1485,7 +1521,7 @@ export class AddonMessagesProvider {
                         typeExpected: 'number'
                     };
 
-                promise = site.read('core_message_get_unread_conversations_count', params, preSets).then((count) => {
+                promise = site.read('core_message_get_unread_conversations_count', params, preSets).then((count: number) => {
                     return { favourites: 0, individual: count, group: 0, self: 0 };
                 });
             } else {
@@ -1536,7 +1572,7 @@ export class AddonMessagesProvider {
      * @return Promise resolved with the message unread count.
      */
     getUnreadReceivedMessages(toDisplay: boolean = true, forceCache: boolean = false, ignoreCache: boolean = false,
-            siteId?: string): Promise<any> {
+            siteId?: string): Promise<AddonMessagesGetMessagesResult> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                     read: 0,
@@ -2049,7 +2085,7 @@ export class AddonMessagesProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with boolean marking success or not.
      */
-    markMessageRead(messageId: number, siteId?: string): Promise<any> {
+    markMessageRead(messageId: number, siteId?: string): Promise<AddonMessagesMarkMessageReadResult> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                 messageid: messageId,
@@ -2067,7 +2103,7 @@ export class AddonMessagesProvider {
      * @return Promise resolved if success.
      * @since 3.6
      */
-    markAllConversationMessagesRead(conversationId?: number): Promise<any> {
+    markAllConversationMessagesRead(conversationId?: number): Promise<null> {
         const params = {
                 userid: this.sitesProvider.getCurrentSiteUserId(),
                 conversationid: conversationId
@@ -2085,7 +2121,7 @@ export class AddonMessagesProvider {
      * @param userIdFrom User Id for the sender.
      * @return Promise resolved with boolean marking success or not.
      */
-    markAllMessagesRead(userIdFrom?: number): Promise<any> {
+    markAllMessagesRead(userIdFrom?: number): Promise<boolean> {
         const params = {
                 useridto: this.sitesProvider.getCurrentSiteUserId(),
                 useridfrom: userIdFrom
@@ -2217,8 +2253,9 @@ export class AddonMessagesProvider {
      * @param query The query string.
      * @param limit The number of results to return, 0 for none.
      * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the contacts.
      */
-    searchContacts(query: string, limit: number = 100, siteId?: string): Promise<any> {
+    searchContacts(query: string, limit: number = 100, siteId?: string): Promise<AddonMessagesSearchContactsContact[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const data = {
                     searchtext: query,
@@ -2228,7 +2265,9 @@ export class AddonMessagesProvider {
                     getFromCache: false // Always try to get updated data. If it fails, it will get it from cache.
                 };
 
-            return site.read('core_message_search_contacts', data, preSets).then((contacts) => {
+            return site.read('core_message_search_contacts', data, preSets)
+                    .then((contacts: AddonMessagesSearchContactsContact[]) => {
+
                 if (limit && contacts.length > limit) {
                     contacts = contacts.splice(0, limit);
                 }
@@ -2250,7 +2289,7 @@ export class AddonMessagesProvider {
      * @return Promise resolved with the results.
      */
     searchMessages(query: string, userId?: number, limitFrom: number = 0, limitNum: number = AddonMessagesProvider.LIMIT_SEARCH,
-            siteId?: string): Promise<{messages: any[], canLoadMore: boolean}> {
+            siteId?: string): Promise<{messages: AddonMessagesMessageAreaContact[], canLoadMore: boolean}> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
@@ -2263,13 +2302,15 @@ export class AddonMessagesProvider {
                     getFromCache: false // Always try to get updated data. If it fails, it will get it from cache.
                 };
 
-            return site.read('core_message_data_for_messagearea_search_messages', params, preSets).then((result) => {
+            return site.read('core_message_data_for_messagearea_search_messages', params, preSets)
+                    .then((result: AddonMessagesDataForMessageAreaSearchMessagesResult) => {
+
                 if (!result.contacts || !result.contacts.length) {
                     return { messages: [], canLoadMore: false };
                 }
 
-                result.contacts.forEach((result) => {
-                    result.id = result.userid;
+                result.contacts.forEach((contact) => {
+                    contact.id = contact.userid;
                 });
 
                 this.userProvider.storeUsers(result.contacts, site.id);
@@ -2297,7 +2338,8 @@ export class AddonMessagesProvider {
      * @since 3.6
      */
     searchUsers(query: string, limitFrom: number = 0, limitNum: number = AddonMessagesProvider.LIMIT_SEARCH, siteId?: string):
-            Promise<{contacts: any[], nonContacts: any[], canLoadMoreContacts: boolean, canLoadMoreNonContacts: boolean}> {
+            Promise<{contacts: AddonMessagesConversationMember[], nonContacts: AddonMessagesConversationMember[],
+                canLoadMoreContacts: boolean, canLoadMoreNonContacts: boolean}> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             const data = {
@@ -2310,7 +2352,7 @@ export class AddonMessagesProvider {
                     getFromCache: false // Always try to get updated data. If it fails, it will get it from cache.
                 };
 
-            return site.read('core_message_message_search_users', data, preSets).then((result) => {
+            return site.read('core_message_message_search_users', data, preSets).then((result: AddonMessagesSearchUsersResult) => {
                 const contacts = result.contacts || [];
                 const nonContacts = result.noncontacts || [];
 
@@ -2341,7 +2383,9 @@ export class AddonMessagesProvider {
      *         - sent (Boolean) True if message was sent to server, false if stored in device.
      *         - message (Object) If sent=false, contains the stored message.
      */
-    sendMessage(toUserId: number, message: string, siteId?: string): Promise<any> {
+    sendMessage(toUserId: number, message: string, siteId?: string)
+            : Promise<{sent: boolean, message: AddonMessagesSendInstantMessagesMessage}> {
+
         // Convenience function to store a message to be synchronized later.
         const storeOffline = (): Promise<any> => {
             return this.messagesOffline.saveMessage(toUserId, message, siteId).then((entry) => {
@@ -2395,7 +2439,7 @@ export class AddonMessagesProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved if success, rejected if failure.
      */
-    sendMessageOnline(toUserId: number, message: string, siteId?: string): Promise<any> {
+    sendMessageOnline(toUserId: number, message: string, siteId?: string): Promise<AddonMessagesSendInstantMessagesMessage> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
 
         const messages = [
@@ -2430,7 +2474,7 @@ export class AddonMessagesProvider {
      * @return Promise resolved if success, rejected if failure. Promise resolved doesn't mean that messages
      *         have been sent, the resolve param can contain errors for messages not sent.
      */
-    sendMessagesOnline(messages: any, siteId?: string): Promise<any> {
+    sendMessagesOnline(messages: any[], siteId?: string): Promise<AddonMessagesSendInstantMessagesMessage[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const data = {
                 messages: messages
@@ -2451,7 +2495,9 @@ export class AddonMessagesProvider {
      *         - message (any) If sent=false, contains the stored message.
      * @since 3.6
      */
-    sendMessageToConversation(conversation: any, message: string, siteId?: string): Promise<any> {
+    sendMessageToConversation(conversation: any, message: string, siteId?: string)
+            : Promise<{sent: boolean, message: AddonMessagesSendMessagesToConversationMessage}> {
+
         // Convenience function to store a message to be synchronized later.
         const storeOffline = (): Promise<any> => {
             return this.messagesOffline.saveConversationMessage(conversation, message, siteId).then((entry) => {
@@ -2506,7 +2552,8 @@ export class AddonMessagesProvider {
      * @return Promise resolved if success, rejected if failure.
      * @since 3.6
      */
-    sendMessageToConversationOnline(conversationId: number, message: string, siteId?: string): Promise<any> {
+    sendMessageToConversationOnline(conversationId: number, message: string, siteId?: string)
+            : Promise<AddonMessagesSendMessagesToConversationMessage> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
 
         const messages = [
@@ -2534,7 +2581,9 @@ export class AddonMessagesProvider {
      * @return Promise resolved if success, rejected if failure.
      * @since 3.6
      */
-    sendMessagesToConversationOnline(conversationId: number, messages: any, siteId?: string): Promise<any> {
+    sendMessagesToConversationOnline(conversationId: number, messages: any[], siteId?: string)
+            : Promise<AddonMessagesSendMessagesToConversationMessage[]> {
+
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                 conversationid: conversationId,
@@ -2603,10 +2652,10 @@ export class AddonMessagesProvider {
      * @param conversations Array of conversations.
      * @return Conversations sorted with most recent last.
      */
-    sortConversations(conversations: any[]): any[] {
+    sortConversations(conversations: AddonMessagesConversationFormatted[]): AddonMessagesConversationFormatted[] {
         return conversations.sort((a, b) => {
-            const timeA = parseInt(a.lastmessagedate, 10),
-                timeB = parseInt(b.lastmessagedate, 10);
+            const timeA = Number(a.lastmessagedate),
+                timeB = Number(b.lastmessagedate);
 
             if (timeA == timeB && a.id) {
                 // Same time, sort by ID.
@@ -2651,7 +2700,9 @@ export class AddonMessagesProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    protected storeLastReceivedMessageIfNeeded(convIdOrUserIdFrom: number, message: any, siteId?: string): Promise<any> {
+    protected storeLastReceivedMessageIfNeeded(convIdOrUserIdFrom: number,
+            message: AddonMessagesGetMessagesMessage | AddonMessagesConversationMessage, siteId?: string): Promise<any> {
+
         const component = AddonMessagesProvider.PUSH_SIMULATION_COMPONENT;
 
         // Get the last received message.
@@ -2675,7 +2726,7 @@ export class AddonMessagesProvider {
      *
      * @param contactTypes List of contacts grouped in types.
      */
-    protected storeUsersFromAllContacts(contactTypes: any): void {
+    protected storeUsersFromAllContacts(contactTypes: AddonMessagesGetContactsResult): void {
         for (const x in contactTypes) {
             this.userProvider.storeUsers(contactTypes[x]);
         }
@@ -2735,3 +2786,377 @@ export class AddonMessagesProvider {
         });
     }
 }
+
+/**
+ * Conversation.
+ */
+export type AddonMessagesConversation = {
+    id: number; // The conversation id.
+    name: string; // The conversation name, if set.
+    subname: string; // A subtitle for the conversation name, if set.
+    imageurl: string; // A link to the conversation picture, if set.
+    type: number; // The type of the conversation (1=individual,2=group,3=self).
+    membercount: number; // Total number of conversation members.
+    ismuted: boolean; // If the user muted this conversation.
+    isfavourite: boolean; // If the user marked this conversation as a favourite.
+    isread: boolean; // If the user has read all messages in the conversation.
+    unreadcount: number; // The number of unread messages in this conversation.
+    members: AddonMessagesConversationMember[];
+    messages: AddonMessagesConversationMessage[];
+    candeletemessagesforallusers: boolean; // @since 3.7. If the user can delete messages in the conversation for all users.
+};
+
+/**
+ * Conversation with some calculated data.
+ */
+export type AddonMessagesConversationFormatted = AddonMessagesConversation & {
+    lastmessage?: string; // Calculated in the app. Last message.
+    lastmessagedate?: number; // Calculated in the app. Date the last message was sent.
+    sentfromcurrentuser?: boolean; // Calculated in the app. Whether last message was sent by the current user.
+    name?: string; // Calculated in the app. If private conversation, name of the other user.
+    userid?: number; // Calculated in the app. URL. If private conversation, ID of the other user.
+    showonlinestatus?: boolean; // Calculated in the app. If private conversation, whether to show online status of the other user.
+    isonline?: boolean; // Calculated in the app. If private conversation, whether the other user is online.
+    isblocked?: boolean; // Calculated in the app. If private conversation, whether the other user is blocked.
+    otherUser?: AddonMessagesConversationMember; // Calculated in the app. Other user in the conversation.
+};
+
+/**
+ * Conversation member.
+ */
+export type AddonMessagesConversationMember = {
+    id: number; // The user id.
+    fullname: string; // The user's name.
+    profileurl: string; // The link to the user's profile page.
+    profileimageurl: string; // User picture URL.
+    profileimageurlsmall: string; // Small user picture URL.
+    isonline: boolean; // The user's online status.
+    showonlinestatus: boolean; // Show the user's online status?.
+    isblocked: boolean; // If the user has been blocked.
+    iscontact: boolean; // Is the user a contact?.
+    isdeleted: boolean; // Is the user deleted?.
+    canmessageevenifblocked: boolean; // If the user can still message even if they get blocked.
+    canmessage: boolean; // If the user can be messaged.
+    requirescontact: boolean; // If the user requires to be contacts.
+    contactrequests?: { // The contact requests.
+        id: number; // The id of the contact request.
+        userid: number; // The id of the user who created the contact request.
+        requesteduserid: number; // The id of the user confirming the request.
+        timecreated: number; // The timecreated timestamp for the contact request.
+    }[];
+    conversations?: { // Conversations between users.
+        id: number; // Conversations id.
+        type: number; // Conversation type: private or public.
+        name: string; // Multilang compatible conversation name2.
+        timecreated: number; // The timecreated timestamp for the conversation.
+    }[];
+};
+
+/**
+ * Conversation message.
+ */
+export type AddonMessagesConversationMessage = {
+    id: number; // The id of the message.
+    useridfrom: number; // The id of the user who sent the message.
+    text: string; // The text of the message.
+    timecreated: number; // The timecreated timestamp for the message.
+};
+
+/**
+ * Message preferences.
+ */
+export type AddonMessagesMessagePreferences = {
+    userid: number; // User id.
+    disableall: number; // Whether all the preferences are disabled.
+    processors: { // Config form values.
+        displayname: string; // Display name.
+        name: string; // Processor name.
+        hassettings: boolean; // Whether has settings.
+        contextid: number; // Context id.
+        userconfigured: number; // Whether is configured by the user.
+    }[];
+    components: { // Available components.
+        displayname: string; // Display name.
+        notifications: AddonMessagesMessagePreferencesNotification[]; // List of notificaitons for the component.
+    }[];
+} & AddonMessagesMessagePreferencesCalculatedData;
+
+/**
+ * Notification processor in message preferences.
+ */
+export type AddonMessagesMessagePreferencesNotification = {
+    displayname: string; // Display name.
+    preferencekey: string; // Preference key.
+    processors: AddonMessagesMessagePreferencesNotificationProcessor[]; // Processors values for this notification.
+};
+
+/**
+ * Notification processor in message preferences.
+ */
+export type AddonMessagesMessagePreferencesNotificationProcessor = {
+    displayname: string; // Display name.
+    name: string; // Processor name.
+    locked: boolean; // Is locked by admin?.
+    lockedmessage?: string; // Text to display if locked.
+    userconfigured: number; // Is configured?.
+    loggedin: {
+        name: string; // Name.
+        displayname: string; // Display name.
+        checked: boolean; // Is checked?.
+    };
+    loggedoff: {
+        name: string; // Name.
+        displayname: string; // Display name.
+        checked: boolean; // Is checked?.
+    };
+};
+
+/**
+ * Message discussion (before 3.6).
+ */
+export type AddonMessagesDiscussion = {
+    fullname: string; // Full name of the other user in the discussion.
+    profileimageurl: string; // Profile image of the other user in the discussion.
+    message?: { // Last message.
+        id: number; // Message ID.
+        user: number; // User ID that sent the message.
+        message: string; // Text of the message.
+        timecreated: number; // Time the message was sent.
+        pending?: boolean; // Whether the message is pending to be sent.
+    };
+    unread?: boolean; // Whether the discussion has unread messages.
+};
+
+/**
+ * Contact for message area.
+ */
+export type AddonMessagesMessageAreaContact = {
+    userid: number; // The user's id.
+    fullname: string; // The user's name.
+    profileimageurl: string; // User picture URL.
+    profileimageurlsmall: string; // Small user picture URL.
+    ismessaging: boolean; // If we are messaging the user.
+    sentfromcurrentuser: boolean; // Was the last message sent from the current user?.
+    lastmessage: string; // The user's last message.
+    lastmessagedate: number; // Timestamp for last message.
+    messageid: number; // The unique search message id.
+    showonlinestatus: boolean; // Show the user's online status?.
+    isonline: boolean; // The user's online status.
+    isread: boolean; // If the user has read the message.
+    isblocked: boolean; // If the user has been blocked.
+    unreadcount: number; // The number of unread messages in this conversation.
+    conversationid: number; // The id of the conversation.
+} & AddonMessagesMessageAreaContactCalculatedData;
+
+/**
+ * Result of WS core_message_get_blocked_users.
+ */
+export type AddonMessagesGetBlockedUsersResult = {
+    users: AddonMessagesBlockedUser[]; // List of blocked users.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * User data returned by core_message_get_blocked_users.
+ */
+export type AddonMessagesBlockedUser = {
+    id: number; // User ID.
+    fullname: string; // User full name.
+    profileimageurl?: string; // User picture URL.
+};
+
+/**
+ * Result of WS core_message_get_contacts.
+ */
+export type AddonMessagesGetContactsResult = {
+    online: AddonMessagesGetContactsContact[]; // List of online contacts.
+    offline: AddonMessagesGetContactsContact[]; // List of offline contacts.
+    strangers: AddonMessagesGetContactsContact[]; // List of users that are not in the user's contact list but have sent a message.
+} & AddonMessagesGetContactsCalculatedData;
+
+/**
+ * User data returned by core_message_get_contacts.
+ */
+export type AddonMessagesGetContactsContact = {
+    id: number; // User ID.
+    fullname: string; // User full name.
+    profileimageurl?: string; // User picture URL.
+    profileimageurlsmall?: string; // Small user picture URL.
+    unread: number; // Unread message count.
+};
+
+/**
+ * User data returned by core_message_search_contacts.
+ */
+export type AddonMessagesSearchContactsContact = {
+    id: number; // User ID.
+    fullname: string; // User full name.
+    profileimageurl?: string; // User picture URL.
+    profileimageurlsmall?: string; // Small user picture URL.
+};
+
+/**
+ * Result of WS core_message_get_conversation_messages.
+ */
+export type AddonMessagesGetConversationMessagesResult = {
+    id: number; // The conversation id.
+    members: AddonMessagesConversationMember[];
+    messages: AddonMessagesConversationMessage[];
+} & AddonMessagesGetConversationMessagesCalculatedData;
+
+/**
+ * Result of WS core_message_get_conversations.
+ */
+export type AddonMessagesGetConversationsResult = {
+    conversations: AddonMessagesConversation[];
+};
+
+/**
+ * Result of WS core_message_get_conversation_counts.
+ */
+export type AddonMessagesGetConversationCountsResult = {
+    favourites: number; // Total number of favourite conversations.
+    types: {
+        1: number; // Total number of individual conversations.
+        2: number; // Total number of group conversations.
+        3: number; // Total number of self conversations.
+    };
+};
+
+/**
+ * Result of WS core_message_get_unread_conversation_counts.
+ */
+export type AddonMessagesGetUnreadConversationCountsResult = {
+    favourites: number; // Total number of unread favourite conversations.
+    types: {
+        1: number; // Total number of unread individual conversations.
+        2: number; // Total number of unread group conversations.
+        3: number; // Total number of unread self conversations.
+    };
+};
+
+/**
+ * Result of WS core_message_get_user_message_preferences.
+ */
+export type AddonMessagesGetUserMessagePreferencesResult = {
+    preferences: AddonMessagesMessagePreferences;
+    blocknoncontacts: number; // Privacy messaging setting to define who can message you.
+    entertosend: boolean; // User preference for using enter to send messages.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS core_message_get_messages.
+ */
+export type AddonMessagesGetMessagesResult = {
+    messages: AddonMessagesGetMessagesMessage[];
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Message data returned by core_message_get_messages.
+ */
+export type AddonMessagesGetMessagesMessage = {
+    id: number; // Message id.
+    useridfrom: number; // User from id.
+    useridto: number; // User to id.
+    subject: string; // The message subject.
+    text: string; // The message text formated.
+    fullmessage: string; // The message.
+    fullmessageformat: number; // Fullmessage format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    fullmessagehtml: string; // The message in html.
+    smallmessage: string; // The shorten message.
+    notification: number; // Is a notification?.
+    contexturl: string; // Context URL.
+    contexturlname: string; // Context URL link name.
+    timecreated: number; // Time created.
+    timeread: number; // Time read.
+    usertofullname: string; // User to full name.
+    userfromfullname: string; // User from full name.
+    component?: string; // The component that generated the notification.
+    eventtype?: string; // The type of notification.
+    customdata?: string; // Custom data to be passed to the message processor.
+} & AddonMessagesGetMessagesMessageCalculatedData;
+
+/**
+ * Result of WS core_message_data_for_messagearea_search_messages.
+ */
+export type AddonMessagesDataForMessageAreaSearchMessagesResult = {
+    contacts: AddonMessagesMessageAreaContact[];
+};
+
+/**
+ * Result of WS core_message_message_search_users.
+ */
+export type AddonMessagesSearchUsersResult = {
+    contacts: AddonMessagesConversationMember[];
+    noncontacts: AddonMessagesConversationMember[];
+};
+
+/**
+ * Result of WS core_message_mark_message_read.
+ */
+export type AddonMessagesMarkMessageReadResult = {
+    messageid: number; // The id of the message in the messages table.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS core_message_send_instant_messages.
+ */
+export type AddonMessagesSendInstantMessagesMessage = {
+    msgid: number; // Test this to know if it succeeds:  id of the created message if it succeeded, -1 when failed.
+    clientmsgid?: string; // Your own id for the message.
+    errormessage?: string; // Error message - if it failed.
+    text?: string; // The text of the message.
+    timecreated?: number; // The timecreated timestamp for the message.
+    conversationid?: number; // The conversation id for this message.
+    useridfrom?: number; // The user id who sent the message.
+    candeletemessagesforallusers: boolean; // If the user can delete messages in the conversation for all users.
+};
+
+/**
+ * Result of WS core_message_send_messages_to_conversation.
+ */
+export type AddonMessagesSendMessagesToConversationMessage = {
+    id: number; // The id of the message.
+    useridfrom: number; // The id of the user who sent the message.
+    text: string; // The text of the message.
+    timecreated: number; // The timecreated timestamp for the message.
+};
+
+/**
+ * Calculated data for core_message_get_contacts.
+ */
+export type AddonMessagesGetContactsCalculatedData = {
+    blocked?: AddonMessagesBlockedUser[]; // Calculated in the app. List of blocked users.
+};
+
+/**
+ * Calculated data for core_message_get_conversation_messages.
+ */
+export type AddonMessagesGetConversationMessagesCalculatedData = {
+    canLoadMore?: boolean; // Calculated in the app. Whether more messages can be loaded.
+};
+
+/**
+ * Calculated data for message preferences.
+ */
+export type AddonMessagesMessagePreferencesCalculatedData = {
+    blocknoncontacts?: number; // Calculated in the app. Based on the result of core_message_get_user_message_preferences.
+};
+
+/**
+ * Calculated data for messages returned by core_message_get_messages.
+ */
+export type AddonMessagesGetMessagesMessageCalculatedData = {
+    pending?: boolean; // Calculated in the app. Whether the message is pending to be sent.
+    read?: number; // Calculated in the app. Whether the message has been read.
+};
+
+/**
+ * Calculated data for contact for message area.
+ */
+export type AddonMessagesMessageAreaContactCalculatedData = {
+    id?: number; // Calculated in the app. User ID.
+};
diff --git a/src/addon/messages/providers/sync.ts b/src/addon/messages/providers/sync.ts
index 6c7d33886..20a3a27c1 100644
--- a/src/addon/messages/providers/sync.ts
+++ b/src/addon/messages/providers/sync.ts
@@ -18,7 +18,7 @@ import { CoreSitesProvider } from '@providers/sites';
 import { CoreSyncBaseProvider } from '@classes/base-sync';
 import { CoreAppProvider } from '@providers/app';
 import { AddonMessagesOfflineProvider } from './messages-offline';
-import { AddonMessagesProvider } from './messages';
+import { AddonMessagesProvider, AddonMessagesConversationFormatted } from './messages';
 import { CoreUserProvider } from '@core/user/providers/user';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
@@ -258,7 +258,7 @@ export class AddonMessagesSyncProvider extends CoreSyncBaseProvider {
                 // Get conversation name and add errors to warnings array.
                 return this.messagesProvider.getConversation(conversationId, false, false).catch(() => {
                     // Ignore errors.
-                    return {};
+                    return <AddonMessagesConversationFormatted> {};
                 }).then((conversation) => {
                     errors.forEach((error) => {
                         warnings.push(this.translate.instant('addon.messages.warningconversationmessagenotsent', {
diff --git a/src/addon/notes/components/list/list.ts b/src/addon/notes/components/list/list.ts
index 2011957ed..c05cbbc05 100644
--- a/src/addon/notes/components/list/list.ts
+++ b/src/addon/notes/components/list/list.ts
@@ -21,7 +21,7 @@ import { CoreSitesProvider } from '@providers/sites';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
 import { CoreUserProvider } from '@core/user/providers/user';
 import { coreSlideInOut } from '@classes/animations';
-import { AddonNotesProvider } from '../../providers/notes';
+import { AddonNotesProvider, AddonNotesNoteFormatted } from '../../providers/notes';
 import { AddonNotesOfflineProvider } from '../../providers/notes-offline';
 import { AddonNotesSyncProvider } from '../../providers/notes-sync';
 
@@ -44,7 +44,7 @@ export class AddonNotesListComponent implements OnInit, OnDestroy {
     type = 'course';
     refreshIcon = 'spinner';
     syncIcon = 'spinner';
-    notes: any[];
+    notes: AddonNotesNoteFormatted[];
     hasOffline = false;
     notesLoaded = false;
     user: any;
@@ -101,21 +101,21 @@ export class AddonNotesListComponent implements OnInit, OnDestroy {
             // Ignore errors.
         }).then(() => {
             return this.notesProvider.getNotes(this.courseId, this.userId).then((notes) => {
-                notes = notes[this.type + 'notes'] || [];
+                const notesList: AddonNotesNoteFormatted[] = notes[this.type + 'notes'] || [];
 
-                return this.notesProvider.setOfflineDeletedNotes(notes, this.courseId).then((notes) => {
+                return this.notesProvider.setOfflineDeletedNotes(notesList, this.courseId).then((notesList) => {
 
-                    this.hasOffline = notes.some((note) => note.offline || note.deleted);
+                    this.hasOffline = notesList.some((note) => note.offline || note.deleted);
 
                     if (this.userId) {
-                        this.notes = notes;
+                        this.notes = notesList;
 
                         // Get the user profile to retrieve the user image.
                         return this.userProvider.getProfile(this.userId, this.courseId, true).then((user) => {
                             this.user = user;
                         });
                     } else {
-                        return this.notesProvider.getNotesUserData(notes, this.courseId).then((notes) => {
+                        return this.notesProvider.getNotesUserData(notesList, this.courseId).then((notes) => {
                             this.notes = notes;
                         });
                     }
@@ -126,7 +126,7 @@ export class AddonNotesListComponent implements OnInit, OnDestroy {
         }).finally(() => {
             let canDelete = this.notes && this.notes.length > 0;
             if (canDelete && this.type == 'personal') {
-                canDelete = this.notes.find((note) =>  {
+                canDelete = !!this.notes.find((note) =>  {
                     return note.usermodified == this.currentUserId;
                 });
             }
@@ -178,6 +178,7 @@ export class AddonNotesListComponent implements OnInit, OnDestroy {
     addNote(e: Event): void {
         e.preventDefault();
         e.stopPropagation();
+
         const modal = this.modalCtrl.create('AddonNotesAddPage', { userId: this.userId, courseId: this.courseId, type: this.type });
         modal.onDidDismiss((data) => {
             if (data && data.sent && data.type) {
@@ -192,6 +193,7 @@ export class AddonNotesListComponent implements OnInit, OnDestroy {
                 this.typeChanged();
             }
         });
+
         modal.present();
     }
 
@@ -201,7 +203,7 @@ export class AddonNotesListComponent implements OnInit, OnDestroy {
      * @param e Click event.
      * @param note Note to delete.
      */
-    deleteNote(e: Event, note: any): void {
+    deleteNote(e: Event, note: AddonNotesNoteFormatted): void {
         e.preventDefault();
         e.stopPropagation();
 
@@ -226,7 +228,7 @@ export class AddonNotesListComponent implements OnInit, OnDestroy {
      * @param e Click event.
      * @param note Note to delete.
      */
-    undoDeleteNote(e: Event, note: any): void {
+    undoDeleteNote(e: Event, note: AddonNotesNoteFormatted): void {
         e.preventDefault();
         e.stopPropagation();
 
diff --git a/src/addon/notes/providers/notes.ts b/src/addon/notes/providers/notes.ts
index 3753f9404..ff89faaad 100644
--- a/src/addon/notes/providers/notes.ts
+++ b/src/addon/notes/providers/notes.ts
@@ -22,6 +22,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { CoreUserProvider } from '@core/user/providers/user';
 import { AddonNotesOfflineProvider } from './notes-offline';
 import { CorePushNotificationsProvider } from '@core/pushnotifications/providers/pushnotifications';
+import { CoreWSExternalWarning } from '@providers/ws';
 
 /**
  * Service to handle notes.
@@ -119,9 +120,9 @@ export class AddonNotesProvider {
      * @return Promise resolved when added, rejected otherwise. Promise resolved doesn't mean that notes
      *         have been added, the resolve param can contain errors for notes not sent.
      */
-    addNotesOnline(notes: any[], siteId?: string): Promise<any> {
+    addNotesOnline(notes: any[], siteId?: string): Promise<AddonNotesCreateNotesNote[]> {
         if (!notes || !notes.length) {
-            return Promise.resolve();
+            return Promise.resolve([]);
         }
 
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -142,7 +143,7 @@ export class AddonNotesProvider {
      * @return Promise resolved when deleted, rejected otherwise. Promise resolved doesn't mean that notes
      *         have been deleted, the resolve param can contain errors for notes not deleted.
      */
-    deleteNote(note: any, courseId: number, siteId?: string): Promise<void> {
+    deleteNote(note: AddonNotesNoteFormatted, courseId: number, siteId?: string): Promise<void> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
 
         if (note.offline) {
@@ -190,7 +191,7 @@ export class AddonNotesProvider {
                 notes: noteIds
             };
 
-            return site.write('core_notes_delete_notes', data).then((response) => {
+            return site.write('core_notes_delete_notes', data).then((response: CoreWSExternalWarning[]) => {
                 // A note was deleted, invalidate the course notes.
                 return this.invalidateNotes(courseId, undefined, siteId).catch(() => {
                     // Ignore errors.
@@ -288,7 +289,9 @@ export class AddonNotesProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise to be resolved when the notes are retrieved.
      */
-    getNotes(courseId: number, userId?: number, ignoreCache?: boolean, onlyOnline?: boolean, siteId?: string): Promise<any> {
+    getNotes(courseId: number, userId?: number, ignoreCache?: boolean, onlyOnline?: boolean, siteId?: string)
+            : Promise<AddonNotesGetCourseNotesResult> {
+
         this.logger.debug('Get notes for course ' + courseId);
 
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -310,7 +313,7 @@ export class AddonNotesProvider {
                 preSets.emergencyCache = false;
             }
 
-            return site.read('core_notes_get_course_notes', data, preSets).then((notes) => {
+            return site.read('core_notes_get_course_notes', data, preSets).then((notes: AddonNotesGetCourseNotesResult) => {
                 if (onlyOnline) {
                     return notes;
                 }
@@ -339,9 +342,11 @@ export class AddonNotesProvider {
      * @param notes Array of notes.
      * @param courseId ID of the course the notes belong to.
      * @param siteId Site ID. If not defined, current site.
-     * @return [description]
+     * @return Promise resolved when done.
      */
-    setOfflineDeletedNotes(notes: any[], courseId: number, siteId?: string): Promise<any> {
+    setOfflineDeletedNotes(notes: AddonNotesNoteFormatted[], courseId: number, siteId?: string)
+            : Promise<AddonNotesNoteFormatted[]> {
+
         return this.notesOffline.getCourseDeletedNotes(courseId, siteId).then((deletedNotes) => {
             notes.forEach((note) => {
                 note.deleted = deletedNotes.some((n) => n.noteid == note.id);
@@ -358,7 +363,7 @@ export class AddonNotesProvider {
      * @param courseId ID of the course the notes belong to.
      * @return Promise always resolved. Resolve param is the formatted notes.
      */
-    getNotesUserData(notes: any[], courseId: number): Promise<any> {
+    getNotesUserData(notes: AddonNotesNoteFormatted[], courseId: number): Promise<AddonNotesNoteFormatted[]> {
         const promises = notes.map((note) => {
             // Get the user profile to retrieve the user image.
             return this.userProvider.getProfile(note.userid, note.courseid, true).then((user) => {
@@ -400,7 +405,7 @@ export class AddonNotesProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the WS call is successful.
      */
-    logView(courseId: number, userId?: number, siteId?: string): Promise<any> {
+    logView(courseId: number, userId?: number, siteId?: string): Promise<AddonNotesViewNotesResult> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                 courseid: courseId,
@@ -413,3 +418,57 @@ export class AddonNotesProvider {
         });
     }
 }
+
+/**
+ * Note data returned by core_notes_get_course_notes.
+ */
+export type AddonNotesNote = {
+    id: number; // Id of this note.
+    courseid: number; // Id of the course.
+    userid: number; // User id.
+    content: string; // The content text formated.
+    format: number; // Content format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    created: number; // Time created (timestamp).
+    lastmodified: number; // Time of last modification (timestamp).
+    usermodified: number; // User id of the creator of this note.
+    publishstate: string; // State of the note (i.e. draft, public, site).
+};
+
+/**
+ * Result of WS core_notes_get_course_notes.
+ */
+export type AddonNotesGetCourseNotesResult = {
+    sitenotes?: AddonNotesNote[]; // Site notes.
+    coursenotes?: AddonNotesNote[]; // Couse notes.
+    personalnotes?: AddonNotesNote[]; // Personal notes.
+    canmanagesystemnotes?: boolean; // Whether the user can manage notes at system level.
+    canmanagecoursenotes?: boolean; // Whether the user can manage notes at the given course.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Note returned by WS core_notes_create_notes.
+ */
+export type AddonNotesCreateNotesNote = {
+    clientnoteid?: string; // Your own id for the note.
+    noteid: number; // ID of the created note when successful, -1 when failed.
+    errormessage?: string; // Error message - if failed.
+};
+
+/**
+ * Result of WS core_notes_view_notes.
+ */
+export type AddonNotesViewNotesResult = {
+    status: boolean; // Status: true if success.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Notes with some calculated data.
+ */
+export type AddonNotesNoteFormatted = AddonNotesNote & {
+    offline?: boolean; // Calculated in the app. Whether it's an offline note.
+    deleted?: boolean; // Calculated in the app. Whether the note was deleted in offline.
+    userfullname?: string; // Calculated in the app. Full name of the user the note refers to.
+    userprofileimageurl?: string; // Calculated in the app. Avatar url of the user the note refers to.
+};
diff --git a/src/addon/notifications/pages/list/list.ts b/src/addon/notifications/pages/list/list.ts
index db9153bd8..6a38c3a11 100644
--- a/src/addon/notifications/pages/list/list.ts
+++ b/src/addon/notifications/pages/list/list.ts
@@ -20,7 +20,7 @@ import { CoreTextUtilsProvider } from '@providers/utils/text';
 import { CoreEventsProvider, CoreEventObserver } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreUtilsProvider } from '@providers/utils/utils';
-import { AddonNotificationsProvider } from '../../providers/notifications';
+import { AddonNotificationsProvider, AddonNotificationsAnyNotification } from '../../providers/notifications';
 import { AddonNotificationsHelperProvider } from '../../providers/helper';
 import { CorePushNotificationsDelegate } from '@core/pushnotifications/providers/delegate';
 
@@ -34,7 +34,7 @@ import { CorePushNotificationsDelegate } from '@core/pushnotifications/providers
 })
 export class AddonNotificationsListPage {
 
-    notifications = [];
+    notifications: AddonNotificationsAnyNotification[] = [];
     notificationsLoaded = false;
     canLoadMore = false;
     loadMoreError = false;
@@ -130,11 +130,12 @@ export class AddonNotificationsListPage {
      *
      * @param notifications Array of notification objects.
      */
-    protected markNotificationsAsRead(notifications: any[]): void {
+    protected markNotificationsAsRead(notifications: AddonNotificationsAnyNotification[]): void {
+
         let promise;
 
         if (notifications.length > 0) {
-            const promises = notifications.map((notification) => {
+            const promises: Promise<any>[] = notifications.map((notification) => {
                 if (notification.read) {
                     // Already read, don't mark it.
                     return Promise.resolve();
@@ -202,7 +203,7 @@ export class AddonNotificationsListPage {
      *
      * @param notification The notification object.
      */
-    protected formatText(notification: any): void {
+    protected formatText(notification: AddonNotificationsAnyNotification): void {
         const text = notification.mobiletext.replace(/-{4,}/ig, '');
         notification.mobiletext = this.textUtils.replaceNewLines(text, '<br>');
     }
diff --git a/src/addon/notifications/pages/settings/settings.ts b/src/addon/notifications/pages/settings/settings.ts
index 5754f18a2..e4ca15b6f 100644
--- a/src/addon/notifications/pages/settings/settings.ts
+++ b/src/addon/notifications/pages/settings/settings.ts
@@ -14,7 +14,11 @@
 
 import { Component, OnDestroy, Optional } from '@angular/core';
 import { IonicPage, NavController } from 'ionic-angular';
-import { AddonNotificationsProvider } from '../../providers/notifications';
+import {
+    AddonNotificationsProvider, AddonNotificationsNotificationPreferences, AddonNotificationsNotificationPreferencesProcessor,
+    AddonNotificationsNotificationPreferencesComponent, AddonNotificationsNotificationPreferencesNotification,
+    AddonNotificationsNotificationPreferencesNotificationProcessorState
+} from '../../providers/notifications';
 import { CoreUserProvider } from '@core/user/providers/user';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreSettingsHelper } from '@core/settings/providers/helper';
@@ -38,10 +42,10 @@ import { CoreSplitViewComponent } from '@components/split-view/split-view';
 export class AddonNotificationsSettingsPage implements OnDestroy {
     protected updateTimeout: any;
 
-    components: any[];
-    preferences: any;
+    components: AddonNotificationsNotificationPreferencesComponent[];
+    preferences: AddonNotificationsNotificationPreferences;
     preferencesLoaded: boolean;
-    currentProcessor: any;
+    currentProcessor: AddonNotificationsNotificationPreferencesProcessorFormatted;
     notifPrefsEnabled: boolean;
     canChangeSound: boolean;
     notificationSound: boolean;
@@ -99,7 +103,7 @@ export class AddonNotificationsSettingsPage implements OnDestroy {
             // Get display data of message output handlers (thery are displayed in the context menu),
             this.processorHandlers = [];
             if (preferences.processors) {
-                preferences.processors.forEach((processor) => {
+                preferences.processors.forEach((processor: AddonNotificationsNotificationPreferencesProcessorFormatted) => {
                     processor.supported = this.messageOutputDelegate.hasHandler(processor.name, true);
                     if (processor.hassettings && processor.supported) {
                         this.processorHandlers.push(this.messageOutputDelegate.getDisplayData(processor));
@@ -118,7 +122,7 @@ export class AddonNotificationsSettingsPage implements OnDestroy {
      *
      * @param processor Processor object.
      */
-    protected loadProcessor(processor: any): void {
+    protected loadProcessor(processor: AddonNotificationsNotificationPreferencesProcessorFormatted): void {
         if (!processor) {
             return;
         }
@@ -191,8 +195,9 @@ export class AddonNotificationsSettingsPage implements OnDestroy {
      * @param notification Notification object.
      * @param state State name, ['loggedin', 'loggedoff'].
      */
-    changePreference(notification: any, state: string): void {
-        const processorState = notification.currentProcessor[state];
+    changePreference(notification: AddonNotificationsNotificationPreferencesNotificationFormatted, state: string): void {
+        const processorState: AddonNotificationsNotificationPreferencesNotificationProcessorStateFormatted =
+                notification.currentProcessor[state];
         const preferenceName = notification.preferencekey + '_' + processorState.name;
         let value;
 
@@ -211,6 +216,7 @@ export class AddonNotificationsSettingsPage implements OnDestroy {
         }
 
         processorState.updating = true;
+
         this.userProvider.updateUserPreference(preferenceName, value).then(() => {
             // Update the preferences since they were modified.
             this.updatePreferencesAfterDelay();
@@ -264,3 +270,25 @@ export class AddonNotificationsSettingsPage implements OnDestroy {
         }
     }
 }
+
+/**
+ * Notification preferences notification with some calculated data.
+ */
+type AddonNotificationsNotificationPreferencesNotificationFormatted = AddonNotificationsNotificationPreferencesNotification & {
+    currentProcessor?: AddonNotificationsNotificationPreferencesProcessorFormatted; // Calculated in the app. Current processor.
+};
+
+/**
+ * Notification preferences processor with some calculated data.
+ */
+type AddonNotificationsNotificationPreferencesProcessorFormatted = AddonNotificationsNotificationPreferencesProcessor & {
+    supported?: boolean; // Calculated in the app. Whether the processor is supported in the app.
+};
+
+/**
+ * State in notification processor in notification preferences component with some calculated data.
+ */
+type AddonNotificationsNotificationPreferencesNotificationProcessorStateFormatted =
+        AddonNotificationsNotificationPreferencesNotificationProcessorState & {
+    updating?: boolean; // Calculated in the app. Whether the state is being updated.
+};
diff --git a/src/addon/notifications/providers/helper.ts b/src/addon/notifications/providers/helper.ts
index 442a0b1e1..fce881a1e 100644
--- a/src/addon/notifications/providers/helper.ts
+++ b/src/addon/notifications/providers/helper.ts
@@ -14,7 +14,9 @@
 
 import { Injectable } from '@angular/core';
 import { CoreSitesProvider } from '@providers/sites';
-import { AddonNotificationsProvider } from './notifications';
+import {
+    AddonNotificationsProvider, AddonNotificationsAnyNotification, AddonNotificationsGetMessagesMessage
+} from './notifications';
 
 /**
  * Service that provides some helper functions for notifications.
@@ -37,7 +39,7 @@ export class AddonNotificationsHelperProvider {
      * @return Promise resolved with notifications and if can load more.
      */
     getNotifications(notifications: any[], limit?: number, toDisplay: boolean = true, forceCache?: boolean, ignoreCache?: boolean,
-            siteId?: string): Promise<{notifications: any[], canLoadMore: boolean}> {
+            siteId?: string): Promise<{notifications: AddonNotificationsAnyNotification[], canLoadMore: boolean}> {
 
         notifications = notifications || [];
         limit = limit || AddonNotificationsProvider.LIST_LIMIT;
@@ -80,7 +82,7 @@ export class AddonNotificationsHelperProvider {
                         promise = Promise.resolve(unread);
                     }
 
-                    return promise.then((notifications) => {
+                    return promise.then((notifications: AddonNotificationsGetMessagesMessage[]) => {
                         return {
                             notifications: notifications,
                             canLoadMore: notifications.length >= limit
diff --git a/src/addon/notifications/providers/notifications.ts b/src/addon/notifications/providers/notifications.ts
index 6e0af0129..02093823b 100644
--- a/src/addon/notifications/providers/notifications.ts
+++ b/src/addon/notifications/providers/notifications.ts
@@ -20,8 +20,9 @@ import { CoreTextUtilsProvider } from '@providers/utils/text';
 import { CoreTimeUtilsProvider } from '@providers/utils/time';
 import { CoreUserProvider } from '@core/user/providers/user';
 import { CoreEmulatorHelperProvider } from '@core/emulator/providers/helper';
-import { AddonMessagesProvider } from '@addon/messages/providers/messages';
+import { AddonMessagesProvider, AddonMessagesMarkMessageReadResult } from '@addon/messages/providers/messages';
 import { CoreSite } from '@classes/site';
+import { CoreWSExternalWarning } from '@providers/ws';
 
 /**
  * Service to handle notifications.
@@ -51,14 +52,13 @@ export class AddonNotificationsProvider {
      * @param read Whether the notifications are read or unread.
      * @return Promise resolved with notifications.
      */
-    protected formatNotificationsData(notifications: any[], read?: boolean): Promise<any> {
+    protected formatNotificationsData(notifications: AddonNotificationsAnyNotification[], read?: boolean): Promise<any> {
+
         const promises = notifications.map((notification) => {
 
             // Set message to show.
             if (notification.component && notification.component == 'mod_forum') {
                 notification.mobiletext = notification.smallmessage;
-            } else if (notification.component && notification.component == 'moodle' && notification.name == 'insights') {
-                notification.mobiletext = notification.fullmessagehtml;
             } else {
                 notification.mobiletext = notification.fullmessage;
             }
@@ -117,7 +117,7 @@ export class AddonNotificationsProvider {
      * @param siteId Site ID. If not defined, use current site.
      * @return Promise resolved with the notification preferences.
      */
-    getNotificationPreferences(siteId?: string): Promise<any> {
+    getNotificationPreferences(siteId?: string): Promise<AddonNotificationsNotificationPreferences> {
         this.logger.debug('Get notification preferences');
 
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -126,7 +126,9 @@ export class AddonNotificationsProvider {
                     updateFrequency: CoreSite.FREQUENCY_SOMETIMES
             };
 
-            return site.read('core_message_get_user_notification_preferences', {}, preSets).then((data) => {
+            return site.read('core_message_get_user_notification_preferences', {}, preSets)
+                    .then((data: AddonNotificationsGetUserNotificationPreferencesResult) => {
+
                 return data.preferences;
             });
         });
@@ -154,7 +156,7 @@ export class AddonNotificationsProvider {
      * @return Promise resolved with notifications.
      */
     getNotifications(read: boolean, limitFrom: number, limitNumber: number = 0, toDisplay: boolean = true,
-            forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any[]> {
+            forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<AddonNotificationsGetMessagesMessage[]> {
         limitNumber = limitNumber || AddonNotificationsProvider.LIST_LIMIT;
         this.logger.debug('Get ' + (read ? 'read' : 'unread') + ' notifications from ' + limitFrom + '. Limit: ' + limitNumber);
 
@@ -176,7 +178,7 @@ export class AddonNotificationsProvider {
             };
 
             // Get unread notifications.
-            return site.read('core_message_get_messages', data, preSets).then((response) => {
+            return site.read('core_message_get_messages', data, preSets).then((response: AddonNotificationsGetMessagesResult) => {
                 if (response.messages) {
                     const notifications = response.messages;
 
@@ -209,7 +211,7 @@ export class AddonNotificationsProvider {
      * @since 3.2
      */
     getPopupNotifications(offset: number, limit?: number, toDisplay: boolean = true, forceCache?: boolean, ignoreCache?: boolean,
-            siteId?: string): Promise<{notifications: any[], canLoadMore: boolean}> {
+            siteId?: string): Promise<{notifications: AddonNotificationsPopupNotificationFormatted[], canLoadMore: boolean}> {
 
         limit = limit || AddonNotificationsProvider.LIST_LIMIT;
 
@@ -230,17 +232,17 @@ export class AddonNotificationsProvider {
                 };
 
             // Get notifications.
-            return site.read('message_popup_get_popup_notifications', data, preSets).then((response) => {
+            return site.read('message_popup_get_popup_notifications', data, preSets)
+                    .then((response: AddonNotificationsGetPopupNotificationsResult) => {
+
                 if (response.notifications) {
-                    const result: any = {
-                            canLoadMore: response.notifications.length > limit
-                        },
-                        notifications = response.notifications.slice(0, limit);
+                    const result = {
+                            canLoadMore: response.notifications.length > limit,
+                            notifications: response.notifications.slice(0, limit)
+                        };
 
-                    result.notifications = notifications;
-
-                    return this.formatNotificationsData(notifications).then(() => {
-                        const first = notifications[0];
+                    return this.formatNotificationsData(result.notifications).then(() => {
+                        const first = result.notifications[0];
 
                         if (this.appProvider.isDesktop() && toDisplay && offset === 0 && first && !first.read) {
                             // Store the last received notification. Don't block the user for this.
@@ -269,7 +271,7 @@ export class AddonNotificationsProvider {
      * @return Promise resolved with notifications.
      */
     getReadNotifications(limitFrom: number, limitNumber: number, toDisplay: boolean = true,
-            forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any[]> {
+            forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<AddonNotificationsGetMessagesMessage[]> {
         return this.getNotifications(true, limitFrom, limitNumber, toDisplay, forceCache, ignoreCache, siteId);
     }
 
@@ -285,7 +287,7 @@ export class AddonNotificationsProvider {
      * @return Promise resolved with notifications.
      */
     getUnreadNotifications(limitFrom: number, limitNumber: number, toDisplay: boolean = true,
-            forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any[]> {
+            forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<AddonNotificationsGetMessagesMessage[]> {
         return this.getNotifications(false, limitFrom, limitNumber, toDisplay, forceCache, ignoreCache, siteId);
     }
 
@@ -349,7 +351,7 @@ export class AddonNotificationsProvider {
      * @return Resolved when done.
      * @since 3.2
      */
-    markAllNotificationsAsRead(): Promise<any> {
+    markAllNotificationsAsRead(): Promise<boolean> {
         const params = {
             useridto: this.sitesProvider.getCurrentSiteUserId()
         };
@@ -362,10 +364,12 @@ export class AddonNotificationsProvider {
      *
      * @param notificationId ID of notification to mark as read
      * @param siteId Site ID. If not defined, current site.
-     * @return Resolved when done.
+     * @return Promise resolved when done.
      * @since 3.5
      */
-    markNotificationRead(notificationId: number, siteId?: string): Promise<any> {
+    markNotificationRead(notificationId: number, siteId?: string)
+            : Promise<AddonNotificationsMarkNotificationReadResult | AddonMessagesMarkMessageReadResult> {
+
         return this.sitesProvider.getSite(siteId).then((site) => {
 
             if (site.wsAvailable('core_message_mark_notification_read')) {
@@ -436,3 +440,179 @@ export class AddonNotificationsProvider {
         return this.sitesProvider.wsAvailableInCurrentSite('core_message_get_user_notification_preferences');
     }
 }
+
+/**
+ * Preferences returned by core_message_get_user_notification_preferences.
+ */
+export type AddonNotificationsNotificationPreferences = {
+    userid: number; // User id.
+    disableall: number | boolean; // Whether all the preferences are disabled.
+    processors: AddonNotificationsNotificationPreferencesProcessor[]; // Config form values.
+    components: AddonNotificationsNotificationPreferencesComponent[]; // Available components.
+};
+
+/**
+ * Processor in notification preferences.
+ */
+export type AddonNotificationsNotificationPreferencesProcessor = {
+    displayname: string; // Display name.
+    name: string; // Processor name.
+    hassettings: boolean; // Whether has settings.
+    contextid: number; // Context id.
+    userconfigured: number; // Whether is configured by the user.
+};
+
+/**
+ * Component in notification preferences.
+ */
+export type AddonNotificationsNotificationPreferencesComponent = {
+    displayname: string; // Display name.
+    notifications: AddonNotificationsNotificationPreferencesNotification[]; // List of notificaitons for the component.
+};
+
+/**
+ * Notification processor in notification preferences component.
+ */
+export type AddonNotificationsNotificationPreferencesNotification = {
+    displayname: string; // Display name.
+    preferencekey: string; // Preference key.
+    processors: AddonNotificationsNotificationPreferencesNotificationProcessor[]; // Processors values for this notification.
+};
+
+/**
+ * Notification processor in notification preferences component.
+ */
+export type AddonNotificationsNotificationPreferencesNotificationProcessor = {
+    displayname: string; // Display name.
+    name: string; // Processor name.
+    locked: boolean; // Is locked by admin?.
+    lockedmessage?: string; // Text to display if locked.
+    userconfigured: number; // Is configured?.
+    loggedin: AddonNotificationsNotificationPreferencesNotificationProcessorState;
+    loggedoff: AddonNotificationsNotificationPreferencesNotificationProcessorState;
+};
+
+/**
+ * State in notification processor in notification preferences component.
+ */
+export type AddonNotificationsNotificationPreferencesNotificationProcessorState = {
+    name: string; // Name.
+    displayname: string; // Display name.
+    checked: boolean; // Is checked?.
+};
+
+/**
+ * Result of WS core_message_get_messages.
+ */
+export type AddonNotificationsGetMessagesResult = {
+    messages: AddonNotificationsGetMessagesMessage[];
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Message data returned by core_message_get_messages.
+ */
+export type AddonNotificationsGetMessagesMessage = {
+    id: number; // Message id.
+    useridfrom: number; // User from id.
+    useridto: number; // User to id.
+    subject: string; // The message subject.
+    text: string; // The message text formated.
+    fullmessage: string; // The message.
+    fullmessageformat: number; // Fullmessage format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    fullmessagehtml: string; // The message in html.
+    smallmessage: string; // The shorten message.
+    notification: number; // Is a notification?.
+    contexturl: string; // Context URL.
+    contexturlname: string; // Context URL link name.
+    timecreated: number; // Time created.
+    timeread: number; // Time read.
+    usertofullname: string; // User to full name.
+    userfromfullname: string; // User from full name.
+    component?: string; // @since 3.7. The component that generated the notification.
+    eventtype?: string; // @since 3.7. The type of notification.
+    customdata?: any; // @since 3.7. Custom data to be passed to the message processor.
+};
+
+/**
+ * Message data returned by core_message_get_messages with some calculated data.
+ */
+export type AddonNotificationsGetMessagesMessageFormatted =
+        AddonNotificationsGetMessagesMessage & AddonNotificationsNotificationCalculatedData;
+
+/**
+ * Result of WS message_popup_get_popup_notifications.
+ */
+export type AddonNotificationsGetPopupNotificationsResult = {
+    notifications: AddonNotificationsPopupNotification[];
+    unreadcount: number; // The number of unread message for the given user.
+};
+
+/**
+ * Notification returned by message_popup_get_popup_notifications.
+ */
+export type AddonNotificationsPopupNotification = {
+    id: number; // Notification id (this is not guaranteed to be unique within this result set).
+    useridfrom: number; // User from id.
+    useridto: number; // User to id.
+    subject: string; // The notification subject.
+    shortenedsubject: string; // The notification subject shortened with ellipsis.
+    text: string; // The message text formated.
+    fullmessage: string; // The message.
+    fullmessageformat: number; // Fullmessage format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    fullmessagehtml: string; // The message in html.
+    smallmessage: string; // The shorten message.
+    contexturl: string; // Context URL.
+    contexturlname: string; // Context URL link name.
+    timecreated: number; // Time created.
+    timecreatedpretty: string; // Time created in a pretty format.
+    timeread: number; // Time read.
+    read: boolean; // Notification read status.
+    deleted: boolean; // Notification deletion status.
+    iconurl: string; // URL for notification icon.
+    component?: string; // The component that generated the notification.
+    eventtype?: string; // The type of notification.
+    customdata?: any; // @since 3.7. Custom data to be passed to the message processor.
+};
+
+/**
+ * Notification returned by message_popup_get_popup_notifications.
+ */
+export type AddonNotificationsPopupNotificationFormatted =
+        AddonNotificationsPopupNotification & AddonNotificationsNotificationCalculatedData;
+
+/**
+ * Any kind of notification that can be retrieved.
+ */
+export type AddonNotificationsAnyNotification =
+        AddonNotificationsPopupNotificationFormatted | AddonNotificationsGetMessagesMessageFormatted;
+
+/**
+ * Result of WS core_message_get_user_notification_preferences.
+ */
+export type AddonNotificationsGetUserNotificationPreferencesResult = {
+    preferences: AddonNotificationsNotificationPreferences;
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS core_message_mark_notification_read.
+ */
+export type AddonNotificationsMarkNotificationReadResult = {
+    notificationid: number; // Id of the notification.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Calculated data for messages returned by core_message_get_messages.
+ */
+export type AddonNotificationsNotificationCalculatedData = {
+    mobiletext?: string; // Calculated in the app. Text to display for the notification.
+    moodlecomponent?: string; // Calculated in the app. Moodle's component.
+    notif?: number; // Calculated in the app. Whether it's a notification.
+    notification?: number; // Calculated in the app in some cases. Whether it's a notification.
+    read?: boolean; // Calculated in the app. Whether the notifications is read.
+    courseid?: number; // Calculated in the app. Course the notification belongs to.
+    profileimageurlfrom?: string; // Calculated in the app. Avatar of user that sent the notification.
+    userfromfullname?: string; // Calculated in the app in some cases. User from full name.
+};
diff --git a/src/core/comments/providers/comments.ts b/src/core/comments/providers/comments.ts
index 24475b69a..3e2e8c075 100644
--- a/src/core/comments/providers/comments.ts
+++ b/src/core/comments/providers/comments.ts
@@ -407,3 +407,27 @@ export class CoreCommentsProvider {
         });
     }
 }
+
+/**
+ * Data returned by comment_area_exporter.
+ */
+export type CoreCommentsArea = {
+    component: string; // Component.
+    commentarea: string; // Commentarea.
+    itemid: number; // Itemid.
+    courseid: number; // Courseid.
+    contextid: number; // Contextid.
+    cid: string; // Cid.
+    autostart: boolean; // Autostart.
+    canpost: boolean; // Canpost.
+    canview: boolean; // Canview.
+    count: number; // Count.
+    collapsediconkey: string; // Collapsediconkey.
+    displaytotalcount: boolean; // Displaytotalcount.
+    displaycancel: boolean; // Displaycancel.
+    fullwidth: boolean; // Fullwidth.
+    linktext: string; // Linktext.
+    notoggle: boolean; // Notoggle.
+    template: string; // Template.
+    canpostorhascomments: boolean; // Canpostorhascomments.
+};
diff --git a/src/core/course/providers/course.ts b/src/core/course/providers/course.ts
index 1b1af7c17..7bbc92983 100644
--- a/src/core/course/providers/course.ts
+++ b/src/core/course/providers/course.ts
@@ -1135,3 +1135,38 @@ export class CoreCourseProvider {
         }, siteId);
     }
 }
+
+/**
+ * Data returned by course_summary_exporter.
+ */
+export type CoreCourseSummary = {
+    id: number; // Id.
+    fullname: string; // Fullname.
+    shortname: string; // Shortname.
+    idnumber: string; // Idnumber.
+    summary: string; // Summary.
+    summaryformat: number; // Summary format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    startdate: number; // Startdate.
+    enddate: number; // Enddate.
+    visible: boolean; // Visible.
+    fullnamedisplay: string; // Fullnamedisplay.
+    viewurl: string; // Viewurl.
+    courseimage: string; // Courseimage.
+    progress?: number; // Progress.
+    hasprogress: boolean; // Hasprogress.
+    isfavourite: boolean; // Isfavourite.
+    hidden: boolean; // Hidden.
+    timeaccess?: number; // Timeaccess.
+    showshortname: boolean; // Showshortname.
+    coursecategory: string; // Coursecategory.
+};
+
+/**
+ * Data returned by course_module_summary_exporter.
+ */
+export type CoreCourseModuleSummary = {
+    id: number; // Id.
+    name: string; // Name.
+    url?: string; // Url.
+    iconurl: string; // Iconurl.
+};
diff --git a/src/core/tag/providers/tag.ts b/src/core/tag/providers/tag.ts
index 4b012d32f..0f993914a 100644
--- a/src/core/tag/providers/tag.ts
+++ b/src/core/tag/providers/tag.ts
@@ -17,74 +17,6 @@ import { TranslateService } from '@ngx-translate/core';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 
-/**
- * Structure of a tag cloud returned by WS.
- */
-export interface CoreTagCloud {
-    tags: CoreTagCloudTag[];
-    tagscount: number;
-    totalcount: number;
-}
-
-/**
- * Structure of a tag cloud tag returned by WS.
- */
-export interface CoreTagCloudTag {
-    name: string;
-    viewurl: string;
-    flag: boolean;
-    isstandard: boolean;
-    count: number;
-    size: number;
-}
-
-/**
- * Structure of a tag collection returned by WS.
- */
-export interface CoreTagCollection {
-    id: number;
-    name: string;
-    isdefault: boolean;
-    component: string;
-    sortoder: number;
-    searchable: boolean;
-    customurl: string;
-}
-
-/**
- * Structure of a tag index returned by WS.
- */
-export interface CoreTagIndex {
-    tagid: number;
-    ta: number;
-    component: string;
-    itemtype: string;
-    nextpageurl: string;
-    prevpageurl: string;
-    exclusiveurl: string;
-    exclusivetext: string;
-    title: string;
-    content: string;
-    hascontent: number;
-    anchor: string;
-}
-
-/**
- * Structure of a tag item returned by WS.
- */
-export interface CoreTagItem {
-    id: number;
-    name: string;
-    rawname: string;
-    isstandard: boolean;
-    tagcollid: number;
-    taginstanceid: number;
-    taginstancecontextid: number;
-    itemid: number;
-    ordering: number;
-    flag: number;
-}
-
 /**
  * Service to handle tags.
  */
@@ -343,3 +275,71 @@ export class CoreTagProvider {
             + contextId + ':' +  (recursive ? 1 : 0);
     }
 }
+
+/**
+ * Structure of a tag cloud returned by WS.
+ */
+export type CoreTagCloud = {
+    tags: CoreTagCloudTag[];
+    tagscount: number;
+    totalcount: number;
+};
+
+/**
+ * Structure of a tag cloud tag returned by WS.
+ */
+export type CoreTagCloudTag = {
+    name: string;
+    viewurl: string;
+    flag: boolean;
+    isstandard: boolean;
+    count: number;
+    size: number;
+};
+
+/**
+ * Structure of a tag collection returned by WS.
+ */
+export type CoreTagCollection = {
+    id: number;
+    name: string;
+    isdefault: boolean;
+    component: string;
+    sortoder: number;
+    searchable: boolean;
+    customurl: string;
+};
+
+/**
+ * Structure of a tag index returned by WS.
+ */
+export type CoreTagIndex = {
+    tagid: number;
+    ta: number;
+    component: string;
+    itemtype: string;
+    nextpageurl: string;
+    prevpageurl: string;
+    exclusiveurl: string;
+    exclusivetext: string;
+    title: string;
+    content: string;
+    hascontent: number;
+    anchor: string;
+};
+
+/**
+ * Structure of a tag item returned by WS.
+ */
+export type CoreTagItem = {
+    id: number;
+    name: string;
+    rawname: string;
+    isstandard: boolean;
+    tagcollid: number;
+    taginstanceid: number;
+    taginstancecontextid: number;
+    itemid: number;
+    ordering: number;
+    flag: number;
+};
diff --git a/src/core/user/providers/user.ts b/src/core/user/providers/user.ts
index 7529b0b90..1541cecf5 100644
--- a/src/core/user/providers/user.ts
+++ b/src/core/user/providers/user.ts
@@ -634,3 +634,21 @@ export class CoreUserProvider {
         });
     }
 }
+
+/**
+ * Data returned by user_summary_exporter.
+ */
+export type CoreUserSummary = {
+    id: number; // Id.
+    email: string; // Email.
+    idnumber: string; // Idnumber.
+    phone1: string; // Phone1.
+    phone2: string; // Phone2.
+    department: string; // Department.
+    institution: string; // Institution.
+    fullname: string; // Fullname.
+    identity: string; // Identity.
+    profileurl: string; // Profileurl.
+    profileimageurl: string; // Profileimageurl.
+    profileimageurlsmall: string; // Profileimageurlsmall.
+};
diff --git a/src/providers/ws.ts b/src/providers/ws.ts
index cb8aa6eed..4bd4ac412 100644
--- a/src/providers/ws.ts
+++ b/src/providers/ws.ts
@@ -81,126 +81,6 @@ export interface CoreWSAjaxPreSets {
     useGet?: boolean;
 }
 
-/**
- * Error returned by a WS call.
- */
-export interface CoreWSError {
-    /**
-     * The error message.
-     */
-    message: string;
-
-    /**
-     * Name of the exception. Undefined for local errors (fake WS errors).
-     */
-    exception?: string;
-
-    /**
-     * The error code. Undefined for local errors (fake WS errors).
-     */
-    errorcode?: string;
-}
-
-/**
- * File upload options.
- */
-export interface CoreWSFileUploadOptions extends FileUploadOptions {
-    /**
-     * The file area where to put the file. By default, 'draft'.
-     */
-    fileArea?: string;
-
-    /**
-     * Item ID of the area where to put the file. By default, 0.
-     */
-    itemId?: number;
-}
-
-
-/**
- * Structure of warnings returned by WS.
- */
-export type CoreWSExternalWarning = {
-    /**
-     * Item.
-     * @type {string}
-     */
-    item?: string;
-
-    /**
-     * Item id.
-     * @type {number}
-     */
-    itemid?: number;
-
-    /**
-     * The warning code can be used by the client app to implement specific behaviour.
-     * @type {string}
-     */
-    warningcode: string;
-
-    /**
-     * Untranslated english message to explain the warning.
-     * @type {string}
-     */
-    message: string;
-
-};
-
-/**
- * Structure of files returned by WS.
- */
-export type CoreWSExternalFile = {
-    /**
-     * File name.
-     * @type {string}
-     */
-    filename?: string;
-
-    /**
-     * File path.
-     * @type {string}
-     */
-    filepath?: string;
-
-    /**
-     * File size.
-     * @type {number}
-     */
-    filesize?: number;
-
-    /**
-     * Downloadable file url.
-     * @type {string}
-     */
-    fileurl?: string;
-
-    /**
-     * Time modified.
-     * @type {number}
-     */
-    timemodified?: number;
-
-    /**
-     * File mime type.
-     * @type {string}
-     */
-    mimetype?: string;
-
-    /**
-     * Whether is an external file.
-     * @type {number}
-     */
-    isexternalfile?: number;
-
-    /**
-     * The repository type for external files.
-     * @type {string}
-     */
-    repositorytype?: string;
-
-};
-
 /**
  * This service allows performing WS calls and download/upload files.
  */
@@ -948,3 +828,127 @@ export class CoreWSProvider {
         });
     }
 }
+
+/**
+ * Error returned by a WS call.
+ */
+export interface CoreWSError {
+    /**
+     * The error message.
+     */
+    message: string;
+
+    /**
+     * Name of the exception. Undefined for local errors (fake WS errors).
+     */
+    exception?: string;
+
+    /**
+     * The error code. Undefined for local errors (fake WS errors).
+     */
+    errorcode?: string;
+}
+
+/**
+ * File upload options.
+ */
+export interface CoreWSFileUploadOptions extends FileUploadOptions {
+    /**
+     * The file area where to put the file. By default, 'draft'.
+     */
+    fileArea?: string;
+
+    /**
+     * Item ID of the area where to put the file. By default, 0.
+     */
+    itemId?: number;
+}
+
+/**
+ * Structure of warnings returned by WS.
+ */
+export type CoreWSExternalWarning = {
+    /**
+     * Item.
+     */
+    item?: string;
+
+    /**
+     * Item id.
+     */
+    itemid?: number;
+
+    /**
+     * The warning code can be used by the client app to implement specific behaviour.
+     */
+    warningcode: string;
+
+    /**
+     * Untranslated english message to explain the warning.
+     */
+    message: string;
+
+};
+
+/**
+ * Structure of files returned by WS.
+ */
+export type CoreWSExternalFile = {
+    /**
+     * File name.
+     */
+    filename?: string;
+
+    /**
+     * File path.
+     */
+    filepath?: string;
+
+    /**
+     * File size.
+     */
+    filesize?: number;
+
+    /**
+     * Downloadable file url.
+     */
+    fileurl?: string;
+
+    /**
+     * Time modified.
+     */
+    timemodified?: number;
+
+    /**
+     * File mime type.
+     */
+    mimetype?: string;
+
+    /**
+     * Whether is an external file.
+     */
+    isexternalfile?: number;
+
+    /**
+     * The repository type for external files.
+     */
+    repositorytype?: string;
+
+};
+
+/**
+ * Data returned by date_exporter.
+ */
+export type CoreWSDate = {
+    seconds: number; // Seconds.
+    minutes: number; // Minutes.
+    hours: number; // Hours.
+    mday: number; // Mday.
+    wday: number; // Wday.
+    mon: number; // Mon.
+    year: number; // Year.
+    yday: number; // Yday.
+    weekday: string; // Weekday.
+    month: string; // Month.
+    timestamp: number; // Timestamp.
+};

From 5699c9b73896667ab4ee8b37cc8d1f5517531faa Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 3 Sep 2019 16:50:53 +0200
Subject: [PATCH 014/257] MOBILE-3109 badges: Fix badge alignment renamed in WS

---
 .../pages/issued-badge/issued-badge.html      |  8 ++++----
 src/addon/badges/providers/badges.ts          | 20 ++++++++++++++++---
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/addon/badges/pages/issued-badge/issued-badge.html b/src/addon/badges/pages/issued-badge/issued-badge.html
index 565993bec..0dcc1e810 100644
--- a/src/addon/badges/pages/issued-badge/issued-badge.html
+++ b/src/addon/badges/pages/issued-badge/issued-badge.html
@@ -172,14 +172,14 @@
         </ion-item-group>
 
         <!-- Competencies alignment -->
-        <ion-item-group *ngIf="badge && badge.competencies">
+        <ion-item-group *ngIf="badge && badge.alignment">
             <ion-item-divider>
                 <h2>{{ 'addon.badges.alignment' | translate}}</h2>
             </ion-item-divider>
-            <a ion-item text-wrap *ngFor="let competency of badge.competencies" [href]="competency.targeturl" core-link auto-login="no">
-                <h2><core-format-text [text]="competency.targetname"></core-format-text></h2>
+            <a ion-item text-wrap *ngFor="let alignment of badge.alignment" [href]="alignment.targeturl" core-link auto-login="no">
+                <h2><core-format-text [text]="alignment.targetname"></core-format-text></h2>
             </a>
-            <ion-item text-wrap *ngIf="badge.competencies.length == 0">
+            <ion-item text-wrap *ngIf="badge.alignment.length == 0">
                 <h2>{{ 'addon.badges.noalignment' | translate}}</h2>
             </ion-item>
         </ion-item-group>
diff --git a/src/addon/badges/providers/badges.ts b/src/addon/badges/providers/badges.ts
index 6cf3a29bf..1bfe00eb6 100644
--- a/src/addon/badges/providers/badges.ts
+++ b/src/addon/badges/providers/badges.ts
@@ -86,8 +86,13 @@ export class AddonBadgesProvider {
                     updateFrequency: CoreSite.FREQUENCY_RARELY
                 };
 
-            return site.read('core_badges_get_user_badges', data, preSets).then((response) => {
+            return site.read('core_badges_get_user_badges', data, preSets).then((response: AddonBadgesGetUserBadgesResult) => {
                 if (response && response.badges) {
+                    // In 3.7, competencies was renamed to alignment. Rename the property in 3.6 too.
+                    response.badges.forEach((badge) => {
+                        badge.alignment = badge.alignment || badge.competencies;
+                    });
+
                     return response.badges;
                 } else {
                     return Promise.reject(null);
@@ -167,7 +172,7 @@ export type AddonBadgesUserBadge = {
         claimcomment: string; // Claim comment.
         dateissued: number; // Date issued.
     };
-    alignment: { // @since 3.6. Badge alignments.
+    alignment?: { // @since 3.7. Calculated by the app for 3.6 sites. Badge alignments.
         id?: number; // Alignment id.
         badgeid?: number; // Badge id.
         targetName?: string; // Target name.
@@ -176,7 +181,16 @@ export type AddonBadgesUserBadge = {
         targetFramework?: string; // Target framework.
         targetCode?: string; // Target code.
     }[];
-    relatedbadges: { // @since 3.6. Related badges.
+    competencies?: { // @deprecated from 3.7. @since 3.6. In 3.7 it was renamed to alignment.
+        id?: number; // Alignment id.
+        badgeid?: number; // Badge id.
+        targetName?: string; // Target name.
+        targetUrl?: string; // Target URL.
+        targetDescription?: string; // Target description.
+        targetFramework?: string; // Target framework.
+        targetCode?: string; // Target code.
+    }[];
+    relatedbadges?: { // @since 3.6. Related badges.
         id: number; // Badge id.
         name: string; // Badge name.
         version?: string; // Version.

From f80dd0c2417a4e259e7294472a1613e0f548bd46 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 4 Sep 2019 07:38:48 +0200
Subject: [PATCH 015/257] MOBILE-3109 scripts: Add script to detect changes in
 WS

---
 scripts/get_ws_changes.php     |  99 ++++++++++++++++++++++++++++++
 scripts/get_ws_structure.php   |  55 +++++++++++++++++
 scripts/get_ws_ts.php          |  15 ++---
 scripts/ws_to_ts_functions.php | 106 +++++++++++++++++++++++++++++++++
 4 files changed, 264 insertions(+), 11 deletions(-)
 create mode 100644 scripts/get_ws_changes.php
 create mode 100644 scripts/get_ws_structure.php

diff --git a/scripts/get_ws_changes.php b/scripts/get_ws_changes.php
new file mode 100644
index 000000000..d5b91f9f0
--- /dev/null
+++ b/scripts/get_ws_changes.php
@@ -0,0 +1,99 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Script for converting a PHP WS structure to a TS type.
+ *
+ * The first parameter (required) is the path to the Moodle installation to use.
+ * The second parameter (required) is the name to the WS to convert.
+ * The third parameter (optional) is a number: 1 to convert the params structure,
+ * 0 to convert the returns structure. Defaults to 0.
+ */
+
+if (!isset($argv[1])) {
+    echo "ERROR: Please pass the path to the folder containing the Moodle installations as the first parameter.\n";
+    die();
+}
+
+
+if (!isset($argv[2])) {
+    echo "ERROR: Please pass the WS name as the second parameter.\n";
+    die();
+}
+
+define('CLI_SCRIPT', true);
+require_once('ws_to_ts_functions.php');
+
+$versions = array('master', '37', '36', '35', '34', '33', '32', '31');
+
+$moodlespath = $argv[1];
+$wsname = $argv[2];
+$useparams = !!(isset($argv[3]) && $argv[3]);
+$pathseparator = '/';
+
+// Get the path to the script.
+$index = strrpos(__FILE__, $pathseparator);
+if ($index === false) {
+    $pathseparator = '\\';
+    $index = strrpos(__FILE__, $pathseparator);
+}
+$scriptfolder = substr(__FILE__, 0, $index);
+$scriptpath = concatenate_paths($scriptfolder, 'get_ws_structure.php', $pathseparator);
+
+$previousstructure = null;
+$previousversion = null;
+$libsloaded = false;
+
+foreach ($versions as $version) {
+    $moodlepath = concatenate_paths($moodlespath, 'stable_' . $version, $pathseparator);
+
+    if (!$libsloaded) {
+        $libsloaded = true;
+
+        require($moodlepath . '/config.php');
+        require($CFG->dirroot . '/webservice/lib.php');
+    }
+
+    // Get the structure in this Moodle version.
+    $structure = shell_exec("php $scriptpath $moodlepath $wsname " . ($useparams ? 'true' : ''));
+
+    if (strpos($structure, 'ERROR:') === 0) {
+        echo "WS not found in version $version. Stop.\n";
+        break;
+    }
+
+    $structure = unserialize($structure);
+
+    if ($previousstructure != null) {
+        echo "*** Check changes from version $version to $previousversion ***\n";
+
+        $messages = detect_ws_changes($previousstructure, $structure);
+
+        if (count($messages) > 0) {
+            $haschanged = true;
+
+            foreach($messages as $message) {
+                echo "$message\n";
+            }
+        } else {
+            echo "No changes found.\n";
+        }
+        echo "\n";
+    }
+
+    $previousstructure = $structure;
+    $previousversion = $version;
+}
diff --git a/scripts/get_ws_structure.php b/scripts/get_ws_structure.php
new file mode 100644
index 000000000..bfa975ee9
--- /dev/null
+++ b/scripts/get_ws_structure.php
@@ -0,0 +1,55 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Script for getting the PHP structure of a WS returns or params.
+ *
+ * The first parameter (required) is the path to the Moodle installation to use.
+ * The second parameter (required) is the name to the WS to convert.
+ * The third parameter (optional) is a number: 1 to convert the params structure,
+ * 0 to convert the returns structure. Defaults to 0.
+ */
+
+if (!isset($argv[1])) {
+    echo "ERROR: Please pass the Moodle path as the first parameter.\n";
+    die();
+}
+
+
+if (!isset($argv[2])) {
+    echo "ERROR: Please pass the WS name as the second parameter.\n";
+    die();
+}
+
+$moodlepath = $argv[1];
+$wsname = $argv[2];
+$useparams = !!(isset($argv[3]) && $argv[3]);
+
+define('CLI_SCRIPT', true);
+
+require($moodlepath . '/config.php');
+require($CFG->dirroot . '/webservice/lib.php');
+require_once('ws_to_ts_functions.php');
+
+$structure = get_ws_structure($wsname, $useparams);
+
+if ($structure === false) {
+    echo "ERROR: The WS wasn't found in this Moodle installation.\n";
+    die();
+}
+
+remove_default_closures($structure);
+echo serialize($structure);
diff --git a/scripts/get_ws_ts.php b/scripts/get_ws_ts.php
index 4c93260ec..900a153b8 100644
--- a/scripts/get_ws_ts.php
+++ b/scripts/get_ws_ts.php
@@ -20,8 +20,8 @@
  * The first parameter (required) is the path to the Moodle installation to use.
  * The second parameter (required) is the name to the WS to convert.
  * The third parameter (optional) is the name to put to the TS type. Defaults to "TypeName".
- * The fourth parameter (optional) is a boolean: true to convert the params structure,
- * false to convert the returns structure. Defaults to false.
+ * The fourth parameter (optional) is a number: 1 to convert the params structure,
+ * 0 to convert the returns structure. Defaults to 0.
  */
 
 if (!isset($argv[1])) {
@@ -46,23 +46,16 @@ require($moodlepath . '/config.php');
 require($CFG->dirroot . '/webservice/lib.php');
 require_once('ws_to_ts_functions.php');
 
-// get all the function descriptions
-$functions = $DB->get_records('external_functions', array(), 'name');
-$functiondescs = array();
-foreach ($functions as $function) {
-    $functiondescs[$function->name] = external_api::external_function_info($function);
-}
+$structure = get_ws_structure($wsname, $useparams);
 
-if (!isset($functiondescs[$wsname])) {
+if ($structure === false) {
     echo "ERROR: The WS wasn't found in this Moodle installation.\n";
     die();
 }
 
 if ($useparams) {
-    $structure = $functiondescs[$wsname]->parameters_desc;
     $description = "Params of WS $wsname.";
 } else {
-    $structure = $functiondescs[$wsname]->returns_desc;
     $description = "Result of WS $wsname.";
 }
 
diff --git a/scripts/ws_to_ts_functions.php b/scripts/ws_to_ts_functions.php
index c6eb60332..ca05d2082 100644
--- a/scripts/ws_to_ts_functions.php
+++ b/scripts/ws_to_ts_functions.php
@@ -18,6 +18,28 @@
  * Helper functions for converting a Moodle WS structure to a TS type.
  */
 
+/**
+ * Get the structure of a WS params or returns.
+ */
+function get_ws_structure($wsname, $useparams) {
+    global $DB;
+
+    // get all the function descriptions
+    $functions = $DB->get_records('external_functions', array(), 'name');
+    $functiondescs = array();
+    foreach ($functions as $function) {
+        $functiondescs[$function->name] = external_api::external_function_info($function);
+    }
+
+    if (!isset($functiondescs[$wsname])) {
+        return false;
+    } else if ($useparams) {
+        return $functiondescs[$wsname]->parameters_desc;
+    } else {
+        return $functiondescs[$wsname]->returns_desc;
+    }
+}
+
 /**
  * Fix a comment: make sure first letter is uppercase and add a dot at the end if needed.
  */
@@ -136,3 +158,87 @@ function convert_to_ts($key, $value, $boolisnumber = false, $indentation = '', $
         return "";
     }
 }
+
+/**
+ * Concatenate two paths.
+ */
+function concatenate_paths($left, $right, $separator = '/') {
+    if (!is_string($left) || $left == '') {
+        return $right;
+    } else if (!is_string($right) || $right == '') {
+        return $left;
+    }
+
+    $lastCharLeft = substr($left, -1);
+    $firstCharRight = $right[0];
+
+    if ($lastCharLeft === $separator && $firstCharRight === $separator) {
+        return $left . substr($right, 1);
+    } else if ($lastCharLeft !== $separator && $firstCharRight !== '/') {
+        return $left . '/' . $right;
+    } else {
+        return $left . $right;
+    }
+}
+
+/**
+ * Detect changes between 2 WS structures. We only detect fields that have been added or modified, not removed fields.
+ */
+function detect_ws_changes($new, $old, $key = '', $path = '') {
+    $messages = [];
+
+    if (gettype($new) != gettype($old)) {
+        // The type has changed.
+        $messages[] = "Property '$key' has changed type, from '" . gettype($old) . "' to '" . gettype($new) .
+                        ($path != '' ? "' inside $path." : "'.");
+
+    } else if ($new instanceof external_value && $new->type != $old->type) {
+        // The type has changed.
+        $messages[] = "Property '$key' has changed type, from '" . $old->type . "' to '" . $new->type .
+                        ($path != '' ? "' inside $path." : "'.");
+
+    } else if ($new instanceof external_warnings || $new instanceof external_files) {
+        // Ignore these types.
+
+    } else if ($new instanceof external_single_structure) {
+        // Check each subproperty.
+        $newpath = ($path != '' ? "$path." : '') . $key;
+
+        foreach ($new->keys as $subkey => $value) {
+            if (!isset($old->keys[$subkey])) {
+                // New property.
+                $messages[] = "New property '$subkey' found" . ($newpath != '' ? " inside '$newpath'." : '.');
+            } else {
+                $messages = array_merge($messages, detect_ws_changes($value, $old->keys[$subkey], $subkey, $newpath));
+            }
+        }
+    } else if ($new instanceof external_multiple_structure) {
+        // Recursive call with the content.
+        $messages = array_merge($messages, detect_ws_changes($new->content, $old->content, $key, $path));
+    }
+
+    return $messages;
+}
+
+/**
+ * Remove all closures (anonymous functions) in the default values so the object can be serialized.
+ */
+function remove_default_closures($value) {
+    if ($value instanceof external_warnings || $value instanceof external_files) {
+        // Ignore these types.
+
+    } else if ($value instanceof external_value) {
+        if ($value->default instanceof Closure) {
+            $value->default = null;
+        }
+
+    } else if ($value instanceof external_single_structure) {
+
+        foreach ($value->keys as $key => $subvalue) {
+            remove_default_closures($subvalue);
+        }
+
+    } else if ($value instanceof external_multiple_structure) {
+        remove_default_closures($value->content);
+    }
+}

From 346c8a42ff8649a56da69321a543a073ad9f373f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 4 Sep 2019 17:19:57 +0200
Subject: [PATCH 016/257] MOBILE-3109 addon: Add 'since' tags in WS return
 types

---
 src/addon/badges/providers/badges.ts          |  2 +-
 src/addon/calendar/providers/calendar.ts      | 28 ++++++++--------
 src/addon/competency/providers/competency.ts  | 12 +++----
 src/addon/messages/providers/messages.ts      | 32 +++++++++----------
 src/addon/notes/providers/notes.ts            |  4 +--
 .../notifications/providers/notifications.ts  |  2 +-
 src/core/comments/providers/comments.ts       |  2 +-
 src/core/course/providers/course.ts           | 28 ++++++++--------
 8 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/src/addon/badges/providers/badges.ts b/src/addon/badges/providers/badges.ts
index 1bfe00eb6..79f0598ad 100644
--- a/src/addon/badges/providers/badges.ts
+++ b/src/addon/badges/providers/badges.ts
@@ -86,7 +86,7 @@ export class AddonBadgesProvider {
                     updateFrequency: CoreSite.FREQUENCY_RARELY
                 };
 
-            return site.read('core_badges_get_user_badges', data, preSets).then((response: AddonBadgesGetUserBadgesResult) => {
+            return site.read('core_badges_get_user_badges', data, preSets).then((response: AddonBadgesGetUserBadgesResult): any => {
                 if (response && response.badges) {
                     // In 3.7, competencies was renamed to alignment. Rename the property in 3.6 too.
                     response.badges.forEach((badge) => {
diff --git a/src/addon/calendar/providers/calendar.ts b/src/addon/calendar/providers/calendar.ts
index eb45fe61a..794e86796 100644
--- a/src/addon/calendar/providers/calendar.ts
+++ b/src/addon/calendar/providers/calendar.ts
@@ -1906,7 +1906,7 @@ export type AddonCalendarEventBase = {
     name: string; // Name.
     description?: string; // Description.
     descriptionformat: number; // Description format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
-    location?: string; // Location.
+    location?: string; // @since 3.6. Location.
     categoryid?: number; // Categoryid.
     groupid?: number; // Groupid.
     userid?: number; // Userid.
@@ -1947,17 +1947,17 @@ export type AddonCalendarEventBase = {
         summaryformat: number; // Summary format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
         startdate: number; // Startdate.
         enddate: number; // Enddate.
-        visible: boolean; // Visible.
+        visible: boolean; // @since 3.8. Visible.
         fullnamedisplay: string; // Fullnamedisplay.
         viewurl: string; // Viewurl.
-        courseimage: string; // Courseimage.
-        progress?: number; // Progress.
-        hasprogress: boolean; // Hasprogress.
-        isfavourite: boolean; // Isfavourite.
-        hidden: boolean; // Hidden.
-        timeaccess?: number; // Timeaccess.
-        showshortname: boolean; // Showshortname.
-        coursecategory: string; // Coursecategory.
+        courseimage: string; // @since 3.6. Courseimage.
+        progress?: number; // @since 3.6. Progress.
+        hasprogress: boolean; // @since 3.6. Hasprogress.
+        isfavourite: boolean; // @since 3.6. Isfavourite.
+        hidden: boolean; // @since 3.6. Hidden.
+        timeaccess?: number; // @since 3.6. Timeaccess.
+        showshortname: boolean; // @since 3.6. Showshortname.
+        coursecategory: string; // @since 3.7. Coursecategory.
     };
     subscription?: {
         displayeventsource: boolean; // Displayeventsource.
@@ -1974,8 +1974,8 @@ export type AddonCalendarEventBase = {
     iscourseevent: boolean; // Iscourseevent.
     iscategoryevent: boolean; // Iscategoryevent.
     groupname?: string; // Groupname.
-    normalisedeventtype: string; // Normalisedeventtype.
-    normalisedeventtypetext: string; // Normalisedeventtypetext.
+    normalisedeventtype: string; // @since 3.7. Normalisedeventtype.
+    normalisedeventtypetext: string; // @since 3.7. Normalisedeventtypetext.
 };
 
 /**
@@ -2047,7 +2047,7 @@ export type AddonCalendarMonth = {
     date: CoreWSDate;
     periodname: string; // Periodname.
     includenavigation: boolean; // Includenavigation.
-    initialeventsloaded: boolean; // Initialeventsloaded.
+    initialeventsloaded: boolean; // @since 3.5. Initialeventsloaded.
     previousperiod: CoreWSDate;
     previousperiodlink: string; // Previousperiodlink.
     previousperiodname: string; // Previousperiodname.
@@ -2121,7 +2121,7 @@ export type AddonCalendarUpcoming = {
     courseid: number; // Courseid.
     categoryid?: number; // Categoryid.
     isloggedin: boolean; // Isloggedin.
-    date: CoreWSDate; // Date.
+    date: CoreWSDate; // @since 3.8. Date.
 };
 
 /**
diff --git a/src/addon/competency/providers/competency.ts b/src/addon/competency/providers/competency.ts
index 5e4940dcc..9be1e7068 100644
--- a/src/addon/competency/providers/competency.ts
+++ b/src/addon/competency/providers/competency.ts
@@ -717,7 +717,7 @@ export type AddonCompetencyPath = {
     framework: AddonCompetencyPathNode;
     pluginbaseurl: string; // Pluginbaseurl.
     pagecontextid: number; // Pagecontextid.
-    showlinks: boolean; // Showlinks.
+    showlinks: boolean; // @since 3.7. Showlinks.
 };
 
 /**
@@ -816,7 +816,7 @@ export type AddonCompetencySummary = {
     scaleconfiguration: string; // Scaleconfiguration.
     taxonomyterm: string; // Taxonomyterm.
     comppath: AddonCompetencyPath;
-    pluginbaseurl: string; // Pluginbaseurl.
+    pluginbaseurl: string; // @since 3.7. Pluginbaseurl.
 };
 
 /**
@@ -891,8 +891,8 @@ export type AddonCompetencyUserCompetencySummaryInCourse = {
     usercompetencysummary: AddonCompetencyUserCompetencySummary;
     course: CoreCourseSummary;
     coursemodules: CoreCourseModuleSummary[]; // Coursemodules.
-    plans: AddonCompetencyPlan[]; // Plans.
-    pluginbaseurl: string; // Pluginbaseurl.
+    plans: AddonCompetencyPlan[]; // @since 3.7. Plans.
+    pluginbaseurl: string; // @since 3.7. Pluginbaseurl.
 };
 
 /**
@@ -986,7 +986,7 @@ export type AddonCompetencyDataForCourseCompetenciesPageResult = {
     statistics: AddonCompetencyCourseCompetencyStatistics;
     competencies: AddonCompetencyDataForCourseCompetenciesPageCompetency[];
     manageurl: string; // Url to the manage competencies page.
-    pluginbaseurl: string; // Url to the course competencies page.
+    pluginbaseurl: string; // @since 3.6. Url to the course competencies page.
 };
 
 /**
@@ -1003,5 +1003,5 @@ export type AddonCompetencyDataForCourseCompetenciesPageCompetency = {
         selected: boolean; // If this is the currently selected option.
     }[];
     comppath: AddonCompetencyPath;
-    plans: AddonCompetencyPlan[];
+    plans: AddonCompetencyPlan[]; // @since 3.7.
 };
diff --git a/src/addon/messages/providers/messages.ts b/src/addon/messages/providers/messages.ts
index 12c482b94..7b7d19447 100644
--- a/src/addon/messages/providers/messages.ts
+++ b/src/addon/messages/providers/messages.ts
@@ -2797,7 +2797,7 @@ export type AddonMessagesConversation = {
     imageurl: string; // A link to the conversation picture, if set.
     type: number; // The type of the conversation (1=individual,2=group,3=self).
     membercount: number; // Total number of conversation members.
-    ismuted: boolean; // If the user muted this conversation.
+    ismuted: boolean; // @since 3.7. If the user muted this conversation.
     isfavourite: boolean; // If the user marked this conversation as a favourite.
     isread: boolean; // If the user has read all messages in the conversation.
     unreadcount: number; // The number of unread messages in this conversation.
@@ -2835,7 +2835,7 @@ export type AddonMessagesConversationMember = {
     isblocked: boolean; // If the user has been blocked.
     iscontact: boolean; // Is the user a contact?.
     isdeleted: boolean; // Is the user deleted?.
-    canmessageevenifblocked: boolean; // If the user can still message even if they get blocked.
+    canmessageevenifblocked: boolean; // @since 3.8. If the user can still message even if they get blocked.
     canmessage: boolean; // If the user can be messaged.
     requirescontact: boolean; // If the user requires to be contacts.
     contactrequests?: { // The contact requests.
@@ -2897,7 +2897,7 @@ export type AddonMessagesMessagePreferencesNotificationProcessor = {
     displayname: string; // Display name.
     name: string; // Processor name.
     locked: boolean; // Is locked by admin?.
-    lockedmessage?: string; // Text to display if locked.
+    lockedmessage?: string; // @since 3.6. Text to display if locked.
     userconfigured: number; // Is configured?.
     loggedin: {
         name: string; // Name.
@@ -2938,14 +2938,14 @@ export type AddonMessagesMessageAreaContact = {
     ismessaging: boolean; // If we are messaging the user.
     sentfromcurrentuser: boolean; // Was the last message sent from the current user?.
     lastmessage: string; // The user's last message.
-    lastmessagedate: number; // Timestamp for last message.
+    lastmessagedate: number; // @since 3.6. Timestamp for last message.
     messageid: number; // The unique search message id.
     showonlinestatus: boolean; // Show the user's online status?.
     isonline: boolean; // The user's online status.
     isread: boolean; // If the user has read the message.
     isblocked: boolean; // If the user has been blocked.
     unreadcount: number; // The number of unread messages in this conversation.
-    conversationid: number; // The id of the conversation.
+    conversationid: number; // @since 3.6. The id of the conversation.
 } & AddonMessagesMessageAreaContactCalculatedData;
 
 /**
@@ -3019,7 +3019,7 @@ export type AddonMessagesGetConversationCountsResult = {
     types: {
         1: number; // Total number of individual conversations.
         2: number; // Total number of group conversations.
-        3: number; // Total number of self conversations.
+        3: number; // @since 3.7. Total number of self conversations.
     };
 };
 
@@ -3031,7 +3031,7 @@ export type AddonMessagesGetUnreadConversationCountsResult = {
     types: {
         1: number; // Total number of unread individual conversations.
         2: number; // Total number of unread group conversations.
-        3: number; // Total number of unread self conversations.
+        3: number; // @since 3.7. Total number of unread self conversations.
     };
 };
 
@@ -3041,7 +3041,7 @@ export type AddonMessagesGetUnreadConversationCountsResult = {
 export type AddonMessagesGetUserMessagePreferencesResult = {
     preferences: AddonMessagesMessagePreferences;
     blocknoncontacts: number; // Privacy messaging setting to define who can message you.
-    entertosend: boolean; // User preference for using enter to send messages.
+    entertosend: boolean; // @since 3.6. User preference for using enter to send messages.
     warnings?: CoreWSExternalWarning[];
 };
 
@@ -3073,9 +3073,9 @@ export type AddonMessagesGetMessagesMessage = {
     timeread: number; // Time read.
     usertofullname: string; // User to full name.
     userfromfullname: string; // User from full name.
-    component?: string; // The component that generated the notification.
-    eventtype?: string; // The type of notification.
-    customdata?: string; // Custom data to be passed to the message processor.
+    component?: string; // @since 3.7. The component that generated the notification.
+    eventtype?: string; // @since 3.7. The type of notification.
+    customdata?: string; // @since 3.7. Custom data to be passed to the message processor.
 } & AddonMessagesGetMessagesMessageCalculatedData;
 
 /**
@@ -3108,11 +3108,11 @@ export type AddonMessagesSendInstantMessagesMessage = {
     msgid: number; // Test this to know if it succeeds:  id of the created message if it succeeded, -1 when failed.
     clientmsgid?: string; // Your own id for the message.
     errormessage?: string; // Error message - if it failed.
-    text?: string; // The text of the message.
-    timecreated?: number; // The timecreated timestamp for the message.
-    conversationid?: number; // The conversation id for this message.
-    useridfrom?: number; // The user id who sent the message.
-    candeletemessagesforallusers: boolean; // If the user can delete messages in the conversation for all users.
+    text?: string; // @since 3.6. The text of the message.
+    timecreated?: number; // @since 3.6. The timecreated timestamp for the message.
+    conversationid?: number; // @since 3.6. The conversation id for this message.
+    useridfrom?: number; // @since 3.6. The user id who sent the message.
+    candeletemessagesforallusers: boolean; // @since 3.7. If the user can delete messages in the conversation for all users.
 };
 
 /**
diff --git a/src/addon/notes/providers/notes.ts b/src/addon/notes/providers/notes.ts
index ff89faaad..12e476b8c 100644
--- a/src/addon/notes/providers/notes.ts
+++ b/src/addon/notes/providers/notes.ts
@@ -441,8 +441,8 @@ export type AddonNotesGetCourseNotesResult = {
     sitenotes?: AddonNotesNote[]; // Site notes.
     coursenotes?: AddonNotesNote[]; // Couse notes.
     personalnotes?: AddonNotesNote[]; // Personal notes.
-    canmanagesystemnotes?: boolean; // Whether the user can manage notes at system level.
-    canmanagecoursenotes?: boolean; // Whether the user can manage notes at the given course.
+    canmanagesystemnotes?: boolean; // @since 3.7. Whether the user can manage notes at system level.
+    canmanagecoursenotes?: boolean; // @since 3.7. Whether the user can manage notes at the given course.
     warnings?: CoreWSExternalWarning[];
 };
 
diff --git a/src/addon/notifications/providers/notifications.ts b/src/addon/notifications/providers/notifications.ts
index 02093823b..cd7f37bfc 100644
--- a/src/addon/notifications/providers/notifications.ts
+++ b/src/addon/notifications/providers/notifications.ts
@@ -486,7 +486,7 @@ export type AddonNotificationsNotificationPreferencesNotificationProcessor = {
     displayname: string; // Display name.
     name: string; // Processor name.
     locked: boolean; // Is locked by admin?.
-    lockedmessage?: string; // Text to display if locked.
+    lockedmessage?: string; // @since 3.6. Text to display if locked.
     userconfigured: number; // Is configured?.
     loggedin: AddonNotificationsNotificationPreferencesNotificationProcessorState;
     loggedoff: AddonNotificationsNotificationPreferencesNotificationProcessorState;
diff --git a/src/core/comments/providers/comments.ts b/src/core/comments/providers/comments.ts
index 3e2e8c075..b7a132cfe 100644
--- a/src/core/comments/providers/comments.ts
+++ b/src/core/comments/providers/comments.ts
@@ -422,7 +422,7 @@ export type CoreCommentsArea = {
     canpost: boolean; // Canpost.
     canview: boolean; // Canview.
     count: number; // Count.
-    collapsediconkey: string; // Collapsediconkey.
+    collapsediconkey: string; // @since 3.3. Collapsediconkey.
     displaytotalcount: boolean; // Displaytotalcount.
     displaycancel: boolean; // Displaycancel.
     fullwidth: boolean; // Fullwidth.
diff --git a/src/core/course/providers/course.ts b/src/core/course/providers/course.ts
index 7bbc92983..ed2d9fc7e 100644
--- a/src/core/course/providers/course.ts
+++ b/src/core/course/providers/course.ts
@@ -1144,21 +1144,21 @@ export type CoreCourseSummary = {
     fullname: string; // Fullname.
     shortname: string; // Shortname.
     idnumber: string; // Idnumber.
-    summary: string; // Summary.
-    summaryformat: number; // Summary format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
-    startdate: number; // Startdate.
-    enddate: number; // Enddate.
-    visible: boolean; // Visible.
-    fullnamedisplay: string; // Fullnamedisplay.
+    summary: string; // @since 3.3. Summary.
+    summaryformat: number; // @since 3.3. Summary format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    startdate: number; // @since 3.3. Startdate.
+    enddate: number; // @since 3.3. Enddate.
+    visible: boolean; // @since 3.8. Visible.
+    fullnamedisplay: string; // @since 3.3. Fullnamedisplay.
     viewurl: string; // Viewurl.
-    courseimage: string; // Courseimage.
-    progress?: number; // Progress.
-    hasprogress: boolean; // Hasprogress.
-    isfavourite: boolean; // Isfavourite.
-    hidden: boolean; // Hidden.
-    timeaccess?: number; // Timeaccess.
-    showshortname: boolean; // Showshortname.
-    coursecategory: string; // Coursecategory.
+    courseimage: string; // @since 3.6. Courseimage.
+    progress?: number; // @since 3.6. Progress.
+    hasprogress: boolean; // @since 3.6. Hasprogress.
+    isfavourite: boolean; // @since 3.6. Isfavourite.
+    hidden: boolean; // @since 3.6. Hidden.
+    timeaccess?: number; // @since 3.6. Timeaccess.
+    showshortname: boolean; // @since 3.6. Showshortname.
+    coursecategory: string; // @since 3.7. Coursecategory.
 };
 
 /**

From 7fc1c96b0345f62eda6ef567ef80cd27776526ec Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 6 Sep 2019 09:25:30 +0200
Subject: [PATCH 017/257] MOBILE-3109 assign: Add return types to assign

---
 .../assign/classes/base-feedback-handler.ts   |  20 +-
 .../assign/classes/base-submission-handler.ts |  39 +-
 .../classes/feedback-plugin-component.ts      |   7 +-
 .../classes/submission-plugin-component.ts    |   9 +-
 .../feedback-plugin/feedback-plugin.ts        |  10 +-
 .../mod/assign/components/index/index.ts      |   8 +-
 .../submission-plugin/submission-plugin.ts    |  10 +-
 .../components/submission/submission.ts       |  44 ++-
 .../feedback/comments/providers/handler.ts    |  23 +-
 .../feedback/editpdf/providers/handler.ts     |  11 +-
 .../assign/feedback/file/providers/handler.ts |  11 +-
 .../edit-feedback-modal.ts                    |  13 +-
 src/addon/mod/assign/pages/edit/edit.ts       |  10 +-
 .../pages/submission-list/submission-list.ts  |  28 +-
 .../submission-review/submission-review.ts    |   4 +-
 src/addon/mod/assign/providers/assign-sync.ts |  16 +-
 src/addon/mod/assign/providers/assign.ts      | 338 ++++++++++++++++--
 .../mod/assign/providers/feedback-delegate.ts |  48 ++-
 src/addon/mod/assign/providers/helper.ts      | 116 ++++--
 .../mod/assign/providers/prefetch-handler.ts  |  29 +-
 .../assign/providers/submission-delegate.ts   |  79 ++--
 .../submission/comments/providers/handler.ts  |  12 +-
 .../submission/file/providers/handler.ts      |  39 +-
 ...ddon-mod-assign-submission-onlinetext.html |   2 +-
 .../onlinetext/component/onlinetext.ts        |   9 +-
 .../onlinetext/providers/handler.ts           |  32 +-
 26 files changed, 728 insertions(+), 239 deletions(-)

diff --git a/src/addon/mod/assign/classes/base-feedback-handler.ts b/src/addon/mod/assign/classes/base-feedback-handler.ts
index 33e08c2d4..a63a11a82 100644
--- a/src/addon/mod/assign/classes/base-feedback-handler.ts
+++ b/src/addon/mod/assign/classes/base-feedback-handler.ts
@@ -15,6 +15,7 @@
 import { Injector } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { AddonModAssignFeedbackHandler } from '../providers/feedback-delegate';
+import { AddonModAssignAssign, AddonModAssignSubmission, AddonModAssignPlugin } from '../providers/assign';
 
 /**
  * Base handler for feedback plugins.
@@ -48,7 +49,7 @@ export class AddonModAssignBaseFeedbackHandler implements AddonModAssignFeedback
      * @param plugin The plugin object.
      * @return The component (or promise resolved with component) to use, undefined if not found.
      */
-    getComponent(injector: Injector, plugin: any): any | Promise<any> {
+    getComponent(injector: Injector, plugin: AddonModAssignPlugin): any | Promise<any> {
         // Nothing to do.
     }
 
@@ -74,7 +75,8 @@ export class AddonModAssignBaseFeedbackHandler implements AddonModAssignFeedback
      * @param siteId Site ID. If not defined, current site.
      * @return The files (or promise resolved with the files).
      */
-    getPluginFiles(assign: any, submission: any, plugin: any, siteId?: string): any[] | Promise<any[]> {
+    getPluginFiles(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, siteId?: string): any[] | Promise<any[]> {
         return [];
     }
 
@@ -84,7 +86,7 @@ export class AddonModAssignBaseFeedbackHandler implements AddonModAssignFeedback
      * @param plugin The plugin object.
      * @return The plugin name.
      */
-    getPluginName(plugin: any): string {
+    getPluginName(plugin: AddonModAssignPlugin): string {
         // Check if there's a translated string for the plugin.
         const translationId = 'addon.mod_assign_feedback_' + plugin.type + '.pluginname',
             translation = this.translate.instant(translationId);
@@ -109,7 +111,8 @@ export class AddonModAssignBaseFeedbackHandler implements AddonModAssignFeedback
      * @param inputData Data entered by the user for the feedback.
      * @return Boolean (or promise resolved with boolean): whether the data has changed.
      */
-    hasDataChanged(assign: any, submission: any, plugin: any, inputData: any): boolean | Promise<boolean> {
+    hasDataChanged(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any, userId: number): boolean | Promise<boolean> {
         return false;
     }
 
@@ -144,7 +147,8 @@ export class AddonModAssignBaseFeedbackHandler implements AddonModAssignFeedback
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    prefetch(assign: any, submission: any, plugin: any, siteId?: string): Promise<any> {
+    prefetch(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, siteId?: string): Promise<any> {
         return Promise.resolve();
     }
 
@@ -158,7 +162,8 @@ export class AddonModAssignBaseFeedbackHandler implements AddonModAssignFeedback
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    prepareFeedbackData(assignId: number, userId: number, plugin: any, pluginData: any, siteId?: string): void | Promise<any> {
+    prepareFeedbackData(assignId: number, userId: number, plugin: AddonModAssignPlugin, pluginData: any,
+            siteId?: string): void | Promise<any> {
         // Nothing to do.
     }
 
@@ -172,7 +177,8 @@ export class AddonModAssignBaseFeedbackHandler implements AddonModAssignFeedback
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    saveDraft(assignId: number, userId: number, plugin: any, data: any, siteId?: string): void | Promise<any> {
+    saveDraft(assignId: number, userId: number, plugin: AddonModAssignPlugin, data: any, siteId?: string)
+            : void | Promise<any> {
         // Nothing to do.
     }
 }
diff --git a/src/addon/mod/assign/classes/base-submission-handler.ts b/src/addon/mod/assign/classes/base-submission-handler.ts
index e0e6bb34e..1c34ce157 100644
--- a/src/addon/mod/assign/classes/base-submission-handler.ts
+++ b/src/addon/mod/assign/classes/base-submission-handler.ts
@@ -15,6 +15,7 @@
 import { Injector } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { AddonModAssignSubmissionHandler } from '../providers/submission-delegate';
+import { AddonModAssignAssign, AddonModAssignSubmission, AddonModAssignPlugin } from '../providers/assign';
 
 /**
  * Base handler for submission plugins.
@@ -38,7 +39,8 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
      * @param plugin The plugin object.
      * @return Boolean or promise resolved with boolean: whether it can be edited in offline.
      */
-    canEditOffline(assign: any, submission: any, plugin: any): boolean | Promise<boolean> {
+    canEditOffline(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin): boolean | Promise<boolean> {
         return false;
     }
 
@@ -50,7 +52,8 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
      * @param plugin The plugin object.
      * @param inputData Data entered by the user for the submission.
      */
-    clearTmpData(assign: any, submission: any, plugin: any, inputData: any): void {
+    clearTmpData(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any): void {
         // Nothing to do.
     }
 
@@ -65,7 +68,8 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    copySubmissionData(assign: any, plugin: any, pluginData: any, userId?: number, siteId?: string): void | Promise<any> {
+    copySubmissionData(assign: AddonModAssignAssign, plugin: AddonModAssignPlugin, pluginData: any,
+            userId?: number, siteId?: string): void | Promise<any> {
         // Nothing to do.
     }
 
@@ -79,7 +83,8 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    deleteOfflineData(assign: any, submission: any, plugin: any, offlineData: any, siteId?: string): void | Promise<any> {
+    deleteOfflineData(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, offlineData: any, siteId?: string): void | Promise<any> {
         // Nothing to do.
     }
 
@@ -92,7 +97,7 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
      * @param edit Whether the user is editing.
      * @return The component (or promise resolved with component) to use, undefined if not found.
      */
-    getComponent(injector: Injector, plugin: any, edit?: boolean): any | Promise<any> {
+    getComponent(injector: Injector, plugin: AddonModAssignPlugin, edit?: boolean): any | Promise<any> {
         // Nothing to do.
     }
 
@@ -106,7 +111,8 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
      * @param siteId Site ID. If not defined, current site.
      * @return The files (or promise resolved with the files).
      */
-    getPluginFiles(assign: any, submission: any, plugin: any, siteId?: string): any[] | Promise<any[]> {
+    getPluginFiles(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, siteId?: string): any[] | Promise<any[]> {
         return [];
     }
 
@@ -116,7 +122,7 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
      * @param plugin The plugin object.
      * @return The plugin name.
      */
-    getPluginName(plugin: any): string {
+    getPluginName(plugin: AddonModAssignPlugin): string {
         // Check if there's a translated string for the plugin.
         const translationId = 'addon.mod_assign_submission_' + plugin.type + '.pluginname',
             translation = this.translate.instant(translationId);
@@ -139,7 +145,7 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
      * @param plugin The plugin object.
      * @return The size (or promise resolved with size).
      */
-    getSizeForCopy(assign: any, plugin: any): number | Promise<number> {
+    getSizeForCopy(assign: AddonModAssignAssign, plugin: AddonModAssignPlugin): number | Promise<number> {
         return 0;
     }
 
@@ -147,10 +153,12 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
      * Get the size of data (in bytes) this plugin will send to add or edit a submission.
      *
      * @param assign The assignment.
+     * @param submission The submission.
      * @param plugin The plugin object.
      * @return The size (or promise resolved with size).
      */
-    getSizeForEdit(assign: any, plugin: any): number | Promise<number> {
+    getSizeForEdit(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any): number | Promise<number> {
         return 0;
     }
 
@@ -163,7 +171,8 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
      * @param inputData Data entered by the user for the submission.
      * @return Boolean (or promise resolved with boolean): whether the data has changed.
      */
-    hasDataChanged(assign: any, submission: any, plugin: any, inputData: any): boolean | Promise<boolean> {
+    hasDataChanged(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any): boolean | Promise<boolean> {
         return false;
     }
 
@@ -194,7 +203,8 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    prefetch(assign: any, submission: any, plugin: any, siteId?: string): Promise<any> {
+    prefetch?(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, siteId?: string): Promise<any> {
         return Promise.resolve();
     }
 
@@ -211,7 +221,8 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    prepareSubmissionData?(assign: any, submission: any, plugin: any, inputData: any, pluginData: any, offline?: boolean,
+    prepareSubmissionData(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any, pluginData: any, offline?: boolean,
             userId?: number, siteId?: string): void | Promise<any> {
         // Nothing to do.
     }
@@ -228,8 +239,8 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    prepareSyncData?(assign: any, submission: any, plugin: any, offlineData: any, pluginData: any, siteId?: string)
-            : void | Promise<any> {
+    prepareSyncData(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, offlineData: any, pluginData: any, siteId?: string): void | Promise<any> {
         // Nothing to do.
     }
 }
diff --git a/src/addon/mod/assign/classes/feedback-plugin-component.ts b/src/addon/mod/assign/classes/feedback-plugin-component.ts
index d315d1b7f..0076ba466 100644
--- a/src/addon/mod/assign/classes/feedback-plugin-component.ts
+++ b/src/addon/mod/assign/classes/feedback-plugin-component.ts
@@ -14,14 +14,15 @@
 
 import { Input } from '@angular/core';
 import { ModalController } from 'ionic-angular';
+import { AddonModAssignAssign, AddonModAssignSubmission, AddonModAssignPlugin } from '../providers/assign';
 
 /**
  * Base class for component to render a feedback plugin.
  */
 export class AddonModAssignFeedbackPluginComponentBase {
-    @Input() assign: any; // The assignment.
-    @Input() submission: any; // The submission.
-    @Input() plugin: any; // The plugin object.
+    @Input() assign: AddonModAssignAssign; // The assignment.
+    @Input() submission: AddonModAssignSubmission; // The submission.
+    @Input() plugin: AddonModAssignPlugin; // The plugin object.
     @Input() userId: number; // The user ID of the submission.
     @Input() configs: any; // The configs for the plugin.
     @Input() canEdit: boolean; // Whether the user can edit.
diff --git a/src/addon/mod/assign/classes/submission-plugin-component.ts b/src/addon/mod/assign/classes/submission-plugin-component.ts
index 39e8cdd2b..552657b9d 100644
--- a/src/addon/mod/assign/classes/submission-plugin-component.ts
+++ b/src/addon/mod/assign/classes/submission-plugin-component.ts
@@ -13,15 +13,16 @@
 // limitations under the License.
 
 import { Input } from '@angular/core';
+import { AddonModAssignAssign, AddonModAssignSubmission, AddonModAssignPlugin } from '../providers/assign';
 
 /**
  * Base class for component to render a submission plugin.
  */
 export class AddonModAssignSubmissionPluginComponent {
-    @Input() assign: any; // The assignment.
-    @Input() submission: any; // The submission.
-    @Input() plugin: any; // The plugin object.
-    @Input() configs: any; // The configs for the plugin.
+    @Input() assign: AddonModAssignAssign; // The assignment.
+    @Input() submission: AddonModAssignSubmission; // The submission.
+    @Input() plugin: AddonModAssignPlugin; // The plugin object.
+    @Input() configs: {[name: string]: string}; // The configs for the plugin.
     @Input() edit: boolean; // Whether the user is editing.
     @Input() allowOffline: boolean; // Whether to allow offline.
 
diff --git a/src/addon/mod/assign/components/feedback-plugin/feedback-plugin.ts b/src/addon/mod/assign/components/feedback-plugin/feedback-plugin.ts
index 94b847fda..d28973ae8 100644
--- a/src/addon/mod/assign/components/feedback-plugin/feedback-plugin.ts
+++ b/src/addon/mod/assign/components/feedback-plugin/feedback-plugin.ts
@@ -13,7 +13,9 @@
 // limitations under the License.
 
 import { Component, Input, OnInit, Injector, ViewChild } from '@angular/core';
-import { AddonModAssignProvider } from '../../providers/assign';
+import {
+    AddonModAssignProvider, AddonModAssignAssign, AddonModAssignSubmission, AddonModAssignPlugin
+} from '../../providers/assign';
 import { AddonModAssignHelperProvider } from '../../providers/helper';
 import { AddonModAssignFeedbackDelegate } from '../../providers/feedback-delegate';
 import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-component';
@@ -28,9 +30,9 @@ import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-comp
 export class AddonModAssignFeedbackPluginComponent implements OnInit {
     @ViewChild(CoreDynamicComponent) dynamicComponent: CoreDynamicComponent;
 
-    @Input() assign: any; // The assignment.
-    @Input() submission: any; // The submission.
-    @Input() plugin: any; // The plugin object.
+    @Input() assign: AddonModAssignAssign; // The assignment.
+    @Input() submission: AddonModAssignSubmission; // The submission.
+    @Input() plugin: AddonModAssignPlugin; // The plugin object.
     @Input() userId: number; // The user ID of the submission.
     @Input() canEdit: boolean | string; // Whether the user can edit.
     @Input() edit: boolean | string; // Whether the user is editing.
diff --git a/src/addon/mod/assign/components/index/index.ts b/src/addon/mod/assign/components/index/index.ts
index 2697f6c36..0361570eb 100644
--- a/src/addon/mod/assign/components/index/index.ts
+++ b/src/addon/mod/assign/components/index/index.ts
@@ -17,7 +17,7 @@ import { Content, NavController } from 'ionic-angular';
 import { CoreGroupsProvider, CoreGroupInfo } from '@providers/groups';
 import { CoreTimeUtilsProvider } from '@providers/utils/time';
 import { CoreCourseModuleMainActivityComponent } from '@core/course/classes/main-activity-component';
-import { AddonModAssignProvider } from '../../providers/assign';
+import { AddonModAssignProvider, AddonModAssignAssign, AddonModAssignSubmissionGradingSummary } from '../../providers/assign';
 import { AddonModAssignHelperProvider } from '../../providers/helper';
 import { AddonModAssignOfflineProvider } from '../../providers/assign-offline';
 import { AddonModAssignSyncProvider } from '../../providers/assign-sync';
@@ -36,13 +36,13 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
     component = AddonModAssignProvider.COMPONENT;
     moduleName = 'assign';
 
-    assign: any; // The assign object.
+    assign: AddonModAssignAssign; // The assign object.
     canViewAllSubmissions: boolean; // Whether the user can view all submissions.
     canViewOwnSubmission: boolean; // Whether the user can view their own submission.
     timeRemaining: string; // Message about time remaining to submit.
     lateSubmissions: string; // Message about late submissions.
     showNumbers = true; // Whether to show number of submissions with each status.
-    summary: any; // The summary.
+    summary: AddonModAssignSubmissionGradingSummary; // The grading summary.
     needsGradingAvalaible: boolean; // Whether we can see the submissions that need grading.
 
     groupInfo: CoreGroupInfo = {
@@ -153,7 +153,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
             this.assign = assignData;
 
             this.dataRetrieved.emit(this.assign);
-            this.description = this.assign.intro || this.description;
+            this.description = this.assign.intro;
 
             if (sync) {
                 // Try to synchronize the assign.
diff --git a/src/addon/mod/assign/components/submission-plugin/submission-plugin.ts b/src/addon/mod/assign/components/submission-plugin/submission-plugin.ts
index f8ba6d005..de2d664aa 100644
--- a/src/addon/mod/assign/components/submission-plugin/submission-plugin.ts
+++ b/src/addon/mod/assign/components/submission-plugin/submission-plugin.ts
@@ -13,7 +13,9 @@
 // limitations under the License.
 
 import { Component, Input, OnInit, Injector, ViewChild } from '@angular/core';
-import { AddonModAssignProvider } from '../../providers/assign';
+import {
+    AddonModAssignProvider, AddonModAssignAssign, AddonModAssignSubmission, AddonModAssignPlugin
+} from '../../providers/assign';
 import { AddonModAssignHelperProvider } from '../../providers/helper';
 import { AddonModAssignSubmissionDelegate } from '../../providers/submission-delegate';
 import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-component';
@@ -28,9 +30,9 @@ import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-comp
 export class AddonModAssignSubmissionPluginComponent implements OnInit {
     @ViewChild(CoreDynamicComponent) dynamicComponent: CoreDynamicComponent;
 
-    @Input() assign: any; // The assignment.
-    @Input() submission: any; // The submission.
-    @Input() plugin: any; // The plugin object.
+    @Input() assign: AddonModAssignAssign; // The assignment.
+    @Input() submission: AddonModAssignSubmission; // The submission.
+    @Input() plugin: AddonModAssignPlugin; // The plugin object.
     @Input() edit: boolean | string; // Whether the user is editing.
     @Input() allowOffline: boolean | string; // Whether to allow offline.
 
diff --git a/src/addon/mod/assign/components/submission/submission.ts b/src/addon/mod/assign/components/submission/submission.ts
index 762270fb6..b5fa53729 100644
--- a/src/addon/mod/assign/components/submission/submission.ts
+++ b/src/addon/mod/assign/components/submission/submission.ts
@@ -29,7 +29,10 @@ import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreFileUploaderHelperProvider } from '@core/fileuploader/providers/helper';
 import { CoreGradesHelperProvider } from '@core/grades/providers/helper';
 import { CoreUserProvider } from '@core/user/providers/user';
-import { AddonModAssignProvider } from '../../providers/assign';
+import {
+    AddonModAssignProvider, AddonModAssignAssign, AddonModAssignSubmissionFeedback, AddonModAssignSubmission,
+    AddonModAssignSubmissionAttempt, AddonModAssignSubmissionPreviousAttempt, AddonModAssignPlugin
+} from '../../providers/assign';
 import { AddonModAssignHelperProvider } from '../../providers/helper';
 import { AddonModAssignOfflineProvider } from '../../providers/assign-offline';
 import { CoreTabsComponent } from '@components/tabs/tabs';
@@ -55,11 +58,11 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
 
     loaded: boolean; // Whether data has been loaded.
     selectedTab: number; // Tab selected on start.
-    assign: any; // The assignment the submission belongs to.
-    userSubmission: any; // The submission object.
+    assign: AddonModAssignAssign; // The assignment the submission belongs to.
+    userSubmission: AddonModAssignSubmission; // The submission object.
     isSubmittedForGrading: boolean; // Whether the submission has been submitted for grading.
     submitModel: any = {}; // Model where to store the data to submit (for grading).
-    feedback: any; // The feedback.
+    feedback: AddonModAssignSubmissionFeedbackFormatted; // The feedback.
     hasOffline: boolean; // Whether there is offline data.
     submittedOffline: boolean; // Whether it was submitted in offline.
     fromDate: string; // Readable date when the assign started accepting submissions.
@@ -67,7 +70,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
     maxAttemptsText: string; // The text for maximum attempts.
     blindMarking: boolean; // Whether blind marking is enabled.
     user: any; // The user.
-    lastAttempt: any; // The last attempt.
+    lastAttempt: AddonModAssignSubmissionAttemptFormatted; // The last attempt.
     membersToSubmit: any[]; // Team members that need to submit the assignment.
     canSubmit: boolean; // Whether the user can submit for grading.
     canEdit: boolean; // Whether the user can edit the submission.
@@ -77,7 +80,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
     gradingStatusTranslationId: string; // Key of the text to display for the grading status.
     gradingColor: string; // Color to apply to the grading status.
     workflowStatusTranslationId: string; // Key of the text to display for the workflow status.
-    submissionPlugins: string[]; // List of submission plugins names.
+    submissionPlugins: AddonModAssignPlugin[]; // List of submission plugins.
     timeRemaining: string; // Message about time remaining.
     timeRemainingClass: string; // Class to apply to time remaining message.
     statusTranslated: string; // Status.
@@ -99,7 +102,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
 
     protected siteId: string; // Current site ID.
     protected currentUserId: number; // Current user ID.
-    protected previousAttempt: any; // The previous attempt.
+    protected previousAttempt: AddonModAssignSubmissionPreviousAttempt; // The previous attempt.
     protected submissionStatusAvailable: boolean; // Whether we were able to retrieve the submission status.
     protected originalGrades: any = {}; // Object with the original grade data, to check for changes.
     protected isDestroyed: boolean; // Whether the component has been destroyed.
@@ -209,7 +212,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
             return this.goToEdit();
         }
 
-        const previousSubmission = this.assignProvider.getSubmissionObjectFromAttempt(this.assign, this.previousAttempt);
+        const previousSubmission = this.previousAttempt.submission;
         let modal = this.domUtils.showModalLoading();
 
         this.assignHelper.getSubmissionSizeForCopy(this.assign, previousSubmission).catch(() => {
@@ -303,7 +306,8 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
         }
 
         if (this.feedback && this.feedback.plugins) {
-            return this.assignHelper.hasFeedbackDataChanged(this.assign, this.submitId, this.feedback).catch(() => {
+            return this.assignHelper.hasFeedbackDataChanged(this.assign, this.userSubmission, this.feedback, this.submitId)
+                    .catch(() => {
                 // Error ocurred, consider there are no changes.
                 return false;
             });
@@ -438,7 +442,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
             // Check if there's any unsupported plugin for editing.
             if (!this.userSubmission || !this.userSubmission.plugins) {
                 // Submission not created yet, we have to use assign configs to detect the plugins used.
-                this.userSubmission = {};
+                this.userSubmission = this.assignHelper.createEmptySubmission();
                 this.userSubmission.plugins = this.assignHelper.getPluginsEnabled(this.assign, 'assignsubmission');
             }
 
@@ -461,7 +465,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
      * @param feedback The feedback data from the submission status.
      * @return Promise resolved when done.
      */
-    protected loadFeedback(feedback: any): Promise<any> {
+    protected loadFeedback(feedback: AddonModAssignSubmissionFeedback): Promise<any> {
         this.grade = {
             method: false,
             grade: false,
@@ -571,7 +575,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
 
             if (!this.feedback || !this.feedback.plugins) {
                 // Feedback plugins not present, we have to use assign configs to detect the plugins used.
-                this.feedback = {};
+                this.feedback = this.assignHelper.createEmptyFeedback();
                 this.feedback.plugins = this.assignHelper.getPluginsEnabled(this.assign, 'assignfeedback');
             }
 
@@ -885,7 +889,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
         // Show error if submission statement should be shown but it couldn't be retrieved.
         this.showErrorStatementEdit = submissionStatementMissing && !this.assign.submissiondrafts &&
                 this.submitId == this.currentUserId;
-        this.showErrorStatementSubmit = submissionStatementMissing && this.assign.submissiondrafts;
+        this.showErrorStatementSubmit = submissionStatementMissing && !!this.assign.submissiondrafts;
 
         this.userSubmission = this.assignProvider.getSubmissionObjectFromAttempt(this.assign, response.lastattempt);
 
@@ -954,3 +958,17 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
         }
     }
 }
+
+/**
+ * Submission attempt with some calculated data.
+ */
+type AddonModAssignSubmissionAttemptFormatted = AddonModAssignSubmissionAttempt & {
+    submissiongroupname?: string; // Calculated in the app. Group name the attempt belongs to.
+};
+
+/**
+ * Feedback of an assign submission with some calculated data.
+ */
+type AddonModAssignSubmissionFeedbackFormatted = AddonModAssignSubmissionFeedback & {
+    advancedgrade?: boolean; // Calculated in the app. Whether it uses advanced grading.
+};
diff --git a/src/addon/mod/assign/feedback/comments/providers/handler.ts b/src/addon/mod/assign/feedback/comments/providers/handler.ts
index ef4e1655b..1533fd67d 100644
--- a/src/addon/mod/assign/feedback/comments/providers/handler.ts
+++ b/src/addon/mod/assign/feedback/comments/providers/handler.ts
@@ -16,7 +16,9 @@
 import { Injectable, Injector } from '@angular/core';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
-import { AddonModAssignProvider } from '../../../providers/assign';
+import {
+    AddonModAssignProvider, AddonModAssignAssign, AddonModAssignSubmission, AddonModAssignPlugin
+} from '../../../providers/assign';
 import { AddonModAssignOfflineProvider } from '../../../providers/assign-offline';
 import { AddonModAssignFeedbackHandler } from '../../../providers/feedback-delegate';
 import { AddonModAssignFeedbackCommentsComponent } from '../component/comments';
@@ -50,14 +52,14 @@ export class AddonModAssignFeedbackCommentsHandler implements AddonModAssignFeed
     }
 
     /**
-     * Return the Component to use to display the plugin data, either in read or in edit mode.
+     * Return the Component to use to display the plugin data.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
      * @param injector Injector.
      * @param plugin The plugin object.
      * @return The component (or promise resolved with component) to use, undefined if not found.
      */
-    getComponent(injector: Injector, plugin: any): any | Promise<any> {
+    getComponent(injector: Injector, plugin: AddonModAssignPlugin): any | Promise<any> {
         return AddonModAssignFeedbackCommentsComponent;
     }
 
@@ -101,7 +103,8 @@ export class AddonModAssignFeedbackCommentsHandler implements AddonModAssignFeed
      * @param siteId Site ID. If not defined, current site.
      * @return The files (or promise resolved with the files).
      */
-    getPluginFiles(assign: any, submission: any, plugin: any, siteId?: string): any[] | Promise<any[]> {
+    getPluginFiles(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, siteId?: string): any[] | Promise<any[]> {
         return this.assignProvider.getSubmissionPluginAttachments(plugin);
     }
 
@@ -135,7 +138,9 @@ export class AddonModAssignFeedbackCommentsHandler implements AddonModAssignFeed
      * @param userId User ID of the submission.
      * @return Boolean (or promise resolved with boolean): whether the data has changed.
      */
-    hasDataChanged(assign: any, submission: any, plugin: any, inputData: any, userId: number): boolean | Promise<boolean> {
+    hasDataChanged(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any, userId: number): boolean | Promise<boolean> {
+
         // Get it from plugin or offline.
         return this.assignOfflineProvider.getSubmissionGrade(assign.id, userId).catch(() => {
             // No offline data found.
@@ -191,7 +196,9 @@ export class AddonModAssignFeedbackCommentsHandler implements AddonModAssignFeed
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    prepareFeedbackData(assignId: number, userId: number, plugin: any, pluginData: any, siteId?: string): void | Promise<any> {
+    prepareFeedbackData(assignId: number, userId: number, plugin: AddonModAssignPlugin, pluginData: any,
+            siteId?: string): void | Promise<any> {
+
         const draft = this.getDraft(assignId, userId, siteId);
 
         if (draft) {
@@ -212,7 +219,9 @@ export class AddonModAssignFeedbackCommentsHandler implements AddonModAssignFeed
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    saveDraft(assignId: number, userId: number, plugin: any, data: any, siteId?: string): void | Promise<any> {
+    saveDraft(assignId: number, userId: number, plugin: AddonModAssignPlugin, data: any, siteId?: string)
+            : void | Promise<any> {
+
         if (data) {
             this.drafts[this.getDraftId(assignId, userId, siteId)] = data;
         }
diff --git a/src/addon/mod/assign/feedback/editpdf/providers/handler.ts b/src/addon/mod/assign/feedback/editpdf/providers/handler.ts
index 45276e932..5b2f8e0ef 100644
--- a/src/addon/mod/assign/feedback/editpdf/providers/handler.ts
+++ b/src/addon/mod/assign/feedback/editpdf/providers/handler.ts
@@ -14,7 +14,9 @@
 // limitations under the License.
 
 import { Injectable, Injector } from '@angular/core';
-import { AddonModAssignProvider } from '../../../providers/assign';
+import {
+    AddonModAssignProvider, AddonModAssignAssign, AddonModAssignSubmission, AddonModAssignPlugin
+} from '../../../providers/assign';
 import { AddonModAssignFeedbackHandler } from '../../../providers/feedback-delegate';
 import { AddonModAssignFeedbackEditPdfComponent } from '../component/editpdf';
 
@@ -29,14 +31,14 @@ export class AddonModAssignFeedbackEditPdfHandler implements AddonModAssignFeedb
     constructor(private assignProvider: AddonModAssignProvider) { }
 
     /**
-     * Return the Component to use to display the plugin data, either in read or in edit mode.
+     * Return the Component to use to display the plugin data.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
      * @param injector Injector.
      * @param plugin The plugin object.
      * @return The component (or promise resolved with component) to use, undefined if not found.
      */
-    getComponent(injector: Injector, plugin: any): any | Promise<any> {
+    getComponent(injector: Injector, plugin: AddonModAssignPlugin): any | Promise<any> {
         return AddonModAssignFeedbackEditPdfComponent;
     }
 
@@ -50,7 +52,8 @@ export class AddonModAssignFeedbackEditPdfHandler implements AddonModAssignFeedb
      * @param siteId Site ID. If not defined, current site.
      * @return The files (or promise resolved with the files).
      */
-    getPluginFiles(assign: any, submission: any, plugin: any, siteId?: string): any[] | Promise<any[]> {
+    getPluginFiles(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, siteId?: string): any[] | Promise<any[]> {
         return this.assignProvider.getSubmissionPluginAttachments(plugin);
     }
 
diff --git a/src/addon/mod/assign/feedback/file/providers/handler.ts b/src/addon/mod/assign/feedback/file/providers/handler.ts
index 2d55cc35d..adc6da09d 100644
--- a/src/addon/mod/assign/feedback/file/providers/handler.ts
+++ b/src/addon/mod/assign/feedback/file/providers/handler.ts
@@ -14,7 +14,9 @@
 // limitations under the License.
 
 import { Injectable, Injector } from '@angular/core';
-import { AddonModAssignProvider } from '../../../providers/assign';
+import {
+    AddonModAssignProvider, AddonModAssignAssign, AddonModAssignSubmission, AddonModAssignPlugin
+} from '../../../providers/assign';
 import { AddonModAssignFeedbackHandler } from '../../../providers/feedback-delegate';
 import { AddonModAssignFeedbackFileComponent } from '../component/file';
 
@@ -29,14 +31,14 @@ export class AddonModAssignFeedbackFileHandler implements AddonModAssignFeedback
     constructor(private assignProvider: AddonModAssignProvider) { }
 
     /**
-     * Return the Component to use to display the plugin data, either in read or in edit mode.
+     * Return the Component to use to display the plugin data.
      * It's recommended to return the class of the component, but you can also return an instance of the component.
      *
      * @param injector Injector.
      * @param plugin The plugin object.
      * @return The component (or promise resolved with component) to use, undefined if not found.
      */
-    getComponent(injector: Injector, plugin: any): any | Promise<any> {
+    getComponent(injector: Injector, plugin: AddonModAssignPlugin): any | Promise<any> {
         return AddonModAssignFeedbackFileComponent;
     }
 
@@ -50,7 +52,8 @@ export class AddonModAssignFeedbackFileHandler implements AddonModAssignFeedback
      * @param siteId Site ID. If not defined, current site.
      * @return The files (or promise resolved with the files).
      */
-    getPluginFiles(assign: any, submission: any, plugin: any, siteId?: string): any[] | Promise<any[]> {
+    getPluginFiles(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, siteId?: string): any[] | Promise<any[]> {
         return this.assignProvider.getSubmissionPluginAttachments(plugin);
     }
 
diff --git a/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.ts b/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.ts
index 3c60de76e..ace3043c0 100644
--- a/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.ts
+++ b/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.ts
@@ -17,6 +17,9 @@ import { IonicPage, ViewController, NavParams } from 'ionic-angular';
 import { TranslateService } from '@ngx-translate/core';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { AddonModAssignFeedbackDelegate } from '../../providers/feedback-delegate';
+import {
+    AddonModAssignAssign, AddonModAssignSubmission, AddonModAssignPlugin
+} from '../../providers/assign';
 
 /**
  * Modal that allows editing a feedback plugin.
@@ -28,9 +31,9 @@ import { AddonModAssignFeedbackDelegate } from '../../providers/feedback-delegat
 })
 export class AddonModAssignEditFeedbackModalPage {
 
-    @Input() assign: any; // The assignment.
-    @Input() submission: any; // The submission.
-    @Input() plugin: any; // The plugin object.
+    @Input() assign: AddonModAssignAssign; // The assignment.
+    @Input() submission: AddonModAssignSubmission; // The submission.
+    @Input() plugin: AddonModAssignPlugin; // The plugin object.
     @Input() userId: number; // The user ID of the submission.
 
     protected forceLeave = false; // To allow leaving the page without checking for changes.
@@ -99,8 +102,8 @@ export class AddonModAssignEditFeedbackModalPage {
      * @return Promise resolved with boolean: whether the data has changed.
      */
     protected hasDataChanged(): Promise<boolean> {
-        return this.feedbackDelegate.hasPluginDataChanged(this.assign, this.userId, this.plugin, this.getInputData(), this.userId)
-                .catch(() => {
+        return this.feedbackDelegate.hasPluginDataChanged(this.assign, this.submission, this.plugin, this.getInputData(),
+                this.userId).catch(() => {
             // Ignore errors.
             return true;
         });
diff --git a/src/addon/mod/assign/pages/edit/edit.ts b/src/addon/mod/assign/pages/edit/edit.ts
index 51f72b0a6..f8569eb0f 100644
--- a/src/addon/mod/assign/pages/edit/edit.ts
+++ b/src/addon/mod/assign/pages/edit/edit.ts
@@ -20,7 +20,7 @@ import { CoreSitesProvider } from '@providers/sites';
 import { CoreSyncProvider } from '@providers/sync';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreFileUploaderHelperProvider } from '@core/fileuploader/providers/helper';
-import { AddonModAssignProvider } from '../../providers/assign';
+import { AddonModAssignProvider, AddonModAssignAssign, AddonModAssignSubmission } from '../../providers/assign';
 import { AddonModAssignOfflineProvider } from '../../providers/assign-offline';
 import { AddonModAssignSyncProvider } from '../../providers/assign-sync';
 import { AddonModAssignHelperProvider } from '../../providers/helper';
@@ -35,9 +35,9 @@ import { AddonModAssignHelperProvider } from '../../providers/helper';
 })
 export class AddonModAssignEditPage implements OnInit, OnDestroy {
     title: string; // Title to display.
-    assign: any; // Assignment.
+    assign: AddonModAssignAssign; // Assignment.
     courseId: number; // Course ID the assignment belongs to.
-    userSubmission: any; // The user submission.
+    userSubmission: AddonModAssignSubmission; // The user submission.
     allowOffline: boolean; // Whether offline is allowed.
     submissionStatement: string; // The submission statement.
     submissionStatementAccepted: boolean; // Whether submission statement is accepted.
@@ -129,7 +129,7 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy {
                     const userSubmission = this.assignProvider.getSubmissionObjectFromAttempt(this.assign, response.lastattempt);
 
                     // Check if the user can edit it in offline.
-                    return this.assignHelper.canEditSubmissionOffline(this.assign, userSubmission).then((canEditOffline) => {
+                    return this.assignHelper.canEditSubmissionOffline(this.assign, userSubmission).then((canEditOffline): any => {
                         if (canEditOffline) {
                             return response;
                         }
@@ -301,7 +301,7 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy {
                 } else {
                     // Try to send it to server.
                     promise = this.assignProvider.saveSubmission(this.assign.id, this.courseId, pluginData, this.allowOffline,
-                            this.userSubmission.timemodified, this.assign.submissiondrafts, this.userId);
+                            this.userSubmission.timemodified, !!this.assign.submissiondrafts, this.userId);
                 }
 
                 return promise.then(() => {
diff --git a/src/addon/mod/assign/pages/submission-list/submission-list.ts b/src/addon/mod/assign/pages/submission-list/submission-list.ts
index 9cc87c045..c3a364b4d 100644
--- a/src/addon/mod/assign/pages/submission-list/submission-list.ts
+++ b/src/addon/mod/assign/pages/submission-list/submission-list.ts
@@ -19,9 +19,11 @@ import { CoreEventsProvider } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreGroupsProvider, CoreGroupInfo } from '@providers/groups';
-import { AddonModAssignProvider } from '../../providers/assign';
+import {
+    AddonModAssignProvider, AddonModAssignAssign, AddonModAssignGrade, AddonModAssignSubmission
+} from '../../providers/assign';
 import { AddonModAssignOfflineProvider } from '../../providers/assign-offline';
-import { AddonModAssignHelperProvider } from '../../providers/helper';
+import { AddonModAssignHelperProvider, AddonModAssignSubmissionFormatted } from '../../providers/helper';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 
 /**
@@ -36,7 +38,7 @@ export class AddonModAssignSubmissionListPage implements OnInit, OnDestroy {
     @ViewChild(CoreSplitViewComponent) splitviewCtrl: CoreSplitViewComponent;
 
     title: string; // Title to display.
-    assign: any; // Assignment.
+    assign: AddonModAssignAssign; // Assignment.
     submissions: any[]; // List of submissions
     loaded: boolean; // Whether data has been loaded.
     haveAllParticipants: boolean; // Whether all participants have been loaded.
@@ -53,7 +55,7 @@ export class AddonModAssignSubmissionListPage implements OnInit, OnDestroy {
     protected courseId: number; // Course ID the assignment belongs to.
     protected selectedStatus: string; // The status to see.
     protected gradedObserver; // Observer to refresh data when a grade changes.
-    protected submissionsData: any;
+    protected submissionsData: {canviewsubmissions: boolean, submissions?: AddonModAssignSubmission[]};
 
     constructor(navParams: NavParams, protected sitesProvider: CoreSitesProvider, eventsProvider: CoreEventsProvider,
             protected domUtils: CoreDomUtilsProvider, protected translate: TranslateService,
@@ -161,14 +163,14 @@ export class AddonModAssignSubmissionListPage implements OnInit, OnDestroy {
             !this.assign.markingworkflow ? this.assignProvider.getAssignmentGrades(this.assign.id) : Promise.resolve(null),
         ];
 
-        return Promise.all(promises).then(([submissions, grades]) => {
+        return Promise.all(promises).then(([submissions, grades]: [AddonModAssignSubmissionFormatted[], AddonModAssignGrade[]]) => {
             // Filter the submissions to get only the ones with the right status and add some extra data.
             const getNeedGrading = this.selectedStatus == AddonModAssignProvider.NEED_GRADING,
                 searchStatus = getNeedGrading ? AddonModAssignProvider.SUBMISSION_STATUS_SUBMITTED : this.selectedStatus,
                 promises = [],
                 showSubmissions = [];
 
-            submissions.forEach((submission) => {
+            submissions.forEach((submission: AddonModAssignSubmissionForList) => {
                 if (!searchStatus || searchStatus == submission.status) {
                     promises.push(this.assignOfflineProvider.getSubmissionGrade(this.assign.id, submission.userid).catch(() => {
                         // Ignore errors.
@@ -213,7 +215,7 @@ export class AddonModAssignSubmissionListPage implements OnInit, OnDestroy {
                                 submission.statusTranslated = this.translate.instant('addon.mod_assign.submissionstatus_' +
                                     submission.status);
                             } else {
-                                submission.statusTranslated = false;
+                                submission.statusTranslated = '';
                             }
 
                             if (notSynced) {
@@ -224,7 +226,7 @@ export class AddonModAssignSubmissionListPage implements OnInit, OnDestroy {
                                 submission.gradingStatusTranslationId =
                                     this.assignProvider.getSubmissionGradingStatusTranslationId(submission.gradingstatus);
                             } else {
-                                submission.gradingStatusTranslationId = false;
+                                submission.gradingStatusTranslationId = '';
                             }
 
                             showSubmissions.push(submission);
@@ -299,3 +301,13 @@ export class AddonModAssignSubmissionListPage implements OnInit, OnDestroy {
         this.gradedObserver && this.gradedObserver.off();
     }
 }
+
+/**
+ * Calculated data for an assign submission.
+ */
+type AddonModAssignSubmissionForList = AddonModAssignSubmissionFormatted & {
+    statusColor?: string; // Calculated in the app. Color of the submission status.
+    gradingColor?: string; // Calculated in the app. Color of the submission grading status.
+    statusTranslated?: string; // Calculated in the app. Translated text of the submission status.
+    gradingStatusTranslationId?: string; // Calculated in the app. Key of the text of the submission grading status.
+};
diff --git a/src/addon/mod/assign/pages/submission-review/submission-review.ts b/src/addon/mod/assign/pages/submission-review/submission-review.ts
index a3652667d..9c96c1c07 100644
--- a/src/addon/mod/assign/pages/submission-review/submission-review.ts
+++ b/src/addon/mod/assign/pages/submission-review/submission-review.ts
@@ -17,7 +17,7 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import { CoreAppProvider } from '@providers/app';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreCourseProvider } from '@core/course/providers/course';
-import { AddonModAssignProvider } from '../../providers/assign';
+import { AddonModAssignProvider, AddonModAssignAssign } from '../../providers/assign';
 import { AddonModAssignSubmissionComponent } from '../../components/submission/submission';
 
 /**
@@ -40,7 +40,7 @@ export class AddonModAssignSubmissionReviewPage implements OnInit {
     loaded: boolean; // Whether data has been loaded.
     canSaveGrades: boolean; // Whether the user can save grades.
 
-    protected assign: any; // The assignment the submission belongs to.
+    protected assign: AddonModAssignAssign; // The assignment the submission belongs to.
     protected blindMarking: boolean; // Whether it uses blind marking.
     protected forceLeave = false; // To allow leaving the page without checking for changes.
 
diff --git a/src/addon/mod/assign/providers/assign-sync.ts b/src/addon/mod/assign/providers/assign-sync.ts
index 60967dc07..c61e09cfa 100644
--- a/src/addon/mod/assign/providers/assign-sync.ts
+++ b/src/addon/mod/assign/providers/assign-sync.ts
@@ -26,7 +26,7 @@ import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseLogHelperProvider } from '@core/course/providers/log-helper';
 import { CoreGradesHelperProvider } from '@core/grades/providers/helper';
 import { CoreSyncBaseProvider } from '@classes/base-sync';
-import { AddonModAssignProvider } from './assign';
+import { AddonModAssignProvider, AddonModAssignAssign } from './assign';
 import { AddonModAssignOfflineProvider } from './assign-offline';
 import { AddonModAssignSubmissionDelegate } from './submission-delegate';
 
@@ -169,14 +169,14 @@ export class AddonModAssignSyncProvider extends CoreSyncBaseProvider {
     syncAssign(assignId: number, siteId?: string): Promise<AddonModAssignSyncResult> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
 
-        const promises = [],
+        const promises: Promise<any>[] = [],
             result: AddonModAssignSyncResult = {
                 warnings: [],
                 updated: false
             };
-        let assign,
-            courseId,
-            syncPromise;
+        let assign: AddonModAssignAssign,
+            courseId: number,
+            syncPromise: Promise<any>;
 
         if (this.isSyncing(assignId, siteId)) {
             // There's already a sync ongoing for this assign, return the promise.
@@ -269,7 +269,7 @@ export class AddonModAssignSyncProvider extends CoreSyncBaseProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved if success, rejected otherwise.
      */
-    protected syncSubmission(assign: any, offlineData: any, warnings: string[], siteId?: string): Promise<any> {
+    protected syncSubmission(assign: AddonModAssignAssign, offlineData: any, warnings: string[], siteId?: string): Promise<any> {
         const userId = offlineData.userid,
             pluginData = {};
         let discardError,
@@ -358,8 +358,8 @@ export class AddonModAssignSyncProvider extends CoreSyncBaseProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved if success, rejected otherwise.
      */
-    protected syncSubmissionGrade(assign: any, offlineData: any, warnings: string[], courseId: number, siteId?: string)
-            : Promise<any> {
+    protected syncSubmissionGrade(assign: AddonModAssignAssign, offlineData: any, warnings: string[], courseId: number,
+            siteId?: string): Promise<any> {
 
         const userId = offlineData.userid;
         let discardError;
diff --git a/src/addon/mod/assign/providers/assign.ts b/src/addon/mod/assign/providers/assign.ts
index e819751a6..07a656c1a 100644
--- a/src/addon/mod/assign/providers/assign.ts
+++ b/src/addon/mod/assign/providers/assign.ts
@@ -27,6 +27,7 @@ import { AddonModAssignSubmissionDelegate } from './submission-delegate';
 import { AddonModAssignOfflineProvider } from './assign-offline';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreInterceptor } from '@classes/interceptor';
+import { CoreWSExternalWarning, CoreWSExternalFile } from '@providers/ws';
 
 /**
  * Service that provides some functions for assign.
@@ -123,7 +124,7 @@ export class AddonModAssignProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the assignment.
      */
-    getAssignment(courseId: number, cmId: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
+    getAssignment(courseId: number, cmId: number, ignoreCache?: boolean, siteId?: string): Promise<AddonModAssignAssign> {
         return this.getAssignmentByField(courseId, 'cmid', cmId, ignoreCache, siteId);
     }
 
@@ -138,7 +139,7 @@ export class AddonModAssignProvider {
      * @return Promise resolved when the assignment is retrieved.
      */
     protected getAssignmentByField(courseId: number, key: string, value: any, ignoreCache?: boolean, siteId?: string)
-            : Promise<any> {
+            : Promise<AddonModAssignAssign> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
@@ -161,7 +162,7 @@ export class AddonModAssignProvider {
                 delete params.includenotenrolledcourses;
 
                 return site.read('mod_assign_get_assignments', params, preSets);
-            }).then((response) => {
+            }).then((response: AddonModAssignGetAssignmentsResult): any => {
                 // Search the assignment to return.
                 if (response.courses && response.courses.length) {
                     const assignments = response.courses[0].assignments;
@@ -187,7 +188,7 @@ export class AddonModAssignProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the assignment.
      */
-    getAssignmentById(courseId: number, id: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
+    getAssignmentById(courseId: number, id: number, ignoreCache?: boolean, siteId?: string): Promise<AddonModAssignAssign> {
         return this.getAssignmentByField(courseId, 'id', id, ignoreCache, siteId);
     }
 
@@ -225,7 +226,9 @@ export class AddonModAssignProvider {
                 preSets.emergencyCache = false;
             }
 
-            return site.read('mod_assign_get_user_mappings', params, preSets).then((response) => {
+            return site.read('mod_assign_get_user_mappings', params, preSets)
+                    .then((response: AddonModAssignGetUserMappingsResult): any => {
+
                 // Search the user.
                 if (response.assignments && response.assignments.length) {
                     if (!userId || userId < 0) {
@@ -271,7 +274,7 @@ export class AddonModAssignProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Resolved with requested info when done.
      */
-    getAssignmentGrades(assignId: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
+    getAssignmentGrades(assignId: number, ignoreCache?: boolean, siteId?: string): Promise<AddonModAssignGrade[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                     assignmentids: [assignId]
@@ -285,7 +288,7 @@ export class AddonModAssignProvider {
                 preSets.emergencyCache = false;
             }
 
-            return site.read('mod_assign_get_grades', params, preSets).then((response) => {
+            return site.read('mod_assign_get_grades', params, preSets).then((response: AddonModAssignGetGradesResult): any => {
                 // Search the assignment.
                 if (response.assignments && response.assignments.length) {
                     const assignment = response.assignments[0];
@@ -294,7 +297,7 @@ export class AddonModAssignProvider {
                         return assignment.grades;
                     }
                 } else if (response.warnings && response.warnings.length) {
-                    if (response.warnings[0].warningcode == 3) {
+                    if (response.warnings[0].warningcode == '3') {
                         // No grades found.
                         return [];
                     }
@@ -362,7 +365,9 @@ export class AddonModAssignProvider {
      * @param attempt Attempt.
      * @return Submission object or null.
      */
-    getSubmissionObjectFromAttempt(assign: any, attempt: any): any {
+    getSubmissionObjectFromAttempt(assign: AddonModAssignAssign, attempt: AddonModAssignSubmissionAttempt)
+            : AddonModAssignSubmission {
+
         if (!attempt) {
             return null;
         }
@@ -432,7 +437,7 @@ export class AddonModAssignProvider {
      * @return Promise resolved when done.
      */
     getSubmissions(assignId: number, ignoreCache?: boolean, siteId?: string)
-            : Promise<{canviewsubmissions: boolean, submissions?: any[]}> {
+            : Promise<{canviewsubmissions: boolean, submissions?: AddonModAssignSubmission[]}> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
@@ -448,9 +453,11 @@ export class AddonModAssignProvider {
                 preSets.emergencyCache = false;
             }
 
-            return site.read('mod_assign_get_submissions', params, preSets).then((response): any => {
+            return site.read('mod_assign_get_submissions', params, preSets)
+                    .then((response: AddonModAssignGetSubmissionsResult): any => {
+
                 // Check if we can view submissions, with enough permissions.
-                if (response.warnings.length > 0 && response.warnings[0].warningcode == 1) {
+                if (response.warnings.length > 0 && response.warnings[0].warningcode == '1') {
                     return {canviewsubmissions: false};
                 }
 
@@ -489,7 +496,7 @@ export class AddonModAssignProvider {
      * @return Promise always resolved with the user submission status.
      */
     getSubmissionStatus(assignId: number, userId?: number, groupId?: number, isBlind?: boolean, filter: boolean = true,
-            ignoreCache?: boolean, siteId?: string): Promise<any> {
+            ignoreCache?: boolean, siteId?: string): Promise<AddonModAssignGetSubmissionStatusResult> {
 
         userId = userId || 0;
 
@@ -540,7 +547,7 @@ export class AddonModAssignProvider {
      * @return Promise always resolved with the user submission status.
      */
     getSubmissionStatusWithRetry(assign: any, userId?: number, groupId?: number, isBlind?: boolean, filter: boolean = true,
-            ignoreCache?: boolean, siteId?: string): Promise<any> {
+            ignoreCache?: boolean, siteId?: string): Promise<AddonModAssignGetSubmissionStatusResult> {
 
         return this.getSubmissionStatus(assign.id, userId, groupId, isBlind, filter, ignoreCache, siteId).then((response) => {
             const userSubmission = this.getSubmissionObjectFromAttempt(assign, response.lastattempt);
@@ -630,7 +637,9 @@ export class AddonModAssignProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the list of participants and summary of submissions.
      */
-    listParticipants(assignId: number, groupId?: number, ignoreCache?: boolean, siteId?: string): Promise<any[]> {
+    listParticipants(assignId: number, groupId?: number, ignoreCache?: boolean, siteId?: string)
+            : Promise<AddonModAssignParticipant[]> {
+
         groupId = groupId || 0;
 
         return this.sitesProvider.getSite(siteId).then((site) => {
@@ -1051,14 +1060,14 @@ export class AddonModAssignProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when saved, rejected otherwise.
      */
-    saveSubmissionOnline(assignId: number, pluginData: any, siteId?: string): Promise<any> {
+    saveSubmissionOnline(assignId: number, pluginData: any, siteId?: string): Promise<void> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                 assignmentid: assignId,
                 plugindata: pluginData
             };
 
-            return site.write('mod_assign_save_submission', params).then((warnings) => {
+            return site.write('mod_assign_save_submission', params).then((warnings: CoreWSExternalWarning[]) => {
                 if (warnings && warnings.length) {
                     // The WebService returned warnings, reject.
                     return Promise.reject(warnings[0]);
@@ -1120,14 +1129,14 @@ export class AddonModAssignProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when submitted, rejected otherwise.
      */
-    submitForGradingOnline(assignId: number, acceptStatement: boolean, siteId?: string): Promise<any> {
+    submitForGradingOnline(assignId: number, acceptStatement: boolean, siteId?: string): Promise<void> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                 assignmentid: assignId,
                 acceptsubmissionstatement: acceptStatement ? 1 : 0
             };
 
-            return site.write('mod_assign_submit_for_grading', params).then((warnings) => {
+            return site.write('mod_assign_submit_for_grading', params).then((warnings: CoreWSExternalWarning[]) => {
                 if (warnings && warnings.length) {
                     // The WebService returned warnings, reject.
                     return Promise.reject(warnings[0]);
@@ -1169,7 +1178,10 @@ export class AddonModAssignProvider {
         return this.isGradingOfflineEnabled(siteId).then((enabled) => {
             if (!enabled) {
                 return this.submitGradingFormOnline(assignId, userId, grade, attemptNumber, addAttempt, workflowState,
-                        applyToAll, outcomes, pluginData, siteId);
+                        applyToAll, outcomes, pluginData, siteId).then(() => {
+
+                    return true;
+                });
             }
 
             if (!this.appProvider.isOnline()) {
@@ -1212,7 +1224,7 @@ export class AddonModAssignProvider {
      * @return Promise resolved when submitted, rejected otherwise.
      */
     submitGradingFormOnline(assignId: number, userId: number, grade: number, attemptNumber: number, addAttempt: boolean,
-            workflowState: string, applyToAll: boolean, outcomes: any, pluginData: any, siteId?: string): Promise<any> {
+            workflowState: string, applyToAll: boolean, outcomes: any, pluginData: any, siteId?: string): Promise<void | null> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             userId = userId || site.getUserId();
@@ -1243,7 +1255,7 @@ export class AddonModAssignProvider {
                         jsonformdata: JSON.stringify(serialized)
                     };
 
-                return site.write('mod_assign_submit_grading_form', params).then((warnings) => {
+                return site.write('mod_assign_submit_grading_form', params).then((warnings: CoreWSExternalWarning[]) => {
                     if (warnings && warnings.length) {
                         // The WebService returned warnings, reject.
                         return Promise.reject(warnings[0]);
@@ -1271,3 +1283,285 @@ export class AddonModAssignProvider {
         });
     }
 }
+
+/**
+ * Assign data returned by mod_assign_get_assignments.
+ */
+export type AddonModAssignAssign = {
+    id: number; // Assignment id.
+    cmid: number; // Course module id.
+    course: number; // Course id.
+    name: string; // Assignment name.
+    nosubmissions: number; // No submissions.
+    submissiondrafts: number; // Submissions drafts.
+    sendnotifications: number; // Send notifications.
+    sendlatenotifications: number; // Send notifications.
+    sendstudentnotifications: number; // Send student notifications (default).
+    duedate: number; // Assignment due date.
+    allowsubmissionsfromdate: number; // Allow submissions from date.
+    grade: number; // Grade type.
+    timemodified: number; // Last time assignment was modified.
+    completionsubmit: number; // If enabled, set activity as complete following submission.
+    cutoffdate: number; // Date after which submission is not accepted without an extension.
+    gradingduedate?: number; // @since 3.3. The expected date for marking the submissions.
+    teamsubmission: number; // If enabled, students submit as a team.
+    requireallteammemberssubmit: number; // If enabled, all team members must submit.
+    teamsubmissiongroupingid: number; // The grouping id for the team submission groups.
+    blindmarking: number; // If enabled, hide identities until reveal identities actioned.
+    hidegrader?: number; // @since 3.7. If enabled, hide grader to student.
+    revealidentities: number; // Show identities for a blind marking assignment.
+    attemptreopenmethod: string; // Method used to control opening new attempts.
+    maxattempts: number; // Maximum number of attempts allowed.
+    markingworkflow: number; // Enable marking workflow.
+    markingallocation: number; // Enable marking allocation.
+    requiresubmissionstatement: number; // Student must accept submission statement.
+    preventsubmissionnotingroup?: number; // @since 3.2. Prevent submission not in group.
+    submissionstatement?: string; // @since 3.2. Submission statement formatted.
+    submissionstatementformat?: number; // @since 3.2. Submissionstatement format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    configs: AddonModAssignConfig[]; // Configuration settings.
+    intro?: string; // Assignment intro, not allways returned because it deppends on the activity configuration.
+    introformat?: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    introfiles?: CoreWSExternalFile[]; // @since 3.2.
+    introattachments?: CoreWSExternalFile[];
+};
+
+/**
+ * Config setting in an assign.
+ */
+export type AddonModAssignConfig = {
+    id?: number; // Assign_plugin_config id.
+    assignment?: number; // Assignment id.
+    plugin: string; // Plugin.
+    subtype: string; // Subtype.
+    name: string; // Name.
+    value: string; // Value.
+};
+
+/**
+ * Grade of an assign, returned by mod_assign_get_grades.
+ */
+export type AddonModAssignGrade = {
+    id: number; // Grade id.
+    assignment?: number; // Assignment id.
+    userid: number; // Student id.
+    attemptnumber: number; // Attempt number.
+    timecreated: number; // Grade creation time.
+    timemodified: number; // Grade last modified time.
+    grader: number; // Grader, -1 if grader is hidden.
+    grade: string; // Grade.
+    gradefordisplay?: string; // Grade rendered into a format suitable for display.
+};
+
+/**
+ * Assign submission returned by mod_assign_get_submissions.
+ */
+export type AddonModAssignSubmission = {
+    id: number; // Submission id.
+    userid: number; // Student id.
+    attemptnumber: number; // Attempt number.
+    timecreated: number; // Submission creation time.
+    timemodified: number; // Submission last modified time.
+    status: string; // Submission status.
+    groupid: number; // Group id.
+    assignment?: number; // Assignment id.
+    latest?: number; // Latest attempt.
+    plugins?: AddonModAssignPlugin[]; // Plugins.
+    gradingstatus?: string; // @since 3.2. Grading status.
+};
+
+/**
+ * Assign plugin.
+ */
+export type AddonModAssignPlugin = {
+    type: string; // Submission plugin type.
+    name: string; // Submission plugin name.
+    fileareas?: { // Fileareas.
+        area: string; // File area.
+        files?: CoreWSExternalFile[];
+    }[];
+    editorfields?: { // Editorfields.
+        name: string; // Field name.
+        description: string; // Field description.
+        text: string; // Field value.
+        format: number; // Text format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    }[];
+};
+
+/**
+ * Grading summary of an assign submission.
+ */
+export type AddonModAssignSubmissionGradingSummary = {
+    participantcount: number; // Number of users who can submit.
+    submissiondraftscount: number; // Number of submissions in draft status.
+    submissionsenabled: boolean; // Whether submissions are enabled or not.
+    submissionssubmittedcount: number; // Number of submissions in submitted status.
+    submissionsneedgradingcount: number; // Number of submissions that need grading.
+    warnofungroupedusers: string; // Whether we need to warn people about groups.
+};
+
+/**
+ * Attempt of an assign submission.
+ */
+export type AddonModAssignSubmissionAttempt = {
+    submission?: AddonModAssignSubmission; // Submission info.
+    teamsubmission?: AddonModAssignSubmission; // Submission info.
+    submissiongroup?: number; // The submission group id (for group submissions only).
+    submissiongroupmemberswhoneedtosubmit?: number[]; // List of users who still need to submit (for group submissions only).
+    submissionsenabled: boolean; // Whether submissions are enabled or not.
+    locked: boolean; // Whether new submissions are locked.
+    graded: boolean; // Whether the submission is graded.
+    canedit: boolean; // Whether the user can edit the current submission.
+    caneditowner?: boolean; // @since 3.2. Whether the owner of the submission can edit it.
+    cansubmit: boolean; // Whether the user can submit.
+    extensionduedate: number; // Extension due date.
+    blindmarking: boolean; // Whether blind marking is enabled.
+    gradingstatus: string; // Grading status.
+    usergroups: number[]; // User groups in the course.
+};
+
+/**
+ * Previous attempt of an assign submission.
+ */
+export type AddonModAssignSubmissionPreviousAttempt = {
+    attemptnumber: number; // Attempt number.
+    submission?: AddonModAssignSubmission; // Submission info.
+    grade?: AddonModAssignGrade; // Grade information.
+    feedbackplugins?: AddonModAssignPlugin[]; // Feedback info.
+};
+
+/**
+ * Feedback of an assign submission.
+ */
+export type AddonModAssignSubmissionFeedback = {
+    grade: AddonModAssignGrade; // Grade information.
+    gradefordisplay: string; // Grade rendered into a format suitable for display.
+    gradeddate: number; // The date the user was graded.
+    plugins?: AddonModAssignPlugin[]; // Plugins info.
+};
+
+/**
+ * Participant returned by mod_assign_list_participants.
+ */
+export type AddonModAssignParticipant = {
+    id: number; // ID of the user.
+    username?: string; // The username.
+    firstname?: string; // The first name(s) of the user.
+    lastname?: string; // The family name of the user.
+    fullname: string; // The fullname of the user.
+    email?: string; // Email address.
+    address?: string; // Postal address.
+    phone1?: string; // Phone 1.
+    phone2?: string; // Phone 2.
+    icq?: string; // Icq number.
+    skype?: string; // Skype id.
+    yahoo?: string; // Yahoo id.
+    aim?: string; // Aim id.
+    msn?: string; // Msn number.
+    department?: string; // Department.
+    institution?: string; // Institution.
+    idnumber?: string; // The idnumber of the user.
+    interests?: string; // User interests (separated by commas).
+    firstaccess?: number; // First access to the site (0 if never).
+    lastaccess?: number; // Last access to the site (0 if never).
+    suspended?: boolean; // @since 3.2. Suspend user account, either false to enable user login or true to disable it.
+    description?: string; // User profile description.
+    descriptionformat?: number; // Int format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    city?: string; // Home city of the user.
+    url?: string; // URL of the user.
+    country?: string; // Home country code of the user, such as AU or CZ.
+    profileimageurlsmall?: string; // User image profile URL - small version.
+    profileimageurl?: string; // User image profile URL - big version.
+    customfields?: { // User custom fields (also known as user profile fields).
+        type: string; // The type of the custom field - text field, checkbox...
+        value: string; // The value of the custom field.
+        name: string; // The name of the custom field.
+        shortname: string; // The shortname of the custom field - to be able to build the field class in the code.
+    }[];
+    preferences?: { // Users preferences.
+        name: string; // The name of the preferences.
+        value: string; // The value of the preference.
+    }[];
+    recordid?: number; // @since 3.7. Record id.
+    groups?: { // User groups.
+        id: number; // Group id.
+        name: string; // Group name.
+        description: string; // Group description.
+    }[];
+    roles?: { // User roles.
+        roleid: number; // Role id.
+        name: string; // Role name.
+        shortname: string; // Role shortname.
+        sortorder: number; // Role sortorder.
+    }[];
+    enrolledcourses?: { // Courses where the user is enrolled - limited by which courses the user is able to see.
+        id: number; // Id of the course.
+        fullname: string; // Fullname of the course.
+        shortname: string; // Shortname of the course.
+    }[];
+    submitted: boolean; // Have they submitted their assignment.
+    requiregrading: boolean; // Is their submission waiting for grading.
+    grantedextension?: boolean; // @since 3.3. Have they been granted an extension.
+    groupid?: number; // For group assignments this is the group id.
+    groupname?: string; // For group assignments this is the group name.
+};
+
+/**
+ * Result of WS mod_assign_get_assignments.
+ */
+export type AddonModAssignGetAssignmentsResult = {
+    courses: { // List of courses.
+        id: number; // Course id.
+        fullname: string; // Course full name.
+        shortname: string; // Course short name.
+        timemodified: number; // Last time modified.
+        assignments: AddonModAssignAssign[]; // Assignment info.
+    }[];
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS mod_assign_get_user_mappings.
+ */
+export type AddonModAssignGetUserMappingsResult = {
+    assignments: { // List of assign user mapping data.
+        assignmentid: number; // Assignment id.
+        mappings: {
+            id: number; // User mapping id.
+            userid: number; // Student id.
+        }[];
+    }[];
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS mod_assign_get_grades.
+ */
+export type AddonModAssignGetGradesResult = {
+    assignments: { // List of assignment grade information.
+        assignmentid: number; // Assignment id.
+        grades: AddonModAssignGrade[];
+    }[];
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS mod_assign_get_submissions.
+ */
+export type AddonModAssignGetSubmissionsResult = {
+    assignments: { // Assignment submissions.
+        assignmentid: number; // Assignment id.
+        submissions: AddonModAssignSubmission[];
+    }[];
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS mod_assign_get_submission_status.
+ */
+export type AddonModAssignGetSubmissionStatusResult = {
+    gradingsummary?: AddonModAssignSubmissionGradingSummary; // Grading information.
+    lastattempt?: AddonModAssignSubmissionAttempt; // Last attempt information.
+    feedback?: AddonModAssignSubmissionFeedback; // Feedback for the last attempt.
+    previousattempts?: AddonModAssignSubmissionPreviousAttempt[]; // List all the previous attempts did by the user.
+    warnings?: CoreWSExternalWarning[];
+};
diff --git a/src/addon/mod/assign/providers/feedback-delegate.ts b/src/addon/mod/assign/providers/feedback-delegate.ts
index c72dda969..4565f64be 100644
--- a/src/addon/mod/assign/providers/feedback-delegate.ts
+++ b/src/addon/mod/assign/providers/feedback-delegate.ts
@@ -18,6 +18,7 @@ import { CoreEventsProvider } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreDelegate, CoreDelegateHandler } from '@classes/delegate';
 import { AddonModAssignDefaultFeedbackHandler } from './default-feedback-handler';
+import { AddonModAssignAssign, AddonModAssignSubmission, AddonModAssignPlugin } from './assign';
 
 /**
  * Interface that all feedback handlers must implement.
@@ -47,7 +48,7 @@ export interface AddonModAssignFeedbackHandler extends CoreDelegateHandler {
      * @param plugin The plugin object.
      * @return The component (or promise resolved with component) to use, undefined if not found.
      */
-    getComponent?(injector: Injector, plugin: any): any | Promise<any>;
+    getComponent?(injector: Injector, plugin: AddonModAssignPlugin): any | Promise<any>;
 
     /**
      * Return the draft saved data of the feedback plugin.
@@ -69,7 +70,8 @@ export interface AddonModAssignFeedbackHandler extends CoreDelegateHandler {
      * @param siteId Site ID. If not defined, current site.
      * @return The files (or promise resolved with the files).
      */
-    getPluginFiles?(assign: any, submission: any, plugin: any, siteId?: string): any[] | Promise<any[]>;
+    getPluginFiles?(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, siteId?: string): any[] | Promise<any[]>;
 
     /**
      * Get a readable name to use for the plugin.
@@ -77,7 +79,7 @@ export interface AddonModAssignFeedbackHandler extends CoreDelegateHandler {
      * @param plugin The plugin object.
      * @return The plugin name.
      */
-    getPluginName?(plugin: any): string;
+    getPluginName?(plugin: AddonModAssignPlugin): string;
 
     /**
      * Check if the feedback data has changed for this plugin.
@@ -89,7 +91,8 @@ export interface AddonModAssignFeedbackHandler extends CoreDelegateHandler {
      * @param userId User ID of the submission.
      * @return Boolean (or promise resolved with boolean): whether the data has changed.
      */
-    hasDataChanged?(assign: any, submission: any, plugin: any, inputData: any, userId: number): boolean | Promise<boolean>;
+    hasDataChanged?(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any, userId: number): boolean | Promise<boolean>;
 
     /**
      * Check whether the plugin has draft data stored.
@@ -111,7 +114,8 @@ export interface AddonModAssignFeedbackHandler extends CoreDelegateHandler {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    prefetch?(assign: any, submission: any, plugin: any, siteId?: string): Promise<any>;
+    prefetch?(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, siteId?: string): Promise<any>;
 
     /**
      * Prepare and add to pluginData the data to send to the server based on the draft data saved.
@@ -123,7 +127,8 @@ export interface AddonModAssignFeedbackHandler extends CoreDelegateHandler {
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    prepareFeedbackData?(assignId: number, userId: number, plugin: any, pluginData: any, siteId?: string): void | Promise<any>;
+    prepareFeedbackData?(assignId: number, userId: number, plugin: AddonModAssignPlugin, pluginData: any,
+            siteId?: string): void | Promise<any>;
 
     /**
      * Save draft data of the feedback plugin.
@@ -135,7 +140,8 @@ export interface AddonModAssignFeedbackHandler extends CoreDelegateHandler {
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    saveDraft?(assignId: number, userId: number, plugin: any, data: any, siteId?: string): void | Promise<any>;
+    saveDraft?(assignId: number, userId: number, plugin: AddonModAssignPlugin, data: any, siteId?: string)
+            : void | Promise<any>;
 }
 
 /**
@@ -160,7 +166,8 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    discardPluginFeedbackData(assignId: number, userId: number, plugin: any, siteId?: string): Promise<any> {
+    discardPluginFeedbackData(assignId: number, userId: number, plugin: AddonModAssignPlugin, siteId?: string)
+            : Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'discardDraft', [assignId, userId, siteId]));
     }
 
@@ -171,7 +178,7 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
      * @param plugin The plugin object.
      * @return Promise resolved with the component to use, undefined if not found.
      */
-    getComponentForPlugin(injector: Injector, plugin: any): Promise<any> {
+    getComponentForPlugin(injector: Injector, plugin: AddonModAssignPlugin): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'getComponent', [injector, plugin]));
     }
 
@@ -184,7 +191,8 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the draft data.
      */
-    getPluginDraftData(assignId: number, userId: number, plugin: any, siteId?: string): Promise<any> {
+    getPluginDraftData(assignId: number, userId: number, plugin: AddonModAssignPlugin, siteId?: string)
+            : Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'getDraft', [assignId, userId, siteId]));
     }
 
@@ -198,7 +206,8 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the files.
      */
-    getPluginFiles(assign: any, submission: any, plugin: any, siteId?: string): Promise<any[]> {
+    getPluginFiles(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, siteId?: string): Promise<any[]> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'getPluginFiles', [assign, submission, plugin, siteId]));
     }
 
@@ -208,7 +217,7 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
      * @param plugin Plugin to get the name for.
      * @return Human readable name.
      */
-    getPluginName(plugin: any): string {
+    getPluginName(plugin: AddonModAssignPlugin): string {
         return this.executeFunctionOnEnabled(plugin.type, 'getPluginName', [plugin]);
     }
 
@@ -222,7 +231,8 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
      * @param userId User ID of the submission.
      * @return Promise resolved with true if data has changed, resolved with false otherwise.
      */
-    hasPluginDataChanged(assign: any, submission: any, plugin: any, inputData: any, userId: number): Promise<boolean> {
+    hasPluginDataChanged(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any, userId: number): Promise<boolean> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'hasDataChanged',
                 [assign, submission, plugin, inputData, userId]));
     }
@@ -236,7 +246,8 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with true if it has draft data.
      */
-    hasPluginDraftData(assignId: number, userId: number, plugin: any, siteId?: string): Promise<boolean> {
+    hasPluginDraftData(assignId: number, userId: number, plugin: AddonModAssignPlugin, siteId?: string)
+            : Promise<boolean> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'hasDraftData', [assignId, userId, siteId]));
     }
 
@@ -259,7 +270,8 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    prefetch(assign: any, submission: any, plugin: any, siteId?: string): Promise<any> {
+    prefetch(assign: AddonModAssignAssign, submission: AddonModAssignSubmission, plugin: AddonModAssignPlugin,
+            siteId?: string): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'prefetch', [assign, submission, plugin, siteId]));
     }
 
@@ -273,7 +285,8 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when data has been gathered.
      */
-    preparePluginFeedbackData(assignId: number, userId: number, plugin: any, pluginData: any, siteId?: string): Promise<any> {
+    preparePluginFeedbackData(assignId: number, userId: number, plugin: AddonModAssignPlugin, pluginData: any,
+            siteId?: string): Promise<any> {
 
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'prepareFeedbackData',
                 [assignId, userId, plugin, pluginData, siteId]));
@@ -289,7 +302,8 @@ export class AddonModAssignFeedbackDelegate extends CoreDelegate {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when data has been saved.
      */
-    saveFeedbackDraft(assignId: number, userId: number, plugin: any, inputData: any, siteId?: string): Promise<any> {
+    saveFeedbackDraft(assignId: number, userId: number, plugin: AddonModAssignPlugin, inputData: any,
+            siteId?: string): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'saveDraft',
                 [assignId, userId, plugin, inputData, siteId]));
     }
diff --git a/src/addon/mod/assign/providers/helper.ts b/src/addon/mod/assign/providers/helper.ts
index a634e520c..d89d14c97 100644
--- a/src/addon/mod/assign/providers/helper.ts
+++ b/src/addon/mod/assign/providers/helper.ts
@@ -21,7 +21,10 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreFileUploaderProvider } from '@core/fileuploader/providers/fileuploader';
 import { AddonModAssignFeedbackDelegate } from './feedback-delegate';
 import { AddonModAssignSubmissionDelegate } from './submission-delegate';
-import { AddonModAssignProvider } from './assign';
+import {
+    AddonModAssignProvider, AddonModAssignAssign, AddonModAssignSubmission, AddonModAssignParticipant,
+    AddonModAssignSubmissionFeedback
+} from './assign';
 import { AddonModAssignOfflineProvider } from './assign-offline';
 
 /**
@@ -46,7 +49,7 @@ export class AddonModAssignHelperProvider {
      * @param submission Submission.
      * @return Whether it can be edited offline.
      */
-    canEditSubmissionOffline(assign: any, submission: any): Promise<boolean> {
+    canEditSubmissionOffline(assign: AddonModAssignAssign, submission: AddonModAssignSubmission): Promise<boolean> {
         if (!submission) {
             return Promise.resolve(false);
         }
@@ -81,7 +84,7 @@ export class AddonModAssignHelperProvider {
      * @param submission Submission to clear the data for.
      * @param inputData Data entered in the submission form.
      */
-    clearSubmissionPluginTmpData(assign: any, submission: any, inputData: any): void {
+    clearSubmissionPluginTmpData(assign: AddonModAssignAssign, submission: AddonModAssignSubmission, inputData: any): void {
         submission.plugins.forEach((plugin) => {
             this.submissionDelegate.clearTmpData(assign, submission, plugin, inputData);
         });
@@ -95,7 +98,7 @@ export class AddonModAssignHelperProvider {
      * @param previousSubmission Submission to copy.
      * @return Promise resolved when done.
      */
-    copyPreviousAttempt(assign: any, previousSubmission: any): Promise<any> {
+    copyPreviousAttempt(assign: AddonModAssignAssign, previousSubmission: AddonModAssignSubmission): Promise<any> {
         const pluginData = {},
             promises = [];
 
@@ -112,6 +115,36 @@ export class AddonModAssignHelperProvider {
         });
     }
 
+    /**
+     * Create an empty feedback object.
+     *
+     * @return Feedback.
+     */
+    createEmptyFeedback(): AddonModAssignSubmissionFeedback {
+        return {
+            grade: undefined,
+            gradefordisplay: undefined,
+            gradeddate: undefined
+        };
+    }
+
+    /**
+     * Create an empty submission object.
+     *
+     * @return Submission.
+     */
+    createEmptySubmission(): AddonModAssignSubmissionFormatted {
+        return {
+            id: undefined,
+            userid: undefined,
+            attemptnumber: undefined,
+            timecreated: undefined,
+            timemodified: undefined,
+            status: undefined,
+            groupid: undefined
+        };
+    }
+
     /**
      * Delete stored submission files for a plugin. See storeSubmissionFiles.
      *
@@ -136,7 +169,9 @@ export class AddonModAssignHelperProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    discardFeedbackPluginData(assignId: number, userId: number, feedback: any, siteId?: string): Promise<any> {
+    discardFeedbackPluginData(assignId: number, userId: number, feedback: AddonModAssignSubmissionFeedback,
+            siteId?: string): Promise<any> {
+
         const promises = [];
 
         feedback.plugins.forEach((plugin) => {
@@ -155,7 +190,9 @@ export class AddonModAssignHelperProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the list of participants and summary of submissions.
      */
-    getParticipants(assign: any, groupId?: number, ignoreCache?: boolean, siteId?: string): Promise<any[]> {
+    getParticipants(assign: AddonModAssignAssign, groupId?: number, ignoreCache?: boolean, siteId?: string)
+            : Promise<AddonModAssignParticipant[]> {
+
         groupId = groupId || 0;
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
 
@@ -167,7 +204,7 @@ export class AddonModAssignHelperProvider {
             // If no participants returned and all groups specified, get participants by groups.
             return this.groupsProvider.getActivityGroupInfo(assign.cmid, false, undefined, siteId).then((info) => {
                 const promises = [],
-                    participants = {};
+                    participants: {[id: number]: AddonModAssignParticipant} = {};
 
                 info.groups.forEach((userGroup) => {
                     promises.push(this.assignProvider.listParticipants(assign.id, userGroup.id, ignoreCache, siteId)
@@ -194,8 +231,8 @@ export class AddonModAssignHelperProvider {
      * @param type Name of the subplugin.
      * @return Object containing all configurations of the subplugin selected.
      */
-    getPluginConfig(assign: any, subtype: string, type: string): any {
-        const configs = {};
+    getPluginConfig(assign: AddonModAssignAssign, subtype: string, type: string): {[name: string]: string} {
+        const configs: {[name: string]: string} = {};
 
         assign.configs.forEach((config) => {
             if (config.subtype == subtype && config.plugin == type) {
@@ -213,7 +250,7 @@ export class AddonModAssignHelperProvider {
      * @param subtype Subtype name (assignsubmission or assignfeedback)
      * @return List of enabled plugins for the assign.
      */
-    getPluginsEnabled(assign: any, subtype: string): any[] {
+    getPluginsEnabled(assign: AddonModAssignAssign, subtype: string): any[] {
         const enabled = [];
 
         assign.configs.forEach((config) => {
@@ -250,7 +287,7 @@ export class AddonModAssignHelperProvider {
      * @param previousSubmission Submission to copy.
      * @return Promise resolved with the size.
      */
-    getSubmissionSizeForCopy(assign: any, previousSubmission: any): Promise<number> {
+    getSubmissionSizeForCopy(assign: AddonModAssignAssign, previousSubmission: AddonModAssignSubmission): Promise<number> {
         const promises = [];
         let totalSize = 0;
 
@@ -273,7 +310,8 @@ export class AddonModAssignHelperProvider {
      * @param inputData Data entered in the submission form.
      * @return Promise resolved with the size.
      */
-    getSubmissionSizeForEdit(assign: any, submission: any, inputData: any): Promise<number> {
+    getSubmissionSizeForEdit(assign: AddonModAssignAssign, submission: AddonModAssignSubmission, inputData: any): Promise<number> {
+
         const promises = [];
         let totalSize = 0;
 
@@ -298,14 +336,14 @@ export class AddonModAssignHelperProvider {
      * @param siteId Site id (empty for current site).
      * @return Promise always resolved. Resolve param is the formatted submissions.
      */
-    getSubmissionsUserData(assign: any, submissions: any[], groupId?: number, ignoreCache?: boolean, siteId?: string):
-            Promise<any[]> {
-        return this.getParticipants(assign, groupId).then((participants) => {
+    getSubmissionsUserData(assign: AddonModAssignAssign, submissions: AddonModAssignSubmissionFormatted[], groupId?: number,
+            ignoreCache?: boolean, siteId?: string): Promise<AddonModAssignSubmissionFormatted[]> {
+
+        return this.getParticipants(assign, groupId).then((parts) => {
             const blind = assign.blindmarking && !assign.revealidentities;
             const promises = [];
-            const result = [];
-
-            participants = this.utils.arrayToObject(participants, 'id');
+            const result: AddonModAssignSubmissionFormatted[] = [];
+            const participants: {[id: number]: AddonModAssignParticipant} = this.utils.arrayToObject(parts, 'id');
 
             submissions.forEach((submission) => {
                 submission.submitid = submission.userid > 0 ? submission.userid : submission.blindid;
@@ -356,10 +394,10 @@ export class AddonModAssignHelperProvider {
 
             return Promise.all(promises).then(() => {
                 // Create a submission for each participant left in the list (the participants already treated were removed).
-                this.utils.objectToArray(participants).forEach((participant) => {
-                    const submission: any = {
-                        submitid: participant.id
-                    };
+                this.utils.objectToArray(participants).forEach((participant: AddonModAssignParticipant) => {
+                    const submission = this.createEmptySubmission();
+
+                    submission.submitid = participant.id;
 
                     if (!blind) {
                         submission.userid = participant.id;
@@ -390,17 +428,20 @@ export class AddonModAssignHelperProvider {
      * Check if the feedback data has changed for a certain submission and assign.
      *
      * @param assign Assignment.
-     * @param userId User Id.
+     * @param submission The submission.
      * @param feedback Feedback data.
+     * @param userId The user ID.
      * @return Promise resolved with true if data has changed, resolved with false otherwise.
      */
-    hasFeedbackDataChanged(assign: any, userId: number, feedback: any): Promise<boolean> {
+    hasFeedbackDataChanged(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            feedback: AddonModAssignSubmissionFeedback, userId: number): Promise<boolean> {
+
         const promises = [];
         let hasChanged = false;
 
         feedback.plugins.forEach((plugin) => {
             promises.push(this.prepareFeedbackPluginData(assign.id, userId, feedback).then((inputData) => {
-                return this.feedbackDelegate.hasPluginDataChanged(assign, userId, plugin, inputData, userId).then((changed) => {
+                return this.feedbackDelegate.hasPluginDataChanged(assign, submission, plugin, inputData, userId).then((changed) => {
                     if (changed) {
                         hasChanged = true;
                     }
@@ -423,7 +464,9 @@ export class AddonModAssignHelperProvider {
      * @param inputData Data entered in the submission form.
      * @return Promise resolved with true if data has changed, resolved with false otherwise.
      */
-    hasSubmissionDataChanged(assign: any, submission: any, inputData: any): Promise<boolean> {
+    hasSubmissionDataChanged(assign: AddonModAssignAssign, submission: AddonModAssignSubmission, inputData: any)
+            : Promise<boolean> {
+
         const promises = [];
         let hasChanged = false;
 
@@ -451,7 +494,9 @@ export class AddonModAssignHelperProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with plugin data to send to server.
      */
-    prepareFeedbackPluginData(assignId: number, userId: number, feedback: any, siteId?: string): Promise<any> {
+    prepareFeedbackPluginData(assignId: number, userId: number, feedback: AddonModAssignSubmissionFeedback, siteId?: string)
+            : Promise<any> {
+
         const pluginData = {},
             promises = [];
 
@@ -473,7 +518,9 @@ export class AddonModAssignHelperProvider {
      * @param offline True to prepare the data for an offline submission, false otherwise.
      * @return Promise resolved with plugin data to send to server.
      */
-    prepareSubmissionPluginData(assign: any, submission: any, inputData: any, offline?: boolean): Promise<any> {
+    prepareSubmissionPluginData(assign: AddonModAssignAssign, submission: AddonModAssignSubmission, inputData: any,
+            offline?: boolean): Promise<any> {
+
         const pluginData = {},
             promises = [];
 
@@ -553,3 +600,16 @@ export class AddonModAssignHelperProvider {
         }
     }
 }
+
+/**
+ * Assign submission with some calculated data.
+ */
+export type AddonModAssignSubmissionFormatted = AddonModAssignSubmission & {
+    blindid?: number; // Calculated in the app. Blindid of the user that did the submission.
+    submitid?: number; // Calculated in the app. Userid or blindid of the user that did the submission.
+    userfullname?: string; // Calculated in the app. Full name of the user that did the submission.
+    userprofileimageurl?: string; // Calculated in the app. Avatar of the user that did the submission.
+    manyGroups?: boolean; // Calculated in the app. Whether the user belongs to more than 1 group.
+    noGroups?: boolean; // Calculated in the app. Whether the user doesn't belong to any group.
+    groupname?: string; // Calculated in the app. Name of the group the submission belongs to.
+};
diff --git a/src/addon/mod/assign/providers/prefetch-handler.ts b/src/addon/mod/assign/providers/prefetch-handler.ts
index 284d558ab..228e8e5ad 100644
--- a/src/addon/mod/assign/providers/prefetch-handler.ts
+++ b/src/addon/mod/assign/providers/prefetch-handler.ts
@@ -26,8 +26,8 @@ import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseHelperProvider } from '@core/course/providers/helper';
 import { CoreGradesHelperProvider } from '@core/grades/providers/helper';
 import { CoreUserProvider } from '@core/user/providers/user';
-import { AddonModAssignProvider } from './assign';
-import { AddonModAssignHelperProvider } from './helper';
+import { AddonModAssignProvider, AddonModAssignGetSubmissionStatusResult, AddonModAssignSubmission } from './assign';
+import { AddonModAssignHelperProvider, AddonModAssignSubmissionFormatted } from './helper';
 import { AddonModAssignSyncProvider } from './assign-sync';
 import { AddonModAssignFeedbackDelegate } from './feedback-delegate';
 import { AddonModAssignSubmissionDelegate } from './submission-delegate';
@@ -106,7 +106,7 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
                 if (data.canviewsubmissions) {
                     // Teacher, get all submissions.
                     return this.assignHelper.getSubmissionsUserData(assign, data.submissions, 0, false, siteId)
-                            .then((submissions) => {
+                            .then((submissions: AddonModAssignSubmissionFormatted[]) => {
 
                         const promises = [];
 
@@ -161,9 +161,10 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
         return this.assignProvider.getSubmissionStatusWithRetry(assign, submitId, undefined, blindMarking, true, false, siteId)
                 .then((response) => {
             const promises = [];
+            let userSubmission: AddonModAssignSubmission;
 
             if (response.lastattempt) {
-                const userSubmission = this.assignProvider.getSubmissionObjectFromAttempt(assign, response.lastattempt);
+                userSubmission = this.assignProvider.getSubmissionObjectFromAttempt(assign, response.lastattempt);
                 if (userSubmission && userSubmission.plugins) {
                     // Add submission plugin files.
                     userSubmission.plugins.forEach((plugin) => {
@@ -175,7 +176,7 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
             if (response.feedback && response.feedback.plugins) {
                 // Add feedback plugin files.
                 response.feedback.plugins.forEach((plugin) => {
-                    promises.push(this.feedbackDelegate.getPluginFiles(assign, response, plugin, siteId));
+                    promises.push(this.feedbackDelegate.getPluginFiles(assign, userSubmission, plugin, siteId));
                 });
             }
 
@@ -303,7 +304,7 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
 
                     groupInfo.groups.forEach((group) => {
                         groupProms.push(this.assignHelper.getSubmissionsUserData(assign, data.submissions, group.id, true, siteId)
-                                .then((submissions) => {
+                                .then((submissions: AddonModAssignSubmissionFormatted[]) => {
 
                             const subPromises = [];
 
@@ -327,7 +328,8 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
                             }
 
                             // Prefetch the submission of the current user even if it does not exist, this will be create it.
-                            if (!data.submissions || !data.submissions.find((subm) => subm.submitid == userId)) {
+                            if (!data.submissions ||
+                                    !data.submissions.find((subm: AddonModAssignSubmissionFormatted) => subm.submitid == userId)) {
                                 subPromises.push(this.assignProvider.getSubmissionStatusWithRetry(assign, userId, group.id,
                                         false, true, true, siteId).then((subm) => {
                                     return this.prefetchSubmission(assign, courseId, moduleId, subm, userId, siteId);
@@ -385,15 +387,16 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when prefetched, rejected otherwise.
      */
-    protected prefetchSubmission(assign: any, courseId: number, moduleId: number, submission: any, userId?: number,
-            siteId?: string): Promise<any> {
+    protected prefetchSubmission(assign: any, courseId: number, moduleId: number,
+            submission: AddonModAssignGetSubmissionStatusResult, userId?: number, siteId?: string): Promise<any> {
 
         const promises = [],
             blindMarking = assign.blindmarking && !assign.revealidentities;
-        let userIds = [];
+        let userIds = [],
+            userSubmission: AddonModAssignSubmission;
 
         if (submission.lastattempt) {
-            const userSubmission = this.assignProvider.getSubmissionObjectFromAttempt(assign, submission.lastattempt);
+            userSubmission = this.assignProvider.getSubmissionObjectFromAttempt(assign, submission.lastattempt);
 
             // Get IDs of the members who need to submit.
             if (!blindMarking && submission.lastattempt.submissiongroupmemberswhoneedtosubmit) {
@@ -440,10 +443,10 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
             if (submission.feedback.plugins) {
                 submission.feedback.plugins.forEach((plugin) => {
                     // Prefetch the plugin WS data.
-                    promises.push(this.feedbackDelegate.prefetch(assign, submission, plugin, siteId));
+                    promises.push(this.feedbackDelegate.prefetch(assign, userSubmission, plugin, siteId));
 
                     // Prefetch the plugin files.
-                    promises.push(this.feedbackDelegate.getPluginFiles(assign, submission, plugin, siteId).then((files) => {
+                    promises.push(this.feedbackDelegate.getPluginFiles(assign, userSubmission, plugin, siteId).then((files) => {
                         return this.filepoolProvider.addFilesToQueue(siteId, files, this.component, module.id);
                     }).catch(() => {
                         // Ignore errors.
diff --git a/src/addon/mod/assign/providers/submission-delegate.ts b/src/addon/mod/assign/providers/submission-delegate.ts
index 70c8e9752..7b65d55ce 100644
--- a/src/addon/mod/assign/providers/submission-delegate.ts
+++ b/src/addon/mod/assign/providers/submission-delegate.ts
@@ -18,6 +18,7 @@ import { CoreEventsProvider } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreDelegate, CoreDelegateHandler } from '@classes/delegate';
 import { AddonModAssignDefaultSubmissionHandler } from './default-submission-handler';
+import { AddonModAssignAssign, AddonModAssignSubmission, AddonModAssignPlugin } from './assign';
 
 /**
  * Interface that all submission handlers must implement.
@@ -39,7 +40,8 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
      * @param plugin The plugin object.
      * @return Boolean or promise resolved with boolean: whether it can be edited in offline.
      */
-    canEditOffline?(assign: any, submission: any, plugin: any): boolean | Promise<boolean>;
+    canEditOffline?(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin): boolean | Promise<boolean>;
 
     /**
      * Should clear temporary data for a cancelled submission.
@@ -49,7 +51,8 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
      * @param plugin The plugin object.
      * @param inputData Data entered by the user for the submission.
      */
-    clearTmpData?(assign: any, submission: any, plugin: any, inputData: any): void;
+    clearTmpData?(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any): void;
 
     /**
      * This function will be called when the user wants to create a new submission based on the previous one.
@@ -62,7 +65,8 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    copySubmissionData?(assign: any, plugin: any, pluginData: any, userId?: number, siteId?: string): void | Promise<any>;
+    copySubmissionData?(assign: AddonModAssignAssign, plugin: AddonModAssignPlugin, pluginData: any,
+            userId?: number, siteId?: string): void | Promise<any>;
 
     /**
      * Delete any stored data for the plugin and submission.
@@ -74,7 +78,8 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    deleteOfflineData?(assign: any, submission: any, plugin: any, offlineData: any, siteId?: string): void | Promise<any>;
+    deleteOfflineData?(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, offlineData: any, siteId?: string): void | Promise<any>;
 
     /**
      * Return the Component to use to display the plugin data, either in read or in edit mode.
@@ -85,7 +90,7 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
      * @param edit Whether the user is editing.
      * @return The component (or promise resolved with component) to use, undefined if not found.
      */
-    getComponent?(injector: Injector, plugin: any, edit?: boolean): any | Promise<any>;
+    getComponent?(injector: Injector, plugin: AddonModAssignPlugin, edit?: boolean): any | Promise<any>;
 
     /**
      * Get files used by this plugin.
@@ -97,7 +102,8 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
      * @param siteId Site ID. If not defined, current site.
      * @return The files (or promise resolved with the files).
      */
-    getPluginFiles?(assign: any, submission: any, plugin: any, siteId?: string): any[] | Promise<any[]>;
+    getPluginFiles?(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, siteId?: string): any[] | Promise<any[]>;
 
     /**
      * Get a readable name to use for the plugin.
@@ -105,7 +111,7 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
      * @param plugin The plugin object.
      * @return The plugin name.
      */
-    getPluginName?(plugin: any): string;
+    getPluginName?(plugin: AddonModAssignPlugin): string;
 
     /**
      * Get the size of data (in bytes) this plugin will send to copy a previous submission.
@@ -114,7 +120,7 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
      * @param plugin The plugin object.
      * @return The size (or promise resolved with size).
      */
-    getSizeForCopy?(assign: any, plugin: any): number | Promise<number>;
+    getSizeForCopy?(assign: AddonModAssignAssign, plugin: AddonModAssignPlugin): number | Promise<number>;
 
     /**
      * Get the size of data (in bytes) this plugin will send to add or edit a submission.
@@ -125,7 +131,8 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
      * @param inputData Data entered by the user for the submission.
      * @return The size (or promise resolved with size).
      */
-    getSizeForEdit?(assign: any, submission: any, plugin: any, inputData: any): number | Promise<number>;
+    getSizeForEdit?(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any): number | Promise<number>;
 
     /**
      * Check if the submission data has changed for this plugin.
@@ -136,7 +143,8 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
      * @param inputData Data entered by the user for the submission.
      * @return Boolean (or promise resolved with boolean): whether the data has changed.
      */
-    hasDataChanged?(assign: any, submission: any, plugin: any, inputData: any): boolean | Promise<boolean>;
+    hasDataChanged?(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any): boolean | Promise<boolean>;
 
     /**
      * Whether or not the handler is enabled for edit on a site level.
@@ -155,7 +163,8 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    prefetch?(assign: any, submission: any, plugin: any, siteId?: string): Promise<any>;
+    prefetch?(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, siteId?: string): Promise<any>;
 
     /**
      * Prepare and add to pluginData the data to send to the server based on the input data.
@@ -170,8 +179,9 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    prepareSubmissionData?(assign: any, submission: any, plugin: any, inputData: any, pluginData: any, offline?: boolean,
-        userId?: number, siteId?: string): void | Promise<any>;
+    prepareSubmissionData?(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any, pluginData: any, offline?: boolean,
+            userId?: number, siteId?: string): void | Promise<any>;
 
     /**
      * Prepare and add to pluginData the data to send to the server based on the offline data stored.
@@ -185,8 +195,8 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    prepareSyncData?(assign: any, submission: any, plugin: any, offlineData: any, pluginData: any, siteId?: string)
-        : void | Promise<any>;
+    prepareSyncData?(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, offlineData: any, pluginData: any, siteId?: string): void | Promise<any>;
 }
 
 /**
@@ -210,7 +220,8 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
      * @param plugin The plugin object.
      * @return Promise resolved with boolean: whether it can be edited in offline.
      */
-    canPluginEditOffline(assign: any, submission: any, plugin: any): Promise<boolean> {
+    canPluginEditOffline(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin): Promise<boolean> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'canEditOffline', [assign, submission, plugin]));
     }
 
@@ -222,7 +233,8 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
      * @param plugin The plugin object.
      * @param inputData Data entered by the user for the submission.
      */
-    clearTmpData(assign: any, submission: any, plugin: any, inputData: any): void {
+    clearTmpData(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any): void {
         return this.executeFunctionOnEnabled(plugin.type, 'clearTmpData', [assign, submission, plugin, inputData]);
     }
 
@@ -236,7 +248,8 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the data has been copied.
      */
-    copyPluginSubmissionData(assign: any, plugin: any, pluginData: any, userId?: number, siteId?: string): void | Promise<any> {
+    copyPluginSubmissionData(assign: AddonModAssignAssign, plugin: AddonModAssignPlugin, pluginData: any,
+            userId?: number, siteId?: string): void | Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'copySubmissionData',
                 [assign, plugin, pluginData, userId, siteId]));
     }
@@ -251,7 +264,8 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    deletePluginOfflineData(assign: any, submission: any, plugin: any, offlineData: any, siteId?: string): Promise<any> {
+    deletePluginOfflineData(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, offlineData: any, siteId?: string): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'deleteOfflineData',
                 [assign, submission, plugin, offlineData, siteId]));
     }
@@ -264,7 +278,7 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
      * @param edit Whether the user is editing.
      * @return Promise resolved with the component to use, undefined if not found.
      */
-    getComponentForPlugin(injector: Injector, plugin: any, edit?: boolean): Promise<any> {
+    getComponentForPlugin(injector: Injector, plugin: AddonModAssignPlugin, edit?: boolean): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'getComponent', [injector, plugin, edit]));
     }
 
@@ -278,7 +292,8 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the files.
      */
-    getPluginFiles(assign: any, submission: any, plugin: any, siteId?: string): Promise<any[]> {
+    getPluginFiles(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, siteId?: string): Promise<any[]> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'getPluginFiles', [assign, submission, plugin, siteId]));
     }
 
@@ -288,7 +303,7 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
      * @param plugin Plugin to get the name for.
      * @return Human readable name.
      */
-    getPluginName(plugin: any): string {
+    getPluginName(plugin: AddonModAssignPlugin): string {
         return this.executeFunctionOnEnabled(plugin.type, 'getPluginName', [plugin]);
     }
 
@@ -299,7 +314,7 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
      * @param plugin The plugin object.
      * @return Promise resolved with size.
      */
-    getPluginSizeForCopy(assign: any, plugin: any): Promise<number> {
+    getPluginSizeForCopy(assign: AddonModAssignAssign, plugin: AddonModAssignPlugin): Promise<number> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'getSizeForCopy', [assign, plugin]));
     }
 
@@ -312,7 +327,8 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
      * @param inputData Data entered by the user for the submission.
      * @return Promise resolved with size.
      */
-    getPluginSizeForEdit(assign: any, submission: any, plugin: any, inputData: any): Promise<number> {
+    getPluginSizeForEdit(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any): Promise<number> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'getSizeForEdit',
                 [assign, submission, plugin, inputData]));
     }
@@ -326,7 +342,8 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
      * @param inputData Data entered by the user for the submission.
      * @return Promise resolved with true if data has changed, resolved with false otherwise.
      */
-    hasPluginDataChanged(assign: any, submission: any, plugin: any, inputData: any): Promise<boolean> {
+    hasPluginDataChanged(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any): Promise<boolean> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'hasDataChanged',
                 [assign, submission, plugin, inputData]));
     }
@@ -360,7 +377,8 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    prefetch(assign: any, submission: any, plugin: any, siteId?: string): Promise<any> {
+    prefetch(assign: AddonModAssignAssign, submission: AddonModAssignSubmission, plugin: AddonModAssignPlugin,
+            siteId?: string): Promise<any> {
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'prefetch', [assign, submission, plugin, siteId]));
     }
 
@@ -377,8 +395,9 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when data has been gathered.
      */
-    preparePluginSubmissionData(assign: any, submission: any, plugin: any, inputData: any, pluginData: any, offline?: boolean,
-            userId?: number, siteId?: string): Promise<any> {
+    preparePluginSubmissionData(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any, pluginData: any, offline?: boolean, userId?: number,
+            siteId?: string): Promise<any> {
 
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'prepareSubmissionData',
                 [assign, submission, plugin, inputData, pluginData, offline, userId, siteId]));
@@ -395,8 +414,8 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when data has been gathered.
      */
-    preparePluginSyncData(assign: any, submission: any, plugin: any, offlineData: any, pluginData: any, siteId?: string)
-            : Promise<any> {
+    preparePluginSyncData(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, offlineData: any, pluginData: any, siteId?: string): Promise<any> {
 
         return Promise.resolve(this.executeFunctionOnEnabled(plugin.type, 'prepareSyncData',
                 [assign, submission, plugin, offlineData, pluginData, siteId]));
diff --git a/src/addon/mod/assign/submission/comments/providers/handler.ts b/src/addon/mod/assign/submission/comments/providers/handler.ts
index 54f450df5..a608d2132 100644
--- a/src/addon/mod/assign/submission/comments/providers/handler.ts
+++ b/src/addon/mod/assign/submission/comments/providers/handler.ts
@@ -17,6 +17,9 @@ import { Injectable, Injector } from '@angular/core';
 import { CoreCommentsProvider } from '@core/comments/providers/comments';
 import { AddonModAssignSubmissionHandler } from '../../../providers/submission-delegate';
 import { AddonModAssignSubmissionCommentsComponent } from '../component/comments';
+import {
+    AddonModAssignAssign, AddonModAssignSubmission, AddonModAssignPlugin
+} from '../../../providers/assign';
 
 /**
  * Handler for comments submission plugin.
@@ -38,7 +41,8 @@ export class AddonModAssignSubmissionCommentsHandler implements AddonModAssignSu
      * @param plugin The plugin object.
      * @return Boolean or promise resolved with boolean: whether it can be edited in offline.
      */
-    canEditOffline(assign: any, submission: any, plugin: any): boolean | Promise<boolean> {
+    canEditOffline(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin): boolean | Promise<boolean> {
         // This plugin is read only, but return true to prevent blocking the edition.
         return true;
     }
@@ -52,7 +56,7 @@ export class AddonModAssignSubmissionCommentsHandler implements AddonModAssignSu
      * @param edit Whether the user is editing.
      * @return The component (or promise resolved with component) to use, undefined if not found.
      */
-    getComponent(injector: Injector, plugin: any, edit?: boolean): any | Promise<any> {
+    getComponent(injector: Injector, plugin: AddonModAssignPlugin, edit?: boolean): any | Promise<any> {
         return edit ? undefined : AddonModAssignSubmissionCommentsComponent;
     }
 
@@ -84,7 +88,9 @@ export class AddonModAssignSubmissionCommentsHandler implements AddonModAssignSu
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    prefetch(assign: any, submission: any, plugin: any, siteId?: string): Promise<any> {
+    prefetch(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, siteId?: string): Promise<any> {
+
         return this.commentsProvider.getComments('module', assign.cmid, 'assignsubmission_comments', submission.id,
                 'submission_comments', 0, siteId).catch(() => {
             // Fail silently (Moodle < 3.1.1, 3.2)
diff --git a/src/addon/mod/assign/submission/file/providers/handler.ts b/src/addon/mod/assign/submission/file/providers/handler.ts
index 57a4a70bf..7fe7388dc 100644
--- a/src/addon/mod/assign/submission/file/providers/handler.ts
+++ b/src/addon/mod/assign/submission/file/providers/handler.ts
@@ -21,7 +21,9 @@ import { CoreSitesProvider } from '@providers/sites';
 import { CoreWSProvider } from '@providers/ws';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreFileUploaderProvider } from '@core/fileuploader/providers/fileuploader';
-import { AddonModAssignProvider } from '../../../providers/assign';
+import {
+    AddonModAssignProvider, AddonModAssignAssign, AddonModAssignSubmission, AddonModAssignPlugin
+} from '../../../providers/assign';
 import { AddonModAssignOfflineProvider } from '../../../providers/assign-offline';
 import { AddonModAssignHelperProvider } from '../../../providers/helper';
 import { AddonModAssignSubmissionHandler } from '../../../providers/submission-delegate';
@@ -53,7 +55,8 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
      * @param plugin The plugin object.
      * @return Boolean or promise resolved with boolean: whether it can be edited in offline.
      */
-    canEditOffline(assign: any, submission: any, plugin: any): boolean | Promise<boolean> {
+    canEditOffline(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin): boolean | Promise<boolean> {
         // This plugin doesn't use Moodle filters, it can be edited in offline.
         return true;
     }
@@ -66,7 +69,8 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
      * @param plugin The plugin object.
      * @param inputData Data entered by the user for the submission.
      */
-    clearTmpData(assign: any, submission: any, plugin: any, inputData: any): void {
+    clearTmpData(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any): void {
         const files = this.fileSessionProvider.getFiles(AddonModAssignProvider.COMPONENT, assign.id);
 
         // Clear the files in session for this assign.
@@ -87,7 +91,9 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    copySubmissionData(assign: any, plugin: any, pluginData: any, userId?: number, siteId?: string): void | Promise<any> {
+    copySubmissionData(assign: AddonModAssignAssign, plugin: AddonModAssignPlugin, pluginData: any,
+            userId?: number, siteId?: string): void | Promise<any> {
+
         // We need to re-upload all the existing files.
         const files = this.assignProvider.getSubmissionPluginAttachments(plugin);
 
@@ -105,7 +111,7 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
      * @param edit Whether the user is editing.
      * @return The component (or promise resolved with component) to use, undefined if not found.
      */
-    getComponent(injector: Injector, plugin: any, edit?: boolean): any | Promise<any> {
+    getComponent(injector: Injector, plugin: AddonModAssignPlugin, edit?: boolean): any | Promise<any> {
         return AddonModAssignSubmissionFileComponent;
     }
 
@@ -119,7 +125,9 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    deleteOfflineData(assign: any, submission: any, plugin: any, offlineData: any, siteId?: string): void | Promise<any> {
+    deleteOfflineData(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, offlineData: any, siteId?: string): void | Promise<any> {
+
         return this.assignHelper.deleteStoredSubmissionFiles(assign.id, AddonModAssignSubmissionFileHandler.FOLDER_NAME,
                 submission.userid, siteId).catch(() => {
             // Ignore errors, maybe the folder doesn't exist.
@@ -136,7 +144,8 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
      * @param siteId Site ID. If not defined, current site.
      * @return The files (or promise resolved with the files).
      */
-    getPluginFiles(assign: any, submission: any, plugin: any, siteId?: string): any[] | Promise<any[]> {
+    getPluginFiles(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, siteId?: string): any[] | Promise<any[]> {
         return this.assignProvider.getSubmissionPluginAttachments(plugin);
     }
 
@@ -147,7 +156,7 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
      * @param plugin The plugin object.
      * @return The size (or promise resolved with size).
      */
-    getSizeForCopy(assign: any, plugin: any): number | Promise<number> {
+    getSizeForCopy(assign: AddonModAssignAssign, plugin: AddonModAssignPlugin): number | Promise<number> {
         const files = this.assignProvider.getSubmissionPluginAttachments(plugin),
             promises = [];
         let totalSize = 0;
@@ -177,7 +186,8 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
      * @param inputData Data entered by the user for the submission.
      * @return The size (or promise resolved with size).
      */
-    getSizeForEdit(assign: any, submission: any, plugin: any, inputData: any): number | Promise<number> {
+    getSizeForEdit(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any): number | Promise<number> {
         const siteId = this.sitesProvider.getCurrentSiteId();
 
         // Check if there's any change.
@@ -232,7 +242,9 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
      * @param inputData Data entered by the user for the submission.
      * @return Boolean (or promise resolved with boolean): whether the data has changed.
      */
-    hasDataChanged(assign: any, submission: any, plugin: any, inputData: any): boolean | Promise<boolean> {
+    hasDataChanged(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any): boolean | Promise<boolean> {
+
         // Check if there's any offline data.
         return this.assignOfflineProvider.getSubmission(assign.id, submission.userid).catch(() => {
             // No offline data found.
@@ -299,7 +311,8 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    prepareSubmissionData(assign: any, submission: any, plugin: any, inputData: any, pluginData: any, offline?: boolean,
+    prepareSubmissionData(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any, pluginData: any, offline?: boolean,
             userId?: number, siteId?: string): void | Promise<any> {
 
         if (this.hasDataChanged(assign, submission, plugin, inputData)) {
@@ -330,8 +343,8 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    prepareSyncData(assign: any, submission: any, plugin: any, offlineData: any, pluginData: any, siteId?: string)
-            : void | Promise<any> {
+    prepareSyncData(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, offlineData: any, pluginData: any, siteId?: string): void | Promise<any> {
 
         const filesData = offlineData && offlineData.plugindata && offlineData.plugindata.files_filemanager;
         if (filesData) {
diff --git a/src/addon/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html b/src/addon/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
index a231c0cfa..5d2565e06 100644
--- a/src/addon/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
+++ b/src/addon/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
@@ -10,7 +10,7 @@
 <!-- Edit -->
 <div *ngIf="edit && loaded">
     <ion-item-divider text-wrap>{{ plugin.name }}</ion-item-divider>
-    <ion-item text-wrap *ngIf="configs.wordlimitenabled && words >= 0">
+    <ion-item text-wrap *ngIf="wordLimitEnabled && words >= 0">
         <h2>{{ 'addon.mod_assign.wordlimit' | translate }}</h2>
         <p>{{ 'core.numwords' | translate: {'$a': words + ' / ' + configs.wordlimit} }}</p>
     </ion-item>
diff --git a/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts b/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts
index 25b0cd5e6..b5c6d4045 100644
--- a/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts
+++ b/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts
@@ -34,6 +34,7 @@ export class AddonModAssignSubmissionOnlineTextComponent extends AddonModAssignS
     component = AddonModAssignProvider.COMPONENT;
     text: string;
     loaded: boolean;
+    wordLimitEnabled: boolean;
 
     protected wordCountTimeout: any;
     protected element: HTMLElement;
@@ -61,9 +62,7 @@ export class AddonModAssignSubmissionOnlineTextComponent extends AddonModAssignS
             // No offline data found, return online text.
             return this.assignProvider.getSubmissionPluginText(this.plugin);
         }).then((text) => {
-            // We receive them as strings, convert to int.
-            this.configs.wordlimit = parseInt(this.configs.wordlimit, 10);
-            this.configs.wordlimitenabled = parseInt(this.configs.wordlimitenabled, 10);
+            this.wordLimitEnabled = !!parseInt(this.configs.wordlimitenabled, 10);
 
             // Set the text.
             this.text = text;
@@ -85,7 +84,7 @@ export class AddonModAssignSubmissionOnlineTextComponent extends AddonModAssignS
             }
 
             // Calculate initial words.
-            if (this.configs.wordlimitenabled) {
+            if (this.wordLimitEnabled) {
                 this.words = this.textUtils.countWords(text);
             }
         }).finally(() => {
@@ -100,7 +99,7 @@ export class AddonModAssignSubmissionOnlineTextComponent extends AddonModAssignS
      */
     onChange(text: string): void {
         // Count words if needed.
-        if (this.configs.wordlimitenabled) {
+        if (this.wordLimitEnabled) {
             // Cancel previous wait.
             clearTimeout(this.wordCountTimeout);
 
diff --git a/src/addon/mod/assign/submission/onlinetext/providers/handler.ts b/src/addon/mod/assign/submission/onlinetext/providers/handler.ts
index dd4b847a4..69a84b85e 100644
--- a/src/addon/mod/assign/submission/onlinetext/providers/handler.ts
+++ b/src/addon/mod/assign/submission/onlinetext/providers/handler.ts
@@ -18,7 +18,9 @@ import { TranslateService } from '@ngx-translate/core';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreWSProvider } from '@providers/ws';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
-import { AddonModAssignProvider } from '../../../providers/assign';
+import {
+    AddonModAssignProvider, AddonModAssignAssign, AddonModAssignSubmission, AddonModAssignPlugin
+} from '../../../providers/assign';
 import { AddonModAssignOfflineProvider } from '../../../providers/assign-offline';
 import { AddonModAssignHelperProvider } from '../../../providers/helper';
 import { AddonModAssignSubmissionHandler } from '../../../providers/submission-delegate';
@@ -46,7 +48,8 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
      * @param plugin The plugin object.
      * @return Boolean or promise resolved with boolean: whether it can be edited in offline.
      */
-    canEditOffline(assign: any, submission: any, plugin: any): boolean | Promise<boolean> {
+    canEditOffline(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin): boolean | Promise<boolean> {
         // This plugin uses Moodle filters, it cannot be edited in offline.
         return false;
     }
@@ -62,7 +65,9 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    copySubmissionData(assign: any, plugin: any, pluginData: any, userId?: number, siteId?: string): void | Promise<any> {
+    copySubmissionData(assign: AddonModAssignAssign, plugin: AddonModAssignPlugin, pluginData: any,
+            userId?: number, siteId?: string): void | Promise<any> {
+
         const text = this.assignProvider.getSubmissionPluginText(plugin, true),
             files = this.assignProvider.getSubmissionPluginAttachments(plugin);
         let promise;
@@ -93,7 +98,7 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
      * @param edit Whether the user is editing.
      * @return The component (or promise resolved with component) to use, undefined if not found.
      */
-    getComponent(injector: Injector, plugin: any, edit?: boolean): any | Promise<any> {
+    getComponent(injector: Injector, plugin: AddonModAssignPlugin, edit?: boolean): any | Promise<any> {
         return AddonModAssignSubmissionOnlineTextComponent;
     }
 
@@ -107,7 +112,8 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
      * @param siteId Site ID. If not defined, current site.
      * @return The files (or promise resolved with the files).
      */
-    getPluginFiles(assign: any, submission: any, plugin: any, siteId?: string): any[] | Promise<any[]> {
+    getPluginFiles(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, siteId?: string): any[] | Promise<any[]> {
         return this.assignProvider.getSubmissionPluginAttachments(plugin);
     }
 
@@ -118,7 +124,7 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
      * @param plugin The plugin object.
      * @return The size (or promise resolved with size).
      */
-    getSizeForCopy(assign: any, plugin: any): number | Promise<number> {
+    getSizeForCopy(assign: AddonModAssignAssign, plugin: AddonModAssignPlugin): number | Promise<number> {
         const text = this.assignProvider.getSubmissionPluginText(plugin, true),
             files = this.assignProvider.getSubmissionPluginAttachments(plugin),
             promises = [];
@@ -153,7 +159,8 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
      * @param inputData Data entered by the user for the submission.
      * @return The size (or promise resolved with size).
      */
-    getSizeForEdit(assign: any, submission: any, plugin: any, inputData: any): number | Promise<number> {
+    getSizeForEdit(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any): number | Promise<number> {
         const text = this.assignProvider.getSubmissionPluginText(plugin, true);
 
         return text.length;
@@ -182,7 +189,9 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
      * @param inputData Data entered by the user for the submission.
      * @return Boolean (or promise resolved with boolean): whether the data has changed.
      */
-    hasDataChanged(assign: any, submission: any, plugin: any, inputData: any): boolean | Promise<boolean> {
+    hasDataChanged(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any): boolean | Promise<boolean> {
+
         // Get the original text from plugin or offline.
         return this.assignOfflineProvider.getSubmission(assign.id, submission.userid).catch(() => {
             // No offline data found.
@@ -234,7 +243,8 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    prepareSubmissionData(assign: any, submission: any, plugin: any, inputData: any, pluginData: any, offline?: boolean,
+    prepareSubmissionData(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, inputData: any, pluginData: any, offline?: boolean,
             userId?: number, siteId?: string): void | Promise<any> {
 
         let text = this.getTextToSubmit(plugin, inputData);
@@ -274,8 +284,8 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
      * @param siteId Site ID. If not defined, current site.
      * @return If the function is async, it should return a Promise resolved when done.
      */
-    prepareSyncData(assign: any, submission: any, plugin: any, offlineData: any, pluginData: any, siteId?: string)
-            : void | Promise<any> {
+    prepareSyncData(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
+            plugin: AddonModAssignPlugin, offlineData: any, pluginData: any, siteId?: string): void | Promise<any> {
 
         const textData = offlineData && offlineData.plugindata && offlineData.plugindata.onlinetext_editor;
         if (textData) {

From 334b28bda219e92402c0a8ba14c7371ed4e259f3 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 6 Sep 2019 13:08:36 +0200
Subject: [PATCH 018/257] MOBILE-3109 mod: Add return types to resources

---
 src/addon/mod/book/components/index/index.ts  |   2 +-
 src/addon/mod/book/providers/book.ts          | 104 ++++++++++++------
 .../mod/folder/components/index/index.ts      |  13 +--
 src/addon/mod/folder/providers/folder.ts      |  39 ++++++-
 src/addon/mod/imscp/components/index/index.ts |   2 +-
 src/addon/mod/imscp/providers/imscp.ts        |  38 ++++++-
 src/addon/mod/label/providers/label.ts        |  39 ++++++-
 src/addon/mod/page/components/index/index.ts  |   8 +-
 src/addon/mod/page/providers/page.ts          |  47 +++++++-
 .../mod/resource/providers/module-handler.ts  |   3 +-
 src/addon/mod/resource/providers/resource.ts  |  43 +++++++-
 src/addon/mod/url/providers/module-handler.ts |   5 +-
 src/addon/mod/url/providers/url.ts            |  41 ++++++-
 13 files changed, 310 insertions(+), 74 deletions(-)

diff --git a/src/addon/mod/book/components/index/index.ts b/src/addon/mod/book/components/index/index.ts
index 794d4970c..267c0343a 100644
--- a/src/addon/mod/book/components/index/index.ts
+++ b/src/addon/mod/book/components/index/index.ts
@@ -121,7 +121,7 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
         // Try to get the book data.
         promises.push(this.bookProvider.getBook(this.courseId, this.module.id).then((book) => {
             this.dataRetrieved.emit(book);
-            this.description = book.intro || this.description;
+            this.description = book.intro;
         }).catch(() => {
             // Ignore errors since this WS isn't available in some Moodle versions.
         }));
diff --git a/src/addon/mod/book/providers/book.ts b/src/addon/mod/book/providers/book.ts
index 1e97a6749..d1061ef65 100644
--- a/src/addon/mod/book/providers/book.ts
+++ b/src/addon/mod/book/providers/book.ts
@@ -25,38 +25,7 @@ import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseLogHelperProvider } from '@core/course/providers/log-helper';
 import { CoreSite } from '@classes/site';
 import { CoreTagItem } from '@core/tag/providers/tag';
-
-/**
- * A book chapter inside the toc list.
- */
-export interface AddonModBookTocChapter {
-    /**
-     * ID to identify the chapter.
-     */
-    id: string;
-
-    /**
-     * Chapter's title.
-     */
-    title: string;
-
-    /**
-     * The chapter's level.
-     */
-    level: number;
-}
-
-/**
- * Map of book contents. For each chapter it has its index URL and the list of paths of the files the chapter has. Each path
- * is identified by the relative path in the book, and the value is the URL of the file.
- */
-export type AddonModBookContentsMap = {
-    [chapter: string]: {
-        indexUrl?: string,
-        paths: {[path: string]: string},
-        tags?: CoreTagItem[]
-    }
-};
+import { CoreWSExternalWarning, CoreWSExternalFile } from '@providers/ws';
 
 /**
  * Service that provides some features for books.
@@ -83,7 +52,7 @@ export class AddonModBookProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the book is retrieved.
      */
-    getBook(courseId: number, cmId: number, siteId?: string): Promise<any> {
+    getBook(courseId: number, cmId: number, siteId?: string): Promise<AddonModBookBook> {
         return this.getBookByField(courseId, 'coursemodule', cmId, siteId);
     }
 
@@ -96,7 +65,7 @@ export class AddonModBookProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the book is retrieved.
      */
-    protected getBookByField(courseId: number, key: string, value: any, siteId?: string): Promise<any> {
+    protected getBookByField(courseId: number, key: string, value: any, siteId?: string): Promise<AddonModBookBook> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                     courseids: [courseId]
@@ -106,7 +75,9 @@ export class AddonModBookProvider {
                     updateFrequency: CoreSite.FREQUENCY_RARELY
                 };
 
-            return site.read('mod_book_get_books_by_courses', params, preSets).then((response) => {
+            return site.read('mod_book_get_books_by_courses', params, preSets)
+                    .then((response: AddonModBookGetBooksByCoursesResult): any => {
+
                 // Search the book.
                 if (response && response.books) {
                     for (const i in response.books) {
@@ -401,3 +372,66 @@ export class AddonModBookProvider {
                 {chapterid: chapterId}, siteId);
     }
 }
+
+/**
+ * A book chapter inside the toc list.
+ */
+export type AddonModBookTocChapter = {
+    /**
+     * ID to identify the chapter.
+     */
+    id: string;
+
+    /**
+     * Chapter's title.
+     */
+    title: string;
+
+    /**
+     * The chapter's level.
+     */
+    level: number;
+};
+
+/**
+ * Map of book contents. For each chapter it has its index URL and the list of paths of the files the chapter has. Each path
+ * is identified by the relative path in the book, and the value is the URL of the file.
+ */
+export type AddonModBookContentsMap = {
+    [chapter: string]: {
+        indexUrl?: string,
+        paths: {[path: string]: string},
+        tags?: CoreTagItem[]
+    }
+};
+
+/**
+ * Book returned by mod_book_get_books_by_courses.
+ */
+export type AddonModBookBook = {
+    id: number; // Book id.
+    coursemodule: number; // Course module id.
+    course: number; // Course id.
+    name: string; // Book name.
+    intro: string; // The Book intro.
+    introformat: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    introfiles?: CoreWSExternalFile[]; // @since 3.2.
+    numbering: number; // Book numbering configuration.
+    navstyle: number; // Book navigation style configuration.
+    customtitles: number; // Book custom titles type.
+    revision?: number; // Book revision.
+    timecreated?: number; // Time of creation.
+    timemodified?: number; // Time of last modification.
+    section?: number; // Course section id.
+    visible?: boolean; // Visible.
+    groupmode?: number; // Group mode.
+    groupingid?: number; // Group id.
+};
+
+/**
+ * Result of WS mod_book_get_books_by_courses.
+ */
+export type AddonModBookGetBooksByCoursesResult = {
+    books: AddonModBookBook[];
+    warnings?: CoreWSExternalWarning[];
+};
diff --git a/src/addon/mod/folder/components/index/index.ts b/src/addon/mod/folder/components/index/index.ts
index d23b70e38..dc9b246dd 100644
--- a/src/addon/mod/folder/components/index/index.ts
+++ b/src/addon/mod/folder/components/index/index.ts
@@ -34,6 +34,7 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
     component = AddonModFolderProvider.COMPONENT;
     canGetFolder: boolean;
     contents: any;
+    moduleContents: any;
 
     constructor(injector: Injector, private folderProvider: AddonModFolderProvider, private courseProvider: CoreCourseProvider,
             private appProvider: CoreAppProvider, private folderHelper: AddonModFolderHelperProvider) {
@@ -87,9 +88,9 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
 
         if (this.path) {
             // Subfolder.
-            this.contents = module.contents;
+            this.contents = this.moduleContents;
         } else {
-            this.contents = this.folderHelper.formatContents(module.contents);
+            this.contents = this.folderHelper.formatContents(this.moduleContents);
         }
     }
 
@@ -105,7 +106,7 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
         if (this.canGetFolder) {
             promise = this.folderProvider.getFolder(this.courseId, this.module.id).then((folder) => {
                 return this.courseProvider.loadModuleContents(this.module, this.courseId).then(() => {
-                    folder.contents = this.module.contents;
+                    this.moduleContents = this.module.contents;
 
                     return folder;
                 });
@@ -117,17 +118,13 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
                     folder.contents = this.module.contents;
                 }
                 this.module = folder;
+                this.moduleContents = folder.contents;
 
                 return folder;
             });
         }
 
         return promise.then((folder) => {
-            if (folder) {
-                this.description = folder.intro || folder.description;
-                this.dataRetrieved.emit(folder);
-            }
-
             this.showModuleData(folder);
 
             // All data obtained, now fill the context menu.
diff --git a/src/addon/mod/folder/providers/folder.ts b/src/addon/mod/folder/providers/folder.ts
index 989a0c69a..c472ce0f6 100644
--- a/src/addon/mod/folder/providers/folder.ts
+++ b/src/addon/mod/folder/providers/folder.ts
@@ -19,6 +19,7 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseLogHelperProvider } from '@core/course/providers/log-helper';
 import { CoreSite } from '@classes/site';
+import { CoreWSExternalWarning, CoreWSExternalFile } from '@providers/ws';
 
 /**
  * Service that provides some features for folder.
@@ -43,7 +44,7 @@ export class AddonModFolderProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the book is retrieved.
      */
-    getFolder(courseId: number, cmId: number, siteId?: string): Promise<any> {
+    getFolder(courseId: number, cmId: number, siteId?: string): Promise<AddonModFolderFolder> {
         return this.getFolderByKey(courseId, 'coursemodule', cmId, siteId);
     }
 
@@ -56,7 +57,7 @@ export class AddonModFolderProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the book is retrieved.
      */
-    protected getFolderByKey(courseId: number, key: string, value: any, siteId?: string): Promise<any> {
+    protected getFolderByKey(courseId: number, key: string, value: any, siteId?: string): Promise<AddonModFolderFolder> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                     courseids: [courseId]
@@ -66,7 +67,9 @@ export class AddonModFolderProvider {
                     updateFrequency: CoreSite.FREQUENCY_RARELY
                 };
 
-            return site.read('mod_folder_get_folders_by_courses', params, preSets).then((response) => {
+            return site.read('mod_folder_get_folders_by_courses', params, preSets)
+                    .then((response: AddonModFolderGetFoldersByCoursesResult): any => {
+
                 if (response && response.folders) {
                     const currentFolder = response.folders.find((folder) => {
                         return folder[key] == value;
@@ -147,3 +150,33 @@ export class AddonModFolderProvider {
                 {}, siteId);
     }
 }
+
+/**
+ * Folder returned by mod_folder_get_folders_by_courses.
+ */
+export type AddonModFolderFolder = {
+    id: number; // Module id.
+    coursemodule: number; // Course module id.
+    course: number; // Course id.
+    name: string; // Page name.
+    intro: string; // Summary.
+    introformat: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    introfiles: CoreWSExternalFile[];
+    revision: number; // Incremented when after each file changes, to avoid cache.
+    timemodified: number; // Last time the folder was modified.
+    display: number; // Display type of folder contents on a separate page or inline.
+    showexpanded: number; // 1 = expanded, 0 = collapsed for sub-folders.
+    showdownloadfolder: number; // Whether to show the download folder button.
+    section: number; // Course section id.
+    visible: number; // Module visibility.
+    groupmode: number; // Group mode.
+    groupingid: number; // Grouping id.
+};
+
+/**
+ * Result of WS mod_folder_get_folders_by_courses.
+ */
+export type AddonModFolderGetFoldersByCoursesResult = {
+    folders: AddonModFolderFolder[];
+    warnings?: CoreWSExternalWarning[];
+};
diff --git a/src/addon/mod/imscp/components/index/index.ts b/src/addon/mod/imscp/components/index/index.ts
index 37edb9b87..6940db0d8 100644
--- a/src/addon/mod/imscp/components/index/index.ts
+++ b/src/addon/mod/imscp/components/index/index.ts
@@ -79,7 +79,7 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
         const promises = [];
 
         promises.push(this.imscpProvider.getImscp(this.courseId, this.module.id).then((imscp) => {
-            this.description = imscp.intro || imscp.description;
+            this.description = imscp.intro;
             this.dataRetrieved.emit(imscp);
         }));
 
diff --git a/src/addon/mod/imscp/providers/imscp.ts b/src/addon/mod/imscp/providers/imscp.ts
index 366cb7bf6..45adb57f1 100644
--- a/src/addon/mod/imscp/providers/imscp.ts
+++ b/src/addon/mod/imscp/providers/imscp.ts
@@ -21,6 +21,7 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseLogHelperProvider } from '@core/course/providers/log-helper';
 import { CoreSite } from '@classes/site';
+import { CoreWSExternalWarning, CoreWSExternalFile } from '@providers/ws';
 
 /**
  * Service that provides some features for IMSCP.
@@ -157,7 +158,7 @@ export class AddonModImscpProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the imscp is retrieved.
      */
-    protected getImscpByKey(courseId: number, key: string, value: any, siteId?: string): Promise<any> {
+    protected getImscpByKey(courseId: number, key: string, value: any, siteId?: string): Promise<AddonModImscpImscp> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                 courseids: [courseId]
@@ -167,7 +168,9 @@ export class AddonModImscpProvider {
                 updateFrequency: CoreSite.FREQUENCY_RARELY
             };
 
-            return site.read('mod_imscp_get_imscps_by_courses', params, preSets).then((response) => {
+            return site.read('mod_imscp_get_imscps_by_courses', params, preSets)
+                    .then((response: AddonModImscpGetImscpsByCoursesResult): any => {
+
                 if (response && response.imscps) {
                     const currentImscp = response.imscps.find((imscp) => imscp[key] == value);
                     if (currentImscp) {
@@ -188,7 +191,7 @@ export class AddonModImscpProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the imscp is retrieved.
      */
-    getImscp(courseId: number, cmId: number, siteId?: string): Promise<any> {
+    getImscp(courseId: number, cmId: number, siteId?: string): Promise<AddonModImscpImscp> {
         return this.getImscpByKey(courseId, 'coursemodule', cmId, siteId);
     }
 
@@ -324,3 +327,32 @@ export class AddonModImscpProvider {
                 siteId);
     }
 }
+
+/**
+ * IMSCP returned by mod_imscp_get_imscps_by_courses.
+ */
+export type AddonModImscpImscp = {
+    id: number; // IMSCP id.
+    coursemodule: number; // Course module id.
+    course: number; // Course id.
+    name: string; // Activity name.
+    intro?: string; // The IMSCP intro.
+    introformat?: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    introfiles?: CoreWSExternalFile[]; // @since 3.2.
+    revision?: number; // Revision.
+    keepold?: number; // Number of old IMSCP to keep.
+    structure?: string; // IMSCP structure.
+    timemodified?: string; // Time of last modification.
+    section?: number; // Course section id.
+    visible?: boolean; // If visible.
+    groupmode?: number; // Group mode.
+    groupingid?: number; // Group id.
+};
+
+/**
+ * Result of WS mod_imscp_get_imscps_by_courses.
+ */
+export type AddonModImscpGetImscpsByCoursesResult = {
+    imscps: AddonModImscpImscp[];
+    warnings?: CoreWSExternalWarning[];
+};
diff --git a/src/addon/mod/label/providers/label.ts b/src/addon/mod/label/providers/label.ts
index ec75856b6..64e3d5c31 100644
--- a/src/addon/mod/label/providers/label.ts
+++ b/src/addon/mod/label/providers/label.ts
@@ -17,6 +17,7 @@ import { CoreSitesProvider } from '@providers/sites';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreFilepoolProvider } from '@providers/filepool';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
+import { CoreWSExternalWarning, CoreWSExternalFile } from '@providers/ws';
 
 /**
  * Service that provides some features for labels.
@@ -52,7 +53,7 @@ export class AddonModLabelProvider {
      * @return Promise resolved when the label is retrieved.
      */
     protected getLabelByField(courseId: number, key: string, value: any, forceCache?: boolean, ignoreCache?: boolean,
-            siteId?: string): Promise<any> {
+            siteId?: string): Promise<AddonModLabelLabel> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
@@ -70,7 +71,9 @@ export class AddonModLabelProvider {
                  preSets.emergencyCache = false;
              }
 
-            return site.read('mod_label_get_labels_by_courses', params, preSets).then((response) => {
+            return site.read('mod_label_get_labels_by_courses', params, preSets)
+                    .then((response: AddonModLabelGetLabelsByCoursesResult): any => {
+
                 if (response && response.labels) {
                     const currentLabel = response.labels.find((label) => label[key] == value);
                     if (currentLabel) {
@@ -93,7 +96,8 @@ export class AddonModLabelProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the label is retrieved.
      */
-    getLabel(courseId: number, cmId: number, forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any> {
+    getLabel(courseId: number, cmId: number, forceCache?: boolean, ignoreCache?: boolean, siteId?: string)
+            : Promise<AddonModLabelLabel> {
         return this.getLabelByField(courseId, 'coursemodule', cmId, forceCache, ignoreCache, siteId);
     }
 
@@ -107,7 +111,8 @@ export class AddonModLabelProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the label is retrieved.
      */
-    getLabelById(courseId: number, labelId: number, forceCache?: boolean, ignoreCache?: boolean, siteId?: string): Promise<any> {
+    getLabelById(courseId: number, labelId: number, forceCache?: boolean, ignoreCache?: boolean, siteId?: string)
+            : Promise<AddonModLabelLabel> {
         return this.getLabelByField(courseId, 'id', labelId, forceCache, ignoreCache, siteId);
     }
 
@@ -170,3 +175,29 @@ export class AddonModLabelProvider {
         return site.wsAvailable('mod_label_get_labels_by_courses');
     }
 }
+
+/**
+ * Label returned by mod_label_get_labels_by_courses.
+ */
+export type AddonModLabelLabel = {
+    id: number; // Module id.
+    coursemodule: number; // Course module id.
+    course: number; // Course id.
+    name: string; // Label name.
+    intro: string; // Label contents.
+    introformat: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    introfiles: CoreWSExternalFile[];
+    timemodified: number; // Last time the label was modified.
+    section: number; // Course section id.
+    visible: number; // Module visibility.
+    groupmode: number; // Group mode.
+    groupingid: number; // Grouping id.
+};
+
+/**
+ * Result of WS mod_label_get_labels_by_courses.
+ */
+export type AddonModLabelGetLabelsByCoursesResult = {
+    labels: AddonModLabelLabel[];
+    warnings?: CoreWSExternalWarning[];
+};
diff --git a/src/addon/mod/page/components/index/index.ts b/src/addon/mod/page/components/index/index.ts
index bc6b76671..a4297216c 100644
--- a/src/addon/mod/page/components/index/index.ts
+++ b/src/addon/mod/page/components/index/index.ts
@@ -17,7 +17,7 @@ import { CoreAppProvider } from '@providers/app';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseModuleMainResourceComponent } from '@core/course/classes/main-resource-component';
-import { AddonModPageProvider } from '../../providers/page';
+import { AddonModPageProvider, AddonModPagePage } from '../../providers/page';
 import { AddonModPageHelperProvider } from '../../providers/helper';
 import { AddonModPagePrefetchHandler } from '../../providers/prefetch-handler';
 
@@ -34,7 +34,7 @@ export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComp
     contents: any;
     displayDescription = true;
     displayTimemodified = true;
-    page: any;
+    page: AddonModPagePage;
 
     protected fetchContentDefaultError = 'addon.mod_page.errorwhileloadingthepage';
 
@@ -109,8 +109,8 @@ export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComp
                         this.page = page;
 
                         // Check if description and timemodified should be displayed.
-                        if (page.displayoptions) {
-                            const options = this.textUtils.unserialize(page.displayoptions) || {};
+                        if (this.page.displayoptions) {
+                            const options = this.textUtils.unserialize(this.page.displayoptions) || {};
                             this.displayDescription = typeof options.printintro == 'undefined' ||
                                     this.utils.isTrueOrOne(options.printintro);
                             this.displayTimemodified = typeof options.printlastmodified == 'undefined' ||
diff --git a/src/addon/mod/page/providers/page.ts b/src/addon/mod/page/providers/page.ts
index ba42a2412..f41739e9a 100644
--- a/src/addon/mod/page/providers/page.ts
+++ b/src/addon/mod/page/providers/page.ts
@@ -20,6 +20,7 @@ import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseLogHelperProvider } from '@core/course/providers/log-helper';
 import { CoreFilepoolProvider } from '@providers/filepool';
 import { CoreSite } from '@classes/site';
+import { CoreWSExternalWarning, CoreWSExternalFile } from '@providers/ws';
 
 /**
  * Service that provides some features for page.
@@ -43,9 +44,9 @@ export class AddonModPageProvider {
      * @param courseId Course ID.
      * @param cmId Course module ID.
      * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved when the book is retrieved.
+     * @return Promise resolved when the page is retrieved.
      */
-    getPageData(courseId: number, cmId: number, siteId?: string): Promise<any> {
+    getPageData(courseId: number, cmId: number, siteId?: string): Promise<AddonModPagePage> {
         return this.getPageByKey(courseId, 'coursemodule', cmId, siteId);
     }
 
@@ -56,9 +57,9 @@ export class AddonModPageProvider {
      * @param key Name of the property to check.
      * @param value Value to search.
      * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved when the book is retrieved.
+     * @return Promise resolved when the page is retrieved.
      */
-    protected getPageByKey(courseId: number, key: string, value: any, siteId?: string): Promise<any> {
+    protected getPageByKey(courseId: number, key: string, value: any, siteId?: string): Promise<AddonModPagePage> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                     courseids: [courseId]
@@ -68,7 +69,9 @@ export class AddonModPageProvider {
                     updateFrequency: CoreSite.FREQUENCY_RARELY
                 };
 
-            return site.read('mod_page_get_pages_by_courses', params, preSets).then((response) => {
+            return site.read('mod_page_get_pages_by_courses', params, preSets)
+                    .then((response: AddonModPageGetPagesByCoursesResult): any => {
+
                 if (response && response.pages) {
                     const currentPage = response.pages.find((page) => {
                         return page[key] == value;
@@ -161,3 +164,37 @@ export class AddonModPageProvider {
         return this.logHelper.logSingle('mod_page_view_page', params, AddonModPageProvider.COMPONENT, id, name, 'page', {}, siteId);
     }
 }
+
+/**
+ * Page returned by mod_page_get_pages_by_courses.
+ */
+export type AddonModPagePage = {
+    id: number; // Module id.
+    coursemodule: number; // Course module id.
+    course: number; // Course id.
+    name: string; // Page name.
+    intro: string; // Summary.
+    introformat: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    introfiles: CoreWSExternalFile[];
+    content: string; // Page content.
+    contentformat: number; // Content format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    contentfiles: CoreWSExternalFile[];
+    legacyfiles: number; // Legacy files flag.
+    legacyfileslast: number; // Legacy files last control flag.
+    display: number; // How to display the page.
+    displayoptions: string; // Display options (width, height).
+    revision: number; // Incremented when after each file changes, to avoid cache.
+    timemodified: number; // Last time the page was modified.
+    section: number; // Course section id.
+    visible: number; // Module visibility.
+    groupmode: number; // Group mode.
+    groupingid: number; // Grouping id.
+};
+
+/**
+ * Result of WS mod_page_get_pages_by_courses.
+ */
+export type AddonModPageGetPagesByCoursesResult = {
+    pages: AddonModPagePage[];
+    warnings?: CoreWSExternalWarning[];
+};
diff --git a/src/addon/mod/resource/providers/module-handler.ts b/src/addon/mod/resource/providers/module-handler.ts
index f4a9888bf..b4c6b1b32 100644
--- a/src/addon/mod/resource/providers/module-handler.ts
+++ b/src/addon/mod/resource/providers/module-handler.ts
@@ -25,6 +25,7 @@ import { CoreTextUtilsProvider } from '@providers/utils/text';
 import { CoreTimeUtilsProvider } from '@providers/utils/time';
 import { CoreCourseModulePrefetchDelegate } from '@core/course/providers/module-prefetch-delegate';
 import { CoreConstants } from '@core/constants';
+import { CoreWSExternalFile } from '@providers/ws';
 
 /**
  * Handler to support resource modules.
@@ -146,7 +147,7 @@ export class AddonModResourceModuleHandler implements CoreCourseModuleHandler {
      */
     protected getResourceData(module: any, courseId: number, handlerData: CoreCourseModuleHandlerData): Promise<any> {
         const promises = [];
-        let infoFiles = [],
+        let infoFiles: CoreWSExternalFile[] = [],
             options: any = {};
 
         // Check if the button needs to be shown or not.
diff --git a/src/addon/mod/resource/providers/resource.ts b/src/addon/mod/resource/providers/resource.ts
index 05c8e4620..19305d71d 100644
--- a/src/addon/mod/resource/providers/resource.ts
+++ b/src/addon/mod/resource/providers/resource.ts
@@ -20,6 +20,7 @@ import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseLogHelperProvider } from '@core/course/providers/log-helper';
 import { CoreFilepoolProvider } from '@providers/filepool';
 import { CoreSite } from '@classes/site';
+import { CoreWSExternalWarning, CoreWSExternalFile } from '@providers/ws';
 
 /**
  * Service that provides some features for resources.
@@ -56,7 +57,7 @@ export class AddonModResourceProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the resource is retrieved.
      */
-    protected getResourceDataByKey(courseId: number, key: string, value: any, siteId?: string): Promise<any> {
+    protected getResourceDataByKey(courseId: number, key: string, value: any, siteId?: string): Promise<AddonModResourceResource> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                     courseids: [courseId]
@@ -66,7 +67,9 @@ export class AddonModResourceProvider {
                     updateFrequency: CoreSite.FREQUENCY_RARELY
                 };
 
-            return site.read('mod_resource_get_resources_by_courses', params, preSets).then((response) => {
+            return site.read('mod_resource_get_resources_by_courses', params, preSets)
+                    .then((response: AddonModResourceGetResourcesByCoursesResult): any => {
+
                 if (response && response.resources) {
                     const currentResource = response.resources.find((resource) => {
                         return resource[key] == value;
@@ -89,7 +92,7 @@ export class AddonModResourceProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the resource is retrieved.
      */
-    getResourceData(courseId: number, cmId: number, siteId?: string): Promise<any> {
+    getResourceData(courseId: number, cmId: number, siteId?: string): Promise<AddonModResourceResource> {
         return this.getResourceDataByKey(courseId, 'coursemodule', cmId, siteId);
     }
 
@@ -165,3 +168,37 @@ export class AddonModResourceProvider {
                 'resource', {}, siteId);
     }
 }
+
+/**
+ * Resource returned by mod_resource_get_resources_by_courses.
+ */
+export type AddonModResourceResource = {
+    id: number; // Module id.
+    coursemodule: number; // Course module id.
+    course: number; // Course id.
+    name: string; // Page name.
+    intro: string; // Summary.
+    introformat: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    introfiles: CoreWSExternalFile[];
+    contentfiles: CoreWSExternalFile[];
+    tobemigrated: number; // Whether this resource was migrated.
+    legacyfiles: number; // Legacy files flag.
+    legacyfileslast: number; // Legacy files last control flag.
+    display: number; // How to display the resource.
+    displayoptions: string; // Display options (width, height).
+    filterfiles: number; // If filters should be applied to the resource content.
+    revision: number; // Incremented when after each file changes, to avoid cache.
+    timemodified: number; // Last time the resource was modified.
+    section: number; // Course section id.
+    visible: number; // Module visibility.
+    groupmode: number; // Group mode.
+    groupingid: number; // Grouping id.
+};
+
+/**
+ * Result of WS mod_resource_get_resources_by_courses.
+ */
+export type AddonModResourceGetResourcesByCoursesResult = {
+    resources: AddonModResourceResource[];
+    warnings?: CoreWSExternalWarning[];
+};
diff --git a/src/addon/mod/url/providers/module-handler.ts b/src/addon/mod/url/providers/module-handler.ts
index 05f475d59..d1ef86acd 100644
--- a/src/addon/mod/url/providers/module-handler.ts
+++ b/src/addon/mod/url/providers/module-handler.ts
@@ -19,7 +19,7 @@ import { AddonModUrlIndexComponent } from '../components/index/index';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@core/course/providers/module-delegate';
 import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreContentLinksHelperProvider } from '@core/contentlinks/providers/helper';
-import { AddonModUrlProvider } from './url';
+import { AddonModUrlProvider, AddonModUrlUrl } from './url';
 import { AddonModUrlHelperProvider } from './helper';
 import { CoreConstants } from '@core/constants';
 
@@ -90,7 +90,8 @@ export class AddonModUrlModuleHandler implements CoreCourseModuleHandler {
                     if (handler.urlProvider.isGetUrlWSAvailable()) {
                         return handler.urlProvider.getUrl(courseId, module.id).catch(() => {
                             // Ignore errors.
-                        }).then((url) => {
+                            return undefined;
+                        }).then((url: AddonModUrlUrl) => {
                             const displayType = handler.urlProvider.getFinalDisplayType(url);
 
                             return displayType == CoreConstants.RESOURCELIB_DISPLAY_OPEN ||
diff --git a/src/addon/mod/url/providers/url.ts b/src/addon/mod/url/providers/url.ts
index 28ffe8da8..cd8f9e1fe 100644
--- a/src/addon/mod/url/providers/url.ts
+++ b/src/addon/mod/url/providers/url.ts
@@ -21,6 +21,7 @@ import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseLogHelperProvider } from '@core/course/providers/log-helper';
 import { CoreConstants } from '@core/constants';
 import { CoreSite } from '@classes/site';
+import { CoreWSExternalWarning, CoreWSExternalFile } from '@providers/ws';
 
 /**
  * Service that provides some features for urls.
@@ -44,7 +45,7 @@ export class AddonModUrlProvider {
      * @param url URL data.
      * @return Final display type.
      */
-    getFinalDisplayType(url: any): number {
+    getFinalDisplayType(url: AddonModUrlUrl): number {
         if (!url) {
             return -1;
         }
@@ -109,7 +110,7 @@ export class AddonModUrlProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the url is retrieved.
      */
-    protected getUrlDataByKey(courseId: number, key: string, value: any, siteId?: string): Promise<any> {
+    protected getUrlDataByKey(courseId: number, key: string, value: any, siteId?: string): Promise<AddonModUrlUrl> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                     courseids: [courseId]
@@ -119,7 +120,9 @@ export class AddonModUrlProvider {
                     updateFrequency: CoreSite.FREQUENCY_RARELY
                 };
 
-            return site.read('mod_url_get_urls_by_courses', params, preSets).then((response) => {
+            return site.read('mod_url_get_urls_by_courses', params, preSets)
+                    .then((response: AddonModUrlGetUrlsByCoursesResult): any => {
+
                 if (response && response.urls) {
                     const currentUrl = response.urls.find((url) => {
                         return url[key] == value;
@@ -142,7 +145,7 @@ export class AddonModUrlProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the url is retrieved.
      */
-    getUrl(courseId: number, cmId: number, siteId?: string): Promise<any> {
+    getUrl(courseId: number, cmId: number, siteId?: string): Promise<AddonModUrlUrl> {
         return this.getUrlDataByKey(courseId, 'coursemodule', cmId, siteId);
     }
 
@@ -231,3 +234,33 @@ export class AddonModUrlProvider {
         return this.logHelper.logSingle('mod_url_view_url', params, AddonModUrlProvider.COMPONENT, id, name, 'url', {}, siteId);
     }
 }
+
+/**
+ * URL returnd by mod_url_get_urls_by_courses.
+ */
+export type AddonModUrlUrl = {
+    id: number; // Module id.
+    coursemodule: number; // Course module id.
+    course: number; // Course id.
+    name: string; // URL name.
+    intro: string; // Summary.
+    introformat: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    introfiles: CoreWSExternalFile[];
+    externalurl: string; // External URL.
+    display: number; // How to display the url.
+    displayoptions: string; // Display options (width, height).
+    parameters: string; // Parameters to append to the URL.
+    timemodified: number; // Last time the url was modified.
+    section: number; // Course section id.
+    visible: number; // Module visibility.
+    groupmode: number; // Group mode.
+    groupingid: number; // Grouping id.
+};
+
+/**
+ * Result of WS mod_url_get_urls_by_courses.
+ */
+export type AddonModUrlGetUrlsByCoursesResult = {
+    urls: AddonModUrlUrl[];
+    warnings?: CoreWSExternalWarning[];
+};

From 49deffa9dd9406b787e544eb5491d4dbd3491b5f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 6 Sep 2019 15:04:28 +0200
Subject: [PATCH 019/257] MOBILE-3109 chat: Add return types to chat

---
 src/addon/mod/chat/components/index/index.ts  |   6 +-
 src/addon/mod/chat/pages/chat/chat.ts         |  20 +-
 .../session-messages/session-messages.ts      |   8 +-
 src/addon/mod/chat/pages/sessions/sessions.ts |  21 +-
 src/addon/mod/chat/pages/users/users.ts       |  10 +-
 src/addon/mod/chat/providers/chat.ts          | 190 ++++++++++++++++--
 .../mod/chat/providers/prefetch-handler.ts    |   6 +-
 7 files changed, 219 insertions(+), 42 deletions(-)

diff --git a/src/addon/mod/chat/components/index/index.ts b/src/addon/mod/chat/components/index/index.ts
index 71e646d53..4945a5ebe 100644
--- a/src/addon/mod/chat/components/index/index.ts
+++ b/src/addon/mod/chat/components/index/index.ts
@@ -16,7 +16,7 @@ import { Component, Injector } from '@angular/core';
 import { NavController } from 'ionic-angular';
 import { CoreCourseModuleMainActivityComponent } from '@core/course/classes/main-activity-component';
 import { CoreTimeUtilsProvider } from '@providers/utils/time';
-import { AddonModChatProvider } from '../../providers/chat';
+import { AddonModChatProvider, AddonModChatChat } from '../../providers/chat';
 
 /**
  * Component that displays a chat.
@@ -29,7 +29,7 @@ export class AddonModChatIndexComponent extends CoreCourseModuleMainActivityComp
     component = AddonModChatProvider.COMPONENT;
     moduleName = 'chat';
 
-    chat: any;
+    chat: AddonModChatChat;
     chatInfo: any;
 
     protected title: string;
@@ -66,7 +66,7 @@ export class AddonModChatIndexComponent extends CoreCourseModuleMainActivityComp
     protected fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<any> {
         return this.chatProvider.getChat(this.courseId, this.module.id).then((chat) => {
             this.chat = chat;
-            this.description = chat.intro || chat.description;
+            this.description = chat.intro;
 
             const now = this.timeUtils.timestamp();
             const span = chat.chattime - now;
diff --git a/src/addon/mod/chat/pages/chat/chat.ts b/src/addon/mod/chat/pages/chat/chat.ts
index e4951d6e3..47be73f24 100644
--- a/src/addon/mod/chat/pages/chat/chat.ts
+++ b/src/addon/mod/chat/pages/chat/chat.ts
@@ -20,7 +20,7 @@ import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
-import { AddonModChatProvider } from '../../providers/chat';
+import { AddonModChatProvider, AddonModChatMessageWithUserData } from '../../providers/chat';
 import { Network } from '@ionic-native/network';
 import * as moment from 'moment';
 
@@ -37,7 +37,7 @@ export class AddonModChatChatPage {
 
     loaded = false;
     title: string;
-    messages = [];
+    messages: AddonModChatMessageWithUserData[] = [];
     newMessage: string;
     polling: any;
     isOnline: boolean;
@@ -46,7 +46,7 @@ export class AddonModChatChatPage {
     protected logger;
     protected courseId: number;
     protected chatId: number;
-    protected sessionId: number;
+    protected sessionId: string;
     protected lastTime = 0;
     protected oldContentHeight = 0;
     protected onlineObserver: any;
@@ -131,9 +131,9 @@ export class AddonModChatChatPage {
     /**
      * Convenience function to login the user.
      *
-     * @return Resolved when done.
+     * @return Promise resolved when done.
      */
-    protected loginUser(): Promise<any> {
+    protected loginUser(): Promise<void> {
         return this.chatProvider.loginUser(this.chatId).then((sessionId) => {
             this.sessionId = sessionId;
         });
@@ -144,12 +144,12 @@ export class AddonModChatChatPage {
      *
      * @return Promise resolved when done.
      */
-    protected fetchMessages(): Promise<any> {
+    protected fetchMessages(): Promise<void> {
         return this.chatProvider.getLatestMessages(this.sessionId, this.lastTime).then((messagesInfo) => {
             this.lastTime = messagesInfo.chatnewlasttime || 0;
 
             return this.chatProvider.getMessagesUserData(messagesInfo.messages, this.courseId).then((messages) => {
-                this.messages = this.messages.concat(messages);
+                this.messages = this.messages.concat(<AddonModChatMessageWithUserData[]> messages);
                 if (messages.length) {
                     // New messages or beeps, scroll to bottom.
                     setTimeout(() => this.scrollToBottom());
@@ -190,7 +190,7 @@ export class AddonModChatChatPage {
      *
      * @return Promised resolved when done.
      */
-    protected fetchMessagesInterval(): Promise<any> {
+    protected fetchMessagesInterval(): Promise<void> {
         this.logger.debug('Polling for messages');
         if (!this.isOnline || this.pollingRunning) {
             // Obviously we cannot check for new messages when the app is offline.
@@ -225,7 +225,7 @@ export class AddonModChatChatPage {
      * @param prevMessage Previous message object.
      * @return True if messages are from diferent days, false othetwise.
      */
-    showDate(message: any, prevMessage: any): boolean {
+    showDate(message: AddonModChatMessageWithUserData, prevMessage: AddonModChatMessageWithUserData): boolean {
         if (!prevMessage) {
             return true;
         }
@@ -267,7 +267,7 @@ export class AddonModChatChatPage {
         });
     }
 
-    reconnect(): Promise<any> {
+    reconnect(): Promise<void> {
         const modal = this.domUtils.showModalLoading();
 
         // Call startPolling would take a while for the first execution, so we'll execute it manually to check if it works now.
diff --git a/src/addon/mod/chat/pages/session-messages/session-messages.ts b/src/addon/mod/chat/pages/session-messages/session-messages.ts
index b96ed597a..1a29a8365 100644
--- a/src/addon/mod/chat/pages/session-messages/session-messages.ts
+++ b/src/addon/mod/chat/pages/session-messages/session-messages.ts
@@ -15,7 +15,7 @@
 import { Component } from '@angular/core';
 import { IonicPage, NavParams } from 'ionic-angular';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
-import { AddonModChatProvider } from '../../providers/chat';
+import { AddonModChatProvider, AddonModChatSessionMessageWithUserData } from '../../providers/chat';
 import * as moment from 'moment';
 
 /**
@@ -34,7 +34,7 @@ export class AddonModChatSessionMessagesPage {
     protected sessionEnd: number;
     protected groupId: number;
     protected loaded = false;
-    protected messages = [];
+    protected messages: AddonModChatSessionMessageWithUserData[] = [];
 
     constructor(navParams: NavParams, private domUtils: CoreDomUtilsProvider, private chatProvider: AddonModChatProvider) {
         this.courseId = navParams.get('courseId');
@@ -55,7 +55,7 @@ export class AddonModChatSessionMessagesPage {
         return this.chatProvider.getSessionMessages(this.chatId, this.sessionStart, this.sessionEnd, this.groupId)
                 .then((messages) => {
             return this.chatProvider.getMessagesUserData(messages, this.courseId).then((messages) => {
-                this.messages = messages;
+                this.messages = <AddonModChatSessionMessageWithUserData[]> messages;
             });
         }).catch((error) => {
             this.domUtils.showErrorModalDefault(error, 'core.errorloadingcontent', true);
@@ -84,7 +84,7 @@ export class AddonModChatSessionMessagesPage {
     * @param prevMessage Previous message object.
     * @return True if messages are from diferent days, false othetwise.
     */
-   showDate(message: any, prevMessage: any): boolean {
+   showDate(message: AddonModChatSessionMessageWithUserData, prevMessage: AddonModChatSessionMessageWithUserData): boolean {
        if (!prevMessage) {
            return true;
        }
diff --git a/src/addon/mod/chat/pages/sessions/sessions.ts b/src/addon/mod/chat/pages/sessions/sessions.ts
index 6043f3f3b..1f6ddcf0d 100644
--- a/src/addon/mod/chat/pages/sessions/sessions.ts
+++ b/src/addon/mod/chat/pages/sessions/sessions.ts
@@ -20,7 +20,7 @@ import { CoreUserProvider } from '@core/user/providers/user';
 import { CoreGroupsProvider, CoreGroupInfo } from '@providers/groups';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreUtilsProvider } from '@providers/utils/utils';
-import { AddonModChatProvider } from '../../providers/chat';
+import { AddonModChatProvider, AddonModChatSession, AddonModChatSessionUser } from '../../providers/chat';
 
 /**
  * Page that displays list of chat sessions.
@@ -73,13 +73,13 @@ export class AddonModChatSessionsPage {
             this.groupId = this.groupsProvider.validateGroupId(this.groupId, groupInfo);
 
             return this.chatProvider.getSessions(this.chatId, this.groupId, this.showAll);
-        }).then((sessions) => {
+        }).then((sessions: AddonModChatSessionFormatted[]) => {
             // Fetch user profiles.
             const promises = [];
 
             sessions.forEach((session) => {
                 session.duration = session.sessionend - session.sessionstart;
-                session.sessionusers.forEach((sessionUser) => {
+                session.sessionusers.forEach((sessionUser: AddonModChatUserSessionFormatted) => {
                     if (!sessionUser.userfullname) {
                         // The WS does not return the user name, fetch user profile.
                         promises.push(this.userProvider.getProfile(sessionUser.userid, this.courseId, true).then((user) => {
@@ -156,3 +156,18 @@ export class AddonModChatSessionsPage {
         $event.stopPropagation();
     }
 }
+
+/**
+ * Fields added to chat session in this view.
+ */
+type AddonModChatSessionFormatted = AddonModChatSession & {
+    duration?: number; // Session duration.
+    allsessionusers?: AddonModChatUserSessionFormatted[]; // All session users.
+};
+
+/**
+ * Fields added to user session in this view.
+ */
+type AddonModChatUserSessionFormatted = AddonModChatSessionUser & {
+    userfullname?: string; // User full name.
+};
diff --git a/src/addon/mod/chat/pages/users/users.ts b/src/addon/mod/chat/pages/users/users.ts
index 4cd59049d..f54560ba3 100644
--- a/src/addon/mod/chat/pages/users/users.ts
+++ b/src/addon/mod/chat/pages/users/users.ts
@@ -17,7 +17,7 @@ import { IonicPage, NavParams, ViewController } from 'ionic-angular';
 import { CoreAppProvider } from '@providers/app';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
-import { AddonModChatProvider } from '../../providers/chat';
+import { AddonModChatProvider, AddonModChatUser } from '../../providers/chat';
 import { Network } from '@ionic-native/network';
 
 /**
@@ -30,12 +30,12 @@ import { Network } from '@ionic-native/network';
 })
 export class AddonModChatUsersPage {
 
-    users = [];
+    users: AddonModChatUser[] = [];
     usersLoaded = false;
     currentUserId: number;
     isOnline: boolean;
 
-    protected sessionId: number;
+    protected sessionId: string;
     protected onlineObserver: any;
 
     constructor(navParams: NavParams, network: Network,  zone: NgZone, private appProvider: CoreAppProvider,
@@ -77,7 +77,7 @@ export class AddonModChatUsersPage {
      *
      * @param user User object.
      */
-     talkTo(user: any): void {
+     talkTo(user: AddonModChatUser): void {
         this.viewCtrl.dismiss({talkTo: user.fullname});
     }
 
@@ -86,7 +86,7 @@ export class AddonModChatUsersPage {
      *
      * @param user User object.
      */
-    beepTo(user: any): void {
+    beepTo(user: AddonModChatUser): void {
         this.viewCtrl.dismiss({beepTo: user.id});
     }
 
diff --git a/src/addon/mod/chat/providers/chat.ts b/src/addon/mod/chat/providers/chat.ts
index 9b9a02e39..f656375a7 100644
--- a/src/addon/mod/chat/providers/chat.ts
+++ b/src/addon/mod/chat/providers/chat.ts
@@ -19,6 +19,7 @@ import { CoreUserProvider } from '@core/user/providers/user';
 import { CoreCourseLogHelperProvider } from '@core/course/providers/log-helper';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
+import { CoreWSExternalWarning, CoreWSExternalFile } from '@providers/ws';
 
 /**
  * Service that provides some features for chats.
@@ -41,7 +42,7 @@ export class AddonModChatProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the chat is retrieved.
      */
-    getChat(courseId: number, cmId: number, siteId?: string): Promise<any> {
+    getChat(courseId: number, cmId: number, siteId?: string): Promise<AddonModChatChat> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                 courseids: [courseId]
@@ -51,7 +52,9 @@ export class AddonModChatProvider {
                 updateFrequency: CoreSite.FREQUENCY_RARELY
             };
 
-            return site.read('mod_chat_get_chats_by_courses', params, preSets).then((response) => {
+            return site.read('mod_chat_get_chats_by_courses', params, preSets)
+                    .then((response: AddonModChatGetChatsByCoursesResult): any => {
+
                 if (response.chats) {
                     const chat = response.chats.find((chat) => chat.coursemodule == cmId);
                     if (chat) {
@@ -70,12 +73,14 @@ export class AddonModChatProvider {
      * @param chatId Chat instance ID.
      * @return Promise resolved when the WS is executed.
      */
-    loginUser(chatId: number): Promise<any> {
+    loginUser(chatId: number): Promise<string> {
         const params = {
             chatid: chatId
         };
 
-        return this.sitesProvider.getCurrentSite().write('mod_chat_login_user', params).then((response) => {
+        return this.sitesProvider.getCurrentSite().write('mod_chat_login_user', params)
+                .then((response: AddonModChatLoginUserResult): any => {
+
             if (response.chatsid) {
                 return response.chatsid;
             }
@@ -108,14 +113,16 @@ export class AddonModChatProvider {
      * @param beepUserId Beep user ID.
      * @return Promise resolved when the WS is executed.
      */
-    sendMessage(sessionId: number, message: string, beepUserId: number): Promise<any> {
+    sendMessage(sessionId: string, message: string, beepUserId: number): Promise<number> {
         const params = {
             chatsid: sessionId,
             messagetext: message,
             beepid: beepUserId
         };
 
-        return this.sitesProvider.getCurrentSite().write('mod_chat_send_chat_message', params).then((response) => {
+        return this.sitesProvider.getCurrentSite().write('mod_chat_send_chat_message', params)
+                .then((response: AddonModChatSendChatMessageResult): any => {
+
             if (response.messageid) {
                 return response.messageid;
             }
@@ -131,7 +138,7 @@ export class AddonModChatProvider {
      * @param lastTime Last time when messages were retrieved.
      * @return Promise resolved when the WS is executed.
      */
-    getLatestMessages(sessionId: number, lastTime: number): Promise<any> {
+    getLatestMessages(sessionId: string, lastTime: number): Promise<AddonModChatGetChatLatestMessagesResult> {
         const params = {
             chatsid: sessionId,
             chatlasttime: lastTime
@@ -149,8 +156,10 @@ export class AddonModChatProvider {
      * @param courseId ID of the course the messages belong to.
      * @return Promise always resolved with the formatted messages.
      */
-    getMessagesUserData(messages: any[], courseId: number): Promise<any> {
-        const promises = messages.map((message) => {
+    getMessagesUserData(messages: (AddonModChatMessage | AddonModChatSessionMessage)[], courseId: number)
+            : Promise<(AddonModChatMessageWithUserData | AddonModChatSessionMessageWithUserData)[]> {
+
+        const promises = messages.map((message: AddonModChatMessageWithUserData | AddonModChatSessionMessageWithUserData) => {
             return this.userProvider.getProfile(message.userid, courseId, true).then((user) => {
                 message.userfullname = user.fullname;
                 message.userprofileimageurl = user.profileimageurl;
@@ -171,7 +180,7 @@ export class AddonModChatProvider {
      * @param sessionId Chat sessiond ID.
      * @return Promise resolved when the WS is executed.
      */
-    getChatUsers(sessionId: number): Promise<any> {
+    getChatUsers(sessionId: string): Promise<AddonModChatGetChatUsersResult> {
         const params = {
             chatsid: sessionId
         };
@@ -206,7 +215,8 @@ export class AddonModChatProvider {
      * @since 3.5
      */
     getSessions(chatId: number, groupId: number = 0, showAll: boolean = false, ignoreCache: boolean = false, siteId?: string):
-            Promise<any[]> {
+            Promise<AddonModChatSession[]> {
+
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                 chatid: chatId,
@@ -222,7 +232,7 @@ export class AddonModChatProvider {
                 preSets.emergencyCache = false;
             }
 
-            return site.read('mod_chat_get_sessions', params, preSets).then((response) => {
+            return site.read('mod_chat_get_sessions', params, preSets).then((response: AddonModChatGetSessionsResult): any => {
                 if (!response || !response.sessions) {
                     return Promise.reject(null);
                 }
@@ -245,7 +255,8 @@ export class AddonModChatProvider {
      * @since 3.5
      */
     getSessionMessages(chatId: number, sessionStart: number, sessionEnd: number, groupId: number = 0, ignoreCache: boolean = false,
-            siteId?: string): Promise<any[]> {
+            siteId?: string): Promise<AddonModChatSessionMessage[]> {
+
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                 chatid: chatId,
@@ -262,7 +273,9 @@ export class AddonModChatProvider {
                 preSets.emergencyCache = false;
             }
 
-            return site.read('mod_chat_get_session_messages', params, preSets).then((response) => {
+            return site.read('mod_chat_get_session_messages', params, preSets)
+                    .then((response: AddonModChatGetSessionMessagesResult): any => {
+
                 if (!response || !response.messages) {
                     return Promise.reject(null);
                 }
@@ -390,3 +403,152 @@ export class AddonModChatProvider {
         return this.ROOT_CACHE_KEY + 'sessionsMessages:' + chatId + ':';
     }
 }
+
+/**
+ * Chat returned by mod_chat_get_chats_by_courses.
+ */
+export type AddonModChatChat = {
+    id: number; // Chat id.
+    coursemodule: number; // Course module id.
+    course: number; // Course id.
+    name: string; // Chat name.
+    intro: string; // The Chat intro.
+    introformat: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    introfiles?: CoreWSExternalFile[]; // @since 3.2.
+    chatmethod?: string; // Chat method (sockets, ajax, header_js).
+    keepdays?: number; // Keep days.
+    studentlogs?: number; // Student logs visible to everyone.
+    chattime?: number; // Chat time.
+    schedule?: number; // Schedule type.
+    timemodified?: number; // Time of last modification.
+    section?: number; // Course section id.
+    visible?: boolean; // Visible.
+    groupmode?: number; // Group mode.
+    groupingid?: number; // Group id.
+};
+
+/**
+ * Chat user returned by mod_chat_get_chat_users.
+ */
+export type AddonModChatUser = {
+    id: number; // User id.
+    fullname: string; // User full name.
+    profileimageurl: string; // User picture URL.
+};
+
+/**
+ * Meessage returned by mod_chat_get_chat_latest_messages.
+ */
+export type AddonModChatMessage = {
+    id: number; // Message id.
+    userid: number; // User id.
+    system: boolean; // True if is a system message (like user joined).
+    message: string; // Message text.
+    timestamp: number; // Timestamp for the message.
+};
+
+/**
+ * Message with user data
+ */
+export type AddonModChatMessageWithUserData = AddonModChatMessage & AddonModChatMessageUserData;
+
+/**
+ * Chat session.
+ */
+export type AddonModChatSession = {
+    sessionstart: number; // Session start time.
+    sessionend: number; // Session end time.
+    sessionusers: AddonModChatSessionUser[]; // Session users.
+    iscomplete: boolean; // Whether the session is completed or not.
+};
+
+/**
+ * Chat user returned by mod_chat_get_sessions.
+ */
+export type AddonModChatSessionUser = {
+    userid: number; // User id.
+    messagecount: number; // Number of messages in the session.
+};
+
+/**
+ * Message returned by mod_chat_get_session_messages.
+ */
+export type AddonModChatSessionMessage = {
+    id: number; // The message record id.
+    chatid: number; // The chat id.
+    userid: number; // The user who wrote the message.
+    groupid: number; // The group this message belongs to.
+    issystem: boolean; // Whether is a system message or not.
+    message: string; // The message text.
+    timestamp: number; // The message timestamp (indicates when the message was sent).
+};
+
+/**
+ * Message with user data
+ */
+export type AddonModChatSessionMessageWithUserData = AddonModChatSessionMessage & AddonModChatMessageUserData;
+
+/**
+ * Result of WS mod_chat_get_chats_by_courses.
+ */
+export type AddonModChatGetChatsByCoursesResult = {
+    chats: AddonModChatChat[];
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS mod_chat_get_chat_users.
+ */
+export type AddonModChatGetChatUsersResult = {
+    users: AddonModChatUser[]; // List of users.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS mod_chat_get_sessions.
+ */
+export type AddonModChatGetSessionsResult = {
+    sessions: AddonModChatSession[]; // List of sessions.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS mod_chat_get_session_messages.
+ */
+export type AddonModChatGetSessionMessagesResult = {
+    messages: AddonModChatSessionMessage[];
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS mod_chat_send_chat_message.
+ */
+export type AddonModChatSendChatMessageResult = {
+    messageid: number; // Message sent id.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS mod_chat_get_chat_latest_messages.
+ */
+export type AddonModChatGetChatLatestMessagesResult = {
+    messages: AddonModChatMessage[]; // List of messages.
+    chatnewlasttime: number; // New last time.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS mod_chat_login_user.
+ */
+export type AddonModChatLoginUserResult = {
+    chatsid: string; // Unique chat session id.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * User data added to messages.
+ */
+type AddonModChatMessageUserData = {
+    userfullname?: string; // Calculated in the app. Full name of the user who wrote the message.
+    userprofileimageurl?: string; // Calculated in the app. Full name of the user who wrote the message.
+};
diff --git a/src/addon/mod/chat/providers/prefetch-handler.ts b/src/addon/mod/chat/providers/prefetch-handler.ts
index ca146b06d..11b3d9183 100644
--- a/src/addon/mod/chat/providers/prefetch-handler.ts
+++ b/src/addon/mod/chat/providers/prefetch-handler.ts
@@ -23,7 +23,7 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/activity-prefetch-handler';
 import { CoreUserProvider } from '@core/user/providers/user';
-import { AddonModChatProvider } from './chat';
+import { AddonModChatProvider, AddonModChatChat } from './chat';
 
 /**
  * Handler to prefetch chats.
@@ -116,12 +116,12 @@ export class AddonModChatPrefetchHandler extends CoreCourseActivityPrefetchHandl
      */
     protected prefetchChat(module: any, courseId: number, single: boolean, siteId: string): Promise<any> {
         // Prefetch chat and group info.
-        const promises = [
+        const promises: Promise<any>[] = [
             this.chatProvider.getChat(courseId, module.id, siteId),
             this.groupsProvider.getActivityGroupInfo(module.id, false, undefined, siteId)
         ];
 
-        return Promise.all(promises).then(([chat, groupInfo]: [any, CoreGroupInfo]) => {
+        return Promise.all(promises).then(([chat, groupInfo]: [AddonModChatChat, CoreGroupInfo]) => {
             const promises = [];
 
             let groupIds = [0];

From 3647b7bfa0885934c57f4d65cb0ee4f9fadf0401 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 6 Sep 2019 17:31:47 +0200
Subject: [PATCH 020/257] MOBILE-3109 choice: Add return types to choice

---
 .../index/addon-mod-choice-index.html         |   8 +-
 .../mod/choice/components/index/index.ts      |  35 +++--
 src/addon/mod/choice/providers/choice.ts      | 122 ++++++++++++++++--
 3 files changed, 139 insertions(+), 26 deletions(-)

diff --git a/src/addon/mod/choice/components/index/addon-mod-choice-index.html b/src/addon/mod/choice/components/index/addon-mod-choice-index.html
index a9e81b5f6..cfeaddc5f 100644
--- a/src/addon/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addon/mod/choice/components/index/addon-mod-choice-index.html
@@ -19,13 +19,13 @@
     <!-- Activity availability messages -->
     <ion-card class="core-info-card" icon-start *ngIf="choiceNotOpenYet">
         <ion-icon name="information-circle"></ion-icon>
-        <p *ngIf="options && options.length">{{ 'addon.mod_choice.previewonly' | translate:{$a: choice.openTimeReadable} }}</p>
-        <p *ngIf="!options || !options.length">{{ 'addon.mod_choice.notopenyet' | translate:{$a: choice.openTimeReadable} }}</p>
+        <p *ngIf="options && options.length">{{ 'addon.mod_choice.previewonly' | translate:{$a: openTimeReadable} }}</p>
+        <p *ngIf="!options || !options.length">{{ 'addon.mod_choice.notopenyet' | translate:{$a: openTimeReadable} }}</p>
     </ion-card>
     <ion-card class="core-info-card" icon-start *ngIf="choiceClosed">
         <ion-icon name="information-circle"></ion-icon>
         <p *ngIf="options && options.length">{{ 'addon.mod_choice.yourselection' | translate }} <core-format-text [text]="options[0].text"></core-format-text></p>
-        <p>{{ 'addon.mod_choice.expired' | translate:{$a: choice.closeTimeReadable} }}</p>
+        <p>{{ 'addon.mod_choice.expired' | translate:{$a: closeTimeReadable} }}</p>
     </ion-card>
 
     <!-- Choice done in offline but not synchronized -->
@@ -80,7 +80,7 @@
                     <ion-item-group *ngFor="let result of results">
                         <ion-item-divider text-wrap>
                             <h2><core-format-text [text]="result.text"></core-format-text></h2>
-                            <p>{{ 'addon.mod_choice.numberofuser' | translate }}: {{ result.numberofuser }} ({{ 'core.percentagenumber' | translate: {$a: result.percentageamount} }})</p>
+                            <p>{{ 'addon.mod_choice.numberofuser' | translate }}: {{ result.numberofuser }} ({{ 'core.percentagenumber' | translate: {$a: result.percentageamountfixed} }})</p>
                         </ion-item-divider>
                         <a ion-item *ngFor="let user of result.userresponses" core-user-link [courseId]="courseid" [userId]="user.userid" [title]="user.fullname" text-wrap>
                             <ion-avatar core-user-avatar [user]="user" item-start [courseId]="courseid"></ion-avatar>
diff --git a/src/addon/mod/choice/components/index/index.ts b/src/addon/mod/choice/components/index/index.ts
index c5bcdc852..6e3b5799e 100644
--- a/src/addon/mod/choice/components/index/index.ts
+++ b/src/addon/mod/choice/components/index/index.ts
@@ -16,7 +16,7 @@ import { Component, Optional, Injector } from '@angular/core';
 import { Content } from 'ionic-angular';
 import { CoreTimeUtilsProvider } from '@providers/utils/time';
 import { CoreCourseModuleMainActivityComponent } from '@core/course/classes/main-activity-component';
-import { AddonModChoiceProvider } from '../../providers/choice';
+import { AddonModChoiceProvider, AddonModChoiceChoice, AddonModChoiceOption, AddonModChoiceResult } from '../../providers/choice';
 import { AddonModChoiceOfflineProvider } from '../../providers/offline';
 import { AddonModChoiceSyncProvider } from '../../providers/sync';
 
@@ -31,9 +31,9 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
     component = AddonModChoiceProvider.COMPONENT;
     moduleName = 'choice';
 
-    choice: any;
-    options = [];
-    selectedOption: any;
+    choice: AddonModChoiceChoice;
+    options: AddonModChoiceOption[] = [];
+    selectedOption: {id: number};
     choiceNotOpenYet = false;
     choiceClosed = false;
     canEdit = false;
@@ -43,6 +43,8 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
     labels = [];
     results = [];
     publishInfo: string; // Message explaining the user what will happen with his choices.
+    openTimeReadable: string;
+    closeTimeReadable: string;
 
     protected userId: number;
     protected syncEventName = AddonModChoiceSyncProvider.AUTO_SYNCED;
@@ -122,12 +124,12 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
 
         return this.choiceProvider.getChoice(this.courseId, this.module.id).then((choice) => {
             this.choice = choice;
-            this.choice.timeopen = parseInt(choice.timeopen) * 1000;
-            this.choice.openTimeReadable = this.timeUtils.userDate(choice.timeopen);
-            this.choice.timeclose = parseInt(choice.timeclose) * 1000;
-            this.choice.closeTimeReadable = this.timeUtils.userDate(choice.timeclose);
+            this.choice.timeopen = choice.timeopen * 1000;
+            this.choice.timeclose = choice.timeclose * 1000;
+            this.openTimeReadable = this.timeUtils.userDate(choice.timeopen);
+            this.closeTimeReadable = this.timeUtils.userDate(choice.timeclose);
 
-            this.description = choice.intro || choice.description;
+            this.description = choice.intro;
             this.choiceNotOpenYet = choice.timeopen && choice.timeopen > this.now;
             this.choiceClosed = choice.timeclose && choice.timeclose <= this.now;
 
@@ -175,7 +177,7 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
 
             if (hasOffline) {
                 promise = this.choiceOffline.getResponse(this.choice.id).then((response) => {
-                    const optionsKeys = {};
+                    const optionsKeys: {[id: number]: AddonModChoiceOption} = {};
                     options.forEach((option) => {
                         optionsKeys[option.id] = option;
                     });
@@ -223,7 +225,7 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
                 promise = Promise.resolve(options);
             }
 
-            promise.then((options) => {
+            promise.then((options: AddonModChoiceOption[]) => {
                 const isOpen = this.isChoiceOpen();
 
                 let hasAnswered = false;
@@ -291,11 +293,11 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
             let hasVotes = false;
             this.data = [];
             this.labels = [];
-            results.forEach((result) => {
+            results.forEach((result: AddonModChoiceResultFormatted) => {
                 if (result.numberofuser > 0) {
                     hasVotes = true;
                 }
-                result.percentageamount = parseFloat(result.percentageamount).toFixed(1);
+                result.percentageamountfixed = result.percentageamount.toFixed(1);
                 this.data.push(result.numberofuser);
                 this.labels.push(result.text);
             });
@@ -429,3 +431,10 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
         return result.updated;
     }
 }
+
+/**
+ * Choice result with some calculated data.
+ */
+export type AddonModChoiceResultFormatted = AddonModChoiceResult & {
+    percentageamountfixed: string; // Percentage of users answers with fixed decimals.
+};
diff --git a/src/addon/mod/choice/providers/choice.ts b/src/addon/mod/choice/providers/choice.ts
index b16119516..246903592 100644
--- a/src/addon/mod/choice/providers/choice.ts
+++ b/src/addon/mod/choice/providers/choice.ts
@@ -20,6 +20,7 @@ import { CoreFilepoolProvider } from '@providers/filepool';
 import { CoreCourseLogHelperProvider } from '@core/course/providers/log-helper';
 import { AddonModChoiceOfflineProvider } from './offline';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
+import { CoreWSExternalWarning, CoreWSExternalFile } from '@providers/ws';
 
 /**
  * Service that provides some features for choices.
@@ -118,7 +119,9 @@ export class AddonModChoiceProvider {
                 responses: responses
             };
 
-            return site.write('mod_choice_delete_choice_responses', params).then((response) => {
+            return site.write('mod_choice_delete_choice_responses', params)
+                    .then((response: AddonModChoiceDeleteChoiceResponsesResult) => {
+
                 // Other errors ocurring.
                 if (!response || response.status === false) {
                     return Promise.reject(this.utils.createFakeWSError(''));
@@ -179,7 +182,7 @@ export class AddonModChoiceProvider {
      * @return Promise resolved when the choice is retrieved.
      */
     protected getChoiceByDataKey(siteId: string, courseId: number, key: string, value: any, forceCache?: boolean,
-            ignoreCache?: boolean): Promise<any> {
+            ignoreCache?: boolean): Promise<AddonModChoiceChoice> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
@@ -198,7 +201,9 @@ export class AddonModChoiceProvider {
                 preSets.emergencyCache = false;
             }
 
-            return site.read('mod_choice_get_choices_by_courses', params, preSets).then((response) => {
+            return site.read('mod_choice_get_choices_by_courses', params, preSets)
+                    .then((response: AddonModChoiceGetChoicesByCoursesResult): any => {
+
                 if (response && response.choices) {
                     const currentChoice = response.choices.find((choice) => choice[key] == value);
                     if (currentChoice) {
@@ -221,7 +226,8 @@ export class AddonModChoiceProvider {
      * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
      * @return Promise resolved when the choice is retrieved.
      */
-    getChoice(courseId: number, cmId: number, siteId?: string, forceCache?: boolean, ignoreCache?: boolean): Promise<any> {
+    getChoice(courseId: number, cmId: number, siteId?: string, forceCache?: boolean, ignoreCache?: boolean)
+            : Promise<AddonModChoiceChoice> {
         return this.getChoiceByDataKey(siteId, courseId, 'coursemodule', cmId, forceCache, ignoreCache);
     }
 
@@ -235,7 +241,8 @@ export class AddonModChoiceProvider {
      * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
      * @return Promise resolved when the choice is retrieved.
      */
-    getChoiceById(courseId: number, choiceId: number, siteId?: string, forceCache?: boolean, ignoreCache?: boolean): Promise<any> {
+    getChoiceById(courseId: number, choiceId: number, siteId?: string, forceCache?: boolean, ignoreCache?: boolean)
+            : Promise<AddonModChoiceChoice> {
         return this.getChoiceByDataKey(siteId, courseId, 'id', choiceId, forceCache, ignoreCache);
     }
 
@@ -247,7 +254,7 @@ export class AddonModChoiceProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with choice options.
      */
-    getOptions(choiceId: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
+    getOptions(choiceId: number, ignoreCache?: boolean, siteId?: string): Promise<AddonModChoiceOption[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                 choiceid: choiceId
@@ -262,7 +269,9 @@ export class AddonModChoiceProvider {
                 preSets.emergencyCache = false;
             }
 
-            return site.read('mod_choice_get_choice_options', params, preSets).then((response) => {
+            return site.read('mod_choice_get_choice_options', params, preSets)
+                    .then((response: AddonModChoiceGetChoiceOptionsResult): any => {
+
                 if (response.options) {
                     return response.options;
                 }
@@ -280,7 +289,7 @@ export class AddonModChoiceProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with choice results.
      */
-    getResults(choiceId: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
+    getResults(choiceId: number, ignoreCache?: boolean, siteId?: string): Promise<AddonModChoiceResult[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                 choiceid: choiceId
@@ -294,7 +303,9 @@ export class AddonModChoiceProvider {
                 preSets.emergencyCache = false;
             }
 
-            return site.read('mod_choice_get_choice_results', params, preSets).then((response) => {
+            return site.read('mod_choice_get_choice_results', params, preSets)
+                    .then((response: AddonModChoiceGetChoiceResults): any => {
+
                 if (response.options) {
                     return response.options;
                 }
@@ -456,3 +467,96 @@ export class AddonModChoiceProvider {
         });
     }
 }
+
+/**
+ * Choice returned by mod_choice_get_choices_by_courses.
+ */
+export type AddonModChoiceChoice = {
+    id: number; // Choice instance id.
+    coursemodule: number; // Course module id.
+    course: number; // Course id.
+    name: string; // Choice name.
+    intro: string; // The choice intro.
+    introformat: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    introfiles?: CoreWSExternalFile[]; // @since 3.2.
+    publish?: boolean; // If choice is published.
+    showresults?: number; // 0 never, 1 after answer, 2 after close, 3 always.
+    display?: number; // Display mode (vertical, horizontal).
+    allowupdate?: boolean; // Allow update.
+    allowmultiple?: boolean; // Allow multiple choices.
+    showunanswered?: boolean; // Show users who not answered yet.
+    includeinactive?: boolean; // Include inactive users.
+    limitanswers?: boolean; // Limit unswers.
+    timeopen?: number; // Date of opening validity.
+    timeclose?: number; // Date of closing validity.
+    showpreview?: boolean; // Show preview before timeopen.
+    timemodified?: number; // Time of last modification.
+    completionsubmit?: boolean; // Completion on user submission.
+    section?: number; // Course section id.
+    visible?: boolean; // Visible.
+    groupmode?: number; // Group mode.
+    groupingid?: number; // Group id.
+};
+
+/**
+ * Option returned by mod_choice_get_choice_options.
+ */
+export type AddonModChoiceOption = {
+    id: number; // Option id.
+    text: string; // Text of the choice.
+    maxanswers: number; // Maximum number of answers.
+    displaylayout: boolean; // True for orizontal, otherwise vertical.
+    countanswers: number; // Number of answers.
+    checked: boolean; // We already answered.
+    disabled: boolean; // Option disabled.
+};
+
+/**
+ * Result returned by mod_choice_get_choice_results.
+ */
+export type AddonModChoiceResult = {
+    id: number; // Choice instance id.
+    text: string; // Text of the choice.
+    maxanswer: number; // Maximum number of answers.
+    userresponses: {
+        userid: number; // User id.
+        fullname: string; // User full name.
+        profileimageurl: string; // Profile user image url.
+        answerid?: number; // Answer id.
+        timemodified?: number; // Time of modification.
+    }[];
+    numberofuser: number; // Number of users answers.
+    percentageamount: number; // Percentage of users answers.
+};
+
+/**
+ * Result of WS mod_choice_get_choices_by_courses.
+ */
+export type AddonModChoiceGetChoicesByCoursesResult = {
+    choices: AddonModChoiceChoice[];
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS mod_choice_get_choice_options.
+ */
+export type AddonModChoiceGetChoiceOptionsResult = {
+    options: AddonModChoiceOption[]; // Options.
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS mod_choice_get_choice_results.
+ */
+export type AddonModChoiceGetChoiceResults = {
+    options: AddonModChoiceResult[];
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS mod_choice_delete_choice_responses.
+ */
+export type AddonModChoiceDeleteChoiceResponsesResult = {
+    status: boolean; // Status, true if everything went right.
+    warnings?: CoreWSExternalWarning[];
+};

From a2fbe1c808a01d7f9d2a953c55a5132ced37f295 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 10 Sep 2019 08:38:09 +0200
Subject: [PATCH 021/257] MOBILE-3109 lti: Add return types to lti

---
 src/addon/mod/lti/components/index/index.ts |  6 +-
 src/addon/mod/lti/providers/lti.ts          | 83 ++++++++++++++++++---
 2 files changed, 76 insertions(+), 13 deletions(-)

diff --git a/src/addon/mod/lti/components/index/index.ts b/src/addon/mod/lti/components/index/index.ts
index 53819e792..f454dec08 100644
--- a/src/addon/mod/lti/components/index/index.ts
+++ b/src/addon/mod/lti/components/index/index.ts
@@ -15,7 +15,7 @@
 import { Component, Optional, Injector } from '@angular/core';
 import { Content } from 'ionic-angular';
 import { CoreCourseModuleMainActivityComponent } from '@core/course/classes/main-activity-component';
-import { AddonModLtiProvider } from '../../providers/lti';
+import { AddonModLtiProvider, AddonModLtiLti } from '../../providers/lti';
 
 /**
  * Component that displays an LTI entry page.
@@ -28,7 +28,7 @@ export class AddonModLtiIndexComponent extends CoreCourseModuleMainActivityCompo
     component = AddonModLtiProvider.COMPONENT;
     moduleName = 'lti';
 
-    lti: any; // The LTI object.
+    lti: AddonModLtiLti; // The LTI object.
 
     protected fetchContentDefaultError = 'addon.mod_lti.errorgetlti';
 
@@ -65,7 +65,7 @@ export class AddonModLtiIndexComponent extends CoreCourseModuleMainActivityCompo
     protected fetchContent(refresh: boolean = false, sync: boolean = false, showErrors: boolean = false): Promise<any> {
         return this.ltiProvider.getLti(this.courseId, this.module.id).then((ltiData) => {
             this.lti = ltiData;
-            this.description = this.lti.intro || this.description;
+            this.description = this.lti.intro;
             this.dataRetrieved.emit(this.lti);
         }).then(() => {
             // All data obtained, now fill the context menu.
diff --git a/src/addon/mod/lti/providers/lti.ts b/src/addon/mod/lti/providers/lti.ts
index 73eef5121..8ea9b09e9 100644
--- a/src/addon/mod/lti/providers/lti.ts
+++ b/src/addon/mod/lti/providers/lti.ts
@@ -22,11 +22,7 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreUrlUtilsProvider } from '@providers/utils/url';
 import { CoreCourseLogHelperProvider } from '@core/course/providers/log-helper';
 import { CoreSite } from '@classes/site';
-
-export interface AddonModLtiParam {
-    name: string;
-    value: string;
-}
+import { CoreWSExternalWarning, CoreWSExternalFile } from '@providers/ws';
 
 /**
  * Service that provides some features for LTI.
@@ -104,7 +100,7 @@ export class AddonModLtiProvider {
      * @param cmId Course module ID.
      * @return Promise resolved when the LTI is retrieved.
      */
-    getLti(courseId: number, cmId: number): Promise<any> {
+    getLti(courseId: number, cmId: number): Promise<AddonModLtiLti> {
         const params: any = {
             courseids: [courseId]
         };
@@ -113,7 +109,9 @@ export class AddonModLtiProvider {
             updateFrequency: CoreSite.FREQUENCY_RARELY
         };
 
-        return this.sitesProvider.getCurrentSite().read('mod_lti_get_ltis_by_courses', params, preSets).then((response) => {
+        return this.sitesProvider.getCurrentSite().read('mod_lti_get_ltis_by_courses', params, preSets)
+                .then((response: AddonModLtiGetLtisByCoursesResult): any => {
+
             if (response.ltis) {
                 const currentLti = response.ltis.find((lti) => lti.coursemodule == cmId);
                 if (currentLti) {
@@ -141,8 +139,8 @@ export class AddonModLtiProvider {
      * @param id LTI id.
      * @return Promise resolved when the launch data is retrieved.
      */
-    getLtiLaunchData(id: number): Promise<any> {
-        const params: any = {
+    getLtiLaunchData(id: number): Promise<AddonModLtiGetToolLaunchDataResult> {
+        const params = {
             toolid: id
         };
 
@@ -154,7 +152,9 @@ export class AddonModLtiProvider {
             cacheKey: this.getLtiLaunchDataCacheKey(id)
         };
 
-        return this.sitesProvider.getCurrentSite().read('mod_lti_get_tool_launch_data', params, preSets).then((response) => {
+        return this.sitesProvider.getCurrentSite().read('mod_lti_get_tool_launch_data', params, preSets)
+                .then((response: AddonModLtiGetToolLaunchDataResult): any => {
+
             if (response.endpoint) {
                 return response;
             }
@@ -227,3 +227,66 @@ export class AddonModLtiProvider {
         return this.logHelper.logSingle('mod_lti_view_lti', params, AddonModLtiProvider.COMPONENT, id, name, 'lti', {}, siteId);
     }
 }
+
+/**
+ * LTI returned by mod_lti_get_ltis_by_courses.
+ */
+export type AddonModLtiLti = {
+    id: number; // External tool id.
+    coursemodule: number; // Course module id.
+    course: number; // Course id.
+    name: string; // LTI name.
+    intro?: string; // The LTI intro.
+    introformat?: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    introfiles?: CoreWSExternalFile[]; // @since 3.2.
+    timecreated?: number; // Time of creation.
+    timemodified?: number; // Time of last modification.
+    typeid?: number; // Type id.
+    toolurl?: string; // Tool url.
+    securetoolurl?: string; // Secure tool url.
+    instructorchoicesendname?: string; // Instructor choice send name.
+    instructorchoicesendemailaddr?: number; // Instructor choice send mail address.
+    instructorchoiceallowroster?: number; // Instructor choice allow roster.
+    instructorchoiceallowsetting?: number; // Instructor choice allow setting.
+    instructorcustomparameters?: string; // Instructor custom parameters.
+    instructorchoiceacceptgrades?: number; // Instructor choice accept grades.
+    grade?: number; // Enable grades.
+    launchcontainer?: number; // Launch container mode.
+    resourcekey?: string; // Resource key.
+    password?: string; // Shared secret.
+    debuglaunch?: number; // Debug launch.
+    showtitlelaunch?: number; // Show title launch.
+    showdescriptionlaunch?: number; // Show description launch.
+    servicesalt?: string; // Service salt.
+    icon?: string; // Alternative icon URL.
+    secureicon?: string; // Secure icon URL.
+    section?: number; // Course section id.
+    visible?: number; // Visible.
+    groupmode?: number; // Group mode.
+    groupingid?: number; // Group id.
+};
+
+/**
+ * Param to send to the LTI.
+ */
+export type AddonModLtiParam = {
+    name: string; // Parameter name.
+    value: string; // Parameter value.
+};
+
+/**
+ * Result of WS mod_lti_get_ltis_by_courses.
+ */
+export type AddonModLtiGetLtisByCoursesResult = {
+    ltis: AddonModLtiLti[];
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS mod_lti_get_tool_launch_data.
+ */
+export type AddonModLtiGetToolLaunchDataResult = {
+    endpoint: string; // Endpoint URL.
+    parameters: AddonModLtiParam[];
+    warnings?: CoreWSExternalWarning[];
+};

From a779e69b4987628deecc483b8b87e988947e16c0 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 10 Sep 2019 09:39:15 +0200
Subject: [PATCH 022/257] MOBILE-3109 survey: Add return types to survey

---
 .../index/addon-mod-survey-index.html         | 12 +--
 .../mod/survey/components/index/index.ts      | 16 ++--
 src/addon/mod/survey/providers/helper.ts      | 29 +++++--
 src/addon/mod/survey/providers/survey.ts      | 87 ++++++++++++++++---
 4 files changed, 111 insertions(+), 33 deletions(-)

diff --git a/src/addon/mod/survey/components/index/addon-mod-survey-index.html b/src/addon/mod/survey/components/index/addon-mod-survey-index.html
index da07713d4..3f5eec9f1 100644
--- a/src/addon/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addon/mod/survey/components/index/addon-mod-survey-index.html
@@ -36,14 +36,14 @@
 
         <ng-container *ngFor="let question of questions; let index=index; let isEven=even;">
             <!-- Parent question (Category header) -->
-            <div *ngIf="question.multi && question.multi.length" [attr.padding-top]="index == 1">
+            <div *ngIf="question.multiArray && question.multiArray.length" [attr.padding-top]="index == 1">
                 <h3 padding-horizontal>{{ question.text }}</h3>
                 <ion-grid no-padding>
                     <ion-row no-padding align-items-center class="hidden-phone">
                         <ion-col col-7>
                             <div padding>{{ 'addon.mod_survey.responses' | translate }}</div>
                         </ion-col>
-                        <ion-col text-center *ngFor="let option of question.options">
+                        <ion-col text-center *ngFor="let option of question.optionsArray">
                             <div padding>{{ option }}</div>
                         </ion-col>
                     </ion-row>
@@ -61,20 +61,20 @@
                     </ion-col>
 
                     <!-- Tablet view: radio buttons -->
-                    <ion-col class="hidden-phone" text-center *ngFor="let option of question.options; let value=index;">
+                    <ion-col class="hidden-phone" text-center *ngFor="let option of question.optionsArray; let value=index;">
                         <ion-radio [value]="value + 1" [attr.aria-labelledby]="'addon-mod_survey-'+question.name"></ion-radio>
                     </ion-col>
                     <ion-col class="hidden-tablet">
                         <ion-select padding [(ngModel)]="answers[question.name]" [attr.aria-labelledby]="'addon-mod_survey-'+question.name" interface="action-sheet" [required]="question.required">
                             <ion-option value="-1" selected disabled>{{ 'core.choose' | translate }}</ion-option>
-                            <ion-option *ngFor="let option of question.options; let value=index;" [value]="value +1">{{option}}</ion-option>
+                            <ion-option *ngFor="let option of question.optionsArray; let value=index;" [value]="value +1">{{option}}</ion-option>
                         </ion-select>
                     </ion-col>
                 </ion-row>
             </ion-grid>
 
             <!-- Single question (don't belong to a category) -->
-            <ng-container *ngIf="(!question.multi || question.multi.length == 0) && question.parent === 0">
+            <ng-container *ngIf="(!question.multiArray || question.multiArray.length == 0) && question.parent === 0">
                 <ion-grid no-padding text-wrap *ngIf="question.type > 0" [class.even]="isEven">
                     <ion-row no-padding align-items-center>
                         <ion-col col-7>
@@ -82,7 +82,7 @@
                         </ion-col>
                         <ion-col col-5>
                             <ion-select padding [(ngModel)]="answers[question.name]" [attr.aria-labelledby]="'addon-mod_survey-'+question.name" interface="action-sheet" [required]="question.required">
-                            <ion-option *ngFor="let option of question.options; let value=index;" [value]="value">{{option}}</ion-option>
+                            <ion-option *ngFor="let option of question.optionsArray; let value=index;" [value]="value">{{option}}</ion-option>
                         </ion-select>
                         </ion-col>
                     </ion-row>
diff --git a/src/addon/mod/survey/components/index/index.ts b/src/addon/mod/survey/components/index/index.ts
index 23f479553..e1715f02a 100644
--- a/src/addon/mod/survey/components/index/index.ts
+++ b/src/addon/mod/survey/components/index/index.ts
@@ -15,8 +15,8 @@
 import { Component, Optional, Injector } from '@angular/core';
 import { Content } from 'ionic-angular';
 import { CoreCourseModuleMainActivityComponent } from '@core/course/classes/main-activity-component';
-import { AddonModSurveyProvider } from '../../providers/survey';
-import { AddonModSurveyHelperProvider } from '../../providers/helper';
+import { AddonModSurveyProvider, AddonModSurveySurvey } from '../../providers/survey';
+import { AddonModSurveyHelperProvider, AddonModSurveyQuestionFormatted } from '../../providers/helper';
 import { AddonModSurveyOfflineProvider } from '../../providers/offline';
 import { AddonModSurveySyncProvider } from '../../providers/sync';
 
@@ -31,8 +31,8 @@ export class AddonModSurveyIndexComponent extends CoreCourseModuleMainActivityCo
     component = AddonModSurveyProvider.COMPONENT;
     moduleName = 'survey';
 
-    survey: any;
-    questions: any;
+    survey: AddonModSurveySurvey;
+    questions: AddonModSurveyQuestionFormatted[];
     answers = {};
 
     protected userId: number;
@@ -103,7 +103,7 @@ export class AddonModSurveyIndexComponent extends CoreCourseModuleMainActivityCo
         return this.surveyProvider.getSurvey(this.courseId, this.module.id).then((survey) => {
             this.survey = survey;
 
-            this.description = survey.intro || survey.description;
+            this.description = survey.intro;
             this.dataRetrieved.emit(survey);
 
             if (sync) {
@@ -144,13 +144,13 @@ export class AddonModSurveyIndexComponent extends CoreCourseModuleMainActivityCo
             // Init answers object.
             this.questions.forEach((q) => {
                 if (q.name) {
-                    const isTextArea = q.multi && q.multi.length === 0 && q.type === 0;
+                    const isTextArea = q.multiArray && q.multiArray.length === 0 && q.type === 0;
                     this.answers[q.name] = q.required ? -1 : (isTextArea ? '' : '0');
                 }
 
-                if (q.multi && !q.multi.length && q.parent === 0 && q.type > 0) {
+                if (q.multiArray && !q.multiArray.length && q.parent === 0 && q.type > 0) {
                     // Options shown in a select. Remove all HTML.
-                    q.options = q.options.map((option) => {
+                    q.optionsArray = q.optionsArray.map((option) => {
                         return this.textUtils.cleanTags(option);
                     });
                 }
diff --git a/src/addon/mod/survey/providers/helper.ts b/src/addon/mod/survey/providers/helper.ts
index 23d7dc9b4..1553bd9d4 100644
--- a/src/addon/mod/survey/providers/helper.ts
+++ b/src/addon/mod/survey/providers/helper.ts
@@ -14,6 +14,7 @@
 
 import { Injectable } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
+import { AddonModSurveyQuestion } from './survey';
 
 /**
  * Service that provides helper functions for surveys.
@@ -29,7 +30,7 @@ export class AddonModSurveyHelperProvider {
      * @param value Value to convert.
      * @return Array.
      */
-    protected commaStringToArray(value: any): string[] {
+    protected commaStringToArray(value: string | string[]): string[] {
         if (typeof value == 'string') {
             if (value.length > 0) {
                 return value.split(',');
@@ -47,7 +48,7 @@ export class AddonModSurveyHelperProvider {
      * @param questions Questions.
      * @return Object with parent questions.
      */
-    protected getParentQuestions(questions: any[]): any {
+    protected getParentQuestions(questions: AddonModSurveyQuestion[]): {[id: number]: AddonModSurveyQuestion} {
         const parents = {};
 
         questions.forEach((question) => {
@@ -66,24 +67,24 @@ export class AddonModSurveyHelperProvider {
      * @param questions Questions.
      * @return Promise resolved with the formatted questions.
      */
-    formatQuestions(questions: any[]): any[] {
+    formatQuestions(questions: AddonModSurveyQuestion[]): AddonModSurveyQuestionFormatted[] {
 
         const strIPreferThat = this.translate.instant('addon.mod_survey.ipreferthat'),
             strIFoundThat = this.translate.instant('addon.mod_survey.ifoundthat'),
             strChoose = this.translate.instant('core.choose'),
-            formatted = [],
+            formatted: AddonModSurveyQuestionFormatted[] = [],
             parents = this.getParentQuestions(questions);
 
         let num = 1;
 
         questions.forEach((question) => {
             // Copy the object to prevent modifying the original.
-            const q1 = Object.assign({}, question),
+            const q1: AddonModSurveyQuestionFormatted = Object.assign({}, question),
                 parent = parents[q1.parent];
 
             // Turn multi and options into arrays.
-            q1.multi = this.commaStringToArray(q1.multi);
-            q1.options = this.commaStringToArray(q1.options);
+            q1.multiArray = this.commaStringToArray(q1.multi);
+            q1.optionsArray = this.commaStringToArray(q1.options);
 
             if (parent) {
                 // It's a sub-question.
@@ -114,7 +115,7 @@ export class AddonModSurveyHelperProvider {
                 q1.name = 'q' + q1.id;
                 q1.num = num++;
                 if (q1.type > 0) { // Add "choose" option since this question is not required.
-                    q1.options.unshift(strChoose);
+                    q1.optionsArray.unshift(strChoose);
                 }
             }
 
@@ -123,5 +124,15 @@ export class AddonModSurveyHelperProvider {
 
         return formatted;
     }
-
 }
+
+/**
+ * Survey question with some calculated data.
+ */
+export type AddonModSurveyQuestionFormatted = AddonModSurveyQuestion & {
+    required?: boolean; // Calculated in the app. Whether the question is required.
+    name?: string; // Calculated in the app. The name of the question.
+    num?: number; // Calculated in the app. Number of the question.
+    multiArray?: string[]; // Subquestions ids, converted to an array.
+    optionsArray?: string[]; // Question options, converted to an array.
+};
diff --git a/src/addon/mod/survey/providers/survey.ts b/src/addon/mod/survey/providers/survey.ts
index 078fae02c..428a3db39 100644
--- a/src/addon/mod/survey/providers/survey.ts
+++ b/src/addon/mod/survey/providers/survey.ts
@@ -21,6 +21,7 @@ import { CoreFilepoolProvider } from '@providers/filepool';
 import { CoreCourseLogHelperProvider } from '@core/course/providers/log-helper';
 import { AddonModSurveyOfflineProvider } from './offline';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
+import { CoreWSExternalWarning, CoreWSExternalFile } from '@providers/ws';
 
 /**
  * Service that provides some features for surveys.
@@ -46,7 +47,7 @@ export class AddonModSurveyProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the questions are retrieved.
      */
-    getQuestions(surveyId: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
+    getQuestions(surveyId: number, ignoreCache?: boolean, siteId?: string): Promise<AddonModSurveyQuestion[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                     surveyid: surveyId
@@ -61,7 +62,9 @@ export class AddonModSurveyProvider {
                 preSets.emergencyCache = false;
             }
 
-            return site.read('mod_survey_get_questions', params, preSets).then((response) => {
+            return site.read('mod_survey_get_questions', params, preSets)
+                    .then((response: AddonModSurveyGetQuestionsResult): any => {
+
                 if (response.questions) {
                     return response.questions;
                 }
@@ -101,7 +104,9 @@ export class AddonModSurveyProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the survey is retrieved.
      */
-    protected getSurveyDataByKey(courseId: number, key: string, value: any, ignoreCache?: boolean, siteId?: string): Promise<any> {
+    protected getSurveyDataByKey(courseId: number, key: string, value: any, ignoreCache?: boolean, siteId?: string)
+            : Promise<AddonModSurveySurvey> {
+
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                     courseids: [courseId]
@@ -116,7 +121,9 @@ export class AddonModSurveyProvider {
                 preSets.emergencyCache = false;
             }
 
-            return site.read('mod_survey_get_surveys_by_courses', params, preSets).then((response) => {
+            return site.read('mod_survey_get_surveys_by_courses', params, preSets)
+                    .then((response: AddonModSurveyGetSurveysByCoursesResult): any => {
+
                 if (response && response.surveys) {
                     const currentSurvey = response.surveys.find((survey) => {
                         return survey[key] == value;
@@ -140,7 +147,7 @@ export class AddonModSurveyProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the survey is retrieved.
      */
-    getSurvey(courseId: number, cmId: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
+    getSurvey(courseId: number, cmId: number, ignoreCache?: boolean, siteId?: string): Promise<AddonModSurveySurvey> {
         return this.getSurveyDataByKey(courseId, 'coursemodule', cmId, ignoreCache, siteId);
     }
 
@@ -153,7 +160,7 @@ export class AddonModSurveyProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the survey is retrieved.
      */
-    getSurveyById(courseId: number, id: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
+    getSurveyById(courseId: number, id: number, ignoreCache?: boolean, siteId?: string): Promise<AddonModSurveySurvey> {
         return this.getSurveyDataByKey(courseId, 'id', id, ignoreCache, siteId);
     }
 
@@ -277,17 +284,16 @@ export class AddonModSurveyProvider {
      * @param surveyId Survey ID.
      * @param answers Answers.
      * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved when answers are successfully submitted. Rejected with object containing
-     *         the error message (if any) and a boolean indicating if the error was returned by WS.
+     * @return Promise resolved when answers are successfully submitted.
      */
-    submitAnswersOnline(surveyId: number, answers: any[], siteId?: string): Promise<any> {
+    submitAnswersOnline(surveyId: number, answers: any[], siteId?: string): Promise<void> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
                 surveyid: surveyId,
                 answers: answers
             };
 
-            return site.write('mod_survey_submit_answers', params).then((response) => {
+            return site.write('mod_survey_submit_answers', params).then((response: AddonModSurveySubmitAnswersResult) => {
                 if (!response.status) {
                     return Promise.reject(this.utils.createFakeWSError(''));
                 }
@@ -295,3 +301,64 @@ export class AddonModSurveyProvider {
         });
     }
 }
+
+/**
+ * Survey returned by WS mod_survey_get_surveys_by_courses.
+ */
+export type AddonModSurveySurvey = {
+    id: number; // Survey id.
+    coursemodule: number; // Course module id.
+    course: number; // Course id.
+    name: string; // Survey name.
+    intro?: string; // The Survey intro.
+    introformat?: number; // Intro format (1 = HTML, 0 = MOODLE, 2 = PLAIN or 4 = MARKDOWN).
+    introfiles?: CoreWSExternalFile[]; // @since 3.2.
+    template?: number; // Survey type.
+    days?: number; // Days.
+    questions?: string; // Question ids.
+    surveydone?: number; // Did I finish the survey?.
+    timecreated?: number; // Time of creation.
+    timemodified?: number; // Time of last modification.
+    section?: number; // Course section id.
+    visible?: number; // Visible.
+    groupmode?: number; // Group mode.
+    groupingid?: number; // Group id.
+};
+
+/**
+ * Survey question.
+ */
+export type AddonModSurveyQuestion = {
+    id: number; // Question id.
+    text: string; // Question text.
+    shorttext: string; // Question short text.
+    multi: string; // Subquestions ids.
+    intro: string; // The question intro.
+    type: number; // Question type.
+    options: string; // Question options.
+    parent: number; // Parent question (for subquestions).
+};
+
+/**
+ * Result of WS mod_survey_get_questions.
+ */
+export type AddonModSurveyGetQuestionsResult = {
+    questions: AddonModSurveyQuestion[];
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS mod_survey_get_surveys_by_courses.
+ */
+export type AddonModSurveyGetSurveysByCoursesResult = {
+    surveys: AddonModSurveySurvey[];
+    warnings?: CoreWSExternalWarning[];
+};
+
+/**
+ * Result of WS mod_survey_submit_answers.
+ */
+export type AddonModSurveySubmitAnswersResult = {
+    status: boolean; // Status: true if success.
+    warnings?: CoreWSExternalWarning[];
+};

From 3b15b1a0fb647c0f6fb48ae0407556bfa9f461e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 2 Sep 2019 16:04:44 +0200
Subject: [PATCH 023/257] MOBILE-3130 comments: Use count field to get real
 comment count

---
 src/core/comments/comments.module.ts     |  2 +-
 src/core/comments/pages/viewer/viewer.ts |  7 +++++-
 src/core/comments/providers/comments.ts  | 28 +++++++++++++++---------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/core/comments/comments.module.ts b/src/core/comments/comments.module.ts
index d19d2ccf3..a216cde81 100644
--- a/src/core/comments/comments.module.ts
+++ b/src/core/comments/comments.module.ts
@@ -36,7 +36,7 @@ export class CoreCommentsModule {
     constructor(eventsProvider: CoreEventsProvider, cronDelegate: CoreCronDelegate, syncHandler: CoreCommentsSyncCronHandler) {
         // Reset comments page size.
         eventsProvider.on(CoreEventsProvider.LOGIN, () => {
-            CoreCommentsProvider.pageSize = null;
+            CoreCommentsProvider.pageSize = 1;
             CoreCommentsProvider.pageSizeOK = false;
         });
 
diff --git a/src/core/comments/pages/viewer/viewer.ts b/src/core/comments/pages/viewer/viewer.ts
index b1925c26d..db0973235 100644
--- a/src/core/comments/pages/viewer/viewer.ts
+++ b/src/core/comments/pages/viewer/viewer.ts
@@ -156,7 +156,12 @@ export class CoreCommentsViewerPage implements OnDestroy {
                 this.canAddComments = this.addDeleteCommentsAvailable && response.canpost;
 
                 const comments = response.comments.sort((a, b) => b.timecreated - a.timecreated);
-                this.canLoadMore = comments.length > 0 && comments.length >= CoreCommentsProvider.pageSize;
+                if (typeof response.count != 'undefined') {
+                    this.canLoadMore = (this.comments.length + comments.length) > response.count;
+                } else {
+                    // Old style.
+                    this.canLoadMore = response.comments.length > 0 && response.comments.length >= CoreCommentsProvider.pageSize;
+                }
 
                 return Promise.all(comments.map((comment) => {
                     // Get the user profile image.
diff --git a/src/core/comments/providers/comments.ts b/src/core/comments/providers/comments.ts
index b7a132cfe..04438b4fe 100644
--- a/src/core/comments/providers/comments.ts
+++ b/src/core/comments/providers/comments.ts
@@ -28,7 +28,7 @@ export class CoreCommentsProvider {
     static REFRESH_COMMENTS_EVENT = 'core_comments_refresh_comments';
 
     protected ROOT_CACHE_KEY = 'mmComments:';
-    static pageSize = null;
+    static pageSize = 1; // At least it will be one.
     static pageSizeOK = false; // If true, the pageSize is definitive. If not, it's a temporal value to reduce WS calls.
 
     constructor(private sitesProvider: CoreSitesProvider, private utils: CoreUtilsProvider, private appProvider: CoreAppProvider,
@@ -305,6 +305,11 @@ export class CoreCommentsProvider {
 
             return site.read('core_comment_get_comments', params, preSets).then((response) => {
                 if (response.comments) {
+                    // Update pageSize with the greatest count at the moment.
+                    if (typeof response.count == 'undefined' && response.comments.length > CoreCommentsProvider.pageSize) {
+                        CoreCommentsProvider.pageSize = response.comments.length;
+                    }
+
                     return response;
                 }
 
@@ -328,17 +333,19 @@ export class CoreCommentsProvider {
             siteId?: string): Promise<string> {
 
         siteId = siteId ? siteId : this.sitesProvider.getCurrentSiteId();
+        let trueCount = false;
 
         // Convenience function to get comments number on a page.
         const getCommentsPageCount = (page: number): Promise<number> => {
             return this.getComments(contextLevel, instanceId, component, itemId, area, page, siteId).then((response) => {
-                if (response.comments) {
-                    // Update pageSize with the greatest count at the moment.
-                    if (response.comments && response.comments.length > CoreCommentsProvider.pageSize) {
-                        CoreCommentsProvider.pageSize = response.comments.length;
-                    }
+                if (typeof response.count != 'undefined') {
+                    trueCount = true;
 
-                    return response.comments && response.comments.length ? response.comments.length : 0;
+                    return response.count;
+                }
+
+                if (response.comments) {
+                    return response.comments.length || 0;
                 }
 
                 return -1;
@@ -348,17 +355,18 @@ export class CoreCommentsProvider {
         };
 
         return getCommentsPageCount(0).then((count) => {
-            if (CoreCommentsProvider.pageSizeOK && count >= CoreCommentsProvider.pageSize) {
+            if (trueCount || count < CoreCommentsProvider.pageSize) {
+                return count + '';
+            } else if (CoreCommentsProvider.pageSizeOK && count >= CoreCommentsProvider.pageSize) {
                 // Page Size is ok, show + in case it reached the limit.
                 return (CoreCommentsProvider.pageSize - 1) + '+';
-            } else if (count < 0 || (CoreCommentsProvider.pageSize && count < CoreCommentsProvider.pageSize)) {
-                return count + '';
             }
 
             // Call to update page size.
             return getCommentsPageCount(1).then((countMore) => {
                 // Page limit was reached on the previous call.
                 if (countMore > 0) {
+                    CoreCommentsProvider.pageSizeOK = true;
 
                     return (CoreCommentsProvider.pageSize - 1) + '+';
                 }

From 716f76f9693c9a5cc19186ef80ac9b334242c303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 17 Sep 2019 13:03:18 +0200
Subject: [PATCH 024/257] MOBILE-3144 settings: Add color scheme setting

---
 scripts/langindex.json                       |  4 ++
 src/assets/lang/en.json                      |  4 ++
 src/config.json                              |  3 +-
 src/core/constants.ts                        |  1 +
 src/core/settings/lang/en.json               |  4 ++
 src/core/settings/pages/general/general.html |  6 +++
 src/core/settings/pages/general/general.ts   | 32 +++++++++++-
 src/core/settings/providers/helper.ts        | 52 +++++++++++++++++++-
 src/core/settings/settings.module.ts         |  6 ++-
 src/providers/utils/dom.ts                   |  5 --
 10 files changed, 107 insertions(+), 10 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index fe54142bd..741c90a6b 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1781,6 +1781,10 @@
   "core.settings.appready": "local_moodlemobileapp",
   "core.settings.cannotsyncoffline": "local_moodlemobileapp",
   "core.settings.cannotsyncwithoutwifi": "local_moodlemobileapp",
+  "core.settings.colorscheme": "local_moodlemobileapp",
+  "core.settings.colorscheme-auto": "local_moodlemobileapp",
+  "core.settings.colorscheme-dark": "local_moodlemobileapp",
+  "core.settings.colorscheme-light": "local_moodlemobileapp",
   "core.settings.compilationinfo": "local_moodlemobileapp",
   "core.settings.cordovadevicemodel": "local_moodlemobileapp",
   "core.settings.cordovadeviceosversion": "local_moodlemobileapp",
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index d837ace11..f8d0edfe3 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1779,6 +1779,10 @@
     "core.settings.appready": "App ready",
     "core.settings.cannotsyncoffline": "Cannot synchronise offline.",
     "core.settings.cannotsyncwithoutwifi": "Cannot synchronise because the current settings only allow to synchronise when connected to Wi-Fi. Please connect to a Wi-Fi network.",
+    "core.settings.colorscheme": "Color Scheme",
+    "core.settings.colorscheme-auto": "Auto (based on system settings)",
+    "core.settings.colorscheme-dark": "Dark",
+    "core.settings.colorscheme-light": "Light",
     "core.settings.compilationinfo": "Compilation info",
     "core.settings.cordovadevicemodel": "Cordova device model",
     "core.settings.cordovadeviceosversion": "Cordova device OS version",
diff --git a/src/config.json b/src/config.json
index 30d79ac4b..4fd352e58 100644
--- a/src/config.json
+++ b/src/config.json
@@ -89,5 +89,6 @@
     "statusbarlighttextandroid": true,
     "statusbarbgremotetheme": "#000000",
     "statusbarlighttextremotetheme": true,
-    "enableanalytics": false
+    "enableanalytics": false,
+    "forceColorScheme": ""
 }
diff --git a/src/core/constants.ts b/src/core/constants.ts
index a6f31c3a5..ccd5f9c71 100644
--- a/src/core/constants.ts
+++ b/src/core/constants.ts
@@ -36,6 +36,7 @@ export class CoreConstants {
     static SETTINGS_REPORT_IN_BACKGROUND = 'CoreSettingsReportInBackground'; // @deprecated since 3.5.0
     static SETTINGS_SEND_ON_ENTER = 'CoreSettingsSendOnEnter';
     static SETTINGS_FONT_SIZE = 'CoreSettingsFontSize';
+    static SETTINGS_COLOR_SCHEME = 'CoreSettingsColorScheme';
     static SETTINGS_ANALYTICS_ENABLED = 'CoreSettingsAnalyticsEnabled';
 
     // WS constants.
diff --git a/src/core/settings/lang/en.json b/src/core/settings/lang/en.json
index f0e09d02d..32a82c6cc 100644
--- a/src/core/settings/lang/en.json
+++ b/src/core/settings/lang/en.json
@@ -3,6 +3,10 @@
     "appready": "App ready",
     "cannotsyncoffline": "Cannot synchronise offline.",
     "cannotsyncwithoutwifi": "Cannot synchronise because the current settings only allow to synchronise when connected to Wi-Fi. Please connect to a Wi-Fi network.",
+    "colorscheme": "Color Scheme",
+    "colorscheme-auto": "Auto (based on system settings)",
+    "colorscheme-dark": "Dark",
+    "colorscheme-light": "Light",
     "compilationinfo": "Compilation info",
     "cordovadevicemodel": "Cordova device model",
     "cordovadeviceosversion": "Cordova device OS version",
diff --git a/src/core/settings/pages/general/general.html b/src/core/settings/pages/general/general.html
index 0e1418813..34f0d2376 100644
--- a/src/core/settings/pages/general/general.html
+++ b/src/core/settings/pages/general/general.html
@@ -20,6 +20,12 @@
             </ion-segment-button>
         </ion-segment>
     </ion-item>
+    <ion-item text-wrap class="core-settings-general-color-scheme" *ngIf="colorSchemes.length > 0">
+        <ion-label><h2>{{ 'core.settings.colorscheme' | translate }}</h2></ion-label>
+        <ion-select [(ngModel)]="selectedScheme" (ngModelChange)="colorSchemeChanged()" interface="action-sheet">
+            <ion-option *ngFor="let scheme of colorSchemes" [value]="scheme">{{ 'core.settings.colorscheme-' + scheme | translate }}</ion-option>
+        </ion-select>
+    </ion-item>
     <ion-item text-wrap *ngIf="rteSupported">
         <ion-label>
             <h2>{{ 'core.settings.enablerichtexteditor' | translate }}</h2>
diff --git a/src/core/settings/pages/general/general.ts b/src/core/settings/pages/general/general.ts
index 9befe638a..720e8fbdc 100644
--- a/src/core/settings/pages/general/general.ts
+++ b/src/core/settings/pages/general/general.ts
@@ -24,6 +24,7 @@ import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreLocalNotificationsProvider } from '@providers/local-notifications';
 import { CorePushNotificationsProvider } from '@core/pushnotifications/providers/pushnotifications';
 import { CoreConfigConstants } from '../../../../configconstants';
+import { CoreSettingsHelper } from '../../providers/helper';
 
 /**
  * Page that displays the general settings.
@@ -44,11 +45,13 @@ export class CoreSettingsGeneralPage {
     debugDisplay: boolean;
     analyticsSupported: boolean;
     analyticsEnabled: boolean;
+    colorSchemes = [];
+    selectedScheme: string;
 
     constructor(appProvider: CoreAppProvider, private configProvider: CoreConfigProvider, fileProvider: CoreFileProvider,
             private eventsProvider: CoreEventsProvider, private langProvider: CoreLangProvider,
             private domUtils: CoreDomUtilsProvider, private pushNotificationsProvider: CorePushNotificationsProvider,
-            localNotificationsProvider: CoreLocalNotificationsProvider) {
+            localNotificationsProvider: CoreLocalNotificationsProvider, private settingsHelper: CoreSettingsHelper) {
 
         // Get the supported languages.
         const languages = CoreConfigConstants.languages;
@@ -59,6 +62,22 @@ export class CoreSettingsGeneralPage {
             });
         }
 
+        if (!CoreConfigConstants.forceColorScheme) {
+            let defaultColorScheme = 'light';
+
+            if (window.matchMedia('(prefers-color-scheme: dark)').matches ||
+                    window.matchMedia('(prefers-color-scheme: light)').matches) {
+                this.colorSchemes.push('auto');
+                defaultColorScheme = 'auto';
+            }
+            this.colorSchemes.push('light');
+            this.colorSchemes.push('dark');
+
+            this.configProvider.get(CoreConstants.SETTINGS_COLOR_SCHEME, defaultColorScheme).then((scheme) => {
+                this.selectedScheme = scheme;
+            });
+        }
+
         // Sort them by name.
         this.languages.sort((a, b) => {
             return a.name.localeCompare(b.name);
@@ -126,10 +145,19 @@ export class CoreSettingsGeneralPage {
 
             return fontSize;
         });
-        document.documentElement.style.fontSize = this.selectedFontSize + '%';
+
+        this.settingsHelper.setFontSize(this.selectedFontSize);
         this.configProvider.set(CoreConstants.SETTINGS_FONT_SIZE, this.selectedFontSize);
     }
 
+    /**
+     * Called when a new color scheme is selected.
+     */
+    colorSchemeChanged(): void {
+        this.settingsHelper.setColorScheme(this.selectedScheme);
+        this.configProvider.set(CoreConstants.SETTINGS_COLOR_SCHEME, this.selectedScheme);
+    }
+
     /**
      * Called when the rich text editor is enabled or disabled.
      */
diff --git a/src/core/settings/providers/helper.ts b/src/core/settings/providers/helper.ts
index 26ffda777..8579f96e0 100644
--- a/src/core/settings/providers/helper.ts
+++ b/src/core/settings/providers/helper.ts
@@ -20,6 +20,9 @@ import { CoreFilepoolProvider } from '@providers/filepool';
 import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreUtilsProvider } from '@providers/utils/utils';
+import { CoreConstants } from '@core/constants';
+import { CoreConfigProvider } from '@providers/config';
+import { CoreConfigConstants } from '../../../configconstants';
 import { TranslateService } from '@ngx-translate/core';
 
 /**
@@ -32,7 +35,8 @@ export class CoreSettingsHelper {
 
     constructor(loggerProvider: CoreLoggerProvider, private appProvider: CoreAppProvider, private cronDelegate: CoreCronDelegate,
             private eventsProvider: CoreEventsProvider, private filePoolProvider: CoreFilepoolProvider,
-            private sitesProvider: CoreSitesProvider, private utils: CoreUtilsProvider, private translate: TranslateService) {
+            private sitesProvider: CoreSitesProvider, private utils: CoreUtilsProvider, private translate: TranslateService,
+            private configProvider: CoreConfigProvider) {
         this.logger = loggerProvider.getInstance('CoreSettingsHelper');
     }
 
@@ -175,4 +179,50 @@ export class CoreSettingsHelper {
 
         return syncPromise;
     }
+
+    /**
+     * Init Settings related to DOM.
+     */
+    initDomSettings(): void {
+        // Set the font size based on user preference.
+        this.configProvider.get(CoreConstants.SETTINGS_FONT_SIZE, CoreConfigConstants.font_sizes[0].toString()).then((fontSize) => {
+            this.setFontSize(fontSize);
+        });
+
+        if (!!CoreConfigConstants.forceColorScheme) {
+            this.setColorScheme(CoreConfigConstants.forceColorScheme);
+        } else {
+            let defaultColorScheme = 'light';
+
+            if (window.matchMedia('(prefers-color-scheme: dark)').matches ||
+                    window.matchMedia('(prefers-color-scheme: light)').matches) {
+                defaultColorScheme = 'auto';
+            }
+
+            this.configProvider.get(CoreConstants.SETTINGS_COLOR_SCHEME, defaultColorScheme).then((scheme) => {
+                this.setColorScheme(scheme);
+            });
+        }
+    }
+
+    /**
+     * Set document default font size.
+     *
+     * @param fontSize Font size in percentage.
+     */
+    setFontSize(fontSize: string): void {
+        document.documentElement.style.fontSize = fontSize + '%';
+    }
+
+    /**
+     * Set body color scheme.
+     *
+     * @param colorScheme Name of the color scheme.
+     */
+    setColorScheme(colorScheme: string): void {
+        document.body.classList.remove('scheme-light');
+        document.body.classList.remove('scheme-dark');
+        document.body.classList.remove('scheme-auto');
+        document.body.classList.add('scheme-' + colorScheme);
+    }
 }
diff --git a/src/core/settings/settings.module.ts b/src/core/settings/settings.module.ts
index 6098d4c91..25693befa 100644
--- a/src/core/settings/settings.module.ts
+++ b/src/core/settings/settings.module.ts
@@ -28,4 +28,8 @@ import { CoreSettingsHelper } from './providers/helper';
         CoreSettingsHelper
     ]
 })
-export class CoreSettingsModule {}
+export class CoreSettingsModule {
+    constructor(settingsHelper: CoreSettingsHelper) {
+        settingsHelper.initDomSettings();
+    }
+}
diff --git a/src/providers/utils/dom.ts b/src/providers/utils/dom.ts
index fb91e5532..9de6e424d 100644
--- a/src/providers/utils/dom.ts
+++ b/src/providers/utils/dom.ts
@@ -22,7 +22,6 @@ import { TranslateService } from '@ngx-translate/core';
 import { CoreTextUtilsProvider } from './text';
 import { CoreAppProvider } from '../app';
 import { CoreConfigProvider } from '../config';
-import { CoreConfigConstants } from '../../configconstants';
 import { CoreUrlUtilsProvider } from './url';
 import { CoreFileProvider } from '@providers/file';
 import { CoreConstants } from '@core/constants';
@@ -73,10 +72,6 @@ export class CoreDomUtilsProvider {
         configProvider.get(CoreConstants.SETTINGS_DEBUG_DISPLAY, false).then((debugDisplay) => {
             this.debugDisplay = !!debugDisplay;
         });
-        // Set the font size based on user preference.
-        configProvider.get(CoreConstants.SETTINGS_FONT_SIZE, CoreConfigConstants.font_sizes[0]).then((fontSize) => {
-            document.documentElement.style.fontSize = fontSize + '%';
-        });
     }
 
     /**

From 7f882a67aef3e7c2a46a313d1959c51b3e80e0de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 12 Sep 2019 16:40:42 +0200
Subject: [PATCH 025/257] MOBILE-3144 theme: Dark mode

---
 .../events/addon-block-timeline-events.html   |   2 +-
 .../components/calendar/calendar.scss         |   6 +
 .../messages/pages/discussion/discussion.scss |   9 +-
 .../group-conversations.scss                  |   3 +
 .../components/submission/submission.scss     |   4 +
 src/addon/mod/data/data.scss                  |  11 +-
 .../forum/pages/discussion/discussion.scss    |   3 +
 src/addon/mod/lesson/pages/player/player.scss |  15 +++
 .../mod/quiz/components/index/index.scss      |  13 ++
 .../navigation-modal/navigation-modal.scss    |   8 ++
 .../mod/survey/components/index/index.scss    |   6 +
 .../mod/wiki/components/index/index.scss      |  14 +-
 .../qtype/ddmarker/component/ddmarker.scss    |   1 +
 src/addon/qtype/ddwtos/component/ddwtos.scss  |   7 +
 .../qtype/gapselect/component/gapselect.scss  |   4 +
 src/app/app.ios.scss                          |   4 +
 src/app/app.md.scss                           |   4 +
 src/app/app.scss                              |  41 ++++++
 src/app/app.wp.scss                           |   4 +
 src/components/icon/icon.scss                 |   6 +
 src/components/iframe/iframe.scss             |   1 +
 src/components/loading/loading.scss           |   3 +
 .../mark-required/mark-required.scss          |   4 +
 src/components/progress-bar/progress-bar.scss |   7 +
 .../rich-text-editor/rich-text-editor.scss    |  26 ++++
 .../send-message-form/send-message-form.scss  |   5 +
 src/components/split-view/split-view.scss     |   4 +
 src/components/timer/core-timer.html          |   2 +-
 src/components/timer/timer.scss               |   4 +-
 src/core/block/components/block/block.scss    |   6 +
 .../components/module/core-course-module.html |   2 +-
 src/core/course/components/module/module.scss |  43 +++++-
 src/core/grades/components/course/course.scss |  14 ++
 src/core/login/login.scss                     |  74 +++++++++++
 .../login/pages/credentials/credentials.html  |   6 +-
 .../login/pages/credentials/credentials.scss  |  41 ------
 src/core/login/pages/init/init.scss           |   2 +
 src/core/login/pages/reconnect/reconnect.html |   6 +-
 src/core/login/pages/reconnect/reconnect.scss |  46 +------
 src/core/login/pages/site/site.scss           |  36 +----
 src/core/mainmenu/pages/more/more.scss        |  43 +++++-
 src/core/user/pages/profile/profile.scss      |  13 +-
 src/theme/dark.scss                           | 123 ++++++++++++++++++
 src/theme/variables.scss                      |  46 +++++++
 44 files changed, 586 insertions(+), 136 deletions(-)
 create mode 100644 src/core/login/login.scss
 create mode 100644 src/theme/dark.scss

diff --git a/src/addon/block/timeline/components/events/addon-block-timeline-events.html b/src/addon/block/timeline/components/events/addon-block-timeline-events.html
index 1cebcecc1..46af070cc 100644
--- a/src/addon/block/timeline/components/events/addon-block-timeline-events.html
+++ b/src/addon/block/timeline/components/events/addon-block-timeline-events.html
@@ -4,7 +4,7 @@
     </ion-item-divider>
     <ng-container *ngFor="let event of dayEvents.events">
         <a ion-item text-wrap detail-none class="core-course-module-handler item-media" (click)="action($event, event.url)" [title]="event.name">
-            <img item-start [src]="event.iconUrl" core-external-content alt="" role="presentation" *ngIf="event.iconUrl" class="core-module-icon">
+            <img item-start [src]="event.iconUrl" alt="" role="presentation" *ngIf="event.iconUrl" class="core-module-icon">
             <h2><core-format-text [text]="event.name"></core-format-text></h2>
             <p *ngIf="showCourse">
                 <core-format-text [text]="event.course.fullnamedisplay"></core-format-text>
diff --git a/src/addon/calendar/components/calendar/calendar.scss b/src/addon/calendar/components/calendar/calendar.scss
index b04fe3d64..17c3fd478 100644
--- a/src/addon/calendar/components/calendar/calendar.scss
+++ b/src/addon/calendar/components/calendar/calendar.scss
@@ -58,6 +58,9 @@ ion-app.app-root addon-calendar-calendar {
     .addon-calendar-months {
         background-color: white;
         padding: 0;
+        @include darkmode() {
+            background-color: $gray-darker;
+        }
     }
 
     .addon-calendar-day {
@@ -108,6 +111,9 @@ ion-app.app-root addon-calendar-calendar {
         }
         &.dayblank {
             background-color: $gray-lighter;
+            @include darkmode() {
+                background-color: $black;
+            }
         }
 
         .addon-calendar-event {
diff --git a/src/addon/messages/pages/discussion/discussion.scss b/src/addon/messages/pages/discussion/discussion.scss
index f17702e24..5b8ee2a35 100644
--- a/src/addon/messages/pages/discussion/discussion.scss
+++ b/src/addon/messages/pages/discussion/discussion.scss
@@ -4,10 +4,13 @@ $item-message-note-text: $gray-dark !default;
 $item-message-note-font-size: 75% !default;
 $item-message-mine-bg: $gray-light !default;
 
-ion-app.app-root page-addon-messages-discussion {
+ion-app.app-root page-addon-messages-discussion.ion-page {
 
     ion-content {
         background-color: $gray-lighter !important;
+        @include darkmode() {
+            background-color: $gray-darker !important;
+        }
     }
 
     .addon-messages-discussion-container {
@@ -59,6 +62,7 @@ ion-app.app-root page-addon-messages-discussion {
             align-items: center;
             margin-bottom: .5rem!important;
             margin-top: 0;
+            color: $text-color;
 
             ion-avatar {
                 display: block;
@@ -108,6 +112,9 @@ ion-app.app-root page-addon-messages-discussion {
 
         .addon-message-text {
             display: inline-flex;
+            * {
+                color: $text-color;
+            }
         }
 
         .addon-messages-delete-button {
diff --git a/src/addon/messages/pages/group-conversations/group-conversations.scss b/src/addon/messages/pages/group-conversations/group-conversations.scss
index d4dd9a821..517363205 100644
--- a/src/addon/messages/pages/group-conversations/group-conversations.scss
+++ b/src/addon/messages/pages/group-conversations/group-conversations.scss
@@ -28,6 +28,9 @@ ion-app.app-root .addon-message-discussion {
         white-space: nowrap;
         color: $black;
         @include margin(null, 2px, null, null);
+        @include darkmode() {
+            color: $white;
+        }
     }
 
     .addon-message-last-message-text {
diff --git a/src/addon/mod/assign/components/submission/submission.scss b/src/addon/mod/assign/components/submission/submission.scss
index d8d1d5aeb..8d3f9a458 100644
--- a/src/addon/mod/assign/components/submission/submission.scss
+++ b/src/addon/mod/assign/components/submission/submission.scss
@@ -10,6 +10,9 @@ ion-app.app-root addon-mod-assign-submission {
 
     div.submissioneditable p {
         color: $red;
+        @include darkmode() {
+            color: $red-light;
+        }
     }
 
     .core-grading-summary .advancedgrade {
@@ -45,6 +48,7 @@ core-format-text {
         margin: 0 auto;
         tbody {
             background: $white;
+            color: $text-color;
         }
     }
 
diff --git a/src/addon/mod/data/data.scss b/src/addon/mod/data/data.scss
index d18a66a08..1bce48a43 100644
--- a/src/addon/mod/data/data.scss
+++ b/src/addon/mod/data/data.scss
@@ -3,7 +3,7 @@
   white-space: normal;
   word-break: break-word;
   padding: $content-padding;
-  background-color: white;
+  background-color: $white;
   border-top-width: 1px;
   border-bottom-width: 1px;
   border-right-width: 0;
@@ -11,6 +11,10 @@
   border-style: solid;
   border-color: $list-border-color;
 
+  @include darkmode {
+    background-color: $core-dark-item-bg-color;
+  }
+
   table, tbody {
     display: block;
   }
@@ -46,6 +50,11 @@ page-addon-mod-data-edit {
     form .addon-data-advanced-search {
         background-color: $list-background-color;
 
+        @include darkmode() {
+          background-color: $core-dark-item-bg-color;
+          color: $core-dark-text-color;
+        }
+
         .item.item-input .item-block .item-inner ion-input,
         .item.item-input.item-input-has-focus .item-inner ion-input,
         .item.item-input.input-has-focus .item-inner ion-input {
diff --git a/src/addon/mod/forum/pages/discussion/discussion.scss b/src/addon/mod/forum/pages/discussion/discussion.scss
index b4151f311..f9013b8f7 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.scss
+++ b/src/addon/mod/forum/pages/discussion/discussion.scss
@@ -1,6 +1,9 @@
 ion-app.app-root page-addon-mod-forum-discussion {
     .card.highlight .card-header .item {
         background-color: $gray-lighter;
+        @include darkmode() {
+            background-color: $black;
+        }
     }
 
     .addon-forum-reply-button .label {
diff --git a/src/addon/mod/lesson/pages/player/player.scss b/src/addon/mod/lesson/pages/player/player.scss
index cb4a4caf9..750d00287 100644
--- a/src/addon/mod/lesson/pages/player/player.scss
+++ b/src/addon/mod/lesson/pages/player/player.scss
@@ -26,6 +26,9 @@ ion-app.app-root page-addon-mod-lesson-player {
 
         tr:nth-child(odd) {
             background-color: $gray-lighter;
+            @include darkmode() {
+                background-color: $core-dark-item-divider-bg-color;
+            }
         }
 
         tr:last-child td {
@@ -52,13 +55,25 @@ ion-app.app-root page-addon-mod-lesson-player {
 
     .item-ios table {
         @extend .card-ios;
+        @include darkmode() {
+            color: $white;
+            background-color: $core-dark-item-bg-color;
+        }
     }
 
     .item-md table {
         @extend .card-md;
+        @include darkmode() {
+            color: $white;
+            background-color: $core-dark-item-bg-color;
+        }
     }
 
     .item-wp table {
         @extend .card-wp;
+        @include darkmode() {
+            color: $white;
+            background-color: $core-dark-item-bg-color;
+        }
     }
 }
diff --git a/src/addon/mod/quiz/components/index/index.scss b/src/addon/mod/quiz/components/index/index.scss
index 69ad61736..e359e8a0b 100644
--- a/src/addon/mod/quiz/components/index/index.scss
+++ b/src/addon/mod/quiz/components/index/index.scss
@@ -25,6 +25,9 @@ ion-app.app-root addon-mod-quiz-index {
 
         .item:nth-child(even) {
             background-color: $gray-lighter;
+            @include darkmode() {
+                background-color: $core-dark-item-divider-bg-color;
+            }
         }
 
         .addon-mod_quiz-highlighted,
@@ -34,5 +37,15 @@ ion-app.app-root addon-mod-quiz-index {
             background-color: $blue-light;
             color: $blue-dark;
         }
+
+        @include darkmode() {
+            .addon-mod_quiz-highlighted,
+            .item.addon-mod_quiz-highlighted,
+            .addon-mod_quiz-highlighted p,
+            .item.addon-mod_quiz-highlighted p {
+                background-color: $blue-dark;
+                color: $blue-light;
+            }
+        }
     }
 }
diff --git a/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.scss b/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.scss
index 6576971e0..2896cb9d3 100644
--- a/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.scss
+++ b/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.scss
@@ -10,5 +10,13 @@ ion-app.app-root page-addon-mod-quiz-navigation-modal {
         }
         color: $text-color;
         background-color: $white;
+
+        @include darkmode() {
+            ion-label.label {
+                color: $core-dark-text-color;
+            }
+            color: $core-dark-text-color;
+            background-color: $core-dark-item-bg-color;
+        }
     }
 }
diff --git a/src/addon/mod/survey/components/index/index.scss b/src/addon/mod/survey/components/index/index.scss
index e8bc5f985..e7af8521d 100644
--- a/src/addon/mod/survey/components/index/index.scss
+++ b/src/addon/mod/survey/components/index/index.scss
@@ -11,10 +11,16 @@ ion-app.app-root addon-mod-survey-index {
 
   ion-grid {
     background-color: $white;
+    @include darkmode() {
+      background-color: $black;
+    }
   }
 
   .even {
     background-color: $gray-light;
+    @include darkmode() {
+      background-color: $gray-darker;
+    }
   }
 
   .addon-mod_survey-textarea textarea {
diff --git a/src/addon/mod/wiki/components/index/index.scss b/src/addon/mod/wiki/components/index/index.scss
index 49867d614..e320264d2 100644
--- a/src/addon/mod/wiki/components/index/index.scss
+++ b/src/addon/mod/wiki/components/index/index.scss
@@ -6,20 +6,32 @@ $addon-mod-wiki-toc-background-color: $gray-light !default;
 
 ion-app.app-root addon-mod-wiki-index {
     background-color: $white;
+    @include darkmode() {
+        background-color: $black;
+    }
 
     .addon-mod_wiki-page-content {
         background-color: $white;
+        @include darkmode() {
+            background-color: $black;
+        }
     }
 
     .wiki-toc {
         border: 1px solid $addon-mod-wiki-toc-border-color;
         background: $addon-mod-wiki-toc-background-color;
+        p {
+            color: $text-color !important;
+        }
+        a {
+            color: $link-color;
+        }
         margin: 16px;
         padding: 8px;
     }
 
     .wiki-toc-title {
-        color: $addon-mod-wiki-toc-title-color;
+        color: $addon-mod-wiki-toc-title-color !important;
         font-size: 1.1em;
         font-variant: small-caps;
         text-align: center;
diff --git a/src/addon/qtype/ddmarker/component/ddmarker.scss b/src/addon/qtype/ddmarker/component/ddmarker.scss
index d9197d122..cba59c4e7 100644
--- a/src/addon/qtype/ddmarker/component/ddmarker.scss
+++ b/src/addon/qtype/ddmarker/component/ddmarker.scss
@@ -69,6 +69,7 @@ addon-qtype-ddmarker {
         display: inline-block;
         zoom: 1;
         border-radius: 10px;
+        color: $text-color;
     }
     div.markertexts span.markertext {
         z-index: 3;
diff --git a/src/addon/qtype/ddwtos/component/ddwtos.scss b/src/addon/qtype/ddwtos/component/ddwtos.scss
index a594f55fa..33666ece9 100644
--- a/src/addon/qtype/ddwtos/component/ddwtos.scss
+++ b/src/addon/qtype/ddwtos/component/ddwtos.scss
@@ -69,14 +69,21 @@ addon-qtype-ddwtos {
 
     span.incorrect {
         background-color: $red-light;
+        @include darkmode() {
+            background-color: $red-dark;
+        }
     }
     span.correct {
         background-color: $green-light;
+        @include darkmode() {
+            background-color: $green-dark;
+        }
     }
 
     @for $i from 0 to length($core-dd-question-colors) {
         .group#{$i + 1} {
             background: nth($core-dd-question-colors, $i + 1);
+            color: $text-color;
         }
     }
 
diff --git a/src/addon/qtype/gapselect/component/gapselect.scss b/src/addon/qtype/gapselect/component/gapselect.scss
index 53ceeba30..4698805aa 100644
--- a/src/addon/qtype/gapselect/component/gapselect.scss
+++ b/src/addon/qtype/gapselect/component/gapselect.scss
@@ -15,5 +15,9 @@ ion-app.app-root addon-qtype-gapselect {
         border-radius: 4px;
         margin-bottom: 10px;
         background: $gray-lighter;
+
+        @include darkmode() {
+            background: $gray-dark;
+        }
     }
 }
diff --git a/src/app/app.ios.scss b/src/app/app.ios.scss
index 8eeaf67a3..d90e3da7b 100644
--- a/src/app/app.ios.scss
+++ b/src/app/app.ios.scss
@@ -43,6 +43,10 @@ ion-app.app-root.ios {
       @extend .card-ios ;
       @extend .card-content-ios;
 
+      @include darkmode() {
+        background-color: $core-dark-item-bg-color;
+      }
+
       &[icon-start] {
         @include padding(null, null, null, $card-ios-padding-left * 2 + 20);
 
diff --git a/src/app/app.md.scss b/src/app/app.md.scss
index a97ce6e95..db1666048 100644
--- a/src/app/app.md.scss
+++ b/src/app/app.md.scss
@@ -38,6 +38,10 @@ ion-app.app-root.md {
       @extend .card-md;
       @extend .card-content-md;
 
+      @include darkmode() {
+        background-color: $core-dark-item-bg-color;
+      }
+
       &[icon-start] {
         @include padding(null, null, null, $card-md-padding-left * 2 + 20);
 
diff --git a/src/app/app.scss b/src/app/app.scss
index 594dccfe3..474ace86f 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -255,6 +255,10 @@ ion-app.app-root {
 
         &.core-shortened {
           color: $gray-darker;
+          @include darkmode() {
+            color: $white;
+          }
+
           overflow: hidden;
           min-height: 50px;
 
@@ -268,6 +272,10 @@ ion-app.app-root {
             z-index: 1001;
             background-color: $white;
             @include padding(null, null, null, 10px);
+            @include darkmode() {
+              color: $white;
+              background-color: $core-dark-item-bg-color;
+            }
           }
 
           &:before {
@@ -282,6 +290,15 @@ ion-app.app-root {
             background: -ms-linear-gradient(top, rgba(255, 255, 255, 0) calc(100% - 50px), white calc(100% - 15px));
             background: linear-gradient(to bottom, rgba(255, 255, 255, 0) calc(100% - 50px), white calc(100% - 15px));
             z-index: 1000;
+
+            @include darkmode {
+              background: -moz-linear-gradient(top, rgba(255, 255, 255, 0) calc(100% - 50px), $core-dark-item-bg-color calc(100% - 15px));
+              background: -webkit-gradient(left top, left bottom, color-stop(calc(100% - 50px), rgba(255, 255, 255, 0)), color-stop(calc(100% - 15px), white));
+              background: -webkit-linear-gradient(top, rgba(255, 255, 255, 0) calc(100% - 50px), $core-dark-item-bg-color calc(100% - 15px));
+              background: -o-linear-gradient(top, rgba(255, 255, 255, 0) calc(100% - 50px), $core-dark-item-bg-color calc(100% - 15px));
+              background: -ms-linear-gradient(top, rgba(255, 255, 255, 0) calc(100% - 50px), $core-dark-item-bg-color calc(100% - 15px));
+              background: linear-gradient(to bottom, rgba(255, 255, 255, 0) calc(100% - 50px), $core-dark-item-bg-color calc(100% - 15px));
+            }
           }
         }
       }
@@ -469,6 +486,23 @@ ion-app.app-root {
     }
   }
 
+  @include darkmode() {
+    ion-select.core-button-select,
+    .core-button-select {
+      background-color: $core-dark-item-divider-bg-color;
+
+
+      &.select-md,
+      &.button-md,
+      &.select-ios,
+      &.button-ios,
+      &.select-wp,
+      &.button-wp {
+        background: $core-dark-item-divider-bg-color;
+      }
+    }
+  }
+
   // File uploader.
   // -------------------------
   .core-fileuploader-file-handler {
@@ -692,6 +726,10 @@ ion-app.app-root {
       @extend ion-card;
       border-bottom: 3px solid $color-base;
 
+      @include darkmode() {
+        background-color: $core-dark-item-bg-color;
+      }
+
       &[icon-start] {
         @include padding(null, null, null, 52px);
         position: relative;
@@ -713,6 +751,9 @@ ion-app.app-root {
       ion-icon {
         color: $color-base;
       }
+      @include darkmode() {
+        background-color: $core-dark-item-bg-color;
+      }
     }
 
     .core-#{$color-name}-item.item-input {
diff --git a/src/app/app.wp.scss b/src/app/app.wp.scss
index b91fb4f10..127e273b0 100644
--- a/src/app/app.wp.scss
+++ b/src/app/app.wp.scss
@@ -35,6 +35,10 @@ ion-app.app-root.wp {
       @extend .card-wp ;
       @extend .card-content-wp;
 
+      @include darkmode() {
+        background-color: $core-dark-item-bg-color;
+      }
+
       &[icon-start] {
         @include padding(null, null, null, $card-wp-padding-left * 2 + 20);
 
diff --git a/src/components/icon/icon.scss b/src/components/icon/icon.scss
index f909e876e..a80559c8e 100644
--- a/src/components/icon/icon.scss
+++ b/src/components/icon/icon.scss
@@ -5,6 +5,12 @@
   }
 }
 
+@each $color-name, $color-base, $color-contrast in get-colors($colors-dark) {
+  .fa-#{$color-name} {
+    color: $color-base !important;
+  }
+}
+
 
 [dir=rtl] .icon {
     &.core-icon-dir-flip,
diff --git a/src/components/iframe/iframe.scss b/src/components/iframe/iframe.scss
index 82b13e078..0d0e5ca92 100644
--- a/src/components/iframe/iframe.scss
+++ b/src/components/iframe/iframe.scss
@@ -6,6 +6,7 @@ ion-app.app-root core-iframe {
         border: 0;
         display: block;
         max-width: 100%;
+        background-color: $gray-light;
     }
 
     .core-loading-container {
diff --git a/src/components/loading/loading.scss b/src/components/loading/loading.scss
index bc1faec9f..8b4136eea 100644
--- a/src/components/loading/loading.scss
+++ b/src/components/loading/loading.scss
@@ -7,6 +7,9 @@ ion-app.app-root {
             text-align: center;
             padding-top: 10px;
             clear: both;
+            @include darkmode() {
+                color: $core-dark-text-color;
+            }
         }
 
         .core-loading-content {
diff --git a/src/components/mark-required/mark-required.scss b/src/components/mark-required/mark-required.scss
index 0453ba119..3b49f99ee 100644
--- a/src/components/mark-required/mark-required.scss
+++ b/src/components/mark-required/mark-required.scss
@@ -4,4 +4,8 @@ ion-app.app-root .core-input-required-asterisk, ion-app.app-root .icon.core-inpu
     @include padding(null, null, null, 4px);
     line-height: 100%;
     vertical-align: top;
+
+    @include darkmode() {
+        color: $red-light !important;
+    }
 }
diff --git a/src/components/progress-bar/progress-bar.scss b/src/components/progress-bar/progress-bar.scss
index a385388e0..4092a6c3c 100644
--- a/src/components/progress-bar/progress-bar.scss
+++ b/src/components/progress-bar/progress-bar.scss
@@ -13,6 +13,10 @@ ion-app.app-root core-progress-bar {
         color: $gray-darker;
         @include position(-16px, 10px, null, null);
         position: absolute;
+
+        @include darkmode() {
+            color: $gray-lighter;
+        }
     }
 
     progress {
@@ -35,6 +39,9 @@ ion-app.app-root core-progress-bar {
         .progress-bar-fallback span,
         &[value]::-webkit-progress-value {
             background-color: $core-progressbar-color;
+            @include darkmode() {
+                background-color: $core-progressbar-color;
+            }
             border-radius: 0;
         }
 
diff --git a/src/components/rich-text-editor/rich-text-editor.scss b/src/components/rich-text-editor/rich-text-editor.scss
index 9460297fd..d4ba94b06 100644
--- a/src/components/rich-text-editor/rich-text-editor.scss
+++ b/src/components/rich-text-editor/rich-text-editor.scss
@@ -6,6 +6,9 @@ ion-app.app-root core-rich-text-editor {
     width: 100%;
     display: flex;
     flex-direction: column;
+    @include darkmode() {
+        background-color: $black;
+    }
 
     .core-rte-editor, .core-textarea {
         padding: 2px;
@@ -13,6 +16,10 @@ ion-app.app-root core-rich-text-editor {
         width: 100%;
         resize: none;
         background-color: $white;
+        @include darkmode() {
+            background-color: $black;
+            color: $white;
+        }
     }
 
     .core-rte-editor {
@@ -32,6 +39,10 @@ ion-app.app-root core-rich-text-editor {
             display: block;
             color: $gray-light;
             font-weight: bold;
+
+            @include darkmode() {
+                color: $gray;
+            }
         }
 
         // Make empty elements selectable (to move the cursor).
@@ -65,6 +76,10 @@ ion-app.app-root core-rich-text-editor {
         flex-grow: 0;
         flex-shrink: 0;
         background-color: $white;
+
+        @include darkmode() {
+            background-color: $black;
+        }
         @include padding(5px, null);
         border-top: 1px solid $gray;
 
@@ -90,12 +105,20 @@ ion-app.app-root core-rich-text-editor {
             color: $text-color;
             cursor: pointer;
 
+            @include darkmode() {
+                background-color: $black;
+                color: $core-dark-text-color;
+            }
+
             &.toolbar-button-enable {
                 width: 100%;
             }
 
             &:active, &[aria-pressed="true"] {
                 background-color: $gray;
+                @include darkmode() {
+                    background-color: $gray-dark;
+                }
             }
 
             &.toolbar-arrow {
@@ -107,6 +130,9 @@ ion-app.app-root core-rich-text-editor {
 
                 &:active {
                     background-color: $white;
+                    @include darkmode() {
+                        background-color: $black;
+                    }
                 }
 
                 &.toolbar-arrow-hidden {
diff --git a/src/components/send-message-form/send-message-form.scss b/src/components/send-message-form/send-message-form.scss
index ea9f7c367..cec94f20e 100644
--- a/src/components/send-message-form/send-message-form.scss
+++ b/src/components/send-message-form/send-message-form.scss
@@ -34,4 +34,9 @@ ion-app.app-root core-send-message-form {
     min-height: 0;
     align-self: self-end;
   }
+  @include darkmode() {
+    ion-icon.icon {
+      color: $gray-darker;
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/components/split-view/split-view.scss b/src/components/split-view/split-view.scss
index 5c399b5e5..4d1fe88aa 100644
--- a/src/components/split-view/split-view.scss
+++ b/src/components/split-view/split-view.scss
@@ -22,6 +22,10 @@ ion-app.app-root core-split-view {
         .split-pane-side .core-split-item-selected {
             background-color: $gray-lighter;
             @include core-selected-item($core-splitview-selected);
+
+            @include darkmode() {
+              background-color: $black;
+            }
         }
 
         .item-ios[detail-push] .item-inner,
diff --git a/src/components/timer/core-timer.html b/src/components/timer/core-timer.html
index 729a8803e..cb59967c6 100644
--- a/src/components/timer/core-timer.html
+++ b/src/components/timer/core-timer.html
@@ -1,4 +1,4 @@
-<ion-item #container class="core-timer" [attr.text-center]="align == 'center' ? true : null" [attr.text-end]="align == 'right' ? true : null" role="timer">
+<ion-item #container no-lines class="core-timer" [attr.text-center]="align == 'center' ? true : null" [attr.text-end]="align == 'right' ? true : null" role="timer">
     <ion-icon name="timer" item-start role="presentation"></ion-icon>
     <label *ngIf="timeLeft > 0 && timerText">{{ timerText }}</label>
     <span *ngIf="timeLeft > 0">{{ timeLeft | coreSecondsToHMS }}</span>
diff --git a/src/components/timer/timer.scss b/src/components/timer/timer.scss
index 89c7b2414..c29a8ec98 100644
--- a/src/components/timer/timer.scss
+++ b/src/components/timer/timer.scss
@@ -4,7 +4,7 @@ ion-app.app-root core-timer {
     }
 
     .core-timer {
-        background-color: transparent;
+        background-color: transparent !important;
 
         span {
             font-weight: bold;
@@ -13,7 +13,7 @@ ion-app.app-root core-timer {
         // Create the timer warning colors. Go to $core-timer-warn-color.
         @for $i from 0 through $core-timer-iterations {
             &.core-timer-timeleft-#{$i} {
-                background-color: rgba($core-timer-warn-color, 1 - ($i / $core-timer-iterations));
+                background-color: rgba($core-timer-warn-color, 1 - ($i / $core-timer-iterations)) !important;
 
                 @if $i <= $core-timer-iterations / 2 {
                     label, span, ion-icon {
diff --git a/src/core/block/components/block/block.scss b/src/core/block/components/block/block.scss
index 4029d7ffa..2ab0c8f20 100644
--- a/src/core/block/components/block/block.scss
+++ b/src/core/block/components/block/block.scss
@@ -29,4 +29,10 @@ ion-app.app-root core-block {
   .item-divider .icon {
     color: $black;
   }
+
+  @include darkmode() {
+    .item-divider .icon {
+      color: $core-dark-text-color
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/core/course/components/module/core-course-module.html b/src/core/course/components/module/core-course-module.html
index eae6da52c..0b0239685 100644
--- a/src/core/course/components/module/core-course-module.html
+++ b/src/core/course/components/module/core-course-module.html
@@ -1,4 +1,4 @@
-<ion-item *ngIf="module && module.visibleoncoursepage !== 0" text-wrap id="core-course-module-{{module.id}}" class="core-course-module-handler {{module.handlerData.class}}" (click)="moduleClicked($event)" [ngClass]="{'item-media': module.handlerData.icon, 'core-not-clickable': !module.handlerData.action || !module.uservisible === false, 'item-dimmed': module.visible === 0 || module.uservisible === false}" [title]="module.handlerData.a11yTitle" detail-none>
+<ion-item *ngIf="module && module.visibleoncoursepage !== 0" text-wrap id="core-course-module-{{module.id}}" class="core-course-module-handler {{module.handlerData.class}}" (click)="moduleClicked($event)" [ngClass]="{'item-media': module.handlerData.icon, 'core-not-clickable': !module.handlerData.action || module.uservisible === false, 'item-dimmed': module.visible === 0 || module.uservisible === false}" [title]="module.handlerData.a11yTitle" detail-none>
 
     <img item-start *ngIf="module.handlerData.icon" [src]="module.handlerData.icon" [alt]="module.modnametranslated" class="core-module-icon">
     <div class="core-module-title">
diff --git a/src/core/course/components/module/module.scss b/src/core/course/components/module/module.scss
index c08daa491..739d79166 100644
--- a/src/core/course/components/module/module.scss
+++ b/src/core/course/components/module/module.scss
@@ -15,6 +15,20 @@ ion-app.app-root core-course-module {
         .core-module-icon {
             align-items: flex-start;
         }
+
+        cursor: pointer;
+        &.item-ios:active,
+        &.item-ios.activated {
+            background-color: $list-ios-activated-background-color;
+        }
+        &.item-md:active,
+        &.item-md.activated {
+            background-color: $list-md-activated-background-color;
+        }
+        &.item-wp:active,
+        &.item-wp.activated {
+            background-color: $list-wp-activated-background-color;
+        }
     }
 
     .core-module-title {
@@ -64,9 +78,32 @@ ion-app.app-root core-course-module {
         }
     }
 
-    .core-not-clickable:active,
-    .core-not-clickable.activated {
-        background-color: $list-background-color;
+    .core-not-clickable {
+        cursor: initial;
+
+        &:active,
+        &.activated {
+            background-color: $list-background-color;
+        }
+    }
+
+    @include darkmode() {
+        .item.core-course-module-handler {
+            background: $core-dark-item-bg-color;
+            &.item-ios:active,
+            &.item-ios.activated,
+            &.item-md:active,
+            &.item-md.activated,
+            &.item-wp:active,
+            &.item-wp.activated {
+              background-color: $core-dark-background-color;
+            }
+        }
+
+        .core-not-clickable:active,
+        .core-not-clickable.activated {
+            background-color: $core-dark-item-bg-color;
+        }
     }
 }
 
diff --git a/src/core/grades/components/course/course.scss b/src/core/grades/components/course/course.scss
index 8c0ee2091..5a3a9eb4e 100644
--- a/src/core/grades/components/course/course.scss
+++ b/src/core/grades/components/course/course.scss
@@ -6,6 +6,10 @@ ion-app.app-root core-grades-course {
     font-size: 16px;
     color: $text-color;
 
+    @include darkmode() {
+      color: $core-dark-text-color;
+    }
+
     tr {
       border-bottom: 1px solid $list-border-color;
     }
@@ -19,6 +23,10 @@ ion-app.app-root core-grades-course {
       vertical-align: bottom;
       font-weight: bold;
       background-color: $white;
+
+      @include darkmode() {
+        background-color: $black;
+      }
     }
     tbody th {
       font-weight: normal;
@@ -58,11 +66,17 @@ ion-app.app-root core-grades-course {
     .odd {
       td, th, th.core-split-item-selected {
         background-color: $gray-lighter;
+        @include darkmode() {
+          background-color: $gray-darker;
+        }
       }
     }
     .even {
       td, th, th.core-split-item-selected {
         background-color: $white;
+        @include darkmode() {
+          background-color: $black;
+        }
       }
     }
 
diff --git a/src/core/login/login.scss b/src/core/login/login.scss
new file mode 100644
index 000000000..d0bc7225b
--- /dev/null
+++ b/src/core/login/login.scss
@@ -0,0 +1,74 @@
+ion-app.app-root page-core-login-credentials,
+ion-app.app-root page-core-login-reconnect,
+ion-app.app-root page-core-login-site {
+    .scroll-content {
+        background: $core-login-page-background-color;
+
+        @include darkmode() {
+            background: $core-dark-login-page-background-color;
+        }
+    }
+
+    img {
+        max-width: 100%;
+    }
+
+    img.login-logo {
+        width: 90%;
+        max-width: 300px;
+    }
+
+    .box {
+        padding: 16px;
+        margin: 8px;
+        background: $core-login-box-background-color;
+        border: 1px solid $core-login-box-background-border;
+        color: $core-login-box-text-color;
+
+        @include darkmode() {
+            background: $core-dark-login-box-background-color;
+            border-color: $core-dark-login-box-background-border;
+            color: $core-dark-login-box-text-color;
+        }
+    }
+
+    .core-sitename, .core-siteurl {
+        @if $core-fixed-url { display: none; }
+    }
+
+    @if $core-login-button-outline {
+        .button-md.button-default-md, .button-ios.button-default-ios {
+            @extend .button-md-light;
+        }
+    }
+
+    @if $core-login-loading-color {
+        .core-loading-container {
+            color: $core-login-loading-color;
+
+            .spinner circle, .spinner line {
+                stroke: $core-login-loading-color;
+            }
+        }
+    }
+
+    @if $core-dark-login-button-outline {
+        .button-md.button-default-md, .button-ios.button-default-ios {
+            @extend .button-md-light;
+        }
+    }
+
+    @include darkmode() {
+        .core-loading-container {
+            color: $core-dark-login-loading-color;
+
+            .spinner circle, .spinner line {
+                stroke: $core-dark-login-loading-color;
+            }
+        }
+    }
+
+    .item-input {
+        margin-bottom: 20px;
+    }
+}
diff --git a/src/core/login/pages/credentials/credentials.html b/src/core/login/pages/credentials/credentials.html
index dcadd2e23..ee0a1c62c 100644
--- a/src/core/login/pages/credentials/credentials.html
+++ b/src/core/login/pages/credentials/credentials.html
@@ -36,11 +36,11 @@
             </form>
 
             <!-- Forgotten password button. -->
-            <div padding-top>
+            <div padding-top class="core-login-forgotten-password">
                 <button ion-button block text-wrap color="light" (click)="forgottenPassword()">{{ 'core.login.forgotten' | translate }}</button>
             </div>
 
-            <ion-list *ngIf="identityProviders && identityProviders.length" padding-top>
+            <ion-list *ngIf="identityProviders && identityProviders.length" padding-top class="core-login-identity-providers">
                 <ion-list-header text-wrap>{{ 'core.login.potentialidps' | translate }}</ion-list-header>
                 <button ion-item *ngFor="let provider of identityProviders" text-wrap class="core-oauth-icon" (click)="oauthClicked(provider)" title="{{provider.name}}">
                     <img [src]="provider.iconurl" alt="" width="32" height="32" item-start>
@@ -48,7 +48,7 @@
                 </button>
             </ion-list>
 
-            <ion-list *ngIf="canSignup" padding-top>
+            <ion-list *ngIf="canSignup" padding-top class="core-login-sign-up">
                 <ion-list-header text-wrap>{{ 'core.login.firsttime' | translate }}</ion-list-header>
                 <ion-item no-lines text-wrap *ngIf="authInstructions">
                     <p><core-format-text [text]="authInstructions"></core-format-text></p>
diff --git a/src/core/login/pages/credentials/credentials.scss b/src/core/login/pages/credentials/credentials.scss
index 6a65689ff..e93abd9d1 100644
--- a/src/core/login/pages/credentials/credentials.scss
+++ b/src/core/login/pages/credentials/credentials.scss
@@ -1,45 +1,4 @@
 ion-app.app-root page-core-login-credentials {
-    .scroll-content {
-        background: $core-login-page-background-color;
-    }
-
-    img {
-        max-width: 100%;
-    }
-
-    img.login-logo {
-        width: 90%;
-        max-width: 300px;
-    }
-
-    .box {
-        padding: 16px;
-        margin: 8px;
-        background: $core-login-box-background-color;
-        border: 1px solid $core-login-box-background-border;
-        color: $core-login-box-text-color;
-    }
-
-    .core-sitename, .core-siteurl {
-        @if $core-fixed-url { display: none; }
-    }
-
-    @if $core-login-button-outline {
-        .button-md.button-default-md, .button-ios.button-default-ios {
-            @extend .button-md-light;
-        }
-    }
-
-    @if $core-login-loading-color {
-        .core-loading-container {
-            color: $core-login-loading-color;
-
-            .spinner circle, .spinner line {
-                stroke: $core-login-loading-color;
-            }
-        }
-    }
-
     .item-input {
         margin-bottom: 20px;
     }
diff --git a/src/core/login/pages/init/init.scss b/src/core/login/pages/init/init.scss
index f50f047fe..b5f282ac3 100644
--- a/src/core/login/pages/init/init.scss
+++ b/src/core/login/pages/init/init.scss
@@ -22,6 +22,8 @@ ion-app.app-root page-core-login-init {
         background-size: 100%;
         background-size: $core-splash-bgsize;
         background-position: center;
+        width: 100%;
+        height: 100%;
 
         .spinner circle, .spinner line {
             stroke: $core-splash-spinner-color;
diff --git a/src/core/login/pages/reconnect/reconnect.html b/src/core/login/pages/reconnect/reconnect.html
index 44955e85a..0cff453a1 100644
--- a/src/core/login/pages/reconnect/reconnect.html
+++ b/src/core/login/pages/reconnect/reconnect.html
@@ -30,7 +30,7 @@
                 <p class="item-heading">{{ 'core.login.username' | translate }}</p>
                 <p>{{username}}</p>
             </ion-item>
-            <form [formGroup]="credForm" (ngSubmit)="login($event)">
+            <form [formGroup]="credForm" (ngSubmit)="login($event)" class="core-login-form">
                 <ion-item margin-bottom>
                     <core-show-password item-content [name]="'password'">
                         <ion-input class="core-ioninput-password" name="password" type="password" placeholder="{{ 'core.login.password' | translate }}" formControlName="password" [clearOnEdit]="false"></ion-input>
@@ -50,12 +50,12 @@
         </ion-list>
 
         <!-- Forgotten password button. -->
-        <div padding-top>
+        <div padding-top class="core-login-forgotten-password">
             <button ion-button block text-wrap color="light" (click)="forgottenPassword()">{{ 'core.login.forgotten' | translate }}</button>
         </div>
 
         <!-- Identity providers. -->
-        <ion-list *ngIf="identityProviders && identityProviders.length" padding-top>
+        <ion-list *ngIf="identityProviders && identityProviders.length" padding-top class="core-login-identity-providers">
             <ion-list-header text-wrap>{{ 'core.login.potentialidps' | translate }}</ion-list-header>
             <button ion-item *ngFor="let provider of identityProviders" text-wrap class="core-oauth-icon" (click)="oauthClicked(provider)" title="{{provider.name}}">
                 <img [src]="provider.iconurl" alt="" width="32" height="32" item-start>
diff --git a/src/core/login/pages/reconnect/reconnect.scss b/src/core/login/pages/reconnect/reconnect.scss
index 1125551db..a9bbabece 100644
--- a/src/core/login/pages/reconnect/reconnect.scss
+++ b/src/core/login/pages/reconnect/reconnect.scss
@@ -1,52 +1,20 @@
 ion-app.app-root page-core-login-reconnect {
-    .scroll-content {
-        background: $core-login-page-background-color;
-    }
-
-    img {
-        max-width: 100%;
-    }
-
-    img.login-logo {
-        width: 90%;
-        max-width: 300px;
-    }
-
     .box {
-        padding: 16px;
-        margin: 8px;
-        background: $core-login-box-background-color;
-        border: 1px solid $core-login-box-background-border;
-        color: $core-login-box-text-color;
-
         .core-login-form .item {
             background-color: $core-login-item-background-color;
             @include padding-horizontal(0);
+
+            @include darkmode() {
+                background-color: $core-dark-login-item-background-color;
+            }
         }
 
         .core-login-form .item-inner {
             background-color: $core-login-item-inner-background-color;
-            @include padding-horizontal(0);
-        }
-    }
-
-    .core-sitename, .core-siteurl {
-        @if $core-fixed-url { display: none; }
-    }
-
-    @if $core-login-button-outline {
-        .button-md.button-default-md, .button-ios.button-default-ios {
-            @extend .button-md-light;
-        }
-    }
-
-    @if $core-login-loading-color {
-        .core-loading-container {
-            color: $core-login-loading-color;
-
-            .spinner circle, .spinner line {
-                stroke: $core-login-loading-color;
+            @include darkmode() {
+                background-color: $core-dark-login-item-inner-background-color;
             }
+            @include padding-horizontal(0);
         }
     }
 
diff --git a/src/core/login/pages/site/site.scss b/src/core/login/pages/site/site.scss
index 86f94e8f7..53fafed91 100644
--- a/src/core/login/pages/site/site.scss
+++ b/src/core/login/pages/site/site.scss
@@ -1,38 +1,4 @@
 ion-app.app-root page-core-login-site {
-    .scroll-content {
-        background-color: $core-login-page-background-color;
-    }
-
-    img.login-logo {
-        width: 90%;
-        max-width: 300px;
-    }
-
-    .box {
-        padding: 16px;
-        margin: 8px;
-        background: $core-login-box-background-color;
-        border: 1px solid $core-login-box-background-border;
-        color: $core-login-box-text-color;
-    }
-
-    @if $core-login-button-outline {
-        .button-md.button-default-md, .button-ios.button-default-ios {
-            @extend .button-md-light;
-        }
-    }
-
-    @if $core-login-loading-color {
-        .core-loading-container {
-            color: $core-login-loading-color;
-
-            .spinner circle, .spinner line {
-                stroke: $core-login-loading-color;
-            }
-        }
-    }
-
-
     .item-input:last-child {
         margin-bottom: 20px;
     }
@@ -41,7 +7,7 @@ ion-app.app-root page-core-login-site {
         background: transparent;
 
         .searchbar-input {
-            background-color: $searchbar-ios-toolbar-input-background
+            background-color: $searchbar-ios-toolbar-input-background;
         }
     }
 }
\ No newline at end of file
diff --git a/src/core/mainmenu/pages/more/more.scss b/src/core/mainmenu/pages/more/more.scss
index 24797f641..bdeb1a78a 100644
--- a/src/core/mainmenu/pages/more/more.scss
+++ b/src/core/mainmenu/pages/more/more.scss
@@ -82,7 +82,44 @@ ion-app.app-root page-core-mainmenu-more {
             background-color: $core-more-divider-wp;
         }
     }
+
+    @include darkmode() {
+        ion-icon {
+            color: $core-dark-text-color;
+        }
+
+        .item-divider {
+            &.item-ios,
+            &.item-md,
+            &.item-wp {
+                color: $core-dark-text-color;
+                background-color: $core-dark-item-divider-bg-color;
+            }
+        }
+
+        .item-block {
+            &.item-ios,
+            &.item-md,
+            &.item-wp {
+                color: $core-dark-text-color;
+                background-color: $core-dark-item-bg-color;
+                p {
+                    color: $core-dark-text-color;
+                }
+
+            }
+
+            &.activated {
+                &.item-ios {
+                    background-color: $core-more-activated-background-ios;
+                }
+                &.item-md {
+                    background-color: $core-more-activated-background-md;
+                }
+                &.item-wp {
+                    background-color: $core-more-activated-background-wp;
+                }
+            }
+        }
+    }
 }
-
-
-
diff --git a/src/core/user/pages/profile/profile.scss b/src/core/user/pages/profile/profile.scss
index edee0fc71..71e3312c2 100644
--- a/src/core/user/pages/profile/profile.scss
+++ b/src/core/user/pages/profile/profile.scss
@@ -9,7 +9,10 @@ ion-app.app-root page-core-user-profile {
         width: 30px;
         height: 30px;
         border-radius: 50%;
-        background-color: white;
+        background-color: $white;
+        @include darkmode() {
+            background: $core-dark-item-bg-color;
+        }
     }
     [core-user-avatar].item-avatar-center {
         display: inline-block;
@@ -26,11 +29,19 @@ ion-app.app-root page-core-user-profile {
         background: $list-background-color;
         border-bottom: 1px solid $list-border-color;
 
+        @include darkmode() {
+            background: $core-dark-item-bg-color;
+        }
+
         .core-user-profile-handler {
             background: $list-background-color;
             border: 0;
             color: $core-user-profile-communication-icons-color;
 
+            @include darkmode() {
+               background: $core-dark-item-bg-color;
+            }
+
             p {
                 margin: 0;
             }
diff --git a/src/theme/dark.scss b/src/theme/dark.scss
new file mode 100644
index 000000000..27800e723
--- /dev/null
+++ b/src/theme/dark.scss
@@ -0,0 +1,123 @@
+$core-dark-text-color: $white !default;
+$core-dark-text-secondary-color: $gray-light !default;
+$core-dark-link-color: $blue-light !default;
+
+$core-dark-item-bg-color: $gray-darker !default;
+$core-dark-item-divider-bg-color: $black !default;
+$core-dark-background-color: $gray-dark !default;
+
+// Login.
+$core-dark-login-page-background-color: radial-gradient(white, $gray-dark) !default;
+$core-dark-login-box-background-color: $black !default;
+$core-dark-login-box-background-border: $core-login-box-background-border !default;
+$core-dark-login-box-text-color: $core-dark-text-color !default;
+$core-dark-login-item-inner-background-color: $core-dark-login-box-background-color !default;
+$core-dark-login-item-background-color: $core-dark-login-box-background-color !default;
+$core-dark-login-button-outline: $core-login-button-outline !default;
+$core-dark-login-loading-color: $core-dark-text-color !default;
+
+ion-app.app-root .ion-page {
+  @include darkmode() {
+    color: $core-dark-text-color;
+    background-color: $core-dark-item-bg-color;
+
+    a {
+      color: $core-dark-link-color;
+    }
+
+    .core-tabs-bar *,
+    .core-tabs-bar .tab-slide,
+    .ion-page,
+    .item,
+    .item-select,
+    ion-card,
+    .card-header {
+        color: $core-dark-text-color;
+        background-color: $core-dark-item-bg-color;
+
+        h1, h2, h3, h4, h5, h6,
+        ion-icon,
+        .label {
+          color: $core-dark-text-color;
+        }
+
+        @each $color-name, $color-base, $color-contrast in get-colors($colors-dark) {
+          .icon-md-#{$color-name},
+          .icon-ios-#{$color-name},
+          .icon-wp-#{$color-name} {
+            color: $color-base;
+          }
+        }
+        p {
+          color: $core-dark-text-secondary-color;
+        }
+    }
+
+    .item-divider,
+    .item-divider .item-inner {
+      color: $core-dark-text-color;
+      background-color: $core-dark-item-divider-bg-color;
+    }
+
+    .item.item-ios:active,
+    .item.item-ios.activated,
+    .item.item-md:active,
+    .item.item-md.activated,
+    .item.item-wp:active,
+    .item.item-wp.activated {
+      background-color: $core-dark-background-color;
+    }
+
+    .content,
+    .content-md,
+    .content-ios,
+    .content-wp {
+      color: $core-dark-text-color;
+      background-color: $core-dark-background-color;
+    }
+
+    .button,
+    .button-md-light,
+    .button-ios-light,
+    .button-wp-light,
+    .button-outline {
+      ion-icon {
+        color: inherit;
+      }
+    }
+
+    .toolbar-md-light .toolbar-background,
+    .toolbar-ios-light .toolbar-background,
+    .toolbar-wp-light .toolbar-background {
+      background-color: $core-dark-item-divider-bg-color;
+      color: $core-dark-text-color;
+    }
+
+    .button.button-clear-md-dark,
+    .button.button-clear-ios-dark,
+    .button.button-clear-wp-dark {
+      .button-inner ion-icon {
+        color: $core-dark-text-color;
+      }
+    }
+
+    .button-outline {
+      background-color: $core-dark-item-bg-color;
+    }
+
+    ion-refresher {
+      .refresher-pulling-icon,
+      .refresher-refreshing-icon,
+      .refresher-pulling-icon ion-icon,
+      .refresher-refreshing-icon ion-icon,
+      ion-icon {
+        color: $refresher-icon-color;
+      }
+
+      .refresher-pulling-text,
+      .refresher-refreshing-text {
+        color: $core-dark-text-color;
+      }
+    }
+  }
+}
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 0cd36e33e..ff18d0e8f 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -88,6 +88,15 @@ $info: $blue !default;
 $inverted-base: $white !default;
 $inverted-contrast: $primary !default;
 
+$primary-dark: lighten($primary, 10%) !default;
+$secondary-dark: mix($secondary, white, 20%) !default;
+$danger-dark: mix($danger, white, 20%) !default;
+$warning-dark: mix($warning, white, 20%) !default;
+$success-dark: mix($success, white, 20%) !default;
+$info-dark: mix($info, white, 20%) !default;
+$inverted-base-dark: $dark !default;
+$inverted-contrast-dark: $primary-dark !default;
+
 $colors: (
   primary:    $primary,
   secondary:  $secondary,
@@ -104,6 +113,22 @@ $colors: (
   )
 );
 
+$colors-dark: (
+  primary:    $primary-dark,
+  secondary:  $secondary-dark,
+  danger:     $danger-dark,
+  light:      $dark,
+  gray:       $color-gray,
+  dark:       $light,
+  warning:    $warning-dark,
+  success:    $success-dark,
+  info:       $info-dark,
+  inverted: (
+    base: $inverted-base-dark,
+    contrast: $inverted-contrast-dark
+  )
+);
+
 $text-color:                 $black !default;
 $link-color:                 $blue !default;
 $background-color:           $gray-light !default;
@@ -544,9 +569,30 @@ $core-dd-question-colors: $white, $blue-light, #DCDCDC, #D8BFD8, #87CEFA, #DAA52
   }
 }
 
+@mixin darkmode() {
+  $root: #{&};
+
+  @at-root body.scheme-auto {
+    #{$root} {
+      @media (prefers-color-scheme: dark) {
+        @content;
+      }
+    }
+  }
+
+  @at-root body.scheme-dark {
+    #{$root} {
+      @content;
+    }
+  }
+}
+
 // Font Awesome
 $fa-font-path: $font-path;
 @import "font-awesome";
 
 // Format text styles.
 @import "format-text";
+
+// Dark mode.
+@import "dark";
\ No newline at end of file

From 4302f70c3803ec7bd1bf7a47474f048ad379e2f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 9 Sep 2019 14:10:07 +0200
Subject: [PATCH 026/257] MOBILE-2862 forum: Update discussion template

---
 scripts/langindex.json                        |  1 +
 .../index/addon-mod-forum-index.html          | 72 +++++++++----------
 .../mod/forum/components/index/index.scss     | 11 ---
 src/addon/mod/forum/lang/en.json              |  1 +
 src/app/app.scss                              |  7 ++
 src/assets/lang/en.json                       |  1 +
 .../components/format/core-course-format.html |  2 +-
 src/core/course/components/format/format.scss |  7 --
 8 files changed, 46 insertions(+), 56 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 741c90a6b..e8a555bb2 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -580,6 +580,7 @@
   "addon.mod_forum.favouriteupdated": "forum",
   "addon.mod_forum.forumnodiscussionsyet": "local_moodlemobileapp",
   "addon.mod_forum.group": "local_moodlemobileapp",
+  "addon.mod_forum.lastpost": "forum",
   "addon.mod_forum.lockdiscussion": "forum",
   "addon.mod_forum.lockupdated": "forum",
   "addon.mod_forum.message": "forum",
diff --git a/src/addon/mod/forum/components/index/addon-mod-forum-index.html b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
index 4c8be80bf..caf4f4888 100644
--- a/src/addon/mod/forum/components/index/addon-mod-forum-index.html
+++ b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
@@ -35,66 +35,64 @@
                 <core-empty-box *ngIf="discussions.length == 0 && offlineDiscussions.length == 0" icon="chatbubbles" [message]="'addon.mod_forum.forumnodiscussionsyet' | translate">
                 </core-empty-box>
 
-                <div text-wrap *ngIf="sortingAvailable && selectedSortOrder" ion-row padding-horizontal padding-top margin-bottom>
+                <div text-wrap *ngIf="discussions.length > 0 && sortingAvailable && selectedSortOrder" ion-row padding-horizontal padding-top margin-bottom>
                     <button *ngIf="sortingAvailable" ion-button padding-horizontal icon-end ion-col (click)="showSortOrderSelector($event)" color="light" class="core-button-select button-no-uppercase" [attr.aria-label]="('core.sort' | translate)" aria-haspopup="true" [attr.aria-expanded]="sortOrderSelectorExpanded" aria-controls="addon-mod-forum-sort-order-selector" id="addon-mod-forum-sort-order-button">
-                        <span class="core-section-selector-text">{{ selectedSortOrder.label | translate }}</span>
+                        <span class="core-button-select-text">{{ selectedSortOrder.label | translate }}</span>
                         <ion-icon name="arrow-dropdown" ios="md-arrow-dropdown"></ion-icon>
                     </button>
                 </div>
 
-                <ion-card *ngFor="let discussion of offlineDiscussions" (click)="openNewDiscussion(discussion.timecreated)" [class.addon-forum-discussion-selected]="discussion.timecreated == -selectedDiscussion">
-                    <ion-item text-wrap>
+                <ng-container *ngFor="let discussion of offlineDiscussions">
+                    <ion-item text-wrap (click)="openNewDiscussion(discussion.timecreated)" [attr.no-lines]="discussion.groupname" [class.core-split-item-selected]="discussion.timecreated == -selectedDiscussion">
                         <ion-avatar core-user-avatar [user]="discussion" item-start [courseId]="courseId"></ion-avatar>
                         <h2><core-format-text [text]="discussion.subject"></core-format-text></h2>
-                        <p *ngIf="discussion.userfullname">
+                        <h3 *ngIf="discussion.userfullname">
                             <ion-note float-end padding-left><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</ion-note>
                             {{discussion.userfullname}}
-                        </p>
+                        </h3>
                     </ion-item>
-                    <ion-card-content>
-                        <ion-note text-end *ngIf="discussion.groupname">
+                    <ion-item *ngIf="discussion.groupname" (click)="openNewDiscussion(discussion.timecreated)" [class.core-split-item-selected]="discussion.timecreated == -selectedDiscussion">
+                        <ion-note text-end>
                             <ion-icon name="people"></ion-icon> {{ discussion.groupname }}
                         </ion-note>
-                        <p><core-format-text [maxHeight]="60" [component]="component" [componentId]="componentId" [text]="discussion.message"></core-format-text></p>
-                    </ion-card-content>
-                </ion-card>
-                <ion-card *ngFor="let discussion of discussions" (click)="openDiscussion(discussion)" [class.addon-forum-discussion-selected]="discussion.discussion == selectedDiscussion">
-                    <ion-item text-wrap>
+                    </ion-item>
+                </ng-container>
+                <ng-container *ngFor="let discussion of discussions">
+                    <ion-item text-wrap (click)="openDiscussion(discussion)" no-lines [class.core-split-item-selected]="discussion.discussion == selectedDiscussion">
                         <ion-avatar core-user-avatar [user]="discussion" item-start [courseId]="courseId"></ion-avatar>
                         <h2>
                             <core-icon name="fa-map-pin" *ngIf="discussion.pinned"></core-icon>
                             <core-icon name="fa-star" class="addon-forum-star" *ngIf="!discussion.pinned && discussion.starred"></core-icon>
                             <core-format-text [text]="discussion.subject"></core-format-text>
                         </h2>
-                        <p>
+                        <h3>
                             <ion-note float-end padding-left text-end>
-                                {{discussion.created | coreDateDayOrTime}}
                                 <div *ngIf="discussion.numunread"><core-icon name="fa-circle" color="primary"></core-icon> {{ 'addon.mod_forum.unreadpostsnumber' | translate:{ '$a' : discussion.numunread} }}</div>
                             </ion-note>
                             {{discussion.userfullname}}
-                        </p>
+                        </h3>
+                        <p>{{discussion.created | coreDateDayOrTime}}</p>
                     </ion-item>
-                    <ion-card-content>
-                        <core-format-text [maxHeight]="60" [component]="component" [componentId]="componentId" [text]="discussion.message"></core-format-text>
-                    </ion-card-content>
-                    <ion-row text-center>
-                        <ion-col *ngIf="discussion.groupname">
-                            <ion-note>
-                                <ion-icon name="people"></ion-icon> {{ discussion.groupname }}
-                            </ion-note>
-                        </ion-col>
-                        <ion-col>
-                            <ion-note>
-                                <ion-icon name="chatboxes"></ion-icon> {{ 'addon.mod_forum.numreplies' | translate:{numreplies: discussion.numreplies} }}
-                            </ion-note>
-                        </ion-col>
-                        <ion-col *ngIf="discussion.timemodified > discussion.created">
-                            <ion-note>
-                                <ion-icon name="time"></ion-icon> {{discussion.timemodified | coreTimeAgo}}
-                            </ion-note>
-                        </ion-col>
-                    </ion-row>
-                </ion-card>
+                    <ion-item (click)="openDiscussion(discussion)" [class.core-split-item-selected]="discussion.discussion == selectedDiscussion">
+                        <ion-row text-center>
+                            <ion-col *ngIf="discussion.groupname">
+                                <ion-note>
+                                    <ion-icon name="people"></ion-icon> {{ discussion.groupname }}
+                                </ion-note>
+                            </ion-col>
+                            <ion-col>
+                                <ion-note>
+                                    <ion-icon name="chatboxes"></ion-icon> {{ 'addon.mod_forum.numreplies' | translate:{numreplies: discussion.numreplies} }}
+                                </ion-note>
+                            </ion-col>
+                            <ion-col *ngIf="discussion.timemodified > discussion.created">
+                                <ion-note>
+                                    <ion-icon name="time"></ion-icon> {{ 'addon.mod_forum.lastpost' | translate }} {{discussion.timemodified | coreTimeAgo}}
+                                </ion-note>
+                            </ion-col>
+                        </ion-row>
+                    </ion-item>
+                </ng-container>
 
                 <core-infinite-loading [enabled]="canLoadMore" (action)="fetchMoreDiscussions($event)" [error]="loadMoreError"></core-infinite-loading>
             </ng-container>
diff --git a/src/addon/mod/forum/components/index/index.scss b/src/addon/mod/forum/components/index/index.scss
index 733686a59..5b0fd16cc 100644
--- a/src/addon/mod/forum/components/index/index.scss
+++ b/src/addon/mod/forum/components/index/index.scss
@@ -1,16 +1,5 @@
 ion-app.app-root addon-mod-forum-index {
-    .addon-forum-discussion-selected {
-        border-top: 5px solid $core-splitview-selected;
-    }
-
     .addon-forum-star {
         color: $core-star-color;
     }
-
-    button.core-button-select .core-section-selector-text {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        line-height: 2em;
-        white-space: nowrap;
-    }
 }
diff --git a/src/addon/mod/forum/lang/en.json b/src/addon/mod/forum/lang/en.json
index 65a9af9df..29215eb9d 100644
--- a/src/addon/mod/forum/lang/en.json
+++ b/src/addon/mod/forum/lang/en.json
@@ -28,6 +28,7 @@
     "favouriteupdated": "Your star option has been updated.",
     "forumnodiscussionsyet": "There are no discussions yet in this forum.",
     "group": "Group",
+    "lastpost": "Last post",
     "lockdiscussion": "Lock this discussion",
     "lockupdated": "The lock option has been updated.",
     "message": "Message",
diff --git a/src/app/app.scss b/src/app/app.scss
index 474ace86f..a43d1efee 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -503,6 +503,13 @@ ion-app.app-root {
     }
   }
 
+  button.core-button-select .core-button-select-text {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    line-height: 2em;
+    white-space: nowrap;
+  }
+
   // File uploader.
   // -------------------------
   .core-fileuploader-file-handler {
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index f8d0edfe3..d4514cc94 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -579,6 +579,7 @@
     "addon.mod_forum.favouriteupdated": "Your star option has been updated.",
     "addon.mod_forum.forumnodiscussionsyet": "There are no discussions yet in this forum.",
     "addon.mod_forum.group": "Group",
+    "addon.mod_forum.lastpost": "Last post",
     "addon.mod_forum.lockdiscussion": "Lock this discussion",
     "addon.mod_forum.lockupdated": "The lock option has been updated.",
     "addon.mod_forum.message": "Message",
diff --git a/src/core/course/components/format/core-course-format.html b/src/core/course/components/format/core-course-format.html
index c7c3bf6ed..40bcd52fe 100644
--- a/src/core/course/components/format/core-course-format.html
+++ b/src/core/course/components/format/core-course-format.html
@@ -14,7 +14,7 @@
                 <div text-wrap *ngIf="displaySectionSelector && sections && sections.length" padding class="clearfix" ion-row justify-content-between class="safe-padding-horizontal" [class.core-section-download]="downloadEnabled">
                     <button float-start ion-button icon-start icon-end (click)="showSectionSelector($event)" color="light" class="core-button-select button-no-uppercase" ion-col [attr.aria-label]="('core.course.sections' | translate) + ': ' + (selectedSection && (selectedSection.formattedName || selectedSection.name))" aria-haspopup="true" [attr.aria-expanded]="sectionSelectorExpanded" aria-controls="core-course-section-selector" id="core-course-section-button">
                         <core-icon name="fa-folder"></core-icon>
-                        <span class="core-section-selector-text">{{selectedSection && (selectedSection.formattedName || selectedSection.name) || 'core.course.sections' | translate }}</span>
+                        <span class="core-button-select-text">{{selectedSection && (selectedSection.formattedName || selectedSection.name) || 'core.course.sections' | translate }}</span>
                         <ion-icon name="arrow-dropdown" ios="md-arrow-dropdown"></ion-icon>
                     </button>
                     <!-- Section download. -->
diff --git a/src/core/course/components/format/format.scss b/src/core/course/components/format/format.scss
index 75426f095..34684e29c 100644
--- a/src/core/course/components/format/format.scss
+++ b/src/core/course/components/format/format.scss
@@ -6,13 +6,6 @@ ion-app.app-root ion-badge.core-course-download-section-progress {
 
 ion-app.app-root core-course-format {
 
-    button.core-button-select .core-section-selector-text {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        line-height: 2em;
-        white-space: nowrap;
-    }
-
     .core-format-progress-list {
         margin-bottom: 0;
 

From 041db81a33cc6dc84bd501b9db6f184882d4cc2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 31 May 2019 13:59:29 +0200
Subject: [PATCH 027/257] MOBILE-2828 android: Add adaptative icons for Android

---
 config.xml                                    |  37 +++----
 resources/android/icon-foreground.png         | Bin 0 -> 14862 bytes
 resources/android/icon-foreground.svg         |  98 ++++++++++++++++++
 resources/android/icon/hdpi-foreground.png    | Bin 0 -> 1517 bytes
 resources/android/icon/ldpi-foreground.png    | Bin 0 -> 3552 bytes
 resources/android/icon/mdpi-foreground.png    | Bin 0 -> 984 bytes
 resources/android/icon/xhdpi-foreground.png   | Bin 0 -> 2065 bytes
 resources/android/icon/xxhdpi-foreground.png  | Bin 0 -> 3251 bytes
 resources/android/icon/xxxhdpi-foreground.png | Bin 0 -> 4640 bytes
 .../splash/drawable-land-hdpi-screen.png      | Bin 14301 -> 10631 bytes
 .../splash/drawable-land-ldpi-screen.png      | Bin 5224 -> 4003 bytes
 .../splash/drawable-land-mdpi-screen.png      | Bin 8303 -> 6132 bytes
 .../splash/drawable-land-xhdpi-screen.png     | Bin 24188 -> 18494 bytes
 .../splash/drawable-land-xxhdpi-screen.png    | Bin 31537 -> 25854 bytes
 .../splash/drawable-land-xxxhdpi-screen.png   | Bin 41246 -> 33932 bytes
 .../splash/drawable-port-hdpi-screen.png      | Bin 14867 -> 10835 bytes
 .../splash/drawable-port-ldpi-screen.png      | Bin 5368 -> 4078 bytes
 .../splash/drawable-port-mdpi-screen.png      | Bin 8612 -> 6232 bytes
 .../splash/drawable-port-xhdpi-screen.png     | Bin 25291 -> 19067 bytes
 .../splash/drawable-port-xxhdpi-screen.png    | Bin 32738 -> 25073 bytes
 .../splash/drawable-port-xxxhdpi-screen.png   | Bin 42758 -> 32436 bytes
 resources/ios/icon/icon-1024.png              | Bin 23610 -> 20032 bytes
 resources/ios/icon/icon-40.png                | Bin 1518 -> 1193 bytes
 resources/ios/icon/icon-40@2x.png             | Bin 2746 -> 2140 bytes
 resources/ios/icon/icon-40@3x.png             | Bin 3947 -> 3100 bytes
 resources/ios/icon/icon-50.png                | Bin 1672 -> 1386 bytes
 resources/ios/icon/icon-50@2x.png             | Bin 3340 -> 2575 bytes
 resources/ios/icon/icon-60.png                | Bin 2136 -> 1644 bytes
 resources/ios/icon/icon-60@2x.png             | Bin 3947 -> 3100 bytes
 resources/ios/icon/icon-60@3x.png             | Bin 5762 -> 4683 bytes
 resources/ios/icon/icon-72.png                | Bin 2550 -> 1970 bytes
 resources/ios/icon/icon-72@2x.png             | Bin 4719 -> 3763 bytes
 resources/ios/icon/icon-76.png                | Bin 2667 -> 2076 bytes
 resources/ios/icon/icon-76@2x.png             | Bin 4898 -> 3943 bytes
 resources/ios/icon/icon-83.5@2x.png           | Bin 5388 -> 4199 bytes
 resources/ios/icon/icon-small.png             | Bin 1195 -> 851 bytes
 resources/ios/icon/icon-small@2x.png          | Bin 2077 -> 1612 bytes
 resources/ios/icon/icon-small@3x.png          | Bin 2976 -> 2340 bytes
 resources/ios/icon/icon.png                   | Bin 2062 -> 1563 bytes
 resources/ios/icon/icon@2x.png                | Bin 3784 -> 2980 bytes
 .../ios/splash/Default-568h@2x~iphone.png     | Bin 22258 -> 16374 bytes
 resources/ios/splash/Default-667h.png         | Bin 26694 -> 19833 bytes
 resources/ios/splash/Default-736h.png         | Bin 49479 -> 37292 bytes
 .../ios/splash/Default-Landscape-736h.png     | Bin 47416 -> 38609 bytes
 .../ios/splash/Default-Landscape@2x~ipad.png  | Bin 47077 -> 37335 bytes
 .../ios/splash/Default-Landscape@~ipadpro.png | Bin 55504 -> 44093 bytes
 .../ios/splash/Default-Landscape~ipad.png     | Bin 20256 -> 15329 bytes
 .../ios/splash/Default-Portrait@2x~ipad.png   | Bin 48050 -> 37447 bytes
 .../ios/splash/Default-Portrait@~ipadpro.png  | Bin 56701 -> 45081 bytes
 .../ios/splash/Default-Portrait~ipad.png      | Bin 20741 -> 15514 bytes
 resources/ios/splash/Default@2x~iphone.png    | Bin 18946 -> 14001 bytes
 .../splash/Default@2x~universal~anyany.png    | Bin 65795 -> 50719 bytes
 resources/ios/splash/Default~iphone.png       | Bin 8612 -> 6232 bytes
 resources/values/colors.xml                   |   4 +
 54 files changed, 121 insertions(+), 18 deletions(-)
 create mode 100644 resources/android/icon-foreground.png
 create mode 100644 resources/android/icon-foreground.svg
 create mode 100644 resources/android/icon/hdpi-foreground.png
 create mode 100644 resources/android/icon/ldpi-foreground.png
 create mode 100644 resources/android/icon/mdpi-foreground.png
 create mode 100644 resources/android/icon/xhdpi-foreground.png
 create mode 100644 resources/android/icon/xxhdpi-foreground.png
 create mode 100644 resources/android/icon/xxxhdpi-foreground.png
 create mode 100644 resources/values/colors.xml

diff --git a/config.xml b/config.xml
index 1ab1ad371..154531127 100644
--- a/config.xml
+++ b/config.xml
@@ -43,24 +43,18 @@
     </feature>
     <platform name="android">
         <resource-file src="google-services.json" target="app/google-services.json" />
-        <splash qualifier="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
-        <splash qualifier="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
-        <splash qualifier="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
-        <splash qualifier="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png" />
-        <splash qualifier="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png" />
-        <splash qualifier="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png" />
-        <splash qualifier="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" />
-        <splash qualifier="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" />
-        <splash qualifier="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" />
-        <splash qualifier="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
-        <splash qualifier="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
-        <splash qualifier="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
-        <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
-        <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
-        <icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
-        <icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
-        <icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
-        <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
+        <splash density="land-ldpi" qualifier="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
+        <splash density="land-mdpi" qualifier="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
+        <splash density="land-hdpi" qualifier="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
+        <splash density="land-xhdpi" qualifier="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png" />
+        <splash density="land-xxhdpi" qualifier="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png" />
+        <splash density="land-xxxhdpi" qualifier="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png" />
+        <splash density="port-ldpi" qualifier="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" />
+        <splash density="port-mdpi" qualifier="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" />
+        <splash density="port-hdpi" qualifier="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" />
+        <splash density="port-xhdpi" qualifier="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
+        <splash density="port-xxhdpi" qualifier="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
+        <splash density="port-xxxhdpi" qualifier="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
         <resource-file src="resources/android/icon/drawable-ldpi-smallicon.png" target="app/src/main/res/mipmap-ldpi/smallicon.png" />
         <resource-file src="resources/android/icon/drawable-mdpi-smallicon.png" target="app/src/main/res/mipmap-mdpi/smallicon.png" />
         <resource-file src="resources/android/icon/drawable-hdpi-smallicon.png" target="app/src/main/res/mipmap-hdpi/smallicon.png" />
@@ -77,6 +71,13 @@
         <resource-file src="resources/android/splash/drawable-port-xhdpi-screen.png" target="app/src/main/res/drawable-port-xhdpi/screen.png" />
         <resource-file src="resources/android/splash/drawable-port-xxhdpi-screen.png" target="app/src/main/res/drawable-port-xxhdpi/screen.png" />
         <resource-file src="resources/android/splash/drawable-port-xxxhdpi-screen.png" target="app/src/main/res/drawable-port-xxxhdpi/screen.png" />
+        <resource-file src="resources/values/colors.xml" target="/app/src/main/res/values/colors.xml" />
+        <icon background="@color/background" density="ldpi" foreground="resources/android/icon/ldpi-foreground.png" />
+        <icon background="@color/background" density="mdpi" foreground="resources/android/icon/mdpi-foreground.png" />
+        <icon background="@color/background" density="hdpi" foreground="resources/android/icon/hdpi-foreground.png" />
+        <icon background="@color/background" density="xhdpi" foreground="resources/android/icon/xhdpi-foreground.png" />
+        <icon background="@color/background" density="xxhdpi" foreground="resources/android/icon/xxhdpi-foreground.png" />
+        <icon background="@color/background" density="xxxhdpi" foreground="resources/android/icon/xxxhdpi-foreground.png" />
     </platform>
     <platform name="ios">
         <resource-file src="GoogleService-Info.plist" />
diff --git a/resources/android/icon-foreground.png b/resources/android/icon-foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdadeb07f6d589e7bda617328e4380ae8fbd3db5
GIT binary patch
literal 14862
zcmeIY`8(8Y_&5HRN_UET?v%<_qtZkuS!S%=4KlVG3CR*g5)(7BZ*8V*x2$D`ilK%`
zZrPVYvW<`wF&fJlV~N4oX6Cu3&-490-+$ow;d>nS97l)V@44o@&g*r)&gD9<>)|;o
z)1BM*Z-*dgr`cIF7J@c||89o1Z3TZK<&^IVpYVU1UDyUbVcV_}!Sf%t&N|>BNTNyj
zPb5`YLI%9tM=-W0*x)<}fmi&mL4kpRs$Ra{c=s!}uBqbuJu_$Z_Jcw4!a*0j2sf`m
zmN?wio7Ya?y5(Z#j`MY~yY5A}=7Kf-`%(STG6*^VnW0Z#2qH}ng=P!|I;pL7amz0r
zd1BF%s~tkAJcYeJdDy|s{Cf1%tG3a*ms6yu7mdoFJtN*kaNo8yzkadpg{f6}n?aj_
z*!%Wjnere#-|?4ar^rvF4t_f9g*|#7dp*<Q$df~*5p<5})7zJNXje~a&>c#hi<wXI
z@ecK6!w%%aLi#$l77djC@ADr5{~_=n0{<cKe-nX*(cB&pDC)i!Z*3_Yd^~egXl97l
z@kG2LgGAy~!u+f-UOpI>+Ey_!oQmvjDCF-_0t7u<zxn+wB{D2*gH%=21xCXeNxL@w
z5ID)f`bHBiS>0?&Bvabt-X;i|h=M^-gL|Q4x$nGJKKb1-X4q+3uq|!%4$(dpZ=gmY
zIHUD6;c1;?XC!v+oO$|wT@*@a+y+6DCthFlHb!6m2k-1;+eamFsKknqpNY0WrTpI2
ztkEORmD#5UKen{Ac#I~9M75j*lkLecSFIfTVjR0i|KuUT&sA=VLBh^1wd1BuF)bfI
z4*%=klF&$LgpAbAL6A|pSJ|alDmCN=x^RYo@>U4EBlwqS?|f=xtd5Kg86O!L$u}1h
ziE@4cK~cfihpGZ%t@W3_a2O>@t87IELkD%CUO9h$oFp)yEcTu`bB3-$-U5Zh12wjP
ze|xRn%iY~wT62H=TszWb<(C=%K9VV}$Usmyoo^ap^Y5NNe=gb7{Zjxn$l3saR0iK%
zX{_w@;4or}$BMg<E_zqKMW}sC#@9sz1+A1)?gFKS<968BM}*URDCYIWMeJBbHy>JX
zIEKX_28Ez^NF~_yDCv@E1#>kVS`0?0dp^*8*RAH=b|mNirNc14^JqPN=0;qMq04T*
z6Z!ff=ElI!pFa~*B{o5_<MG=e*%r<I%e}I4a<$KTS%t+^YAW8hxqHjX*L#tM*%vTg
zw}8o&W`X$PG}<OeuT5qz6f%4`{j&cJ7Z>^(@j4|%m4+-%B*w$KU34y$x5DOsmXwre
z&wMKxy~R=oJU{@$?gNHBZ)<B^z+Pj-NRI*|E5m6BvX4lGA!V`c{rmUz2)WIWj=>fP
z67Q)BVDBlmFJUaC^h}UA6U1*)FzZ;N$It8H-GbhmS}uO;Gv#zU)Hdi>lN1CIYF|5+
zYb{TI=PZ)&-XCmv7ttyRS)b=J)`(i%ty{l_VCT~%L?JySknQBz_+Te9FXhs%J<RH3
zaI53wf|lu5>@}r#IC_L5>j2d7<tPMY^j~`Y6^Ue8A}F1^9&oaqQFdzPi13^9jOOCn
zrLT^r7*7!>&q@SpsCgUAnJ7at3ltgD7(u8X%R<i$09?@6*jSzd04C{xNt<OetLZF4
z(IaAk4W=L6WFy|fSb2aV)0P5<gPC@Ka8RBp5Jsw;c<TLheR-x@g+lN_UzVGg4ZJH0
zQ;?UD3GGdg)0Ge|!y<bV6y;DF!CSj#o~{~xk+wQjRaA^YILTd{m^;GFPjN=-=&Wc1
z@<2+~Kxka$Vvo7l)6NOJeBB3uD9q0beQJA)TL{01O11mp*CIzh27u4l2kO#1ANJSR
z@lMsZowBf1TFfvI1CX$i3WBOtTM&j7e)sO(xddVrVK3x50YK6@nC=p>$^~p^=BGrc
zGs7&=Dr)41`$`L_RQ6oOXo4<aBjk|<)Kx0G)}F?npPw(7s;bk1N1VFZUVe@j3|zWW
z7x4CZ&uJ*?`*R2y3B5U76YP`UTd74^%z^p&*jL~V>h6W%<o54hJ14ZxG$@<@?7xh+
z#9zHS<^Y?&Lk#jmU%sI87v8<1`}*a2pTT#<Lfkt5k&F_n7>|^#<_IXmfAIY7lpb+K
zH)EDX#}feQaCP8Zyl&vE-UZYSNL?GSNdM~S$M~+Zh*}-E^In)88f^=N&J7|cb`la2
z5mkggAy;2O<UJLgncBctah*uqPVtqcs>qk@wFfhU<#b2DM|CccByQbzqby6#l*tj;
zqr+T&>ZNFBVMFL3wp1&=P?g&X9X%rgy@75HRh5-^_ZKmZn*tD&bU+J?r`vFaGKIhc
zL*EH8c?+ZsvA?DAUrR=kY;+_!UD<&sa&|R`rmG;d+EHNO&)2kY!!>n9Y#BHsAI_-h
z3C>8DFllm(dGNsCf>5PMV5=&lg1#!iOB)0Qgt1o?j(YJ<?fvoWa-YHFRN+jk#v+iq
zwbSkI*O;1_o#`LDfAZ{7X^l1Mij2lk?rg0elSYog#E3u>3R|ECy`CFo7jsjb7k{ON
zcO?=%SQdo)>v)=>hMwL=zmR#H^i9ySH$u0(JvYod1Dk(D;>5z;%)r3JlpaAFlCFO0
z)M96k1DM%T1UmOA&oWc>5s{6j6%&bl_eVd6f3(5O$;irv1){%z;0<vA>s=+Bg2z+y
z2`I93e?a&d3@cK+xY43(2tmn~m6fe2115SF8Z`Qc`g#u#mn97|%*69ci1wFIe-0@#
zH|A4%x+FoiISwNBr0RCyME<Me>BWWAsj8G7HRC1?bLMllTpY0+q@?hdLSeeV-X7mR
z#>+U`+Sa0&VQ0{b>9oc>Zxktu3m{^t35iBf19<GXRhI4W*ajmA?tWp6tC)E=D3JzS
zm7op2GZTKdNG5R#9>l~5e)H%G$V8-P0qn2GolD%B#ceS4kMYA;l%#l%VM1ae{a0mI
z_^gZ&M)4T1>PJHRzAIwenKpHqH0`5s-W-U}PZ=)v=zPizTS(5HP61P?sDK42rEB>N
zEN+lEY9>t_#TUoqh+Dj^X{&1>+IOV^T~#c=pi%pB-yue-vR$1DGt3=bs78*tf1J4?
zZJHpvTG<uJ=ST{pyvk)T^bas|*lpS>6PQK3apOt2m?GmfNP54yXTJi-3G2R5rZqvL
z|AP$)Mynhn$7H=xgcm6QZw&+9YJ>v|tt}j=@EeV_!QkSE1(=xUo@2z7+VS>u`pT28
zFpokIO`ZiFg`%=Fu0#kN;S8|8&o*_*c>WWhwY4xuEy{0!K5G=!EVS8x#P6~jrft$x
z2}a@hejqVD09fJaM}ad;T5gA2-&b!ewA%q{yF4Uj#}lJ_f+zKnOu-32%*Vu+=AI%@
z2%x6@8?Bq)ZaH9B$AROSpi2qzA(s+}l5<1V+>d14K>1_9N&iP2C>LZD8OLGsJ-<*b
z8*g){)bt?`Gk=G+kVNf|4R-(nMF~W0(<X6@XS9-^I&<Rz(A-fN`$A$jL6f(=KwMD+
zapgEX%NDi60#rfPl5(iU0Xf~<(`rI4?%WPNQ}+4a(I6d|_AgkM3Rx_Vr3|!_l#uXM
z1FI9lZDjYoD!|*FJ3C~UgpV*q>%At(XNb5XC@z5i8#zKhz7M>K5KHa5!3#pyD8W_1
zN<1!MSZQ~~B>6qRQ;5*GfCsL1y0;mE;aknwTU41F#YpDs!E#)EIbjdv`tv;Sx71yc
zA$>d$E<h1zXanNNn>WBp!PkTtqI$N94MI&G(cTdyDdn#Nj|jegeNyrNVQhvPHC{%$
z?i7W9N9)xR_GT#Yug?wF77te9nIP0x*(RJ_AC%78=QkEd{J1Y^N<*>5!8TXJKX*5B
z;jL5&9G+&9OM#V~eBn$=jNlWcR#S*yf>zp-WKZxXyWI5P@#wK`;$CxDD8A{vlvkwO
zk|?4lP_ai8(MPvL$iJKlqceKf>XMx21j-QJTm+IT2RYiCUB!<lezQl3cbv(7&0f1N
zTy8z#pVg`AnSlI7Qzk2*sn=$#59wx$t~&sK{fH<Ick^S#S&#6E725DfebXu>3c-%H
zRCK|%dh43xv<0pT_b<T++Oua1bj|{VR}^Kjj>N&6dqxNQ+U0bwB!OHMP9gmBctPpK
ziM3`;whdL=G@;$UNdw-aAq>>tJzBLDd!!W?m^N)L#4ju5l%;P8U+TC<ELVu2v;|UU
zf-0mB$>ipxWZ9v_2}w9WG7#1QAFdWndmGNgNtqUzC1sQ0I9iexy2*%j`F<a4o<gk9
zr&Q=OE5Z*fhaD_aAU}p6YqSW|@dQ}KVDu-F?+A2M)l9=jjQ{%eD?3%<q)gqAbN$T&
z63)pv{Al7zG_m3kocf`p>iu=}+D*)o;cfqo(S?f8%)deS0OTm0ecP_8ivzJvdz=)h
z1>c`659vK2VMDkhBd*nif1ao>c(ZAR39`XgX!8srC}mU-<X3}~PwV*HNE$41@aCBH
zQaxvOh@v5)ZU|`QfEPyMo2T~U5{NDdM1D`O>p?R__$^Sp#lw=!J(1@nH`WGr$4ZW~
z{b`2#V0JNXx8BVViS<Q_g2eHeYMi;#imqrw2M9MBMSVApw;}6~Q5Lg^plZ>36UFNX
z;ii5;BYU-@Mq!pbcs{;qz%&0P?kvo3-^7CS<GF`tBOOeaT7e*6+pW+dFsOPmwxBP>
z3%!v~tawA%I|<7s60`U3-;ctgKFyDDvo+sD5?BS)Pq<Ic(i54*xhaA}{=Dw!<^H+j
za$BRmg9_ZE3FIJ96>Z4CN}dz;Oll%1^_Sn>{N6s%dp4?@`x>RBU{)^$D}G4q#V~)i
zj?K%mA}=BYOiEY9I<7aM8$sUoyCkw|o9N8!?+@S=y?JXWm5N>a28sh^#-x^C^R!QP
z<R!)ZxQA!!_kQJ1ngp6Yl9aprc15x)jFWB(lC`S`0*dnb4mKH7lbrcs636<UPnB!k
z%BRntKdYq#jpR74$OWBA*eHONyg+aD_%cikGv6H>5$F}l)CWmdT|)|L_~ZAsCPq@B
z?nFY-G_G1T!xM`UTmhCzoLD$vigV`VAer=7qWHvu-;-UY@P(Glq(Somm+Ar#*{u>b
zK^c#i*!|q&4sXY#;V<N1%Hk~|Sw=33C^aXIHHKit(`AkQJ)%%_PG3-?H@xDSu-NlG
zLgkSzNs(`!gXGUr<|>#nLS^(p%sT1Sn`f!kjud#H^~wl)UH$E{!z=h@%F9Flo}%+)
zUdffdRUf$?+8OyN$#CyG4qH<UKSp=fQeS4XEV=O@B{w_-^tFE3cf%)+C~4A!2X%bj
z>|Mv@<_8)HX!OkjMQ1-uXji(&RGq@gQknAF$0<W1k?lEUz`}6z&T6aG25}X>Yl1QZ
zkao^bxWyV~5quvJ`;E~#1bNq~BK^5@HTY5fLpmzMCWNyPIK%(dI?Rm@EFQr2vqrBJ
z872<wffYM^9mact1Ze@b5PB~FVSxmbrp_z7ag!)sr)*?M=NUf_0e5zDh9ZAG>2RO2
zRcO0YXg;2<IHTE5`6M`ebEbv+X%xnaRM@MtqSd<zn$UI(6oJ7?gpp2>LDNBv(OV4(
z&$BBhNBpe$ig0XGELhCoa+#eW4?U}4nwzvdm1#4U7?T{CpscCLSQ0Zy|AFjr4!2~T
zg7i)(LeE-!zP<U$pi&L?!VE#wR1fz~3uH)Uub(@mRJ?48ZBvs8>L1F^ntrglt9vhx
zF=d!Q%+7ikw|EZ)7c3j8gqq%%)42?a>qH6^B_GgwIGr@m-_M;OuA~wtmC0fmb;pc1
zW=pvr59eD3zZY0NS{#U8o^{Nc+-hpgw+lZ7A5zyqu#T^apVy3V`)(N+UPt%~lE1bc
zTFkluNMJYwgpCt}@H(q8Mcf`uG3&80L->m%#mK9R6Pj~+!;*O2r#UW{c_)+v7A_$k
zUzR+%^qRHZlw|1FQLwt0e=ohBOU%J<sDW}YV;@sxrpYwBTzf4u_$l`vgExh>>xNbv
zH2$)1S$5<w6!9!9^3AEO!>$;}D0n+GDUzv;i@1^B8|;E9nt1;=mO_;D{VttOju^W-
zHx-yx#;rL4cUzpW#dRTTxnsTW(OxgR;}qs1TV|`xl|&}NI_w)%YZrT>>+0%25T(n)
z%rQ(6kFVxm<C<l%knYt*ynGS^k7yCd4J)YY&K6LEx_dI0e>kJI85J)`>Z!QCzR0!#
z`=1_U)RRE|TNM8nQqm+6Z!-687c72Xt!Yr9sIYpd@#f}(Qe@J2kI20(D$EUQiUy=n
z>|k8OTS$6hu$p*lp=;XlDV|@DlxZjU8&I<L(>9<Qs3QsIX{+YFNG%Ehl#sX3aVAYa
zi8}w_4N|cCV~KYWlru2DXGQEr1f`p(^A~Jg(d|IOtjaA6=2a5jK$CgdxakqmJ_UPe
zk7>T*qIJd00x@INW}p4D2tGs9k9S|pyd^66v7)c@@NlmxS@c=@QOGrV5EP2$a5&ge
zhLf%G6Nt4iSiH&Tdm_=JboDczx6XNC980r8gwOwMG<opgfz=asp>PY@1~4?C1sl_X
z&pY+EQ>m98W2d^1YMn?mE5z|)c9nx|Ut3J<{Zv@D1>$(*itoiSQb9`3<Eo-{8%#@E
z4AC_9K{Kr6R6^a>A`;tBi4^yBpDCj}t4!^f;7;j*F|L|7J=~oo1=W5S6gvQi3$d}J
zttu$+7YaZzY^}WiWt4EIQ@2P_)6ZMEu9e9HEu9nMM<+;jUjm$LZI?iV4D9s5gnVyn
zM)FrGC7W61Q$6QhkMJhmE@x?{ONe|H-%+^*4u><tX78!h+p3&BoxL%pqzjuL8Li{3
z6f1xlGfThv;mCR0M?r(*idK9FqOYu1vB7l|*b$d*J8-K5xywM{Q6e>Tt$9p4`pLY8
zv|OBWwtp^RN5*ah!)YDo%xkCMAr-=QXe8s|79;BfNas9)f^<=e9wziT#Ej;Dl{+dY
z>S3248TYRp&z`jx5`VG@(lHUa#fXDkzmg3<KP<<6Q)s2?tAyD;S}X~lvCXp+>G*34
zbgM&gixJI1M14zulZ;41;S_Enh(3|D*FMGEG`h0K#dr-TMlZc#3AiPm1Vm0uyJugp
zr9c^*Y@iHF+qU_Ho$KyP3s$V7>ix87LXXS1B#G{V+Sc%Q4g@72Ip36!Ofk$>7CaA9
z_jVR^i25ykj{)q#st(o{ufFd&2<_SbTMN5Vc9lG0Uv8|5nq1U<)-`GQxb#AKWjWDD
z7+CQz-I>?cgM{_~jfMS#&d0<_-Q|GN?-wA8`2KSqKk!{hDMP^yWqxC0M5IgTOfMz|
zvOiiAyoC`hCLh#sd0Ejk;V6{%aqOnY7Y%FOzvjNF?@!$=_?baLObIk1;rl`LtFn1J
zbO3Z(+_y)8{ne~mDy97kMfA<BLdWihE_A)WVr4FF#5}|{m73I7OxR(Vko`7L)Hk_H
zm+JoB4As~_R(*^;xhZO&AKyqRg54HgQq$FHDC-h2_o-UV-UYSAs2ubI6X`VCF9D(r
z3E(!<EvQeBy!l-^Uv-(i+1ky|Ha~G}+pepS)tybyImjXz29XLi*4Zl~rQBu*o)!Pf
zNn}r7j&^ZGFiRF1vJipLdbhVnZE}4S2aQ}M^|`dfyqk{4r%xrhw)xi>)(Z-wdrm-A
zshc1oiSzakmxMjyJ=Xvus%Q=a4<+?OT}ax`&fM8W80L5LWz1us$%_C2_>0I7%$P@%
z$&*OWEs)a9z6Gm|VcT_vtR4T#C2UisL=AU?1C~E&@_X>yHzfq6@$g;3zMR842iX@1
zj5ChQANQGGUX4lq?2@Prx~mymf!Pq0=3RAqSe3Kstw@lPM2FlPfujn?zKZo(64Myz
zGZFdSaQhR<G&O;~1o&)jkfNkWK^CnX8dA1Cc>Ju2<Jg#j$EU|3HLH1mIaNS3QGJW+
zB`~Hrv3OtXZSO;C$CL!>jn1|8wQJMDArHZjjC0UE1Z3l}9kR|#@~@eH+#STzFwMbG
zdK>P1$;Q^?5w=D7f|jv-{Z`QVwz;|)vK~vRLk$ZGlY+XZN`SAQZbv#N3lhJ+0358k
zzX=NJ*biOV+>p{2@EUZz3U#mP`3BSKu9JTj|J4zVUykHNr>B6pa2)Uh%-rj?8A=SC
z365cKi-)B_vPwzVq_1ck;l$bj4ZUzcLFb%ll^9l%S=;F0QbID7DqrZmUb(B=ZaiqF
zS&VVmd&laWza+XTOR7Z4bYNG~oOzOb8$zKqY1uAGvOj4Jo6wAK^Rfy)zzn<e$e#S-
zQnF%k0yqx%K$XO^E7ylhCtlbLSFX1Mj&}qCn^CD4q~r4qbbMl>p}p-^>{69&yRKjF
zgCzU%54Hl;-d0#(E^*KwQ?BVh`i?R~=8~q#5#_bBDb26&*B%93qy?Kl+91h#eYe;=
z@sMIwX8<1n(doBne_GK+%f?5$mFx6Ro;)e<Y##bmk{o$-IH>jdqW13VPA{yIeA^L`
zCp9@rX|=pr9BomQG(23X2Itdb4B_Q=YRG?jBquK8EMaQrw{|2PTd;lrdMMc8MNtq$
z`6}?DSmGz7fCe@`GUBFF`#~0E!~7yxvK_C-!;$>a!|S8#U1eS->0p1U;DhEl{w`%N
z5Z5C|UySp_B<qjB1sGZKv4$NO+koZ<%fO-YD6xhxkLhC#W}lFeuL)Zxeh9(_Kk^KD
zJf^(7s@y#@xr9%1i9}7&8U5np!3zp7zlqFxy|<vkDBo)3U1XW$ybGpbu<3dFcvW2;
zVQbVXs0q<~cM?v5gfse{#PJ51&iU7wdO@n898urS<dHVI={n0btXOuwxRR=^3X;<(
zNF%sZn#TDM9_@_i%uu<kGge;_9-$2{Jc1JSZ;HiuLK$<Qn0E((cZbf2?NRceAsXb=
zFTGPzlI}kp`btiGgs%c_7T5~!0*tl~mod+fP09|!cj#srN{pvO`Z-Jo(-t!8-sKQ7
zl<)(Nvjf$Iwaj$(OVDKtOsDnEV4DWQXUeRV$)c_XAViVwQK@y#DACfX0t7{2pS*ls
z1ZZn>73Q`o4+r<#iNUjElKAY)F{ASff&RM<Yc`w$1rav_yKI+i1_F8Ja^ab9hCrE2
z8Kk_-c0q|YgylgH94_zh;YR|b)UgeOcOwjIqBfN4d=fOfS*^aLfzXdz2dZ(OlIXh9
zKXr;Cz0o;k8+rOp!GDEg)|Kh|bY8E56Bs2*DWOzqUJ+D59iGDA!}xTsYd56y5r{m@
zBpDhQ81VlEt-WO$Sy$3>sX;0!y?idhGhxxYbl*RtYuH(D=Rta1L4kPX;u<+-t6NtA
zd?7oH*3+DoZg?vqlJzHOoPc<d($iGiG3^z(iAtTC+9e^Mis!F`CjDN310SEg{zE%2
z)UbW9nl5iDecRn?EOdY8;>I{`F!%>z|Im@L9QlfsSvv~R8VIJO#Z9xlQzb;yUBF)M
zB|F4T<g=a1S?PgyK7)aZZjmfm3m4jI0uU}IFVBAu`p}ZJrf`YNHOzR}3Dy@8tAV<z
z^G<_;gdy=8BDDl3LR!|>nuDfc?+9tW7mRt+J^P>u<t@;!6&SQVYF8kR1zEI{LE$JN
zDd|!fzP>EbOb#R!#ahjJ*TJVb2JJm;t6=7=TDsK<nI3ka{EbsG{l-nA0M$&{5{i($
z7{Fe%9u^uS0a%Y3lK=^n#=ep`!p4Ob=%n+FE$lbrkI2bA&T>XNa;?J%4x!u@OiYHQ
zIlY9<M)r7Pn3GzF58FUH^BFMu5h=*l76Dl`q#bu$!#8<R@anHfcs_x)S_z6TJ4s2&
z$YT>DO<_O^eVpj%vF;c0xnFFn1Ru-#6MrQ*l$&kZB(O!9rU$p#uiq)7oPjz_K@oJq
z28x4pPLQpbudXoft=>FDA(&%WJ)m<ZWGkPEwEo;5=82xp<g_?_!bW(9^oHk9+&faK
z$Ow1zVn=r15dt>A41`|}sA-5n(^^rnAm9BR;FRrv5^Y&pC9d2DXJB|SF)<enz|i~H
z(`ofSOdetZmlCqE<@#Vl_3Z2`WrjK3uS?s%371amc3RLdSAsGUZ*sSwo%&;JLdM|l
zV33k4*lB-N<4@f`Ggw#qa><%L729R_ISwWB=ebXJVe_80wmg<x;E(xYN~6WUiz&3Z
zIAAJOIPExao<7^PzAty#$5do=Rx)#Pcp#>intQUgBJ-Do4ghdyP=%BZn&x(2Ba5rq
ze|?x<Bo`YaL0L&(Ut?s~f0u5gJ4nTNUu#g&eGDMCwT)c(d`6PDBy^5c34$Igo+~Ts
zQ@natc2!^KShDlqZF~pxxxG3Q(TjQOCZIdOOCsesq0G}kXGRt@vx#rS8~&9Go4e0!
z3Gy5-DYjFk&EFB1Xckx1k#Z+X1x5s(zq!8rqJlRV%gE|BX?-c)3i?siBu*qwD>M5y
z>A_jnBNWvUOBja1V!>)IBAVyYXy>rLd5KL)8()9vp4u%ve*2V-?niL0mSGJNXl{xG
zlav@<1nG#7t4fz27R{@9jRk$Rk!UH+^8eRmbt2m2W_9HG9mDlU`7_bR^Pdmqh*~v-
z!{*Cj^K>|44g_EcDH{GmT6ti2Xk=)g61-<8SnjJ(F`5CdOK~}ccE00n`CJ_?GIS~1
zxXC)5*0W_#V)FoAadzzzD0?}=5~8X|(m~WU1WV3B^|3w)_nWa70~p2yAK`GuuxR|s
zhG^%?2hmtY!g}U>r>My`i(3akTNX5px{v}M$X2&hqJrs2s-Z>FZm9Pk#qd+L9+RKO
z$}fMLqSjHU%3B(wWM3^%i2!E{;5IL))VnPv&^;%}>MUl7s@G{Opg9dZ#HZh8#B>>=
ze0X(tZ8z5McCIW8dxWh%_XxY@qG2Mz?Km2Z%T4j^LelrZK=*twCMHJuN9*w0Z#=b}
zk~POG2g`S*!3Dvr9h~<IYu@GYAE!ba?>tVX`iGwux`MEpsw(2jh^XraSXq-_*({c>
zv2_Xrw=UynbG%Ou>kbgr=6srp!aFNMBNdn9P6=1Ox7c&?bo;kmFc%_GEjQ)C{`ilc
zxO(1l=yuPiyI#pHoz;yzX1rF}<51Nxdu>KPFiqlwLhkJ^IWvoP$OSgW^NHZ`CTPSD
z*!hBOStN)XTN?g23oBjQ%J~s(MbiEJa4!4Y_PBl+H%^P;4Ztnq+5QOp_03eVF8JA_
zGvtMwtrt~kepZo6H0Mh#-+APfX<lbJy{vpylE>re`hw%$q@Gm_6}w?edk)S#i}=<T
zOnK>u$D3ULLUzrvHH@^uk>vUQrBC-@(8Y9v6P}$*qFM#SzINS`kYHwoVdSrKkLKbu
z8PR7D%koww+*`XtCGF-Lo=Yj3QupdVb}QU<BFiRD*32(A*=^eFo$_Vuxc!$;C1K|i
zJlaZfVJF@kZE35MRbHR6udGPe9geh`DHvTmjHFG?p(8mbdY9@K3ug4|wMx7G=3WY!
zdJ(xd+%-%Eo|Z!EIqsiZk04($aM%+l=)GPj|ByINDeb`L4M2LJFGn=VDXA|~*k@yK
z?xeXis+JJdq8s3sU?bg?O)mByixmFSte75r{oh)Tqo#FKLYk`IRR`JOi>Ris#{(zo
z>dCmov;Aqbli3u|!UP2dj@ly<wLqorC;z(UQqcGI&yg?WOQ?phbokIERAX4OVyIP~
zuTI(AOqGv<r{gmB#<3a$(chY!iII>C`B9#>=Z~Ii{<=@EY@5wRb*pb0@xwOxP&5dM
zV_c>V77JNK!@%YT><VAh*9%T;F>>n96R~)IR?p`eI>p5g=iE+5Qfj^JSW+BIgQ~uR
zHY1g&x-*r2q3AI)+_%9v2nvz~yNL3k+k@Ylit)7VQHW374i2csjdZ>~(ri_}eIT@M
zH%u~x*1elbt4~i*S0MkcEJNJZJCfg=D(@fszSVUT5aGADc_t}*0_^nO-f^fhv6U-v
z|8U5EOf8+Jo)}(6h*JIR@a`?nll3Pjz1}5x)k;v&?-lh2sJ~7mT8OG|a=k%4TclzM
zHy+<S{xI10ND_R`s+hjIqKOHzf3$)H-ZjLaMHKf!yFi!GUH-||XHdq|3wF27Gtd|-
z|Ln7vRb`4sN1#LWV(yKuu3TzkY>kzu(CZU|$BsE-SS+xWik+v9#*ZKJ$An@$Gm8Cl
ztHGZ+?3ZeD&x|hWOP++~i*5^0Q~mzcE2S_#uNg~7O0g8luqf&c2htrYtLh2&g4Jy4
zs&ZE%yn`Z+_yzqqdpznP@UzRH@#zg`-1&nZGW_+mqYPz%5G!R{N_Y@l<a~R+XbyO2
z<TWK+a;t;c!XfIm`ZLKd_m2vX6Txr6;jKdCkMfJN17++5_!axJb(x^L07%(hx}aN0
zMq|Ejd#qG)=mxkop#;t>(CC^K9r}7S()#`1qno*AD*FCho*zNnDyt#rB!<zNyPQ=*
z+>0QKM$JA4ZN|XyRJ*L*ur3rWu~4+ZtQ97iN>k6K+>VP$E>}w3kg#kPrHDeG^`)TC
zqY1Leg%8A)tW`dOQt(=|q4n&pcWGk}#~LZSIy?hvCqIvsPX$NBKp7`NdGuImg}<O5
zx_tR$zM1`XQijE`;DoHE7am8UBdPkPkOk<KgnScLC^i^to&NeFwrAHh`8{c}R>OG>
z_{Br0(X8xN+bl&W4{W&gZ-Qe>&>Y)98(JfLo;2#HsHcKW<Ik}fGg$}5)biE0faWA<
z3$*x##OX`k_^}PjJ1#S9u-j@ltLc@yJGgw3F;`e7((v#cWF!gh(@@QP-`?g-bb5A~
z?cMWiU{7E&M^^ud%`w1@$INX}2ph;~j*7)3JO2b%jF8e-!1bW-!lrE5mBt6=aJS~G
z<?Tou>8_6OMiLmCNTuF*`%}<z6x=~`6#;Y1RfRn&A5<>@r{PgZ0Q2xt9AbD@Ph4aZ
zWW*H;4_Ui_%fM?1Z#Gwv01}@c?3AI!5jFBc)=8XerF+G|jT%wVG(9c6>a?peoVI$;
zR}z9c42ACkoU8-*k!W;o%Ga)od%%>wN1<n8<D`Dl$U$q#VrdBa+*k8FMm`0LVsDmo
zr~)1CzS1PXj|>^%&wGzTFM3%S!aLMXLU4~V!zNBiWG=jm2FuyV0ooEiC_-3_x2NJZ
z==V*J&zX4|n?^qD19vB&j(q^;40E+w!U6am>(O&SEJQdVd`H65Pf6B31HJjD-ReLT
z={!KjODnUJCI1xfteGQ35h)a}F;lQ2T=}FkP)EO46{1p6kw?JcJ%l#}`s7imEGrRW
z3P@4_ofLqM1r2G*{Z>_!jY@U^LMnj}`DE;V{fF-HU`Ujz&@>uaT3Y^p#bj%{pBBy|
zd{qkWv2_z)<_E7l(Rd<UzOHaSBs@=d=SbX>9YB1C98f%u*Q@6{zqZ6q@4WsOK+_7K
zsjaUwB)Yz~W|iG~04(JPuqm#}vr6nDXu}C-%mvF>TuRpYiUN<H?*s3+i^cTHi~Iw6
zQQ%G0KS1l=);Q2l0ypTSv4C}L$V}lk`k>(=M7*Dn_?kTc@P#J-78(WIehM^hie|}r
z?-ahX0`DvX&>QOn3DAMf{0VlN4YERF4V>s4O`}~0@cq`)l#-HX3;H%ghP^^$z%d%&
z+A2#n<^Q9{1+d#8e(KdBv|50}e8>ab3kmrG&a(pHZvCeuH2+_H?P;s;yktFo&kuCs
z3zlb@nh7U&jI3~I)B8n{D{7k;45f4Tv>IPMEhUOo{FWS>siN{CX!7|~Yb;irKUt+a
zdK&xm>9i#4HfJHsp!`X&SXQrk7{?>634;($bLb#s<mS{LzGUdT3p_sidlPi%w!i;^
z4|?O>xX(;$YwLT}383O_Qz)v*B&Yi%T;3;?-rb$#1V*3RCjvcYuk*tOL#v8Hy`@XR
zyJ|(q$R7x-o6!gRhAcVZD7E>2e%#awm4#WqtMoL;F4x@;oaq}(1R@ew+%lW*zBd9t
zjB48k8Kq!p?;PqctLp0lT~0bPqW4O~Fk$oSdF;V=WujozF+~VEA)hEvq3Hb})B@?y
zIR&-(hE!`Ur|Uo{^u<)T$9B_^%`$FsOD?nQ71~p%Cy_{;58Cjia}%{3sxPYwedHy`
zrZt~Wb&6#cdJldr1>%p59+nTfQeqz_1?%d6&90*TpO;#h`tiiBudkIUi#S(VaLY^c
zFDS};t<Gf~2MK``PF#ebkc^v3ZN2xz-UqKB5D}xi^Lkkd;4&dq^EP;66uuc6IWqUU
z>f0$xZr)Y^th1yDw35gotOcOM@Ph$h-Ow|GP0+0zY}<Od6Gv$Jmx&Pc<E7WrUSd#0
zujc<5(Ry{k932+Ys|mzFQvjIqV-&rL@fz^-dum4~XJ>;rVz#qB{gluvf4{V?BI<-M
zjfEM2m;@l+1iiryzLR9o{{)X0EFkFOQ;Q?kaK^?s-e+(-SeOty`+^kzxp8+o7!tL%
z4QjXquC98*=12QVT)@=-^D3wN`aT%9I3av9kR((_#_Q=s1bRd6%5Srrg&-||KfifA
zI!yMb3=niqQ3U$-v38qK_Zx@6@Jy?G7n7zy&gzdY0I1Qm&5*0(+<@@wrG3+(&@<Kc
z@rA`-zs~7x{!NvJiyo!ld&9fH_cyy-=E0u>BErGYU&59A_wauigXs5lV$e%ln>9}-
zm%R0?(W0pw!4<m3g^_jQ+aKIN1HX>U_|g@B1cWapnx_OV>$f;*68Xiy%_TI?f1m#l
n_z!{q5cm&)|6d^RMqB{heswfnanIu`LWRwYt<Xh(yWaU<a+2WP

literal 0
HcmV?d00001

diff --git a/resources/android/icon-foreground.svg b/resources/android/icon-foreground.svg
new file mode 100644
index 000000000..add166f8b
--- /dev/null
+++ b/resources/android/icon-foreground.svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Layer_1"
+   data-name="Layer 1"
+   viewBox="0 0 1024 1024"
+   version="1.1"
+   sodipodi:docname="icon-foreground.svg"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   inkscape:export-filename="/Users/pau/git/mm3/resources/android/icon-foreground.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>MoodleApp_Icon_White_RGB</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1306"
+     inkscape:window-height="970"
+     id="namedview21"
+     showgrid="false"
+     inkscape:zoom="0.11523438"
+     inkscape:cx="-652.75324"
+     inkscape:cy="-1188.1419"
+     inkscape:window-x="1894"
+     inkscape:window-y="73"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" />
+  <defs
+     id="defs4">
+    <style
+       id="style2">.cls-1{fill:#fff;}.cls-2,.cls-3,.cls-4{fill:#f48020;}.cls-3,.cls-4{stroke:#4a4a4c;}.cls-3{stroke-width:5.24px;}.cls-4{stroke-width:5.28px;}.cls-5{fill:#333;}</style>
+  </defs>
+  <title
+     id="title6">MoodleApp_Icon_White_RGB</title>
+  <g
+     id="g118"
+     transform="matrix(0.59052793,0,0,0.59052793,211.20967,210.89845)"
+     style="opacity:1">
+    <path
+       transform="translate(-12,-10)"
+       id="path10"
+       d="M 714.85,763.42 V 524.26 q 0,-75 -62,-75 -62,0 -62,75 V 763.42 H 469.18 V 524.26 q 0,-75 -60.9,-75 -62,0 -61.95,75 V 763.42 H 224.56 V 510.14 q 0,-78.27 54.35,-118.48 47.85,-35.88 129.37,-35.9 82.64,0 121.77,42.4 33.69,-42.39 122.85,-42.4 81.54,0 129.35,35.9 54.35,40.2 54.35,118.48 v 253.28 z"
+       class="cls-2"
+       inkscape:connector-curvature="0"
+       style="fill:#f48020" />
+    <path
+       transform="translate(-12,-10)"
+       id="path12"
+       d="M 77.26,402"
+       class="cls-3"
+       inkscape:connector-curvature="0"
+       style="fill:#f48020;stroke:#4a4a4c;stroke-width:5.23999977px" />
+    <path
+       transform="translate(-12,-10)"
+       id="path14"
+       d="M 79.41,401"
+       class="cls-4"
+       inkscape:connector-curvature="0"
+       style="fill:#f48020;stroke:#4a4a4c;stroke-width:5.28000021px" />
+    <path
+       transform="translate(-12,-10)"
+       id="path16"
+       d="m 459.3,338 121.9,-88.72 -1.56,-5.4 c -206.31,21.27 -327.1,49 -505.07,154.49 l 1.61,5.27 46.53,-1.49 c 33.56,1.16 68.26,2.79 101.7,2.93 -1.67,18.28 -0.91,39.85 2.6,65.14 v 0 l -0.81,7.1 c 114.91,38.91 224,3.38 281.36,-97.15 l -3.39,-4.62 C 494.8,365.05 475.76,349.59 459.3,338 Z"
+       class="cls-5"
+       inkscape:connector-curvature="0"
+       style="fill:#333333" />
+    <path
+       transform="translate(-12,-10)"
+       id="path18"
+       d="m 326.35,322.85 c -0.67,-2.38 -4.92,-3.26 -9.48,-2 -3.49,1 -6.17,2.94 -6.95,4.86 -41,11 -108.78,30.36 -156.5,46.43 l -2.94,1 c -36.93,12.42 -54.72,18.79 -55.82,27.76 -5.06,40.82 -1.93,93.35 -1.9,94 l 0.41,14.18 c -21.54,61 0.15,109.76 18.56,154.4 0.12,-55.17 2.36,-100.08 -13.21,-157.18 -0.44,-8.46 -3.31,-67.19 1.33,-104.76 0.76,-6.09 25.79,-14.52 52.3,-23.43 l 2.94,-1 c 48.76,-16.41 118.53,-36.24 159.1,-47.1 a 14.48,14.48 0 0 0 5.08,-0.55 c 4.56,-1.27 7.73,-4.23 7.08,-6.61 z"
+       class="cls-5"
+       inkscape:connector-curvature="0"
+       style="fill:#333333" />
+  </g>
+</svg>
diff --git a/resources/android/icon/hdpi-foreground.png b/resources/android/icon/hdpi-foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b02860331c058dc2279a7cf1e762bc685f36d63
GIT binary patch
literal 1517
zcmbVM_dgp56i;`PR*g`~g(fwE;?$;A%%~HpsM<59w#JB{*P;m*S}U}KiW;rai)zfM
z5?W_fQDWtAMkDm>(Ugln;qHCj`o7P5pYQwWn__EY!3Pot0RR9#q^0RiUZotx+0(q-
zzJ5^x060~LG&Q~zGrltE7G&=y))u~S21F4QH1u>HV1l&o1{!`*@>3nY?4PMa4|@u-
z#Mr&pE-|vkJSYqybla*Jd6NW$R9Z65fho@3Ew(U<>>~*`ifPGd0pnUK%_p2Vw~?MM
zJUND~r<La&s$grAG3dUpMLV2=gx<VkyeIyv;b9pcx7K2~y4xo~uUcCV{8Rco?Cpo7
zH!|Z6X}uQL@V*C6bObNpPjKY_4)kkwLAc1<(P19V^UI>^p&xwBeK~99A@_b3J1@@B
zw?@K+pQ#Ay!&D=!F#2~L^5Hb#LIIbnd7=B$O&1qE)NB9=>ru92Rauazqp$(MiP$*N
zOKb1ap^DR^LjC`!w>N9oR{vPvirQ9|b=kXkBQAyW3cVQK|7TtIYq*b!kE=mZXnNJH
zYBs~zTc>CdFtTZ0GI$v$K9{*mvW#n%&OSKK(9*;mf6(>|Czy+`vgwg|f-1wdt1>Hc
zA|W`5T*WMrFo*4b0!0HZoJo9d#)&0n?utvNhW;+*xw_eX|2I5&67_v*-8m6r?xyQy
zK(-NoT@Eg+A<i>%sJ%O%NqaW30U;S!WpdT+jPX_Sz!lt<YeEY0q(_sm=j!>MA2Csr
zyH%&&s3B36j2*15*ZESVj;QOvIkX7d$ij>sd{5IoRq?r#Bscz)?ukM+F(_oyFbiks
z*NL<8)~yj?G45&mTzV|%3#_QDY&LT&RK|Y7Tfy4~og1(E9x_A5<$IQBN-XQQne*~(
zJ&X2Fn=9VSP;Up3s*+gUi3zR?gna{?_j>&H>}Ke-``rZ@m$LWD+t7Wv)&u*UqCOdC
z9}C0VsX7WBkvDSrdz9Gwf93QS=I7_X-r9>(qq~3OV?WJCSnMv$88o-er0wj?v0kQw
zq|6#jC3i(f6n)g&tCf9|B*c$L9XgimLf!L<IFRTF)hWJO@z$~p>qm?TR52_l9`0E*
z?%gEf73H^yu}jv2(ke}Ax_~xVC~R_UsUFn~nMv+`A><HkYre+c=Mw22q)=Z(Ud$pD
zuWF2Z9p0SPk=yW62&nTF%F&330QXC$S*Vd3U6M=b^cQHbUxNT8RxPvZad!6#YF@s5
zU^q~0K>AgS(5#9*@eh>S^TMTmn}7-69KbJox7fMyo$~s!dXWZG1w1h2UseKx2@;nc
z<yk%J%bH?Y<K?nx*E_@~Aa&8~6|nH0ubDm=ihe7{PgAOmHfS79aPN<BVj!|Q%crsR
zsD#mTY(9H%upTbl89mRA-0vk+rAjRa;hqn<A|Rdm>h*g+4jR)<>WC6=?q|8Jw~>F<
zT9MLpVB+1k$32iQSRY5Fw49h9#uayTr)b=?dgD;DO-@+T%HU#oq~o0)g1tq!iK|qa
zxgvSGb>LdaNXt*PgW&{7R|Gu^)UmcKYT;2@LR}#`FfEVRzVYEZD#_Ccp5NQCvDCak
z2!8DA%P*-iGtTpv3ACPmnLEKB94Q=a#&z?LE=E|(5akL&T*xzQ$TLMLObhJJbOhq6
z9dk#r$SL%Y%fdHQ$3dZ_3R^gaHC9OhW(c@lk(2M~Ql>JzsS{^;5Gp61QGmMDkShQj
ztTx$rSRgQ$WJw5VG>2U$^HEcH)4pYbK63yP1T{rq)EG{0pf$3*ZsQK+rMm~*xJHHt
za*|?<92pu%hxmqc6E$d)@^{I_(+FwPQJr`e2uhI_fbqzT371U~C!r4ofP%bLp6B%<
zd$cShEBFi2V-2Z8!Ih|)&rDkXnZWIL4ysP*3AT?_Ox^zxKmZ_YYfto;%JSaf&<y8D
OK9OcNrZou9hyMbmth9Up

literal 0
HcmV?d00001

diff --git a/resources/android/icon/ldpi-foreground.png b/resources/android/icon/ldpi-foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..79c9be397ac91a9f153dd2f214e8cb6914de8159
GIT binary patch
literal 3552
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
aUFB~`D%8oqc5Y_?0000<MNUMnLSTZ&-Np6*

literal 0
HcmV?d00001

diff --git a/resources/android/icon/mdpi-foreground.png b/resources/android/icon/mdpi-foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b82b899f68cebfb003793b22263ddc1416ba620
GIT binary patch
literal 984
zcmV;}11J26P)<h;3K|Lk000e1NJLTq003+N003+V1^@s6k7ifR000A@Nkl<Zc-rmS
zO=uK%9LDir?M1D$S{f|M&TKRlHLLqNVtffI6%Uqznp5!&557X{3u24RY#_dnQ?XFY
zQBi!MB8s+_LJ5j^k)A4wco04LO0v5uzGQqx5{WT0o83*K>wZ7*uz}6rh2O(}=D%aA
zssI200000000000000000000000000C9AKm|16nIPL0Ro-|BS+6Zrr{B9W0QBdJnW
zD!Y{v$`$2-;&$b4WgOEQdc&g8==4M)u}L|k60RvPdlb_<&y*eBIz~4{QmNEfm9s)Q
zs^Q-cD5rOBDi#wQqRX6Dk_P^l^1OhOx^u*`tkFzzkg23;8usr>dl4mh$;4u@RZMb_
z>Ati;!#=Nc7FpEmsH`PSa}asQZSAT{rIgew9s2i{`hDI5XX5C`wlOnfo6E9kV|C66
zt<leo8ONNPv1`7f5&uhHO2hqk0E_Aw@6@=V`?K8RRi9*Sb4AWJFJ>L%h2r`}1>VRy
zp_X>LW+E+#zAjDBFb|h{>C2b3iy|*o!0v3bS>08XTUbKRRo;HLrFvw=metVEFkHiI
z(e65}H0$R*%CAbR?mY+fdQ3T~+%2W7IabWQzP+Y<_>T%N>#h7(@s~;sb$OomFBV%?
zG7)$GTvzLsSkl|Ejmz$V_@@<Hn08ZRp298^Q&vi4{jv6&fi3GzX`w9@`)H{jJM2uM
zWzCxzd(yUPQh#?$r(VzI(&jGRr+!vWc=xP4>+X1m7YggUu+{>~da50}-+O$eqj_^b
z3VV@r%<p=CW``4+rT20{Yacfm7MH|6oL^Vl+R`}1{bAvBcUCIq_g(8B<tNLss(T*a
zGmddH&*|@w-{<Q6y+La;X=6Qyjy_~;<J6lW*@k;-XW0FJTa9~FxxF*o>3#Y2TdUpk
zTkz0L-_P#aW&UgJP*cT~<voy9Vd<dX(QwWM?2vnbYtx~vfnSX6aKg9j=Fqr2m(zWf
z_=IDz(pG$7#+|_3nKm~EA2`g2-`aL({1^&*_x|;xcG$!BR#;QGj=~DtVZV3>hq}7D
zFDR@$cG$+Qlip+sE04nFzkY-y6jmNb`Vq<#Wj2MCPid#3(db+XE1$x?*QId|g_Q~K
z|HX6*3scxfg2E__!YB+BMqw02VR+Xg$N1d))3UzO;naQ^wAOXL9^tpvi|aHD_g`Bz
zENJarXX+^00RR9100000000000000000000000001M3y>khQjt>_fW%0000<MNUMn
GLSTXiqTvw$

literal 0
HcmV?d00001

diff --git a/resources/android/icon/xhdpi-foreground.png b/resources/android/icon/xhdpi-foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..85e7aea6cf7588308c6530b65312bd71bbb2da5f
GIT binary patch
literal 2065
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
AQ~&?~

literal 0
HcmV?d00001

diff --git a/resources/android/icon/xxhdpi-foreground.png b/resources/android/icon/xxhdpi-foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7943f82625035e21bbbe25e132ff22c2cd67b8e
GIT binary patch
literal 3251
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
ZRVZ#|ziqm5RsAn!7tcG|)}Hf8{SOU-`B4A>

literal 0
HcmV?d00001

diff --git a/resources/android/icon/xxxhdpi-foreground.png b/resources/android/icon/xxxhdpi-foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..c80626392b008abf465019aa67049d992aa3645b
GIT binary patch
literal 4640
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
O-M9+5Lb&Ym@P7b_okkr1

literal 0
HcmV?d00001

diff --git a/resources/android/splash/drawable-land-hdpi-screen.png b/resources/android/splash/drawable-land-hdpi-screen.png
index 2bbe24c29d72c725fd34640b71dddb70d4aac6c9..bf0f39e5a3de94c892fe447ba01adf969090daa2 100644
GIT binary patch
literal 10631
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
KM&Y&lfBrAETl?Ao

literal 14301
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
QzpD(SX`oU1`04Ba2PveU4*&oF

diff --git a/resources/android/splash/drawable-land-ldpi-screen.png b/resources/android/splash/drawable-land-ldpi-screen.png
index c043d3597ef9395e1a678bd4c8e827a6a50a8c82..38728e3eb9118b77ffa76e07846ac5cba682c01f 100644
GIT binary patch
literal 4003
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
E19$(AcmMzZ

literal 5224
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
JSL;G!{{vAIn<fAN

diff --git a/resources/android/splash/drawable-land-mdpi-screen.png b/resources/android/splash/drawable-land-mdpi-screen.png
index d5eab5c1d5d147057b2a7261c46c433019602935..6c94d5721dc58df0ab2a216c9aa8dbd19472787b 100644
GIT binary patch
literal 6132
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
G_TK;~oqjn0

literal 8303
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

diff --git a/resources/android/splash/drawable-land-xhdpi-screen.png b/resources/android/splash/drawable-land-xhdpi-screen.png
index 0398df2bdae7435fe15e38b8701cd7ea6c0ecc5d..34d11f804d0e0f9c7110e24fb98b5c5ce2ac7e4c 100644
GIT binary patch
literal 18494
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

literal 24188
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
A9smFU

diff --git a/resources/android/splash/drawable-land-xxhdpi-screen.png b/resources/android/splash/drawable-land-xxhdpi-screen.png
index bcb36cc1286c905261c9dd41697e91e5ccab6b06..8043bf1a7cb5baccac895233e86be7e6ca02c985 100644
GIT binary patch
literal 25854
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

literal 31537
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

diff --git a/resources/android/splash/drawable-land-xxxhdpi-screen.png b/resources/android/splash/drawable-land-xxxhdpi-screen.png
index 686f1313291294d7e486e32cce8f852e9d647516..3688f573275eeded7a7c9a0ce881db3669e40520 100644
GIT binary patch
literal 33932
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

literal 41246
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
PVdzgjKh~YR`rH2j#qDb@

diff --git a/resources/android/splash/drawable-port-hdpi-screen.png b/resources/android/splash/drawable-port-hdpi-screen.png
index 8256b58de7ee9e57261c08de3776f6493bb69838..8c7353e9d34e0477d8e587c125b3a8ebf22be408 100644
GIT binary patch
literal 10835
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

literal 14867
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

diff --git a/resources/android/splash/drawable-port-ldpi-screen.png b/resources/android/splash/drawable-port-ldpi-screen.png
index d41cda737f190d1b16b0f23dc86d6a5cae18cbc4..b5605fe7217723a014080fd35b1755563a818f21 100644
GIT binary patch
literal 4078
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

literal 5368
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

diff --git a/resources/android/splash/drawable-port-mdpi-screen.png b/resources/android/splash/drawable-port-mdpi-screen.png
index ac8009538039cd7c1cbe1987a603c13e188f07e7..a3f133a165f9245acb5e398ee6cfd4216997f6e0 100644
GIT binary patch
literal 6232
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

literal 8612
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
KDtY+FtN#LVds>nJ

diff --git a/resources/android/splash/drawable-port-xhdpi-screen.png b/resources/android/splash/drawable-port-xhdpi-screen.png
index 3defde5164ec075e936267e3a1fca70a14ef348c..777b8c86f47bafd98390608a46eb11ca25b022cf 100644
GIT binary patch
literal 19067
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

literal 25291
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
IySNMg0ng}{0RR91

diff --git a/resources/android/splash/drawable-port-xxhdpi-screen.png b/resources/android/splash/drawable-port-xxhdpi-screen.png
index 00c8a805534a8a84ba0a926c0a9cfe1ebf8fffae..58f7d76b17f2efa307eb87070dee29c51f1c9101 100644
GIT binary patch
literal 25073
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
AVE_OC

literal 32738
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
J|LgLt{{i;a7-0Ya

diff --git a/resources/android/splash/drawable-port-xxxhdpi-screen.png b/resources/android/splash/drawable-port-xxxhdpi-screen.png
index 53b5b8661f7dc6fea2b02028c17ae89ebbfa61ee..460d49a8487b0472acda151ae707e8b2b6038b6e 100644
GIT binary patch
literal 32436
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
SvIS5AK2xLfh6Sgu{`6n>ZQ?}$

literal 42758
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
Rea2k3-#vb-{x#sw{{?R*T@e5P

diff --git a/resources/ios/icon/icon-1024.png b/resources/ios/icon/icon-1024.png
index 377e167bf06a166f79f111fe2fed8b50aefb2274..9df9c6fe2f124d21be922040959aeb084b0b41c1 100644
GIT binary patch
literal 20032
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

literal 23610
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

diff --git a/resources/ios/icon/icon-40.png b/resources/ios/icon/icon-40.png
index d257a53035e66fb907617cd1bb2389164a5bc6df..125cfc7259f92b700f55b46494d1007e2b32f7a1 100644
GIT binary patch
delta 1184
zcmV;R1Yi5^3#kc^8Gix*000A=FFF7K010qNS#tmY4c7nw4c7reD4Tcy00dh}L_t(o
z!|j)COj}hL$D8O^quXR^t+GPjY)i508#S4jV2lY7f_?xKVxq~SF{U(I29%AKmUVp4
zA-)k^s)l3)YPL~c{GdyQ+sw8|q?+(yQfRFa0@_a6drNQcTYr7dz2&ZSfWsGNv`<cM
zPR_m0^E?0Nocr8!McF%Kq9V8m{-1*xhM{Siq9~FiGn}z3`%i%(G|d@MZ@o)#_IH8>
zUcM%RAQl%Fr>3SxMn?Mk`&(LCdU|@2$t3^$Uj_3>K_8Ce!C=tm^V#k8hK2^S*{sv)
zR4SE3BC*+Q%YVzue}Y;F27lo3QD7B8nb+&BudlDHtW<GUQBh$u8UbvzT1Q7mc^7cX
zGW5;HGTQ?S$V4JBG&I!M*r?HH<Z`)It2G!5CX>m`8BC(Ct}YslA{UxsfwWQ5{tzz`
zwDMUU7#OIntyQblAdZK@)v#tDSFhJsS65F=e4g`y9Dgm&P~V*;ulUF-r>JlJbmUr=
zT+QLP0Q1OnI_>xSYier5VzE>zg{%SqFos(U1}k+snOqT^_$0d$PJQ|!-n9>F-;K51
zi?!Vc4R=10>N`MQ{g`E_E$}&TC=}}J>k9+|V`F2(!^4AvgOF-|Mf0g9lktfv%VT=W
zq33j%tA8}rqrr|oh<nQM6B@3mQ*iajfQ_~9N&8>RQUssSO~Dw3Ei5bu`wKc9j&`+5
zX|<S5MgufRxy54Huh*B!6t6t3jyuZ;_dd+^DDIZxT~f?Zf^~{<rv!7{4+($~yjzYP
zxhFH(%WWTeQ*b;UpPikB4!lTEkD%jly2VnZ&VOLhK5m4j)@YRqg}KW5rnf8cRu$nA
zCm}j8+-3N&htfj_>Bv<&Iz^1O;++p8FpPJKQ@vGeCbeP0MZ!*wL?Ua7(FB91UB{l4
zy!6ce=bzHQ@MOiSFE@Yq(W$xFAK+Hzo6|{02?`BzA^JN9*mOdOzUphhjy{0$?<&RJ
z<$ui2-*dN^O~KRC)51nYoq#Rdxr_3aCtQ%yQZ_cvC5?io>0d&yib$@f9M+OJ^9H&_
zQ(2ls)B4g2g9r?|of3Nf@`l+K@hdtvHwU$Xf17#m>KWTg+wO#022`wDPQ@ZL;-b(@
zER5uWAdd|8Gcj^Fr-_T6xo~nD;F+13rhlfUe8t3B8w5q6IWT)8$}2{fcw{~JP%bnN
zp4<*N91b@(H^bY^O`XmMBS5#D*$RAkJ-GL_z(N6OZEcOkVmk*G>gD+O_|nqSj)H}6
zEf@!8b`+fVZMn1Hb9Ss_FMeE!7{`@`;BFc2LE~6Q2@yELd98uJdYf}p@RO$Jzkl8y
zI6ZtYX}=pnU~Rjg5&`Tc_}6);$!NS|Z?fgC^k=WHQ+)nJ&ar(DlxsRPdHZ0r*Qo1X
zkQYvpm;1?!@4=N#uLyHuSAQcfeL!A%AI70v(AUqeef*Il{o}QqBRp{NUFOD58`tW8
y-?_TrBvp9A-u#eNcm!jMzc58`5gGg+1^*6m5s?Sp1{(|j0000<MNUMnLSTZ?a6{by

delta 1492
zcmZXSc~BDv6vkIjRG3jYvm7cUNJs*>xkwD!DkC=v#<bE>TM3B=9-txtiG&bP@d8Ig
z5GsNvR8c?}D#eP@62TLcLr_5k1WSPI29jkr+w_nA(do>a_s#cae)HbU`^pz;ta2R{
z<^TXRxCZ}ZlDRw9ZCD2YRXJ8z%si8yb5I!M4^%#P88sQ#*kIuX066Rc0O^?kfSN|>
zp8?<y1OQ{(06<Ux0HlQC`<qq+fLT*yxF~=i2&2)6<2Z(4v$L~$y}rM{zqz@&yu3U&
zH&-f^s#GeSPN8dUZM|^eLR?&2NJt2W!(lKOWHK29L77Z8H8q8zs9Y`&3=E{x>F)0C
zo}QjQK0e;w-hO_5jg5^)93%dzS;B~!)=f-Il$4Z2L_~OacyPH~UteF5NHjh^j?JQ`
zL$q3LVPT=azdw~qWwY5#CUec2HHzBWdqyLHe|kCl^cwo;9NKgaZM%YfP!k3nVZ;#x
zDJm)=kw_4<l1!$&sVgSNyODx0L=M8q*05{|EVD*ZNxD;9w7H<WyE`W*r=g*tzP`S)
zveL`Ti_i0=`0!*Kz4U30u#ya?*da<XlIek{Rv<^5;Y6z$#SIAz!@a$|d-v>S(5QT0
zE|<eLH6D-0Vlv$*D|QCbXENMi#d1VRL6mNY+z~nAgrvJ6Di1i(5`B1fa&oe>v(sQO
z>`yujx>CJZJO;#}(&+9KGLJ9FJAF)lnlqi|1gE>{Z|%j0JMfV=`l=)(71W*K6SE3K
zPfyQ_OG(O57fCSdn|08Zwch)7#$GPHGW=;!uP)Ul+aMW~>2v-BhE8AHfTX)3iskrd
zPfJUSu|h(mSz}ogUHbAF6@}0Y-~@pUwIgXRNQOI{Y@@#&PhbW^?GZ%ogbzOJ>grM|
zmDAUylQLU4!yQp9Loz)T*u;?ObvT9^?q@xH`gH5otur^IaI&p&Y6Kta(O1d(`uetP
z*@BO~#XmlakB`55_pU~xnYp<GNp(Onsk);Kqjm&NvDeq67#fZtX-o0J=QE|>!|`Tt
z(jw#J5dOIfPFk$p2Wa;K@WF*x{}WRzv7Scsk3#fGDauq|LR-s>2Ay$w0#%n_@0+oK
zHuTA5w58Yx|C9UM8CMfbGDjR1w0=ze*1_kj8%bg29I}3$h~E~w4V>o=1bS?Db-i_b
z;UjU=4Lk87hO^&%Dv7t)oU-U~fzoF6Z*t5m!~YSvOw50+%*(C`3l0rwQ(Lw^VL%X#
zPGc~BxhbY^-rSY@D(_8uXM29fE9uLQW1+NCPpJfgIIR4Rb_WiVY0crXcifGvzE@qR
zsH&~mkq{Xm9R7TD$jd9%QfMI@{WvzP85kWJA0PZOa_4HriAZn>Xy;;6W^4H^4Rly$
z?P$N$)|o_dwk^rMnJGCWWI=Nsg~E>Z4mPW%`k?p#thFk$I$3toDm1hWToT&G0Hf%R
z6&1VVc7GXjb}G6UeIiyK-TT&05Gz)EY`E{(pHJ065S@ig>mmyHyR>#k%R8>O*gY>;
zm{&67%uap&gT?&%Y#1yMfx|1K>UU1rSPWfj%O~B5`t?MNF77DzJ;SoIQbm)9qkdN^
zL$YHAuRn{f+t>R*6{9KcVaNqwUY=u;nY{y<)>m7k+>{;j;=O%zoyJ^nMDca-z??mn
zi<gNdk&@s{+UipklM5c5z7>>mT&QkN_=~^agT=1~hO##;2v4Q2r%3?X>it?#(<s|D
z%g_<=^P2g><gZXsU)IT+mghmAt!Ey5OtDwjC%yAS0~xAn*5ivsuNd*~ESxgtYM{PG
z8PW7OXziba)CkRo)YgO+rDC9vz(-d8XqKfmU-U5CY~!YiwMVPX!-Ky&9}Wl3Ndf@Y
zvF@;mgUzo^$yt#Y5S1v2Nt6m=4@gY{ups6tZ;0#7VvCq;0hcRatuiG+070@im)!pV
fd*da$wx|3b0RJT{cvrnl1P~Iiaebx#wv4|4Daqqj

diff --git a/resources/ios/icon/icon-40@2x.png b/resources/ios/icon/icon-40@2x.png
index 64ab98ba1c8be2f468471446109b4525f069edf7..25fb10e3ab26caa547d5ff1005d9dd947321c41d 100644
GIT binary patch
delta 2138
zcmV-g2&MPB72FVz8Gix*0004VW%>XB010qNS#tmY4c7nw4c7reD4Tcy00<6AL_t(|
z+U=T+PgCa}$N2|tGB=zEI$kVADdnv#T#C-^GI7&6%`{Q6MH8JdxEL?V1Pbz2CYW8l
zjwx)iEV*|k=os?_%tlCbFh@2Af(DkGD-2OmHXCoIoc8qPynnFoIZth9d&)}@?<nV&
zCns>)-|6#tey`6tCuDqqNr((A1IxfNuna5%%fK?Q3@ii7z%sB5ECWA%V4mkWj$=Iq
zCxZmo7cU4cObBt5v>U@PX0v&4aPa!|>n$xU_4W0K4jt<1>LQBs1{iDv((Am{Y8@CD
zxOVN@nKNf9D}O8Z?c29)+qSH%ER9B!kdP1^9ldhp%DTEbhr>ZGG7o^gA`r|YBO_O@
zUahUI-M@eT=FOWkGc#2x)hbcq<Kxw8b!uv=PNxIv)~#Fn`ud(4>a2h{QQUKV@ZdpP
zTU&K?_4e)C^?H3=TwH8yEC>l++5|~YPftln!AIrg<$n}K`7YU?3mB7gI-TzMnM|g}
z#>N8&4y;|f7S>ZLm2gz>z<_Q-tyZfM1%G5@WWd_6`Q^)(-O>IhO<EH}6p`85+M1V_
zw`R>6cqYsRGyYW+5Q0|YN3bHhcI_G(8p1`eaQ~O29Wo=-;o;$$nwkw8HUJW+#F&#1
zPL$;2<bUJGkAriHgbep_k8%E~0=rRh?CI&r&(DVe5uET__~$e^i8CiACZ0cko|Gkt
zh{dmPtT1@bh2S5b7e3<W5O`u0MUh05!agu5$w2O~oIWtrk&|!SxFKA8q9^mLw;35b
zZyV!nkH(#}HzfFZ_6Y-%-iXll_Vxl5_C(gjynlhJ2~@z0C_o4_H#dtj7cEBY$vU{Z
zKRG%+vYp*apWaBHe93wu(|STr*Q}*Ke%1E*+xAu?)7Q*DG)=(fpCmAe)#Bn}*b}*z
z)DrDu37A=2uhe)|LQ_+dJB*qB7W$J7meS=^;d4~cVybwF<?vEVNw}pX!g4s=QoKYs
zX@3aC(OR8oZ_H)ycDdp_(C`lNLcM?g{;^}n5OU$+;qYM;Qk5vMvsx55XTZ$qX}Y*X
zZT<GB@%Cz#W$eucs_<E=_<2i3w8gl>H7YP-T*G}5qjVX*jD@gY%I9qlU8W8gn9$no
zb|lhGn>L~3pfM;YC^&fVU~X>io;`bZ?tk2wlaqtKV*UE{@XSDHwVL=OZSHGHj>;I!
z-g@$797Py~r95it0shKZOQphM2&HS+@ehUqV-E51X9#NS*w~nF$A<)qV?#p&qH+2u
z+U3tWO+vCZJ2T~;A;w{h8Y_zyoVGlATBu&bsDP7OKU~d?{T2Xoh;J#nbm<aI?SBhQ
z`UGqPki%vKoUYTVlQpZ;Q+x6h{QHrQ$|f;mw1*qRs{WV@p0S_Z`#7Fw0gR2yg$oxX
zdmwW1+_`gz?P&s|Sf}Z<N>y@}Ueo<|1vdq43^Eo~xJU?WVJs4Im_KIW%VF$5`{UXc
zC@^e`4neY;C&1r)^R+rbH6<|eIe*e}qFNmnuim?5&Cq)h{E?{1X{n+m)_-O=+Nzk|
zCg#=!XL}9G5)!qv=Nng0hUaVz@66PzB`geJ$<~jY{PCwQMSOB{s!*SFT1}c(IJyVy
z2_gF-^kmuD>&~A0g0=q7*|6)8Veus9LgBIf`z_x3yGPaG82ja7d?cX==YKC*X8nhT
zr_3{Q>>0Q;F9Mrx-+E`AN}r}tr)W`Ql!@9^Nv;u>q>EjtibqOIOT#7s&hJWom^pRd
z`hiABR29(@Q%BPNAjQ>MuufMm$ufc}&(oj2K@~kO#T;WP4rA~9C@u{fATUz##fulE
zZ$XeyxqZb}x^%d3MO&`&lYh5XmA{#g_qzJs*AfqGOe)wId!lH6%h#=Uhwr#|%ffb-
z6*dg^76Y76NJYNRS-8mFQskobh$7)%=k<S4lHO4vcr|mgX;#3PA~vho07?Lh7j@qJ
z>Y-tY%^1T~MvfneMAmf}BW)E?w#pc`By{}FHL^4S#;UnOLsVpX8-J;SMH0a9XG18{
z-5@b<F*rHXEumsd1Ok9Voj-gwD`1GhU@)7_{(za@FNuRuWkM1fD~qDUpU06Zi*%0M
z<VdURqsZRA;wS40HJSPE6~Dm0j|lxnS)`<eot>ux1SWW+qoaDg9@_?qU8^Us_oOkQ
ziWu(KpC!^J0UrF0LVtVg8^h&746}nB{($*Mqn0D9EM+fvr|Ve)lSG9boKmSo-g2Lr
z8SrTTq`*r90e(1_z#SbOVPRpXPMvc1l0gpK-rkOV5_S#&y7asQ?(XhZC=}QvO_{Xj
zJutDS$z(#?xO?~RiJ2@of!(rY%a$EGb}R^B;?+lw9tHD)0DmT4-PzfhlaoVG7lcb=
zhgelrCDC05B`_iE@9!s1x`H`NdofGho)1!Bzsxdl@BlA3mzIGi0N?zQIvgfEE^t2(
z5ylE(Hbw>atAF5MzN1PaTz8wjbjx1Aa!j@#u2K;~4@F}vRkYaISwF|XJzr1-&j|Ni
zghyWP5g|MTD}P<ajrREk9%vWtX_ZEJDvG*Ai`jv1{ae^1EE86_#8bC)IhFqx=l6AU
z1}xshWB=1?{cts1mrd8c;yJQ#k~0rT0E_>!_qyqiUZm^R`6#|ZpL~hE*CnMWc6*eW
zKK(j<>Th(dr*2)g^+X2K+c=|J(=&gI2W#o1$DKCmF;mG8^8qXJezkBxj+yJ%mUxfX
zFucYTs!v_<iNBaO??eWcfn{JBSO%7XWndXt29|+kU>R5jmVsqp894al4}#`jF?_04
Qc>n+a07*qoM6N<$f^r2FumAu6

literal 2746
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
RD`Y4Jzz}AtTL*QF{tx@O0~G)O

diff --git a/resources/ios/icon/icon-40@3x.png b/resources/ios/icon/icon-40@3x.png
index f9c0c04901bbc895846b5df1aeb1b397cab1bddf..9ec2a7f12ce03e407a0a5f8cc6d5b4e29478b2d7 100644
GIT binary patch
literal 3100
zcmb7`=Tj316Nf3GNl==Upp;NOx`d8EI1~gT@u&eQ(hMExMTme@L8?FkVyGHggg`{P
zH0cB>0i~Wa14KH?QC_^cf8hPFyYrjfo&B)8Gfxuyo&nn>&?Oog8n(NJ`hQ)-(BH;P
zcj1YQMR6B_#m^8CaFHkfHd;NY{EG_Kk-Pd(^UyC_`C)KwE5T2{A}WcTnW<pGr`I}x
z<PIQsG1Z7+&Oa3)TUIQ0RW*A6MAlu_)_2aBl#+7<TvcTcv}1qRI%NklA4!b6SwqWu
z|G|TLwbizS(;%I^6s9>g6E161d$_W)(%hcg>R#LF>FNB2Pjgg?B8#T}Q!EFBG3E}5
z8AJ~iMFIh-|7kvE(0^Ky9deQXt(}FD0Pik^{9%c#el@=BYtS^Fw{bVLGIQS|zos`N
z21=DP#xDKZTa%TQWn*Kr!rKpzj^ZmSVvar$YPNb=W{UW5lN2J6h{0e8k49HlR?13C
zz2;lOCMztAbLH4rSayz%LIMMUtgOvpdlE5%oYcw~hAQm1v{lVD&0t`j&-6PHFc=Jh
zOpwXs;o;%AxyY$1L}6heU3ACj=oP81y~f7I!a~8%k~W`c5U=jNA#YSKWDl-fl)AdQ
z{&ToRkE63B-Ed^U>J_mUChCK0t+gT!H`N1H0ZdGz<@6+a*J(n1eKs@y&~oY_^7)d@
zAWR}_l1vs-_ZL%937)BQrKP16Hi1j0Gra0FPSWS(<_4ri<DWgdJRLTSQ9k;yAek+x
zAHK{A!Ewnj>-JSwSBr~_YX)!9L>%nw>}+q-%ye?GBH%v4&K=sqE_`WKRWdJ)lt*A_
z2U00Fp#^|PdU$9Au9J=rHfXbWuhX#RaSqpYHk1SD>BD}U{MrNT0E)egNmJ+7>Mt6v
z2x>KkA9!pd*yT&*i)YCox`4#*Pwy3%lxS*b7@l+0V2A`3C*#kk!%cp%x2XcEbRa)_
zKSsu`70zv_udnaAq@-kmix&2z7iKM!#4PAL*YvWWK+AVttIr(k@LV16Lasv&%Z;n7
z%uftfv>{<{82SJd#mWW-jM5cw{T-;-^+lhyA=-Yf7o59gT)DgNptfYr$jC@Z)4~TI
z{Kc15)tZW0;xt0`If-hF=DZ3I$B>Y1JDchpXE~~B{xR%Mj+;uV18FKiJueA*wZ)~M
z(-7Vr=Uujt>o0swNKsMI&d$yyGIoi~#<^S|!i3H5<v?yUBvPr=+1c4RR^Awny@Y8E
zN0}mOJU~Go1ZnReyFdnCV+vISY|mU9Ppu-i9-j`29t-?B#^{|^`?4L$<!Sh!o4*cg
zlvyzO0r-x8;U8|Qm1}PQU0e)?EAlB0EqJYWR;?(dNIfC14CcCL#`E%V=rX46d_4NX
z>Q0GScw0yR5~q}%lvQ+tQ{o2ad~CT%p1yLZQvdx11FUw7_1@N}V+tN-S~j7UL8~Ny
z5+vo|n3h|2cX#{x4B?6{EsB47ZIKs6=Jl371iXaUiw?(WQ-X{lgQAZ~bjjb>4!Osd
zaRU%ZSIqO9*T0xluIja-SF23W_fkLBgk0S@OrGGU;H~&5$wQQR-a9@+y0%l~%F4=;
z;$keAu{)jG%UAodMtuH^c1Z*rwxt?d^$#o!1;1_&?90AuCY8-!6RZ1*KYy@eWa3N?
z(By%7*VdM}%N`TqrOVZQMM!)0Lx5yy)b^#Hl?r&SF%I2?gM!p&)s$57bDL|6--QAp
z1LN69yxe)puBZD|YXCC>y>v&!Ia(7Eh-n1(a{y}8&x&yWh@^J(X(F9?bLH$XIw)-#
zyLXPX%f)^gJhC<b-}tz=xM$CvHnAY4nO=D6X#C71sKM9eU)WQOSro?YGSm<OC+{m-
zwX=C2HKlRyJeQrb`0({l^g8yq^9tt;w$2WDBzW!O!U6*Wxp{bEG&ce@&?e<@DeUt4
z=BC%hS-ZQt`}p{Hc~#-@?T^3pHh7Y29NMFf_uaKqZi6rHb1{stT@Gbm^XT)-d_$Lw
z?!XimtU3t{=qwf9MLZb*zBOeu(rvqi;r^?qr>CKzp{g>&WuwF(t;5>O1RVt+<vP#)
zLnv^;@qmeUPB=G!R^wS;i3gq%BnAcsVOvj<TcrXUBid-TIpm5~cMccN@z}WO$?%=g
zvpLJ`Up|gANm&-C%R*A`z0DI8qT@fXSOW}h$G)Csho~`%J$SeJO(-lnXGIiSpq;+X
z$eM!gdbm}dh_XEzmG?#pn_vU{{rkRyS9=_u2U%BSjJfF~P1|xW3kho<Xqt{Q*PEm;
zP>4U@e|N(tqKs=dtg@>Edba3Rh#s%o5j#Vc#YAVvknP2fQ&X0fBo|LBEAqv{`#(&K
zRrz)#+|p_Vi%}=P&L+xB$9vYnEhW|82IRUAhEQrY=^s)mG9jO|&C4~VgIhmME_~G0
zMlqHDAaW{mt>fE{lQoea9-M7l9Xx#!X+Q(g)*JCNd(;-$Vy1Ky?9iv;YO-M*BxvtW
z%agHw@g;pf7n`j%l*S1{%Hm_@J)LFL_%9L<Ggqf6uX!v&Eg)+02Bhtbp!-5B3^9ws
zEaq*Fbxtac%gd~Q&=<M6yzu#YcP_g%c)$HPT+cmA6G^%WA3-ftQTV0!fK5@cIZ+b`
zb6j=e8?R@t8dzPG5ryURm-DlQRJM_WQ`Z&qwX_%rC$WGiCx?u@A!Yjou?fq(sVr7D
z-NCO!?^ve-ph83DZFxcW^Ft;dI5V%Lq0@xM7<`-!l!L(kwI&xQ^6<#hV_8A~b&>#^
zjV+_38<lN7I$%L&70LUC1r62DN-eE2FC2C06MAU%bZQqTSLHc={){dV6%}=Mb~ZLP
z7Sf42*}WSGO2+M7KJYbrH5~*)P@2EgnIf<xdPk(z?R;fvq!pjr>4DZfROnWCJr0*7
ziX=2y1vtJ?oEs}xsT%bQ$1HySiQ6bM)k;<gy>2btcdVP&W|a3UdfU`9^3s%s-O!nJ
zc)Nwf2H_gJyxkjx#UzQ6<34`|s{?gDj5Gq9{v$J};*c5Vs<pZk`!N>$L$3nnwrqkm
zEl`76&d%tLCzPJF56C}R=^tOgP2kDpnt!@7x^@kE<2_NIZBJ8gFO!w*mJIhkTTo+;
zQ*6|o4#wvQL$}gqP69htCVpjXelv)j%K5QqH<k|U_tzZckD{}g!VT@#$v|~sj0E6J
zrL1?k%)>g%@G<@B48?(GJQ>vHYoK~*<D~*Ei-WT6Dzn<$)_uz@+=3bPHFdzv;P8u5
z?UQJt%pJV#dum5C{R8OH=_e4x%oy$C)!cu!;Z8bk0tbWP$>Om4LiV%16ScWc`}j%A
zZYX-_W)uWDjP}-wk$A&YME5)?Y02aIEcDHY0+H-b1M{9dhYuAtGOy3N#@-tMVknlj
z=<U5&32Olm2zzK#>%^eGG-|%YCQzSM+v>xI<!XEyym$#iwX{{ftjkp*B`qz=dzIMG
zP@4#XrU4;{Lm3$vvE0ciGMO+9i4kO5KRJ0qBg@YG#~**NL(;IUmo70Q(^X<t$4W*E
z)J3^3wYId>5eOWRGz$Y5EY(mfrc+d0oB_ILZ4eS193LMa9va%+(<6cugwoHveJdp?
z`DW|udr@Q*S>y1>f=&=+VtU#dFwBc|8V?Ezl9Q9OC3-<gPogELMUx&~U0o$5B^(e3
ztgH*6uC4=jF$S9yG20dyu`yNMIQ3C<JvyM*#{2POMPni6@O`XEctixpzV%bLc78sn
z=z0<WbL(FM{1*s+^Wpxv2omweKkaGLmHb)BA=2l91o|fZ3^n(~;J=GN?019B*KPy9
z8I@J&Q|4DqRLgyo=D3^Z$F@VZ=K8L}96nT=_?P|whk2K%ifix*P5IHl93rgFd3zqU
zmr_p!>PBz8v*7T>k08{5x2?Kwoc&~V9e|Ykn3aFj#+bcM5g_dgDQzgnqZ}X*EB;c{
zBToxA3srRBP1CzLo$0+kzxSQOw??Oz!n)=HdYKjinj(_}zlM?h)?^~yhm3$UK{F_d
zb#yPE8EG}Dq|o!59Q(F-&D`a+;wSIuUd(-2r$(6XcbolROq`1S&B(pFB<ADP#B<u@
XQzt<~v<mJ5_i66lzNcTK=NR)pnMdGQ

literal 3947
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
bIETkhKL0ym7r!_N5I{N_28d$yhk^eAA7+N$

diff --git a/resources/ios/icon/icon-50.png b/resources/ios/icon/icon-50.png
index 0fefa6608a03b819b169659c029972fe63b05069..462c1ddda1e91ac88c845d8b2a44fbdee8491f3d 100644
GIT binary patch
delta 1360
zcmV-W1+V&u4eAPz83+OZ005C)ALf&Q0~db<97#k$R9M69m}^X1Wf;f#rbZLza8QOg
z=#5g^QcBCfk0N}~Kp+7UiG&X}h6T4}Xt<P1X~zWRqG%ilIwB!!#x0?e%#6uZBrIak
zDmsdg%wa%ej&phnZO_H$^z^n?po$AM_Q{*3J$-tfU;oely|f`zKt@OqD~J`u3Sxi#
z|FB4sBnSd`20T9+Ea1RB;)vC9N#b=KL6Fte)rEzHv9Ym^j*ijMQ3n0tViET6yt1{m
zH9tS!*Vk8HU$0auv$M0)($d6Yaa2@PX=&-k#>PX$VmjrzyVYt1Jvuu(fg?RV9Ux+3
zW8>oDghF9rVj`c<Pfbl785ub|(4K!-o<N|J!C+`<Y01gSkxHdd9yk&b5)=wWvNL!*
zUSVP3^71m|dsv=?8#%_|v0OkHhUxYCqM{;zfWjh?NG_K%9Ke+144F&@ezMtY%x5W*
zp#FL$k`#gaj~L?XArwV>dwVl8GoeiafdC3KG=P=l6VSn)o*w$+G!ssjXDENLd&KW6
z#BWC8-W|$n_P`_l1{R|b7-(o{C@U)qOam=TNlDp@#xr<aZjD-F!|8g&A9pQd&F0Q5
ztXY9ICSVOB>}@Ib?sGdmuUNn8B9L`I$wFLAGcz*<1qA>kkw~CTAOrXs9`|Qb$djb<
zl=LLt=GC+051*Odk(nw(O*Ma!CiN*(U5tH1o7B&mYEGi66M$&F)x*f(FV@7wgifbh
zSy_P@H#avoH8nLmI}7tJK0e;lOkPZhvLs2Oe7uBD)UlAN2pUMkp-})x%b|ycO~2H@
zORlN*8MOSEWwh}?GB?)d=H}w!B4aX#e<@0(Qh~#umA*`1eMy2;B$a>lzbc?EokG+x
zZg~KrCK4@w3N3#U1@RopMKcL#<#BxRy4}wB!C33->#!EMCL=Ss>a_J-zTkASB3Vvr
z10z{MTMhcl;c%W$d*SmEA)$>#9aZfE<f&qrTT?7I8?0Zp?+%=!FV;pm$g~{j=1zCM
zdxq|h1*<cI<*C-EU6+5waj^pFX|_ng70bC21v@rg6fexk$Y^b8-n@@e-wz;FELt81
z6Ri_?oZSA^rH5@^XR1Ew%!#3`c9Boszq^n9_iQ3_$KC7N?@Ge^mBRO57QU4yZp`6+
zqB%1?dkfj#X1*zjTg@M)o2nxm9s)5cj$0=`u&;qu3b!#ybPj(_&vww)M&YZoeqq5f
zJvlk)g=Nu~*{VaS1~#~dyc9#J!ze>P^Dd;34EnV*w1Ko72UcY${^Jd|b?k+AbxP=+
z6N^?9zx~BN_6l+J3%1^-rY3K-hRcwOP^6B7sH4$3HlkwfemhKhl^i$+3OTSeY_uv2
zH;#K_^}mi*KJ9;=q=2>LA69#NdvS5Gd#`n3xs{;39BwlVQ~P77!tkYk538%ID>paS
z<3MxNSWMU8_y+r60AVp*TU%R$&BuM>J8~>nw6(Rt@gab)7{QE2qs3wgEVW2`1dz8p
z$pR7U!CyRfEPVyNI$z|`OmH%(j<6Z@-X#am(<PlbXf=NeH%|DVp9Nf#)}8}!u=y;F
z9Rh3cJaXYtw2FmRo<LRM=$lX276!da?&w}aE<EDOLEd=WcKfDx&Q&E+`j{i9G7K#{
zhW~WqA7R;VXPv%`b-ZZq&NpAlHFxKkJ2Ua0r`=nu{n0Z1o<~kT206cc<CD{hee{we
z=SrUW<7_<q&esQQ)&If2M(7_{_yfcDuuJ%n<IjD9|8E7cf>=SUAXX6TDC19Kp63PV
S%jX*a0000<MNUMnLSTXnypS9K

delta 1646
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

diff --git a/resources/ios/icon/icon-50@2x.png b/resources/ios/icon/icon-50@2x.png
index 503c6de51f7c07cff66c1173727c2a939c9729a9..9b85f2603e8ac5182d84ccccae873248c2de0664 100644
GIT binary patch
literal 2575
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

literal 3340
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
HaftdK^G+^V

diff --git a/resources/ios/icon/icon-60.png b/resources/ios/icon/icon-60.png
index f3ae32330986d2d29993a5ebfe39b70e6b2e8fd6..bfa0ecdba7165538ede6b5de241689e893d167b3 100644
GIT binary patch
delta 1638
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

delta 2114
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

diff --git a/resources/ios/icon/icon-60@2x.png b/resources/ios/icon/icon-60@2x.png
index 83acef98503f9e790e124ed29c77e31c385d91a9..9ec2a7f12ce03e407a0a5f8cc6d5b4e29478b2d7 100644
GIT binary patch
literal 3100
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
XQzt<~v<mJ5_i66lzNcTK=NR)pnMdGQ

literal 3947
zcmcInXHe6@w~ZpGL6j0erK2JNq=R5YgaioEB$NPBBovVlLJ<szB2{{%D!q#V=_OJk
zMd<>9K#-DvbPz$h)c?=-?Y)`z?Y*7ZJ+r%W_Uzud_s-q$`}$fe;LBhT2*jd|M4$j9
z{Of0!fKl0AaR7i*kJR+kK%jCW^MNfRFhAjm(ozSN^ztqO6G1y9N)H6`6#;=>27^F*
zz|zYF5Xeg!1X_9s0^NEG0&%;g)fwIfHkdFvS_lAv_7`6755QSBq`4;`P5swTsEeio
z;^!Y~Bh-uuqbuqDE)evKCe>BS4*~1a9^%^PSuNd`epn7`SF=0B&`Cf1zK7`H1n-au
zQZI7vw4p(4mrd+t$=L)E6LtlYd}9&>+D;PtB8JNUrg}MBeN1pbCxBIpTbeb>-KBv*
zrDe)(SRcPl-|`JwnFy)=Gwzr7r)0Rka)b8h6Mbi{r@`DdN+$Remok-yb-+Ts`NVYy
zuiO6_w5Keyyu}?X9~22h%OIh#vV{F-f{gnE&ew5BD4ROSm_I1yZJ!a^SpzKO7^OZ|
z(`hf8hk~L=ki{n{k=#-h-YXUvK696<h65sId^nn`We=S`L?i6ZO;1msyKq5HTDqyJ
z33StSd~&WQ6<F|G9=@TerPVp>F;dgBwkEwiTs$3pllFF5xF&dCF)&)jsW_mMRGp$L
z0{8b<MVDIVmzENX(4_-(df&HitbnNB9pbc7qM|7@#K9bqYgjcr<DtC$d!oBJ==5VO
z_VY!KkAu%`&JJ6k#cCDxVu(b~*)C4sXU`T_R%QqCbvAc);_u~)LcmVN;wKODz1yYR
zvJ!;jJHPe!H%Cf+>c~)eCbEK5v(slpYmrdS1INH+|54)&?o5r>dRl(+OU}*~0*9Og
z#Ug{9<Sp3DDZQjyW+0Mr1a7RxeRs{auD;&g>S@<Gwo`M6G6B*Mim!bNIC=7GvRs<7
zXDE$k9U2;1hU4k32y4Y4gkvM#lMuAC-4z}48-PiU4)>MaCP7IKQ+2<o-XF4Luz`n8
z#W6{k@{U^1c_p9qs{+qA*`7atZeM9G(JjnR<OoNws>@&XL`?<Xg|@DYk<H67j8csU
zvM}#oO<ogqzT;|Hvw>Lg?_O4S4mXYT)0CP?Mg<=|X2CT$j>y)q_Gu(EmCGVJfxTD(
zu<k_t(~SWgsdD?yxTb;`3k%_0{eIt#IlVi(lMDb?4Ud;<#l#YB>)+-tMUd$H^czVI
zu|1BlsPz_RsWLqMQ`cTlMjW=bAQ0PHSJM5X@{zLluZsl+nU41M!DbSg4<0<Y)?yKR
zcVJO|nOZu(Huc$Mq-^Sq*fpw$!6|A)k7H$;l6zpT7SZGAz^7`sicGdMA6AJTBoUTK
z1xkc9K|VgdMhG8i@uPTiHO7bpX^-KXKHQ<tcO{Ag-oPGyN<Az|qllOg=c3rXy)x#r
zzd~kHpHw;@i_A+7Jn`-zY{$=|+C=3HE9PhQe$+calaHT&t|Ru!=H{jw@KE4{KLkJ1
z950k@aF(%Hx!1Dkd4W4$D;&C)q8>6FdEe7Es)*X=5~9rB$rb{xprxrvSf%VJ`EH8B
z;qa^R+L-c-CCfGP76tHo+PBgjhYC#^j`o&a#y`3{ceW8wc`2JIowSxb{KK|T=~~D;
zrSq<&14b^y7#oh6tuw!)R}!JcZPs5}itg}u(#Pk;T=M&URCKiaOb1&GuX4-e<Ub1_
za{HAzA4EHt1HPYtYS>#Uy8U-1-ifMKSm-IPX{251eV)A9==S1|z{1fnoM`>Z@A5Q6
zt$tiagE{;@Ti7)=zV6pL)a*KP&hT%9w+brer-!4HqWCz2Bg9fg|AAQI!s6mo`cvA}
zXf<|6<BNU>3OrT=<pLk{U`xyA_vt%Vbr_vk!A898${Ui~?W!8|x^tr%W`<Ii^Gy<+
zv9k%?&QW9rr}_%HFejKtE7J!(|FG&mJFI_t*L%OD<^6ulh|aW92AmmB+2Z1sw9KMV
z(h0X?mg_1<+Y}?>;w(G!#a%b>{!d?z3=3eYB42~atMaYW{^9(;G`_^KhVO@DEZ7gB
zLo)mgV^GuT&{yse9jEz4DwchO9~_NfnWC66-p@9Tz}vGgj{eR!{GChn+nstPnvcB7
z&Pf`Yx5H+l<<PJI_E5vIpWn!G2a{;m*JB5~;q>PW^YQ-KgkL_T19sZq^i7C=tp}ZJ
za~<YoTHOch=vTL4ctHU|M<hY{S=_4V$SQIR@S25hLQygjW@RtUBup<!0HF;e0xRxz
zcQ-3?T;U;H*#A0^m{O}x{xv(PsT0_aPT1Y&yR=>scz_%H4Eq+u-3$%n6epJ#7h0Vd
zXqj=n!X6oZJSkvEA5kd!C&CRR(Yv?#=Xd{1OW1r$10poOZ=Oy4;h18~G%)0&9uMR;
znkBVXW2uDMM6_eR^c~dQeol#)$1nCMhDmK!5hZuU7+c+?_?Uh0x!$8J6-|;a`@i__
zN-m`u^rp<ftShDqMrOO;<R-LSgrm{uYZ_F!nfXU2{N+0ZTAh8Yz-}xrr`DdfnI*e*
zj-0%<CZ;fIJ=ELFJ{o{Lm&P9APcs<H<kKo4xct0dn7Ab~q553tuipz)O7Wes>4KTj
zRxipRS`;GI_aGXQ#WKU!Oe9BDQi|k-$Q6H5_F(sSSXX>08>kpeAF&~9`$E2j`StHd
zm4%e(c8c{odUB!l0XCwD+y7y+YQdOu0!Ztb#|0e!G?`!QHFT&0$0S5C7Ap?d5KXyN
zG9+1bqlt3ld9UC&`@jMV%kr8%t=g&xzs-;L@vTV^F1iu?l3L@i8-#~+Kvq#Ds$i2Y
zOvM%2LQ*3{?xkx9%g}jYTDa$&mF~9b-!)Q*mr-BpK@mGoVW!7m4VlaltqJ9dOx!-O
z&Q4IrzKQLZr&}znQDLWe-i$nzLMOrO)P)7c11-zhew6d(eX%!MXpa0y?ZvD=MvMiv
z`TlHs$qB?_d#zhqN6mZ}&K-Np(u>(uu}36cJFe4v{qKQ_GH(9n*|v+a$>);t39iSP
z8wVm`$MfR$V4Nt_sSXzpjyK3P#f#L;U+);AmlU(y%`!qm5BIy3xMQyTWERmZS}MHH
zA{My+<8;O(mv_|?`!5^!{xe7CV|7KeCC$D9$pcq@rbO~7hQ|`^<=@1CEyq$N&+{rZ
z<r42iocP7qZK$HU&Lox62|?L{FAa{;vvBmjrieFv>_bs5XTvSW_54;<4P9&k4^>wM
z*&~;T_I9kXisQ|ZZ@&uWRCe#jaBZ3_u}kDP6lJUx>T8rTlX4I_;rHMOUkYt8!an#e
z7G7?aXDpUo?YKCQfBVlDj@$dcDqUy|m)7>qu<Je9u>P8O+;&9IR4|<aopHk<Ff!%z
zqXz~h-d*X1um*}BFVC~R_64cFoW`XPWKJ(qk>*<o-CUEppKf(S=eyTg(|Za+BRUQj
zdkkLS!k&lA3lvNpgyl%(el&S)j|-R<h>PeH;8f3g5{@t~-)lbYV}IydgQxe#@WIUL
zo{-S(LsVlPJY%fQu~8cH@#yZE#DurwqOm>x!G4odXKRf<+4!uMW6bD>91$x10bw;a
zrGszCxSmxRcx6!^Z^|dBCq81(o#bFU=52@FKICdE17C5ma2%<SjT{c`&#{-5s!fhR
zH_J(m3{1P?7Iha47Zx^uuVwys;t^qC=Qx5>=T>;z&qNdYVx4m%U%a@Y;2YIIex(cj
zzE{9fxUMt9WbZdrv{s#jR$8?ycm7P=dU>%kGO6>NVs`P1rHD!7RdtfF7!@AGCkZ3g
zFwa<q^q)LYWgco{HM!QI-t`FMyo3<zi2mHWQs!~Vi7f0j>eDb=1+5>Rwm!Znv=l8m
zrD3;^nOVp0@ffzZcU?zwm8eTDX<o1tT{YhFBXOS)$;=oD<+}f7Qdi{j+L~KXk>sng
znr5fGw@z+W3^7;4R`+~c1Ke|}uA!%G3{B{^7Cx63TZTBUZ!W8WVuFyjUm_(k2*o8B
z-_OyQX0YyYA0@ppKrZ?ti(?y8a?S7ogs?OSm9%bHNG#~5kw^#0#*)wmjR|)d+Np{f
zeW@m%Use%cT9}HOVMKAv3hmOnF4JM7PwV=et1cc*Io0q)Bh9kRh{nAoaY>s`UsDvY
z4S`?V6f~Ji^-T2iZIXIk{Fd}Bmu*Rla__4$H#+>hn!UZXWhe^SUGJ81=Pi)!VAcJN
znWw0hrli+icR$?o0)@VMmFn~gK9_Qdu>b{4Kt&OWa!Lzci$Ofi&32m2`6!YHqn0S)
zNG5j@s0NdLJ%EC?mPUKclx(<`qY)|A2b4rA)G?j`K{>E>t%t*G@ZreFh$SA64AO;;
zsM1z`|9+R7%TVk!%Oona@e0bg4-YCbEyipu4JGPe;B(yH-#PiW{CKCADw=pN-u2Q&
zS=IN;7P0BDr>3qjh-~Bg<%%CS9@LaM_N0`tWW3T9A8CxeCx3bNPrJYc#y+^CZvTsC
z^^f}a<2q;lOY|$jy2s!<QDyt$8%e8_O^c30gNb)Q$zq^-_(bWvN}rP`1O|hBhUfWc
zzQr==!vjArr27Z6{m&nVqqf_~eulWkardJm+)>_#Rhscp_S@RX=LTo+N$M2x_7-`i
z#Br1v@0fjGaOvVoQ3JVJX4s>-%}F%Mb{xZCBu?oZ(W3{nl?!Duake@=n!|Gp)H}FA
z$NbdNPeKN=By{;a<3o&T`zwAMbo0~2$L4%6;<GJXA1-T#OgW|>6i&9~ELo%Sm_ET%
zj#UCGyO-Yk&NGL1-G~_sqCfuNH@i9*lxeHE&$F*j)s(P|{$)Y0c%U?nR>g69tR|=1
z2;jCuGxg}!ba`(okAP4Lo<sa5Ho0~6!=o+RQ>Rncl$0ie0~z#1|KFhZm|-Glj_8-R
z`R}iK?TLoj6MNey4!7()8~^~xO3NtUkXE=MD`zYtcS}LxmYl4(wDc`$>DqSW=6@sL
b@b-@#eg1bsN6H!!Ab_+r^bsZM4+H-LY2AmK

diff --git a/resources/ios/icon/icon-60@3x.png b/resources/ios/icon/icon-60@3x.png
index 2be3dc5ca0c93e4983ca971307f15f479d2ece99..781bfc7eb1c41e27c5620c64adf1408658cc814b 100644
GIT binary patch
literal 4683
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
VOBWO(i9-N@)_py-4=Prn{{@(Izi|Kn

literal 5762
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
F|1Wuf7@+_F

diff --git a/resources/ios/icon/icon-72.png b/resources/ios/icon/icon-72.png
index 8ebd26a51d441afdb752d0202f0e5d68a3ce5150..948cb58bfd283f7c6161d91666ab6309791c33be 100644
GIT binary patch
delta 1967
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
Brw;%C

literal 2550
zcmaJ@c{J4P8~@q|sS#Pqo@r2{F^r-~ma(J=ktxCqO?F|%t{KBju4Id{WVx0knsP<R
zdS#nzi4m&d+Knx0n7H}P{quLu@BZF%p7(P;&wD=4`<~}H?>V2}>})M1#Eyyq03dPE
z3hlr{tA7F{%-fw-Yb<#nc-zFr1OTd2#rLp6JkA&DU}*}_2NafgM8(s}!3F@LP5=No
z0RVpTQshMdAi@D)*#iI!vjIT%&XY!a6z@P7cgYgXL*C+=y(RHL^p4f_P~O#J{{)|@
zMqUH}fY=w&CXNvktGO=z3eNJ~q=hFr&D=Hh2UjzO8A7#AnukP#(Z@BY#nvk3P7Tr(
zr6^<c{Y3$*XV24~JC=U0Nc#CsTvAI~GsDIFIay7zHdeEJI_~ILaj|5|%)4|&mOh6b
zjvp{U^$kRgy=8xc^gdnPD@&hih}p_#aR<T&xM2yk%#3FhUX_aV<5@tGJ->#9XptO*
zjLZC2GW&WW&dT1t{l+C?oQdYBLu=sKB9JjsP!nPbA~RTd=3_^OeB~q)Ex@QjPb@Yr
zCr5sMe*SFunnKHZ=+4IUBa0765w91Wasmk*p2*}FqruMmvIeAIC{It%<kZyArD4d^
z^77t=E$RE_C!o-!_4Ng+tedeWwYKh7I)rX+u0v5vFlJ;mt?wG~Bu)Fjc9WBnH`+y%
z;W|3)pFb;f;v_u}I9O*olz#N7s+ATKQi@*DDTthx4{30{H0>{+#%w&u7#Wc^Gc$W)
z5K5b##-2EF0^{l`*hakRP$8W%GlD9~R4W|($Ygfa3>v-v-Rz#0JtmfA$!{kO8~u$K
z6_xvjbvN&0`4wFhs;{r_0I)>Jb<}d|Rjmwl$V|oGzCGSby3n1XIFoX2&Digz=l*d%
zZ)CO#=xpfxfpXjYzrKXC<``KgHOhMMHT86HvJMSDPX%XML#)dVTc#*XFO?T|5pTX`
z!U`wO2=bJ?799&}YG=P}9avn{VBQF6P@uE*pZuBE{w=n!rNt;k={%#Y&3H@omIOu|
z<3U7^_o#rzr+zX=2{M(!C7C!pp7s!W1#$Ll4^>>Y#|uFq5L6P{<l>o8W~b|z8NFVM
zZ1%}exJEfcv82O7yx~{av718diDy_rCn$@{jdY9s;bdEY>Ybfc4+seGLdYlUWVx}D
zOEY=RRp_4Xly#q-zNg%^=mDW52v+J`-S2eWlf}=IK6UzR+$Re`<Gm+oiwzPDTY+Az
z^NED$oEAPbh#dt`?o8|R9`&0PG&?)HsJS`cQH#oKL?qPlYfz-UZLmJ+C4<T{Z&}=H
za<%-FZMTm7-5{OEmepmQ;3RNW!b8}h^I%)y4}WWp<R6+kxCb<_zarG@6l{oO)Zk42
z8P@FFV|RQ+L^g-Rv3}RaxMpm9Q9tj?@OxO=HOf-))VIl}5o@wnibd`wUD%Q0)i)~*
znVL7Y;NBv-Kf+!Yh`aaW5jarh_CD6ZeIKIsMaFHCzf`P9gLObcB6x2nxGrGQf<(H|
ziA%>-CoV+t28bFo^RubORH-lZTZ>}83l%Ogn>O1N=x$wvuSxl><Q@V|5;rDaW=gj6
zkO=!Gw#?x}q_$EPSHxHSL+VG-c7jVQ<2BzooM9Hr{Y}P$wVdqisSlRQ5D>-Yg>xo3
zgO*8=axYj|Q?gM_vzm#sM)F<Fa@NvyIX<JgGOXu2XoR?cI%0wAxDI!d@O){f;h0gz
zYz%RP&Z~g*^WzoDG>%daZw$wwwmHJ5xGFkDpS$jO$tmu1ZoD!?jaf~Yy<Rmg+!y)9
zx~uqO<!MX+sON^u^%c!BEla&Q0k2^n*KR&$tFu@D2)`ivX#myA9d<gnw%HTS@6_8Y
zQEUqG#~v(={}c?}d^AYOlNh9)(Id|u4{6@n-#d;E^B3B%I9DTIRB!PnoRHRATixV(
zApEnPf$vz5>W~TugTWY!Ma)jJW)`-!U&VeuvUyk5x@x)}JaxoMG3N00)WbxMi&ooS
zO=~xaT?SuXcHtXt*S=|z`b$1?qrwKVLL(=D``>`(S{wXn`CkmWpfHBDx-i6842(I&
z{{q<_qU87c+qZf5l%f)$1re0kT@E(xFJ-)a35nwGT;JmYt9V5<_`FNHynL+nxlfTd
z8}cKoP}MPM*uB7PHtOgnkm}NwS-nW%#E3r=oR;|qmr;M&>S*eWd-h+f$*tsB<ich~
zMKP{d)>}~9=u5t0Ow{@r?q2M6@KhUL*!ouqvS>`gOh(H-=>0y|Zw5;R6jdhbrtf~U
zoa5v=`KjLFD0eCURMaQQKXH5k^OIz>4?GBpY77GP1S?Qfy!X(Nh*xEh#s-G-wqT46
z3@35Q&*Wmf<iUZ>Q{!>#Ge(;+pK2VO^j}(2UuMN_t2BmDPkPNU^=&~LkJEWPI_M?3
zgYg4io_HA=GPVH1cY^~@T>d&bAV!73aDUI)^y86MCD<RlkBl%fatoy^WvUL*DqGau
zGfw^F_w4XF$Hqttf2<Z4@KzjIVXN(<pGu{#3QLWgg9$Rd(Yq<udLz4bZWqJXT%#W$
zqJ%yRKMp{Wi{I@HoLh$@5P#^a{Hb5Dsrr6ZS0?!g_Ckg9VJ%&c{&+C0iI8_LAi#+~
zkZ@H#&AMisX#2#Mh8an`^jQ1D$B#9d@yEjK_55N8vFBx8vcjKb1wK$S_j|Aq>Dm%w
z(1bk+89a6k+;sQ!^Vcm=Qn|L}Ir;ekk?nhUyPFv@rmsA^57OP5lNKVgwhA3bfh5kg
z@GnH!PFywDabMJ-Lr@nECxdYvw?<M+d;xRO$n~$yD_@)Q94bb9_ixY}iD^1CI$c{S
zX2V2`YFhcXU&C_U(GOL`#UWKgL&F=Z?(avXhYHR|2TojZ2rSJw-G>{I9)cS9KF>ni
zCD-lnIW<H;mM<M)vy`()TJ&g(Dpra|Ck<@l&$?qQ^ZL+)K&3AmIh?T2Zzz*H(JicG
zYFKMdtYGNxMO;ay6$!>U(_!W@=<)7|V`EBbc8MwZQ?h?9yAgX$wCuFi6k$@i+eO~2
zl$DiuN4iX!-4tGOya4H+d3*daw3y8lCN6>PFa)Xo{;JVF8xj@|W1iNlfC^v|9v&nK
zx?XbQoBX~YcRx+LKBqQ75K_g-edCrG(m<RsTg{Cr*$HOKJbWGC+IPQ27ZZdWx_18R
z?c+Zeq9(no)G4^ks`&q75&oBX*cZtQQW2TZGycamK?vp;f)|!>%g{6A77qXfT*m+g
zN5T-gjyk%ANTi{z&Ph1j5Drf~?cnoYf`A||AAID$3%DW6qdWm{(cBhIH}#<W2Zv0d
A<^TWy

diff --git a/resources/ios/icon/icon-72@2x.png b/resources/ios/icon/icon-72@2x.png
index 42c444fa8c6fa704de82c87618a0b64fd367eebb..57192935c1180a9b18f1044eb59f655a7575fe3e 100644
GIT binary patch
literal 3763
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
SUs^y!Xa>5*I#mzBG5-M^oC5~{

literal 4719
zcmd5=S5y<s)(sdW6zL*j2)zqZq_>0`fk0@26e&`qNUzeXgkC~7ROv-gL4l88p@k}4
zN&qR+3=oheAb-Bc|KYygb!V+Td(F(+a~@{q?6U@iG|;(0%}xyf0B$^hYZ{X{<6nTT
zlll$qm5(F>y1)=H0H8UY=E9zWG$!*i)=>vEjexgE1Fk1<V*~*3TmS%wiUR=tkfx$G
z0e}Dr0ASk=08q>a0B(7|Y&TLSEnIid)6pa`shw$bM3RWg8~(_T6nf@gkf{q51p@$#
zjt?|pronRrOk@gpD*Th$Ugs>nqqFl}_;;`xZT|PDClNg#sp1Q5DPT#W<f%n<u6m3$
zNa1hP<5h5&7}Bv!n}=FAxfa?V*IqXcmqj379aL~pCrD4qsL*yRTq#ehp8pfnv4h88
zIA2Hp8d+S7Cg8(2=4B!{T}KWU2}4B%qhU)Ym-)BLTBa@Tit)_b00vR1H~Ssp{;R0b
zdO!W0vM6d|m)xHxldVJ$#Xv61ubvoq>m9GWD}`bf-;pmEk!4(~DW3P_@5Py5i@t4e
zG>^g;iH7jNyAKA|rDi>Ho0}!Ib#!LCBGtD13&+NcdV72G^YiV_j|ngRMid%syC8i&
z-z-beJmEip)L-8SAWZQ9p~|WY%uYL4IXJ^#ak#%96ngy2-qA5G{QOu_QBha6h`(fX
zwOt&$SJBez1CC=@^HuQt_~ZI?!y`ZA!E0OwYdQ;BQ-=QJypOht;Uy$hbLfd@!iyKT
zArR-8CYx6iu5=uVnyMw$*5VZ{+PWxX>OLQDFr~1Qn59CRMi~<7J{*36@52NwhK%c)
zj8X|AS?pB}*_KWoR8NE*-~>J9TT|23{^r|s1U5%rMfkRXv3u8+<>{I&X#0GSx(LQH
zRl&L?1A%ON;!2P5@%JYU7R@nSpfn)@PP32ZRZG+Qy@~oV<J#_H!u)J|fT-06&-IFQ
z)s+cDHU6SuCLj!fwzw;+h2F{nQ&qBH_p*nb+X$`m!JB0-Hg|S-LFDsH_2Zf3TI2d%
zUt+oJf`jvii{zx`<@;Z7M!*#@RY)PON<K(Bb9$f8OWdS**6UfkKlp{UxK2=z9KGr(
zSH1b`rp6t|bj2h86sS&?K;B@p(;(|&*dapJYjG%zL#cn`5H9?HkEwf=IJYz-_)UzH
zftx`+1LtUg4O4KRZm`E?@yl+5qg!cMFu(t7yE-_;Ac|y(bMCL3Lk^v_wY5PpQJOq3
zp3Is{f<DM3-8jj&O~2V<Elp{6`S1CjU?!Xa_}Qh-P%pj}#G+O7N3`AI?!j)y-oc>l
z-z?HjnFiHkmJ@h9LK&h1lH}(sbOra>lY*QbZXE7^rT4o$nwb}=Cv!F{9Zi<y4FAp8
zb=q?;cs<Abd-D@Yd$ufn0aV|r3D)nQ4CC?^foz;NK46BpS&{DhXRDedggI-KZkZqa
z`1&H`U(H7!-o4Hf$P0Q-fdc(3I3I&LILMV}`#f;B^W^a^_S`d$p>@D5W>w_dZ)}!I
z=<)u$lFO95$Inq1rJxmgIu#WaxUdVNa4yZ9dA%q3);s56_W2JJJbk1fKO%Rg8%dYE
z*xWWeM_)k0(2yRbx$^PneI2|j_r7wvl~-pDB_#OMF@a5@;)(s(%?7l(`!H#?r#)aN
z_?+;;$0pBIL@P2<&7O^PFFH;zm3n#8YpBA#-lsQA^D1l#)dA!{)5w<@LvUan{iQwI
zLGK-}{RO{KNqPCi=|WSHc=TJ|SG6u-VK1#b+v0T~A#sa~i_^ZG91mH6{j7%qjWEib
z01(+qcddFVu+A{8W%?gt?;YjCA!%AVx^i@Rb#-+vI*><KSgL?lFHd|OC0JY&zy>kl
zX%roY<ItOB8vZ_Dj9Q|&b17OYR15Uaz+NSJHBBa*yM2TE`5#7Hgf~;kyT5?AI_<iV
zO8)4o4|R(n8ywS3HiK1&q736K-O9P#rTfXN@@t17#<eVl%0!^~<B)YDzHx?x>`Vb#
z&`CJ_&Ec~zoqNoXQyIk%oHhe7d*vEk?3nHJk5D+JDea0%qNAGc;-miPd%U+ECn)Yn
zbuYvRP%3S1)=Z+I6H0&=2?@d5wbj8#Q|4rw1cHivcdg)dG+j&-=fyJRg8u{}E;`*b
z$ubV5$-so+?1{Wu+E)wC^uChyKa&8Vki;Z5V>82#rx(AqcW^??e>OkWYYKBSs$BL<
zi+_F;C_NJ2mAuJOD$ta{aVwLZwFa9bB_;J`uEjls*mH|?fLN?*6tlt0=jGtx0Go)5
z)yOr{Ln%PRcLs2Wy1`y5h_kK|ZI=m9HO&e>r|!B+0aPvwp&g^;@DvpG-aP7)#&1l5
zA5kvxa=L`~{1zhfqltVKbZnARnEx!SIACX*cyTx?t*UBZYip|`(AUUhk`)`DL3wZ3
zccwEE=6%*F#1Um0M;Q@+KC#E}>pA6^$}Q7>#G{KJY%^_@rieQ+;zGKcPNf}YF8Fzh
z8%*6B1%64}%xUv})4SK%oo%R!+uxT64-c15Gbt)HTLOB%7hZ537ba6MeB%&3`p!Jv
zWF+-R!>O!I<eOaYy(^^k$&1Y|Wl73qOPXlOvbnc3D*pE1fS;9o*fZX>0^3?NtTj^m
zfRQ4}d3D`aVYh7q@;H<r^K-c9-|SSpF;x}n)<_i-#RYOZ8~v@sQRSsBtR<4;c7ip8
z0P9rb*o!*?U(%dkqmGW14+FT&?lGhhpy`CDChP#pU56^?TIJmuHq?AX;$hAd2O}y?
z7+Ho~UeB|2{_!Q=<NKTF=x8$R-=o(iA~|qArc-SCPCI(g$$AF!7CpE=w-N%u?(tSS
z`un3xt}Zs7;fc?|WKWuw&j$||n%~2xZwkTI*U-Mp-GcQEfjnmXI=+5<SR#FQ#9>pb
zo_{wRo0%5QG0Uv}VHtYmXvTJ9T<@L}$pT0&F0HvV+xqOz9a#@9*5sDUT?3sj77x7V
zdGgd$y5Qnjlp=zHndMn*LC|YuBFUS@u^q(FM9q662VN~^<q5Qjmga5NX~o6Gb1oBk
zH6lvmOzZk>)=kr)cmpuiYSXfN_45lt61Wl?)|%7s_0d2O`>VMfF{aLscdiP(9rd(|
zWvLc3phne&8zFqzxH%Ui2#c6*ZH4%l^}0}yn_yZT>aE?DbqVL=Onz~hh~StM-K{rS
z%pv>>sY~@o+#KQigwt;%{VP(&YHAW+P1O#9zt<}lI=G8jJv0;*+%$|slSjYw39TC@
z3J=mg<D)IDPq#bi2repajF3Gys;T7@p#3Twr2Jmj+}zwsz=Mh#X)N)O$vUF0Pt8{4
zbIfi=jBVb@P=A7BizQX5HMB$FeNpVe58P8pW`$%r1|rMi{HSSy;j6-<?N;tP<sg=X
zA1N<SpAKw${Dh@dc<YH%aAL#BE{6G;g{XQ8a&<(!4>w8ArZ~yk`*GzSygvy(d;dpw
zb*YBt47hNotvF$tVMjn&KIQ6jayRx*U(PmSXt8J3R9>=^Qu&Xkm)AW!9`E>WcCK^1
zFZrqGcv-XL^^reJkwFEcjW{tDN40gX{2%?i-{NVv7erAuKDXS)ZYEB~2y4){%fn8$
zu2ybfq5Ge;69dc?fmVo^`ZMHyq*=6cNPdNwO+ja8=MZK>M<BZ(Q^ZGcY=N&)X4ZqX
zlBMfpcxvJ5Q_$`FB@O$_AW*{JYXvW@aQx2B6;I_1FM9WwyLO{%yOPC8R*d&U+O|`-
zoVs1;dG=hMoQq5q`dTJyTJkzPh{+V&B&sB~xtLXa`;|EP?csJwpuLnGJO4<tMM|;4
z<tZ$RSJW)gl`GL%U8Iua(?p^Vbv!xApJdd|aE8Gb#6E?9&%$w14-V3c`2+t3WQW8O
zjZ8OJfW)Q0^-0S15&<7I5^-w^g?cQf@`IjLJ649bk3HRybnV`Wc6+(FXG2T~SH<jW
z)ij~%d>K9zvu{hSkBm_`Er^qmdc~`nmQ7M&$jr>#qA)|MLw?5Jdc3?<UE+Lpu%5%s
z3Y4OS!dK+3RCvZ{qSG_6>M=z+7(WH#4pu4TNN?lN%DP+;TL}g!PmbU5!9G`Nm$&D7
zS2Kjrr8m1$3niB^i_|p#KxG8^-Cs$0n%xcDLwq`?Wa%pO{%(t2Q-Rgg_bFIzV_!!j
zH4^#m<}pN|b{(^%N91FZ#oH6>o7$6dM9s&SmgvI*5ALYL*tjTjSFAr$dmVOhWgS|+
z9*Bcdsy2)6*3pGspDIYYfxIaY*n>H>im*)8Z2Z0Plp)Fc*G!AlFzXE}7XHz+)#Z@K
zJ603zxuTn2DbIYney&VVFGLhOFXW_vbAJtq25#Kkig9S*!-bH`F#y|{1RadClW2aT
zzP|MNF=OF-Nx1vyeTLuY<v3ckPJ36xY|yhebkEkR%Pt<Uq&1?#+_E;e?ScRXaKqf!
zVh)X58b2-lwauyd?s4;#jJmLYpzWcP#H%gPTDxb<&~>r5zGODyNLr5fq72Xv6^~>`
zH&#q8=JtcxVyY=3<U`VOqVjotbZ?(tdVT7Vo9>M%F8~;go-)=#>;iiE6N^ngi5eJC
zyHlf%ttVXvMRr{ILmFi})@QrOIImpH>R1o-jW|vlQ<GhtD{MP|fPgonlX}WO|EyD5
z?_daqOBSe5vQuO8eW@v?F0yf-AZ|h-g-F4z!gp*GphiYBA9khhQ<2XNwT_FmgO`~T
zTfR{<K{t7S-b<r19o*0tmtV4zFK3^P9q_>nM^9BHNFDFu2S+eU^?h|mnuwicX-ZuN
z{yvlJ&CRgQ_AVAh&7Ka_kr)(4BL_?xz~$1tGN{#$@IvX<pu?-ftI&u>a)$70ISNx^
zoaSWqiN))%sVCGdW>lmc`}s30At8bN(H>Fj1xS$0Am}Leq4>GmjHa^L;IL&?{ivNw
zx1)k3fu^w4@EuN)A}MREtc<(2uWuF`t^_@Ys4`$&YT3OA;3JUy`-o*xv$r(}F_{dc
zg8oRVvd_~~TG|^orgr<~{Wlrx9;OyZ#?Gs7|Mc<~zd`f<Ngtg<Gh2av0;$9V5Lo)h
zg~2AJLJBJ0%Yd|1q)5*9&QLi!insT<kdyaEHV%c%w%lhsg1kBgpKUR)H+?DRrsW21
z`M2ZOTm3;dWLBf+I9POr=^)CW`w`4#>&bdw$*0uR1dE0rVm&x1g2pG_K(Af9)<SuA
z?eHwELuPgy!cND%Q5@>oXg(K!pR4)j849y-e<7u7Iff>&#{s&245@JC$h}8<gT|j!
z!AVB`4GUX(jdyixzR!nbOZa_q^3G%S?Oa$X^O?PIZb3!ugCkM%riRYHV?R|{pCU_Z
z+91O+$I7GBj%0=TNY(^ymy&SVJe$DVJq}}7y)WeV$5PUHM(WJ!4Yoh9SXGU`ff~sK
z4$I8Ec{)~ZDfLXD&DEl`hP_DIg-#Cd&m6B_hIjhl4?y6jna!*|EcogXU?#cQMY%x5
z%ij}45e=``lTjQ7AK1pSpt9Q*JRZQeZ1xoY8DqWXi(0P(Jz7nqp2rgP1Dum^m9uXr
z7sDkroKTC^WcN>iOtY<WN*{E%8b#CFXf9bHI|6lHin163W4!aS8E4yu?A5D>w@tD2
zv9&w*6$D!PCS;n$xyP`{`!?^S-b1Z`OarhXC3oXe=c+zxvS{1Tt2mgjh?>b^=H-T|
zt;=i!lsXd*Q<ibUh?P0yJmIlqgmaP8k10jvuM161hOWBMHh#WWz{=r3l~PaNWqk`~
zso67R8&&^R7bvAF@bmSmn_KcT#{Pr&veXB^^@Ej|aqiXViiv@7Ho~*`03gOV%|KM|
z$@d7ZWX6a81Gu8k0rNUlQ<=7sK4JL%wJiJ{?fsn;pZGeF2p}aPsURjHBPJznDk-ff
tBcmuSEh-_QC?Uc5Mg#i)1kb!2U7bVzv%r&ZenAod9%vb8HmTdi{2#!s%8md4

diff --git a/resources/ios/icon/icon-76.png b/resources/ios/icon/icon-76.png
index 5b418449425d90633c0e1136bd35b2ebf89fe9ab..a646758f9b864d73de272fba0c03e1986808102c 100644
GIT binary patch
delta 2074
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
Eg8O&ex&QzG

literal 2667
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
Ps02V?$4I*hiH-Ru9wgtT

diff --git a/resources/ios/icon/icon-76@2x.png b/resources/ios/icon/icon-76@2x.png
index d50c660f45547c756fe21df07763d63ca52129c1..b52383bf94b7986d1ffc6590fa673255a64fd37b 100644
GIT binary patch
literal 3943
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
A1^@s6

literal 4898
zcmc&&XHZkovkziKsR~FFK@mb%st6)T4K+Zd1f&HiLTJ)M3j__lDZPYVrG*ZPfPxVa
z5Ktge1u;~EbfmrOyif1LoByXb@6PPqIrq%&Z+Gu+?>Xm28^WLrv|O|x5QsrrOC1jA
zjDK?R0&wSef8!>g&O52-tAId+M7m=n7#LG|!=b96nj!8LU~uD!7F-_$3WR__Vb4LJ
zzrdrgWe~_$0t8yM1%VU*Z|t5q?M8~g#05KDs5+p5>rm|t22htgwamQ%=!t(qr7Dyi
z00J?yYpbgm2Ylbi4T`h;782I!P01w={a&!D<wddZP(?^;KN0*$#llVeaW%$MXN;@h
zZ3<i#K2v$sjYqt=T!SCZLO0TXQ^iCmB}S+fViJ86X(GVidgEBjv#x=vlQ0l4C;evo
zZQ_{n?`aY#z5_oolj$3pC-a?zo|fOA_6Q~W4=*N+TA<F~<c~9Df7sf3rTe+z|A!DP
ztioc$=b2F!s1&$RiG@{hvq~R$*|7|c&opu1z<u(e;>SJ<jTQkb<Y`%;q%!F<^>F@k
zA?XeSX#}5@Q7@SzH*yQC?qT6W{t{LkGKDhS)9m(<NaVbJ-NDl{$zIC*9Rnky)ZM!u
zfBxiGQ&WpeOx*6Egd~>erZ1p*N}Zbn{T~l$h-Zv*4R41DCl96GA~g?w`gF0+{^eMi
zf%o4XXIQR+hE%5g)2C4cf+P^Y3soxOvo97;I4-0)T!~iKDjTap5U^$Vz?de~L}3$K
zn~tT7{N(3PJ~h<qXdVDEN5MB{k(lVcvup&zEB0kdJ8^JwBJJ$3c7!N0ngbW^oP|hx
z;b6{zldSHO(Px=z)-D@!oqd}b$s3vhreo6@yBC2L&mg0hsJUdkQ-^aO1f|`ACP+v~
zbai!sh>5&{nR+i_Wx{N+VRv-+nY-)7^u}_Ub9IoSulwr7AP`6taWQyF)CM__CcZQ=
zBu4bOzpYc(5Akq(F2WYeecvxmZZ7zh+-yKZcsLa-Pf1@S^?mb3y;iuMN{W1*I=QOq
z<)@;eqAKf-tXj;;nq|;NQ)`W=Qwq6Y158((#aUuGvD6dI!hO#(tRraO>tGW(lq0VO
zd8Hz(A;a~cR&RH`-Z_gkR>P}}JMU<k9I)9<6HQzMTpW&zHI~?tU%3FausL2}Unez0
zh8*oZTc4DK2nrhMT#4<C>a|;%kmDQE6C2=5)ft(XAl^z;e815$XPr<y%0C2qeCb#F
zZHbP<Yn+@vnkK9l1(gpk9qm(qiY(lNnU~KusVI%>(SLY|8l0TuxF+ZRa|FukaJaQJ
z%0K>a08CeCvP7j@HuevA=8b=Y$DGm-{y{7}CO{D;!=)iCE6z(tJy8G2u^|9Y9It+S
zxWL{Sh2#K?wFb_6TlrhCEZ<|KVdS1KNw;1|HM9QlIa6AwWO;e{23P#KAL<oz<w@{N
zfQ)SmF`@zM1R|ovea0ijtUN*f>bm8KNT%La5${Qq)f+!a35l@9dp<rsmt%Xw+LA@O
zWc0a-!uxI^8z`HivNC8^&xH(@ZpWA<G|xY{7wp#aOX)U__V&+#NTE>Z;b9wN6%Ls+
z=osB=7koHi^XuKw?^o}tA(ty{rF;9Ayw+zsvU!i^X^xM{%EV{f?d|P#Vxl`aE_cth
z)wKQMdiN*Z!*j-WLi?)=bHPP6_568Ie0=<$h1fgwPl${O-14gY%mob%4GtrfFCW(I
zu1#$Jd}Ux~&X%xfYtFtav5_-k-0i4Y)!nV~?(Brp;7x}8qX1v>4W7gn8H*E5a0-7S
zK*H1QJaRY<PnXQ#R;Uc(W*GkO8fL-OBO}mS`0V3xLcabL*HQ$~d1QQ00=rFcGT;x0
z6yQK>&D7{q-&q|)+6iCn68JQloU6Du`DABrZ+t|cpnLnc6Q}*?=NCNY5e}2>B*Q<c
zN5Dl!qW4HnB*GIKpa*^Y{aNBQr%bCd5ox^u70j%BuO=#=2FSC&$+!Q$U6dku;;SGX
z!=wB{ZjVtRSKSFWawsz?znN39k9cNWMVE?*TD8Vn)Nz0F=KLry&=q6qKEjTuK;L>i
zgEiTsD;aaf2mO}EV@}a8`}k*OX4LtT)5vDKw&rZW_bMTQvDt0vBaY#kV{(;G7X!7S
zE!opxqc`M;*h*Q4CUQfapd)@%jn|CP!gVI<E&UK<;S|nrgj{8i@W+>_8R@kjf+>R>
z1G6-m!g60rSc?WVUYpnTOSY;ObR}HBAMkgjOdh@U^KC4Ge2Zh!k2}(Bs`(l5y8nC|
zBhGwe-GtjV7iLEZVI$8o{lO)Mp^82WAtWWLU!D&)B)?9NAvawZ22W_d0dHCwH;$!m
z{57zxK2(c)VJ3BTBo6*=Jk(emaXDUZOdU1&d*%)4UC8}NCf-tj4T=r6O0g!<NRHM7
zwUK8B=@eJ;$80%0?b0TU;SAp%o&rB6`R(+W8_Q6cPGex{UWE3wBG#32@=bJpjBaG3
zXzQvq3S?_U`2(W9zPiZV1PhkFmICKi3`i2h2Vl*t(Jv5UntaKv<vo=>GW1d!>6mus
zltj$lolW;sUHT0yvXD4?^Xz@z0?&zXWf9Hi@;fRSyO;U@;v<I2j7DI5av|ZLN;@@s
z-<*^?HBQ`H0fXrr;}{tj2q8y)e!r)q$!LHVi)d?erTky8KEKtPjA)0hr`FHTWWlGW
zIGL3Zqe2wrR_NTL05y+Sm_Rz~RT&Y2rwB4nmwtd<{6203^MGLRARK+z-u%kdv>Pkk
zlY8HP>x&vwvQEh|g+grJ@LIUGa|_(EEl!m!oHw2oplJP@9VJK)Mw=1Der!>)Kd!{M
zaEoPdzYm<7S^mm7?ax%e{9s<8TD*!g{5?O2U=Yf(hBIhMwQrzhQ?E6%2}v!2Cf56`
z!13r`oXxHzRSX7$Hc}@biV<RPA=dtuU?rP(9#ejYvI&bRLH$hE6?zKPBBL~m+-{j~
z%6@8#5%ka|6m)8RH_f0u%U=>aj&SJ}9io36hs2T#y%&2z_j#j&cZR1l>&=O3*z$(Z
zlfdy>8-oHv+ld;hX}>8qe&*<QWtphZxzoKC(i?w|!}A5#C9cM?(x0wUzj8%b^IHk^
zflpOpeSZj2HjHMy+EP>n*x-}9{+IPHx2=RXCskEawLFY67J0GOu3j|aEE+ifo(?k9
z)ZwErV;a$yMs*9_TQ-}$XkhA)S(PICu*GR;Igf;0T`oBoRpW@Q`Dpn^@+>yrLeSiV
z+|-?s<2JPfF4L*llB%_3K#I$C!oC-oKd&eb9oyndtjgu5R36IFm-|+v&lPXx*{C`Z
zgWD|RGxO8f$zE-xFn0HJw5iI^?{!t5nzKiRx^{o%*@W>TpImxdaEldlTwOu5P&a|z
zi<0TJd-lCDSJQcyvlt#aB%335(BlBcx614HfTp&G`LoZ$OXoWBKUa{L`!{(}<Ma2z
z*76ksJ@+0Y%I&0eZm?;aKDzjfyR5>f3}_pH`wX^O7j8oqoBMdHKi6-R%9PS-*T5Nz
zw<|`&{At$}?}2@gqZqOKzsS0SI{gfExz~uHC+25oY$3_0EED$6Tdr&!9Ub2IpGVTl
zH)N9wi1p}z>Oo4au{|xVLFA2e<lm0pru1v=Q<Amc!w3glT08kE;kWe`;_*HA|8NaW
zDepz*C<HowzWJJZqtGt5HS+9Q$XdGLAMhjj@7$xK&e?SAx5X0OaQdE7F9#j_$X?Ta
z6Enwy?03CMYl$zF{y;SCsBjZMYiK^GI}s(#T>1U>i#Sduq}|}iOWQ6CYf8F4UQr8Y
z!7N9+7!8d#I<>DG+#4^5;^h2j_b1QntT1NI)}(2?(YP2w+WumpDF&k)oxt(5Hn}oq
z*Bcv^{SR}y%AzTz`f-aF`MQ4?y!G|?mBW_d`P_i33+V?T(7`T=5t1YyiXym2a~7v;
zYn7!Kl@-Ikq*Y>=8`7h6n8=}9Q?fZaS7<jAFXx7j4caMtXDgl$>CU?Dws8HDlyzK`
zU-aY4!7YlLM^dP1Yl$1Y7hR|Bvaqm#{^1@`I`amz<yaDlCz6K4-Esabb6fmvl<5~k
z34c3w;(r%O<x51Pd*ge4hj1G{%Ee1NDH>mp-Uvsrn4b{?ZV~JDgV|G;t8D_SjZ9f7
zXS17U9x7!heJuDjhD+dJYfqC~se$jqTErEYgIIk6X8ek5my}GY(TRDK=8sl)w3d!=
z?@IyQ$wp_E{b_F|-osDOD0RN4)uNEgT&J89*d_J5t|gl`HoG*n*(18OtRqvMt8|au
z65FNvwQYUIB0^77INcuxGB~n602VW8?CN^<wqlh?H#X|>XLxmR6%W>bFKOY&x1!>X
zdr&yUBMx!wCG(!p*hk9gE_SmGnok`~>le8ENVrb5AUY6yyRA6;s;KGa>3(M(6XxJU
z)#H|gckh(Wb_EDn*bk`^YLAe4>-9W055<_&!t`fL@fl{Aot#G%cMM7M^5sJsh|cXG
zR-4ds-^|N)N`}YVQZQRzNW?a;E{O_ZY_A>RmrQaAl0h()|CKQFie6n{!C)lY)YCh}
z;%bimYy1rmiX#JV`@*6|L|jpw?)HHgHFH|2V5vE`xYtryXWtU<F-L4*yQB!?(<SD1
zZ$D;HWjVN2tmJK*$n62%!YagxksjyMmMHWfQTNCKYG>u5Ik@Jows8o1qTej_1$N<q
z{6$NfnxnQtNH=!n%NN9X(N_k@g@W*^qAv-Zlv3=zPy5@Jsa%UT-x>u|+G#$^diuN5
zj3Y214Ur55@3%KfbmZo?RdVD`BX9{}dxnmz+x1MchLWe`Yq~XRzIU9(Dn(4PoRi)2
z6?Y#s*mkF6e`G67`xQq*W0R~%XT{-#uZ3FKwRTdYZ{N$%om1oc9xb9DTIGLFSG>Kw
zvAi(cc?eJU$K9B+R1&$GB%9GiB1N_r^FEMV9?qzKW670cnM-kt%L>#Ngg_3y)rR(N
zZr0hXLvmE}m`aX=Cvr9%!=huqHE~4P=DJYRG@=Ndh@x5KRgH>>hAE1exH5vKL<)FG
zPlqco_f5X~W*7?~k|rs0op~*@fw3)fp+Vml#WhgIRj-3PuNXHr$hc2vF}2f}(qD~E
zziY9NJ60yt$PZ^{X#;z=v(pn`pWGcm^VsS)t&5^=cGKO@qg=#~G2TO`HG$34<+!Z%
z@kb`&=O<hac55;EP$&&GHTCIG%Yc1%X<8BIl*_9?XX@KRh$JTlCMNH_b#vzE^MbG(
zAp<4XGVKV}Bcmo;;2@$0gE7bUa`5mtK7CsL&4K+Fm5CrN(7Kb&@eby|<V!tB_+HkY
zSR=0qw61?{6F3<0Wf)!s2DZuK2XNpx*xbJUUU43a1;YiHqn*cmHKEYQR(?nxL*Mgj
zD=WgoMQ|NSC8gQbdb;hf%3G6#8nMe88{&74KiNx-;n|;i8>QM>pn%xYtplCg&P3Bu
zgYy*<o#oDAUf(KB9J;Z*J1G|-pEdQV9Z?fC;s!6C<*?Z_Yh|#1^>K^&_S&q$zK_{;
zD(&=6fk-8@SnDTC8yjHJsJfXq+|oY%Ua?>mA{B)I%D>hq%BjN$IQoVK5B?NynSQ^u
zG(d2>mQ=up^s8hOJ7`PA<9Y77Pix)HcJn2@KtI%XN>=d>7=EySIg$9^8NISqkw$-D
zkgIbX<N`3c^)gbk1QTe|c{}%KgQlL0M1C3n`nFXv3L$D%ld>#enY7ocRp~hbZ?R?W
zc<z#P5%N6dKZuSlMh9}>rj}wf2cGJupvKFwl|s<#oev7>&(8S`axY!nGvdr&ZM*2%
zuvUK8LNo)VhCIhd_*-++CF7K-@cxTmDbOIp9I=x}b4}Jwxlqzzc3eg7+s;JO#sY;=
z{B>7?v%_l~+a=TXW%qsfXHgGq0(jTV`u2;}H}zf(yXhj##MX6OjMVs*?woTj-6i@$
zdMof>A!bNx^plg$BG#`)6ALjXS@%=Yw0Bjbv|ir%j~V@^jQ_9Z`_HJ!e1X{}fjuX{
ze<J}O4TO(9(#JvJiI)SQKvEKt^5PP*;!@JalF|yYvI<i2q7o7c5)%F{+)4k#z|F(n
Z*%AG}8(fep76S}G+8QwR8dY2De*tC3Nx%RA

diff --git a/resources/ios/icon/icon-83.5@2x.png b/resources/ios/icon/icon-83.5@2x.png
index ccc01673f7db6c17bd8780eeb121a0f6325d7b3e..9b25425001dd78b65cc4fa557fa2b8c624470c83 100644
GIT binary patch
literal 4199
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
WJn~EmS-#sG;OS}^Y9iDfBL4@M%QvY2

literal 5388
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
ZzVZFP1Ae9Nr~?5Y4HaGGawW@<{{f;XnS}rV

diff --git a/resources/ios/icon/icon-small.png b/resources/ios/icon/icon-small.png
index f7978170fdb911af710a84ca794dcc74944be526..fe94321bb00eaf8346091043a11a2d3e2e430164 100644
GIT binary patch
delta 839
zcmV-N1GxOF3DX9U8Gix*007zX@K^u<010qNS#tmY4c7nw4c7reD4Tcy00RX{L_t(Y
z$L*ExOH)x8$9>hCprTAot(iaOHn%mMn<Vw7Im;kH`v-az_%f!MZqs$ek_ekge?ZV6
z%~h<u2ytvGzNm&jDj2A!p~2eRf}L~c?$34Zk2ceZ{V*c%aDVQ(_dNHxpYuJ>^W1y0
zl7FXV?Q?&g%d#xPFf>i0@lUykMSpL5pf`ovY=jW5t*!a}{>jNnf*^j4D{MA34TVBJ
zpKoAbprxgysi{e;)z;V7kByCSo(zo+uJ6i4M8p-OjgF3*OeUkzs8lNDa=AjGP^wgI
zt*zluP+0y4z<&-A&q}$*Vljuq(cIjOKr)$3qtWQ~`kI;=q|{(AEX>a%9}2m`F!Oni
zS)FDg%Snb0S0>>c7e&+QbRvNgi9{-u>U26pM5C5(=t{0U(|E~{SePK(W_YIpVr393
zfxYthBO^8I+)*z8z~k`*0)fTF#i^;OI>UvkN{wDut$)*1qXpDz72*zGE1_%!vCdp*
zEdaNUg7zcOaspcOLHl8Hd~myJj*H`XFc=i(C>nJQjYTrGqEcU8p(-ycH8fm#*=D4%
zLeL}SWcElCZVNFnh}+LWTM=(5XQQ9CpgC?l9v8SM%*+OGw_ogTl$tKfyRKgy8Xk#)
zjpXVZ(0_djAwb8mgxf4UNzZ#Z$yh1u%%MKG_#Dz(<KXpr#cIQ&?BH3Zr;xN{v*Z0@
z&fz+|tAw`GX#1q!AsW}0V6Os62IgFH`e_DkI2^_>EXh{|;)4F#nDr#+Jf85{g^i&a
z;L;^<-#rnzk!9W};kiQ@xTt1rHXD&h2weO@Er0CdxTMdX{B5pKye^jufY@Ggg%b)f
z!+#U@n9Hda;v4^p+s|{^u;h{B57XQ}HA+3IhjiW|E3i)mv0`A&CufFt<KhwgUKQ-f
z2CWB4&wcSO2yu04&I30NkZ&KS>*01WH0OYuhs4FUbJL9`sK9G#?m0F4jQJ7}jZ}jA
z_&|z!|ALwsVj@f8VgwY8vm;D&MNs!o{zGUxLf`z#r;RC5Y$oIWfBwJbegi>!v}Syf
RMNR+!002ovPDHLkV1k>noX!9M

delta 1166
zcmZ{iT~HHe6ox<Lr)Bg)R6s0Mq9Ft@vdJa^LUkk(DFQW8Kosi)$&c1pX^oX2n1Fy|
zTNP?WrtLVLTD6oZB%)|y=|uh%M3jKi(lUaDiV_rdza)^&?sj|En_j*1o|)&IGv_@6
z{tW@up#~oSKz_!B4UG6|k}{G2FrQuI&G%#cg2S09Qqb5J_JT3t1@C5N08q>Uz*qr*
zhbb8+0XTvH@KOPQqz-_P!f&nH-vMADU!I;NqiLF=D3T<-Ua!aFnVOpF?d@%CZFM*t
zr%#{OXf$bQX;D#zD5+H1*49RmUYa6ZE>}xSi&m>mOiYZ7jEsng;PH6H#roNq*Gw~-
z^kNux@#4kQ)Km_K!{u`Me7;yLj*E*E2n3s@(r06%US=koA}9LEzxv4O(T0WwnM}rF
zv7)1+g+d{UqH%Fz?z-4*DVxZVwmFl|08enBaWyoog5_&n=cGhmz0>KmTCF1^BV%J@
zn>KC`3J|df6^n#Xyx42Xwcg{wm_7&|55tR=;zyUj(zjsAN?f<dW2=@VrG!Vta*;Sr
zG>^T8wR!6{i$0kyUx}BoVHs=wR=KD1Yv-AGXk<|{<D;X@t~6zscizx#ER#nb-WqA#
zpJTe#jJXN=SvOV^3Qt7Lw-~&`zrtf7xPCeD<d(%^p_sGIVbmFfu3SZzETKEU^3MDX
zE4X-3Akll7oPG++*5F0U2zygWNeMNFVW$MM$5+oD4Rp7iCz(XB=dhAXJh(!=8iVC*
z!fr6R-R{!TQZGR`KNH|b13m4v6gEjbxN0_=A;di$7hq)+_39af@ZUh^aOW2yPe&bv
zy>M2=;Ke~i-;b~&5-$!W2F#Qj!w>mTv(I5^7+&b(>G>WW3&!<9c%d)xuz@BC?~s)k
zY$o~}$*DhS!c9DB2`2`x6a7u}ypwo*gZZg+OWu7(7VJ$+Nw!`xrwrGyLJSM`r6wn3
zaUT{aR`?ogYEA{5T#Ta2)@LjU4bBmN8l0XGe&<eKcjtrl`*&@z;l_2{9rwby>~(9R
zyVkB}b=%%tUi0OaNo94-`ExtuS(!Q8vkT-yj|T0vYU2Toz5nsRj!Xd}6bi(A5qi^f
z{aQ<Yb$QS5@b8JH1WCee?&pTvR?D%XVm&eEnQzxM$AfHNUw^-o6;+if$-88-ySZIk
zx{{7Gcc5%GC*tZ4S1xOmYP||Y#>dqY6X>Sh>O7k~H*0t1t}dH=PvFj-oi_Qw?DzBD
zIIsFy!`1H7e)!RTp7y|5_)?*mbo^95UDe})F1`@vrPtlFApu-NVyLXPCch`k<Pd)6
z(3u>I*{zFFVy0Wrx3_M?RnDRHKJCBEf3PTcp(;eh+q3YTpGRA784?)$t0rQwoW{M1
zM|)b;(-QyW+@`0dj|bHLRlK~L2VW}{znKsJ;fgQHUFvJM+cQ@TD*OPQru>H9bt#q!
zAwnn1)hY9J1u99wC#rm%3J4H>0uK@K1ZWl?m54+VG(HAFBna~M%@FH<2$kgEA?1Fx
W{{I2(%O-yY0I9O~k{hLp@_ztyFilSY

diff --git a/resources/ios/icon/icon-small@2x.png b/resources/ios/icon/icon-small@2x.png
index 1ab363c66daacc5793f546267e2fdec3e46e31d5..a0b6b043824953ec76175e3cf69b11105999a6f0 100644
GIT binary patch
delta 1606
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
Ef{Qr{Y5)KL

delta 2054
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

diff --git a/resources/ios/icon/icon-small@3x.png b/resources/ios/icon/icon-small@3x.png
index 8ded4e1ea044d99e4cf66dc2465be14272b9d2a9..0756d9fed2942eb63fb5798f1403bb43fb7f40fa 100644
GIT binary patch
literal 2340
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
KMNUMnLSTY#$zqrQ

literal 2976
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
aXg5#yu>UTgS1FgH3IHPmgnk3eDehl_+kqqi

diff --git a/resources/ios/icon/icon.png b/resources/ios/icon/icon.png
index 9c018d1042405a7eadc25c69e40ac296bc894a03..23aec95340a23ceba7add60fdae144517f25fffa 100644
GIT binary patch
delta 1557
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
Hu0mjfd`Rw2

delta 2040
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
WFfjRY>eT=M3IG5}MNUMnLSTa1J;|N`

diff --git a/resources/ios/icon/icon@2x.png b/resources/ios/icon/icon@2x.png
index e3bc95e6abfbb039f5dd8173f98f3bb0fb627d67..e18bedc519133f71d74a87bb38d5eeb2b90b6136 100644
GIT binary patch
literal 2980
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
Ypt6Xm_-WMF*}wK}VqmUcuj>-~A3x%}zyJUM

literal 3784
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

diff --git a/resources/ios/splash/Default-568h@2x~iphone.png b/resources/ios/splash/Default-568h@2x~iphone.png
index 9e7f3dde58f7d2b45d1f58b4d07a45f3ab5c5d49..6e5005418b831274ec1707281f26ef5ec0ebfc96 100644
GIT binary patch
literal 16374
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
GUi}}ZsP{Sm

literal 22258
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

diff --git a/resources/ios/splash/Default-667h.png b/resources/ios/splash/Default-667h.png
index 9b6ee14a54bb72699a673809151c34394c72c068..6c2e7b17e878ea0cb9b987ae7dfafcf1c2c3cbbd 100644
GIT binary patch
literal 19833
zcmeIacT|(xwl{3qii&`Uh%`}A5a}Ihu>sPhHvs`@(z`%NwhdHzH?$~KTId8qiBcu>
z-U%H8p#}m;2>Bk*+50>9-20s|_88xJ?>pY|N3zC~@yx6;=Ui)+-<ltu=%_KA<2ZNh
z*f9q6$B*=n9Xqjc?AR%pGbeywRI0M|faa{{V>6#)$LLvpeU2YXNxO3F*tKKokM0}3
zoWM`heKK77axi!3k>K#|)S#4-hF)xL+gEY%{@{fM*_oTUFAX-dZEY{I#D6Npi}-zi
z{qbXiN@RnY-DZOzaZK=p?ZbP|dSQ|kG(x&$ozNMSqd(jGK&<1{tB*dxd>s56vEaOr
zucwa9@{EKPoj7(6bL`k-_G8BcPX5_kvp;q$`~0y#n%@(S|9bk>#7G=Frhod+<`2TZ
zLJtuBchLVDF))q)I{ts||JR6tY5dpm|9k2GdEx%U{QtTC|FrP`82`VQ{y#D9AM^i<
z{r^?^f3M*DHwoTfWc(lU|36xAuG#-zwfs{%|J3JysKp=J{f9pNOSSrgN&l7p->X*t
zvj2axTK!}G|2+QxBh~VNPG10-kZFs&X+_k*sLv^=d*B|v`TGGy1K&y9P2TC$y_w7%
z^Ym_x9r8_l=f1AHV%b1_O%M|)T`^G2+u6W-_&awaT%co#&e%aIe)>Z#JFwMA-{!}O
zc7!CWKo6n)Kbh1h#mwvbbNjWCR+8kwu=$fRB|@f8v|)H14HIp*8OlSwkm!AM*eVq)
zH?i`tqj|JSi2>LmE@{KWxZ@OGYD*zRQlzfESpDWUpq9D4)}rQW9k`PI0%KU7P&@Z&
zIaIlSG1~X1P80R~V;-r%Lk9t13ZH!hB&n-TUF7~2NdH^LDL!I!8}S1ZZ6Ge8!_giA
zLIwKve$9u5ZQPvFMep8^Z+DNA08a1h^T3w?uRS33kJ$xI>Yu)c0p#RwUojH;r?b!h
zo)9YmXwKi>`=^(I0Y7F3zVuapQT+Mxae<S-lfcPq_J6({BeBI)6ep0}sUDY&E_?9n
zMS+ur!R3_#j=Xe0pKlUg4U0UTFwrDaSi5VoX#q3!fuaq&14{c-70<rEKE#^8`qfYA
zoo4%5sN-DIJ4weL@NU1FM<Z#O&<mpd%!+n*bv+#Kg;Y<v*SR(9ji3)&MQ4K6gn_?~
z1?Fg)zg|A&sb090lWc|BY@{Gis|E48%B0^<GLHH5Dxs<C9-B1_QCX^y95SwBG1niS
zX1ZEWT25U-Uj=V{-+a#dD(XJwF~DYDyG9||r}J_d;&yG^0aIQxfh*izEzHov1)hLO
zH)N%`Y82O9-=BToVcN3Oz7^dvn!FCr9SV!9CxX_B2SHeXhb0ZfiKLNq=OV}Kh=lu?
zd&rf}`POiF;4-Wb7}h7dsPO=72%3<-i7#ztv~VqJ{WTm$u1}{m%!P5#+zyEsLtlk0
za?rgBeAMo(xn|k%=kdTo5n9=-yHsP!{~YM>3aOkF=iiog*T=nXy_!W=(F-0z9QPZw
zM2<V8R+^k<;7I7L5n>U^lEA?uUMBC-a%p1PFuQ0anU9%CuD#Z4T!2i(Nc6R`h~eP%
z<kiAa%YbQ{Fm56NPCFE|CSm%%Jfw3N@Mo8CHKllV<XNcJ=N)cl(+)vL3!sg9LeG*6
z%inp+vGQz3TQQtXG($Or{DD8?U=n*oEVQPsI;6T)ckrd2zp5y={z*!02W-|K(HZPC
zISH)5e!8TijxxJl)<r<NuGxPkI)5VGD)XFcQrN8bnW%IIk^7^o0TzQrr={-iP<;li
zU4A4Jxh0+YK3BfdQQ8}liyCYfPSmhE0W9-zfrrAU1|d9?D&d!>fh7pz^8SHr+$)}I
z4$C_w3Gk~@Q64Vp#+f)^O~=S}(6AZeLEgoYo=2qH{avc1Rkham{Yk*!<#vAX{$jOF
zb0`Cc)NS}19Jo$Ml080DFQ`{rTbr=l?cz0Y<?nsEF%OPh@TlKzQ(?2*1txrFJt9(e
z=H-u=>ux^$mVynm?{DZf0WK$7LjuDG+y1UFFTy`nV?p~<K5ATEEwYW<k%zal54Ug|
z??3G-4=U&?;P^qL4#{4{!TCz@zv*je3NN2}T-^rBW%p-4Aph&1@4wlxv_WM(n>f#-
ze5h$n9st;uWPNpDZshL-w#@MXU70H3h(_|N5^;<d%jpm<T>W$7eFsvIfn8#e33~AG
zNXoa1Zb9kR-;~(6Da`Y3)Pf@S41}^y=uz<4pANvfR&)bulE&8dKGEr5Yi^+}vNK>$
z*ni6J%2|x?lD_6e<W0SUDy}eEQRNIK$DbzKkl3^W$(brYC;M!v_ihLuj-U>AyTu)b
z5p;dMOH0x$4o`Xut&{hCpnPn_rRrh$1<|TA!iD2E7JG%E1ff0toGlF_42?^`;H)NU
zC|W;%FR{3?E{6td;O|^NGOwMo4Hwf7O;luvUw&{^+*v6tc%v3e>IndpM-GsRL>_TB
znVFXhG%A*sE^en9_9EAfO9P~eRjSU@G%l!2z|4*Ac(0tfGaQXilrKlj-c626Iz<rl
zs5ggEAK16CEG6>@_P(r_Aiyv#C5AJQ!koM2t0WWiO`F6BF3n=1zk!%uz65O@vsQ7Z
zB16=KZEiEstTz+{lSSs-wVJt6l$oopwpMR`hdYB-m{7ocxWRvT{4tEEj_i_GrwN9v
z&jj*^Fbn!%&mfW50-;aXayd)R#HHe4{ctm*?DK-xZ6|tQlpcl6!@UwH^=Kardj2D(
zTV_%SeQw~rkz=PYQp@56prj!?9sCwE3lB7hqmMKu^W5w=ES6UC`1h^NQU2z*61xQ-
z2oJnb4UCDNkB44>?<@>hL$1R2QU~5;X(sc;OnGbU9B3!Pbdf?Y^QLFb^Lqw;1CCcJ
zJtD6MY@{ynZ$5Tcysk{6&ByzP=Y`yre`#1r`|LEIm$}Uo&gXhXoBY7H?{dG5^~Y$c
zD!479gVg{tC@R_;q#PNVxL=8NsWKTL-U0dBd9TOXyn~mz__h%H6PWuKU-iF@ELR!3
zol>vv+qZSFwLZT<lT=<q<`gmtg1p^GRqS6xO^$9D&g_|Xd)X7iJ6Mo6k#HDdW;fjc
z^$a~gqM4w+Hu~aP2BZh$f<;6?KDww+!s>O<s;=}yyF4w5pMJ-vI{B&~D9F;gxh#i%
zZDH4OrN(leHz0x$E0RLaaaxt>x0!4mY`n-*;d8jc6YA&JJ=gKZB*8kcpxkL&-)!)x
z_=J8apowx(C4lNk+3pA`Al`D@%3Db~o2&x|2(WJjxO59qUyTusl=BlD6%(IAUCFT=
z+=>z$3fErz<OZyPsny^|47g&)p)twBi5RLQIcyG^1Fi8-q2IQd%;g#E(B@CHhTPEl
zSlNBqx4m@2o&05|4ZldNm>+~()@HwY8coK3$m#Xb+H{&S??3R%JiDgCGQx!1UQ=Bd
ziE1PEB;5$!VF<}ohet+J_Xn2flHkyqTRIbws)_C)YeIqVrJ5YjF;g#X4_9bWj8`s7
zBMdC(aPeGqQ!1u~s52z8hpEB@H2&bNM>0Z5B7|g)9uJ`1Fr>q8T}TY{>149fLp{U(
z{F)AQz!d%j>(ZgXKQ&Tx<VcR<n3R?GtT;IENECtVL&!5?DrH?PM{3%zoF*wt{*H$x
zt<H5^RX$QUAH4<h{-3T&i=an#LGReST;cc;g{ih(*ZmY?6dy!FeqL}p5Gn-PLMGLE
zh)g$Lv;SG3yE9VAm*eHRR*XE_%>!xE^F@XZ^V=rXG7{N<(>~R`Uc4~ezk-~Ij~Ca8
z3qwTelJ9>)U1?CgvOKu${Q&D^YkB1~AL786iuUV2*lTL{YEGGhN7EjGr(`u{X|+2e
zF2y|CmdIiB04i05!%7#+1}9LQXy5hZpXM+rA#|^NoB%bP#TARx?YU63rw78Hu+3lN
zelU=yw86VwhSl1Tt1EwIRk!(ldS@hG<iREW=&2Z@_0aCP>#;Rv4VQ71ufa5xD@dK{
zGcKwuG9Pux5N{gxPWa_2kq5HA&nKso1eaE>3Z<j1rR+_IN{vm!aA(p(O&ZT=Zw3`g
z+4ss=#`ubJ20w?QMU+>uaTYXv7|5d|+=4`>1*?XA(yu)nQrbR6QK5@|ze;(u=kiun
z9c#Bq$*SyfNojLINen_WW;*Ua)Lfwogdk1w%I_>C%6h#|m^;ZO?iMdTn5T<%DQS?w
zf(iHEoX$B_@j{lrq4zFS7OUu%l8QiIw|EO2v|Bcofus)y+0$8}ep#W?4`PMbA5mCq
zt2nI(b?3l63*WjmO>`J2xs^QVI$Md{L;RcVd>ZF+q$*U7^T;K*M-xOiyXLsyQu4FU
zEzY9%>&QK}Ubjj}p^n{bnZ^79n$<X%8dfof7Je#Uab_(vyU<!NrP_ehh^}hML0G>X
z`4F~KF<6m2n>Baq$|Qe8<EhJE*7sIZRZOExdo~;8QuPboHat9frJw7Tds85pr$Im&
z7u-LFN*U?+2>HC)WEpvsygPjreweirAF#q=lj|5G;p@F{??5OJmy^t=n~}!X^zGG2
z0xUXqy$B&Kxmym0AeM6NI=$|K<oRk>=D*?yHd5(hvMF+(N51%;f;ZvRwjeH#!dzif
zlu=iUM>$0G*CWTXB=#c*S{E|CcskELYd{3|xaro3fH`&EEPwS#;6WD)uE?0PeNm*e
z9&}+JMXrVU<1xcC)n}*=;)hGP;Rn>x;i8;E8A4U#ZypWCsM728zh!~yvqM}UJtPp%
zprml=fhhWGy|@Cj6dIA>oPJFJz4aJ31b-A6((IBV<7LvAOX`%r27dU}nwO*QKDcL7
z(8s~|p(C&Tf#b(dwLU8u;GGVI^-2TC_g6$oabA;Wh6;r@eXF_d+V=IuvIKDJJFiYo
zmFj?P9%|;_s$D1&D~p9Zl5y+v<EhhR62mD)Tk~^FmiT`EiBTXF3`$C?ePanw4cojR
zO=Nti^RmZpnpjEq$Zqr_A2`#u^?PD#_&E=E)9p{mQvuFndoQ&%zY6fc$$q^z&YxKb
zAm5HxhEMITXrvj+68v(Tcf={%lbOxcomQ`RNdeQE7c#bf|5|23CMQ{gg^Iq?Axx(Y
z_^@)5T!{!Jc|1crI#+v|n4<GzL(y^_hXK8Ogo3!bKEON)Za<u3f{p>!3UcB_A-Dh7
z+%JnY8GX34UOl;?2@|%6G@mF)FJPDUZgFT<J$e@QrDW9O$%_IPMuU;HwsweM$}Y}T
z5V9X~P|az~8Kl|{sn}WV9PY(FVD8g*SHF|Psq?-Ks)%oq%%8mB0Lx2fbY*B*U}>}n
z+{@7!)~c>|zL+QiyAp|G8wniLFncRjgy4}bVuf!Pj&y_7-8`uHuhmJ5ZSh%N<C=Zi
zy`YB4vW6^bSb{aA{BTUTJ94eKQ6OITNjK!W@^-L|=(Mj=N!qB?Z`#DYXIkh1EaRCx
z*4yNhr}RVRq8xkD?gAgctysedmS{m~U4V5+-5u0*xEhQvQ{xHQja9oEc$;u<`G~TK
zmi1Xl572=tQ-R}Z(l%V!*rDB38N67XrK)&P$6&!%jD87Tb9gVd)>ne!T*i<N-SF((
z#3ftl_+Gf07cR3*uUURP<Ht#342%1|k{tCS_y=2OuhLUWf<C$P5V>Fg<&fUR@Y#_|
z>Q#R1BefNFep;F%H4?%>G*7-Sz;UD&>3o2|rn4}abw}V>c^chtaSt=M$9tp-Z7|OX
z;!AlOk+~7)CDn00R<IK1y|w$6hFC#myI#!efT8pHq2|jDn57+nvB}oCWecNDUC}R5
zRN`b9BR9%h-eK`QbF*5+6?xa8L=eq)LOi@pRC4VJQXd56x0jY&UmIqBy>ICe_?wj4
zwi%i}3@p26J$|w+F8?*)Prm|e8?$n=FMZ&ydSvFpks#OmNvUT!U@vQkT3eXA1!So<
z#i6x4Du1&fPF^VF{q~yL!pEY*M3@9Av^oqC&Id;My)M8O)Yzw6VtJKGVTpKo7h>vt
z%o8E|<z6@~4@AW+B{%=}Fz)7(aYyjS1<!MloF4UFOI?^n?h4%HEFIe1iUr@ErD7xY
z4!O%xo}MG9C2w;)PP-RP18b$VIBur<b=~>!do{EB8`tKMHXPe_rh!HxiIB<C$ij#-
zSLeJo<5JBl@0*IjCw~-rFd{CSelfQtg<RaSf<<SgCK-DJJrQQBY%Ep|{9dGg#`wnv
z?Te2|7tPc==#a2Ut=%t93p^}KfGGrQC{yr&mz~DpVDAq2(}^(>S*lT2l))_y77_A$
z=tAy6MH}hIFz`_RX8cqTIhgV5xN4+^CV2b6Guz#OX2gEnO<J;Ax0<uvfLr60#-3J*
zO`SfKqi~~+0@!C`yvp;1iO89sV@0Ob@SQB=BRknMl+b_|$_}`}Ip3edMHcJ&d=!!}
z$SdGeG&|Z~cv8MFPr{u4#Z$?yft*OIhGJ$uA(y*cLhw{GN#*_M@#`Oen8L#_gXOAG
ztI6QahQZJI*X=hNDI0*F<`>X@o?F?rWh>T^cHraOp3OWsb&F-9GXq&XlE9Ai_nqzY
zB$8PfzLKs5by_zG==1qQBt9bybYJFQ`pK?KF}Js(lZja(uqW$a^j+_<6&)hX--b%h
z8yw}uSr^VJUA~T$BDNLI%`?qi5;*w+THEa3)i|fZGbqS)E8~bm=hP6AWu@PYRUp13
z#!U3>$-bs@<DU<rb^X(zategmgKXLz%Nh?Hrdf0Jsu9Zj1+E_3-cGd`+J$*0Eta{k
zK9wBr*k27!Mt~4oBM)OFXk7x5E+a*N18uVT9G<FT-~c$Q(^KNSbPNm>k`;;2YnVb7
z;j$i`BE42eC*<*9=XPCq7?GYQ2J!WkEHB8pSBW|61}Jjr5_D(T=b%@Ki_tT^56Qyc
z$oWLc<puec9JfMyaeT<y`e;6LC5~6mZu6i%#3C<h#z)zXJUnN*pNr~A2edd&<qGyz
zc+BbX3EUYnq}j^<Zj{gd*<htnnVd`hfo8H@vJo4sQNi*~;RioU+S_Tt;I1C$AF6ib
zu)%@shm;n?<H`*k*y?hRcTH~lr+LAfpmzNb_`w*IDK9>QpkE`jCXtc_#N!fx-Co&u
zEe5?XBCyl53D23!>(m8(b^y+ADSL;mPurc=N8Wn=55_VD2xE59kz9AZ0grUr>tel4
zbM@Hs9}b`c%w?wa1{=)@@df!&ankdbA<?BDu5*8kBB_E0kn=45kxW=+@EccCL9Rx<
z<|1`vai5<fiO3ZZ1=*NQ>++hr${VTDA^UE^zx&=iGdHZz($b>)PVi*5?#sjWW@Vne
z@s@9IA<`Ldq|-`rti3mL1i2)4R9+IQe2*9AZ5P`!uQtux-5WQ`Y;%i=(jUJ8mgm@y
z-Qu5P#aXU_jVv!egx>*G%-e|SmW6rzxQYrL`f)Y0%(3QjO9$w&yHeI+Q*$B`>tt3b
z_q5i>%g27h1=uD<ECW4#e;Ut87kCL5cO`TzkGacTf9hWJlgmQx__LCqziY=U^yFVv
z;FifqDj2=k>#-y^nO+}szi>cWEmYR+XMGfifY*AgwyAGcQ~J<?35amPr0j`PKD`tA
z%e5;Rlm3%#VGNuj?;KM)dMzYh_I)cxS5m)#XwgWbWr_VjP`CogUbZW2KZ-8|;oH%&
zW3X?$+%SIemQBF4zNS2%k%JO^D$oktg%10C)<j;&T+*+bVeRI=W%;4_0(qfXE7*XR
zGT}1q*+n=?ZE>VZoX>=!vm_SsG58fhNw@$=R;iX&K7i%><&o)BE93?Uw|g#SEq}K#
zT1GsJjt4V~6fs@bpWL|Qypq!(VIO{Q7!p_4BMJ%$SW0wdwhBZY?uK+svn7fYFfsR)
z`WpvJ7v&tc$%8E%xsXy}1=8%TYBY-<u}$GmlGD3#b-@En7+oxSh_w_;y-mRCAQVJW
z>b*X#tSt(>sS~x|(bkmAIBR0eluQ)b$x!E!@1{B{BswZvhuCgb>6Hu+*)YAzSGcP~
zh(=$au?>AeNr(&wTVPX?&DA=Rb?nV(00JjW-13#0`g|bTOm3<>3WzXn?xkWCj}EXF
zam$P49o@Jm+&vxrAC$~Fg7b3pGq&;PPUBr~e~bfIre;TBL%@80cQxfzUNg}Q!7tmj
zxkxs%-XI7H4vR&Cwg>0pI!n62(Qfw=mzNj6tj%WyoNay5Y_5S$j<(A39Y5a5{!1nu
zf}}RGq*<+GcDTiAe49TEKO9M}I5VCCb-eGrLh2uKdw?945H}uuidE=hsjLsqi`jw$
ztN2{u4r>VQIcH)U<6|sqBA8PHk}|v02sIB|$8@bMEHtv}Knw_Nx$aspjm9QTN2<(Z
zNbtQfS<)w~Z9S~hbT8^nV1JP9lI%*08Z9_Br9(tW9!H-DYh|ic!<e3;y%iwrbc*H)
zRJ`1t=g@ZmBEZ-wztJzL9@R@<W7CB`Rffp`fzC=h2oP$uhEn&`<GAP3de0rM|1MUh
zHz_;qs-cL-%I_DmLK2G@RY*56A8bOO+4euw8TrUKj@pa+kyw3SiXnEn-(^H165Gd{
zf(jv#)F!5FYWF%!CY0t@XAPaBnsE9YBMey{W$BP|2Ge+1#NzkLAxwwA_+7hRF}$`=
z<C#5|(2lrqN%PSyZ?-R%zjdW@!by{*kq-0ZcT6O97R1FTW;IUvDql0=#Xdxj=Nu$x
z`M=r~_v_$Z5j7)i?(^zV6~a>%Du|4nJ$xfW*y&^mw_x{3is_hh{#d?ykeY#N!b-iq
zrs;FZn#55@l`vO>XPO3A$Jru(g|Shx_Hp{o`_s^ad~F#XMc2+R&4qMakzG0`35^uO
z^60EiP0ycLfM5-JhuLqhoLj)#;ns)Kn~;EoNLf|A1S~YiEyiMsi@QNn#>2Y#^y|IM
zZTM|a2-dr?T-4E>FYTO+@)Goc`lXjecs)LM)4=U*VzZU~M(W&|*h~Wn(&cz(1!JpJ
zqmUkM`GJ}}xqPuVMq;PR34sX+<-_R;jiuzHtJ-5<$4X7K%cK|LX?5~fk~_IA-r^PO
zleKzY<o-O~<)=rT03=Fy?~X~dY@-rB$>M;KqO#|5OEzuHIES0|<s3QzvrWosj_qJE
zfhRae?$HwkYih+NF*5#d7W*w`Xkkw8qz8j^=C<KyBFDb-jtz>y>%9Vr;eh$lOj-O<
zWL5#8u33xz&?z?)C=IhbN|X(99S~^`acqXKOYL@AFk)@Te!NPJ=8*DT%(aN%l6PG!
zo#PF)&#QK+%Yl}+Zh122+<!xtN0RXUd07Dn!~>SJ*MxJP5(Qu37Tq{B_yftT=&3Ta
zT{tFGg>&p4xQp%uX)Ba!jnD4yhV&mqv(mrzw5i{VqZ9FnjK<%^`a8(n*%wv(?$g)T
zL|ApJ&=}>OeA-#04|iG}NjybJPWkN|!6v>5|Da5mnItu)Q%t$fX7;w;p$98FIRFIM
zg4*~ustx@X!#!tsEPAz{I%(vq;qX`^tc*&4f}7H#ufEG3<taF{dA8Qk48+aB_uFUN
z;EqL?g@N22;v;3<z@?!Rl0|{ftpgv=eSU=5>P?dPm511b(kMtQq|Ov$$bZ$UgiAg%
zCtp{}<{JS@9;*rluYTHu+Q2PC!O*ZTG*ox#I+CNY`$w!rBv<Xyd(X+B#UE}+uI(yO
zM#>1WnN~Ae5`C9g!-+sc+9KGO{7nY(i=5Pe5NfkZMEC}K3M3_Z-5PQ@5(PPDg4Q<y
z{Cy)=(N;0`qq%`dwW^Tg3<2Kr0p;r)r{G&P$2H@=&aRoI8_83X$A>fME~O4TnU(~-
znjcY5z#Jl*8Eacd0*MTbILRf)JY;wHrHld7n%nr-mP)tOW81lD+dBj%VQF#V$Qlq^
zoIA)rp^)Yf?98QDutUaA&~1WcvrZ8fvW}`|U;A2Mo(IHD1qB&m^R_1Bd<!wDB@HeV
zJ56EHje2BOGjj8%e7-7C2H=uB<>zB|<uL)mh=s>`MXz!R`Y7moLPz6bchHx>0lx6|
zVv7{hQ3+>i61BN_V92BY;HW|sy4V4N;A0zP>!Br)8;5(U0W^oKFbHyP0XnwzE`;0z
zdS=);smU!7Kccln)$uZx57_k7@_xmPf?jE6WUoqV&c=H1Db}v`Et79derg(Rm)1zu
z?%KG{rD2e<Z75YXn+p@G>JwBZjFKE7-MmiZ%tv&L9sVf-JADjF8Y@SQLHs0*my4mx
zZH=um-EXxu8-OUUVeoH@7VnNAjxyrL&#mKgU3X>+MpzCP3+H3knlB@5f#8-jB7MsH
z#X6_Kgy@gKeKi)4nP+GTMMkWuCGRMpEHaNoZ?0rxnYW^{^8x0${+@Bg@;%-!o(_S>
zr(MtwW%9>#!9mbpc^qjMV_{%(U+8}uy#gQVUZ4o~xOcOVTUp47spM*{RZg;lH^suz
z-ZgsQEX_!uDnW2gUY9$l1^m1LH|FFU+bq(=ETyy%-#Ce~&%cLB;6Y{9e$g$Hw8<9m
znS+cgy)87jg@l{o*E}Zcn|zr3Rt*$*ghdoegZeQKIIDBrjRGC-Piow@^uOoRpMIyU
zn47yYa1E^5jr~HHj)a=M?CY);H?rOU%n2;$PUWPZAJazh9m2A|J9E-uM2k(Z+4obp
zodosrdWfCB@3)v67RluX;=tLtGa;BBq$?sRP9PU;Nev)1)G}241>Ovhpuf_pGlKS+
zw+l*2pmXooUZ}&^u6}IWx86Xmc)oizQe#%1?R{D*%mwfy#^?+(*qE%?qxxW`&vUPb
z6!{SE5KT$mN;FR?Nb?En+=_JX`PCxTD>51@hh?+Jl4c(E9*BZ^*=pjO9Rrtr<_?=q
z@i~;oaP0T*NbVzbx++`Rp%q)k)#R(&IV=hk24(BF?H=@WZET;ObhJ;u!aW|B7azO`
zKWMOR7g;*FvP22!zxn7$a>ulK&9@z^IUOtEC8OqNCzb2*io2)07IjdBHHMxROcbfH
z@4N`#TZ=mKtz7@H7bWPxYj5g>=}MLLKu-JD(T*q<=DJ{$=RcsHDgqUmUor!CIdU{P
z!n<cyqW2b+#?R`I{S`$AT<=&Kdz!wORFw>jKY_I-B-~vI7*>C`EGPdW?6sp@aX81Q
z+q6Ya{2M2kLNBstc}40a*!i!U=~KkyRm-;}J#U&J7vI@BHMI|(!{gb09@Yh$hAG(R
z9SN2)rgDyGUacz&lJ!8daw}&3V17<&8B^=*^&b`>2$C#BmFFf;5mQ#H69g=SpO?jR
zyp2?FN#3NmnAGzpXV^5XO?h%;f8ega=!kW~{|<x*?P*gjK*Ygb*{Hnt9gs{~p|?J0
zVs}hqR<@0M{Se|N;4}W#Tz`3-Zc@g9^)YN!yzLZ^OON32E3hqtz@R>i;4M}AW89G6
zA=M$*wXvyUV?@k+%FDlOA#ca+Ia_r8OuNDUB?U<<$n1c4ondBmMVX(!a+YuF{njXW
z${4z~(GeGFR~Wvv6R$U@%B{SM^gA)TB`O*WNzoC0Y<%5>du(dkEo-{GMC+44MDLMG
ztmJ}y`vYC_(?DZ?A>Vwio~UV(g@5_?op9YpEXw`;0VXfaf)f#-YQgYx0?l+n_B!&o
zY+cAse3n|Yd%n#{17Jph27s<kJv^m+R3I?OTkCHQJWdpquHb8`Tr^=jg8|afIP2N-
z&LpiPYsdu0am&8rHrGTev0jZO9Ua4#;c>w|qNN@VRd0h5j^q(8%fBqnpQx{WkoLfO
zD=`%Lj$)8qKlG~Ay9(&Eih;y>`OXG?^Qj6x1d2h+CfMe#@-k<u!@2en9_f%9%FAop
zUJ3zA>j%)t=%W`>+q~l|s_nhG4UT^I?_o-JA3?52{7OXjLWmV0Al?_AeoGfqBxfH-
z5p@yqy`0u}TuIY}dqRb~&;Nk@^@Q4qFz3XX?aK8#<F|w~Mzsa~<FKB`^hy>teCn19
zeIR0lF2^i&xUf|5z*L{4@_ODdN8MVNr`dAu@pt|R4Fsq_5KVQ&UXG(fXccB=ZHBq4
z!|;7%fo6GB#d_Q%*(SH3)5C6L)u~-5&=Hc8Q(N2V&>15Ej*;i<P6mb<()aoPFQ479
z>(h066ra7ja&2v2ZT}9h&gOb%`o%lNbxvu!)Dx6-ovvt09;-k>t|V*J^9Qj$O%4iD
z5tPRy7-gbuQ^fRbz~vSL`VmvRl7q1llT6pq7|v(`fA4zFS+Cy3SK%mS`&{dWRRf2f
z&i<p+OA3$B>kZS~NL#j8Q`wY562?U`8xZQH>@FboRJIVMz{oA{JM>kLNpb6*X8ZnO
zqQqvb#3<Ly)2}B7^zzC)NSo<$;)ivYvu<(m?@ZoM)3aAQwhk(lSjiFd%pg#1IBs{G
zPNjmZr%N&mt9t;uP0w1ebj4$DjUtoy?)nJ;?II8-;b-$^c8nnojh&H}u1?9(A}#S}
zet?UJwN`OV?>w3L4CF2>NdwpH558r0MX*c$LU918c_ttgJ)kM-hC9eW>pQdx7@%x5
zVkPlQ@FAXcJiGl&)ukMIqOe>=xs}v*Jdm&qgHn>=tUo@BWmWk5_RV5aeNY?0KK>d=
zzzY4=KSYAmg}E8Qcyuh&E&aaC&g+hSJ#-yyI9F(dQQUu4bEL;$B4^F*ZZqMXzIdcr
z=iPK3P!c|SEAV!!l)Y-il`;UTkmlKR*5McPnmU%w<!H(GxS2w5o0e%3Y|@vwI!B}1
zJWK=cDn=e8@Lbk`y^&o{;Vqre6-p-#el1f2;%f5cJN`B2f^Y*LS~WKeme{URp5=B8
z?z1W+e}9oA(aivuz;JWCBfCH|NF7tZgAttcK!>DAygAJ<0i{uMv_`YLmgrb@U}xdC
z(Yr5A^16P`4_@Rnc2H#Jm>+^)(t!y~$4KNI>24>mC&CMnzT=DY;k1q&LNwUZV40Wp
zRbViI+X32o34q1e+!c@v*qBNWm<b#!wRuCwG~);lF~<`pZwdGe551;fp7S4HD+qD0
zNWKBY*WT?1z;;Q1W8Qotjg)#rAl}k<>sz(tx_^HZY%ZdiX5`wtB;K&lj5h5MAy}cv
zF}4)UTLL$<=y0gPl6a?b?Awr$K>U#qw8nRvrVapUI@MuvQNLg_9@PLG#T|tcg=~js
zzR5{2J90<Ma;0`-F3D@JlRJ1v*(`(wA<l&gDQVSeW!&03g0~x(5uXiFrL%4MQg2d}
z4Pe_^Y}(F?{D+bA&BzaJyMVkk%x6`X2r;UyC%MZbW>0-u%?zyqa)S626B|EGm}kb9
z34cnl#UAnl=UaM>G-QB@4xo|;*M_woK5U--{zeu^gTW6M`JKmoeQi}S^=g<YKZsBB
zgo+4TB10w;J}hl5PvC`R$tka{wKCGqQo7tN&BQ>drt&pE0_{=cYeit@nU~V?PLE@K
zL{``?P^};u<BKzd%>IUt5!CTOdv~R!lQ4;K_OG%cU@?F4etU7%st0cH3iZnXEZC5L
z?H;CY!%hZ#JI$+&9atRa6p1<jwUmk9b<)qRaHNDBCM}Co&t=^3=pMMWP`9k<2!Yhz
zEqO%oc)B=$c3j;oYBJ|mhbnebH~d^W2Y=d)5=ZaO4$B0I@xra4>HaZ>bLmpGwO`b5
zQy^pOcl;Y4+Zb>A_9GDJGlbQ63HoK$`Wr_6)z}VrIOA1TZT7N{9yp&*Ql-9tXCdi-
z&EE8m{nfz5SYhOpL@{g=vR_AEo_;=C%h6ytF)x)LTrjJ0GN=_WLT=?(cB}i&`*rIi
zSvS9H;T#c4ADuWJJ$;cCO?-eWdOdm_+H3N~ckt{fQRo$`?N#;o!qMNTTCW1%gH2Mi
z{0pSoEw}De>cWg5)mYz<q#ez4w(;4qKEcM%W#!NGmbyppcr*ZG^JvWAv10<xX@~9P
zw5?xmu8x7j(IH7cmmn}${_MV#-}5o6!EG0bFiUrk0c`I9TlT$~<80B9=eSgcgP3#H
zq7XCfg1xHRaN&{THk2V5k_a+=<9AmzgaO2Kb}I**oJFnz&XoL_Rs~$)R?Z22dc@Ue
zDr_er59Mmh*Nd6djb5b`VFc}xAEvdgtQ*aG$KhUh;F;mX_|?uiuDZwU#)J<ryQsU%
z6>w@%0xl(?<7(m9_b$>gV{DzTPhP;#k9`Rk%^wKnwW@BHR%oJkcx8>l5Ut(Y%#&<m
zOENqPoTIu|8xa-UF&@`ax3z{0on(hE+~{VJ5ptx97Y$@R*ZO2kYlOFU`=F=sT<7zp
zK(t`#f?hzjR-ARmT=w#bil-#@G+7ZeSwHz5HxNe<wf~hG60RPb2cTHh3|f{k5=;75
zWDs{HCP%X$V}QI2H`OD38WpR15-?c&E!R*d)bb-N_~oBHfgI@j;T8AyyWb&h!>rB7
zyVjN3g}yHi(1+hjPtZq9*$|%iE}962XWc4k@>9E9pZUBx68EFTWHUS7fO$AQ*-?$o
z-D*}oYC1^*$hW+2BYJc<Mp<T5G^*jqc6CB{K=ipM3hbi+ToM4(qJPR|fvI=IB)}W<
zw%9wGu8#u&#HUXwKlIY$U~D{%52dODzBFhxm4Wh(YRs<(GEMu~_$<h`2Hj2*Jy<9n
z#pF9PmsgAQf|Vzr&&C{Uzcnh`V50_F?FvP0A)wwVxH9~8$piFPuZG18L`|h*wOO7o
z={}A{aL3%Y{dBIrA7Ud$m>y5!%;+%h|6&n<gE3W5)H4I7=a;aUb$1!>>-MIxhnbpe
zmcIP~Xv*~MkJ(z9Ca%v4gkD5NO_lxFkRT=81Dt%B#9EJPrFiqUo=(P(=hBCBCyu-P
za#}(x0c2cBcLd{=r}(XDK$_%_6omBzxTGwa$KnwU-kRX$l8<f~ooX9pewsw@?n3we
zd8didkLYs^S<ThD;iU!(0dcJB3rL4#`rF<z$$&|+>cRm>>kd8fEH7<zG`Dk88j=>M
zh@)NC4~52kfQ?r;%1TKIJ*|0y@s+p73~K{W*C(#+lhv^cnQf~+BD>@1(doKV?2*{7
zV`H#QR&f#`aeTeRC4K#6Fu6CJU&V5$)E`G?F{eY{2#;Y%>ab)}jU;U=p9-TjPcYDm
zMT7P-<Fr+*-&y5!<_#%BR!Uln*fQTBg)Zv@v99s-ggk3@X@rSqt}vAX7XeW`*|ZFn
z9F?ESfofOZ@A?T?%G{k2fn9Kia+{#!8X|=)hc39YMTuCJTH{`aXs)csPal~AF##Za
zM9-0Zesdv|)BPnsZ5MwKBWiD)Cb7iEBS?H}5rB4ce+sIVPQ8|&ATK4$;()IZK2u>G
z!8lWJFa}#+@FrThz3GnI+nOCVGrA-Xa+NuVq`mZGn)eQ4yN(sx9}3YMTqz%%yJYq@
z7r#{~$Yl0HrjUF&L{7m5inT3yKrV=!{(QK#=Vqz@Z24NSor!}o8&9?67%l(F8UKYM
ztt4jpWi<n|DLAFT1iYw2N-UQ5JJ+sgv{@%a9z?%w<eKJ9iwcBUP$iI8ZIbgtrL#hU
zlXz;c*Rd#E1H7uTcl2yY3P<AC?PqxHle%8u^<0(F!l&BYW2S;s_aHmPCp$?J<{kd$
z)C*E8tpa6IP?r9!nXj3Wt&iWqez#Zmf6j}Yzb(INO`j%FLzTY32a)eE_)NZOQreKe
zPFv=$nuI=?yHt49MY6O!&CacyUM_7X%eGy-O1NoJ8`G;Ldf~Yn{m#BZ6Qa?%U5XX|
z3CNg_z+d0Q$5?HBu;*ur(4}GzKVFdT>0Yd&wxzvXO@2_IGjUBwlQP-DI+db)(fEft
z)<xYsslW}$&?F@UZYFeWu5<*ysO9o{*#|&J{505Psv)ch!_-`Av74v%ow?MFqle`z
zpZ7#%JZ0<^4l{^@OXn|+Q~3j|FR@ONke25nsE=_eS$D<-vXkGMP%I|Ze`d+m;u4$=
zL(SUH-$tF8yO*lT-%x00&NkPdnpx)8T5W0+pBa#1?3^s5j_4yNF7>u7ZmxVaL~YbK
z;ngap5#a$^`?*?^OV?z2Md<XzbO%%JQj>+lFIQJv=6vfl^g}NMZlA5QPZgrDQM|4U
z$_D<FHvk-ac?oH&#kHt}K)4xf<O8f?pOHoK9XfsVU6nc7!S{!84ri2LFQiOgBS}&~
za&vug&Se2a6MOL#dGK6yEh*sxTnMzkwIhEGon#=Oyn!zN0GsF3Xe;65JC+-wRJ+i%
z!&y?DfZaPSh%}r53)k+KY?sm4b#BN)(t$)p!@1?lxHAoDDrZFR-=bEy+U7cLt6aG-
zvRb2ibChd*r|0#Oto=(Dqk=)l-YFjVR(k0V+-o+7FbZTpF|jd`)pXxT1sjj+ePAxx
zzG)2ETUzZkBq;@~oa?QhA_ib2Gd@Po<h*QOY#*WOy6mRJ-N!sLcCgRYf^hY9IaVxu
zbm5pB_|C^Y%{ls!k&6qyJ3Y`E*%8^!kEGqIUFyvdWISh4!bs7VLO|C}e@@vz11{`9
z?vl#Ax~lDcg>yUuQ%M@QJ_Yw;r!G|g_vQuQfJON}@Fsk)VFtXRU8Fkh0xP$~9gaGP
z+)vqvB59!qw68Yni%Eksj?5Xgpp;U*@6;soW?NgVQ<r>yC3n1q&e@gl@Z=EDoNhhH
zJaJ$=I7jcw0Kd><%Si6QbpZpVryzOTunE3znc^-g2C8qBJQwuqI;!>S>RqTIBeCPn
z4e3*!4}hr7h)J!}3n=RFkXH~KavuO3qkN2W_n!J7GngH;o30s}bbh<6OdX|fch19R
za|R)2f<mWl+lu4YpFf!ljW~|$yXe2tCF)j@Su#rMH-#!(Q*<&Yw$OSIU(6}(pj$`1
zk<Bavnbr|%I*rq~ont+|utRCg&FLhT_yMUwv<CJ(fY>{Ex~)B=!nbE8M=&qjO%Js?
zI{-s7I&QPeUYpd+_lTq~AJEU;+h0=iIG3s%?(W-(m2tL;HUlXiS#&f&8S>K1`X6;<
zz60C}9fbVN6qNRl?OmlQL$Ga0*`8C)N1xs60G_+>ru|MyvAQNM0{bXy^sD%(0-uv7
zGjkc5lngz_Hx(*adAVcSJPaY^SNo*KRA{tyjhON>sQJ}R+yX)*T<jV?+Pkk5Qz$84
zd4~S-Bee~~mozMqDVfeJ#hO8>{EbUc=z<GJumjusuWR_{T^gFOTY)GjF#~UHkm|sn
z=l+ym{<$HpODUc+N`0da*h8f|-X!w{z+;~VJO__hZO2;w0+AZ)k$r{?!6RZ?><GY&
zs?d1q&wLwjTOAT}wUncJQaN=y+xl~lTZ&Ei5tBCGSGaq(-{m&HJ1lJ9t3t<E9O5y8
zXjl@E*;rU=cVF)d&L>|El1n*&H3ip;_^n|%Y&eB1?ffijou)G+%q|N>%>xeNmU_TM
zui=uy9iwK1iJYDGLpXj5cXf`bop=^hJXgYsrunwYAlP}fhcOl&W0h|K=zh@-umfEB
zwD&;D-q8Q|jnjoSb_4g_eK!Y&)h?S#j#~?Y0zIU*2W_y)Mo%TF%_AS%Aj3YniS$Ab
zyf<&@*<taPLr`faj8TGw+hzySiplYzyJ^Kp6Qa|>X~JQm+%jt-cWOYkqXosm|E+CT
z3u<~t5-v)-e;hzM3|a~dCY=yfyvie2lr)&@XY-pDo>Sy|$oTzn5yqtxVQ&}N9D;V2
zotpSf?7J7~RCBlul)|6IdLbr$;|IWjVS9b=3<NeOqY5oBm6cW-FNm7sxc8{%jirJk
zj$;)yY5)RvM^pDQ<nO8=Zf~B9Jlu%~l7kj%QK&@D<0s1phl@;5LFWEWF550Qm!t^?
z#r=zs%_6*lP`mLK*ZoN^9^DO8>7Ko?@99?>ezLJHQ6D)*I-;U*Sn6Drl~gsh0DXEe
zxSrn;eT93ws#M)+3C)jf=)V)f5w`v$aLJ4SfZMaXR+A-!i`i~x5WK;M$cj$My>;Rj
zU)*4?8jFmEyMjW*(K{Wl5i5w_m)$Bk*SgZMN2VaE$;gx{O{|Bz)Ql7heu=>8caT^w
z-VyGI<X5qy8}h#A{pD=vuBF${q?~X*<k6=h2Z2Fi26$okV3Fq?H>{a8nOu_6QC(TF
z7Tg9sQeTQ3chf!pOZKESVM({>eoGX&$`*+;84O&1@hQR#lrT7FEdUCkQ9#X6#hDn3
zlGZ$$#0yge3(b?pZK^rsneDS!Vf4<^Jhm@Ea#}lmRW@qNq0$u$_o#J{Ed7)qAmQhz
zn6Bt=;m_O-DYU~Z3TEHJpL&Wqob`O`KX%L<c`?s%wW(P;m$ga{H<5Lx+iNoV?60MH
z0RxuCF+yAItM6?FAI=8zUT=%hy;Ct!j<{>$M|L^rsKTz`LVEdJ%b2Q!xWy=+2MpQi
zL)zHo<`4u=&pk;Tp~J7;@UrLzO6A9E{BZI-8qX}x%LOwUJry2PLJ)5lq(taa0wK0j
zi?0d?3QQvna`%*AN3HE1;n7n9#clX*EIRlNUr{0I34y_-ogX4gJ<j$wrhy&<>7>);
zUwn@yft@VW<#uk?UX35hL8=?snk`sRW+Ihq4c^&Ua@_C$arUct{63=cGQ=O3*#@A<
zn{K>~=LqQF%L6ly&?~S;(oDg`O$@1rB@tou_5z3Vi>J&wuLnx~s~Hd;+t=$6@^`|h
zvB9B(?SRA5anhvv=CDzM7FwQT5b0O2Ky@eO(=%cH0|f>P{Q{DrrgVW`7<0Sy4MM}?
zICZ1)BF@Arxfi>Sg?>WUgjCF0@Ml!pdGD(v%Jl;iF}B1+SjvKDa+<els<1Q}n}%f?
z<q58Qd%WExf6OjNK+^r56hc>x$K^1nn-X%ncDdBN99ISFKjIAI6&U!QZx_uPdGrKK
z^!V7#ZdgEfA<?nn393>6z({Yo)!0M|eVI5tgnFHY3!1w(LLE>bIe~YWnp6&USh|pq
z^^H~J{WT<s?W#aJQdbH`=>I9*%$M3HMSWrZ7BYvG*?mv6kWAUiKj^X!)$~ucK)Iy3
zxMcy5OaSx&WS(zvNM0*yXp?T9bbT<w!$MbS5mWu-r*%m6oWycSW<O7q>V8y;G8>!-
za=v0z@_F3+y7S1Rtl-cOaPg3)1L_R2%td97=OYt)tt;lKWHCvX2ZK1#U-uBXJEyv@
zb+zHkECucNuAcP5dv6YKj8yh;1hZu&v&rw;B#IB!$+e^u)wUZQJ$<W|Fok(dvgFBs
z%zj&J5xwOp<@`)8!`_>`#<vMoc;-p?6rGGn)7P|8q&=1jtZ>?4lP8-}m|k41v+<tx
zY9(am?2x;D&WfsN!`HX$7^2#MxUdJ>HoEG$J1>voGH?Ze9e&tw;Wq{sH3}6i#vjY*
zitD=?RfV&Ne6uPHYLQh?(UAX{`_P1nev~zcM&I{6@XzVwONNJ(-V!K@xSu&qO?E_^
zqP7nXYG~)<rJR!hlyIMsUBysp42XtWb%rLJzujwk3_I%Xr-^b*3v$pt9DIdpt8D=O
zf5G1HdU#*Zlb}m^ONJ;g4S>aG<?5<2tc6NUZa&nbhBdp0=bG##9Vt`ecTZ^$?D4<<
z{46{_2u+&uR}CB?6eo8TRif_&?flU0zt5YQZ=o9IKP%(6=7i}xc)MvlA@U4{?I?zR
zAYz5&@!{7+<-Jo;M!tPNfaHXOs8;c2N1#u9u&6pk=rAHrJ0AUcVbnQ9n$8d#*}2Kq
zBew+<5n%aM7oh&IULvHKQ_fX|?CI1ZPR+`nOb~Gw0(qI-`Z!7JdzE0rx~E0R#NgQk
zOBxMlW!Bzd>SYUf_TObk8~uDWFp1wSn<=vYuHm&boJ<cIvG9?%K8Z8^gcw-N2-jd+
z=j0(o{`}mX^?@@qE0A-Pel$u4Jr#ELcj*dJs;5Ajm_cIo5OA-;@vz>vxojzKvrq`^
z2$Qf7@ObB6q3op}NXiFpH)yPEa`TY(Jh{K0<q2;iGOW}xg;XrZsW?5Abq!>v_5b|+
zet%_2+sa|CZ)ZMW;y8cEtfp87T8~VY6v`pGz%nq1A8x{V`yKSXE=3&x9pyy=U>rBH
z3m6Y=$)i>Js)yi4&<XJR!X1Cg+6AMeik?B_paT8CXwEmceud5%T`qfQW9g6e^uzZR
z=Gb^QHdQwPG}*i6chV_Jwy445b#cEh)q|sDkVvt!Y%+y=7?~@3=g_*eY@0|tjo4FN
z6e0oKg#oWJX^v`XA3@YQn@$zZQa>adH`ZqmB6L{YF_{T!IBd%5$dbLa{}jkLn|n9+
zclgoqkMd+pf%Uyt0z2M}0&xymyhX|;(<J1r>8&>{b!^u~jAlMrLN>lE&T+=oiE6l$
ze7vcZixUEKqp7sCDL<Q?K0hD_Zej%=A0TpvblfQVD9k8m?zdDb^rdXTI+;KdEX1EJ
ziD0Xo_ErHf67(H*z`dDtGgM~2?{^+R6feUM(htTg0klw5G{phDvk&}cB~N3@>EyqO
zOuJ}>O+K<R6Z6RT5J~*_{ywG@6*9((4lH`Gp!Uk9W<cLedxlk7sA=`mZ=@Ub?fQ$f
z{gY;5f=@ZqpALZiNPUkm-#~T()sZRcb(5eUPf$YyTKm)Al4!5_it~{}37Rf()zA+O
zjsK&INc<mK3*c|HIDTFF1}^FT(fqpf{m(@t{x`er{uhf#{L3O1e~})L*#EF_f5`72
z^#%SznStyGqyM)=%CDdQ)m{95$({f8YXLOVJdjb&K;fEWzwLRrG0MK5y>-kKC>kSp
z^4K$AMT*Y<+5Db({MXa3rWB|aV|@D0<{MCS1)%t&`9=6I=>fvOLjSAd|Ihyaz4X6E
z3{2y{j{h(A{}<{1dEx%U{QsH$KP}up=Kt@d|4)qj$Nc|O|9_G3|9|QKqTm!o{Pve5
z=YKEB`-`0aLxBHOng7|6^RN2<UsLk_;+FH@BzXV4W&BIV|FLubvDf^|E$3g-|7F2@
j{I{+D-za&W7m34<^!29cfZ}S$j;X8YJVHEp_WJ(;N+HLs

literal 26694
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
Uz#hR+Bp6_V4#4iO-y3`B-|9mj*Z=?k

diff --git a/resources/ios/splash/Default-736h.png b/resources/ios/splash/Default-736h.png
index 1773d666e694cdbaab365c0ca8fd3fd02ac2fcbd..51e8cffc69db729f5f839ccc44b7d0da3c455442 100644
GIT binary patch
literal 37292
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

literal 49479
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
Vigmd$@P<9k7ZB%b&tCui{{WePwDAA{

diff --git a/resources/ios/splash/Default-Landscape-736h.png b/resources/ios/splash/Default-Landscape-736h.png
index 7cfc62946cb6b82ad420de9e988802040da04908..8123091af9218564db0d8b21581f3d896980c84e 100644
GIT binary patch
literal 38609
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

literal 47416
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
CvP`D{

diff --git a/resources/ios/splash/Default-Landscape@2x~ipad.png b/resources/ios/splash/Default-Landscape@2x~ipad.png
index c7a2b2494bdb60128c2aa1708eea23040edfc7f4..63398a5cdc084cafcca266f46722d1908171a12d 100644
GIT binary patch
literal 37335
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%0A0MTi%cG11n?L+P%V
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
A1^@s6

literal 47077
zcmeEu_g|CO`*&(v^;<{$d~8LOp_L)ZP^N^Dx(zEefQXDpSt3gednC3LsDhwL1Og<n
z5<tQd5Re%y3S}j-K}J9%F<}G<A&_-HckK812cBP^Uz!(WkmTIwT<cud`+6Vl|Lk;m
z&v%EugFqmA5LYgsAdsEl)9sL*+rfvAxz9tvhi?MUI-Z3<s<U><e7*%=e}zF^J_o5}
zs`0=VM|`iK93hZ+9SG#!?+}Ot{L{V95J=Q12!wwV0)gd1AS!nXnyy-dZ*2d?{_+Lz
z5xi}kZ^nTS|8wVxI|c&TwO{%B6(q0VAoz6%;=);%*bj?SF}a@HBu$CH(!>L@PwS1-
z1J@t*9{hOm!HH`PS|0CG{(J0lz4k;?=6_YjBf{wFF;>;#i)S9py+st{Z^9z}YhjtK
zUH0>{E03RDc>I0(*wJW+*4cfn;Ur6e+&AFfw>w|_qVoC;S7<HOkB$joS_&)!A&Ua3
zVwz4wZTm7u2t;j!pWOQO|Gs#guKT~wAP|Ei|2|bp;9oiXV+a4r;a@rY>kR+cz`t_%
zR}TN~4F78b|2o6J&hW1@{Ob&$1pdtt|1pDq<?yc@{&j}`4T=9c!@th(uQUAX4F5mV
zgZDOLR!R-Lwmz<nK%n}#m$p}-ZF<ZP_@ODC3h<4WF0OWZI}-jc{CQ91@($(a@6`v{
zNk-)YQz*{TwZy96SKK|<C_5Z%IKl`io`RG0-SbNN){L}E>FZU%ps6_N=<r*=fsCfF
zdfOH2#VGPtM<jboj1LQ>Y*&FmX5MQn2Zg+cx#rbDi>)`|&P{V9>Te0Uq^Z1?Pf2=m
z>LH?>Ix>%2d04aj#uTbR(7Wzi_9#bl2zTsI(JmE_*@CNheD2FQPgCg3>)m6|{A|C5
z@U*AyyRfeL3Nnfgc@Q)DFp#I~shztZkUM_={qo^kMKw}i+ib`cgdKr<tygo&-UKN%
z4#aVmL|;K5dy_=zxc~X`L2#ZoL9qIt+r0z({(TBc;Qv_;pEVZM!S9cG==oD|mGl#?
zuIh_ZO1%BvdAw4xciv|_kQTBq>C!^@$xY=OuQA7zZ}jFj){4dEG3G$q1DPBP_oxr)
z8maK8^=VHn_ilwnd2yG*aS1v)I(s+%1QiH*ee|;OYq3{1DDS9?hRg85MR{>hP1M3j
z$asx*zC}1wB3h`8nCmF_YBn#sR?+>TF1R*Hx)Cx_Z?G^@(F4AV*_zMc8idE$gQKGC
z`jzvBKsa9vfKrR<9{eB@gdf1^X<NlC_tu9_)cE&gm!lcB3!_!6JhR}M+rxD0txtsU
zwxopmu&KNXkA{GW`cR%&$`i$tC=@3>?Wr(}R&S%rnn{tilKw2tW$dTRHGW<HeW&b`
zK*n|`mvIv+4W3{y+~wes^UXuMo1zwK0{Zeo#$Fs%&XPY|RvR|e6f)gn89Z9qM?l(=
zysH{cUN|Kdaj-*C<ibqY352nY4LOG)o8PL|lvcNJZ3Kvt!SOmH<wagoz5(xNcGky8
z6-||54^JwEGVMBvW?+*j@%+;A>(xJ=yjK2q$HT*4F7x4~UaNQbsDlD!2O~2pvsPDE
z1E)&pbYm;4e62X?1e=nTwCEeR)q`#ehW`M3SpfT=E7Xd2%lufXqT1Tp@%m5?^RUTW
zv)~aw5r5ddEiq0b?$hHCaCGGoK~YB6@dcvz(gheOA@C>4tE6(l=7GF0bh)be^%bvC
zQeIv+DDJgn_-69fpPG_C)soixkrQa;l4f|y3qF0fVfac=_7Es`%wOA_%M#@EG49TH
zEA@l4UcEqx{dj*pzSS#BJ!<E{IzBZw_wQ#H(<vi}na1y>;^``sU2$>o-PsfsjxP42
z?pkI{%Q3`&sUyG1cI^C@u#jf0T->e4jVa=!Iw89e6Q~?gDX%PB$*pW7G-bHVEf8GY
z_{$*YfWW}P1rf^CwWFhBU@3Z#7fFfmkYj<1OBir1WU`~zXrpYcM>q#p%vmm!*G7k)
zU)5Bug>qPVl{39dQv*1c_3%6$rQIrR>z8*ACZk5Zl%g9ccPEGzMgwo(J~22rh`@t7
ziG-0eva$ky`Q?|aQL<5C5*ZZNeO*d!R^q2)TQfW0x$n|d1bL#WdARZ-)-lTF*PUFF
z2a(<UnStRlt=IlOrW|^?S<t3j5)>}GqcjJvS{@gx?_T4VHCiBe229Gs@^nCb#)-<%
zWU8!-+IyJ2*`akq@x^U-eF^SqzqST$Wr3nDzfpHWDVpV`h04h|F4?{Mmy07+XzKX*
zI1#mxJIoLVn>*G%?L7SfAdyJm^toSaZvOPeFNU0vQ@*?}9lDt<WhlOPeyA-#qT2;p
z%G#K3);u^*<{pd5M>{lPk0`w_Q{75wk=51J84n*8O)M?PlT&hsfsjj5xS83LK_uJ;
zClJV6J+WK!s)rAoEPRpmUdR_&|Gwz8t~uTkhfywGDdR@zax+HIDh9pI3{g`?2FAv&
zcXW2fw04|hE#q_wvjNaG!{d59)~d6T^i|M_tCeyWnR2_lr-B6UA$x1&bz(MX^UDlC
zF_|drYh3L(EPQ_+3dRcqFdTqWNVwqvocAvVJTV>$Blj9DHXvtHmD+Nz4<Tg(%2Dpz
zQ`+6@v&Ic8@Dsm<v)gQx(rjCO82+gYEx-N6fxw^uszX&%lkK_=|2|!wa5zOZdU=v0
zWLg=4rUj?OFr-tZ3m?jH$`NySC`J0>^`#VPqlv<;;>MFIoP6QS<od#~CSW`P?UEM>
z<3%@vQ?%Ece{_2RaG=xe7;L1Twjh4AdCeIva<&vtVq(-8AHUd=TI`oGA(u=x7MiAA
z*V#%zHgYMR2}^a2yyARiQ0(pP^-D~&CJ+e7gyq?r-`~!qP?$<@o`vGhXiDCv)kN|J
zk_^EnF?druqa5&5)`p=h2er1+4&_P~s#tZS-uY>o*fU_bu){kzIQXr8e3$0>23Og?
z>WD;gpQRgiciL`Lw}>jjr_A<#_eFrG7|OVCQ)6+8gNu)cHL$S>mCegdiA%xgo?}_o
zHD&LBw{PE8e%zWJ_=pRS@(K(H(DC*4{o<JW;j8;Cg}o-?gJ061o7gY9_^PJL98lVu
zqs0`ltg`7u!*qPGdC1tKu!e-O`b{=F0_o^D|A~NPW+^^rainbmsj;PH(8w1_>7V*y
zZjcRcHul|v9~ve6GK^^0jr(SYX0OtI&CR2)H*B)0P9=mM!)AT>hA%vOl%WtI@Wnx>
zQPG=eGo^UWJX1FBU#Gu_nZ<3b&2N2FVdO4UHXA~%SAGID)iBWqhPAy52LLG;eZVk;
z;gAA3R2cz>-(~pfh~prQe&V0q=FHA7VLI+Z^DvIVW_iU-Jvmv`Vm#^<<E4R<t%6(0
z{rmU5vcjEbam!~So2Sa%Yjtq4PF%qkzb6G!8iNyG0`LJF=bT-m9e-iKv<xzH<p_8W
zVYN@H0-#+s$~Pv2rO2ccXh1Sri<L`UT%UAxb&b?*;dH=l5GS<25jr(-*1)DFFz0!<
zOFQj#bxzWdl~{49F3aeLbJPY@4R`Ds%jY1MLamX;A$~lw_SaIAU_)atFzMrpo)nhF
z>`bp`h|kaUv{^6NYK*h%YN(xYM&Cm29m`hE#Civ27XV(WVe+oMt+<gj55}UN)IEnm
zVP}J3)5UeTdtAYy(dqg(ULJ3liuS<ra<F=Ep$VLz^qho@3E6REncK3Wz3st!Rv^4v
zgBlH&?=*Uz@trfKvx&a;TSrm+2Te}ct*S#C|FK<`zRWuPA*!nNy|9{!In5;qtBqLe
z-bC)te;6Qv!iX?N<C{l~TxlG;leK<E3~tD3_rKUEd}EjoY)pi+bm3cFo;bN^{DseX
zFy@$8S~hmhWnFL_^y`0i(Y^7mKX%RndrZ0WLuId_w27tSpuC}|q?_h1gX_0mj5Sul
zE-`2hf-A)_#k~&NwS%ScwR&>zf%P4%GOJS96wyi7b;?oafcE}$XGeXzj;3)zFR!(M
z9q;ed&%k~-ox|f14G!ZC7Vx19&e0)G<JG50AMzZ+odV2DOa~DrPh7|}io>v1L560&
zgTCVdb;9k{8kh7eM5gW0;r`B&8%_G9V%vs7`59D45}d-5gyU<HFx}ZAJ&zIX2@4%7
z^P<Jc0*7!!Ks~KD%rTEg>(vqYp|VO2!Od0Cc@Ao1a6G@&)1{d(!{L5iE&D9{y4ckj
z5jU(X<DApwm92y1^xL>!3*Th*^hO$+kTa%ncv>Z)DL><3$swu(3`3E<6c@~1XS{#9
zCoQva3bnC{&D%ZgTpNn%&NS#^R_Hl<5J;td0fBZVgmr0q@GmRk>wG7Ab(dd=@$lP^
zeyjb-;=y<J&IXq8E8cmFQGiAeF6%3>;P{eTZuq$TU9|uM4Ju|b;<Bx%6gjU9PGIIZ
zxD;I*yZZ51(`QCQagg!p(~m<Z>gUB+fw(4UusCtOP*drb-if;Rye@vWy!c`q+dbl_
z=Rt88e|5sYeScR|nsdE%c5jFy&r!RTocvp$NxrEGg13i)&e9$pdwLJ`5G-$K2`=<y
zKjXL%`W!ls|9dUUz{<>$PjtDgPUS!M#fP;fNJ9<nSO#I&+E*^Y^*qdJA)chQPjbC1
zHX&fD0beTW8v5WDz4Y|8yQCSOgWdjwXRKBaE20zVR{Hm%QZJTY?0VbP_33{~vkMCN
zLvBU3OTW43lJnIPx}WZ}IW%WenR4uHTP09RB02`6Mr??j`}2CpNm7ld+ArSMxDLh(
zN9F~H<Hn+FyPw{>KHM(sS1m~EZ+y=8TO9NINOU3epbQe+>4WGee4@}<Jtms&n~Cgz
zVKzdqXIP_{of@51)*O;|_sBy%k5O7kV#td3OP`C~oF{s<6NKsYnYbbg>#X+G<%|-(
zgO<IML)4^YX{L=CSd1c~)`PnGb&GG*_=)8Wmk)AxsxH)zjmjsG-SvHX`EI(0uNAvX
zuXGc{+8)#^q;Whb>VQ#Qxk2)cq@bEkvlj~@<CaVGH)dwh=ZvfMRXy@<_y13+lQn#}
zi(3p^Eh^2lG_aIxy3AqDg;nZ-d7!p3nCJSs^lJW4CTNo`C$15wy~A#3vNAIZ3DMub
ze?Q{x+d2u(Fs~TVFyRP>SWS7qrvF^W!z~_F!PEDsUrb4XbU)u|6YD*G`pMd6l3vyn
zDL|y&m3kRvZu7{Ys{5(k06X~7vPmz~al=#GLL~b9T4Zf{JhS)^@&Lnh_;jFFCxsv(
zrlZIk-7Y0<*2Dew-0vMz4PHaVKXy;2(D6jGtP=OQggn;<E#x$*W_H?-vpPH1y-X^1
zwNYEXeWox@ziV?PA|XqBt2Y4=Ku|FKq!K?5LQOp)Zk;vYXY3x21#OMOAF@YLMNKY&
zUU~fI+6l|y!5%kQjm4Kn0Va>wxols{-yphLl$3i>LK=<qJd9s?msxV39g0Rh-wwCe
zMK-H!oYBN=+h$^g=XIjYbBMb6pW0wNwH*GdbZ7GBno9}8aCp4RK8bIi_GfPEMnfoP
zTBZHB#PKGB`TO%h8q$DnLQGLetm*jr>y_z)nOqIQ`SAtYgR(z&qZxh&>CaVkFO#YK
zv04;)^MQ*|qn1cDhXz|+r`1a1D%3$cn9Eb8l<>UsbTysgWSPWH2B~KGSK>pcj+G{J
zCO(K`-8L<3Y|h>q<92MP<{5w9IBh0NC?^ts&_?L0T3K3hWG<ZyeNj-AQ<Oxz)O+oL
zi~WJ61nO6id+mA3ZRQg%1xV9~KTcJwmtf|fxN%lHHCdaRo0X)+02#dYY7c<2vt7N9
z^cyU8+#09K#|t6{5UeE2d;PoT>2`UvxJ892yUBLG->A5}(f8Cs%LkH+oMuAFc(^oY
zMrmhWlWqx@3lYW3_Tv$OYq7fW1Tcd4pww|#dQOX($evxmFHc9QCoL9y^d?NzMnm@(
zo|8O(-x6h?mlkFpH)9`k&6^N%<1w)UVUr)JgRj0Hc#vC@bq-LNdkQq9B~fRLx-y$l
z_0yEKztJUI9TBBYZCb<Q0=p!|1d6(~Mw^(j;Z%@PYzyYCzH=ec%CTB~YgI*YpSp>|
z4O-3%_}kK_PZDE{yYTWXQKh(Sc56(~n2XuA0S1C>V$>+jS~UNO0z6SmiU%jGEwX2r
zh~ld3qyExs?_`Yw?Ni?3i_yytwI8QVp;M1)*6j5bmhFp2b;m7xuP<_2Z;dYWsq*D{
zh<bK*%{+(r!~U*{%SE_F%TlMLP(Fs8FOiLwz&2i4`jWFf#Rk<e|7k@JSSx<&PPQm^
zk8teHn;?V+<3luCs3ZH^g9DgVT#86g>BA+px?*hMp?deDx>7rxN3fRi`E)|poHIEx
zf^Whm@%_V{qBti}ju`@}lC#*Jsnqr5msii?T!`4k>dv)BR+6Do=R&Y1(eA3e27ua*
zDI8bK&CNCP>16{8qBRU$jIk6AIXl}C_@oEPg&%$3K^m<m`wVc|oX18wRvJ!u<m6|9
z&FlD!s=cW2jgWNNZ!z(3c9l-*#S#43Lq3k({7%$0G?l~LPw-bM!EVJAwXJxSB5eYH
zCfbC2he<dP+#@jyT9*7G5htD)U+MFcl+u==yA=BoI?&13ta@NKx;W3FgT6caKi8>i
zn@{wRo;jQi6KAqwsnkgR6U->Vt0wkLy6Dbs^kRgp@HY&(cYUz@)iL=5oK*8M&u`-E
z<a)&vb47yA^IDQ&o=)dec!`nt<>%6KM&pVKqO|RaA{j^Gbhs5a&8!Wn;9~fL-sYY$
zvOA4CHca+n1nCbK1``(~rZI}B?hpC+QeA?v&GE_17?Yhht+T|>0u!&8UH@;PhPQZ}
z6tWf2-7ztUn<4Pnu?W7K_hV*R+sWbkC40~Rn6?$g-rk(;sOoLvQBSj87p)5<A>I7L
z1obQ}xq5P@>YOh^hoB$-A3@1{oZ=NBGJALP6;lK*s=M2jSJeb-Tv~V0WgHc0yU}dL
zj-{Di=7|pjSpFbFc&|P6i)PEOK5nAZ%RL$lsep_tB(V~8dUA}AuCB^z$kp{b!07$t
zzSm}>o`hmHizWZdh@)LXsS)gZT@VfQ@t*{R$<RT|(hD_ninIL;s}nExXePXVKw%Y=
zoE=KH_iW2>^n3L4b*i<f$P|gy>$5;Vk+cXL<$QsC(#Tf(Uz0~CpJAD?Iilb}#!}Vb
zq<FOJLzV8Z!+@%NN9PV{+tWFl(OZjUT2r$Q<2oelnR&&I0o>+b5OXtgC<lw<yJ4ji
zlk3ouzl4({j^n^2&R)_WkLzxy+81jentTyc2v~Xy+*Y14-DR25eS)Wd===RWnM6m6
z;>kO{c~*d_=v#s2<kx`|E3U?wN#?uHZP#-Y>QqFdcu)^H^~f(6m8I=V?p;W@N|MHl
z3aY2^<qVy^Iy3?^il$+@(opCPg-fSeGq<hwMfAgjCp8i0B{5jr`8F2Kdg}>|5wYSe
zc`1$glZ_NN;mYp&CI0e4)1(Y_&ALF*&7xUug_e46DI&c^(=I)k6APP4wWNGeOTpE{
z5<0!cw=>fd(`UAo&e%+!OcGBi3u#Tw@BdRL#jReNv#_)zl~uKxmqZ5&Yk~E^!MHAa
zXB6sTz)t9{-9_kuNyR%5p(gvu`;vj`3?mJh?CB4GiqAZ24G50LI|aU=P6!+@JySv1
z0Ch-3{xg3R_=!(&I=tuYpUyv#oI?yJ8cG`Fn4mCeJF%`oOT_dGxw_p%UYl@j;jG2&
zaQJOU8}prC6Cdhj$q<sVHX>(PfZ&SYd0=GP8-Ua_taan|PKRByAu1l?3hn~Bc=E{|
zDV$a9X4ZMju~DFsOu=YIroQXbvJ%({A0~kQLg0DI9uHMX+gx-DWH0Bewfgq>ERH=^
zgt`^uq?$U&DWZ!rBE~vdb;5l{{7jx9>ZmHl^;HD5Mfvj^WXX|+iE{-DihUYfb5gTQ
zUws9Sz0nA|pnzy*p*=i8Ga+TD^TpwKy46lqf7pB%tGK+)e0~{8Yg-i1+Sa{F4;XaM
zPW6MpPNuc8AXhtm>D}k1%0Yn`vry5%VJQ|_ciZ<^_;qHglX7#fG)$Py0gy8MdY(?F
z5v4b{KG9sHt8qmzfzz9^XIFRbo~^+IO3;e%ps+15LI7(2DvEyo`K=lw%!pT&F5y0Y
zQFbjaA8XTh9__&011B^6*=EN-X?&N`XnFQ`&adIcz!NsoeXH?J@5k!<TItZ$)#<1s
z?SBfieA9QFy|+VgrqvaVkauf3$+NR)wzI^=uzBns2P#rSIX(4DL2avUJhlW)aBSG~
z;di9IUEcZ9Td&y3WAaikGTPV3DeDZy$)IJxlW!q+f#tMWsV-<762G>E`Y@9sfKVPz
z1TQI<B@TqxbzDjT&L7=v5?F4Pj&~xgy)7987Q&0mB~o6C2(XJ9x|+6prlIRrMuKBr
zLK|N35HRx><q!gTR=^x2?Yu(a7`<Z~pVoZ5E2KNGYykMHB4{}w92PDw9pZY$$40M%
zc7Kfc#qKk1Z`v<N1q?WDD+fnX!VO9Q`0d*ZI=Z^fc2{LosO!LbS&N{2DX!CfkTezR
zyhfrr;RcOp*o8Dyl$9Q6vp^#of#Kq=G|6eroBK$sfHl#lS;F)i(Cd;^(SWUlfpXcc
zCc);|O`Y{O`jm{{4ouV+;o7Oijq_px8M@>;W1Z2FaOdZC`Ld3$t8w#>eFlujYh!!5
zJOCelI-4?Nx&Gi9CZ{=eb9uc=F4oJ!-aR##m}s1w&$(lz(si>d_4XYo4dD*Vuft=I
zd6%(TQw@M0o#51S)PfKji4I|BD@GL|v1sd4JKqkatt4H|(;A*>tr1_yJB&4(FP-OM
zM_JI0MpIQ!ncC0I%Tu7Ky7H2i0Q*KRPOH@n5p$PmR{P#QQteUlgvrjI>x-<{ba@q9
zm-wTJ`eX~>XS%li-d3?Qh)o13EA2Bs5>YkrB7WjVEwv9VA4bntcWU&Ejg8sv0*1XA
zW0iYnjGD4u`hUwmLE^i`Ek)FBt;8L6F3Ir@yh>Nh@z7G1b3j9pPy#K%i3G)sb8PK7
zvX*aJS9zEG;8H?N1gf4kx!TOLi3)@X6i?phcc&QMV}@=4W9>XI(S#lpa2+5WdMPz>
z+}pK{E42E1HX>7d4iU%auiHk2^E<IR<OcaIdXYVp?B3rTuva|D;5mcl*FXpr@BZze
z|J_*Iy<G7hmP_xN(+M?t^GsaMxNf+kSRGE4d~8sIncPp4zPDD~lDNt9iD?RJo&&Vm
zPVHF=U<17=j)Gr9X>1m**TYFnu_AzP!h$=T*GhZQ-#VcspI{IbA^_$d<7<2kS|u`X
z$<ayp=Btha+Jn&IExu8)H8vQ=UPU@n<GlAa9)W^5;+J;CjS3<j49?L@A7q?xML<~F
z76+8DUl(2pwx<A%7q^OoHa45s0)Zs{`|V@W1ulJ%=NA&PcoW+5+w(HNdV~}C_}2Yh
z<{YB-Ac^NzTBcLlNeHmdJB+iM|Fz6{giXxQ){FXZ^{1{E2Zz+Zr;R3_Ze_$9lVjxZ
zu$<PDr3dJ*o16dsz?f??MN4w@^20P<`m#RFs=pj#uV(KK_?TTXFuA#)7c8(B+W^+X
zrGXl<eXs9G{TH&=s}!uD<;`STx#srMd((as?m9Cax%~|#YP3kqdr~^8sEuSxW@qt`
z9gJg_YGsFcURx(YuhI4e^NhXi(r3G2Mj6QBa)oC+uFhuaq%B3V=(amkc!x<)J8?<8
zTyMa`Z9xYo6`BMEp}pw#-n1f^_xrQZ%nFJFUuS+6jtHMS&r9qyD#3I$Kmm=Ds#@`&
z^Pj)3bp8tS6Yn(>7OS^b(%=OrD_{Kxf~QKvP&izLHG{7mgX4?ra{_MPzCG#-!j=O9
zv9qgdUUApZkPBFDy1MEW(b(*%4`Naq*m09%aibW*r%bEmzmuW1xlOj;1pLV2zS8C8
z_?6SwVwe*Jqm&kdTE{2xF1p9t_x&_pP{Zk_nPk7gAwOKZpn8DQl#W-ADFPaCxeoG6
zuyC12`^PTp15TIT4ST~|4=arOL<~}|b>zXmFzo5h>D_@BE%cyr*1GL#EKDFD9^#_w
zn~(i<PNl*QL5KA@mkk24aIp7Vl00w7Z?B$_wd_q4+nj1P?u!DfTOG5Cgv(S!)X+fk
zzHJAuwU?ccdsNv0_6&RoqxM_zyW`)yIOC4<il-{ZBda!J5HUag7h*K9GHrmYv=el*
zo#H+t@nM9>OK-^8S%O=Q_d#Sw_>c$mA+__dmgI&++(0SxVVDL8p=$gS50s4u5d9Wb
zRw)7T`JNo^c}>aBAoivb0>=Vk92`smSzypz$l3PU!qqmCxzPd?Jd`e9@Jju5W%)u+
z`tf#mBDss!@T1&F?um*SjBB44x}8yNUG5EuAC>ulhJ3Osl~(&|{vD^$_eJw9*AXxB
zG`h;3YXh)ua`@-a!R_PieZJ5Vzyh8F=I33Tv8blYe{UV^)6zh8Gff+S1;0*7WSf)=
zA|`*G{oMO=5pFPWhxlXf1IwieXpH|O^g$0|d8@gcB|B$lmOVtC>M>rCWh_sn2^;|o
zBe#ZQ-#!n^Bqqd+{<Is=@F1>VD+cCqlp2h4lR)-)rPV<RDeu+(XPf8LZzwVRY<+h;
z*r@><OGH$3UpLM+Wh>BQ+f4zrq4hI$_YFX>=o%*|b>6a43Hkea2^Cwq0cT5g9wfYp
zFh{hW3A$DS6j70NpFa=fBucHnhwn(qHMSurRB-S<1HinrLECjAFi#MuZ>QR8%f<#u
zsPeR~#qc8G2eIFq8*W+O{gGve6of0>*M@Rp8uo;Tex6tD_>t^aju2J=*~YatQ)2lI
z`hF+(+-)CMJlDfpPsq!#=Ddo7slP~!6m?M5_H4j+zg}=#t_%4r<Q_MCsBW$;e^9!}
z()I{*?9fSVSo%-2VEGV1r&LAT-#4!cxD@YbG$oLMiHUwTnDpE`f4NzjxefAK4QxdY
z@@Qbp0y7;;POh)9t!>*vLX?+aHJ7_~I-aSp-Pj9x*($<$X<JEMr|<mbpio>~z%0IX
zh<7Z~I)#!Xf9zT;<R$S&2g(y~{w#z4eDsg2ZYd<6Rp2m#Ff_4aX(j8`M_@7{XuJBs
zVof_>7oacqXghVVWNR-q<GVjjY92fQRB7}wZU37NH17aoq49`g+$W^5v=j~Qt3yvW
z;Z&|~tf53aNd)C<OY%Cs^V3WECS!Cp8rEKPDRw&bSE9lOtrX`~uzL1s$ouqnYs_We
zK_q>ZHl58WX4?t)K;C+MJ5_zw7hHSVAJM?Ze;|+zFymGxch?{Nmgwr*Z2LhC0tRe4
zdLHi^AVi|;Yy%C+-676J*W_$x9`wWUaLFYJT2?`<$lpQGK}XK|y{b>DQhg~0Iv5C;
zGa`ysN1x6b&?4XW<2+txtkm+@5lgZIWP5^(Yo6{knwU4+3sh^jV<KoOU8xJhSr4_d
z6z=gj;euYi1(U6WexE>Tz&rGn;%w+>czDn%ZZtxZH#)w{w8?v!VE~#x!EeHXtG_?u
zROd@O6!e^LVU~;K@!Dm3f}ehALvbUoVSu4vZ5OZ4r0s~v0F`_JwEKI<hSt|3mHysx
zggpXzeTxH>Ws>?>=q5w1dh;=pq<4V)g#Y_z3G*d`j8!Af_fFou!8(X1iapdTm^p?M
z%<6kUY|j7Yl<<zkO_7)vK4lKS$ej%l*7$gVW?kpkmy;R_kkhB4(;(gFfs=BU+^IX0
zyhD+g!F<PY<l$z~+K0mq9RSF?Hhe%c?Vso2I9!5yOrM^@=;iI}pEV8VeijjWwffd)
z3LSKLd$6@`G2Cyq9k4U`{LRmyc7Ozp1P)WFfRi$)VFs9NThMH4bHNTUnAQy5SZ6hW
z-KiH)`8~SvW)k4S==Sdk5bmn-&e@f9_<KMl_7>Dc8$lj&4hoYen`TXmKYpj%9zEQr
zK3W7k!IAu0>jA0BcVC4tPRdW>4Ep%4J6_!~TYP)U=E<}Q5Ze6!AY?e|JbX4b_%QqH
z&$LDXgN9qu)M-^LQ`L{RdP_zX484<ZGtYMU&z35~CW$X*QU!(n@(=4(G8J&MKG@=>
zzb?Jyy2o|^DX}8(9(FMe5Q674TQeTzaR!+b>4dzSXl$0h=t*6#*X1o?AEvy@v?I9e
zM*v;x4B0}^GDH5_Fc`GjmLp4&rDMvLPZ2Q$Y?kVhBL^z0xK=w)edqw8xHq=4uZz2%
zUa**`S{vCPxRzz)os*+cJJ<_w>81!9Qb;qruMapmY>zb?-W=N%OZHjC4WH+E$&K)&
z%X>d&47Xnh!Y@A~MxmX6T?`Umiq#z+D2#qMpB_8wMLrlmDrXTBfa9uy8x}HEGXx9~
zXx?X`@RH~j5SR;$z*s}?Pxe_O5sbM!Q?|?q(U3!|R%^jrU21Ei@2+eg*qvU~o<yg=
z$q>+|Tl1Iaw=7zwyP0HO(k!~fT0!!;?)Oz^8=U~c83FIr3o(gwe{KnE$+c@Wu;fO3
z0R3X84%i;3Bus}Gw;K3Q`0C|fqs7T6ep5DGi+rs?L}20_gTB@_j{hR(cY3Adp-U%F
z;?hY?giIqr5L3nOiywge6px0mzOk`g$Lrg!fB^Om=?e6ZCcAiTy`pX@l1-wv+(~ls
zHcr~flxhAjv0-xfuA9%NBR_m&uiA^n&Qv+WCBM3G8JxHSj;SWs8p4qPKTG#;xLt>e
zZr`7%Q<LlnwQcWKP^n8?z*t`8jbBcHZ+sL7kJ+~1#Cw9m6jQWmir<gPKZ@T(AE%}V
zysv%+xPbN(Kqq)-OBQ!|dwvyRnxD`ICgDIho>Q7^l5YiKZp%FFzK{VU1RP;Q$uK}P
z6>cmcB&~kY2?L92>miFn2%FQ^j%j~I4F$M@Vcx%c4S13frLr<|aQk_%{e;%-Y&#*c
zH$o;UJWyl>2<&DiY_O-z5Yb^s;m|SAypDnu>6MX0v!Hrt^6tXFr>#{}=#&;%s}XRv
zV;V^Bx_<e~?)hJ3KOpl=5zzsO1UC%*&3dSKFT|DZ;@TAncmIIEuK0Th9}6w~x~?15
zrVaE0SKs`(z9Z$nB4l7aMnzWUbGFjNJohMx`C?CE&5LjQ@h($-lK%B@DZCWD!KVqW
zw@18U^zFfAuf5mZo<d0;x!v}mw!<@THyt(4%d)rOs%h^i+3AHJKs1?vo($zNK0O1$
zlo1v07l$g$7>ZKUQLHt|{YfPB+8fJpVIpxByQm(my4{y<S@yL?x$tTp&E#=NtBE`q
zYcUL!h0(Rs(PLW&>of(TLEwX?_ColL&GAV@G&y-d^Lr5{vgVV2sne???$OuyzAQxD
zV!2-;!r0bR=a+boyoXuE<q1dJ6Oi4K`L3Y{G><*7)XzE*GY^}dPvSfz7V-&j-|;iv
zwg1&~JRK1bh}W*V!gbX|M2-JYinR2t>NH~|epomG(jr8bDn+*3XT&}>l`|bYIJp5w
zQDnCVNE+J_oYh=AeD#U>Wq_jK<rE21d**I{ec$Bs|JRoNnUa^gs=s;tHy8$g3tjlB
zYyk$gQJc{7lZAP*v8}^Grb#``*^Kw(JZ+Ovma?{fGjx?%-L<(|ni&^#cfBileAU(L
z7P-aOx4Yvqo?J#y6w?+DZr|1<WE*b<B~LiIZ-GEwqNzxgyEpK{C`(pwwV(fI^8iBx
z-}9Zdf1-~#;ne5$l?z5Z==lRhcKkv-^Vyr&fJl8gjf9X);El~<y}h(WV>73B*(?X)
zZ(Eb%Ou<Y#N7B2?Sv^6v3;NZ%1gvy%H0!u1V_WRLkvAH3xkl|IPW#51t3_#+#`lmi
z=1hcYif^<|U-p#GuTC+s%$k*Ng(!UWD)BM^>vIgZ<C1~V^n(vh^vT&*Ff2er!SSU8
z{sa$|ik_~p7qmqYrOeIcp{iHb!>T!8pDV+~K6_DI8Z~WxFtab;`5OEY=U1bmMuAD!
zNHf7nHFEFum4u?AOBFyvC;~Xipf1K9QT2FvY82}Vowi8uE%n~`n%A;a;>=io)}Oh@
zDg4ReUPqgSH;dkgkGZ~sadSVE8pVPJfCFI!;4}#vd(iHX?Z#_p06q*gQVfWINBl+m
zw6m#RN}`JXzAr9y#npA`#9Jf3vskbLu7sK}f4{tii!NMMQo^3yzn?hTWhLz2HNt6`
z19^7#k|LNXwhld<{PFG}BD>X4G%i4h21ZM4=l#K^a@dQoyCwOwLofdpuxJjUj^iuW
z^DYY<;x_Y$x|NRchw;msvIYkYJp_#GH}QbDgFz{XSjNOMZ?*DELHLl>wIL-`C!d;V
zp%aYrdpGd$5jE?RF1l@}hgZ3@8_}2OzDV`nkmXG1Mrbt5pF2X_Q-*iUDzT1o>rS1(
zlfgzw=ZsoW?TgN<b^~4oYoF?PI5}$|Nq}Too@T9fYowgkcx5)v1SlE)vz62-UEk}Y
z)I%@-L$wZjZzrR<>GpWz`L9gC?sW92{cVGw>k!6EiG9eT5Kj<p^{?R+6Dy$FCLXCK
zOx**o-g_E<?x?nrhs(~=G3;DPuMqvd=HPhsG5KNO6v_Scty;$W;6@7*1j!+)<A+kT
z^gOQsNc9WrXP8Ril_-3ZT~sgFiH{5A=P=Csg0V;X45$tm0pL&%f0XeMdd}$_WXDfW
zI2^DBmi4}He!DFr$aPQUWB#k5D&R7&Wlpg7+|i=0$|EeHB0Y+UNfn3IExw9m3-<>(
zF|=BPu_o@)CvWikg(8JZ-W$~6!(mQ98Gz<9L_MskvOORH>L+Dnz4P|a5A`ZFU%$p{
z+t=Lce-<*;WJY!h%yRlBEw4WpL>Y(!pFX;I6==#{i|5INvf9r~z@pYl!>)-?x;Mr5
zIh|(l#G!y78O9ljf`Mod)J;g$9YW|h8{|3EExsKxN{H${4A14X9Ufrtpm^OX1k4fd
z#9_QPFZgpR1R?x9Tv~!XHT-D|b3Fc9&~g)OzMr*sw9NbSFBn8XjFxXn5lq@wie7CS
z;<g>N<oxckpXF1Ujwdcnphha~YGrw*P^_)H^daqot!G)%=F>Pg{177WM4vif)Az05
zN)j`r`P>1PV%^dwqY4=Hi+}f5-w};c{u{|`E6kEpGh`&s98$p|>4QwisG<HirzOjP
z1ik#x688wVym_jl`|7-3XL8rr9a2V0QyZ8Qs#PyhOf3`<{6VY@Z-h0sg`m@L0+C)>
z+nIvZmPaN)8Lh#DWNjg8kQYX_ElE-8QA2mwmwX<~*6fm684R!d#L;(0QKOysJwQaB
zTjFI2daITA1C9_GK)Ahl#Ly%n_i$ThHkh#Eq`(zA+5OQ7P&ng~gaT3LyG`NJ**9hi
zPZ-0R8@fA3e6S5ZT$OmfsS`L0=E5Q{DjBPu6sjCiHQTm1LM_=ENpMDQh8ne$f&ZLj
z<+p#-eeeg#<%{CvtBL3uKLkj`RkCc8ZPcW$qsiOeE-r>h<X9)md1B(s*P4Gz*?^(|
z<S8QX3im2R)Nqx~;c&H=eem3)_vm(#R+r9JZ4fBB0ro~FR(3Q`92JBWTDy(UIoHKT
zz^b;GL);b^ShY8sie))xf348}Y3EZS4Gio_2{oL@pUQ=`Y}L<&&xSdUAZlGmW0;rb
z`1y>KF_)u()>W`+4F_d-oiAkP-d_Dg@s)<0zvc?Ym=nWSt3b7$M2!GHNn*T6oDsN#
zISzB`>!d%Mz9I&^Xp_`S2Y?PL4JIE&J&d9(5C}s-%Q94V_esL?xoIdSK%PZ@%pcZ7
zh|S=S_}bjXIG%NmTy>!sHv1{k>5L`WewxIYwHjoIkf>!KoyIuI)4yqP4}}jSb3k%~
zutMM@@3ydM*!J=B^jPDuJ`2E<S8+J?^ns6wyIB{*bu1N2JS^8pfHgXlg1B^XoGXkk
z?9BSEk?V!$4*`!9Q8`78^K6~IrY-bDYXyDxwTwp5{;m!W{Ax<B9KGiO;GQiBWn?c;
z*joQx_~h=)10W$JOe}JyuHjuYH{E#hzK_Hmiq2EtoYEvix{u@<*ZnBZS9s8C(Po>{
zvq~i&0E;iMlUkk<B8S(2v>68{CpEkYaJlD4kSa)H3%E3bQ@7RhYNltzyB``qKYP>k
zR>@q$Gf%P~-CmpH;rM{lc%<`y*NiHwIl9Ry-pbh^!5Jn1riQqlk7%mjn^Edg?$&jd
zy!jw<q|ap{#R<66t@M0OCGaScdj7QZ-3jf|PCOY|<er3t1(JdC=Bddj*KPv(aJ>Tk
zbRlTyLkq?Z>;WZ5PRov!X4=Nb?k*e|CJDDJ)x>x1l+7Wph?n36cNHFk%^UDyePE7e
zQg_Fsz#h>7(-VV9W})VlsA+!|n0p;q0_n}5dIxC?TUD#uFE*qthogNy_t9XpWDxv=
zBjpb)_CC1Z9FUc@oXo8zp56XVERoqeQ!x>ehE@Z4mF!xLi0Sjn=V-S1!RU9n?qo#;
zj>4ZD-P>em9sE_qo!-7A3z{{y?+)+&7JNS<^&P--DM^fh38ZeNNF0x{G>Kkc0JZB#
zFU+P%y>M{(9LoXdVNe{V;JQ!WV2p3n&#mqlm=to`#ali<-kb(G6{IWjR9xP&2i*EI
zvwC03>g^Znj&+NhkqmLpfV8XvEa*<-#8(gl>h|stuH7ILplQ*{w-NN=>t}@fjJAWF
zyY@FbA^KiTrXXyI=-%b=Q4G-pJ|9B_1Oym^gj{E&jhUuwW`}S!3unz(*~NHKwu!bw
zc#W2#w2Kh(nsgLH=!Rc4!3RXo25vlj(7!*hL|BPd{~oZ%#jFBb&?_itV1W_Ef!hik
zA11kJwWge@pZ&n~_vq#~r$zO~!?Vgz^&w6eE>(9tFU7t1<}0|I-1T;g*CG}xw_E4~
zpn1f&ipt&1oy~O<z0lq`buZ$ByQ=gx!$Dq*wyz0!{{eeeu>dQmgUMqh4T(SUM9~eu
zumuXJtyvEPzcv=teyZc#H$Io_PxThVxM>4hzXC+blW+%qO@g$U*(r=0znz77T<rv7
zZ?y8TD~uwTC;>k{eY1I&h&fz=x`s8Je>0KFj!ng!ZrWZF2)27ke$jJBF1+|z+_C6F
zCrp!<e*oga#ikS_b89NV-Iyj!6&DFx0bBRGK?C^|s_LguSM4CXya_mYG4|&Bi#~1X
zfGge`KKw0Cm)rnM&3cHpF&|Vd`24-}dt}=}4#7X%K_ZNrG6flKil%kO7PpH@ZlC)e
zOttQ%%;3_#^!QSi`;8$xd=Dr<wwkeJ<MF{(zxvVvzf)h`SwBtnzjw8oQMmw8LqUog
zNVf)Q+aRM;$b!Q)rDL6IUz929VHDUKwVHwe*`X4zU+;Sb@3H_pnIl6giaP`FgN&hY
zd@(_SXXJyz(l}rX{pn5U^_ykc8f0bzAou&Yc=r9xX+Y|tJsi?4Npp@~R>Ou@MW|EK
zIUb;ui|S}5ZKuBF(w*{3{nq9|Z8i+XO(pC|nXv(z^U;Sf4_Ji#yf&%sVB7@5fj&p*
z)%T33twde(CIt*9kJqJcC}Low4<rr~38H=n3^N{|J-X@-$1{HbkbDB#IIupBtRi<Z
zhN-kWZ4-^F(4@a+mB8j6`0Tu?fJXfMNdp;O=>$|F_clmFxW|Ghu}A#p-40Z;eO#dr
zo_Bg?GsUtVmlAT+&C$DTu6ayDl)zKQi8KTnx(4ib*q`0`m36aEOh!#uRChAfiT>^9
zv8%3#@DrA+20Uyh+@bE)-CQng=bJ_pit%YNk};QquO1{A6XF_6?NuYcy1tcS3Z1r=
zP5-4~2<oa-#@YvhS597|U>6)&HELgTiVV5rky~zu-RvbL&Sa=tVj|#EC&tIiYHQv6
zn^c)!Q}=I=txmY+nmo4@3DYa`i;gyTc6J`G_Pq=vJ29<=y~=RAr2>3Je-h&WvG5DM
z-8<F?<P{H^N;RohcRqD4QPe}VFOzfDxut)+V0^v6(&_Xpkkn}w3`Q#;p^WaQSJrCm
z!A-q^Fdm?QRuE~+#UUPq5cW#})h(*K*C8*#_Q`sKfkSoGp-OizaxT*fYesfsV3_*C
zxP!#2j~fhmiBf0@cF;(>4^LY+7U=%zw~sz1xs#UwhwEQk3d}D&)zK|QUBmgm_`Uty
z?+;Q_-tvj!;)JcLV(;il>jMR4Qx)w<TLTaw4xl?vn_cH(k5;zg{mSj))<2jccYm$Q
zdQpZLu)gD1BUjM8{|MXNo=}MS1r`px12>N|z&oIEqB8Ytxm$}NSs+>R>;Lu~gw?e&
z-74<U%U?#oe1)F5mD>eqF!2+P;PUu1=hV@zv;4126SFFe;_dnNSbbg;x3u;$g6=fH
zexz8!Ju$}YgMAB<NdI&DPvccEqrE~ZC~#mf_ANvTN^3D5(@B$gEuyI4n&|iw;*igr
zOc5dOW>4(M;$py3<dce8SGv{|thB7=a^OAg%W_FURx#Sxs?`Q$q1xvd_I2q}3!I%S
zwYijpFvI4>8YPb!Oplxgmi8)wPw_KO@xNcmNL@-?aArBlYs5v3b1?@(wngG;K`3fW
z9N*bVGi3eVfdi?*W}~hk;fBI#Lu#3v+#dRjTk-t*_KTk?#3hT9xhG08VG4mFj!txi
zf(5DYh#r0`tkgPDuDA|vlMb*d>GV`^4=eCAHf-liC>&q2`k2_P@HIAPrCHs0@F&Gl
z`2LCBVK`X5%!#Lp6E^*UwlX}}=&N4cf<jzGPhTety#w7j$5|aW@YnYRmq8U;+K|Pv
z+wnNjg&KLK&%}D1HD_RVeRXJD-VR2#q<q%~W_(XoSB1yGBrs2_{VDvMD}J1Y?F0Kq
z{20OVAJvcOZyI@?>&1T3DjIGc?$Dijc2;yGveEL>!{1!2N(QVqw`k)ezX(p99OtTS
zQd?@IxCv8XEX{c8N>Og5?9KB*8e6EE<&%h*{$CjZc6cY<`TGkf4cw7oOBKV#8t`Di
zo!^y53upcSn{NjUZoCXmm7Y5>VG$S*e;F3FhA)i%)LW!2u=KSzcZd-VZB$#ggj$!y
zWN;r>OqGv~^fi?_MX#6jns$XC@=!}BmRWMq*5?HnqQt4A%+Fe`mM}TcA{!R;ss>U>
zwJck!Kx$I7lhx8oHISa4usm8|4zS9OokO5TOPLAwcUd^}Q}fU5<HWg=qPCf(guSnS
zop!?W*LR`F>wMx5SxgMH4o`CeYuwNUakW*lTn~z-h9qdIqW}0!c&C0VNMO$m)l~QN
z+~wM$nhK%cUj<KYLI*rBZrvY@w5Q$)t!kT1!FHQFPywREcxHrPT<lAS`L{O_FIVN6
zBt*AWNwIkCQuYe21j{?Aa;H8n`iHy)jFA)90PJWODU!7&YL18#rtG&yRPYwEn_!c8
zP}5jV!Ks$w9mR$Y7O8YFkt6J9Q<(X<$bElX-uhPTqkC@@i|qc8HaIC;K*Sua>}u~n
zekBUsoo7V=&y+S;c-qc?2D1g;<sB1N-~XmsXb90QC}8?)Is*1=hwh=9IOu0Hlg}Z9
zrL1Citmvsd_%9Dn3I1vPIXXBj-q?1etI}N{4C7|I$d?fO^}G|c?Kk)}_s7-XmifD~
z*pKlitO6DmKM#-hFZeCF=pvUE1B4E`&aGhq2~ovqf8Oi=?_c|)x-OLXl@Ef@9=y|G
z17jBh(`{XDwcL>6v<c}t;<1N~CUR;_KTeaM<M~MOageZt+=Cs5Q@_om+r^udW-^Ws
zBaGCs;govkJePD3@e<XnYsw=zQQ4ob1fl9fCl?ZucNHy;kvRQTTEm%IomwQ8;ep|s
zp`TYxoEf4(konpB7i&^21>$r@Pn3_-k+UYrM3Jh@ExN6;+BjAo5ZYa6p_|i^Fcvz?
zQvx35HpIvSPoKMK^F%1J9Na|v=1C<(J+*=hdOXjKsUVFu+j$SbKy{%v{9z-Jrh#+^
z`b@K?@+I?C36iKYw*kglreA<)Cb2gmFawJ(9Ej`70^uWK${t_q&=|VcLTBXkMj^-z
z&s!Tq>rO?8fL74y%EFwYt@9i*Sm95fpXdtF6@AOjk!W-0U&oZiRon5?876Y8X`;0#
zg=TUZI_g07JE6p0$Jg6IvR*OB(}VPy{DZQ(y846Xf57x(TomR0R5i{&UV3L~<7__A
zFJL4%)-@NnfvgN2!W1^MDgeV7m||-NrA|REA^9%;RqUc1qBohp=%$md<D7@Z&zh$~
z6GsjJte{hA)J$8wVMNuHxEan_>91QOL#0k<jD`n%#gmWYP~-^ry9-wl<CHD(s`d5w
zrw*Z0Tx3sP8j8|#jA!^-!f}1lyYAfjF}%nYh_ZZ@Qif+<WK%dEnpYaRQ2c5fW!B3M
z<rZ`eYv#Woap|Nyn)+5ed&U$Iw|KZ~vBR&W`A+a3j9CFlVgEGq{rl8Ea~+((luy$!
zeBQOIw>yp!f!=PvuQ%+9@O@u0<n=Th30@9$Eh*}h({N(iBjcS%$qLF)PK(73-Hd9n
z?Vfhy%bEnH2Nu=}2p`hi$y<AR)WTA0ffy%{x0_0%AdE?IyHKuC18kC-sAi}to_*)8
z{HV*OhT)vEIwl0B(q<&r<pynKpzzDrYZPs!Czl<#W8ti$5iAJgr*!pg>6ze`_SfNW
zAqNsw?~VIFZdRE$yFM8jo)JC|!c@7CLg~GxuEqH$2IVIPTi<ZUi|rV@IfWM5$(`$$
z;8iA5_5pm~0dzEHM&w*X2b0RAp8{k8^T~<T<(uZ%!Cs+Y{c@oRr66+pskXd@weCpY
z&$8>t*_#>O1~o#M)g@8c;nyZ9y_KrppWzB$mHAA7rE;<G1GMN+zF?c!WU1#xon-Sm
ztV;35Z*?4DV#2!k()jr8@HPv7(bvswbyCcenk0{ILWA}&Q*E<;TzW9s+h{lrB!>cZ
zmd|}MZok-lK|YY~?6o3Kws^Y5zJ)4wzQ)dTa1^xZ;Jv8%QCTG+ErBbSVC<B416ra1
z5TrrV3o}1VJ($0F_(0?Wh?$8_+UE8$H4aImo*(owUT`b2-s*dU(i9$|oj@?`l9&l7
zY8-ZN*E8`Q2l_7dWBt}6LB*IEoa=S`ZGBSG3IBI{l5wxp%EMHZJI#tw7}#LA0v1#|
zbRqAls^zs(wFkz-ZMJk9#`Ih@X4^NeK`2MHoZI82?K^sX`+ct8E6Z-v>Uy>t*9^}}
zzK%zgz$Bk+>fu${Y6N{)f+BDVnpLu1ES3a3S(oUQ2@u`SXRKKP_WYby3z56Z{0!@e
z#sPD5bP(NSnzGKt@RIv=7HAB!zGDrG!cPD8Zeq#u;b`An?mjz`V}}zmX;qpQ{09q|
zg_kwiaa{#S9Tp;QyjNg@)^<gVM+SDMmZY*LOdvl~u2VwLCV>4T+95STzY0iat`NQ=
zt321@MWWD>2Ese;p6{9-R3sb+15R&cUrP)|53CH{x^P=#_BmJ*0|3E?KA+1^=a9%G
zCU`8wI(3up-R;{z3z@K%b^N(<35@YepK!l|Ir3vAd;}iE0a3z~sg-lz?4@f3;j1r}
zW~<fSOuJ@aX{HJ{4B{j><kM=84}bJeHsaQeSd{-B+3Bnv)p65z*Hs3OwX6_6f8Cgb
zsabA2Yqg$o{Ei{aU^qpfIr8`3yR)}nc5GeOC8sN{4cJ8g?3vGgs8a+#zQ)?vD2Sra
z${XRN_(Y$k)4fa(?AgO>Ss&P%8o^AL`1G&z?n1SGGDuFqww=F3uJ&8VGeu4}NE7s$
zA58d9B_qN+Wh%{OCwO8MRlMxd<23DSy;og(SXBia$RPPQ!>`-78~ck|5w-q`swc%c
z`ZjQ|T<IJC_59C4_^>DZatj^ue*F4gSz9(fQU|2Ao6MJ{rLwKYcI*X(qdcek`aeO#
zbl13#_jQ#Al)jx_+a~X5*5Wy6?N8s1Ho7q70~VQHrpI-9-OiTN@x@dJefzr4uTre)
zm#-UFo9>EHP`qEB%pWZdX#~%e37eNrAO?|9lSQShwpgYGw5ES;C)X2ydp!8S&5^B{
z`5w*=XY=rbSl^g^&#WWRsD~Rq8iD^Q$#J<{WGiUxdUkOKJmWOV&KTrS{UC74+gg@^
z>{@A{d9ihr;La`jRE0P&pSTCAP3n^wcAi@7IE9S|%`_;M53N4IIrSW*=$F`XD-f+(
z$!5#YUxPU}Pb6<h{cnRus|tlUs4K$miDYQB7`E}dO-}il3vjwK`mw&H8IN`OY2d*T
zUbuts?+T&S23QD#l7U>#G?slUQ=Y5`4+L8UkCb<{L*Xr*tPh1UU{M~ITg3I!jKvAK
z1$2Irb1+-Qqeg229~1Xx?B=z@Rvkx8wETWm$vs8N$?4T{nD+VaPKTX7SI+%)F}HWO
z3Bls)uHE}~9t=@?;lAB>E{R~_j<1d`RjG?FgK-<#aAqn0wn4q0$kH`Q%*A+t(i!$*
z$;%DMY_VcW&nw5+vp^BQ_Z@W>Wt_Vj^4SmO5pg=|#pWVzWN<iYQ1pzjr7}>g4$){i
zscKVS&lHzixL3xDB9nxUs5=x5aZLicd)~-i61GwD>||H9QL#q+ouyY=2%EUO#&a#b
zuU_2frX7A;S%#{NAJ2%{C{z15-=LEa=Fou*4<c0Ea2yyOy4?1tJfozxp+wxVTG&;H
zzOM3j?l3c&;P1I%Z887XLSO^g#BA~;ni%qb+I#Q6rqAww9BYfMp!B}2&{PE5GNeos
z*{jwnhLsvBd#EHtWJE&PglH*nw;*T|2qTaxBSn^gfXs*#FwC+I8yO+2umcH6J{R_W
zzdzp}zTZFK`*_F?B#b1l>s;rY>x}1lzATBZe@`s-`Tx6J$<BPcZ{NQtRAZzudXwMo
zyS(jR;WVO}pXYwhr9;f=x%XQt38lI-nWCP%p|&6OiImjn#qmXO*1u{Pbak+19gg-Y
znuY5n$SL=%)=cF%HEpJ9*u{Kqo*w<&Qg`B}y`SAk-kCf+Eax+(C%0fG{-J~Nfi2V|
zL#r$N#NMcSi#fNnKHxH+&uTaL>|08aS7!8`C=xk?oy5yzMR-}{MD8`I7}7_3`mD&_
za+bGT?q|q8)z#okkk)>&VekS<F*j;>B#I2y-hBH33->RWgW8e%N5k@!qO{QbHLkJs
zQs3pm_LJQ+5l-YLo7(9D%0$#ieAT{f3sk6M&kprn@(%0X8>g8s%_NY>a(1uHVf7)5
z>~GRaudzdJ;BaOhUtvx@$;U*0?<l$MAf2dTT4rAo+qE)HAw@1$7A7d$8}nY<eW7<0
z@UgrvlJ_`kZxRn7tQ)iKFvXMqj4E_?y10Yz{nLw2)X2A66pu>fqXLH>_IHChdE>P)
z-zC?gt;oGK-+%e0dC1r0S>~+NYojGM7@-8RhJuAUJLU@RoddiE9eQOiFr8*Zi=5tq
zPd?ubHILNWc}wq&F^>0*t9QTWQ1RkL?eFNKnS}gXbuylhHZV2wgHWkTBjpfWuQE}^
zI8u+@C>#t;R=SpK4mI|w^p|+uMJn`r;Ju-Wwp3I0uMbZ<Q9GSSNh@_05$gzp$RE%6
zmAvsl%1ve!(`XxwZe%>1aB((Fl%1qdZA%SdtMJzx9@fe_$Pq8NIHz~RLPA){?H2UN
z^#^dNoBFK)`$4;Yh+U(da!eGeBXYXVhK)b&yF;0|mk!3gHIK<Db;T)ozU;e9YxTqg
z`VE(5UJesHEPrfz1BuX4Z<n+8De2ifhj8nmihAwX<zWHBEIW2cP{;mA{^b4)DyV8b
zx?o5p7JlyCn+b;U@43gw^HB)D%a*6A5b>rCI>hFc>J9&PCut2~8C=?pEO7QQ7>d>(
ze1W^TQy!~PyEMp8Hh-kZG<3<lK7+f#Bx$W8*b<t9_h@uYd*P)JkB+p7!YtK`6_4*`
zE2bUwy5^{4BYzCGHrb~-+fv9EUFsjPi_A7-UHD2zWukwj`g#F>{c@P<NI*a5D=Ddq
z--DIk5AJw!IRQ6C;O7r#Hs5^Ik|4)<lAv_=qSPb*YeO^s=kYXc(<;{&CP5dCgYKMc
zStM8Jqj{;UcT4_DcK9D`NQ0CTH)N;>H2Y^aOjhrrHSVAfm5-2Dt885Ey9~En)-Ptj
zRuaYrvWcy-HCz7iMiY{)(reXgh~%^O(v_}HpV}uTSdnHEhEHB64SF9VMQUl77Qjj{
zFUoSSSNLH&COhrN#059%P)04c*Vw4YlHpuATa!Xc9NR<FZ%onNX8<dZK{v+4H~+_k
z+wlCrc_~)eW;5VSV<jL9Dz<xD1dgp9(5v}g_}EH`1=b4vQno+D<D{a|BS6-G%}qGw
zHOcZWY*)?<I$H?%e%^wyoF$f9R%uqtQrCh?R1O(mPcrH0I%#XypE@|3fTSX5z}k;i
z>ME(h&oWkCny`Z=ee0PKwj-HS!M8ew39!Im3*YNGeV55mw?tv~irHV(V+f7I7HD6;
zir^_<VXw;{6nO3<a!Pl(gI)IcsgP*-MxW@L)>Pof*0WiET2@hjrQW-G$Qy9aK4SX8
zu|qBcj1lc(i%HBu_*x@>@}ZJ^v`fhTkI+c1;6LxFp>KHzC3eo~8S;r8yIbVuw5|e?
zL@?W@s-9v$e8P*s-+SyU6hh?h+hpJ&Zwcs%=jfeo$l7w{^8gMiNmP9KUmi$AUXB@V
z=}T4e(>2?&*uqg&8>&j8&k)^1E!%eK&c)hL18xA`{!e|bG|M|BPs#k>>cDz@-a{t-
zQK6N$<#-ROtDm(-EtqQU=M#PpA+d`c?QO>#d!Nil*F5qcYwU|UNDW}?gX9oXoCfc^
zhyPCM(WwN^;E_KN>}p-~OCw<bA+=qtP(!8#)ft!3JGex`ZT>aNWT+WO__y(|Rtz^q
zkL9yoS!rPM`>ZQ)?%ff&C+Y^j<*QjKWi*w47V85<mbOJK`L9V^r6`$~{Ox7Unh2Z9
z?z{7%@A9t<1J{h8s2y%f=`1P;)A26(;p8mCpyYIFegHWmuTn=TRi!gUbvD(3r>&eJ
z+IQA2&<&V6_=H2ElqevM&%th}>r47r4va>%kQbZ9F-tIZU&V9t{4>R?hM312=Ut4e
z`*MwHhHUGfDcYNd-pjQDV(K29qkjXAqzrwf6ofEDLzO=ng-uqr%uy*Eeu_Tztcu=i
z!m3h>%||_d-dBH+8WLN4<0i)SKdYn|G}4UrY<4!Ivv|mr+<dQ&n03IuIKH_;Y#V@j
ze057?8bV_`&8i2?!JKKAYmW5%IpoIRIYixJKGbha5v0y7K6$7l3vAuyy{%hIUg|%y
z(J&5r_v6X4CO{mqjNuem%J35F#kAR%f!j(%bnGqr(*(=}<VnutCNbyAUsY1C)C}D_
z#-&G77&R^UsHz^`m)Y8!SoI|#e1^S0=A5r0!YyrFF2ee6{|9jC7{B+Y4)XH$boO|N
zhkcG&#?fOZRr-$Hw|j=q=#}NzCQe|Q2|o$DF!C{KpA_v>Hgzf<{Wqqi_L^F!RhJFd
zp7;CTCl*G|-O`SJ#cuy?OtB8|1~?v-S^~@*_uBq33TN#VEE^Y@wS=@zqf$epZU!$)
zZ~2;fcA!dx8!msVMKzRazP3%A)91#MM}CHM`Bq11kb{E^2DP2+0pnK*qxZFLMoyM-
z$eS;9>E=&l?MFfe^isEKf|lkKx7(2jvx>f0fNt~o=hN6#eopf8^1~k;$)^+-7tc*M
z$DT327;cT$qakLV;aMGhD13Bo*nVeH&}M!qjTU+&J?QJEVbn`)Nb#~##dGgSi-ntb
zD0g{<zvc3*GhxB;OI<(C?NI?SXnDNa!zr0js&ni~a&)M(Od?)m0*N%_Hx4%G6snWv
zt;k}w<RT~(z9)MyV$g`<eRd7j>uT=x4*b=fI~O}1e`{qBd1sx{@j8uNV_Y_nk)a6|
zK>LK>@|zVoh7$3yR7aY}fc_ezdM)GfId7cB(uS2G)+*lQGqu6%bhFSfQjkxSg*DP|
zseicYGDU@5VO}W-&$Uf6Hj43rX3pY{(TrPeRXh*LwQAnxWtzBVNK1VT1y^Ky$gVR@
zd+xe2#Ux5xrEZFZ?J3HZt0T_~wF2SNV^F#QCl}rqF_1Z#+kVo1w7hpaN1Lp3G;xd^
z=WyhH1)8HGrMES3os^qmdmNp`{>_`UxTu&`_$OQ*DPL123?XTo7F=nCV4IT2r-(Vl
zTD{?yyMBOZsU?o#1K-M8XM`I5s{m}0%a;~HWf1UTQUD_tda8-Q6<Xv|K=9|+y;<?g
z$*i~i!xU|ygK~C69E?jPTPf4TxKq-%3v9|qTEf&skMsPqbUx9`4cO6V*O{V&I#Dee
ztZMUtlTt9+hNmAgzA(X(s-<jKT_XLx!GLi_sFcycwWZ&z)cuNkyHseT88K>Eypsj|
zmm%w2-7GBkIF^e<DA^<{+J>&ZSuj;LtL5sK>(KzI+)J|@TMaUY6K+Nbl>@;GIG_{{
zt5Q80fa|OCkf(;<$OD(}aHVDE$bHu$dnx~uMI$q5tE}Nhn2tLLB=RiMBBy(N1A@sD
z$Ewuw^K#tb=FwrKc@<OWKwO^C0=-;{x~1oP#7mmBYrbV{kZ)se_9$}i3B{a)ZHnAl
zDi&I;*(Y1*c@*4sRN%h&MDjX^5+Jmf^bBv2^JU252VHC4$(ge8tn%2xgf+X`xy|k{
zi}1TuY94TQMO4WA@9bko1gY#ea*q#MFGFN$Qo9y0<MWZ!eHi?`fB8W}l`zFvt~;Ez
zba8fe*4!R(t*ofPjh5Zo`cuQkjig<Vad!8(L4sPF@3jt|Qb$$?vKO<7I4dQ4!d?&R
zrP1t1Zgh$^E4i~^LaHF)j<5+ebAZ~<$&-a;S>Mj?A(=mplyJzJ*scOilHKLccOKW1
z`pQwa;yb^gs1WE{{x;RC7NV%JUYlw<U2z`?1yLUXNyf{tHms1!Vp|dw`^=%)N$*4v
zWmUm;jqRea;0NDrGDEk|!!1XnZ#{eXa~*0vyd%PJ;pgzq4WM5CU0Kf|Z_h-180Xc4
zqhMv%NWc-~@r1I{u6-356bG17m}gq%B_ET3s$JI23p-B`s$fagp4A4+F)*(3K{Rf!
zl6B9w8rCBWs(5LN=7lhbnD!jh*bNp-*Z!zf<ySvYlali$w>I)(+zf6!F19~<JlA69
zL5liLI7vGrz%V}3pG~gtt~&Z^E}XI&<xst5ZEgkvD3h!Dg&zGSd6SYt)VO-APL>X3
z<JSvW4|3)PVg5XQ*1P09B|D!@Gi^AR+;_XqO>#9}SF($0F!O-^I)I0#$s0y~0rXJi
zy&gh}0z_rC3z>)87qR#xVfZ7d*^ThS5XsS467Sm_MPZ*-RA27ll=p%Utfk24j4e*Y
zj9*Gm-dvMY-ML1J>k4e-+a8s2bJ%sq38bo5;p|Y)r3W!cXBrw4PZ~_HNR8Ysr<^r4
z@Hm&N6n$QFRN1c1#gpnlK<>I{R0MEF%i$#du?yV(pPXbiVS_tdo&>ct6RRQY8Oz&|
zaQ_fk7)PK^W?wd_C9#qYRM1oTtk+1~W*>`m8rG+}^B2k`Njnk#MJ?F4{eNGQ2L7ph
zbdm_TvkrO38s$H|-yPukvTphr>LuDFH!OZ6kV_If3wjTl1>M+>$WMLDH}5P>5Hl&p
zzlI7j{cDZTy`M17CRT*_bxanKO=gp2HOQ{-9>_5!i5$FJR#E!c)K>Z2V}x2uNo96`
zg~u;XR+uI(uFhe~gOt`dN@Fi8?`X5E<|a7XTj&19^iN4L*sIHxN}TP^P1axwz1OGS
z#{kJD#8k|`t5QAE(~y~G(@{Psw8)Iy-b1;0BBE<`j!50~dEa(WZ(O{h+p*7~GYz(w
z!<mt#y(E-_W|XcyJ4O`k8cEG#@*4|N%qUgpPYp)zUf;5z1Dg`T4QT|?pK54+Flj=F
zIGb)e@^9u|ysy;Fw6QXHO}b*EuIMcB;)GZYj-rr~+6w97#yq7C|Ixy-0IkAV)N>eG
za)Oa;m(hdMg&Xsh^0ZI|HlOF&SC=1f3cbR4qkkLFSrLDxj8g@R7*e3aNnDeoT=VXP
zMwFM{Siq14#2?-$i7k|yig@O2rQx~km9@11Hb?D!E^1%5JL(raU}uO%qg6dPmWk}Y
z922cfcU6SgoEQ0YH2?QZl%DO$7^sLdS-;l(@Zv;_*8uTgggk#t{mA`{lp-6pWSpXH
z!#LhEp!Z|#q5w710KXNPW&_Q$sUveOg=2-s<ho*54;cEz0Dl?9yG9)0sm3-ZQ7@e*
zhYW^!rsMkT7?W=ND)(sbiU4ANijSL9u|7n0fVdWhRF2TgQaiVWx-1%3R<%;j#B0B$
zU8d#w*8C?wpF(iz-V3*lHErizlN3&wRz-kR%6J2=E+xgG456g}+g#dMV7<1-2uQ0+
zm$g27rDhNi95ZtQ?$WV>F_t6uJ=m_1Bn-}~8#XPPX*co1K<g!&XD#jF<9WS^0DYT=
zo3~NoKlE+hZzyuuwbX^2rE6vBbq2{&NePx|;$R|lj1UtqNMU|!yjz>+_NGg-i+~LE
zqE|>r+%xkp%I04efvhY$3DfZ7)g=^Bj_{30eF`>45I>7ItaVz-O&B2VX2X*)n|-~;
zbSY=IvrpY4gZo!A0}N9^oOw=!iHZ8^3s%92-+^CW1rt5Ml0wD;YUW4%%DP!(^~x77
z@=i%*jl2jP^oa0-zO4xqZMg)LsmUZ3hA~Y=t3;!*0Q2l@T~!DlLR^$sC)>*Oz&wsW
zQ3;{=Gu0;Y4T~GA#D455_4%g?Dk43NO0AV4m6klEYmyl+d&0^a{IF2^^eI2f&%C2I
zg1MG}^$R`x2_J<NdD+%3qQQBIUd_BVoP32{tvye2!USZ*yL{(?OetUjU>u;xoIMIf
zDBctx4m_6##B?n!|BCW}hP8f<s*OT-Q<Rk<&?&vy6w#V&4T#Ryf3%qS7_9GSzwUXe
zR}Qst1<kF~X_@)yn3O>yZes@&bJCL#U7^GKORgNzWv=Bq)*(ePW4O%Vk4MhrygbRu
zF(g*PXFW$OCGm#(RddN2RHg~K_ev2qN8l<%{e;vZT!D_8ekRj(@ll_8Z0leYQCE~e
z#0Vy@(h|7_PHo&NK9+2SrB_qw8_sv>vSAGO9g;6W5;W$P%_g)a7I3`NW*%{O<7Eo@
z4eBB*B4#4%jDN_kq%jPA&_qYzj96xA9Y!|A;<HTNCdI}pGs)*bQ9BlN-z0rRvS6B!
zrFVYQh+ye*dtsw&)H2bjdrlBl0cdsgG~b8o!H(1;i*-6>gjK&v!0A}U8|proG2@gD
zx%8MGUd$58Y}tjAA)ie}@**&8Jjsyl@u{uJ4TsgPcH(w0YtsX6xUBlQHR*bPHg&Co
zsxE_=uxNDOe~seIv%>MuUK&;23IW=7fRUK&H0j!7p7aWT9n8Z+i0{m~SV=ysJY)ZJ
z>;5v8`cg#LkPHKBzF)56WM;|Ups{%L9jFvU#W-{0n51S~ZoKjm$6NHMfZtI*3lWK#
zwkI2OA^sVJFW(hAIHbjMOCxWP&cc1(e)0zhz|+k(o0BBlR3G76lT&p%Txmpf>Y7VK
z$M&8D+YbkL=kCL>FAtdt?mv8PGA0>z!*<Jf?Y$ltl`Mb!s^FsbdWaL#Kx7qj0Ww9U
zw6f**tf>@lu4IMN@3sFFKhk(}^rM)QE}KKQ?@nP3+9hf`HoR-`!RPO!k&+N<^?}x5
zJDmmIEUx}*t~gA=^D&O?hqT<^K<O=if7MP}hSe;GI>;fWHhb+I({M{0E=|lRBEKUN
zB~+-mg${4y_cC6&TSH5^rNVfMN0if4^gABBKRfJt$LX?bqD8uGyFp7ZQiys<G23Kt
zC3^}3jq{Q$S%W*tS4zm2E1(^F{FtwIDkW+z&Of^mpaa5u_x*kpr;4>PMh<iwv9`NQ
zm9;OB?CBOT*KTkFqgxNw*cfO(x!u8XON^RdRQa?v)a)))2}ANs54GgB5Af`W9#(!M
zt|j{DRUv%UiedS!U}FxGY+vAx3zpW678RJvgJ9yL_rV0b=!!T$KR+5!^}XlEe5myA
z=ugOg)$Sp|9s4zTG29%~t+uS<5a_J<Edv%gB6$?oXi3FQ?vow+CW;fY2iObBkyZk^
z1AnM<kNao_RV9~%>t1%yd5JekW|$bLPHZ))&i0Chc}hK9S%>a}B;J*LTRR;u>m?Z}
z$Udh;|H)`zEc;iBrM`Bkc!F-PBqoyL@{PN6c%(X-f33+xuvgSGk%W9&mcj8}Z@_je
zIxuO2M>F<!km^~BmK#iTG`j@SaPV+T=1uX#TXl`s>3uv&8P{?T#=1!vZ1(4iiuF$<
zx<`6+wCdW6Rv4sKm%uW**=59J_C`JNyZK*03z|5y@Y#{#(Bzk#V2EgmuRePeMB2k%
zri{36b5=41xDmD>R5BpaCO};~rrn6UKXa10?`eTV`s+g)!f9I7=$a(WEs%w#dQ|td
zJkTw(^>IsE9UGWf4}fP_9WfX%7`9<GGPC+jW4_yYlS_UlDaJTab$|;_1K02kSJ}4X
zwW4b=71coVuh)t_GntMr@(ZP^i%Q`A9t4{Xv6JmsPw&@XJiY`lnUYC*$6hS2YqVds
z(!^jOLlP393d*U`OB|wx%a=WjYIp033KEX3>7c{h=ZYR{9-g2!<h~BY;~OD3k6k&;
zL4sw5ScXpXucSMa@rQ1<u~L&__+I%$9ztcl+%`@9rvoB#fOAJ4SSryQI<BA5Y_TlW
zea~h|#OvAfu*`~l_ZMC<YesP>PfcV6SR#a^{Gf_^P#0&59anc3{#UArv+a!n-K}Tj
z`>nUtBu#^=6F6L7H#cx^)WI7_tmpiD?Q<#ekkYB0BQ@-`>RPOtzoivaI$<LT6`VLY
zla?W0O0qrvqpHgy(sGN5*>;l{?UaAZIPQz7_|FYS<rPM&q;E`;HMiKV2D`)gSLk_o
z+bkuKX)vMR>&0Ji5G`a@_=R=Y0Z^niIiqCDNO|H1Xr20On0O+|a=o4$d?E3dcS~L4
zWOY~!r#D}+ZfPg2Nv>Xi>5iu6m8!H5xPf9B4L8QfD+lvjhR`c?)jFcb5Wr1QZE+JQ
zXhAa)H|GtJ^bqNhQ*^{pXk~-va^cOk+!UXKEXjEhUA&jK=OzF24?(IeJ=d_|JG7*e
zywTwvIHrXM&Xf)lizNDx9fpakKc(uAAz?ppiCXZ0vF6**Q5n7ix3uMtV{O>POOAB@
zVNGhDS#d<lh@-8evp}-ZVK3f#<>Xj!g|nq&8#e1@D`;gal#+_$q~Zxns}hr3ul<>A
zeoPSZrSYjt_gxXE!-S-bW0M(uSn*BV+~qA7OiX|xh#Czi5}UqdSIleH6y&UJPA_0>
zdx$PjlMD3Qj;rLr3ohax+IR<LFhQ)BeVWyBPiv)-XA$R{f#GQozxI_$<iH^dC~CeT
zR|~d|dnbVd)T8c<XXRSAuIZi%3%uR6-AN<*>p*DsOd};yLhR_k9yAULCDEg!2eQXd
zjy0+9>0G9;5+a%+nu@F>zEGnKlpZr`-oIL)IMJv+u{B9Tx%nt({z-nfe^XUN7tJP3
zZV^>x{oU2?$Czn|r-ZFZ;(-)(bsp{GL`R+|qXEjLR0tRFy~NqkTR_8l-g7$NuY}tn
zt)**X{3<w~u=e(7K0n#ZIJaa*wlll;oMO(+%1Ic5^L^xxkK|mv!5DTZL#kC~D94=3
zof0!3lHDom<e2EDRtbn1<|#!@`V%`f=qf4kyrc_1ydS~A+}jFMVdwbX!0yhLi01Z+
zqc4c+iAI`Cv3H^0lO(RJ2!p)uX{s>beZgKZHbw0#J2;Ga+@a3)(02BG6{60A>$y%v
zhOUH1F8_+)gBA?DE~^PvD6<7wUfOVTwq4urPKsG&!igiR%WH|SdtFO~E)o|A=0IG7
z+18xOiX36mwOD_wN?<VapC`1ZC>6Xb!N+;F)TBRC3M6D=I`D_LD=Kte!fFUSa^R!L
z!=tN2q7$(vN17RCr#w-CQ1ONh+7oCej<2~l2>i<q14^k^Y*f`^^vparaK8x7G$%vY
z!5K?t9w$NO{FskAP-YtDdWm@bQ({b^x|98BvyryVFDk!x;(H689Rp`(yCm$YWKG!5
z<SDD|JlU6*45)?}yEK@^QV)heJAxjhT~)thr=idQg=EvbuKQJ;`reo%*dXSl68RGl
z(WGv{BoU!j`B#1W!+Bp?N)VjLVL$~B>2DTCn$&l4B<WhVZp2>i1tRXdq@dO_1C7(m
z_78c!XUQz;S{&9kbjswjH(krQDVeBSU+**>ib`^&jTa>>?2%;^ej^@ed^s!;4@J%A
zn8E~dl5?|D`?_Q+ONy3%#yI(RNpF`R@VgpuYF>{<LuF*|a4a~wnZ1jv60M!Za^Lp<
zMEbn`2GKO*U|Emn^7ejoj9JA3SezkgMlsD<!vkuOu|f!v))nnmeGT-m^1}OWr_}lo
zq+zkUkRB7Ybd;CgGflI)l5c<9Fc#4Er3+Z}-o-6u8m@J@-$QspgF2ax6VGdmh1w5O
zVxXG2gI3D$Mqcu^*TGLqXPMc6RheX#rlpnbsu}5NO-jvcm^SU7Sl=|u?HIg!&YKs(
z^%OJ$_mn`6R3SgzQtYu>CCifHF5&hF+$qrvz@N3^M`GMMQgv;@SivB%f25@|2T#n>
zFKkcAx4<EmsDX&aWx0W=ou0Wxy1Gn=1uPa}nlqr+)_)o@zH1Jiz|u9$v{ynEJkr*#
zOr?tXmT9sA<I^nAIewis_a*@*&Q`ugZ1?Jzo}WrxdzM9Rt|K@v_xzL-?t0g*ZlLAN
z&f{ZH@j8|vS=3caut<~bq+N!d$W#)qr5S=0!O(%XUxK<dwnERXLO^ZnX1SKz2+%})
z+`LRYKan~D(1^ycOHZq$;8Y4IvDr%=)L;%I2jsbOgl(dvvPsvP6od>zt@ral!*&xB
ziU0v*Z~8xa?NhSYpgW-{@o8i3Kgm;iGe_K5c>C161%9iRsJFAlq-`j~n6o2YDpo5f
z9@P95rh&_7M#W3YHeqRVWA4r6LOG(&&fBA`a#J!{P905=RUjA3XK{@5U*O3u@1i_2
zXNsCkAt!Spg6>9I)G0Jsh&WB=J21)C#W#9o+0G}>{uy7?%MnyW$1EO4`(xY2O0C(U
zmpYo3NfQd{iDO9V78D-3^H<;CVGp{=)Hu`&x3Y#hc$=4X@D6_vtgVMg+y=1KPA@zD
zI5o#LZ5pDKOaba1y^vkVKk%v0E4y#2HU`mB-RT<~BYvG*Kbf(XiG}kIu<+Ws0*Z%_
zbcsJGtQysu{tLHs8Bo7$M<FdY{0b8+Xmf81{cJWQ?2PJ3-Fkjr)IJ}5ki|nRJ?X+2
z$C<Eu?$HEsULA`w2%q)enW<~T*lewc$HiIY5?Sp1DxFj4l5cH1xDGtQoi-kzjbN@X
zlbN~;$OC#ZaURui18X0)T%(qsDFXaLFtx+YxM$!B=47_~9C&-nT+2-u>-K`Xvx^5c
zItc34kW4xirqXUf75qexw4zo$UCZ1k9NtEo1e?nY{4m%clZl2dtn^IJ6E){aML9!V
zgB55$X|F9W6rLv}=PGB(Kj1V}hjpNaV+47Y6f;5dU<+ZXalrn_GT&S@ccU)vjBRgw
z|MpA&?}KV7D7@MH>k-WQGhR+tx>vTU#Fl8k>JZB7o<2QA?;{>m=2_78kD&@i_?r_T
z*{$SSiaIqo%=7b4IqDn_as?mgiUPtXTURT8&|>E=Z`Mpyza`#ksS(&MU&QjJXMb#3
z*P55UL%f;_XCyawdyxhE%p7s9C0Xm_0zPAq)&G@@4a-~kFv3a~!+6)g23v=TioleF
zk%(U^#0iAU_19?M3Dn`{ky;`J3yRnQi)fr(Wo?+M#YqC~N3MfH8LC3mChIA@OuiS(
z2F)0~;KSTe3R9FxiMu6TCYs#l6VFGid$8_BA=`tM+V6f{sDi$Q#ONS~a0G#Psm360
zooO<xqNzW>!0VYtPo-5=4Ktr98?JtIZ$EgTaS6*Hj>xG+Xl-TKHB1UZ{yH}BT8t;s
z^^!yU2I#vO!`qR8@FnYtdoI#m!Z3$jul1GVaYdZjeJ}D_56@omgh<lriW(^xiGZld
z$iU5Mf>)+Uo)7_-SMR)|wVH!h|1vOZyr$EN1lr7EXVNLwbJL-RU*Fgu%HJi$#o@iS
z%(*-Q5jQPYU_<Mgbw==N18tCL4uFg+NpcW2KwM7+D3l8mH*~FQ=SC?dV`@y%XEiOe
zlV3h`kh7$S#ikCD18-3O(A;?-r`jopNPFn)@$ROM&>%oGh3%a_ZAn=hRX7jsc<_pL
zSpJftl{jKd=)|CSFJTKr)RxWa$c7toGB^yE>_S)O0pHM7gSF_~@rf6GW?8&|(ugf9
zm^e5U6WBeiiUmjaH9?A`^Tc_RvYMFTdxRw(_9cm80SSPIjS;ig3Y_Q<ez=wK;wxo5
zq+uZn$rIfK5q7%#_Z$MYSXxt>b<axe0X1{39JT)w4(D;MK$CSZJ<kTJE%;8*JABu9
z?sX?Ld;-MtXTnrwqc{hO9;?#NRST`ae6}elLYRt#x;AXlI3+QMj++V5FzvNT3ssx=
zp+5!L-cCMcMb1q?%8io+uNX+>dQ1haee+wmxp8fdJaxf&4>A0aW9KX-OB`88WrpA^
zff@yWeJGH72AUIj;UQZA5VM0YXbhj2HJF<r>DsEi#wBh1h8o*~?g3P5?KBB~s~F$A
z$+18F8`}3mtl<H3K)C_7-%m_0wJiIOaL!RCu2aJ>1|eN0?u3UG41Y?`Nf9X&M2Wz9
zl-I7MF`qv;l2KP`YQ@UC+(M4ls+7+O>h7|GBmJZenQA*?K&8`enTc12eRjKR*|_ej
zFI-l?ykKuXnE`qa4m@E=o;`Ja5iEBYKw-A6aCag1HwyD_SW{(>!K>|>%z4X=6x6(P
z2O8V6e!`Mc5t8`cT&#LG2f%Eylz}^(l-XPaIKpbgPONaFjO(IeMy27Oc({kXv;um)
zPT4L@R5I{-5F(hG9s2y$qzDo-kfIWWwYl1^e#JQFPw?h{<^8nxkf@FxdvP<O;CS4C
z4kY%BXWCjS(Xh~zlvKH)oM20J{Zn+xi~T41%O3Q=a)~CSX&0MU&y}PWqfGn=lf8XI
z8G-@T8}V+WxK*;tL81+7{YT_U+a?_y)kHUSFNJFLmJ)c4kxS_9l66boJECF4!fM17
z>8S&`91-r2Fa}oLCpo-J(yL0xf@NnpSab_90|&?g9G9d|ml>4z+YM*%!WdEAQ@zvq
zSX*f9>%kX`;~o(N>8b5gtm-qQjdGX*^v)Fx@((lO5%gZ0GQt?^826fmlWK7SAw&(p
z`S;uT*wh<3W51eY_1~5Ta}^p+Ol=oq<3?Jm#Tt-g5B$eVKie8CxfU{9`6EL_9!XZs
z3n84`UcM@Q&6=8&qCV!8-duBls?#i^hdKq70o<|K{x*o4{`h3zX>c{~&AJ=WXnvGQ
zD^B`V$}v@^Fc$@))c_(-wkDJKY;{OBFggN!?f@%|V|(2D2dRuN=IT-SZ`fNMvQyij
z&gTKEcX^H0KUevv`Ap2Y`P!+};-rZ)W_{bnuDdIp>vooDIIf$)rBA0f3|_vG{Op)0
zal>{^yNTh_y;1Cp)l#7PW&vVNMQ}l<!3D8{J>#bU`h6rCQ_+u*$>yv}#3kJaQ)z3}
z%B<<-CSCLs)5?+sI=-F^X^nOBqBa|fZ7b&Md_SFb_dNLrEpwmAzX6FElccX@W??LC
z!b5!H&zi!bXH)Xr0X=v}$9DBwt+)xuN@d1K@Ay*i_CX>ne9IE}vxixFA3q0;tX4^Y
zA!fbXGP`-pOJ7@z-F^#-5aalh#E(D^;_p9(AjQI6%w8J(TCF&WluDxX)f%6wlqHFO
zMDo$=OT_f%5hAhU_01SRWLfDY$y0FXl}Nr}hk8RzA_H?0eKp0!iijTK<#_BqhFcod
z{9?~CVYWOHyJD`}Vko-PaT;rrMjc!E_$TZB6w*e=)s(rF7j;SPtxl-*1-f<Zfi}xJ
zcch~dsg~e9f2X6AirFimcTdNac_=If6@xo=d`nBD8vz@8QG#b2&&G;{+(3~;Wi|j#
z+*JI|tgOe{JX6a(8|;-yY?*KkWDX<oNYbFJ=ej<mY2Pb<C91pDF!v=ME&v#&+D*&O
z*ENz#ywjACM1H2IvR?P)#TMpz3bIt(!$m@7L)RV-&7ZFJpo1~%ye~UphJ@r$s{7*^
zH=^3S@l<v(9{yFGW6r~V)qI5GRSgBEMr@7Pz3z-x=_<IZhyO?7#KUdBQWV#dT@Q_(
zC1y4I#h5|dLFv#o5q3f$$Hp+**TTg+X1##kJAGp+2aguFN?7;R%3MM5=bh~2?v{pA
zQ$WQ@!dB~FzMtn>8oT^5voE<3j}>w$Hl?F~1V47@JhH+(--4B}@P^{=p<mgj{bp1|
z#hiy5rfZcwpErg?ixBzsn<rS|lmZ^##g&k}#yr<jBMz^liW>9Q%nWmK5rm)YCkAp`
zDI5YZeriLv-$T^!u$}=jxq%l48X)j}RU6>C*!52DP@b}r+m@<Po@rY2JAQ3jzQS=;
z5w4;?-(BbgJxG)|Nb830%o!Cckx!f%dr`879zpF@gIVD#mNe7|YIQ|z3|%IDAz3wX
zBu_X>@0#ugvtSrro&3xhREY8Yi6~fj=M*Ar42)xaGB6M6X$!s((ApHO1(XXoB}<?6
zr)73ao1-=R-<3#T4PEJ4&m!u9qhSjr>?Y@Hbr>6r5dwxK<tXl`tS5f}(zMf#-1U07
z!3XGy=RWU?z*0BkI|^NRv2LDOII)DZQ7=I+al`~t3+tv0610<gkOS{91+5DuBl%Gq
zQ(e<Hh^pxJ<o%Khk{9tN+1DE|h<L1^9^w@p+(z8&B_AcGX~~kHwD{9s87UXRe$^!e
zgTSQ*Y#xbKV`!7OJ``LY;uk-)X9#PWu1k`vGr&tSW$W{_XrFMN+VVD1ffDLO16$d9
zj2~edas7~qPggRY3lz_ugoY2fIp{Q5%z}>Mpsv^vnXDEYfN8GUEI#>aE=P%e4bbWr
zO=dQa9F*XDYtfsl-MGUn1%B8_lp3vZl`7Vs$ai8yjal~W#g=vKAtY$r;<v0n)F$3-
z^J#X=ab@y`LQpasEYWa^u>$Al1CYk!1L%exx9$=yY@EhghqZ3O#JLhx&?z#8m_Gt}
zifqs8U)~9BZyT|30d-U&R=P&S(TLj39;J5w{7454E!BZE?49815Ioz6>oSKiE^ASY
zdVbMG{^me-Vj%KSNiOOINmkcBtTPO~u0KV^iLVTl%flqSc{{y*eu37;60bZ-<%rM0
z1Fvhz(NGAUb@OZP;l9M=gZ+t7g$$uav>^@K!U2GfC*K<y4O#dB;9k1{&;mFy_X`10
zIogSkhNZCq57E1%Nuk6>w9T|ho-)ta8P^VYeVapG?R=r9Z;`Xzf|}CopAd{d!&zAl
zp)0iLGM_E^0!NwNDp2XZ5kDpN=30uumTh}6CiyukDXJ~`w!cVaHKrSRoNCZf*UUxD
zyrys(F2s(B+v*^%v;LH6AwMLVwBh>Dhl&Rk|Ft|I;p&1WdIFr_|5eAA_PwoFC(jhc
zNx0=oEAZNPXZjnr%Rv3dPwmR09ijNl^SbE2dd@-`#AU#me&6N^EkXZIVr?JoJIeC*
zJ>{<1+lJpy7XJvft`KEXI8EBIP6zXNswZq;yA%fQ5BK75<NvsF#&L_b6L08yf$t9m
z(og}pO~rbeGMw0c1{Nb>!W)GiAmS&_-0T-OQ0!iqy{cn(RjJK-v%)X1gZ=6_joP5Z
z(n^uh&4?korjKq@ZH!CKd>^(v0<NlmTUlI^WVvg@x~zO{a}kvhKlH;`fthkHYW_#)
zOQZQ`Wp?~`%*?fjGHVytuEKL|E<c@jZ#0ybhKvgYpqHW|vYLD>&Sg>r(?U|@c}QRe
z{^M)I+3_wpDLd`8h@}m9ktAOe;LFi<9AZ>mmKPPwXKeEaPkh>FHn3W<`gc;>g#?jT
zqa)zQi6GS35HE@_O#N9oF>=X+nMFHzJ?F}mA6{MZd5NXt66}dhyY1v4>dH%t3H_<`
zwN^<)T@lv0ZfF|WlN<%mu|4mB!FpiMt<Is6imCXG>pvbisoaAAO`0+Kd{e-WGf(j3
zcUBs3pO-`rL*Yl0b&kUj3cj~dfBqSVF}dHDWVu-cTI5!^gHn}FxZySF7MAO~BBD=V
zT=7mxKCmvRcHQc=-6oX@JFH#UfMI_9T!(|Vrm^t2!*Y)myGk>5BnDHL#r#^d%A|_D
znVEvWg``v~wUM@)Mged-*EiiM?0yL6DQfiJ(X>39cm;+TXNQ|38OHY#&>g$&r*jPn
zpL>e}OHCC_fk9=0tZ!?CA?Z>EEuXUdN&X~i`z9#{XHgeN+cgV!<hRed7E&{}bGbn}
z@ET3F_y9jb@aWi?dbIY;4U7^-jF-oZH|tE)ac~jx-a=@*-)imNY5Q#f<_@*&KuF&S
z_wg46<KO1jZ_I-{$!KSbm?l2Od@SAq(tr6aoGvR3uMr#9LFyvShPFc7DrO7ty-~rS
zAZa{t+E8tvtJ5U{_^4OL*AC5fp-@>}9btPnG$j7W{l4D@=T8+DZV72k$>jM{WG5#d
zhw1a66m}saz-;6rYrCtR1HmKRyW=G^+84JMp3uI#n%a7+V+XjBiNyXX;Rxuut!;bl
zO$=IDP-sSv@B}D013l<5qfIfZduGDsV&TY;0Y{Sz3aO-46z7J9LZjM5h!+(ot35lc
zxo{P`5Gp|kKc`fEgfqqxfj_k2dhTg+dErD*cukG$jUrhw^|&#5#pGXZyU-Nt2i6i`
z;TFTk>k0jITR{vI79M0(A&KLbhJ!-37ad5H)XKGzt?G4Q>g)-E%fq~+%ffA>bq@-*
z!$9!{BQX+D#pjLpHs=0nR?&nzF&^BX$%|^6tv_nUhIy~<*~&Z%G4oxW;**)*3NBT=
zFlC1Y)FlSm)Gp0)O9?I=5eoDU#ppP14=TX*8a;*<S4IS;URvt-jY3vO`bp*`O)eIX
zBUi$$OW>A8U<2!-zd`TMDF$1oL?us#yVWgYZ6vKcYoai!e`>#UZbnW`{iJ$qOoi=b
z7u)`ldMxL{+YmlpgWPj=cAm9WrKLKii>RHx!Ohv)(EuHZ39$`=XK{Vua{z6U>iHDJ
z+fwO_32NT>`ULRVm4GWlWj2*ELG3Nvvt(NX$l?4b*2eLqD%vPlq)CR9yX~qc+Aso$
z1yRm-!Ln?LEqs;OR><lY-m6VhgJX&DtT&jj54*dt`G-x|{tjz?gkidw&E<)ITv8D0
z?M%usln&f++r8w-a}X^%&`V7I)GKsY<aBr6L%p?k5dOsX1uaR4+UQ5M=YzM?o!@lI
zi|QH4t6zME3c58xw{e3Zon+Pq0;SQM9@)VCI#Bob*qjFSfpDxqx5*Fyv(&7bD6|74
z@+x`jy7Y2SJJs}@*Dba1Rq{5uOmqilQDM#wMOO$r@Cp-|IB;VIkFBSaMxhd)<MZ|i
zYI2yKsKTxTElkhHK*z2Twxb+)BKM^U9zya;9Vr*BW4!wlZu9$!&6~(JhDkZ4nXF6(
zeTm(Xjl6S{tJc--IV(oG07XV#7I!%1)vvUHu@UvSSq!e&1{Cg`7%OitaOW;$#ZtC4
zHR^S20Aej{T#2YiUaKv$mnWLJIMafp0*&WipHY93FAJ?nXsMgO0X@$xZPJ(+GR#*J
zcNQM1;aTD%agLly0?#&?ctJy*Jk!6eXd#Bwl@5td4Tdl|8{XmLbT8qz%WK??&Ag(&
z)_*~@2ZIK!@x*+YZSC$2u1?c;F0Lk3*;RJ>hw;ZN<EMirMUrKZ_2k@q0WA#fxeV`k
zeJ=*K+crBmlr~-IdCHUkvWNI9CGAD54(q#?jB8h%)UQ-LtQfT>dORoucQIUw4P#h@
zgDN-uS|e`&fHUby$!fFT!X<CH?aQBmxpczX&=34`kQF;HP|-@zP#CA-`oKj+$8>zs
z3lK~siguz`X!L3%X-zseQ?TAxC`b4j;Ls3j61?D;MTR1i*njqBba=n{%xBtD%<=v6
zj7c3ga&r&r`M2y4bjKCorxzo@+kzT;szwx_9<ykOn%F<FiQ>0yp5N)SBE`z(DK)7Z
zM>{Qf%jH{yo->X-XDkMg(W7L&D;eUXzzgW*2-fbFLud|t#l#Xla#|y*%zD?IRv|oa
zSQU+6O^w5nci3yJ($u5iegt?YL6ik0ve(LiC%J=r*NnoS=cbg@W1QSp!x+DuXAru%
zXPxg7zx(TkQ@weyTiO$UJL!5-oVkV&Yg@bBM%ltz*RID?WJ<%|ZRrPPg9O;c_RzuJ
zSFedN-`atF-wwA2Q&yYzmL3Ql<YF{-`i_yj6Tm=*12siOT~0N(1vE^P<m_BM!vGvt
z+{k*@L(#4$m(-I3q8xTT(<=BRN~1!){}@?I+bmFPz>$r>lx#Sb<fOFsws}ApN|rP*
zZZjCmFHm}^ZY;P5=0oQGdNMd~<v^9oPg1fG%)-qx@lm8ejgVVm9q-mC`5vt8XiBz%
znouX3mN=o1=g*F~dt#mSz5VGgdxyT6ahNz$B(U{yNpV67`|uixeWP@Z*qOYnH#fhA
z=%}@*8z)zJjm*3&GV7_bKL+zd<ZfNgmVbsJu!_%C+ClvYRp+M6*Vt8N0A}=fFoBsa
zc%=YJRoRhq&2w+E3$2)sK-D032>p{I0N?lPKTTF6HpwzP)Z)p@cb*GEzJ>%M*r7K%
zdWuMAIgFLsi}Sw}IrP+<p-1*vY5DCBgLb|$PT={1+k62qJQzD4Gn1T(o>ZP2tAV}1
z`bplJ4f7-pXN8%li<$V?#rA>QLjr^Tj4z6%V<~};WD^)Q`ose{H{zSq`S!-E?!}_n
z-`YZu_mvR6SD1lk_l7J-?0Va88W}6ky992zZ|`9)N4#d5Wh++%4(}Q(mEIX%f|Xc=
zJn}`WhU}wo@4}bL!B|>KL5>lL7Jbn;LItABNKRIVcii*q*H)1kBjumf0C;R|Q)D%8
zDr?u|Yx1;oRApLpVQCs8ha*B)-m6O4YjQC{bmR16C9nUu3Xk=^ftVyCT)RRoa<X;#
z<%!-=fl=<?-&Grly$upun&0~*!zgx%S{7Ey_+0-OVk`Rmc8l8jp0KJ^xOw^)6~u7F
zYXT^Rao)pD4?jZc&iDKk;`<kZAD;L9&oik%j=V22AO6eV?{B(#_)O}~{r3-t-`-C#
z{qxgT=l*#F-%tGCTW?FhueBcj<@=)_-u8nKK4`+B1i;q^bNC>H_lodA6F!*3KZ@`{
z6Fz9d2Tk}8F@p5)gAhIl;k_&Ppb0<>AB6Bh2>%?6A2i{ECVbF@59PHFHOBW=@S)HO
z#PC4~AB6DFnehKBO?V|?dYC>sY|ei<hb5$x8QuQ=pH+Z(_sHR|-+xK}Z`0(<|MmJe
zzyI$aKm6kd@%)b}d{BxHHuGOy_~0r2$0$BH(htYSe|6!5fBfJdKlsP@68K;W|8J)7
zY0O-3cK`mR3?L&_{1s<B>J}bt;*CRt2PvrD1!HYJeQhZ0=L;|seSH(y1x-CY6Ft5E
l=pq5!?EmqC04&PaC*uG61^c+Ap~GE(U$OtO^oN_j{2wl%!#V%}

diff --git a/resources/ios/splash/Default-Landscape@~ipadpro.png b/resources/ios/splash/Default-Landscape@~ipadpro.png
index ab00ad82087e8c3b92e3bf90a16cabe011f7e936..add5c8016221327366459e3045b341fdab678b7c 100644
GIT binary patch
literal 44093
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
NJ#C<sb<*;|{{Tz=1i%0Q

literal 55504
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
Fe*sKX8T<eM

diff --git a/resources/ios/splash/Default-Landscape~ipad.png b/resources/ios/splash/Default-Landscape~ipad.png
index 995decfa1b2048e0ff5ec4c76bbd7a1a27cab4cb..6e5fab59780ad4f7f559f74ff060e9baec030610 100644
GIT binary patch
literal 15329
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
O(!FhTtNg};KmHf9U=;@d

literal 20256
zcmeIaX<U-q`#wtZU}gK;Hgh{Qm{ykaP);;_%MmSy+~$-?ni^^$sG!i!o$Z~aB|B%O
zQZaGBoKO*|%#56JKobO~)I<Rl5e0$s`1_qV=kxiW7w5%!xBVcGfIMrhd)@0^*L_|0
z^Zb3))qd~p-*$sQpuLU`|8)m}wgP`{0qxul9GaR`_5z2kp%)+*K%jSNO6x(}fY+Pg
z?)Dc!mE9V%z>CAd4(<>T2&D@GJ@^v@k^pZ#_z40bj6fjnO%TW`3j|V)&TG161AMUk
zmb3kTfg|v<c8P)o4!fcqeBdCE(t(ZNO`x2-Lm-f=isOGTc*Ze#viQ8)vHp5;T6ZHk
zgJUgqwYYfn&;2{M@3j8w?c2K($x22KPXua)UI`tzceNd#DtUQNJ9PcjW~&EZj3Q5b
z{ZGcLyGNZ5?}Cn6N01l{FL8lTIyvI&HT&ms1>ZGR4?iPZY?$S<5CU5~+|^4Wlic-U
z)x&^JJ+QBpL~C#Ka^V}$F%andrVXQju7Wmg9DY5&@eJCwf8+VzkIrwH;a_X~>l+(x
z@b7XszhQ=dm&3oyVZ#mn&&%PbHh&8UbQa3A2+L*AD*0@24+K|ayCB~5;L_W077{EM
zY;3bOd53`g#%8Gw=I#|HXf)>`@D3;$zj23$m!qi*VW`AT(CA3RR}Rsf;Edb!?lX>2
z;UC3nIuWU^iJTe=c+2~s!@y~@)|k4bsIbWOgzZs^R8LdW1HbYS%ny7|dpv%&20XkC
zRCqXO^^ZVDIB&Eh$0xV8HIddc!S~b)OrM1tsLSTcl>P%6yZRsCRBdlj9;JhkE+GVa
zk5z4*t#7%WNf_d=s4?)J9mRmbG^cka@7nwzfY@fmn75)TKpNLKgFvqi7hVSChCBov
zX8-zN#|^V8*!AWfyMrnkG`AY<6y?qDFF@7LgI*c&0%%%4rJ(n%NkCH|(C)(<&kr{5
z+&H`f0Ve{1PCVFn{{Q^ZdBw(dt{ezs*^QCByoxJtcY;9n{{gHk9jNEYo~$=jdU$!I
zpO)<gy?@~h0=-Ya_nH>#hVk-J{{4p~1eb3e8!|Uo(KuI0slMHjF@j{l)|N79d4lzB
zL1&w4U>+gtDS(&GZuE6`UG;Zt)kRuZ&Ruqsc`PS>#{Ca$Kg4n>!#9$iamKeAF*kU3
zw8a*^GEZm6j^>w^mNt*?jruaFtytB$vI7LtI0=A_N5A_lfUmwAt%udaSQ)G+n(a^k
z8dgc+H;tg?DjLU=)i*kFmsNj8C=~km`T6bMi=qZdWEkLq<d0-488#b5B}}Tr#~-P3
zLVpED`WO!ajr~#{mP7JchyvOl3dAP1NEoE)ull4;hIe58Mk7FXLy-bb{&;kjj`KDQ
zX{e*K(<LM{)WeI>Cp9oI2#Jg|FvPBP2tB|ekKyKccyjCOAO&Dcz*FBJ>umTb5TV2;
zKazny>sK}$%?!lEw=6s|{J||Fb!*0syZ{WTOLvcw4-9w?R``;CJy@=BuIhf`g8)+I
zhK*a3_pZ(2<+IHbDkKM1eOQhzH9!!J2TZ$i6a<Rf`ulJ{*g*2QHK>v%mn2Laz<&t^
zONae1Yg3J~6;@4XPl2b`%h}mk7YO8bKLO&%_x))J5t@U`D(7lpxj=){Z&D1ts*kRI
z&I3jomh*W93-sLx=zHrx!_`sBPa2n4wluDcJ&Rxep$BJpdEW-6y_9&$)YLS)prCtx
zem?PuZ1JkXaT!IOAFk0$`f!+p5tRui!SYET3K9mGBLE9}a4Zk7bx_FEMa<+IX|j6c
zmmT2M4+*QS+TAMNelK_|a%gz?#yN*;!}>9*>%o%+GEHmbkJZVvo}Ts2o*$146J8$y
z%&L5BGw8wNzZa|47awBaaCqZ<b;nYRm}>Yx-4nB8OGX8uNTfxsWt82khuGr9hgbl?
zc9`PVI@d>fWPYw-*>dqC`JS~Mptv{yu4;_06!>CUF!B^tkQl|0a>Ud6foo1V1bU8n
zL<UNdOE@?723t-f?s?n_7|arI%y`*cAilKpBvlS{=MvDJV*{K=ikIF2*|F3)|Fy9l
z;H)#g^-vVb3b2%OdQx9MjZ7r=nL!98CBiwHd@g>lrr_mxbVDuwJ-5!0GK8;bJ`*Hn
zg?kC&9BN@1`<h{5Nk@3w5pPGtRxJgQc}=r%D5&v>n3|TlI%(_qd8Rn=IqBR-!8MT9
z{f*{3f#x@6y;+zq=zI)b9|snb3`3PEzpRG=i};|bs<1Z=W2WjKa}97Y%eByYSYK*O
zJu#igDRV`?x(Hp)L9XYVdfeQguKE?0J0MC-3krPPXThG^H}p=xPOYEa_uA??QltB%
zR^i;Y`VL-$+s~!*ftKMj$Ee>l$(Fo;(ZB<>6wS(2Ez?IkUg>P~>C@M9a>pf-LPCn4
z^Bv7e!z>pLQ_-=5mHxSqTno*CBXZnZ;;AS!i?zfcVa#cgGFlGK)oS*Gw=D3KWUlDO
zqIs(Yub>fn&ra=h%w-3*K+B`1G-Oa$)*Eqs(1>T`e?h!o^%M+OnZ><*`^9i~*KupU
z17)rNia}Rb9fMgrc=hP?tEZdix>ta$7|E0A+1V=X9Nn(y%ZrJB*?e1z!Xansp)>hm
zvFzN=C^zfxFKb&psX(~?e9bx)Qn#2@G&)+Q+4UOMe)hpzbm37%+vu5neFps5ZkT@w
zw@1grL#$}Jgc#Kb2Tu8c_U1!U5YwNPz6N89hi|^NPD2=aVXd<L@#W`EF_@x4VN=YT
zeKOIuv8rDHrwh^d7P+MxVir^4g}I}7X$e1${f~7jd^4Y^TZWv~(CYh$EiO#8I)#@E
zlq@laS}dYa{kiw~jWYzbeIBGen=(+xD9BoCJ_J2E(>Jm-TpNoyIgElc*U-2R2__n<
z(XyffCrM2yVMs66)fKTkT$&07Gft`&*^TEx!<T8qmydWCs30^|P_SlZnPAW*$}FZ%
z^#hx#K{hLW5At|xTak~3s9c<mvYLe)?^k!Pur+4fn<=sqm6mol=!i<woF$W+6S96B
zF{ond>ML=O?Sr*L*rtef7#>0q5uox)XcZ;Go^tk7wN#&Z&y%=Uuh>fduGAHMgIi<Z
zi1_H^{~@bBqP;;?ek9^j2D)ZPs~Oq<<qDyPz+PIb75nARHy`8OY|+0lXXRy^Uv90-
znC^GiRIGZI*qvmQrn#9@rdwvF#v^}?iy1l^7Rz%$3upQ{%ZBX6Mk%wFB5*v&ha@X?
z%-py6?G4Q$8<+>lq=#l~01;>CBzmh?VmE6{UzM)DmS}Am`|DaAjHR{80#)6Z{754b
zfuI>dqFP{=^swnPg_PD)=})PSWH$jpuJ!t|pkiq5HW2sQHQ+87p``*{u=+{w%wrI&
z#%#H%kq-~E6AqdUwSb531)Gep8G%&!+gL2=Vw{a96_y@i#C?|MM6fKjTDe!MCHuH+
z5En+o_0apS3X;q}q1*0}V@IBkhbnA%FR?FI_=b8(`Tidmx!fl|h%JJ5WJeQjY2;(}
zJ7razE`530Q_tq4XfmKc@-dUZjG32hPEQJ%lGZ!IWix#VE4;AEH7S%Oax@)PiPLAj
zTUxKkTl%(-VzEaRx12sa>7IYzk*n0AFPfw^>JzoU9u7%3!*4p?H6wS+DU)09@&g?X
z)&mn;MzMHmf9L5;vt=v4_qroC@%})tJ6>8b>%aWfQ?FpSu0l<RT51-UfZdLjS3^<L
zn+7j_clOdtYV@?v$CnOa&-$2#W4%Hb(*g=sBs2)Y^4aEs#O9ufZcjZsTMv@re4qO0
zdEB0%z<Vu#8w_Dgx>Py1=_civq1c9qWtq7-cUWM%P#2b~BA$IkY3a}P$d3-<!f9tj
z2Ldv<S-1?rwj;oHn+|L;Mu!wXD~P9JNAB5kmNLjc3>8a;Z~;|ppdyF#|8S80!k!bE
zfN9oqmUq8uD^_yvb1tivsO@tXOTx&b`QzaA`#Fa4Fq7{&E)|Zb{*FhV+<mp~{z6_f
z;$ORFndP=Ug+9Mn+LIW@4VAG5^zb!r$Y}7T2P&80XmN!aW?9_lCtrc`GoayCvpvX1
z0}b!};^)Pt1>WESbV22p-{xJnw?g}a`zSx_N)6*7M1=Z2{+$OZZ9(wKDK*S0B#b1_
zg;t%(&Viszoj<%!A_q_1daB<YQImDL`#2<D1A7hSCVjVDu)GxM`T6aBy9JB#=7Z$h
zal;A+_?mTkzGaNZFOrBWR1PEQ^nLQJRjjqkc6551Ej<V44qklRhvw5Db(r9EZqTow
z@)MsPLvlJ4M_RFRSuNRbP(`Ls5_}b|zKQ@{7t0W{cA7eKJuZnK^!w40IS<XmkAGm(
zHbwsz0KOWxCIb}y6y%hxAl{8586;0n=SFomA?7mbzpG=rS~xRT6+21&AxC6+Hs+ZM
zQ70PCbjF<H9S3KP+`oNLvCg39<DCZYYN_;ewJ4SE@H(Sf*mbKqG}Hus5!JIgyIdeU
z#$J%fPF`%c?Si}<*BdPuFIJcj-$R(xv?!gvZV(V>l$vOSKRxf7N;x5mTAv!20V~FS
z^)5WJkd5ycOQOA;_MqYR@cGk1?SF*eNc((GnCjNk`#ka&KQ6aS(TeSO?{;W~By>f*
ztJIJ5Hi#h;TeUPjYMyrrTvD-45<@wAAk_9`YY)w^l@{0bLK9RAOOMQPg!gBfuD1s|
zpn0Rm8Hck2z`GIqmJ+Q-aP!&D76mvC9AiK&Nr-Y+-wRrBI0hi#KR^5aOq2`pJ*4%o
zq#sIws}}(rU}|eit!?9QY!%AO!A&q$XJ_a93^G9)YBPcQ=DC(%!hRW=pWuxYI1vh#
zwEF_YX<>qOPZRXrp|S?%Ls+^S3GG;;H%!%M#E;_S9aw8da^ZE=%}-nE*^RcXG>Kc7
z0Txb<4vd0WPK>?Mj?GBvZS$vB;U%TuY`LW@h8)e7ue`BrE#enbc{zJH!sJ>@?BQ(o
z_q}ORIgjf#(e=kY+Ka^x1Dyrw-h6D9amzutwdr~p-c|Sr>=Z&!UaC99wp3!_ByX2#
z3WY8N_rW*td1t3q_NMo7?MZ~M3&Gfb#*4xD)12(iNG{>*{9MhxWxu^hJtd{mZmbtz
z-a5}YOU>q9EszEh01TJzjMQMIJn~GcHUA5RBdTm3+h+LXUAtE9qeqX5RpjkQ-p7^E
zUeZ#rcNHJB*Dq8yFMS1!rjh;vL?w3BKMKH1yz>=Ggo4iXSNNuIoUL`!5g|4Ean)J1
zvZeq*BicQGsd<?u;FVfvQ*KGgJB+!;QG(`^NwF<fyb5jCL9N8+D0jVc%K_;@Cgd}W
z#?gGaJ_f6JQg&@|)KBE5)-3g+^VQR{yOjMOydyVRa(zZ|k}z<-JcaXJrFIfFrE6>;
zC$sZESO?^<B#U(;(&B$sUS_);jMa&7g(P;z5*pXBx{R$UTeP^Kn+b-UJ)sMk3gfOB
zMW_kIqBQi%2j&r@eW+=^BciXSUr|6Vvf|fH{h|l5DF^b=vHia(&w&>|9e{t_rT3%H
z*|6)8YCsl%q#$PVV4r=zaAf@0nWYZH9srMD(gH0LEqql`@olq|rKWaHzHO3~S59Se
z_V7QE#?6=B{XTvN_5jgNpo%W3HP0ckB_Cpuw(ZIXH`f+UC|2gGS3^f%j!4%k$80<=
zdsR1|VK)W$VMO_A>$8K)fomnD7L~VtZEaXp^gT9NO%XUVdBE59*B7cGQ_L#!orG?*
ze?AoOW@+;fM^gUjztr}gjG94)EUaj|p!=oib?tVwushowvHsOFsb+Wuy9oU9SY+sf
zmornE3SAyUQKIxVC*<W!hz%@w3Y{i5b!-5@DrrayhwNytUaj|ra;1u+jKvbQU7&@X
zV<l(b2UVlR{L=;o1WV?_2%B}Rpgm4XTPzIADJEgxdifa0X;c3+u8-jAq2G~8&(1_0
zv$NR=@A3|7_^xtdNRHU9SS_2}5<f=L6kCi^j;BOnZ&!<i^!e#azGjBnF5<?BR7arW
zCUNa$I5xZk-lW|LjGbFz5+_#H;iVRlR~BjuVd(_Opl1GbAjUe0CLb>UJwx%~S<Bsp
z0xW*zGtF&qK5D<IK@6Jx_RnIK1%M_XO4tJ_myF$SdCkCo&71f6GL}zrMvEx+n;56A
zAUqL6mqrbAlvwF(u>pAHu5+@mV<zH1U5B%6Pc@1IP2<|dC2V95RD2R-ZwADeeedom
z%NyR~3kqD*ix1ySAJTKAjba_p^10qOa~qC8FGNnM8ZgsKo9MSZiaDd*{nERImae}L
zW$F@J4c!P!!rHQ+_?&{}j$ivE6<<wNHS#?KT~Gz5kH}`BD?erWXEW=2d>2Q)R)D;N
zH8%Sx$ZG3TSQiBv6Q!;6(UP5~u#V~;Q>^Dg<D!NNsoZO-lZ_JPZ>h+-h#j^5g5{>d
zz635rO$&iS^{kEavs$jdI47ZuKUN&(Wpb*qg+|0{<D;iz^kvFBI>hb_XNf60xD<lc
z6#n8vL-udlj+NDf(Il0Ow7=e>=@Z@1Z@TKPZU}B;sYO2f%%QX2aY!j5OwfFE7zuOV
zi<{kxJ5%|653pFn$bK0g&=?yJ@Ipx$>*M|h$5J;S0zeORe*Ab*B4fx-XzkcJId(HW
zY)jcSFE4J>*MbYV7g!y0J?tE9YelyXZ_}@eNtMOe<0&bHhi^8guT`;1Fev|Yl*)zk
zEYZ(><dC>wL9v}MO?x%M{q{l{EoY^P#_4%jlUX!-&|cjj#&)z&x0r~N$MofDCXSrC
z_%!5sxvf=~s+_jRE#4i~gX$VGC@4FnrVBWZGCfsaeC*Sqiu`YT(%aUi-o%fjqCC$U
zRy5O|M10f9_Rk%EEO#b)7`P;MduYYIjkCVNkbgD|UF{9zPuG)>zdD=W*m=LluX?%&
zfMvPdw>9Yq|EPG1=yR=a%k#T50_*s#aP}qgiHQ#;`!37Zcwu%@DV<q(#a3}3|2bd6
z<79CEEGfc#O(WO|)=DijV--`|kawNoqIO{Zl>0dge?U=Ir6ntg6}cCxr+?N4#(Qti
zv^y?~T79=eIUaQO%`U(jaX@M=^?eWi6|O*21Co<2)bnzBO4TK6;xu-8)VWY&r4&aN
zKXfsW!M4Bv`+;l2Sw?n`BVxS~Aj=|Cnkgg*T-M&tS$|O!@bk&6qtZ8mBVnkRx}x33
zK_Q4ZZK_{FDhAdfp_}0)70|BFUcX+ayWe?NWlQ(GzdY%#DgExL?#8WG^2>9k@Cg5#
z8X+uqU{JCXhqD%%YGEd(x#RYjlcIAyu86*2WuqrSo`*5(Y5f7R%)-t0RNAm!dSU5o
zUtB4q6u<(+U@cs^b*29L47r3VZUW9{JRA@AKD07eek<kzt76wT{+ESBaIU15<{T2r
zr)j<aDQ;Dk->;5tzw_JYQ<e7Yx#Vh+?J-e*KrUySAp|j!?WkzEaET%-Fbl*4=4^nk
zSd3LR`+4y-UHhDR2r+<Z9ofCm7w8Z|$e5WEc)TofTscj^aC-=fXA0wNe^V4MfTedG
zLEM|$hn^r4Vn3vqtbf9Xtp0(AB(roWgAiP2rL%A`5F*T)DZvZ`SL^^S7##=D$kTmA
zV)@&yTru{9JfQvR5F)uXs6J}601+|tL)xN{3YnRSaM#tDz_07x3JV4>AH6gNE#A_T
zas$t?lwC);$y%UXxngeC+)-Gp9I_A#elg!<F-yuf+Ioi)(Ajt<tP+Jq>48yg(F;~#
z>Ep$;95ZX&T^Ey}4?bS(89}xiVwzkMOHV7Znky|085&XS1RPBGQn_U9lc0n;RY;$2
zilo##K53|*-JHg@42_;8g>un~p#UuS)P6zZvDP$NST%J{(4X4G8l}#bU_Pb+4jbW)
zUuuvBCh3L=sAsySu()wOEO;1sn_MwgWV;NrEN`ZYg4N{0+<r7aEhZ|5bKknmsw>j~
zg6<mCH7(l{%(coM&ER&bmMGFkT@dppJ2tg`EmiW$51+g?Yb!!~fX9!kwJ3)A6P9Rt
z{nW_XFR#Dzg4~@SVP1|u#vU7v_pc7=d!gy&UPmuzTW%S*1c0`3+TiU&25vRO($J1L
zsD1u&fqYA;Yuw%K0@Us5nZaEb$-Uy?^?WtVPj7b`x92*IcMN2|wf79LqtU41$)O5X
zj3-i=a<Rr60biNpeh8hu?qjeDEGZ)KYk@6#gEk#N<f~GDUXJhZ9nHW?v+>=FGj>P1
zVii89G|9B5lC?Pai{S0fNXaZ#s!b4gdLyWHyefUq>vlw4(Ig%(7t7;K;9pOeWyLr*
z>LBu`lRKKgLn8Nk=hi2reVhe(Z{Cd8p0dct^eQL8Hd=n^P_w=$7;k+_ZtrpMb6Tx`
z5BIWR_rM${S27D=z0)ym!$t6-+#nN*G4G|o72ZWVofhy@ULDb{CqFwZXB5#wmX6jF
zDUU`8X>JN@#Zj3+!W#(n`=+9R)x6P!xRXm$?To3RGy@Ot`fJa$HGs}(=hi1iu%Ia2
zRyPHymPJO2JNnF$t_c(+a#~S-4^h5$O`OhVd0^RPCZeP$!4t*Hl*wnR^<}8Sh@t%c
zaHNGSO7Up9g_o8dL{oosUq|$N+NBq{EqT)&SkAM*vdw-ior7XRxz3mn&-FB9)?01p
zFQ3BK#ca>#l3q7gg*7K*KplrPmNo|h1FJFSF|fGlCuuQ(*qsNDZW|l3dMJ0>c{KwC
z77u7COl6DhB>E7{uXCcRyZ(`t^})G$t?O##d2j5vJ2hw_S*Oqk57q>?r*81nDJd!E
z=E`gSm)_Z6!qjPt>gN>e!hSOdbNm)}czC&GmZs}r54o;0LjHrko;r|*_2TNa+!?6x
zVaGC7iW#gjXhW8ywjG#T#XqO#eJ(2p=PncaIB*2BvGKHFOr{w=9`0VT)KF&Oqd^dN
z(Q-NP0M?nD!KblSZ!=Q5iXXyj&4Xx}@)V3Nbw+lhIuxU#JuF%Zt+MS3l|$S53pom&
zZ@-_s8;Vl#IQIFNp`^V?!NwLy7JCHUin!lbzrKlYZWzCl(iYxtoQ;~o7okQXfa##j
znO-x^F?iJ=eqx5l_AJ3+xFRPYck1Irhmi+cKk<GZN7t9229){~siVA)DFhz_DD66H
zuD331JFwoY`_YTqdaa!MuM@TcY)T3JqrW4&2TD2dw40u7=%jcAHbp_GPXw7nX?e(V
ziLslb;2iDw{4kE5e1PF-jUU%jL@&1=oAcXT6-5BDRe&`&^ziUd+xNKa#?I*VD1K-;
zD?QduFzxp)^ts{4xtIF&T|XrGvJu<Sj*+Ubw>(BesZ9a-o!65z&`Z0{2}ejB!8HEd
z(kDGT;~6{_v%zCR<NY5R<o!g=&Gl>JfyhCia(VPl!Y*_lWkTO0*CTL!OJRvtxr3U@
zaYta%Y+BvcT`g5!S$=pfMw;2g51pZRTc_8BK1E$8IiUM*voA*D4(1^YhpFbGHt<VM
ze+xO{5(B+(v4og`rm%ugJ<{IVSpWQKI4!e$*v5wx*{{<d(eEc~sf`69R~D}6kpv|(
z^Ogr!i}dL^qO!Sr{u)KVlov?mQ<{(i(uVfW=ypp;AE_TZn`_b_&Z#A1&9ZZ%w_axH
z%B+Bx`GRwtG<z`i?sm4tQ(#}Jo~iUYecy7oF|bwzzSv{g`2oz`_l|lo_DZ9+1I!PP
zUatsD)?O9U=OxE(+CHdfF@o9$%>omnOw7X?JdX1Y&qlcl)G>Cm-euN$`V6WL4CSV<
z469r%t0gBGW#3SYwfCkDjx@-V!XhR2x&7taKnu|uDYFY8+yIa5Ngue#&4(CoQmpHt
zya6M(;bv2}b3s{q=H~s%;evtyKBvEff5A|x^;B#9R~J&33yn?)cXP#b<yP|_&ZMH;
zDcA<f!jILJbJ9v@Bkpo#59WHZ_qyP3GRn>Cc#5zzm2y_(nC6R#3?zl+da7HL*oh|0
zGO>-mukPZ7EB3a`q{dpfnDAANT@$$04(-Xuspfg*14N8{;B$@;bAQ<{YN>!h{H;so
zh8kV135#qn8;%$Knetmb`{P4Oq$^xx-)B8dvG3oRK1~!O3imS|(+Yi0ldNW}`zfo|
z_LtVZ?_r-2u6jlc7Kxt$c@sV{!aIi0ZD)u9=EOWKN-<<+8CW1$7G@6Kx>HFpn-%F9
zw#-=#+hzg*H(N3wT%mo_<V}1-cc&FKjt2we5x8t;wbs!>krFdPadH?5F)<y_QAOm>
zb220kwOtdZ4>VcK_nez`?d<#VlH-BZNusSrugJRCNO9i?JIp{acMbGSD=g_0C~p5z
z-v^iO`rUK`q$5C_NxDG(IrJl9a}0@ekl$4WnchL24|rP>n$@|Io7aRnqN-(`S(0CS
ztj7+4E{J8;+sOXWj9<FPy5GHPuA2V?-lwZ(0kIsw4ooT@c>L!|`;Gi)&Z!x^x4-gA
zZ>V0stT<>)YG$>Av1^7DS+*GN**TxBPIc?^!}?gx2Tk<fIG)tDY=B85J}dlovrZ}h
z*|fKJZW=^DC;3i!CZD1k@ys)k*z%G-{`Z`fdbe2LWk~JLV6oOL%t4?Awurx3LvB(x
z2*kth5#fOur|0vkGGjdt8;syqB-k5PdOWrzfjYNTsd<1s<3)}eXL|HYC5t=LW#uMi
zL~8`1553~1E9)veKN;;+(XkB<@3K!v_K6IxM0hM)6k+=GGdba53<blEiJZ;3K4WLd
zc&8fU>(8IFBE$OdPUtQv?m~@OI-p(c0JOCr_aOwp<rj4J^aw`P&5|OO#6;h%RmAk5
z+|zr?I+eMdhLs7+CbVxMZdebdd2Z9mO;nByy-rIGXD`wR2n-ch7%sfkv2c`Beg1nK
z^G-ygS92u{H-1aZg2e&@ac2Me&~f(+kz21bvifsCwHdlRf{`2Eul@a2;s@vSy`jiQ
z^F`zKSgWoK!=ii^!xkY`p{M3jdN<+nQi!exk;PUbwbGuJv;G%a@VrBbeuBS8ah?&n
z)@hSNUH}KCmx*tZeT9nIWmz);dMOkS{93bTJDB_aarO}V=Oalc!1eQd=o6K#mUpR;
zbSt%5z?av56dom>@)^nJt}40X7e)F^FWzWy^LYo>vz52q7)<rq3x|5^9kCWX|3D`=
z>t#pJriH4*Ks@;L*;eLTf0tgI8Ia=}MHSigX#chN5i8na+ehGvJVYg#w7561E`9j?
z=AHg)%<N~<q35&1*N#+wg_~HltnlY>{$xFBDV=l6Gx~Z7*px9HY`<-0)ACs|gc$7V
zgy8n4x9viCwYLYj9k-5htWV|t%_2D^A84^t+Y7qmftQ}?5Uz=b8e&(Urr-*D<~FB0
z+HYDeNvBjgO~=Oej36L=E)q#hzc#Z;->H3O`n);BGJmQwRHt>?XrHe(yU?2NLg6us
z3c8`M9mrQh5Pg@~xBe2s=>?A>H_^5v>Xf>oCjNZwOU7JSxeGz}(=?jrw!A+Qv=`vT
z0C^e^9sJ^_UN$a%R^Jd{ryeR9oISDWeT$dW`}?3&*kr+wuh<z@xX^ACPH+p<n;s&}
zl|Tg7#LuQzqTmmNIrb!yw&)+P@_eJ;?7-M4W`!leYAvr;oPba%H2AD!80jE-drf)q
zk9mgOK9j+6$Hb41!uax`A{w%~eu!ENk0r3<-H5{;eH?UGxLrdo#+Z7JankMV0&-r)
zx5u+p*pJKZXg>C2MM9<pY7lbP7^2H4I{-hOL+hFl_|-p=qSA5hCH^D%oi0{gB~HW(
zOqN~d4{60FASnS<?6WSFjng@MwkP?)A>JAglV53vcHGG2H6$V)!L3~+>h79Y{?F1R
z_!;74&)h+iyg1&UR$;1r{E@!=<a{#e)-NAp<_yZM&oJJFmd7oDo<4laU4`R1a=lJ(
z9(FreUz|_T^Kx~h2<yG-gN=P+ZxOrnwDXYV19&w^|JhFJpmn6+%HvMg2GGquwl<tx
z%#Ig+IMc-HMT-e~>ypS?C-h9FJ&8T~Xy>N013)Fh<L?dMXh6LIu!tj@7eDL7k6m7M
zLcBuEjj*%hx=|*(K^Dc#==BR$@@rcx^0JnP^mu%o0|)bAx${h>3?p8-cEV`fG2);{
z1^65z2eM<z#$Y(cT^DbD_J&{NJ@4vJU-7`l%HF>oI<kyi>ZbqnteI1ew7#x288p}p
zbFO}J^>%rID@ytD@82tLdHy$dc|*8J2h>bp13SaJ3)E|L(JVFroDirA0GcjtZZm_v
zQC%Z`WR&c6_V$IH7M0-bxXN<7J`4Il4iv=>h>Cge*pwQA@Etwwm=np6>G*tq_oQw=
zvDc0lL18OjuY2~<juXF<RaD?JRVA#a>~l2v-H#o)6NYn%;&!uF8||O=*7;@SCd59a
z298=Ne+V{LiX`MV8PUv#5#mJFw)ejP<*?C*L@4S8>;?3A>ygJxU#fF%5q?WdWP=~r
zGHA&t@Q}%!E9e1oD}&minK=ESG863~9imWTG*=4GmTNskYB=V!*_5YD6J56p0o4}W
zkhb-K*M@`-ND*>#U<V}<fp}`T4Ri&h@oI6l42^pXnq2E?eRS;_a{t~PQu3>tSc0_9
zGS^G=!+Z8)Qc|M&US!(Ezr8G=8gG{gCTka-C8sN^UhkZU+lmPskl7?0NVRY@RO53G
znz+nw1$^~?7UW&OANc!UPdcUp#Pt04cazcDgU33Sx0W$TX3XtILTj7`KFK_xg-t!C
z##ei`HOn)<Gj)2QC(^I2N?Pyx6o#>{KI=e`?jUJW>UDS*-79jN50X&yfxBYqY@K6G
z&NVe^tuVI8KhKSkYnxT0mI^9Nb|I<rkng^JTys!UyT)K6pQTWg#V<fry8-6B^~Zco
zk1K7|t=}vgj|Y!D7XAfD-bdJq3Eh*G8LAZ#<S0kPgwGBPs4zf*WIdx#tU!^nKOZH;
zo@O)^HX+N||J3J4zi#L?OGeIAgvE~LhD#cfuAe1~M;e}xDw{M95iCk>z?a`@>cxB*
z+5qnG*y9vFB*e{XVY|j3M00hVOVj(w-RS9b!nyS$=e<huNAr<ABSCiiLDw$<^ZwT}
z)lD{nW?}Wc$<G^QK1xbTkEK;wJ{I`{d*2nr{C=O|yxq4yvhiqqXa7pnclnk(QEPsE
z2Cfa8<#!e-@+N4orIn7ln;X;Xsn$;j&^m!CZ1T)a?bxITDtw{D<7LJwDY-Tr3`%Z=
z@(56vD(J^s#-FFy2jRnsu}tfhoDFO&ynmIPV?Dxvr$5s>E;BDgXz8l$`lbs5i~6xg
zfWUz~=DcslrJLxqU8z)C^rIKwb!uDO+5hz}p1j*?t~?LTZ(RG{ZkIurMLn+A6#d}J
zxKm<hwwh~{19Q!#Ru+(3<eD=F&f%B_!pB(I3@Y?_t!0AEtQ$n@zh+6$uD?qy@Pp<v
z-`jN<MHjA6G@yQpzkl?qYXAP+m^oNMoy(~8m7CA@xSoCT+9^2+Ag~<kFlL*_zSmr#
z>~#6<%K$yvplh!pPcm14IG;Iz>B<>pR*0@vOvLRY^isWGR_A=+E+$whblk~HPYKwN
zkwM&c+ACk&_)Wtb@%x$E-oJqODMcRw>R14Ad!t-LZO`_{(rB#<S1y0KR#ME23n4!r
z(RoC_qyB#7b4MR1-r4&uFY4aeQ|Y<tcDR+59vxX7jyiN_oD$ye1B@k0r_{}c#M(#F
zguZcVf#EQQU0&GSJvm$S_qX#JCbZN2Ess;PUCg$=BBqBJGyYc9k@4|rqFvJd)Y96(
z#K7vRv*GO@P7bov!7rfqswd+do^F2dti6Ppfb2W%f;{b&Un>l2S<Wm>-b2|x77hM0
z1Ej3K;qNzX_KuzFiFZvsH=R{npl~u|{-GwWtn|<17Aa8@f9hG4z`V!!&Bm=gEy2qJ
z;VaFfbJTP*JPK~|-7bFdh8O*&F(XVhZTE~WV-culkQmc%_MCe76cH9Bh34qn4cJ<8
z+@rl9Kc~mZl-SVKVX}_Q%cbNFOUJa-l?I*7B2IQYAv)vB?zS_53`)04MO&jT7)xsZ
zDdPgXT@?T0i&?~u70iw|PU*U{w`0=w>00YSa4sZ(MI9|>-%sqz<p+3+_k9emts3hq
zlrYnpxGk9V1yiN5pvxO!65w>|Verptp+C}{4d@dS7dV(y&om51H*lws|BJIVx?QyO
zAb=p8-(AQ!_;;5PP|4V`-fQN)9&bVkS`y#MEg~C;&W(PP#h-N{NK0L@Awamk{Mzd{
z<6^Qly8pglEgT)jGBCR%pY5V&xaoS#>1xYIPwULNIVOJg$Y3!@9{KWe2DwlRy6Q&5
zo!%!VY0?t|OxNF&bSRZ`gku`@727h0lHO{|nu`iz!Y{K_WN<Qc_1&m1hJW);KSbLH
zH4rF$VI_7{TCqN{Wh}aCI{<n6>R|wH<s7h-zKpW}=Et%BOOiJOZCEUaiXr~vwWNu6
zFv`d1p}lJBY;5;{STTEN?LkQOw(cwNYF0&T=t7I)AE+IjS^m9K9#O`H8f9vrgNUYv
z0T=^E+4m@CVYcF(=RX1u7Etxm$4Lm=uD#y1Oj`q|2C#CgO5&dn$jpWkELuC{z9uyx
zOZy8eacqhQc)AfFobGvQqz>L*ZHjUg&W;A$wjL~@&RznfeC0m0T+vUhztINvXX;MY
z{Q^iuxqz_hY*G`p6dd>VsXZ}oZQ#dSI8M`BmufCGAmr)-B<{2@$`#JHEXJ%`p7tln
zOaf+thU)i>iuJ>GSf?*H3H$3i+WYrWp5IKcYo{6P>yr{J33j46U4`AIv8oMeU3an#
zWZ1Gg(b<LY4a?pf{d|wA2h2)W6mRG#qzAeUcDr6*u4{!NgPElD%iFQ=D}b6>97z&}
zG}vrKO(pQ^A>R9+kt=gM#@Hk`zWlBUC2VP2?Dg`rL6LY>;A(Day8FPDP49=@91&lS
zhegTHn^5mnBh4Tt6oamI?D5vF5`wr^z}sC*@OhWE9>6=KibjBWu%X)v1=>!@;?zN-
z-`h?kqaa*8j9>{~h}g+BH3WF{{yxsq2d~;fNXQ^`wO5hD{nTEJ8G%zCl9~2d#*uFR
zdXW4NQjBfaZQA!oYWAP<M5n@%O9w05WC+9AR2YxB%WB!a%xh4n)-2XDL9CAwtj3?p
zlsDyE=*x8y8Vb4>4k)6C*|XG21OgwJf#(AmJbf_`FKMV*dLOv;{R;<ArRXf!_o^d$
zdC?dDv+4bZ{`_{%5bad9?K@vlV&CTCu=HV3n4L`BC!sx!z-~c!eo9SISoo7L6pft&
z)LODXu8rJsl!w4lzfRBqltCx77q$GPWa8CT{w~EyCWekf*pGfW5QeLFA`tf|_<*mr
zVgt3V1SUR14j|lt(vQV=r(1Y!^c8)|nO%Bk<YfUsEgECC$1Rax<6V2q-x}qZ*jtuP
zxZ!V2#H6nQx;xj*J0ZsNXMIP?SY6lKF>MuDSCv%Sl!;{7`mB$F|CtU}+y-b#R-(=!
zcA+ZO#0UNLN6Myph~<r&L*~FZ#KlzMG(YcYPn%9oZ#)-L+_*HUhWP<FjLoTRc3%0p
z@HJyfBf4{5l*RsMd59ohRy=>YMITH7X&nThtj&@qd*lcAAGmwqDtCixz5Xc**IDi+
zEe3Z_C=w!*wIzUE0$E+9ZZC`DzX>V*BXRNDu|g%E^}-pTVC+(vzP!D?$q3K!z}PUR
zC$F@Q*tZSb`SrYD7r;p^tLmWZV;`-2diL|U>{ORM#v%o~+NFkB>gnes`kH7ccaZ>7
zQs8Ky*a%SK*B!PC;v7w4VJ3ALl}l4)I;}-FGC4Jv`?VFaC%0m3a>juoC#y9z`p0fM
ztJi|P`B@U$ByL9EBu)`k%%)P%iM9o~b^%3|TCfk_p{uiE=pxn@%zGK-Ja|`wA+vW{
z#77!aky+eNrU0GqMPKix3wn`RE>RAAN#^O6skX36dFIsfaE*txU5VOV(J{8H-isLO
z9<U5+8aE`?X@xnW*nd5cmM<tkX*$`XIouzi1aVR3=!|4@^bgZ*z*SN}9yJHY9_{kx
zu)1paq}-~vnxYdukxoc|+_+Scn4BrQL4<??XvS4yN-yxIujKYeQtW&h^s;@1RBo4@
zl+OiJhoXu71$a(>psCgT%eH~HujUxD)Ug@UxH-La<dMR*UAhtWTxeHvt*>3dcwnMU
zE20D_{X$ibukwYlQO<za2W=P8qbq$Ij3TaEy0!2D$W($^qB$q>k1HE#H#_C%GGf5g
z8MzB!?y#ob9S2svq+NP|JknLHI0@*IvD|j*QIT3Eur<~ew;cp(V~eTs13=vKX8Ouc
zW)qvV=4HdX#-AVBX4A7q4y%;RLEF8rco^trYZ>p}g!Ie)fX6s<Q?NEv=Kw&0oU}i7
zdWHK!TXFAuQKP&@4YMxp4-oO8M6G<*F4g$X!=*zd;=NJ8Ry8f(V$%uKi^oBUS8U7G
z(_9s~SX-b#!-j5jKsBF!Cu{j`H4@S{?}8T7bYc@ub+k^GG;P~Hq{Y}<769q>W6-1B
zOb~u3L&-BJiu*@ODbbY~#H}g#N1_JCO<w|=OPU?QWxVM=w+c4`?lk8GvZIR*Yn>7c
zAjduWfnvJehuE^;hpBu$ps?jYK?X-j(XskUdu)zd1ak-T<4f_YtpFK4imPjnp>`iI
zFLdk!Jj<!x|Hbq%#ksEAb4{0JgrQh0P0EJ``I4Va%uA*s;)-rG*{3-P9?^2f@wB6}
zqzNt9<HGkhj{u?87_hdPsE~G?;nU-kxb8!DQFW+8BXz}`^yzxTBC0%i1CyAH49jGF
zjrr&O^(ghlm~O24HrrOOrw*IO8~}1;>_r*(x*4eli$V3s+xCE$J?KnGp#-VI+EVXm
znTPT33-lRDy|TN!{!2Mm2U2b1A~;TaDOqkm!#lcQ&U#@Xo00wZU=+=UmpNM9G!cK>
znt1IUp2~Xn6%?G{m(&R5{<$0|0lQa>Hl%5d_r84^g$ic+0)Q|zEf)S&FS7lopLj^e
z18~d7tn@~7lekjK7Wp^69e+{DJr2WhwvA@3WGM1BEaYRk`yX9R%@+aHA#gzdGE+z>
zbeg<pPsyMT6{v&$USVkTy<f%@#LiUGzOwgoF($Fz#CGZ_nd&+;_AW}kNej9DWBb?(
znBPt6*eF3R!Mh;Ytgb%-M8qlmCqIhY|GdmhObzv17jRxm)@T`=Hbd=--)U(D1B?I2
zGi6AkX~2L8DHvLb3M|u<-V4ZGEAr2jcX09mYor}aLO;jecsdmFJK0VqSOroEfWGQx
zkb}cqrFUMu=eSt@=a|UuU~5@w=bJhru6CBT04882)YJXNPp27fsI=5rVwTn!4mq-R
zUu(Axx=ETC0<*ji4NoK=ng}0^eJiDpuuHoW93_T|d==BHr`LBZM8mhr1NVdW)kiuY
z6m7IT$pqeMx*j1cQbrj6E^5*mURxXJQDFPAa&=w&C90<l$ytF0!p_qu$Ta`PyGtLA
zc#3f!Ds|KW5e4iF6q#uyY;8?s_NvS>=)mfs$WLcm9q}1?r$7&<*#|u(LldfcAh^?f
zyV{v>l`e<;<v=-Mz%5R8V(XVvKqMrAiY!q-T2i*S{&vF)p{mu%e#xEBEKyLS9P5y^
zrhj@VHfd%2&!*wUc>6vakP)!Xf<{`#ypKz=u<)bswL!=g>f03S^biYblyq{LHr~#s
zOep>v)!$V}vbgK2kd78e)`xWAV%_YjRlBi}r`Lx^6Wyx$c|c*7p-14tUYx2T7-0yY
zf}WNWGVd0O`Yt1^;0bKEa&;4a4^of8^qffuyuzMTmaW}*M&w?6irJ{rvIKHCyJ4zz
z*oww`+orUuKO(d{??imCrH`ZzxJhEOB`sva4cdn{SdcOt^Ki@6<ZzpLY!=5-PFZdd
z`qOjl5p8!FcK@}VExdTD70T!T$kHoOY!N^NVWYOcRa3R`=k{#^XfXv^eweDdj_m8!
z6|%0dCTzD}c;B#~-K_^_dE^WIvn8)-&a$7Rz{Ewc#lB75D0f1DFt$`nbjClc_cU^5
z{z1}%@N-wQXqKfG1VuHuD0Wd<SBa9=c@(MPDPk_uc(fvMHQ1Tpn(&vPcZXFdM4auR
zM-Zoz2?|Zxi%yp`f}h48GkYKWy>@cnLbN$YY%@vyrk5};o~c-Zuaq?S%d4iuSwG;q
zFxF~bUF&ke0wf#7e(Vk&x5u^V2z_e?Z~+w|a?ut|GzpDIep7Mx$&{$kvPy?!{@fZv
zrs7TfRNWn%Cu~D$a-mMkO1szVp<+MsQS8g4??4^O>S%7ct?9<py2#$M+%@4#&<ItV
ztR`RlYk=y?Mu`Grf<6!2W52<)KH}E^q2URdP)UJ<0UD_0Ip9gfiYUA1lJ%&c-EM4c
zwk6I^Ym9Sa&1c7woftiO?J8qmKYGd8RMezQz^q5$+K@467CXk7cHa<Mqa?9zQUF(P
z-GP8vy)<h(MX9d6T?kxeql`vw0>w4_Ht%>)HC<krNV*v4#oqt(0}v%6S<rixzEu@D
z-FA;v02(tz$v=uOzmr_pHhx8k%5w$;AhhmiM?$U9O~mrzEOscWBz{SGBjv%b<cNVi
z6RBS;4$XWVV5oVKGBFgsCi_gQg$+%&twF!*%mF2Ra^>P!`kY7p`p@18^p4-nNO$3V
zb(7a-Lb(iqldw&Ed-ZRy1G?ijJsRDI=O6r{-b0G=t{>mTG?v3yG22#e+J&L%(*VN!
zv7-;oEpvxig*0mJD71_-dvnBtx?CVGEH#X~myBPXGz&y|SMzdolCD`3nzku2uG}xb
zdxfP!N@|OYXsgdGw>`-iHgp!e(RKl@a%&3U>A?C4?3y!P)-?ij84<W3fcYq2te`yd
zr?2ySPe>CJ6%6_W@TPxRLwzB7xxoXdH&ncs=6c79f7U6!Rmi^KZ`@0(Y^diAHMLBR
zUhfz}38V-f9q7+(Zb^%QNX_j_-@_Lu*(NPxARZ`t=k_?dCfp!q@0A)Plo9oxTG)gu
ztoEWkfa;n1)eW%fBhwoSR6#j7Y)z<VENKcy2H&4Bb%*r09s=p`CMK3zrf~_Jh6R^g
zK&y1e%cg;1<d@^B3KO2WwgXzMLg!POCMvZ=21Ap-s4|wW!zb<gbw!@l)1N%`z;>eG
zmg7JT{6E|Vj~Y)0&E<fB@UVOD2fVmSG~oTftZ8OXQRBLT&?qmY50=^6w)5WFC)(V2
z6JW5p-FlN*;pS?xu1{<@5r@x{yaPg1vuY8uDy&gc+4E2BtESvyp^ql|zGPJLxwc1w
z?Ms+y4I^Q&IRJ${-*DWgp@d~p<^Ri`XJ}H1rCzR9KKGMek=<NlskUssw^5t?j^{d*
z9PELYP4r&>OWH&xLK~ikw}utwAFCeVbN?yPp<+zxLLMG|?X(@xBhMLjTwViWu{}1C
zYfn4g)#XiCn@~Wc46F;fM}>Xo@5SW@sPK4ZYv0a4kZS?39R9j_D_`sd_JLmn`u|*#
zr-~HMEtaHp`_v@t0omO0gjv&R<)E_@dy>oiM$5RnAIUMxc4U~zA(g7KwQp9AQD8d~
zP^QyxHRp%$O5jl0mCKTF7TNoq>7gR(WRn>gW5?qKx}pULdL<>@mes!x86zzn0xm4E
z(5+F&iSz)JI6t6gYrvqZ7FkUXOg&tDuHp`h<y?={wglrtI=sT7))JW3l`a%fa^wlc
z$G4h1quB~KbLx?7_CMjRbo#qA*Tki5rLI<BK$h`tmKiyZw_jpDmEuWAj9sHRqm~uv
zLXlNM`IWUv>{6nY4?KqWOiw3Q`z80MJ)&%Ylt8MtHB-{D8vsO*l$5YYML1I({BmWm
zr<gj!thJ7G0W_8EO6;Alk+t3bjUuXFHm=iU<lxeul@P2}j7!}bjTm${2gFF>zE;`p
z_u~Mjdhl-XV3@KQt;w;v;dwo98O%emyNG}*m2ZiePJOaiT<{%`Wv;L^?9Pu{-}QFs
zxq~C(iD34&OK5Vi-+AxHuNG*dC;g0>H_d0FXS1~D5z<Bzxr`Is_ni2Zh?0vLEjI7#
zV9Z(}rRj`;c-{q&+h7Mh7=@*qP3M3VwKT-?ct2VhWZNm$2R(iYV7wsS&0kIICqgw-
zdsuTdEEQqt+$rUzNPfdlm(=p3L|7)v{kFDJJC8BldTrUQFO_uL=FGUmx#`F9qVg<e
z6%!rlxu9o12n_F%D+mNS5GKGoo<2idiC%ID+aa!5c56be^@w-<_temDucH6&%Sw#{
zf&cvX{to}%(gJXUe{b;d@9j=D+~D7vIQ)APhYdIQKi|aR-%z<>n}6?x1f&H2B8PuN
z<-ehFV;%he7AhYoz%nY+<@1UX4ru0h%;n!>pg}RWt%C301`Z$-Bja;tjLgrNn0gwU
xTA7<$nVRSu8Ce+_HMTn}|3AI}i-LxQ#Q(p4;Y-ef!^TJ)FT4J?^5V^h{}&*TE%E>W

diff --git a/resources/ios/splash/Default-Portrait@2x~ipad.png b/resources/ios/splash/Default-Portrait@2x~ipad.png
index 5a9b090904e0247696e836ccbfe64d25a1cf412f..1ebad1ba77c63810635cbdfadc682246e0a81cd5 100644
GIT binary patch
literal 37447
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

literal 48050
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

diff --git a/resources/ios/splash/Default-Portrait@~ipadpro.png b/resources/ios/splash/Default-Portrait@~ipadpro.png
index dd8141a79963bafb02c5e404714fdc7626380896..c158dafffd66722b67d973a1cf355ad67359e7e7 100644
GIT binary patch
literal 45081
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

literal 56701
zcmeFZ`9D-)8$UiRTC`}PNS4SRLK0$<kUe87YqDh>5tDVKQ1)FzQubZQZe~hZ$C50Q
zEMv`X7zSgT&pqmSzRy4K{pIuNyk2$A;GA>c*L^MT>wR7KyuPQUa)SN>Jp=+dp?dcY
z3<5a<F6j%790Dix-)F<X>7cEGrUC>~5_xRff)0G%=LS=`4JqolI0HU#THb|eLLgqe
z5QzUv2xJrd$bT9FalZ<I%szxbWZpm^=Uv{`=-dRqIP^$e<qkN5gQ8fA1gE1ecOSSx
zAji(q{_TS#y=4ZsLsai5=so*2KZLeB_mDAYbjA0zjOz7MCFg~N9G;w?YCbM<>aD`X
z&t@O5o>>a^Z*hn<yVMX`iPujZV;Ko@yYEoAZ|@Zl$gW+}(1E|#{#)Q3e~w%J|G9$f
zKlq=^Q=I>~@`wEAe#k+ZF!m14TYoRW^!NYg^2n+GT>X0_<ew}dkbg=9toNVw{Bs+S
zfBy1cpa8+~UxbAGg9iVg0kDLB(BL050BZ0L8vKI>Kn?!okpG|o<R3Humhg{(`3DVX
zoZmmz;2$*j2Mzu~10aEa(BL05psB$>Xz&jj{DTHGOZW#3{y_tv2LD)tf6(9`G@v=e
zf6(9`H24P%XqNB~8vKI>Kn?yuga2Qk!Hpp~nvwZayEi=~rOr>4$)gE!);2aLZ9At{
z`{z)H8K`wTq?K*2Et}t)bBq0m@klqHZF{YEn4jo_5XjHFw7Vgn*&W(9cdh#-YlqZr
zY<@4Tw6qmqWie=!JNe1)rr@D6Vk0!keaCejv|&D!5Z${6{P+KA56y^_H<gV8?@sU>
zB)BaeKg7m)D*(N&6{2)TKWEs)N;bi%KY?vP)satYAkMe6pRcyRUB2HccK%m?oaRNo
zl5sPx2c;psIcg=ZADwO(z7=r!)~d{l>ZzN^;{s<M@$DN7{W7)V_2rZQml5y7=Mnyt
zoem=87W@1EGSEQu{x@&^r*U*|H9Y-k{jmQ%NRSi%y#^N(`!4+N$L0gq{`X_l;m7~`
zk(1&3|9<?x^TlU$4$~$XBti5|m7026Q(N2H*T?Hn*ci#d;eO}u{1p%GN%1r1(r|ud
zr6Ec~dFJWn5OUzxub!Vjb2c}<B(GhYUK;%><F{Sq<>mEsJX~s4-F!19BqSs)g5l3Y
z9v=C#ZdJ-1)$;ipW&H&*GBQ2Ce&r=3oGY)W$SWz)(bUu=?o!Y4Y2{Q@7^I}65Qnvy
zgTPOck}hZ_T~lp*lf&@$VV_Sa?5(;BN~?HGJG+~RDX*-|udaT;r~R&HdA!MeqWLtK
zhhU0Uer>I>oSfY3%#4n$t!?UlYT!YI_j5(HT9G$NuM&ifv-AX+$QFN9h?(n;0%$D{
zV{4NL(%FlPiwMJIDM`uP4<8i5!^4T^w&!MNpMs}bi?gWK6zr!q#Kpx;?+}q#cCYD6
zns0CDD4e>p6ZKba%(wTR_xa-l+K@Na6A|cVXqb3`mDPRzrx+NXJ#iQ<<4KyR<(LD*
z^Y-47JWmm|`t`|f^BbT12U%jB?&RcT*zVo}K_D&-dk?!cEaR<&<c-x)R}a;CcQZFA
z=uj^npP!kjbmGJb8L!oxlNWEi@9Q&A#baWqYK)AGk0)E>H`{FG)9H?#%X$Bvb2j*|
zNqjz~v^Q^(^7UkWnG^#sHrn!o6&-JibO2-fRbm;Ol$6xd-=AAlB;xMjank++)kjcB
zh&=LwVfMV===p0lZOjiG(*2J7HOb=^dj|Ee`AJ8MboSNby+3}Wfrrgaccsfb8GA_^
zZ@Nk(ZQk~eA4grQ65141Idw2e+&Toa6e#+*H&0(sSU6nf%pdvv$F?7d9#?dCchAkw
zS9fx9lJS^-L!0BmK;>L>G`Bq*Zs_2U4@RCI;iXDPM_04bAxnO(?Q^@#rX41Z3j6<_
z_D5$PO|H)FYVfAh1lQL$`}z5SJ*lzDWSG`^G(7U5_U7c}{rJiNEjY~n?3SdYq<G^U
zwxfSWbc_AN-b|xO!$Lr}%F1+U0|G+#SRBl)9QINtlgajWb~+9Yb5U0|Qk}Zelr~qh
zp@ppQIvph?C7q_fa*7K6qZsdH(Dhg_EtN?2-eI)2`^J(5+s$Y9;MkoCpeDgSB~(Xn
zTg}#DEqOT-X(D0McJI_d9hJX*?NQl(p5lM(>pfsD;Kg0h+$x{k=M0>FeNqMLVDIRt
zhd>~DP9OeO^<;dNCX{so5(`$4h4LS>ywydUn!n%FTV3WLdwcsIyE|LuNU9%g9LZ8}
z1293e!X;=b=aHvF?)VwE)UCJYgpD%l>+5s4|IUW_&>zjj-jM6V0!0iy$@XKDJXdbl
z%}Z0w@^VRH=x%mAFqAKcIeHWs<T9R&H;R!s{>b$6`#&-@Z15JHdP{R3z`PcIm8;7l
z7JGiTC%aF7zho_r%Hcj)W7nNE6RpDDRaiNk2YgG;_@5_0m~H+Dg6Zhjdu(iMG&eNt
zH7AVT-JFwoIvoW>**i4E=3aLfn8S2dvh$B@d9pxzD%8BiN__V2--iTU+KUY?sus*N
zzX4njZ5b+@hw`L`pDDJtw|}+yL=Dt4Fqlo}*vVn{SyBjRkx&Ls>Azyg`ZEeoPhu}H
znZ`!tg<-U@C}ty#rX4{+K^C<?sAw>wY;E6J-I~b+V?7g-i|!ZyzW?jRJ-d9CxNc^_
zOmm0EmCn83ugm>*ynv#f+=}0|72@arZi*Pn)b=CACW%=FojK}P_&462k~7N%K*s;A
z8?XpGO%I%hWYDWW)bk1p^^J{<d%7NFXJsif$gM^VQ+L-LCYqzew*R`8Q>=Stdt7(e
zo4mF*yRkg}tJFGl*k?r(z4priC`E{j(G@y{_mq{XIhq0_h?*CrrKSCM=C?Th+%M4~
z4P3cBb$7>$GMPwjWQFGx6=@9(4e6+a7RJP!8A1?z_k5dbEU&<kfdAhAS$a=$%)F)j
z1z@qrzmwtiKm)wUy@o8yNS4Mhmh?`a-x4%C(0}ltrJ1%Ng?5zeIj~#oE5kH54_t&%
ztw-TI??q{v@&bzhuSIhn`Q$pOCP!-KHmZA80?XCwiT-mlWF&3xt<8!++`tBjbt@5l
zMW*?QW?rhm9`%`nbW~W+wBm5&-F2)v$Ii5hq(%Kf;O!!SnD>svJ2d}!iydekE$;Lc
z8k2i;we6ZB*nn5J>M03|LrK`q#-?s(IM*&*kB^U6V*4v_hzRT6VtaBXx6{OJROy^z
z=0~x1`uR}-rNKLUU$NsyraIXHyXKGtMPg!Fta_gOed$QZ9xA!|GPB!`P1Zxh0bkUs
zt1Xv#;PA<u+FDs~s{zd&*3?X(BV}m2g=mL~*q&|&F%!|iBd!q%#dtGsO`2-1Ee_>h
zJ)RzMePV%tHAgO=M}F87H3*S<Mn)IhFaLP}q{{Kn5??YkHI;E0@%P(ZNuA3~H2YCv
z*~GuSUiLMZVa~yPD~YyzUl{!Er7MSr{KxY`OwR4S{?X!U2o*TlnaM=+zE0$>TW@c#
z5}QzQd3pIv>h4VHQxFzu3zc-^Nm@a<PSamE=O3Czb2OZdU{X()Mik_BR=bVLY{IqP
z-uMziRRF?S-58IY`}X?m=8r^7Mt_;DQ1l4i_FLGoOvhrM3d7blH4FY~$3=7E1Uj)U
zae^n-;gMLQTA!K%Xa7sa%NciIywP!IUL)Yamjv6^<oHaU&DI^6MB`Ezh;n=d@s3g6
z$My@{eJ9Nq@X|`7M}-bz*eKf~EpU9&bWvIivEvp4b!WBIG9`pD9<(hA+=nHC(LQ`U
zE@cF)@r^Wk3`xNFdM!7cC$~v-ejI~xSuoR-+uq5kHxaYSQ+U7RHq8y)w|#5c=B6dz
z&Fzk8&92ROTIrKzJgbRYwVC)jY+~`fdT`1}i0&wgQ-JQdPgLB|Gcb$SdiS|>?_bFb
zv5KLq=K3I3-TC3h%?+*dVsB%Ki&1bn0YV>t`P(Ss<CvO(3GZJS?+gTnM93b^*~yuX
z!4ow+9BLN9aXC>MoOC>}G!0&T0Uq@Xy=pzZOS<<(nBsA9kukZ<Ji21AtTZFFtPUTd
zz`>@k{eguY29yeAO2Q#ZpI2^KHBma+E>V1egkFHb^Cu)?)YavaWzU0WTEi3qHA*!E
z`D0;|;z~>~3zVLTfUZugEJtg8CMi!BPZui`cZt2jPkzaazKk^EEYQtu{Ue59vaEm5
zDLndUz~H+415PGJHM+p+pvZ2zu5KuCyNx?ySa>2;245>PA#0QoagI`SJvUz;Q!9+v
zwe5z%BYobq_-eiBt!0C(^>jWj7k?cW#~&Ay?Z+M>lo4}UoQDafTCMRQQ$wK(HKoX_
z2$qVoanB9BiUt^m1_=6XQ+wSy<+3fCB1*=fhdkzge!y;oV!tP1x2=a<al(REu7vU4
zeG^ZdiSep&Rl)*6WTpRTQ6#k=&MZ1a`KaQ`(n7vlBxN|iVo~%Hv8frOG1iuRxqrXv
zbE{a`y(|6uS&TU|1vB#m#JRIu^}-Wbbhvf(5*$wQU+G|q;6FvicGHCyU8lsVOhzum
z7Y~RK>I_>ysae$a3|y|x!eKi#2m_nzK0noCR8=c(t3||}$rR5${bM??)N-mdEQMEB
zT1`*{=S#FZ#A1SGp%i)KmgyH^40eCAQ__tm1{l=)Jp=}Lt+myPc1XmP`Rv3Z%+$A9
zDj_4|y^)%pT8k^HUPs*WJT5F*Si&Yx<AMI-+q+Cpgqbx&Zm#%zAG$<<i4vY_*cZjZ
zWjM<@;u*TL-!W*JuKN;Eol@CJ{f=A+wA9hu9HYD>L0xIHEZ0vO<ol=?wcL;QvvMxu
zj~~3l)6Gp7Le-wEcozr1aRu=xvge~ZCR?Y~L(RglXj#}1Q|j=c!&fV=uvM}HXy&~u
zvHbCZ*{wZoF}Wx%3Hvk+y9QL2>V-7m6HamOd8Kc+cw@UhC<d<%x^>Q=Y~RsfP+G*x
z^&37LA2FM~#d+oB`ZVC9rlxjiH}oAlad?muvF*RTj3#LYXEvfq!pWEMNwq2349$ti
z^@gRhF;dy|(5zd6C{bN8(=7XtYmWlv-`I(#^R>ho{BHbRD!AC1V%G4pOVF@V8{-kY
z{o0g7PR=ZH%668xN|?e(|A5_3^^Tp8y(}r8zLXMYrDmmE5M}=x*V7i4a#h`9zGtxK
zNF&cWl$haYfGO80axUH;T_BNbCt0tn&G^1>lfPSC99xJ(lkZ|oNhc!J2VC2^Y$gOz
zI&M~tZE>ipDp@vZ8hKHV?jzl_=)K*hzLp#y@vY%fZ}Lkn#KQZzthFbc5%E)ji5cfq
zn>yUk#Yx<{a+)?hjHr@sYkS^i#<!d7-K)=^kN6g~@C*r?n+us&8e&G@`;7ZhVv{r9
z$z?lB`QsJvJ=sqdS36%pa}ccQ8k1*oy%O4T>`KRNTf*LP=^CI0)B<^>!7|)=WoQRZ
zTygC-wA2Q@O~QH2moz;E$jxB8=_g3Y$m>Yzy1lb=9}WGrwzlr0$Y8Q{G1UqfkL<ys
z#0l04wVAUp_|OQ`PRG%B`4#vUD`^4V%n@ycn}`|DsP7U_KacCE(y`gTf(j8tjftB<
zuyMe<dzWp$R&*uS2_iS#DT`lWS=VcbWXi^;iEdJO=iTtmW};xM&>Mc;>!vmxa-|Xp
zEqdWCzMXcE>gy<WN(FCqy7#0<9Y4}BJx-q2`sAIIf@0lvuHA3xB)-cFIWhEntzmCO
zW!JS(0>`v9j|*hp^(n7QB+j&IdP|q8J9o~Jnh0$v3<oGaE||HUOR5UtaTk)es#8mh
zJbuLt#`%}3U6B6{^^zd536oB!Os>IW2-G~EDU00fwN~EY<DYcHb#|>%o|054Lju(S
z0<f<8sAVB*Tf${ok0g!$BLe!2?jVRjjw|kI`5n&VinK&K-q5T|qVs0D(?EsJ1_zgs
zk<n^9+)o#cMtg0H21`Er_G-7<@_Z|zqGiEX-H&jnT2WLj#du8rpgerhLjbL=MvQ^`
zJ{Wz6j0*YP9EMf$7<+`8QMXdjjM5?shYz+k4u2XfdEr`%Z{fHvWKR82o4*)*5HCWW
zk0SP8LXxIj=YUwS>K?z;`cZhAKsD(`y!|}i;tHS2l^Q$ajVLdQaZ*^X2JV7%xgg%$
zd{vA?XnhTby3&dj?+~x7d-Z%+rZ`itMo87gY(se|spbW5^~I%gl&_)<;}p(<#G2X3
z+KOg8Rm0h|yzOVLRaS9K3L54yal>!%$)pK?X6<CeeEdMI!tT-`N|0etpIe%CD#bL%
zI=mjyIw5G#s$s+<;e?uxqf{^Ke;fx~{AbS5VmOG#3KMU2EiKb&z!tzc=#P#R*}cTz
zipht?MQ7jjS^~&}`?w=-rU3_Hwv!^w2O?;tckEy?Gy(pLpUfVyd8+uGwz{eD#JZzS
zRk4~8RMF;#JzeNxYj}i6J~KvlA5ahb*y5pdmzA?56|;D+wUdQhM9)Ye;mq|`A|Ze2
zyEdcq8*bUHef@O#)(*U-o6C>h#=_w-16a+)!lubNspE^!sL#i`VR#!#N;1<T8(*d0
zhqi5o)(*5zg?*UbXEV}N{9;0WalH2y6U9^;R|$`VpI%+1pZ*1J<?y}j+<meC0YkG$
zjiSfuWgsuReltqeS=X)WI47hU#?IK!gnGH9947@8C2ZHNcIZ`y(1{;|<~;0kMV(Hs
zJ_I1w!_Rve;ngF5GKruQtg8UHOovMizh8oWb4MWNf}z_VCeZRL{hfI=HJh!ApS>xI
zC#%`u%}&0s-RZN-7vKXNCb2ywW`0dx)(E7r&DeobH)2!@n$)9KW%1+42-?T6cJQ6l
z<glme?&oyH+LrN0^<KH<X3k$_suxzQZ2dS5PrbdWE65)vW9oAwk#&XIVN{KHmk8Y~
z+uou;g^l?L_xY%;7pjHvxDLP6`TE{c%d83B7snC9>L~WW!-!_=O32`Fc1DqtV*ZiY
zq>MHE<aM-2rCas<{9&dm)y6jSjF_eyhH#^zMgPH$a+3GEc({?or;c@@cxg_8%dOpp
zR2<ebwynV1dWyg$>ya0C<&_K@FhvsM9&SHSke;q6>oNZwOWndcd<{AQa_`qNXEs$q
z9AZGOa<|CtjEU~1DeIa4zU+Th$gt9U)PWF7pb{y@$K{PHw01w^nfl}f*87A@h2%wK
zeWNw(tj!`r*G$<+Djq^U<A+Hqsi6e<#RDEA)l4JKb0@3iB3n9q?s+t9Svl~YAO-}l
zlh_Jf4_DyO%TAO{$z{{gA!5_J1S9i=fvN|KDNR;W$U9$RYORzb*f7QiGQ1}u77VLK
zvq@XX1djYvS*cd1VcyCq+tN^I?!y^Vac+Ckrc5L*ZYCP4lkb9abCu;_^9mQiw`NZo
zn?(_-6r7t(`lT6K%@9PCQw)%Uzuz?tYAZ-RnV$hRaBFR$o0fxQr}`ObYI@exxV^zy
ziF+-V5a$*{*!2ggF3w7LC4-8scOun=qF~J7gO7iX@*4A*ulojS*YQh{(@SyCjEBGW
z3!rSrUA`6!cKN!pawHCr(WAN>$YNdN+f{|KlPBvqYnLw3sV~OmUXb(Qz4f*)IYG8c
zakPd5$FaS<B(RN5bm%NRXI`o5M?40m##K9AF<LJ7>ewV}gy7&t++YNUnrU*nRu9(4
z$R4S<NUoe@fXASB$LVdZSj<yg+-H3daQSqXChd$4;jj5i$d2(Y5%+?`flo?)#1+?L
z(6`=Z1s5f^-<=0O<?6#d*f?$5?`XiM_4fNQ(Yp6d97q#De!xKL*i;Wuy)d&|l9Hsi
zwNB45#Dm?$(c6g1!W9N8B?WwT2$RE`hXv45v(sJlbCc`4h4nS~iSsuL9)cClYdX23
zpEf+DTnqPpFuDo9%a$C3_%J@y#3Nje7OVt#V>r<Y?sLbZ&s|(8Q-_cBSx1W$yKdEt
zK(!MAhkZosCD~D8wFOPebez}G^v+&)JZ87+2!i#9idHn*z<Eb%GTFS7>A*_7Ln3s$
zn4a}|izqcFU~;`R&QK|Z{zZc~rBAuK(mZxx)rrzarubsabGy&(GxJvWTVE-a^40Qa
zgrU-6a$;%d`436{T^o1{5Z)b%(OG<{J}|%>Wi3IEU&)#7JrHZG_gI^$?469DBvQ$P
zg7!80Ms6q5r&7;XBX$$cf9~unS91QU1<<Lrp|8=GwoFCD9gwyye%A^tMyl+NM3NBN
z>kgwy6WZH%Mmw*!a%{g1V1-_haP`?O@@iY<AFNhzUZ|YVzNsM5OnFHrl@nlV*~ZrA
zk;-2}4!a6j1baz*_pZJNOufDw8bcr#e|6Y@XWgS3zk3(sR~#@P&n@dUwuD-{YC^VQ
zWdA9$-nc%=;G0VD7HO1hNqwd_+F60?q-4yW;D{+iy}@>d0{v%Z+zZL8FV@yP7Jil}
z5&)$_<GTP!s?2uu#lxr1yKQYN9G*V;-6mUG!S6GP#bwJf4Q{;GP_6cHdr{iyXX=NC
zE^%!Dtg_uj<lpWeAPHd$9`+B3XU6Mf*OV$wKaTgFqYIqFij-qdyT9F-le<z$E}n>V
zjzN<{tL-3^Pox2FN<z@!w@4?dU?xH-g@3oEqPcL3gQQZyU$t<oG}dOS6Z3P%IS`H&
zS#KraDlyk@vMQLwZZBeWe|qTEOi8&C%vtZG(C;j)mcw^CCo25ZXMde>Py4`)Hguj#
zZQ&T;Le7a!RkYt_0%`$ft@y|L;W=Yl9^;Elz1I3|$rG{Kd6}6!vv-*<3kb>Gs5U;P
zQh~cbSbu>Ip6uI|5=ho@8A8*WQ=_*#sIoUh<qgvuLI-hFRT<BF9^`DR;Q9o}aEnxr
zfDd`gRTd*(XFxU+!ix}=Ue@z5v~p0b>4XS;x&|!3b@D_C#pMsBFJ&TaCg<W^HNisb
zt#u92J8#F#|B$t!4_>-4uWKCe(t!g=F7@%jWjl%`RBz)>^3!!<bI1KFbahwarRoa?
zzaSVfo5GZ@(2-vVNgpH3u2^6sG0uFAhfd0e6Mss&Cw0%hr#IA(K_DX+9Q#X^kZZQc
ztY5#38h04Dm4D3Yu=u*Dm4%#H+?I0HbY-R92JQjm5CXgABKXUd<M0XNNVRo8C4loc
ziq6QH&Oci$o}5E!m5kfF!xN3Snn-*M{7<%Q0TMqs^hhO3Wi&!+!fe-=l3+-w#u_ca
z`F%>XcC88njM+g3F1^}uln6W+|5iN|N2HuH4tU!jC7(VYo1!+j9$Z>h6e@Fa^EpWP
z2S_pXc&eE_Qf~H!qPbV%U=1`Lelz3S0+wG_;+>NOSU?x0J*QQ5D3(|A2YP)tALP8A
z#L2haMW(f%fcmz-lQWLx(>7oZYPAygl^2a|;ZIpKW~Nn7w6!~>&A&?H;Y7EN+|10$
zw>PWAS8%uGZssd-(|e2hef?;LSw`iIpOh;y-EC%I-2J3kvkq<6La}0b{fEQqEAfIp
zGY&9ZQcm}A-|WU0wgZs@RXd@jx>F3*@n10ciq7NR^n?wETyO85CqbCuudeW&YM+58
zbO;|UkG6>qx)3+5B9FxSDXPM5^Sa$Z>C_6t_#H~BK=ekZxMXaa){Fc}w2wo2Js!zb
zNh!{BH0^m!Qn`=(?YSHwiqlFtk0k^G37j%koMU35F*CWjxm~u<t$qYm7Laf)e5pNI
zn#rprk-i#$rK~I{Ck>mEFdYcisX^&jx{h^uBD%DHo`--R8Y(3Et=D>uz2-~vn+__7
zrqfDI>d!(knO=A_rxTpeZRwIaAI-j@y==dKdIsk4wcFJJtM;K1O8K;1q7uK;f0Pcf
zQxwpT3vOdy!W2Fj&4*?{`Uobq+n8dZ`5PibE6Js?Q{Sd!T)wnvEq*^4s7;Oc`P$7$
z70m(&*A`ZqkJNY7(7E7Rmsnh^zgCTmBT(hCOpYH+O(@>N)bk~0)b75R2VV5I=V>tE
zu08T><N~v$-o1O@r?B4M-b@Fd16os`Mm~R&2c(+bg9j|`VVCkRFKupzX${@T((E&-
z$vuGY0BW{0vwvm>$tnB9W>v_)RyN*uN2mIPdF&7GbiZe$NbRYR0B!fXL)iR>UBWO0
zi=JE&_UcT9(Ihy|X$$IjK<t!{(e6ehlYGDM5GA>^ETOUT=x6EbodHJqmGdON)G(R$
zsFCD8exD-UR^T}44C@13%e@)px1>n!(5x<Ne@d2Zyl<Ya!a98F-FZ72A^4eRkN^B0
z`POZAb{3|p`kMaOxap_*co1$ss1DV*!9wZxBNh;^aKBmE4L3AO+745p;_2zEObfCD
zj2O~^YALGntlUNN*BF9~l%UTpR&|tv|Gt-sV=~02`>1v579YiwdTSZ!PYa=28i@f*
z2&T3Nr?J9Zb&2^yg-cV^<S}ael3ngXZ;tMWTGc&gss~sjlu!4C5bBG}9rr*{8y-u>
zD|IOFO-q1!?K#zd3lv)(K6dHI1*oy1p+QhkFhr)q^8v2d-%#-Cj|1agtD`gRg6cNK
zJ13ts(3He?*?eMv>w?%|?}w#cjuxj)!3OG=A7zT8p~$qQ_Nhz_?H;?1(d4;!-(6Oc
zELD{D+fwDxGGx(G3K_<n?ohJs>b}J!zoJhGYD(8SaQy96p-OmuefF*%W|;*Hv(OS<
ze}30ww8C)Q{RH5%Z_O{wih>i=wIdf)wE_bJeJc*VI(q?96ehXn@4P%>mCsqHMM(Gn
zHGT&dFriM2oPR-6h=nHL0j0KT87fvq0v&dP>nqLTyvB7OlM4C3@KPrcyHNUvFAB-l
zft}RM!9^*{GI$-l$gt|S`9vi2oIB&gk*a&6yH2h06h4w>r*ewT#_av#r3Ngl%1zO+
z=s6JKD-N?A@O4(xDxf^Ey2^iKKhGI4R_!Y-%!&s-GksL9`5>5Xo-~lL%wvbjIdB3|
zr0P6Q5F9MmA-(u?LJ@A%e?q&(Y1<)$s-sGTRsBW^4(`^(EriR2`>5pCOA?}yQ^fle
zj`##g`qV9<>I1Teh(<2^FlCyfH~`t#wXeP4M0)ZW)*3IOuyICxcTx^56ywlKz4uKH
z0Q_@GyKWPNi9K}$UJ|hD)(8CK9QJ?Ce84?)KfbHD1O8)zw3stK@@ZA1S_;FBB>nu1
zEOaccuk33s+{ufRK1GgZfDa8YVV0&`y({n3j+JDqkFrMMoYFTqBnhhp^|n}E#8d2q
z@3l)_67*7XLhEaIfn9E-rzm3nJy=mS%uHZT_ek8J<Px=+O_q5`@)VHS-_i(luTa_K
zwg1*dw+79J8Lasdo4s_JNk(1mt<*QmP3-y`za?Nqh;z$`iF4|>A%>Sc|7tVp(qtn$
zbR9VnF(01w^Rx|<v!8<Vj=7qJZ%^c*%apTFosD{EtCY&pj*FHv;aoMD`uXXp2}y!U
z@e&0YS4?FI7ZDquONDKWL2;GWfn9?EiG9t-g40exS(!w|Sx7;-8mM76y(<5F7txbJ
zrc`St>GdftLnC~QoaYb|HbrqM6%TJ=UdleXKe~bx1{jFkHFgCvLl-Ej8RtoW1LBmW
zPIUh5;BX~l(GC(u9L?c4^tORx6H}kqBv>_dOuWJR#kxD|9Agp1JJ-#!hhg8<hd#E+
z^@d1(<Wj9-?FJl|QO_dYV3}!^%Xpb5Im*O<UILb-i77KsBeEJb&2*Etu$fD}CG?A%
z1sWErJ+Hy&Pn})%)(5qWhetpV1a<=I^Yj6nvp1%$Htv<ynM>kJe{409r(?^Kt`%7w
zK|^j{bSFj)Y{#|z6aZL##|sbWzR@IPJe0DM6M2R>*-bjUt3N7~O^;D}p*!z#LWL2t
zfq-qz=|J~C6UB>Ej+<L6YZ<ugY-LP*hBkpbI}m=8m$2m1qr!0fts~qyG_(*Y@u}jb
zn1Fz^R+d##+sirY#?IK>3qnlstr;O1oR|7<l^T$==oJN$qXA`I^K0UQJxF^JpcQ6n
z_y%NsutVa&+6h!wH<Jm%c5wqt^6LDu@g<rsAPwiE(Wd(P`X!E#k9|KNF8eZ%76<bo
z=3aCs>FNJub-!p5qK#YF$#on;i+7(>%SyG8T(x0z_S5nsVowz6`+t26e!Y>^_69|t
zK#&`0I7#R&T8byO;-O6B=<(ZL3_>Pbc=7aXfX;p(@h?`MXgT9~tDVd_jFfan)SmHG
zB5MbOiWyRbwKdeTHnmWyQmq~LMI@dW5CW)~@}@C$i7C~3HM{#LYv-yD3{0#Q#zIL+
zJtgw9+;tz@_5~JG6&Ekuc+&UTjAp4<FaHf3b?X4nM3-MrI04as+`x7TWOsJXe`h;u
zq!$AUVJ~pKz|a29w&H6~h{<)pLWz@W7@o>qI1iqY+%@`0{P4u^Mo`;Ny937a&1<br
zz7PD?*B>8wU0WnfZ@wAS_6i!sBJKPc69#?2SGi^$yk>BUmxrzwc8`}w$SUu5tDaUA
zEEA>>9d{+ps~c9Mi&=Q%vvWN++iX@&`f13QDqc*k*(i?6NK9L|tI)9d)?TX45rgtf
zaqMLlcoIKg$`b3qeB_LHuO*{ic!H@*?Dp%(R`gCO$Zge42gWEq-)js;)d_Kw5oA<u
zPJ|4NuHaJMt5bsY#7XlB7&=C>T8726<ooDcV_;EL7b@NS)@EP|tua-dOOJRdG{JCF
z2(kUOnro?i*l^`&paYiM9Ui&)(S^kacdYtRQ!vsz>(irKm>^ldyQ9C5%)c6jExvJh
zn~Y}7#Z~QC<i7t%#ohv#Ho3Do)#uWzB3gz{*E-Lzxu-1w_356?suhY9Elw90BN?Mn
z1hEgB*vXaROI?VEOADCS>K1wAKXokgS-~w|2^jlj?ZsGxG}--mR)??p(^zI{sC@22
z$^r3s?kyx&n3#BAgLv#zb3`(4<<j-)6VUj9owEXHq1kjIE_;$;=gw%tT-<%~mwb2t
zkijjpz4oK`9G)D+{iK;g{+ve`gT8uadOsO)Uw`vS{(8DnEY8bHvkr?eY)epm9Suu^
z*?hZ*Ivtz&!(PDC{-X1ncrWjah**;5;R$08_5O1L-mZ_s%NP5FDjibhtL*S=^+>q#
zsIh1>hwrsn?i!DZ`5t36@#h(3+0id!aCeJTTniO3{!<K8J?DXNdV^s+F_44MpS46L
zsxPpn$+tNmzPNG4ZRb{gw4Bz)xGcEBeHEQaxBL5Xn+Wlj>#i#6ElyjD-)oeAiRZc`
z&41dmK0kO#S3)Pt@f#D<VNHb(8c$Hyobv)QD{+!3QP9<j!34l3;;%Asrat3CJggmD
zdy_f^G-^ATX>jvFzpC4ztkEfS3|;A2K<96kwiW2R7W<fDMrWSMMFx>UOjmLyZ4W-p
zV7|@`)aRkgpRzM>+&U^%@AU*T>+5gtWxG6Qlz&W&-DA+4=`lTPtZx*hZ-%~^^!BpE
z@9U`7>Q;QBF)We_Syg(a2I3XO&@b5rh*oJ(m7;7KRlhKvjC4$Z?xw{RhHgF<X)nid
z{Nf}$!D=)#=VOz<)=pga<sPPs3>7fq)J5MH<lxg4Q_ixl)0jDu%gMt-@4CeijE3<F
zr_Ln6Wd$VJqlu5Bk{DX0oR}{Vi0iF=ErnD=z}#CkY0Y4_+&>H!ogjH58H>j{CdCDE
ztx7b=`%$DW*yIh=X-jLh*33I<YUd`3=+LM^;~L!}%F7;~YY44t3(@fYYu8x!dwKBt
z><oxo^5XO&X0cnE2mzCI%UlPy9+hVlwFF!TNN2lJN-cS(D%7g`0v;+@EMh>Rr30<7
zxPYIm*wNVirmMKV`5Hl4GYBl+N$x4<ndLv9z|1F0O=KJ-iJ|huUYJc>59Fc$Z7M43
zT31@!kwBn`F53sp{LBD40+uMnWc(!1<RBgpfWTLD-o01}iONVz;{uH}$8m@JNhH@H
zPn_oF=bVBpNvZ~2k=X3r9lo4s)T%<iHAf7nJ7pD!8?K^3q4%;xnzG05Gn5L3=3YMy
z=Wa`q%DY$iV*^v8+I3t67rm^y%{=-&2-Mh=vB;*w(K;zXi!V0w_Wjj})-V*Wt{6%0
zxs<18<O>9>Mg^0ukD<IYS&${krY6As-0n&q*yzJg^vUtAd_M1%-nKO<&pO$Mgg*}7
zt+a-Hxr1s!;5vX){ZU&dV+g4Un>k_-W5Q49<|&uLr4+<MtCXDAV_{Q^Kg|z!{GNN4
z;5~JcPKZcMZ8<e8G+3*&JJPMg@oTa~UtCu{?_n>WHDAZYH@#igqXdd!E;|QGC5m-7
z`ZQhPyWGY($E`);1~y}Sh9rOw`8aX8p9!1!us7JP6QNV`yzNa3$f0=xxwD(m%e@<p
zM@K+7PK_EUH~KPWTs)0X0CJvS*b{dU3P_si+{yZ!9%cd1g;Q#cTcvfuZO#=Nz9y3f
z;5r+PP*q`vv<SpPtAW7%W$FG*L~C5!q`{`SFl)13gx)=jnn&yYK==@U<!EZgnpB#6
z>oGv;ARdO!_fQPY=4B-pe-e>Trwdj^j5uW%e8pD`a9Sun-TOZ7qD!noOy{Q7q>9+N
zWu2aHleQ+-&^(pnN)*LNhVcDWAj*1b{QlfdZ)1vB$XEDUP~YB(le)=DjyA=RlC5or
zL}iHygC5K+dd{;=@udny7VoPx6x#3D^|_OzeC~~QxRYf4M3CG4AH<kI{bgWDxPL|+
zuoEULL%>q27djiVKO@9)`%7_{jFC--i3?v2)v$CKp`yp*?(c|ItF8b-rG3yqP~!lz
ztIt=R>cYsz%6>jcMUP4N<XWZZmDe)imqF!}ziL?lrB_mKh`o?{^b+cTYqB4gto8G@
zSAK6_g4E9c(hFKIlfU1D@Ai7M=#?vag7G0Tjqi^H+yXs>copcTPN5mv2-M}}%H+P1
zysebA?roTqZ@=aX(pp}3<mHi=m8U~cfA=zBMH`J!rD{CR+x~+&uL0ATwB5p&E<bjR
zv}G3Uyi1om-O7G|&@WQCdl>fnR!^{tU3S*ZgLtHdP3ujRo(^@WQVbRqCBX6FVT%*c
zrq}^Q;vg%P*PQxjI}`(oKNUAq22v>(RM@vRjVKFL`D^rVK#a4I&v@AIBAcE{w}T)w
z-fh{Bnk`Wq+)$uYOSLZ4nU4k`qmA&5yGb*~cp;w^JD$bOd8P#fa*@rG!d*MbuzhV-
zvF20j0OQ~$6Wxk)9PGv5bmEmLfN-+x3+fHCTb-y|8|Px46wz`A^H>^yjD2hV=<R%n
zx#6SU7ch$_J$9Q{b8pk(i19Ij^yb^$KOIv?BISx)wieU|S2=ZQUgK|*+o4+~O;q)-
zw);P4sK!3sTBw`@T~l2>xw`uImfqFhkBUmExK%@}WRge47bCCCHXF8u)v0_rfEAT}
z($`zKhQ9bZW4^!|Hilr5XKR&ebi4KuPT)h7ibySPmO@)_3%~f0+nG7z=0?k~{&;h}
zkMr*wQb{fXjS~ivB6SZueq0QkV^0Jm-6QN~KXE782WUH9oQ`uKe<?+3!q_Z)(?z63
zZ}^h;%6X<XbDqqQLmrux<>LD3OeRQd+k_{*IVA!lp^dd--^y`BFJ<S^h0^hC^PL?l
zFGgptn`@f4vo`(c*0&?(!<4$1w!)%Wqz%5vr6wwe#Tsv6Es;aFBH%KYDkr^{9p_7|
zOGB{*BaItOR6_ifdmo>b$ITdQkf>3B;?Rn#J>=}I;nzVHPj6I7p=sxfust2!cLvYv
zKQ{J=>3q{FU5^9f!RN~17cy&!7-Ph+XLgo$D(H_3Er_{p;PJz8ro-HDZP^mmw3)*&
zN@5b#cfrGtJ1$eNIk=6F5;rshq4|-WuLjDjFHC4(j4OJ-?{lRTsMhfgTP|v<*-Q+T
zR_^2lpwwN{hYp99gHjDZS+Vpg+PYQ0sdt^kM8ekD4XT!PP^xZLAw|wNKhb7JJ`C_v
ziVaNsEcC<3ntAKa_WIOBr25e_KuoxsOH6^Rw#`l(#<{jCJ(10H6yU3e9|##sEazo&
zS8;n!L}Jd6KbXYjVhq2au|l%G7FP^5lg7kp_EaCE29o^SvxCg;mrXR@=vPg8=5n(O
z;kT{|pjc9MU2sjso;5gs^>fW4wZ@n-rNwY6d*~qn!bZ(thdX_q{Eezkz`j9V4MMQ6
zBf!|J1Ox?P7Vn()ojUlO)*9LAw^p`kPMt%}gqm-s{q9UfE{{>|8e6rJMQg{7!S0;}
z1N*%X&wroH)Ngm}FlGapbb_(XgsXObC8jWB^YjfvP+j}xC(vd#ynx0rtwr2qawmm~
zORfu55!V^p9*9*nP|Gqy7_ZbQy=K^!LPaxxc5Rb5=w|8mXo}%_i-_LFT0YGCIID@4
zga9fxRex!h5S?;Usx%-1_=9i496Byd$ON?nm7N@uH`;*Z`rtFylE1aBVdT8-mAfU_
znfv8lh1!=P>{-AP)zZ_0YNO_tAtZl%VTjBLk$S0=D8kC4E0uC$+(aFhxoqoJ%MI@)
z3Mngu(S+)ULPg%?J%n|r1xZk3OQjNl_NCtbU;cDCLS@ji1aDEIZ_kqsq3F9grJwFz
ze|Lah#Q4;~yn=$B5GJ8j4(d3vhl9GzF?Y;-Bj9&ON<L`Q6-xdb#eeVPh6hRvq3nA<
zu|eb6Esrn4_=;k3@7*j$6GWv(`+^Si;MC+mL`!z9D6tV0HrSV{-d~erX&%M0bDC~_
zCt|+G^96qT$))Uywj+yFU)1bYy5D1w0`FQt=w#sJ7&^v`Stk+LQ#h_S8M+PBPJt?-
zP$_rQiTP$KE?Pt2zE^O-0McC0>;gI6&4Nvq5wnvtF~o$-BR)<btl#$GyPaXfUq!}S
z+g^z<T&8}y1N#!74-)T4*i0+nHhfI@5z|hTMoAq$X~Qpi{l<Q(fLos~Mi_pMGZZM<
zJdMg5NQ>Z7C54N&EDS%>$KL{SJ8t@?M3c^W1TdfPuO4R#vH+sPwayhq1ID%|y@BZg
z6Wy|-UR4wb?ZU<t8mYUh*<?N>iEpzTx})p6^n#-YxWxFHpq4{fJ}>86BOBb@xB6pZ
ztrF##`|WS&n(@?<MxV)RIl05M@zz5<Y*0?*Ms?0v^ZWfL=odF)<|m|MUbmz=U5`o;
z*Z$&*<<lQN=bm)TwboA%Z-TT=ok-apMNDWHh0E;Hp_0}Go^+lc*V%>&N9%puFrcg4
zc^8+&=AN|Trb+TPi-9}Um3FQGLRgm6UaaDKaLN{EmFTDQB_MfR?w9Oc{x=A8fUF-7
z@kRFwb-^IhAK28}zL4sOnolz~xVlm^%{o#Pkc;B?9-qn#$kkDaHmM!#<C_>TPS>Kv
zUIoT+>=}?H2W0_V4@v?i8iv0zYRl_JGR_I#DB4`y--|dmTbQ-q$^LF`h0uq!f;bQ5
zCw9m9`T6g8dRBuL;ZOFxg2E3<?||(aJ)kYWIClhj($bo*GnUo67*x2FeSe;hc;FU0
zzuM5n1aab&wZ;s-shym|aFD-t1;Yn~QWyJpI9SfNE*SA;GAOZ8w&}A3t0twid{ZqA
zHa<QF7>V9_C#2ps;_eJuhfl^3f4zE$)olx7ZZq1P?ajF8Cx<zE2_Ubkah!NM@3-s?
zq!Cx{!!CPDg*kBge6VMM?dM;7#$$OwF<zme8He2Vl5ibJ4K=q|Wt3RHL??BVpXr<m
z+vJZks&vPkV``A<fNW(Zq?TDU;};U4%W6Gh9Tv(3u#aQDisRezshpQ&*S)II9H5|B
z8LfSKnGcU+^Hce<%{sn*ktWc6d%F#8LB$($a&qokFgI52dta;A>LF-{ZcNOOEV^7s
z#~m&&FZX>kV*i4(Ku_0N+#2GbOpmpGYQ-$uM36sdL9qv&&ljM6b)YbjCGGb6@sA8u
zK>-0BuIMPX_q`9ZKEZ4@+euCDUfFgvWmrvtI+@7@r?3!vlwCfcR#}Rha=o*Ax;<Nx
zDSf<@udL(oJJ*bPYo`;f&Nn{OhezGJN>!#bn$rqWF`@m#_42~l6={k!q9snxWH|fN
zwPucIGP4s?=X?08MiZ^GMMH>cKlMHY%n|qq&+hq65$>4H%cu}7D88(jETNeJ^|(z&
zkUL;39C}(hi=X8NB+E-$ttlm5<~e4SIDCn)%><ZtE<b$uD1RGRWg&87!KJSTEk!<e
zY$kr@#G0Jd)ysQ085}RS9RQM}Usq8FNZxpLiA1&Bv>Xl^20tF~29pN3>Z{jSEQeDd
zBfchm-`6K=WhW$T=~I<qKfHLH4BV8hByH~`mUiSwr`$8<&5h829sYIp*FeHOC)?X6
zhK{-iD%<f{*Ts=zR+KyDVl?+F$4J5+X1rWhyO8@`jYl;fB?Rx<&cxALy?c9la!N~K
zfa3#%eGE%MubRSbj~_Ry>+QO*_r2vCj#=}zh4>ZQvNmg(Ua5SN)>FnktCGn;=z2Ra
zwRT%*3Y}OCy@DLe%t?Qjm}^!DD*M*->S+<KPv`;x9mZ$Am9;&J43}w__Q9Q`q;FXP
z@XjK&=33j=<iYh4wfu2Dt#{e!h;&NXC)gL^RM@je$v)j>I!)5S11q1l^UR}i+1+MX
zy+sjLi9JkTkDjm4@aO`pRVSOPkf)|jZh$^VH2kM9a@rh__Vbj!Sdz+cnCaID)T%|l
zG+u>T+abyEDw++d=<$Vb^7?$(_7e~9)EGGBRok?x4pbb-oB80fA02QB4_}Ej^2e(Q
zB)1DDw=1(vZF|XNE{)}9ob7Ya(<xSFBDbn1nL9ChaZiPdcjT4ueF$2-r8)ERm&9|g
z(&ys+xB9>HkB5nC$;eSZ-xd4_6I@ceUu<<M?*>cWC(fQ%dO2N655n^vq}50InYE~v
zF&+HkU$}(5Xwzneig`^EbA((?KZgs;c`Xxkxg`R{r7NQ(uXO?<FYNy5?(kf|7UboF
z>I3iww}b8=FeGEHS{cYCh1k>O%V#=%<=rbLZqD{|8*W9+e+q<gd3GglzSE){m>ZWq
zoi=}nP6*1S3uAYW!98-|Z7$v}sGmZpqJz^Tx()HegGc7`x)QIv-FjNN-NjZi*zsAf
zK+k1J4yFKgelGEbBBUaCe@EJy>YLrOs|;$EqQpsU_IPOZ_1Vk5JbW!8RfZtpp1r)2
z&dDQ7w5diUs4f(%Bxiaj)(^49=b%nu7ia~^@5DcSBr1)}Oy|$%gMA+s%s|L>J~b+>
z6{fpl0{Bx=H_9>CyB`GUy(Aap$o$AzWT`y<%F-g_rEdPtSzg09IrIJoJx$o7iTkLD
zhGXt8zAz><hdtmYEZynR89sZ3M^{oQtLn<^Wof!V@w0}lsXky>z8mjO&Tw^0`DiC@
zV<dH&Zi-5f75Z7!gF5n5EUmIT5=}Sks!vdPNWI~{8&92O6gs!8)PzL+x?`Irk`XE?
z8zw;Ec14@DlH{HmcpX04PsyL~7~)2b%;{v$;L2MUOcMt}<sY~#4|pJ&Ifj_s$K3kG
z`>j(!?+%-LOulW{{L2S`+Kl#gmonaWho`NT%}ds!-Nk0&1So0a^7ogs$troYI=K!=
zDQ(@H`8By-$Az6=+}IWYTe1B2#X_+<fR*~@FQ&}H!?XMj@;w<danL_s#$(c6Pjyb8
z`34h@7Me~=b<Vmi@Vs@t&s&X|$%S6Ik+68wRdaDMV^cdJtHzF3+E0ES5+DEljre4?
zdPC3|x&7Y9`*<iiaE0*-8aa*TH^0YUyX28O)(CQ~uXr?P`P;gU@VBwhC--Jwjed&^
ziKkB(c569$=!vCTD^tM+UG78s9-U2+U9Ls8&m7NQ;eKwy__|Wc#zmW+l+rT8MnBnC
z>T2is@4E)K<$%~L?nu#y+#UuCFpbLq0sU^)WnL`9T4KQMekFwJ>uFYmPxnd6S+V4f
z{|zdoeR&^0-UFRSpy?BM1gxWxYoSi|jjy1;Rr|HJ#Q-xZ?@5e6)!Npq_G^+!QPoF-
zEPKao_UxzlKt9MbQD6-{-dwYBQ&+o(`DCqkzdxAqJtu2Z3cBMivzGl1{3u-+S&KN2
z(Y(%WUMb`^PIW@HjRgn&R)bqwWwphkc1LOAsB}(**L>^5B3#R5c?i^SSNykx77eWA
z^?}bOLSWm#+NQR8h2Sjz*BJOs5kif`EVJ*M)0M4Sru<4(CwlzZ27cy>TRMlz1of0_
z?oK-kgxST?+|H)v?v4SVtxsLD3<I0IdIknq2}dC!VfY+p-OIXi^0SP#lVal5`mje<
zJ*u0ff#Q?BI@#0tRT_eCPrHX;>e~XL35yBE1Xk=LxNA%R&$=pIAmDyvK+0M_kWp`^
z!w1w8$M%!o)JpbT>P&R8>3R1bZt<eADb+sBg}cypU_2dYO|^#k%_wP3bL7%kL-Ex(
z=(bJWJ3gLVm!SD=<DlJHYIi|=O3f{s!5tkwmW1uDAy|d<EVJ#KxVBFN)~zdLm%cHc
z100v|X0EEduwku|eD_(h;@%SeCF8~Sd}?gVH@E%%>oIP4Kj==&Wvf=@Zw`}grMI%K
z*#zdlzb_~fE~CW3i;59QVRR3Z-&VQ+@lgrwsgjy~HFY(1m`}pPzRvGZQ52h`nMdQ{
zw1_7~ji%MaExL{0UX;ECo$Ps_Q`y73vVzLtI)*;Sl|4u|QF)+aOgdP$RI}A=gVJ9q
zrCxYAJ;L*(ESbGOS}bXQH-m;}d|R6_YX8-rrD&47Z01M#*~_+!8gZyPm+9;ErfN}9
zsH^IN4=%c&p>T_;vxy}g1S#=<@ebIFSXfvH`XQsS-}y=WlsA%)pK*GO#q|{dFZGy<
z16~TCIL}tbr@qdJ3+XpQi`0#rgJ8-e{Thbf15Q#96+;48AlXXIqeBxWZgb+&5cxbi
zWf8r-d;s?Iw0j%oOuF^?VKFO1YO0Nzkk#+uv$chne1>EwtAU2t%>*yXYD<pgnl;YK
zW|))5vSPATlEaWw)(xe{ST=LXvjb6%tGxJHMwuhaDsTQJN~ekWr)2@VknZUhzkj?l
zs^+d0tuv+VJ|*qn>+{?JTdIt~K0JK{qVgo03}dGNM9d1-prbM^boXwcn2=*)&o_AB
zv#2O~wKT0Ko}iQW=3X0lM)4R+sqVRNL~rj*z&^-5$nsJG$~r53necRen`6Zc<7_y;
z<|Sq69LpkUF`at0ueGB}ORdqd*GoIaXXW)Vzn@a6Q9qiBMou1n$5Nu^(Z<*^K~TR@
z;Z>l~9+P8vTnN;sF*_~*lY+easE}Ltd(s;Lkwg|O|DgfM(^igW5`HJXfO$+CQr7X@
zp!{*CZe8Zt()+dfer{FTzFse{pOz~z8mF-FMU8hA+6;_%EpME|8wtGXUthd!!f%d+
z&N5D29XDv!3kTw&UQ|~Ct=NHG=cPJ+Cru<ryhBXXY9m^tI70AdM8LfH#%pw)vMZ?W
z8P(InY19b;TMuL-k%K$1o04s<m2Y3+A3s&SAgz*B$~((=fIB)a1tVyN5BI@$T`6~>
z>A20Tdo@9Tgc1`!JEeYo?2s-Xl7I3LdfCa`dsY)Sg*62Z|2R7leckETs&f|-mmqBK
zWF6U#d-Njb?5cH`)%bO1>@8TE!9mvK<o#C}Z}6F8`DPh?QE~GH$-y0#&jb{1+x!w2
z07WrX4h;E?5B&Ea!_#tg({P=pxqO$b`3;n(o7S89N2u4K<NAZ-6cTwV_25_;8fM%U
zLak7<nK#MhRF1SjiW}IhGPZmxm=Q6rzK6*)bJYX}mHseIquolC7yl-<7#`!;ep%r3
zP68COG96e++w^<OtU1z<MtnSa4|+goTMg^4#$5*Wli86kFOsfW1hn1bn7sKu;LUZ&
zH=)>)*FSry)@@NNstev=BZF*uM3<p`P1~DX&+^%>h?KmK592_^M5dLcJvh@*8Ai}2
zWAaTg*_URY`o8%gAl@s+ib4uIavDoKD0&zYH_YUobP<R%7ngFjWu39tTY|J8CKSRW
zXvNpYvT1zV<ds-;7g4D!vm;z5y9Eh)Nt+x(k7YJCa}4m|*~@|o_KnoaW?IEFl1ES-
zL)8mUc-td3FM&yYhV1R!eV_XFrYDR{wlz3uBhG@}SsSRC$x40<VGbEvlM6L|C-Eii
zq>HDFQHEn(<4{r(lX&Lo$o-3O9wu=~+$4kZYnhf>pA`=Qw|DmHz_+ob`+nrfwO1Zq
zc;S@S)EcJ|6RCc{|FXLj4uNQ?tK7$#9R2H&hgOC%F6;t_d&u*6jg~mAsO)_YN5En%
z-|G?BwD;BrZK8Kl9xZ*d7+}F)Cg>#&u=6<&xPT$QH~&)v){fwS7S+^9<ePoH+5>hx
z_jY%ukByDxjPLuJ1cxWocjQ>ES}1okC!>c6a#?p^Hrux;FTgUZ|E}^eOx7U3ksz*U
zVe*B|V(CGKozdVau}i%MVxAxicf;ecsvp8I?QFf>cQ&D5kIL3!PB+;?StLr8Nr}z!
zA>H%1wqgehM`=FE#vGQZPd6AFf?1Fxe;>GV&>pu~7Y8ll1!LXYPP4u71Z<Badm`Q3
z%8ZPS(<2Ta_Xf0@E6M?r>Su||XcdETb*`Z+0E=D~{*l;TxCSjhT$VA&Jl|1enjA~(
zj62yyJ#!SLBf)bvRc_w5MoA5ky0!aGM8I2o_L=V+9SO@y9!+c+7}W}I@S7#DFJ^IE
zr|H(kw?BEwjnnH~KxtQn_G%!TUqIb-owljm&CRW68S+U=-9n{DpyO^tLhc3D@j|wu
zm~ybM114@3=t$_gGBbb3|K4m!f4TGn9^D7A$f=iN;^|p;d6nBmP+pX$hJ<xbQTKAw
zp`8<)x{@N5x8;jjPM{X7f@+F9TFA;N`^82Eh7)SW%Oz<Jd6VIfLw*mwe*y?(styaj
zk%3RU(LwUk)r*v(b1hAekNMxp)M&`b(LElPCZ79D4UB9FWpd#212U5Mwx{=ud#Sue
zgO5Ob<Uqq4lhejx7bH@0<tq2xiXp!4k{tU~D%i60<HTk#(LV8JKIT#jxmhZ8T6S;8
zuICFZ7g&%@h3m<^Kv_CHksuz-&dtTQ+oVSvIc`3zI@9rNLF^)9D`TQk%A;Fv^rAKF
zzm*eokh9LZgp&|a!r8L;$jR{)w@gr3Q1t{#O0pB^UU^ranE1nVSuldPu_Z%|1Q$HW
zHSR4lUe0!st4E0N?Ak1?lZTn}Z>#ZBnZm}##udN$pCy*F3)X{zr%+epO2q_s)x{Om
z1O;EqG=Am>dmY7OD;E1O)P<Cuv&Bz{Ss6z3XF!;HV<{vUeTE6ZOrh>rSq80@R!PV=
z)zO2wod2i2FAax!5C5J{N1dj<OsGVOjC~0)Sz3@iLze8!P|DsQ#*!0J%1)E5?6Q>#
zBTGpb#3>|M!*IwFVhm&Ee~&sZo)^z`{a-%UbD1~Bbusf@?)(1U_x=5RK0g!zIU1*1
zK6+I<)U(6m;4W#HDT3c%odojFZY2yx(ri@Kdy0EMB3L-|39<Dc!q`kOF8pKKziVjV
zXVzbduQq5&??4P?-}v6uKd6R&8vXp{DOlE!EaTIP5P<QO?IgsItg>P5<h$c7S;uz*
zl50ZZAR>CCV_sbIIG08$6!nPB>%uL;f&cXP2fU5qRk{(r1;KxI;PrC#8!IzXxkI&H
zbaco=Ifb7!PWW;f)=jfBe?|L%w!8uByn;y%zx93u@u9L0^;%!?{xc#$$!GW6*9DU~
zCD0*}K2x)_3X@Ws8l5NrtQO+$M*kA2D))~=?1cmaHM6rlHCHp6H+$;B0rgbdA?{@V
zdvQ`;GtRS8jz&l4Z!l`JEMMsCd66(RF1qykAxgtVhW!QG_{xR2&Wm;&UAzI-x;};4
z<7_jz<;5i-5oVV+Hs*M9>C2xPdmFa|pBHgEfoQsnb}dM>`cl5>jgBWN&uGyu<UBKN
zf5U}{x;&$w)Hc~o{I1>Gk^!l(Cfce!Sv~gpOyG|m{ro#Zc*wAb^)|8aEo*Nqv#yM=
ziA)ZidvDpbrd#}b&&)b%QC<U^cA#`Cwno+U+>>bDatcZ<$l(t}+vk=8@Lve}-C9=|
zTyc!FMt*0g=Ak=w7d9jI2=1>%O{he6Pc8&fQ$`(3aHVGkyB0NK#lw{@@eL?aHTI7R
zNa7v5+iGbk(Vn6+BlUPMRRgskN;g`dLdouRyd!(!YAWj>)5m<A2M&n*)n;S6<K0DZ
zaq;V$5a-`NTrQfL)@yVXIaBK)5vbnsct|-^Qec0%^2EFAF!uqSo-~*{zWoLD?4I&1
z!2`={Vs=;V^(sENvM5h+f`?Kf5YbWgOCs>R$v6LiU_#;f;X28u@^W(OynDIJba$LU
z2zTryglrnIdMIkypjBEi8+1rO@NUUW%@*y4l!Yz9ZSe7SZRpzvNg;K44vVOq^$9%R
zrbWp!;+L?Di=Utjjvs;bwfl9o6Bw<XeG*u|3xQ(5w^LAPd46|yxW=BQ<Mw4=Ul$w=
zqS?=UxKJ&9+3*S$Xw9=X(_@gDY~o<r1BUX6x<aCp3%Iw4u#%5OxUm)(=?~K9zL$F*
zr$5Bq!ae*W_{GmLj|Co>jMVQ!0IoLyja@m^=<nwjPpQAoa<HxV>kqUe^f-D2(;xI)
z_{of&h>@AQJYD2<5K(Asc7*U$g=nfX@W7v@Y=s^3?UaVEBes9$*U(03<?v79oU*=q
zvNuT!)qx0BA<B!>8N?abd+xSht%j`>9Cp8uZpBceEGhESRg<|*F;ep7rQP*;+xVwq
z{OnDR&z=AtdbULd<Q;}&Pn{|+HrfUc4qQ;6rP8XAn!#d+Zult~r__b8U8$+fJ2{C9
zz<(e0S29n%7wB*W@y35Khui?WH~LFgW95ttiJj}m0!cLC!<e1jR_<fE9-%n<lLMHk
z#MvtmO7GwN>zXvHa*%LWR`-^!7PV(Fh;lhUPX<1CIWYjMB9FK*|6wuKFY|$ihNorm
z9zS^p+}#$`>$Q))2jNSZaUzMjdkDyStuH!|DS|G;Z=(dkpO2ZE1*N6)ReZUd5aDK5
z6FBRy5Zv5e5U-tsy-N3)chSR+*+POYg}*e}vB`FGeijh&0|+oK=O`t07Ub*9;8BN{
zJN2EfyY{jCA-)?+2|>2CoFjmRZp~(TMunJluO+{qMEoyJh??J-QRETj%Oef<F|&<z
zQpQc&m(_5(S3_|Q#y^|VqTN)|f(mBpF4pAh&wG5GKaNf?S>mO+y10s*PpL>dt$d;s
z7{T@g{fEX>@_xi|bWA)t`3Rv(h4?Pbh(l@UD{0sh4Gg(0!}XX+7EJhN_<c6Qaz%>(
zTN8Dp2-G1`7Nms`h`pk`M|-$Y%D{S35lNq*6e+cF*#RLO!>*fcBXvE@2WdQ_M%beq
za#%AyLY<KxFwf)03NH?>A;aVc2gC@6?<r~6<RkNc5O*Rtu<y^KHQp%_-yNW*wJ|F7
z`ISP|WjMO#tqiv+zE9K=To~zktk8Gd;pb~M{(NQUuY)@)E9<=1cw1MCWG%7HnI*LY
z7{kY)-n|ep54qMigPE90r8dl6V%~hJ%RHe(lQ(m>tUZ&y{V-7W=T7D;3++U(i3JDp
zX#&_YOimnwk~wds$<B;F{za;b^%_hUjz$+mblZO!(4ddp!HH;Sq~Z`apZ|H&o%_&*
zt{2&fTp15yjZRv;4G21pvA@x&6;@JbkB*5{Vxv=6cz%tto;y=eCovD2D<B^dppy8(
zk(zQ(>6p}Y67H66*J1k7GH31@g)q<iK}JABoi}^1Vq|M}YXr>TlA@M&nnj<~d%R4j
z0JS%Bmv3U(W#Cbf3`a8cKdC}V6?9>;XFnlU7O;%=De<R$-apq8$}WAlb~@~Xr{+LR
zD#2>dMQlF83oEZ;aeh?J0f3(|gIt8@7snEen<7*95q7{p`Afd!v8{V_yF;Xq-lHs#
z#7U)%s0=O<wuJ3F)D)S9f*wfeiP395W9`fVJCi_GGWH8MAy!2fa8C6%8+5pmbkw_`
z;(6yY6<1JlA8I>Z1A`>X>Cb(MTpo7XIOm)cmV<mWkF<t%<UJ)S4=nl@ec0%0wIvlu
z|Ln9x$gg&v;g>z8u~TD0iQe!~Z(aQ9x6s;JUSXlG!XVMBQyNi~^h!p~C{zDq65vya
zhLa!8r)CB1%6(;6<Em42w;C#{`Y#I)6yyQMCm^IHgd#M{e)6YARS7`aDP6S%fU?XV
zUhITLIDto*8d5N!hrb_x*AR+<!Do6kXva9Ym4)R>47Jzc<#FY79#L8Qm$-rq{n$8w
zf!0X6rEP_f7hC~{DWv^;C=kMW8^ZDQ>EvpiNCE3sc#m3+UrKxmCoBzdq>N!UH(gC!
zv!lm-&(Qy5`V9vSv~kI$g95VNWjO6(M&Q=yLDpTO&ym6<Z$P&uV}%^YeVhTn=(j1S
zR6|G(nrQ*A+@ec*lT|y;wvD9{JEYNio8LT^(hw<#ZRS!>9R=G>2GcfdgyA6Ok-yBX
zi90jjDA#$cl{8L_6hiP{hC7`c85Q;2TG)1La<!Yb9W;}>a}>nO7YO+@cXotQmjeiZ
z#E&xqAkKi>p825Xj+>>Zk8keD`gB<UwD)1!wTqP}g##Ww7sVqb7|IISs88WMhK*AI
ziuA5NmOcTGXl89cM-NCImQy_5PKxy;l`fxrN8jJxl78ycXvs|&o?6PUDybcGabDe+
zz;c|~L*PU>iRMQ?&C!IQ-z`z=bf0Kp)Tvb*;dbg+`S|lZhm->699?>-rd9G&X&LH5
zrhbp9nPmAQ5B-J@{8<{!b8C5vf@`=EMX~j^I<|DEPT|?D*3s|7ujFnY4;nRx3lQ*S
zR%4f?q|Z<&yTg%Fp_}7*7CId6ddPB>7J2r%sj2>o>FMUz2y2Vo1%-uE{WKm2oOrF@
zCPOwJG&4u1Z0hT5As>4_a341>F)3_%qPM{P`@#GZj_<WBgfMvWjTlEUql?0_b76UL
zY0%X@YNK#NGh-Dv%s$q!GSEi*Wa=3^^)DJ5UGc*uG6s-yr6|MPX;CB5^65~9NNnXr
z*KWUjFPK+Y61y}!jm{%OtMvr)pMzuvY5!epiwl#o4uxv&U#A9cy|mNj1tvv)w19~7
zArT0*PWZ@ErrHl6E1fi8lNF+<>|0n*!dw(@bnoJeFZcbD#N$Y(EM&OoFBC}eJgN%b
z1=U@z^jueU&Uqn&VJQa^2U%A-wc6}NxPX99uD>7I8ZIq!saun`TrwRvu^Kb=Px9h^
z4jz^30wl><BmjG5roL>G&8`oJo%#qL)p!l7;_Ag7>G@xY_oj<jY(}zcr4|T|#b)vU
z1*wAlo5*A#BN@3#?(rXuHpUfRsiSpynU<s*QGJQyS!D!vACbpDNtY^UQt?#{nj-l(
zu6BB?&R-?-4#ucfx;0JTo5oxo{T!egSisWLKB#Ds<2jn`cG>utEVD9ie|mvSYG0Wg
zRtW9`u5~9HRxGO1!^WW{e)`h=7@p_+(CA%$+1INYkMZzrvRZ(l2A^8rep>__={Fa~
zu7cmpG8HU<<Rlv^DAVB@rPM$!CCs}iiwvH;ZBpka$%ei54ki#8$XLfuK$aCus_Ad?
zkP&dy<fU1X{zi7Mnbn9o#-SvHS^-2|$#_1Vq3<bSaTMbc8ZTV&(`7r-EAHsNkqrHQ
zh+!_Q;=VltM~?X%wsvKiko9b$21ldq>Nq)@TO)hC?BGHgFvw2pl1uI%d{Iy`+XhGS
zVoXF$i-|sqs!%@xaJ#f4vB7zEq=ONWi*ogIZYrE%b75^*3T!NnVcVrs2Htg+=$NWe
zJw3yS)=^Zf_&p_pjf!~CkRh4(TDH_7!lRbq2YkjAGl#HcVBF&(j{rkggKN!pyQb^9
z8Xn7In5$w+(+~X~cx<re0Nk{U0r{CYJ(yK2Zm7vq6LNbh>n8S0q|h*|ZCc}~w@WM>
zaO`L#l_i+L#+OEy?2EW<Qes_{&KNxbrKg8oWb3~a8My*#)SA@f$pEr9xtwY4`st4z
z#TLmLpMXvoW#k}(%=nlNQLajtYDwCbWL_m_;=QCzUL48#S)7+i>+&~q?JtLZQ!I}x
zb^dPm-Z|bP0C5#}R?5Q^@VRhxZB3w;mq5IA%qM<tG1O#ZxM^!<GpXNEV%1j2u+J?@
zz?JJssu2tt-3k*~YK48wbd6U%m^rQF=iOAqN`rnbK*TcjJA$f`WRzol$h^BOP5fr{
zx7scBP4Bie@q}D`cl*`oA8nK>r|m~)Q#os#ES~rb`i!aQLCd?zV~&~1K3Yw$Us=lr
zY?4&HF6cS>^m*KQa9A+|H~&f0aMO;{Muy_D9%RN`dV|}Ifc9OXCB$<Fr7r_RF|Q-V
z2JlcLJIVKhPLOlpS7^RF4x){SbkP;PMQ#$BMwz{9&OW|=hLlR`8V#@2f*uktA!VT@
z3*}1G2%Pm9rpXFwMR>@_np~iCqKNuf?*U#UjVKy8esk82+|4p{?7Pw9(UGC=)kAbD
zs57mRtX()XciJF~2f!$@S4oWLjSjC+f2%Itt|Qz_s2J(MJ{6ukwdSR3HQme{ZO_W-
zC$m1^6gupi<nKSb+V-uD#q?59XzgE0=}qn8+`}naF}@oWd6;kU9F*k2f$J5@8-$32
z#AiK){;U&ezGox;gi!l@&vBfSjbu5&Ppq*!JSEE=Xl{;L=g%0gj;LN*{`4nlYYoW5
z@DNgHx4k@Hy{1|-dzXt6Rg12qO-&`lRx|QNa~@yt{;Y?j1)4%^QVFR6n&6w=sN(eE
z`Xau2HfLHxk%K^=V7d*{zNFe~^dH9rHYDg>l+y4X79+=$H+8EXSUd_hP*qQVWV<z=
z{_%azWrrfh4d^{dLHy<Pg1KvX+{M@VF{@k13J&sXfD&|}SJp|(0_+Rlq(?r*$5y;q
z&Fb_&#Xcz~SMiPd_ZDwJRfe$S9m7CW+`)gX2%<}7#Qqa9P%`Yr1ctTV28@wMAfP11
zdyzJ)F+@|M3BK7Ma!r&9&1YV`L?d-9WU6&{Q)ETm$B&<z^&g!u3UKJ0YnKE>?Q%DA
z&`(-HLrKC?xZEwd?@?`HWw~bR7~?vrwY3+LRqMIjN1wDwJOzSY9C4es+%ssIT`Q~G
zX`np;-9yXM&K7ZXT(#om6D9V&$7L*gKE~mMpsyS01+pU5E38pxpLEQDpgb*FlS|;`
z=Cp7nEgR^{Q-w%-0W$^jd4pKbgKUE@nVNpD{9c?1lZp$8pBi4x=FgEN-dXfau6g<+
zfsf+jb3S#<c#aiaY7nGXGt)T7J7@(lY3aU<>2vJ?<F2OG3cb>#TEd&h&4({mj2Qqm
z%&@tBXwFCf+pTgGlOYL$5#dT7LK9j|rC5#>>-Q~uls|e%qFKYChJ5eoWFcUWUaG*~
z?@W$R`arHqQZ>(=l4bFilZJ!DvXOYMeo?^&h$Dw<CVDL2nFqLZ8Ww-!Pw8V8dHOq4
zP%k=HP7S}Fx36P&9op7$ac>YWK08xl1=*3xz7Q^zWkzQ1DN#b97L^YG4xehY+dX$&
z*>>vpCF)()tHFCVdq>0^r}Th2V%>kr;ZT!=rFcSX)QXfuq0^l@F4k){cA9oWBT1lF
zw0vBToXgB*gNFl+C0YSv6J+dIpI1<`9pn0_wca8_C3btu;fu?kY=Bevh|MYdz+-1J
z^FsokzN|y{scHDas*o`On<afLX9q`Of7Cj)Gugh(kLkI<X1!C>9TbngZ(Dgbl{dGZ
z8~$#p+wS4y;?m^Z^v3_;U6CF-t=^M5^4f2AOA*TmpU%XP9kvS2ZlQm7;+*Nrn{r?&
zFTD>EY@kT6p6MD+TpA25IwJad=!x$GqN;ec&bRGBSwBMETFO%n|D5|$1N6c$r}(uV
zz7_?Q{fn6%9#l|Kd99^w{f;I}!n*eZ)hsJ7YOJnOUX;iLw&aqt*dqk7(&AfU5{mh=
zwwZ4w$=61K-^f}VLo4>xuLquee^AMkmkpn%9s(qtdbpV8%w-2dO-0i=d(zE<?1G1h
z5Lbhr+=7G%Uhm?bmwJ^X@em+?lxUNq%rXvzs;;rnea~Ip%l`bKUo&yLw1f##4@|Y1
zZxLU(=2~CcM5mq}pEO~mCyHH^nia}t0F-uo7^qnCYm)e&6)wn#j--fhsw-qfyhEn1
zIRQkqpp)s>8CCZlu74u^agDm<hE-{q5vQis<tv?<H#|}gf!C@6T3EhvVoz@Ip>L07
zMHqCxCI#g~i<u!Uc12Sm$+)L(kxCRg5MGOejF;$cO$vv3f9B*C-0kzj0>>(GaKT{C
zf952bg!TcXzK=_L63i}KPTr4golr7<LiQx2UtE6Codslc4~f=XY81=to55gw`U1KK
zzq{!{s)%6h+Ug%QUh~SS<hhw-rWNzw%-CyDEB{IsUAYC$iND)YLN9K8h%Q|?5^qti
zIM6urXmmFtvve^T&lPyqd%~*pl7r`}BJI24-e#Ydki$Fzt)gf*qDmk~(E_^G+MB)^
za_vX6&729%ZM8<<ZslgD0iUBMl;C2r%;0NQ0BG@{Bk}o%(WEn%X&;jldta-6`wmcd
zT8A%dYUpsz_1jaWQE1{=g0E}$&{ygp{Td#V%-Odl*yCZeb+)f&-#|-xp^^88@=+gV
z!0Dh}NGB1qxyQOd1=nIPLhyRW2_Z%7QS)BeM@I7j+;ef6OI~*CXxW-1Il!PrmwfJR
z>?%&fAQmmrf(k5I3G@eLztLT@@x2Tq`iP_sX|o~UG*ueiGcju_6=2BXtl6){(cLdl
zyQ)ZU$jwlx)cM{gTppOz_dpZxRBPb<)){d3<f1)Omku;lB^mhWxafJVmN!)|?x!~_
z&bh`aCKq9!F=R^xR<HW+2BeE*Y%(#5QOvD?xIlI}C(ndTrU>auS0_=t@W`$1hcZCF
zC+NIuM;ypg@U>L8dGNr&a*fp2%NGseDTcX<s_BWU442TT@}|ML0%T6x>#}L(6^k;{
zV()TLE3jsM8JQDf_R93AN5PIaOoDi6@M%qUq5&<(55S5rV?Hj`w2q`r4s;MNPxcA3
zmNf7*#zjX)s*J-pB{E$ANM2<x=UZ{Xw3;_Tem6?J=1E8L7qj}Fugz=vG<Ulsy7?-m
z6{t$)F#LKBsq~fj^Ca(;17V@;A7t@!ng33I%`P*g%2$cdmawF43N4YTq8Pg}-NjRI
z*DkyB7#HRQ6wwxw)To)55`RtRzgs|uVq}ne;fUi@b?Jf$HE`F;cNHUbr0X&V{+dl}
zrMzZ9IM?{2(WpSp9?ikn)P-n>$+$+ncD-}|mSosG{BVCYX!R0(I*OuD#N#=>ZAAtp
zfD&7MR_fu3Sh%{*9{#e4POZ(drB{R6$;SgPs*`4~C-`5xU$>Jb_Np2%!Z*$U@e!ak
z0@-G3z?}yPOZIXhq^fuXFa&Un_U0m1=95eH&4;5^e-P+@qw{SujHR$S?pY^26LqP+
z`H#(nF2##7mvX$+Su>!exSBl{FkkJ0t#rM@Np3%pM=APwM46mEt8f%EyJa24$@NY-
zMKb5w3&zZcdH<GCq>whpB^h-Ayz`hAULe~zLidcJE72PSCM$I&of80AH)t)2f0X@G
z8eJH*a-mq?ISfQ;1ZC}wSpy}~r6V~MiIuFrmFhXm{#9#b%xD?IfZVT|km_ABRfhp;
z4bWjMt-Nm2=KFc)^-hd>mn01?&Ca{H?X1o@nvyOJQVEo)zzfW2)hMM8?+Gr6{?k#^
zC|A>Gllx2eJ6_lu`H}`&QLkQe*31Ra1q|M=l27KvR5SOkcbg#m1fNk`w=e`JfQtGh
zgM2d?&-oxhX{Nu79}tD4p<Kr~x=PDxx$I`0E+ZJAhHI6dR{K{a4m}yl0SsoDH6Z*K
zpI9q)rzKzcC_tBI3*j`=yy~)WT#SsVNWsl7RDI7p3CX54&H8IWn9hq@nqR(AY*rcY
zqOZ-ZInr8OHt>1t7m`fZ2wvoAd%r~8!<x9GpFqtJWG!c6FqKx!AKS6CHin{`yT;QC
zZ+G$;`U3G20FJrjif7h=gM(=QshvG^zBnt-ayT2Egobu-a)B@^sOTm6j|<YPRVm7>
z29g$~l^Hozbx06|Y}m)k-|N*Zm<&$yK|(Dv4w?RyEsn!G{*~$v)R}}33sq4gdHXjt
zx7pA~YDrVI%<bIcDdO$z+hoW7Mw-;r+LZr&YW!N{VNw4P$+6=7fCf|<6=nC7R;=ii
z=@%kCVoNV;CsN`K67y4pQHffi+1O)(i)oJzeDYOuR^(5=8t><9KAk=r8N-XY6xeeD
zRr3sgMfZ=1uVUp_OZwUxaZc4X-ruHW1R5!vNlP{Y(KLwuSc|y6C%k}1PAstz#XH}r
zCv+M2KN)Jc<JtQbW@T%(p1vUv$0=qUUVz|RMv)0D!j;J7BgL_CoP9r9fW^6UO1m9*
zD+Fj~eEmYT<9uP~pE!LHNy!~bY~RiBy>_Un&HQN4zb`y3Si~!7`&Ck}S)b~9Gh`uX
z<3H)(WDvo9w=wJ**Kr(INg`&&9I_YrlWm*3L4D|G`NU2#?{-KykILFTf$~vCZa)r*
z^lC>nST8HS^Vd?LmC&%<%|5Rv>8C|}ZbUI6l;<@+YlCW4gM;T~HY_v9+`F$cFOEHv
zJ?j^X2t+Q5Q^YK=mNAz)zqMBJrS&MEgs!&t=Xap1$QS*QHBKadLUNP`UbY)?r8hWb
zsQ9HA0M}`;7Sz(_-b6Bkb{iRs_`kbDjdEG1C}qytST67bbXmB9K7u^t-K=o>2q8tZ
zquMHv2AWfsJVW>6wR4*yEsn|hRq9f&<X1o&7N_sx|1CAn(nOoq<WqKm_rts%VZO1f
zrJOHOMvt7pJog;^j|oL$t#m2{wXVbeTWA~+{NmwWIixGAsxD{{g!G7=9zTva4xivG
zWX9`y^za9~H4=Dk%6e3n`#rn(18^%&C4-%=#Dm1v1rFep*S6p^4dQDTlTa$pH79%a
zE@mQrVlaNOjH23%A5N=bV~R76vWkW1#o}a*)Q%2u-CLZI(fg>e-xKP*(buO|$@G8z
za=^-T95Hc!_cye?4B=V>@rM7<@@HRIVg$D~*q*A@(u2X+yIeq9a*|H)5eBF#@b$LP
zw)d*N?L(D{)(Q)5p<f%xXkCsH0WBiHc5bC_x8RUXYA$BTq4OeE><}yIK&`RPvF&ox
zp=g0$daI=Rdrgz4B`eEyCakb!Gp&vKwbV_rV`qTNCP=zFnU@LQ&i}{yeKlMF^{Blq
z#3N1C!i?Y4ke^?yGJ_Gtr^?LM`JdXIb^cZe3g|ZUyU?=@JjqWn9xNFumTWPOiV#wR
zz(S=_S{a?BuJ>vxS~(EH#9t3BSkl5`+59*<o@BT`<7N%isA{9XPKMwG^aZq8V9C_{
zplz2=C-w!ZkQu<?Wuj3T^&Bl><i4PZA0wuPxOFzWnYh#3TJ%%IN&i}ZmBJ@z_suDi
zw(*Ums9A$#1kwbA#TNFq%{_Sxu>upM={-rL%$I^R${Y9h>qK&d`_cSk90f<>t$qqN
z5H$rAwcdWHJ@I;39&NsdaFBG@S<scGPMWAaFD)jLEsE-!!<5P%Xv}zn*LYy$KAwcr
z=sO6SCu$GpC;Lv((I+?6U!KtB@L?2(kUz?|z&7&xePm^`JN*c0M{N<#KIYY)P#ecT
z=WTWLW33jqmIAv^3k8wfD#tH!pAYM9>q((aJ1S$TNY_;>js>^)kn^2aJ=q;bqqoYy
zIQi$#;M2HBkl^L;2{L!AYb4LSH=M(Al(W)8I27KGe}z6raMOCX7lBB!)izMr#5fp-
z*wT_e95lQ_qi`P3OwEyWz&Q&Ed$cFvasm_Wzu2O!@`oO<@@(gdu*Y}^k7^(va(Ets
zVg7AgdV2Dt8cSBgyA{VlV}*fjdG_Cn`;>s3VQl8O=bE^WlLb@!eKc7fFtW}bDsHD(
z(|WO<*iMgm3+J*B3)a1mLj#hi1gJwpTJz?#`&i#)UIZoBe^D!_0xA^?o%Wv95pp}^
zrh;(A2rc^)$fa#sffLgqN4SDjju%pHB}i`3rSc+Y=<Ub@C5ih!y2Y`}58ub)oa|+l
zh(i}$94@<)ATAu+yBw7Lb0ANEn%*HWz}0^YRqr&#y2&FT>zT5T#<*J-Vo#o4Z{`?L
zx#D8;YmDAn)e2%9JQ$i5Ct{HY`b9Xlg|@F5<U0g(Mhv%`XiX+q`gdx%E3#w1`q-^O
zlO?(*y_(fPkVHZ`K7R!0sfklBIp%8R;f%JuxDK^|JNfe-q<!V5vtUu1MFs;MpU#@P
zv-m{KJS`aaSWe?d3^RvjB!w%OyR$nZ^F~H@TL{Tc*m3YN1bRq1Vfwd3fiE;91T3wX
z)^JRw{(iRzkJ5WV=Nwx%8=iQZAT`$cXS_|E)iNq)c!#`&pzNX-Qst)&<h=)#x;0=u
zb{q_3cY6@Qq6s1ZZ?^(yEih)Ef}9a0H&b8kMvn|BVmC;2ZHFU9TRvRrBT6<KRazdX
zE5euk;}xr=dG=ZY(AdXiktRXfIevwpkseX33+xi7P~DGwXvR$vam~n5U_dl4#)`?u
zDMr@maeAPUy2Z4ao75ZwyHwShM?u=G>99MX`SUi=dLNb)shHq`uE?(HYXUH|Egb9D
zB?x!9eOjQ0kUb9qH1p-7G^VUTVTlGDFdV=<?9jw(bnck24?~NYJY!hH1rF$OXwn^`
zus^F0zSqH<21?V+662xiGRd*62fdKBl~s%E*0ncY>Df1eOJbFUBnO@GwClX;z7v!b
zLK0{?)XY(9x+XnNb-YqRO}DGRR3Y$;_gg)7z-?rkapdo#%(P_-@G2?myviI(HJ!kw
z9pr~?iHmJ6F?H_%zD=K)kueDCF=H+?wONW8(bG9=l&oCGYuQ`_eYulgWJn)@pt!ib
zw1Z2VV%!<A^6lYN{@SP74EHr-vR;rtHccZ{<g)s9&c5a3(w3P-v;=6zMkwtqz9f@v
z%iIaM1e!>A0A*@I-AbMjHLCs;X#)0aVm~CJzaF%aRPV+n6C&L2>#D!nSD-4S5Li~%
z4c*i!kDN`Gx)%jx*Y+b_15c^m<7sH_)V(;&ltiags6p3uG}+qr($ss-wzyQ*vyek7
zfWg*~k)J%j)@*Dn>hZmi^Ff*rt)ZM6r7F*8+X`Mnw(;(g6nXesM)lxn_pqH%d&k@y
zYVmX!Z>pyA(#N2~FZYrZ-x_X#PYlq0JKP0f_ne<LyY;-qAg#KYT|6W9LeL*CjOLLu
z{ASVJQcaJ-wx@kF9evFWpI>FZv|<yV>XWJ46P~w!XJN)Zj+U8NUR9%SD=1G)?YqfY
zTInU3%-PuL30Y9~jKQiKo;Y|4h|$|kfk0B|-hUSECwNu-b8;P<+HRUHh3#(ntQ&tl
zP|kOV(*ehhxyyk)lm%3=g+%%IIzgNgme#qWM=?F#YA&!xI&PuFkUiSXcL$Gv86Y0l
zaznr<+*iOCn_PPF+e&&9-*N;SpK1Q{E>}z2O7v9o?onj$yX=Q{n@JuW@f9r7QOClI
z6*K<x1cT>XRa#mog=UH6@DMy(fOBV5#<S;;VI@@17CdDWMJ;LP=wCG#XvDvqaY9u#
zOO?At9#)^OJ#^Y#gAK$!_cqTa?xs^{pG8y)-_6rO?F-C!?h~?en|i2xhEf50Rb^p>
z6(a9OQC#o_!F`?r{Sde(JJG^hq2szngKbkiO*=2~P(+rx8EHbi;0WESZ<kvypeSv%
zXB-(j$o-%@vaCQK>%KE+vR6nD^&u{m7Ci;pvYH05`v60;vnHgjuRhwNV{~aiw0v&s
z{G#NT!L5_h`i`UbLDf|P<Dgai_V16>clQ88B8W^ZOiV3Ra~+?Cj-%*c)zP4~UnBN=
zHFft6E>~>GiJiuG-~QDr;^xmO1TJVYF1OWmc`0BXV-u~q()r`cpBFwPl87ZC>a=Ek
z3n1<pwMv;dp1%)iLzBKu2Hf`1t=cK+L_6P;f5eL=r9xs5>yJOtYP;Ll0m6!incwTF
zm+GFqHVM7ej#muAg)j5V2ELj~>0;Mi@$p&^=1>{9!q#v@5NeUc_-EHmmo(R|$<o7e
zdyZ)~%Texw{`CMa@Hs%@VRzJ3VfNBq{GIoJ-cnALcEq70(dj;!eYduP(rZ3r&NN%s
zB@m@{on(AU&wFKa>GoN;*gMCj<rvTHKMq2@M#E)MEs~bv<+OL67J(vzFAYJZj!?<O
z7i7gMmM*A@VVo|xN`C*Q#4&vKdi1p&<cV{o+udR?%X`U129)mVWB6SSs|W3{So@c{
z6S^eD-Jq%@A?t^o84s*bU_372KWZd*IU@N;e7gVNeQ%>$Ty9#{FkdlV&sg0Rk3$MI
z>sH&mt$U3VYK=!1jjnIP+BzN;X11e&?dxVY?oCbM=QWp_rhV0GmhL}MMXE^a=Zqa7
zX^G;-`{NINPt!GQt>6R{!oiZq&M&7zEJk--kL#tEGCnS1SHpa{0wuHE(^~&Mgv;rF
zY&!#C%Q<X3k0okXq)Qcs^x%?|Q?_Nl3fbyAFwg}De}sWJ8lg@WqVrSJ=EyWjSr;-}
z)H|W&Oh~%FrDb%J742ywTVjQ+L8g2SpaVx=6&?E8U9F?IW~oT^>me85H1y)p!qGcK
znc%7a)UGFs+^&%cu^<@fp>Zs&;P3l-O^p*CrE`p~{y(MtQ$lczdj_A`?Xp%&5zNgr
z;=&z$)QWXXNq~8CN_1U=FV`9UqLoW?oINDkn915_-R5cY!}SZ6_h0eH^h(%&`@ps!
zg(GpQr8+aITvUUqql;;gtg^jjy4nvC(dnYHtFAry_wX9`lh8$vD+t+z3CMf+T=DqS
z)221m<})~;1oO^s{oJhJ8snF|WmXCH^P;$*2wp=hn&eS1RZj-oNsF<u)vC#^h70g?
zgt_6jH;Iyh=Dr*~MY@LftL$U@kK@C%Gw<(&jGj|WrR&G1<!Hu}a;kR?fcnogALgsH
zuuE~oVm*NowS&atL(#VoVXFvbJSvg~E0%g3NgL4QWe4HE8+kFpHhh_e1)m}0oD~WG
zX#G!*HTfKdig}c&KQCcqB8b7eR#{86Ej9BFpa+j+Hs)uY_5K>-tE`{&P7(CR+^#h%
z=iC{HRVAC&Tuo;4BX1}Q2_{Iy<-_v`WQ`m_-Dukj&&-<r=N`}5=XpFK3W*OA&ockn
zMSf?Il@l=k!D9HuzCII*u~@=WM|kFdAchbFD0n!43zufy26QCiL0eyZr)T3*3-6$)
zT$lEA<0xjAPXFr_r`T{UYC~L7drY$sh_A%)V00Y&ep-I4<xhCsu+-gNwVjITh1=9=
z2jb;pq+~~T#YQei>g%rnBdQR-K;cY0pE^8w+dN-EyxZN_m34q#$%`F1LLVcX%jJ2K
z1(z8zT?^UL3!J)EvAw%;^KNfr-yLzE{1pMz`hMn6F_)>mk46tUQ=?{MN_s^GD=m;f
zr4cp#_fWXY=IaTZ@!Dk<v`v~KFN?{#*0esHfJSas>0a{imy6d*xtrNHnDf)(^DZZ-
z-*>n0^@`ija){&KjK<IBj$U33Qm@d`$~o?%|7SMVIji+yHZ%&GACN?h%morm0E1lm
zDd?HviS(J+N~O`)m@If;%aRcNfl&Th7O_z)|F!w#(<B20o#OJ@@np4}XO~5aW3;c~
znl;%^d=b&0#6M_~qj4rtkx7gyhi5k>(`ORDJ{mpv0C>=eB>_e?9tH6(aiv8c<vAY4
z<3zI_A6MYb^t;u1TTsTqsVS0Mz{olwIk>K!eMBDno$A+<wr5MV7M+~F-ct0JTYi$8
zk_aIse)ek8r`&<k)OnJ3ez`glb39$SL)f<9xP@>}e0*MfEMA6!MVpJD5_LGTWkRV~
z>KDs7`}!+zrzMl0VYx}*FX0~zp%{V+>{F3>4fXs?)s?4lv)AK4@#eNg$mf@zt0}jd
zbV;aNG8(VX*SPgqLuMOVScRY;Kh_ozB7?ppl&y`ws{un6y$_={7cf%93YkB|@U3{E
zP8FxpVtsORI4X=-HuLjjT4;}oXqR4elZyg>+^WiD|4Eygl5kSTxZA@Ia%WRdA2SUy
zb3T21&{~op*X+}!mHK*X4tnUPapW)sI|t1M?VKC&txXhQrURko18Vi}Kid;veZo1`
zf%OPmVI}2#r{fZ5^>nJQqLUNq;E6xWKTo;%JmvTGz9o6#!WkJ;gzoX|kh6e8ix;zf
zHGFX_U}iO4O9#}d6!$t(UsRJ9-iA7%A_!wdDS03L<NCn$05x?bFa3+Hf9%n;Gl9o#
zOiskIA6laXrk_=8LT?-Et5tTv`rPa65W#!i_kh*%G$-N6oX4{tU(`M@elQ)`g2&>q
zh9tmg8e`E$#zLsX(J}=slvchy$@u86>kjc>Gl0qL2nfirO?edP;fHLPNKR4SHqw8U
zOG74?rM&tfjm}0W{`c5Mc)R|(8LSxi-+TDE@pR6O=aK$u=lnK`|KFd$`h(@vy$i>l
z>=wGk;E3o0c*8Em*I(Rw{(EPu_TRhUP3(eW{k8Fj|E<Kv@@yEzZ(G>#ng5((BT{Sx
z(%-hQ5g#|=<3@a3Ux5u**l>jnSJ-d`Sb>cMX(K`U9SSy1g^g2T<5bu<6*f+VjsD|C
z2kCbt+(?i%I_&?M!bXC$ks$rHg^l?5pHplUkQ)W$Z(G=ij~nrEBR;OLz=kVqxWa}j
zY`6lfz(#_!ks$pJ1skWr#;NeXI2D4wzS_(N(g&Ymex@zo1?t~M59ar>AvRoS!-f7A
zE(CwF;WHaP^J@h*GO&#d?6)s$93LCU$8S^EXyN~NK5WFtjrh0`AJ<o4!xc7MVZ#+R
zT!Fm;|L+!%w-9GtYnQ1O3vw__!5ivkH*j`0@JbGzc=&;kk&;#vmy#2gku{c<Rg#la
tl9dvbl2VeAk}xyx|3Ci0#SM4W@#g>iA8a_j*|AqbOI`nb@mbrD{{e_k1;PLT

diff --git a/resources/ios/splash/Default-Portrait~ipad.png b/resources/ios/splash/Default-Portrait~ipad.png
index a430930f263463573ee4d124d4ad42936d6b71bf..f7a7b564bb0c3e77e5585d111d9dbc11dd470120 100644
GIT binary patch
literal 15514
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

literal 20741
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
M-%rh_ul)Ld07|k7fdBvi

diff --git a/resources/ios/splash/Default@2x~iphone.png b/resources/ios/splash/Default@2x~iphone.png
index dfd140f53dfb9f073b26cda809065ae71a2d1b86..7149bb0d42aa9fcfac7202cb1b103ee303ea92c1 100644
GIT binary patch
literal 14001
zcmeHucT`i`)-Q;Pihv%ZNQ)kia0CI7-jAZ7A|N8Y1f)twN(h7m4+07TDq`q4g7gv~
zK&S~4AyOlq5FqprT7W<ZCGc|Yz2lAdz5Bku-k<jyV`XHIy~f^q&AH~9<u~Vi`^3bM
z_nhcC4h|09hY#*O<={9G#lgYVdgcWCj!YD=jQw{u;DJpL2M3S9-#<={j4Tljjw>7w
z@7;M8Hoi8=oh1?SWhwCM*Y_M(Gdbdm9-P(r$~o12|5-(Dk^NBI0;Uv@Lnv)76t23S
zX-xX<)6b7r-v7Mw;@3y;sk@ZZU)72^xqfqcaQ9=jhKD=((4&udNtKdi%qh7C)uRZw
zjOl1;H6iwTVO_8hZ*GpMpcR`_99LTZ9#I@z?7?y3{NLlut-r@VC;pS?{>ha8H(&lU
z=KduR|CdbsllK3VIUm9Q{&f6jNWs6KfL3ncc+RI~>_Bij;lX%Hy*J{-KV)P>moE}`
zMkSK6w&gq6g?=ng)~uzE`bxw7HLqr~9y33E6+a4FjonJb$H0KZ!U@fM$cq2qDgRK2
z;033sBo67B<WXRf?Y;rlMnM#FM;XF0alEGb4vKNSO*fq}?=oW;Qg`)yw4S#Vf%E$G
zbel~XemWnm5M7zs)`MqmwKf^F206Y>8rSuj)E33wSH{4kk!S4;^1`M0fhgrxn09V?
zeuQ#h=|3JdSB9>*GEfrf+?=PwtfHhLnxaiFlq+tCj-penys<?MhFhbh@YBqJW3TSm
zb{lUk7IQ;4GB?ofI!xH<q{tspccM5sPjj9=Y5jj(U3B93*S&wg5;-Yy!HGS)7+o7^
zlJeUPtLu_7(yb@nao|MxeGR?6U#lMcXb7To1p4Hkt>n1YS}D_Bu2a#g>on6AgL3c9
z&<I-G83n?Q_9y_@;ijP^c>WtVKpVo`XipFp2DliX`}?7vOAkQA03nz{>LY*5-eQWW
zE*QtFmIYo+FE1~T13;Nq<HW1U&;#Dfw_SH9LFAB82Q<mA$ux4=JkKyWM-PVC|Hpft
z7zX-)V_@%cm)eDa%?qFH`ZQO{78e(3k+cZl;jHlPR0Qp2jn-PtV4oH(i{&=m`YM{6
zUsBb_nn5FCSFy)OHaQ7u&w!jlY+h*ss6ugYI13M^FZO0>(3|Of2Rld@%m0|+Z(|7}
zy1^wt6M?N!oK0(Wq@0L#jo_u9EiZ8|iDMv7`GYhZpVsOE9LPtSdTA4R$~x+zleHOM
zWAfJ&S~J~5Xi}+9eGad8v?+|)h+$LIl2;#nnzw7#wnp`!`#q@hQ8QjL!WE$EJ6`j&
z_}RP2a_4`n>9dTy)B4gn$sZd@?^QF+QdbnCy5E=tQ?gOpe3IJgVms?7f-Vsuo8b3F
z<eW$L(H0yF8Fc{FQl#HniI`sdd*e{@{@R0X3NDT{p8aeJ6hl|XxcIeiiOsoBN~i}o
z;a@F?wmVn`ZfG1#{LQnV#hw?SF`KAUBAl^qgJSqVe9<no5TU#9$-H{gZ)DPEzLCAu
zOOw908YQZ~1&*w)5_sh6uk>DK{&Pzn`r|`>m|b$ypF$iTQfzL6#$ObcH4&L1f{i3a
z#-tnEflrq?&EDj(R;zz}B%iwWX7<lhJn{|mANBcll#Sd~=jAHWZEM#<hd^vvbhdt6
zLlp_{tc@E$Vn!pf-uoQnxFWX(tQZQk?kQXo{I>%vZM3bXaCr2Xz$p*K$YNGSe{F5H
z(j3t8=*t>3)nm1C@lQC%NrX;;DM_fh(i;i8t*^NFHRj(Z&G?t+-w+k3D^aP7?i>)R
zNbO4<AAIQoNVf`DJ4*weBl}15pcu0sEJwkGdhjHRs?`$^4z4V@r-`)ZF*@(MXlaty
zTFZLPXm<WBDv|r!Tzu+IcnQ$WBvoYJd-ULGkLc-D1uKUTi-^LwzY^r;s&mz|)zl(c
z?c1q^18@L8tPd(585FwT*R~MxX|d(8B`oA7s<yYgYAJi0MvyY?eIVIf0wK`4LD@DK
z%AxDxLZ<-wIx6RZaC1wKs<s2pZdq`|;A4S5HobZK!PZ!BCk$wbIhd%twd<I6xRWuT
z9x*WL_yB&BYQ4HlDew+{IN&B+z{);FwL|6y0eSV3_Wa%SiUmQU@c_dk3iq{E+CHaS
zY4A6_0V2#Or%4aI#h9<kY?D3crXOcx7?AzG!-WxGUhiqn0@=K&Q#?XhL46v;B6NLa
zLz=A158L-GYt!GNQH_X*^@crnCDKW$;Y1g=`A_n;Y1&{rYU9JrJ#s?fx|jsYNI9^n
zC?wN!!Z2?n*-$`NP(tU5CNw~sC7Z8zSO&pUJ9+pE%<MwMnnbx~mq#?@q^V{2Zgh?)
z;+WQdRzG)>bT3aW*;e&!Mub7{WVOjXxt6^C$lQ_gyt&gI9xzle>+8J#ZoUNndu!JD
zxaize-^j)=Gi$NYnvO!iC5a~Q&sm;B?)^WeoE58ME;j^PS1Ly0ywaONkQx4NP!5||
z`|AR<sV_E(*-<{Ga-Ejl?@+TwNB-Jt37eY{28Ogt61DowK=CGTMoK*4z=S&fw$nwe
zfQMoMEqJjo)_Nd5?FPD1O|DjRlp(_&Qcbb(g#Z!baUId)PS3~Y%vbKRsu6Cm%cM&q
zl+B0^4@vt*ug7~Iya)IE<(0ZXn9H2*I|FtT_UvPuo1lPUmI7H`fxdLFoF(4?@hnz)
zWJ9NP_9tPfhY4JLL?Ai5Jb2B_#$Nwfb)rArpuZ@mKW)kxrxS{*{MLKabENB@;u(ze
zbloii<2>)7-y?1u+wXUqJrv5ZC^b>1z!h3&L0!8J;-<%5%5^a1=Xsv<1~WWvz#0|V
zd*;d*;L;sN*HI43s7~8iu`%Yp#IUsP9?Awah^ADmyEiuSf9L}@Y{T>B1a{B05HR<Q
zb}MD76~;3tCDp&N+S*+2bP2s2>TphUll>a9!d%twhP6obnxc{WX8W_NFYA7zlV!+(
z?vQ18Zk65Z;ejlL$BY&ay*E{vuk}!;x}i^r%Uz#?T#;p7`Q4c*L|8ZZ>$Wa;{r;MV
zR_Frv(fjiBO2gramVJlqK3J_PVbp6Ul|^0!XhG|Vj(v(+c=)06s(b373Mx5<1C`Xo
zVvw*0leG25m5Te}qXR`~`djr_UJ|rb9+nP$91)Q<pIN=7Z)J#I7pkKXRjaOr%<V5^
zju$MToA*j<VJdec^ZLONQjn715bwrm052e=j4!#(y1eD^N62R9f#J0X138^G;d8W!
zDvn62j8`LW@GlX;6FK=>1mn3P@9xUgia&Ih<;Y=AMeJ26-q+?s6E-}`uT#Z@YO4qK
zU%#yJ`Ni}&e5*%i_-aU_jL|Rng{D6KrhCMwh-b-93X(QJhgW3ulAyyD{R+Qn*lleh
zWG0pKb@bFfG%LzxFrg>wnevbFw^(okb4D+}NN{ooqxkU8VcY!f!=xCR=ir7!B31Z!
zy>dQPx>U<o^c~0G!YkvKw3gi?CSGp}da#C`3?(^)65R?*vf*f>inI=}vE&;`O;@;1
zTqGS8O*wiwx1~Wg5t5T9>$a3PSdIPRkzbsWp6Y|aN&89GeUv_LoRiV-c^uEXP4e#$
zmXM5{B>q+Su@O^RbDo7m|D3p{%UbCyB|JO*!9n!E9kGc%$h&d;3!j3=E1TNdi$YQg
zhN?0WljvZuQR7m!{Q9T)Qa47>CY3vG+x<@Ye96qI-=X5yRO1PUmKg{+KJF0mAV*=l
zo)jwQJo$bdP%v~gKD(p>Nm%U`G}NtzqM>EMgG0&)ZHwrOPL1!URtXdY?C8z4B<2J~
zcb7$j9UJQH_wz$HqE{8j2UEKkdNvJmKqBjI|I|M=T(=|dkEmfb6aAs|Og3-Gf8B{5
z8QTE;cz-7vr5C5m1lpkilQpic$xF;H{q>NEI<Eyg=O#qrJ-hu+w0(z#C(h-=AGm4l
zhHWR_js4Y~XhZ!Ro=|kXo1(hFjr7|NaI-DG5AM+DFDkguccBtfdT{RGq;dboPF@Q3
zJ?7{+OR##?3w$`@d0017v?W73>B@E&?_C>7Hr2TTX3Q+5abBILnMIYZ&~td$rzZx0
zUxo<Ft`ckfBzehKbPt-Shp=EUfaheGgq3|*2-_UDFvh*tWWig0ipCb3?_T%k8S;zV
zazeH+Y_IL~b__J}i8Cm;I$ymK!pEw;hGCzH^u*62KNwYGpOQ&8MW<RIc$?afDaR3e
z{h90!#zmLT9U#+@Q&s0@Zmo9Y+nKD1jE|K0tDkmk^zu=L;3_w~o%EcD*&mO-<QcA|
zX&*bWPE!(WbHMk9s=>+yqa{hgaG)S@Stry<c~fAIID+xkX>Het`Pve^kmebNzP0KX
z9I4u}0>O6~;@EUc(K7qMZh{1rE3IWH&ZN1pu1`0DD6z7!)mUM|UF$ol_VOpR-Fwnh
zewoh2a4|$w*R-^1OvfObV{Qh5-X$0#Lnte^pY>6iwgfq_9@>3N$_oT^CvW?u(>S*s
z^19yxPD&C>A>J+QRa!MR)|NL!C_8tn*pnYcqt9Czv9<nI8?N?Gvv-jQjMh6*RG{OE
zkb}r>Tu`g5M!u*4BC;)gbX>1mMPRz?GHU=~_!`ID8THs1dpSb&F$~!5a3&Pj`m=CX
z1$0FdmoJ+V6<Bz&r2E%egYQ_5+-&6$mbWLK2_x!{%;A%PEDru|(_d+~1IC8*L7o6C
zm{gDPb<k<I1FKlBl);D{!CQLyv}V*SL$NqZ^qrKCusqo};5~Z#*SwD8XS+O^TOTq%
z0hoi2;&R$6T73%*uZ6$Pj*ShyS7N1I8|vn4OOK|foGu6gt~Gya2b0x2JOBbuhkkh7
zuzXN|x~a$t`XQ7;u~~`q_LgbgOERJE3$zVS3oNrrp2=IUNLDBzHaY{!iD&im@<8W7
zzq)P8_d!O(;(XBV^9Gxj$&V8v{!$U)Ech@-F#3E`W4(Uv^Srs*(3t>5;PBUnDWMaA
zcniLbpI`L#P=u)nzJs3Wt2p_?qe4`bzwol%JvGv$x?p}QhC8zCSDRre9}BF-9QsGy
z^g?E#yfAjwgd9W1#hBzZss+q9+<=sy-4l^74XNKP0I5I9ihOPz3*A9UBsKYEH!~kd
z6J;wJ!?%(=hZcDyUK6I|4svY@^*6$;{7!bomJrny&d;tO-(Pq~1rnrtA84Ho7?(us
zvI1ZxETx~UHsM~&_8*Bj)=%m4@vtVK_5z|UzfZ2E?az>q-?0WK>{olWgG1^~8*8V&
z&HJ1+^c6RrsM{_CN}Eo6?2EkaP=AHw&}~rD8MF(p$h_po2_T~So~YZI;YJl4GzyO1
zp1$A|KOt{hvy|qNbfdtnLTtJ-MH=}s3boHCsq7gi0n!Zk!BFBm4m<eX3xDTZk0Hh)
z^9_|tOqD~92io;+I1ugk2NmW}n9Frr#DWIDs%le$SLA^13p>&P=cB;p-LC#U3oAS2
zfTxwFP@E@iY0P1k4858IeFEviF1md0#c91h+9}n0>_e4AFj5&$L%Ke=fldjv2pAtx
z0){OnFM6mWC$x@pSt!--g^@RM7^$Ai9`vTv@YtBLn*lBKZ`V|BPAY@joi0%`z~G_g
zK(3jdU5<<<e4+Rg3_Xi&X9i>Z(dhd`KL<_9!WI|2V-PDO^x`p1UO8-s%f5^N4r-ea
z4Z#L~rY!nx63HgO2u#X1Z#RXtwE-0Y91>WLcnLLR7WK+XYuUe#;TU`nm8`=UJIw{@
z)1a&l?dbn($J1&CP4rLmYcAHOEIKL{M@|$Nb*MtBEF8&9G{Q8eMZqDX0@BS)R(oWX
z#G4`%V;o?fy|((pk?l`gikgc<pfg`QgR!yu60yyhaCuE_@P6N|71svM)B!CXl-dmk
z9o5IVpVodI@})43Y>Xa(vKl6=wQul!Hi?h*e*(LbBllQ!UoZR*YODY|)_*Ll;76cz
z_KiH=PuA$n8^u#t1jwT@<7LFwd3wB$dHVId+jg!POVW7mjrNK^u=}I%#K{r}rQrp5
z&mlfv!(Tx!z$Oh__CX?nt;N3HPJKi*#gUfRZ4(I?OZ0#n_604?!i6Y1EK8UwdQ3Kh
zZg+T2;Bk?yvUYOL+@*$)Ey|!OckV?eQNDmILXNdsE1b2rwZ^^Lyz7W#h>Dsl@Hy<M
zShnNNq4c=<#OvvOS{|^yVI*{CKE+f>j5;uhO*Zg-n%+?SVc+D~w$U>%B+oMPu`ymk
zN~w>RYjC6>e1Y^=@NimJsOs@|X7llzj1?86hz<bl@%gw9T{7%({=0|xN3xi$f^A;J
z{ghB6;hs{zS-L6Wz)RVg6aaoU>G0}<PIbEprPrZTO83xc?}J!wUTB#fQw-q8E90<*
z5=@?$0tJ%ZByQ1v)*iIHsO#xO?ONfpWqS<GBCDS;(4&rTq>hd9cpZB=;JD#GJ4;Os
zUC?DHJE4kqE0VzAuqp*B6#Ru^qSY4D*ZEwfXoL?jf{$DY8Qtq%b9%)w_##SJ!Exfp
z8TC%C!;N=hSZ$xy)^8EKBI-VrSNb4;axmeW{%NZ`I}v5qACeJ#UAbCLtx;^pXzj0P
zKF!56mz=QKw_OLnJ<RY=o2A1p_`NMg-IuQ`2N*d*o9S}4ZYA^D`NaCljwZL`7p`b#
znSY3Qps{1PvUpp$&LMBhs)Pi}Tl1iyOFHyr=To=K1J`}ol3$Jz8NL&+*N1}hHB@^|
zggs@=_;1P`u2*(BN14!MOj4G0dXr<X4TN-jOT81Y&^O(sYa9XDAH^*^sKq2e5)+rr
zq0C0e!$-AHf=o~XM$&XjZ6bE)2Pb3rTtF7WMr2qucX5AJUA8I!nwK{``$xNR3Mr$h
zJec;|gx9cAP9reFHI(mUS~#blx3|{jcLCJ-QN92-rEqe)KkMaO6Li1R9E+MW<)7GD
zIaqI?IoiPD_{5ccl67$2Kc}4|_%8=fQy8pHQ|RrG<)O<;?mY-S?6sCuX?~%Yu-TD-
zuQiNH6_T}@|E1$2*s!SSGpU67>!LRF$@njnhx&tc*V}JZ1+RV2$lRGlZS`n}y5K*z
zL@vag8K=LkX&Xl6dFSZJb!-pvbpd8S@ndqIDu-YLB%Z7hx~3T4TL$*%%kL_x0naf-
z3x*X5wyLE;y7gmX^$YV!{<q#q;3I3+#}vgMU?HxoeM_jpu-OaME&!@?yyaY@PL}W)
zxMDKZVx_Boq@eCYOBcVxWXu<@9VSG32UVLyh<jKaE}cyFx$us|+%Ot_)dF-}_$fop
zN3XG%RisO0Vt5R9GgTnnc<518y50d(=NOcE0NdY;gB`u~fQ@^9tCf~-+PN{1S<np(
zs@Yic9Prz79w@LaTrvn&AV-*$``X~!d)k|Z)B4p&+W?flroTx<bfE^SN7?^b<2EJH
z?;$-J0cNO{H@NhFGTp?w-Co)3+TSCwW=<eR#^>4!>OLEz)ck{;;}N5P<Q|X8WuS-u
z^bi-RdpKQfU0p}-XaYMz-1adx885d^N#xs#PYoiR^1UXeUfUebDX$l*FEpAF;j%Xz
zPzY;r0Th|F&%|@f^P*mks0&OqJ45=D;gVzAobGM~#+j=AQ_Zm_AimzDH#_hezp5}F
z@^zPkj=6oQIW>R8`<DG0)76w?qMF38Qsn%&^7*1%6Ul9oV>Y6wMJMMdRa4p+#}SO0
zZ#Y;!r4B<YVJzvBTexxo-PFEx3ymZD16N0UKg|l^7i?sk4Z0!T=35LtqxSBKnhZf5
zRm~qfIA6rDZvN#R(jvP552g4NBn&1sA^OZ)JrntP6JQF2ePK2;L2)rJYF2I@p3e8~
z0QtVQT9t0kXMW<^;_7FO+>JsMmk~-khBWH>$B}ZRswUcOSI!-`6V<03+XV#Ky2>6n
zNwt*=eUda;ep@d;@8_9YDm67V&HKxxyr-BMK7(~f)mESD5_zsW?u(Are03X~Z-_|v
zK<iTNNcH|po@v(W8+rZJiv{AJosZC~?M)8Mxd3jHL=aE@-aWI7trp?eO5l*b%l?-T
zyLwHkNjD50?AnXu#6Fw*wcz>t;LVxT#q3>Lh)G;rLdc55S?h<<xcmLJWNm)Oy)Uxk
z^f-n4DSGDg3*ovDz@P$n6X_s1W8p5EZi!AR6`bDJ`lG$-efGeffBB;;2}WfKI=ST?
z3U+~)8s|PnTyUDQsHmiZSv#Y<L=S`(+jVRSFAjpAI9ylsCKc&+8u5=zXj-L!J55)l
zmBdhe<!ar2ff6GC=tx+U5j?pl=z~eUah=@=)xy(}ZOd<EK1~bFEAA-!vFWb|FsL!J
z3x3+Nm^i7N!K9{|*js3YfsS<_pR%B6O;)n;i5aD-up6*vW^31JmyL-ai}jitk`K4r
zqWhO>gD;LK?QLuW`oB7OXOI7miAmARY~BvoABd(J@rSJKw808dh_k|A735)nQDD+x
zqYE3MEC{;qhuVg2r69Cd%1|SoQGn&Ux4nI=^}}>6^t4k!2gukHhaCws(S&lHr82+4
zggL@Pc+T%x{B0&$SFm#R!16m|{aRlWgueP?FB%`ZX5;C#!O4XZ);b##0rdE}e1*}b
zu_louph%yM6oD-4SK_y3=f8TCk~BOu%u(pyV{4autp{e!Ha;<Xr7Kgyk`=R4uERi=
z{h=nu$UJ72KWOg?=ZPLo!D%)~>a<dhmQ-?o91+q+;SY&Icg7aZM4KKwZ~23fB(;{q
zTWIN<B@ARDLXs-t4q$aA<ZwCC)uJH$GV^Ei0026^P!0|p-&xb>?<d7kuX&veW1E#8
zWDH<SKy9eufy{Zh+V2i}ffgO1sW>jwmR8QFK@{Q~&(5ljZwS(}^zqHc_7dzed95Wd
zc)+o{xB2vmo^zbKN6a}i(LIw5UzdHDO9#Yq5VBJfuddjiaG2=Ta3eG7S3p5Rvdi(G
zi$<=lA3k0#!ce^l`AF^lk*7gFZS1$%pikpObC<7@QLeyl7ozwla^%dx5FrNmHm<_Q
zd)-W-b+SvT&nBP4%KheBDM<L*srp0DI{yBqFB*;`v!%C<9>NKt>`2a>Q+K&2ua0eC
zk&p%1cHSo07QPjnz_itP_uAfz(F{&LH43Ck=LN8x1E?flqIB^dxyWsBd${l;{Ahf{
zo}QC_VS1-qExR(FGpT#C6H$sr_g_0&^S~j$N5e`&yn<2{xFZy}4u4ws^7cM&`OGCQ
zZ$Zl4n&ze7Wrtp((=N$6p?@R$uw&MW{TY_CD5vyV|2(XO{MDS#QvvA}g_I=y5v6A2
zp_hU=d|($u3%@qKW27d5E#Z_O&Q#AmvvCA&sqp;06$Jdb5Cf*2$l{%iz>qoR*GW^q
zftTwnY|PHwT6qvf(Ak}s<uq)+*DI^TdpM)PExyi`WP0RN-ed;X)w!|!GAe=eO#UDw
zJLW7wdE$09{pHrKM_#{iNP)0q)g9_`V5!LTeV)8IMv=<>hk+@ZHC$~Zy{R7>)4WFQ
zJvM-!`ajj`5`CO9HaDE8N8Xz%&fRsN6TA6=Ei$s_INc@AZm@FzRqSL6ucUU^Vo&<Y
zA5nU2?Cu6+BRy^?tEQp;5%>>HTB0U!-yz{?y5M}4{z@~9Iii~`A0`_~7vTO=o`XZk
z>hD?rn%N58YicirfCqnbcCi1LRGI|r3e{R}hSksQkxBH@zgFzOJ=4a{5U{rS9MZ!a
z$lip?qfmb?VP}>5dExhaC)+-adQ*o7P;2m&R2ug0l!>O1*VMR`BiM}`x!WrWVM9_C
z0-SvS?F(#wuKew#_|YXyCy!E79j9DJSHjfWB)~IDW8o?`=hj!9q(RW4A$|nwuadK`
z@WKjt#!k~HbZt);)$0Fbe{f^t8xm_x<6B(*Eh)7n(L$8d^l;m@nfC<))nA`H+*qP*
zCzuz3_kiRD_kJG`%rmk|vXMoWc67jbO&!B3yPJ&JoA+nZV2j@23_qHknrfn9A|}rS
z=w8Gp;?-_l#K$g>OuDhVPxDr4Jg0*A@8zi?gVcQM=@c=r%lMo*_E}J9$FH~Sq>;LV
zwdG(p#?QAQiw!q1gQUWkU8u*M;Mq#sCcbw5g(8Uov?Fc*+aBbk_JKcf_o>qRQnict
zHgw+H?ioU*mv4!NQO9pC<|os3kAL5e5q7L+%WQ=?r->xCxUatQHmm*4UWoOJynLH*
z{->-(3zL;tfex(a(wu+Jc#QicTyJ|qZVID#H@E=OwuYUwf;d8sV9Lr0i;)i43yo>%
z-ivM_6?EI);@<}u%(7#%6(%f1s!Un?Pn0;LqRm{&YA&_xaDmV1WZJml7mwbI+EK@d
z-ZVv*>@yo;GvWdJi>pgT8H47}5ckuxRr2}=E?sMGKpGhG{{VcqL#_9UNhdp65qZO>
zll$L{2N?<r$3#jw)D-mxdYCmG$QK8hS$Hch{E$q=&$=UCuK1H;M>9(`Rx=<fYXjG3
zB}_}y>2^CgtyPVt`ZBDArEq?(K83%7pJ9=cva%<7M7=f?pqmMHehqGuXEwT1zf5V6
z{k$u7KmA#z%nnCX)z8RRz>WryE850IFJr8BoH>Xk*-El@m9`#^^gs{QfScrSFa5ah
z2{W`m!JBU*MlT=58p``UY247$no<Q*KR_xLd%f2)Tsc=9pc^IfCvU>&Ta#FSZ>k0D
z>d#WK>G|}g6>YD^tp|(9g20Au?g6nwrZSd=wy%!46ICoQ&6b*jSKN};g(vKx(*t!I
zpZ*LFI+wI$*?9E&(Ot{Bh2Eo<u&FiJaYJ7Lc23-NGi@f|yb_|ZdR?C*VF9pPHNVHb
zqO2Z)o7GX+*PGG7?;=^eb%{M4vuZbuU!?umZ_S_wFP6GJM&9y+uGG$gicBivYxF{m
zvLC9AK8_kxmbq_!l;4NTLHRc~*ikz=dDniH1-zfDrOYZ}E+fDX!m|HPz^rU;Bijf0
z;tM0M>#lVZ#}iEVp0kmH4s%^Z^WnX0pu@>A8Ed#8{JES>wd=P(Pptut-l~5-t?saG
z5`1@!CrQR!v^H_o0W-JiWfUJ2@o+)$P3mzbfEGC)yCD+glfE+XIzz9Iwzn)JQ$Y&f
zVzBl2zCO-JJ)%dx(<oVvH8Fe7WwU5}`J?MaIR`~e?UTjpVoA%FCA)?cFO+HjK?V8N
z0{$8blps>M3lre;`K#>crM#>(;MO7kO!|eH9}w(5XsN;^syh&Rg;nEuZ!J6d5M|(N
z30+!FRXA>1&O{=Z9})MlwhF6x?^Z3rwU?0VsiQ@SdE_!-#MWN0pw!DdQ8sEy_Ca3{
zXU+vEI<>6T)Lq=^ctezSzbrOf7z_@QHhnM0$B?(NZ+zi35_Ms8{MBUydFY_&`Qn;u
z`jc9G;jvwB;g}@~4t#BoIp$x>f4O5#+2WyhbUSNL4wO#qT8P8eKja5eH_%~mG4#B-
zxFM2CC+(~s^)iB$y}hO;ixB(8q6@_HXpc~OTi^jT-YhllrpoO*!(OM=j|~REL8WS-
zVP-sQ3o$y<i5s;z7`KVlVl-~~OCSDa==+QD*loyxY=ql!tsCm)W}SSEK~%BWv?lM-
z`&0E}j};unt&%KMe@=hU$$i)auaLBZu6E217Y?X7J~}>ntol-JGVE?xjXndoGJ^gX
zpL`wlS?_i_pv^c3qm>2mU9+Q|@jc#1tl5q?)v63W*q$dg;RGZWo6~y2%MM3Njo_@?
z8TAe#S;OW2frhkgWPZMDLreVg3y@K;S<tS*FOnt&Y?Tc;&bRS|6R-ZxFcOM!*-AOq
zc>GuqQ{2z}TbX-Q>D&;zJVQ(bzsn;V^!RwdSQ?EFbnDdOlY16NOJ#io2N}U7FV}8Y
zK>Jf^@OP_12-ezj36Y~;Tg&SBZK7}ns)VT&rCdeUmeM!l9Tz3{l#S~Ke&T&@CSy|P
z!G;Vz(1jSD?EO(#+*!Li6_COt<R$*L0w_$$uEi?pEM5t<X+C*xK|nn&uWY7u2cNqM
z;O7p@jEGIa%!q`w1h_|IZ%MMkwzl$QD@ebJ<SXmWy|46sI_EKYajU;YzdRXm3AmlI
z#fyj2bkUH5ngKxadGsZ<-7~U<em_QiqO@}EDzdzHurVVL@ren!qc!0!etS^^I`wwk
zPr6;hM`1ST;tmP!G1&v}7i7Q-cX)V|0-IbJ^bqI^wrqm9>{;IjLh$!-qsSl?OMK?*
zbST|8bZm*DKUJwJ%AA1wf@iMM3i4}QI=TdtB^4YmA-38*=VN&VOVfJmYl|CiMarTs
zj85|Z;NJGd{T*1L=`LUQx*odg2-f<U(|%vSU3#6Q)ya^ozUQXMhtl@D)F%G9GJ$a4
zn#BQv@F2A>Cmy?Uk?&#-^CDs$N*^}iDUs;lJ*1IUqC9Kw4HI;HF^8lWn$W@U*+Se8
zBCtU}4dy#`?ME$_eT&9U8-T()mFr#Xc_?TC_q$|FRERuq@c3Z$W6E3MK7L)&0PXGV
zeAj23jjc5{=a1ORCC%yv*j$oK9Yen=5_X^=5GQ+&?WtE^73}`nI!un=0wNP_Re1nE
zf3yRg)p9{hxh`mDoc{&r_3HJcadlUfL-ma1@-ZmU&v+pN>;gO~!dW3Wo%F@S&JHrg
zU&4REevt4IfOQiQ&Dl<O?UUWXd^nVc+nC<NuQrE@ivN01YPfM5zT?4^Ns1>!9+BRx
z@2N)^Yfmd=1x+f8k|-@_0(NK%5ei8Lexiw_vRBvW5{68=%h~ewjh5mn(--GJWe!2x
zk3f}wL|vQ)`4-T7-7dk8Ht3$r*u7T^N8VCl<$J`1i(=mkC7xw#H%zq_iEtC3@|sk{
z$Ohjx=Ha>J#hiTaq%I`ZWW|*7?8SyZj<^uO5t=aUeJnI{n>H7FPawg@a0D8qC8|yD
z^6W9B)4$nO#6)JuwSm_^>n_+8T48e8>^~Er&*_IWas1#~rJ*4@tTr*IfgyXj)vK#z
z`N9pi-zex*zl;g^sEjFLr*=CiEW@#@B7;q@<`6prnTdo9wKpBU=9t~wE>Uk!&BB_O
zS9Yh2a;pHnrY6WXuTFtfm95d0_Ci?sVUK=lvF7L@P9$gTaQExn*~`-B6JlY%K{mW9
z2!a^o%!*+O<AG#T!&dE(FsFO@N#=N!^M1!!KyPwi2t$;N^$j-X;_NH*YTSMk5Z(2<
z+;Yp$?)A4NGm?tvv=J<ay#91<a^FCp&Y03XvDakblG42KBzWAaEe)CWT`{ZA=Wxjz
z+ht)p^Xxg=Cjof0qGH5FuAh|}e`$-Mv<0X))}JU+M~^RknJ!pvQ;Yck?3UVWIL_fM
zYZ8CEyeiI)=kOj-CHsO)>*LFII^87X)ZX-A8vTdQ9$LmhLsJ{N*^Bki8!QT;FB4}?
zB;5ds%h}qH-T{u|%{O&EOWOY`-x_HvPazU2ws*g#83)ghh__#NJ~ap}%^Gn?<vMSi
z$~EM2@Ot-hlf@xrnRj+MfdeJP1+fSsAxC&{a39$Ts&_D<?&4&Mu!riWo&?y(#Q3|V
znlN-CF2-oC?hyquFxDg?IprIi2wD+Jqyn|yIbYADKJpnTDu<BUH-}icA6nXq!h?}r
zEY)_FUbk;`rp&Q*)~WMWCn#`EfLbMFa6b53vjtfmbhF0}#Xh=;NmGgw!I$cod#`Qg
zv_5}*k^agF-?q*F>g*hiH}|vg+zTLIknyLKB!r7F{HtcDLTVSk<3$7`|5m9%7)5fg
z$8wmI8!s-j;=JlUQ|jTez9>oj=y71s*_~`LwYme(RkSncU7_$-&_+6CBS^psxOUjy
z00(dz;fu9aIK1$W@-;DoYic)gxSI!X=Z7Qzn$I_!<AGjEJn&qw`@Mot5>x?7N4%^*
z+hljNUE({NaLg{R8*Wjva=6-BHq1d*&R<({XiK~-y*|0O^0kE|#cS*cZvJpFfLb!L
zl;(iz?CT@@B9>l%>HkFVIOVlE*)bY{cJ7~N4XUjq7N#tFhIGzu;b3nSn9jk$s;Ae8
zjLe<fnU#fwvELDXm4-~E`Os)jrePb5cTm?y3=!$MH<d7O>bS^nySub$JfZvh6uS@u
zf0^w;8I%L~@%cFT!2{;N{VLmVOCk5~`$U*mcj!F>zh8_+t-HE*hu+=H8pidNUVNK0
z{0qKw5R_UWa@kGm_j1x}{ZqJ60_OR`PG<7!cCkqXO}{6QZ^!av(8K-YQJKqxLi;|<
z2j;f__d>}Fi;s2JjIx^xA~kaMiSxx;TO4twHymIPWjFE$EgK36i&V^VL(reLkW*@I
zf3aX-k=lYepR!m|$>Z9<#pKuVaXLR7`^Sv$y5YPBA+&(GO216H;6dh2o}%6N!b5Lr
zLCVL`93&KY8gu3r?Uj%Dln~lb1?X#*C#^LX?l0(QmS=}nIq(}U=BDez=_wxTGUQM%
z>cF*G6eiUdhGM;2dacuTPe2-Wm2D>n+T-AU+Bd+5i@{S_`M3_1T89e0m;{h91(Tr-
zF{U=UR5!DAh)zZ$EO>Uh@|KN}iOwxu3Ms!EYJs7b&BvruXWNZHPez7xiaT%P2aFbi
z*U2d!G!u76OH5=qwLqZyW-3in0ld0@OT?ktwL$+9AnTq5#px_8(WtXbx(k%!u#Y3m
zzTm!(r%4(gJ`)j7_BsbY@tSI>dr_iEUwHvBhr*gSzI+B=bo<h@Fdxl~yxO|)Wq>MJ
zo?p{aULM(*%c#3Pqj;Ly6yEST$-vUX%5f1mjyq8!*C#CHrBKK#cPvVj4%=-D#xOqe
zFQo*LSuT&-YKEzHs6lpFmAlU8o^WN>ff6;#hI*)mtFUW43<nh}o#;8JB6>~lTn$4D
z-hG;c+xxMa>Pnh@3Uz8IGP-eS#GvK>4tZQ%XL@omZ)QQLK)o^xu(EEQwjoo#bN7-y
zeU(R$48_Zq#T}c*#?EMbTv+b9S?&t|6|0G??sMVJy66;!Ku@IF)aYI@+PY(t#{cbT
z;kN1XrLgs{AqoGf#r6NG<<bAvQSm<o^#4tJ$^S^me@Yw0e{C!J=f3}o_J8&p{qL5e
w|HQdU3wE>EzcpX|7f$?t=#VnEV}8-coSWAgT94U1XdDmko7}6o>-6XU0;~~ATmS$7

literal 18946
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
L`Np5F{r-OdL0$dz

diff --git a/resources/ios/splash/Default@2x~universal~anyany.png b/resources/ios/splash/Default@2x~universal~anyany.png
index 5d21a832c86625601ff1de5ba10459862ca09e59..1bb650ee045d981c580e6859d811f6278d194204 100644
GIT binary patch
literal 50719
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

literal 65795
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
ZlJI~2LZnE(s#=@dQSTqhzCZiZ{{n|?$HD*r

diff --git a/resources/ios/splash/Default~iphone.png b/resources/ios/splash/Default~iphone.png
index ff0484e500fb5fed5c3701a4756a18fd3ca5de11..a3f133a165f9245acb5e398ee6cfd4216997f6e0 100644
GIT binary patch
literal 6232
zcmd6sXHZky+Q%s>pcE01UK9ld1!)FQz>Y{e2$4=gl@5v!AXF6*5D<{wjv^p6NDD0n
zqzV|Mw-7o3Qm6?f?d6`i=RF_JJ7?y8xHIpb*|YcB>;LTMzt*0$X06|j`OQd|>!ip@
zCMG5>y@&T6GchsWIy&drS&p7q6Q%i%E*!oOE&Z67P95E!;$vpY$`N8>5<01O@3vXs
z6k&$#y_tVr>sC^Z=>X^YT50)fUZJzhtPLI|P(7bLv@@a<@w+)Z%}(4O5@-Kh;`wQg
zGX_%4v7d^i-o9*o%W?aS)RmK~Z&|n>C7&~3fYvDt43u_A`qdi2L86pYKEtmC%?y*i
zZ7>{C&a!SIQoF2~PG4hUIdQ9%iJ4Uj%yf)1B7*skBD>I^#nac0YT1SU5FFM1q5pUB
zNdIT}U;2NCAL;*i+y52*SGvE4|E2$T_>sN8r~B`@{VUy{js1V+R;2T*V|{8!%?u@%
zj|ksIwAlZvo3?=6cEU!vO`)jDcvRj`x?wnS!|}jv_iYW-bRlf-tjaoKcIl@yIAq+@
zH2mumE&iWwrM=2#dV;_#-k)CH+S+De4U7J%;}23FEQK}tKe@POL|~&^0oaAG_gZ1b
zaVv!-v2W#YpL?YTsYNR}vxm%rwU3u`m+8v1x&k@e0{$YHrK?e3^X_0vQR(@+dnLUp
zpALTh)Y#%}_&wgpil`XZz*T$$3g^AX{3_yhs}z{!1T)_?W`?hNf@3p#Mg+&cjn8PT
zUykJLS3?$=xsAouQa?kD*0J&NjcK?Kg-kdlsDQ3^j@t`lkpZ)4%RZPoF}QBy;qG2q
zTDsDoX=-H^JZ=l&64!ju^ZpzHx~FjYvPR&h)W33sceji#N_9GRCwNU%-4=w-hVIP-
z<0{7OpkDdfp}}N)W@_pv41|=>3bujF`0J-#IhZfjZ#@>0z|;7q4_8%L>3y)h+}YU)
zm<{m@2&m_-Gl$uQ9$A`2GFl^9Vb9kh&3V2z2N1TaWx@aQ?pj|<kV1;z2r$UFHlJqg
zJs7&~O1dV>UxpMu4Iz!18|U4$WZM`Oy>ddt&Hz#bq#&IsfDMX@ok$SU^`eY}_0z8p
z^|zu!5X@}G^9}GCXgB-5Zk~75_m%*{)O>q1?ol&jqf*yaaf(@1NY(YdUAP3mJBNOC
z_!^b4WD43Z#ZpWM((PP|xhb`N^}FD_ZRZX}v=-sch2?v@akV4kd{r&y$Zl!kQgfy-
z6*kJ3v2x1-^EV`sYD~kZ{Ey4cUbl2yi0DRQj<DnfT;haUS%sRh1u&(2d9fU5iihOa
zdW@-e<EWWK8b1uy_S@8>wQB$fFhaA-#y9Z*eQl@H23N;M@RHAUj9#p%3yr;>1PY{?
zh$q*%mo{E9mf8O9>oIu=+U|#nH0CpgR69ok96TP3&|ehTY7GQCHj!2gpzSrNJY>g}
zVG3V4a2TZxmZb++zR4>>c;|(|`qN|kJEO+7l@7)I0(=rOU54VAnTt6s!e?sThO6w`
zTk4i06~s5)aH;-l@-Y0QyvNGjVW+MNog(ZVwR6@25VPY~fnk1oV|NsOUS9j$wWlPA
z#)Z&7=3Bn{*k$<r;KeJA4V{r5eKUKHgPE6SmBnd5<Ii6ZBD2#WB@-HEqLLD(37Ja8
z-pEGJ4@zJ2sj)Yq*Lbzs#@stPSMuqd2d@4tT(Zme9J;^NmP)9~fC?Tp_uvK~pjTl)
z=e4d~(Q<!dinOnHN)5*ZG<Gq%0^lOVW2-25q1SXZ9gA7Yep0GBlR-X(`x%|P`jvk}
zh<!reJUmy;V=NwkQ4ib%(?~_x-c1-ar=IuB@xG+rBef1~Rj~E%CO$EMehkZ*{GvxU
zdRoe!dNev8&aOfqX?~%)lrG$X67m-py?%p9n2BpG^%mANr3@K;1P$!UKF(7x{UwcA
z?IXmWdaR14!)R?M)hgk=9z~C)`d}9fJ8~0HCAZG9t$d<plu!kKfq6H#tQI4gm6H|%
z9)tHgS9LyriSN}Iu(5G^VwlR?K;>j5+hNH-qN%F+eJ@(^mz$vYhE`;du^IXa@`U5M
zKdRDD*4Aad`z8yN%Nz*wn*C-AdpO?6Ew1S#)D<frzuWX8Fnp9_x|P)*k-jIc`rLJ3
zqDR5RCn8xxaVGcU@XUtFnY|Bd(5BL%1UYyKX{`Mt^RGc%tn%i{=O696j!SK})Y%Gl
z!`lPHskVjvEoXxR4XjQ!sKD)f%#V8kpNVEZ+;`sR`>`9hz1^dyBFTui8#YoEyTbD5
zMPbEKBUOEvwynS1YX=O9L>Dk7l4j8A&8l*9Q(l;pH6cMy>*YMlVqe1L7mR;dKOMxK
zIyB$a!o;OB2&Hf-*Ng~LeDe?p;Eis8Y+!zWx`A3>U&rI|DaXqJq2XhSlx_LLREA97
zrF0GT^`E|Uv{+K3Da>x2_d)pRVulW&S*eFJcWvMok!Z6M1ueAG10-kMv6nxv&3wow
z9QWPy*DUT0A_+YmRK{rbFOl=aq7H>)bkk~6K<R5a*tFC6Z(mHPWkK@}mc(NSb~I;(
zky>ds^~rq~hx3Od++YJWMD4J6n?p2sWOU$D3OU%@sTIRs9^T~kkvd|1=SSlC>W6Zk
zj{OZkY%&VqyzeyNYow>ZiJ@@VuKXaZc-sM6vuE5SnH>?{&kVC|u0J|%w`OCeb7(d6
zrrEL++(P{56M6%|PQ-x8LUUV4J0Aq(C<ssHDY!&9la)H`FW2=sa?FFr3YVu!irvb{
zQ*JpHgws%lm5>}N86ww_pSP_KtdlWfps7h)e`;gn=MgK7!J~OaBz?KE{Ef)i*1Lv@
zgHK(sjUHyl5J`w$QeNOYdaB7xKbD~@v;90%X)(R}R?_<UkLE-DRy2!i*Ryu$r&CGP
z{tl}MRM?VpaBAB@NVH$W*d)U8=}N-RN38q3)&K$pL)TC%ibe)+C^}5xYzXTIbZ#G?
zW|uu^*M~M`5ol7MI{JIylKEEdf|&jJx#8n2l;K<*$q>UmZPs8X(5N)@J^Ijg6frJf
zX^Ge^+Fms&AmeH0pTL{LJYlZSD4%O%twe{z=EZc9CqAPYF(TQ^sJf(m$0?x{Sb}95
zW_NTtP<i5w?#B1)V;(6qjZy2ycnJWOQS2!ZoyMZ+wlm4trl0m$dnoLf^4-H8bzqBM
z{TL{qEUx9+=TZ+Kc1F88q6JXAK^Z%Gb$HKHiZQX%>&q`0CjOXT*swZAwHf(lRQmB^
zuKk*d>IjPu8^pa{gPZy$Q0R_BxbuaEHLOPPufR>YNer3pgox<#@P_3N#Hum_I0KKC
zkMj|<)E`qk?#~shHly<m8Y*-#uxcVL8gm=~fqq$_1AQvBU-W2APhKY#RG91P?qpr)
z8aSyX3EvDD>Qy+eRTdO&ke<k;b>)0b*mBg@MSrrcPv2&CkFs>uc)v|xJ~C7^2O|X=
zRg$3S3iHs|bg8%ZH?hID!3O;S<~57$RwmYtLsE>YlncBe>VExJYHC@vQa$f)2gZwW
zs0a$mj9wIF5#N=077`Lbb&iCKThrcocBcUp=7!$xbVe)PE%}N#Bg(%$Vn}-VBNX;Y
zk2#w}bXX8TT!~X8DSuLCpB0mg6n@R2&R+#N|CtYyUgK9`Idty&CqK`7#TL$3i~Cp$
zOUeXl)Z4P?aj&woc0K%x$-&1jEt#X!9wM4f=XV^=kG#b{9m|gLr&KIEp3!xn$|w#>
z2eh-wdaIBVfTfq*{H%&yk&M!v$tM~P{Afk}$Q5#yEE;6?(Kdj{JbLIDOwu-K4s#dB
zs6f{9`!oZp6z06xZ<2A~yIQK^p@}ULwBZhx<q_ue7XjSFfPhLawGD*%n%)L*$gfAx
zaRt;3N~Y|`o>IS<5^>kI;VH=QXl>IOE6~R1Vzn~`jcf(FEd{!zA67rCE%yu6>!3Ql
zx~K!-;~7@*uy5`#xU3t2+5;H2Gl%a#Xpc^Ps!oAq8`H}?{kjr6R@2@!B8{gIV)~xK
zU7twqLrfaP1$eqJLdVdEe{%mNT_))ACLgx7l3%3>K7jAE5h&;GA<jPO+QsFzvyC*^
z(Vt2CTz)^@0ZQ>X?Ms#LIB4j~>oFPnaj@-&%k3`Ez+Ob4k_59A1+4ny$_tmdd|)4}
z`gBEy-@K;VS!#V9)9SQRWtKf2vNr=6$Wp^~L@bBA19vBL3feyAtOz#aOq4t0JI>F%
zp?(fbt3pVM@GxvcAZ378*OfpD`dY7=OjVxp#2+>Xpu4f3GviJzy*@b^lbbogp0BLF
z1<Sb*g{`~~3o{_gQReTXNd)?#v1x&V$wl#3KNnqZ%R_fQjVN|yqj19mSHOry-WH<`
znPyy8-tG#aRq+(eQgyWLXpJdbac4G+Lb!PG;%sm$_D0=wyf8p!%!>53lns%}XUY?7
z*BVZT-)n8kM5}7(K0gSg84kVG+)3BF3wgCUrc-=|FXrI|KFX9NvJC!(k5cFava*Iw
zd&qLA)7yygTn#mTU&cZjRkt)>0qU!9CEgg}D|Ds#%HWi?kV6!|$E9ObM~TR29!YJ_
ziK-2UWAvWD{SChCq<G;-NrqSL@Arq;sgILLEBz{>k+WgyQ@+Q(4NcYn<G&dgkxxFD
zqo$FIj)SaQLBzVWcms*ZnL5`E&*3igNvksG5S3=($;#*Z8y-Jdv(d7H0^g#iu_*NU
za^sb-H0Zu($FL{sxa2eATJLmrJ0Di0Mmwfuf~!Djx>eb7=RoJpcRyXcFhH{#H`);v
zqw=7|YtFno$4PX;_H@g25+^)TQs0xcx%<n==ScD)mO$DekOqprRX{agK)dXAWGSyw
zV-PlA0juztCVvkjBNPYpBXT}MUm7(ZI@ZhagW|9GB`N(-kTYu950d?3aD1*R7VvOI
z4GsrtK;ey8aMVDFt351N6#tDoaUL~z*Zt1ylB34Y{sYJlyX9^lVB01!Z`!rL;j+ux
ztmgbsT!*FPPf>q`T6`47alAZ$@gsG=GEi$OvB_X|;O(PUP>j9M(GEc`B)JQ&%2JH`
zd54nXZmD9RnKgAZks)>1Dc$#H1}!d6f)(6z#clzxJz*MXWw%@Hi>*9w5?MvtUX&L~
zzaY=Ejz52Sj}!vAmzxtJrf!S8-h3z=ep|}4>J{JBrB(|)?0)ue!(wZxUHqDYZ0(1r
z1Xdk}Zss@34T<YK39Rx#5BjR$3N^D(6YuP^Jr##;G^3&kRjD~im0WLC5n4T~!oUmd
z*>iC`2;nPOQRfS}F@@u{2(IT0$?cn96fM*taF-mo41X^l+rk?>%0Kyt6U1)vYbbDc
zoL(1A*E36~bI%e};?DN~4%wkN;v^D-uo?;9(6$Zt&UhS46`Yj(CLnTQMx_Z8I;6!{
z)}EOk1C%OGdOaX;+0_w2dW&pLb_M#TB57mN>vS1n>YJ;}PbRJh8)uQm3h+@fbNpO@
ziB`%AD{<X+0E|T1oR|k++VMVK5x)ko(wDCoFSb%#DcuUaBcH#;^-zl{F+o7CEc$n`
znm663y=$(#$`BtOw(*4-I89!19GmSG3G|gH+{-{0k(+{u%C`;{{Q`ATAeGNMqYlHK
zVy&<{1af_9R|=#jzZ_mWuwb)F%U|_+{VQmMXdI_$q5tS;+e~NaOS&I(@F?ot<}xqC
zy_6TLd&*iwh0$eO`1F{}oZmSx<XD<#+J^@l`f>R_{GgiAm_w**cHjJ@Z>FXM0wZc8
zfR8ud<|h=!$1drf;Nw8ab90wr(pT~g#cd{G>+x>mWk*B*H6LfPGZEN(IP<097X73T
zyb-Wf(;(tTtC1^?p(rMIiKabkD3qX*VA;kq3S}3h6`z>{7EY<nREb?h-qPlI&E>+P
zJyTiX0|5IBY<?HpYiH7wsj!o&{GNEBl5H%zEx69laJ!f#aG*Nqs~qwCPOz_575vI3
ztdqx<yO5DX8SW2)97<aAoyt8H28L%%%pz4k-K;IK;ng8kZ-;E$(+7@`I9bRrwtz&P
zHGfCMqw@6M+5|p4f94>|aJ;)4`wG(N;A`^2&QxvTakGnIENw?>F6D&Hh*4~^wd^ED
zer**$HBr@1D05nVk|>L5UrH``XU2@gY}yCsky#QF!<4Pf>8ZUwB8+SCOU6UL+D%NX
zwd6(lC={%@>dld*g!UWb!lrL}VxHXhN?zv@A!`eLzA|ieaH~JyjNr|vJu}HtwH0cL
zYLR>@aCtxa`6|acXgqWIx=Oydi$ckVuU0y@6gcn~o~GUmD?|R4f;)SohjzGik+4)z
z7SCXvt%qn0_f^|UNgfW4G2StU?igcwcGJa^YdvWqHPM<BcOfW8LlSP7C`NXx3t8yM
zAjV9u5>a_qx%#N9UcjIjk?HnO1D?jEP`m)@TdwR)Pyg+91#`!mGr8S7{pu9$`m@V@
z_IaPUmHpUc1=gRHs5%&kJ0P^L2H^YNbVr}j%|_oS=q`s#suj&jrFY`qpOKYaFI`@^
zy%RMbGtm9;Ak)Izg}idVD`)lxiPo9B^oaAo35IgFQQRrHfxo)VOCDRF9E^=y8ck@v
z6TcxUzQrdzL;{)YB#0cCs(pi_72#LZDiay@;4Pl&6rV(~+EN)|)5;_dq4w}{hAjL;
z;zpKV_RVyH-5dMN{_JCD*R=T&0wh6<eby)^T1;iM-3YDguC`#`*4;2BS?7UC8>q8U
zYO}ijy)?@cs3V;}v`U)nF)pmVdbAH9a1B_(43lEYg?tby-So})jJ^4cuU(;Xg>>?!
zHf2$bJZ6rs(9bm<r$iUEq}$(f>`v^7-VOxN5T$#J_p3=3yRJhO^Vt1PhK1>5e))JG
z%g*wd9R_`x#*Y#cuSYCj#Lf{raPxNw?E4g@{rq*N7{5c~w1m+3{8ORHJYE5KeymIG
zXkPnp3(7)T`;zDpv+<6OR`k^&vHhO!PBhNzF{h>rfBR_o8>M61?Yg_k@&84M|3$X<
zPvG<KAoCx%=|7Rkf5No?5jXuuw;6DzKPm8kkLv#YQ~Xooq`-gb|D(SAJHq~dMRotQ
er*n(Jqh9M;fCdTq9{nm{(z|bTuksG~<^KROt7_K(

literal 8612
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
MnLH|e_~)zt1t9)dQUCw|

diff --git a/resources/values/colors.xml b/resources/values/colors.xml
new file mode 100644
index 000000000..841ad9a24
--- /dev/null
+++ b/resources/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+    <color name="background">#FFFFFF</color>
+</resources>

From 0e9b3dcbe1657feaf458c7d860e6d33cd63165c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 12 Sep 2019 09:22:03 +0200
Subject: [PATCH 028/257] MOBILE-3119 settings: Show site URL on about page

---
 src/core/settings/pages/about/about.html | 8 ++++++++
 src/core/settings/pages/about/about.ts   | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/src/core/settings/pages/about/about.html b/src/core/settings/pages/about/about.html
index 65dd36145..f948746d8 100644
--- a/src/core/settings/pages/about/about.html
+++ b/src/core/settings/pages/about/about.html
@@ -23,6 +23,14 @@
         <ion-item text-wrap>
             <p><a [href]="privacyPolicy" core-link auto-login="no">{{ privacyPolicy }}</a></p>
         </ion-item>
+    </ion-item-group>
+        <ion-item-group *ngIf="siteUrl">
+        <ion-item-divider text-wrap>
+            {{ 'core.login.siteurl' | translate }}<ng-container *ngIf="isPrefixedUrl"> *</ng-container>
+        </ion-item-divider>
+        <ion-item text-wrap>
+            <p><a [href]="siteUrl" core-link auto-login="yes">{{ siteUrl }}</a></p>
+        </ion-item>
     </ion-item-group>
     <ion-item-group>
         <ion-item-divider text-wrap>
diff --git a/src/core/settings/pages/about/about.ts b/src/core/settings/pages/about/about.ts
index 1c339f5c1..373f0d90e 100644
--- a/src/core/settings/pages/about/about.ts
+++ b/src/core/settings/pages/about/about.ts
@@ -55,6 +55,8 @@ export class CoreSettingsAboutPage {
     storageType: string;
     localNotifAvailable: string;
     pushId: string;
+    siteUrl: string;
+    isPrefixedUrl: boolean;
 
     constructor(platform: Platform, device: Device, appProvider: CoreAppProvider, fileProvider: CoreFileProvider,
             initDelegate: CoreInitDelegate, langProvider: CoreLangProvider, sitesProvider: CoreSitesProvider,
@@ -114,5 +116,9 @@ export class CoreSettingsAboutPage {
 
         this.localNotifAvailable = localNotificationsProvider.isAvailable() ? 'core.yes' : 'core.no';
         this.pushId = pushNotificationsProvider.getPushId();
+
+        this.siteUrl = (currentSite && currentSite.getURL()) ||
+            (typeof CoreConfigConstants.siteurl == 'string' && CoreConfigConstants.siteurl);
+        this.isPrefixedUrl = !!CoreConfigConstants.siteurl;
     }
 }

From 932f00cf1b9d3d1549e6f9ffb6ee92f0648f45fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 12 Sep 2019 10:28:58 +0200
Subject: [PATCH 029/257] MOBILE-3119 mainmenu: Show site name and URL on the
 menu

---
 src/core/mainmenu/pages/more/more.html   | 6 ++++--
 src/core/mainmenu/pages/more/more.ts     | 2 ++
 src/core/settings/pages/about/about.html | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/core/mainmenu/pages/more/more.html b/src/core/mainmenu/pages/more/more.html
index 60ccc28a4..4630fb1e4 100644
--- a/src/core/mainmenu/pages/more/more.html
+++ b/src/core/mainmenu/pages/more/more.html
@@ -5,9 +5,11 @@
 </ion-header>
 <ion-content>
     <ion-list>
-        <a ion-item core-user-link [userId]="siteInfo.userid">
+        <a ion-item core-user-link [userId]="siteInfo.userid" text-wrap>
             <ion-avatar core-user-avatar [user]="siteInfo" item-start></ion-avatar>
-            <p>{{siteInfo.fullname}}</p>
+            <h2>{{siteInfo.fullname}}</h2>
+            <ion-note>{{ siteName }}</ion-note>
+            <ion-note>{{ siteUrl }}</ion-note>
         </a>
         <ion-item-divider></ion-item-divider>
         <ion-item text-center *ngIf="(!handlers || !handlers.length) && !handlersLoaded">
diff --git a/src/core/mainmenu/pages/more/more.ts b/src/core/mainmenu/pages/more/more.ts
index 09dd27b06..84d1b86c8 100644
--- a/src/core/mainmenu/pages/more/more.ts
+++ b/src/core/mainmenu/pages/more/more.ts
@@ -38,6 +38,7 @@ export class CoreMainMenuMorePage implements OnDestroy {
     showHelp: boolean;
     docsUrl: string;
     customItems: CoreMainMenuCustomItem[];
+    siteUrl: string;
 
     protected subscription;
     protected langObserver;
@@ -108,6 +109,7 @@ export class CoreMainMenuMorePage implements OnDestroy {
 
         this.siteInfo = currentSite.getInfo();
         this.siteName = currentSite.getSiteName();
+        this.siteUrl = currentSite.getURL();
         this.logoutLabel = 'core.mainmenu.' + (config && config.tool_mobile_forcelogout == '1' ? 'logout' : 'changesite');
         this.showWeb = !currentSite.isFeatureDisabled('CoreMainMenuDelegate_website');
         this.showHelp = !currentSite.isFeatureDisabled('CoreMainMenuDelegate_help');
diff --git a/src/core/settings/pages/about/about.html b/src/core/settings/pages/about/about.html
index f948746d8..01ec8e930 100644
--- a/src/core/settings/pages/about/about.html
+++ b/src/core/settings/pages/about/about.html
@@ -24,7 +24,7 @@
             <p><a [href]="privacyPolicy" core-link auto-login="no">{{ privacyPolicy }}</a></p>
         </ion-item>
     </ion-item-group>
-        <ion-item-group *ngIf="siteUrl">
+    <ion-item-group *ngIf="siteUrl">
         <ion-item-divider text-wrap>
             {{ 'core.login.siteurl' | translate }}<ng-container *ngIf="isPrefixedUrl"> *</ng-container>
         </ion-item-divider>

From c0feef896820afbb36352fc787ca14a445b04084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 30 Aug 2019 11:38:27 +0200
Subject: [PATCH 030/257] MOBILE-2872 book: Show hidden chapters

---
 src/addon/mod/book/pages/toc/toc.html |  4 +--
 src/addon/mod/book/providers/book.ts  | 50 +++++++++++++++++++++------
 2 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/src/addon/mod/book/pages/toc/toc.html b/src/addon/mod/book/pages/toc/toc.html
index 30e22bea0..c4132681b 100644
--- a/src/addon/mod/book/pages/toc/toc.html
+++ b/src/addon/mod/book/pages/toc/toc.html
@@ -11,8 +11,8 @@
 <ion-content>
     <nav>
         <ion-list>
-            <a ion-item text-wrap *ngFor="let chapter of chapters" (click)="loadChapter(chapter.id)" [class.core-nav-item-selected]="selected == chapter.id">
-                <p [attr.padding-left]="chapter.level == 1 ? true : null">{{chapter.title}}</p>
+            <a ion-item text-wrap *ngFor="let chapter of chapters" (click)="loadChapter(chapter.id)" [class.core-nav-item-selected]="selected == chapter.id" [class.item-dimmed]="chapter.hidden">
+                <p [attr.padding-left]="chapter.level == 1 ? true : null">{{chapter.number}} {{chapter.title}}</p>
             </a>
         </ion-list>
     </nav>
diff --git a/src/addon/mod/book/providers/book.ts b/src/addon/mod/book/providers/book.ts
index d1061ef65..f5815f3c3 100644
--- a/src/addon/mod/book/providers/book.ts
+++ b/src/addon/mod/book/providers/book.ts
@@ -80,11 +80,9 @@ export class AddonModBookProvider {
 
                 // Search the book.
                 if (response && response.books) {
-                    for (const i in response.books) {
-                        const book = response.books[i];
-                        if (book[key] == value) {
-                            return book;
-                        }
+                    const book = response.books.find((book) => book[key] == value);
+                    if (book) {
+                        return book;
                     }
                 }
 
@@ -278,21 +276,41 @@ export class AddonModBookProvider {
      * @return The toc as a list.
      */
     getTocList(contents: any[]): AddonModBookTocChapter[] {
+        // Convenience function to get chapter info.
+        const getChapterInfo = (chapter: any, chapterNumber: number, previousNumber: string = ''): AddonModBookTocChapter => {
+            chapter.hidden = !!parseInt(chapter.hidden, 10);
+
+            const fullChapterNumber = previousNumber + (chapter.hidden ? 'x.' : chapterNumber + '.');
+
+            return {
+                id: chapter.href.replace('/index.html', ''),
+                title: chapter.title,
+                level: chapter.level,
+                number: fullChapterNumber,
+                hidden: chapter.hidden
+            };
+        };
+
         const chapters = [],
             toc = this.getToc(contents);
 
+        let chapterNumber = 1;
         toc.forEach((chapter) => {
+            const tocChapter = getChapterInfo(chapter, chapterNumber);
+
             // Add the chapter to the list.
-            let chapterId = chapter.href.replace('/index.html', '');
-            chapters.push({id: chapterId, title: chapter.title, level: chapter.level});
+            chapters.push(tocChapter);
 
             if (chapter.subitems) {
+                let subChapterNumber = 1;
                 // Add all the subchapters to the list.
                 chapter.subitems.forEach((subChapter) => {
-                    chapterId = subChapter.href.replace('/index.html', '');
-                    chapters.push({id: chapterId, title: subChapter.title, level: subChapter.level});
+                    chapters.push(getChapterInfo(subChapter, subChapterNumber, tocChapter.number));
+                    subChapterNumber++;
                 });
             }
+
+            chapterNumber++;
         });
 
         return chapters;
@@ -376,7 +394,7 @@ export class AddonModBookProvider {
 /**
  * A book chapter inside the toc list.
  */
-export type AddonModBookTocChapter = {
+export interface AddonModBookTocChapter {
     /**
      * ID to identify the chapter.
      */
@@ -391,7 +409,17 @@ export type AddonModBookTocChapter = {
      * The chapter's level.
      */
     level: number;
-};
+
+    /**
+     * The chapter is hidden.
+     */
+    hidden: boolean;
+
+    /**
+     * The chapter's number'.
+     */
+    number: string;
+}
 
 /**
  * Map of book contents. For each chapter it has its index URL and the list of paths of the files the chapter has. Each path

From fe4b760283f517fada03e27d584d43d37cfd0edb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 3 Sep 2019 12:27:48 +0200
Subject: [PATCH 031/257] MOBILE-3091 signup: Sort countries by name

---
 .../pages/email-signup/email-signup.html      |  4 ++--
 .../login/pages/email-signup/email-signup.ts  |  4 +---
 src/providers/utils/utils.ts                  | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/core/login/pages/email-signup/email-signup.html b/src/core/login/pages/email-signup/email-signup.html
index e00adbfca..30aa9cd58 100644
--- a/src/core/login/pages/email-signup/email-signup.html
+++ b/src/core/login/pages/email-signup/email-signup.html
@@ -31,7 +31,7 @@
                 <ion-label stacked core-mark-required="true">{{ 'core.wheredoyoulive' | translate }}</ion-label>
                 <ion-select name="country" formControlName="country" [placeholder]="'core.login.selectacountry' | translate">
                     <ion-option value="">{{ 'core.login.selectacountry' | translate }}</ion-option>
-                    <ion-option *ngFor="let key of countriesKeys" [value]="key">{{countries[key]}}</ion-option>
+                    <ion-option *ngFor="let country of countries" [value]="country.code">{{country.name}}</ion-option>
                 </ion-select>
             </ion-item>
 
@@ -103,7 +103,7 @@
                 <ion-label stacked id="core-login-signup-country">{{ 'core.user.country' | translate }}</ion-label>
                 <ion-select name="country" formControlName="country" aria-labelledby="core-login-signup-country" [placeholder]="'core.login.selectacountry' | translate">
                     <ion-option value="">{{ 'core.login.selectacountry' | translate }}</ion-option>
-                    <ion-option *ngFor="let key of countriesKeys" [value]="key">{{countries[key]}}</ion-option>
+                    <ion-option *ngFor="let country of countries" [value]="country.code">{{country.name}}</ion-option>
                 </ion-select>
             </ion-item>
 
diff --git a/src/core/login/pages/email-signup/email-signup.ts b/src/core/login/pages/email-signup/email-signup.ts
index 25ecd0e2e..cf25a4ab1 100644
--- a/src/core/login/pages/email-signup/email-signup.ts
+++ b/src/core/login/pages/email-signup/email-signup.ts
@@ -43,7 +43,6 @@ export class CoreLoginEmailSignupPage {
     authInstructions: string;
     settings: any;
     countries: any;
-    countriesKeys: any[];
     categories: any[];
     settingsLoaded = false;
     captcha = {
@@ -177,9 +176,8 @@ export class CoreLoginEmailSignupPage {
                 });
             }
 
-            return this.utils.getCountryList().then((countries) => {
+            return this.utils.getCountryListSorted().then((countries) => {
                 this.countries = countries;
-                this.countriesKeys = Object.keys(countries);
             });
         });
     }
diff --git a/src/providers/utils/utils.ts b/src/providers/utils/utils.ts
index 5b9d3b70f..736cf84cd 100644
--- a/src/providers/utils/utils.ts
+++ b/src/providers/utils/utils.ts
@@ -623,6 +623,25 @@ export class CoreUtilsProvider {
         });
     }
 
+    /**
+     * Get list of countries with their code and translated name. Sorted by the name of the country.
+     *
+     * @return Promise resolved with the list of countries.
+     */
+    getCountryListSorted(): Promise<any[]> {
+        // Get the keys of the countries.
+        return this.getCountryList().then((countries) => {
+            // Sort translations.
+            const sortedCountries = [];
+
+            Object.keys(countries).sort((a, b) => countries[a].localeCompare(countries[b])).forEach((key) => {
+                sortedCountries.push({code: key, name: countries[key]});
+            });
+
+            return sortedCountries;
+        });
+    }
+
     /**
      * Get the list of language keys of the countries.
      *

From 10328b7582743ec25c29b764de1bd2ec7ababbc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 29 Aug 2019 17:09:16 +0200
Subject: [PATCH 032/257] MOBILE-3105 wiki: Move Map to a lateral modal

---
 .../index/addon-mod-wiki-index.html           |  75 ++++--------
 src/addon/mod/wiki/components/index/index.ts  | 112 +++++++-----------
 src/addon/mod/wiki/pages/map/map.html         |  29 +++++
 src/addon/mod/wiki/pages/map/map.module.ts    |  33 ++++++
 src/addon/mod/wiki/pages/map/map.ts           |  93 +++++++++++++++
 5 files changed, 220 insertions(+), 122 deletions(-)
 create mode 100644 src/addon/mod/wiki/pages/map/map.html
 create mode 100644 src/addon/mod/wiki/pages/map/map.module.ts
 create mode 100644 src/addon/mod/wiki/pages/map/map.ts

diff --git a/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
index 2ee9b5e8d..749a85458 100644
--- a/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -5,9 +5,8 @@
         <ion-icon name="person"></ion-icon>
     </button>
 
-    <!-- Go to "home". -->
-    <button ion-button icon-only *ngIf="showHomeButton" (click)="goToWikiHome()" [attr.aria-label]="'addon.mod_wiki.gowikihome' | translate">
-        <ion-icon name="home"></ion-icon>
+    <button *ngIf="loaded && currentPageObj" ion-button icon-only (click)="openMap($event)"[attr.aria-label]="'addon.mod_wiki.map' | translate" aria-haspopup="true">
+        <ion-icon name="map"></ion-icon>
     </button>
 
     <core-context-menu>
@@ -25,58 +24,32 @@
 
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
+    <div padding class="addon-mod_wiki-page-content">
+        <core-course-module-description *ngIf="isMainPage" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
 
-    <core-tabs [hideUntil]="loaded" [selectedIndex]="selectedTab">
-        <!-- Page contents. -->
-        <core-tab [title]="'addon.mod_wiki.viewpage' | translate" icon="document">
-            <ng-template>
-                <div padding class="addon-mod_wiki-page-content">
-                    <core-course-module-description *ngIf="isMainPage" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+        <!-- Wiki has something offline. -->
+        <div class="core-warning-card" icon-start *ngIf="pageIsOffline || hasOffline">
+            <ion-icon name="warning"></ion-icon>
+            <span *ngIf="pageIsOffline">{{ 'core.hasdatatosync' | translate:{$a: pageStr} }}</span>
+            <span *ngIf="!pageIsOffline">{{ 'core.hasdatatosync' | translate:{$a: moduleName} }}</span>
+        </div>
 
-                    <!-- Wiki has something offline. -->
-                    <div class="core-warning-card" icon-start *ngIf="pageIsOffline || hasOffline">
-                        <ion-icon name="warning"></ion-icon>
-                        <span *ngIf="pageIsOffline">{{ 'core.hasdatatosync' | translate:{$a: pageStr} }}</span>
-                        <span *ngIf="!pageIsOffline">{{ 'core.hasdatatosync' | translate:{$a: moduleName} }}</span>
-                    </div>
+        <!-- Page warning. -->
+        <div class="core-warning-card" icon-start *ngIf="pageWarning">
+            <ion-icon name="warning"></ion-icon>
+            {{ pageWarning }}
+        </div>
 
-                    <!-- Page warning. -->
-                    <div class="core-warning-card" icon-start *ngIf="pageWarning">
-                        <ion-icon name="warning"></ion-icon>
-                        {{ pageWarning }}
-                    </div>
-
-                    <article [ngClass]="{'addon-mod_wiki-noedit': !canEdit}">
-                        <core-format-text *ngIf="pageContent" [component]="component" [componentId]="componentId" [text]="pageContent"></core-format-text>
-                        <core-empty-box *ngIf="!pageContent" icon="document" [message]="'addon.mod_wiki.nocontent' | translate" [inline]="true"></core-empty-box>
-                    </article>
-
-                    <div margin-top *ngIf="tagsEnabled && currentPageObj && currentPageObj.tags && currentPageObj.tags.length > 0">
-                        <b>{{ 'core.tag.tags' | translate }}:</b>
-                        <core-tag-list [tags]="currentPageObj.tags"></core-tag-list>
-                    </div>
-                </div>
-            </ng-template>
-        </core-tab>
-
-        <!-- Map. -->
-        <core-tab [title]="'addon.mod_wiki.map' | translate" icon="map">
-            <ng-template>
-                <ion-list>
-                    <ng-container *ngFor="let letter of map">
-                        <ion-item-divider *ngIf="letter.label">
-                            {{ letter.label }}
-                        </ion-item-divider>
-                        <a ion-item text-wrap *ngFor="let page of letter.pages" (click)="goToPage(page)">
-                            {{ page.title }}
-                            <ion-note *ngIf="!page.id" item-end color="danger">{{ 'core.offline' | translate }}</ion-note>
-                        </a>
-                    </ng-container>
-                </ion-list>
-            </ng-template>
-        </core-tab>
-    </core-tabs>
+        <article [ngClass]="{'addon-mod_wiki-noedit': !canEdit}">
+            <core-format-text *ngIf="pageContent" [component]="component" [componentId]="componentId" [text]="pageContent"></core-format-text>
+            <core-empty-box *ngIf="!pageContent" icon="document" [message]="'addon.mod_wiki.nocontent' | translate" [inline]="true"></core-empty-box>
+        </article>
 
+        <div margin-top *ngIf="tagsEnabled && currentPageObj && currentPageObj.tags && currentPageObj.tags.length > 0">
+            <b>{{ 'core.tag.tags' | translate }}:</b>
+            <core-tag-list [tags]="currentPageObj.tags"></core-tag-list>
+        </div>
+    </div>
 </core-loading>
 
 <ion-fab core-fab bottom end *ngIf="canEdit">
diff --git a/src/addon/mod/wiki/components/index/index.ts b/src/addon/mod/wiki/components/index/index.ts
index 7296709d2..a7eab587f 100644
--- a/src/addon/mod/wiki/components/index/index.ts
+++ b/src/addon/mod/wiki/components/index/index.ts
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Optional, Injector, Input, ViewChild } from '@angular/core';
-import { Content, NavController, PopoverController, ViewController } from 'ionic-angular';
+import { Component, Optional, Injector, Input } from '@angular/core';
+import { Content, NavController, PopoverController, ViewController, ModalController } from 'ionic-angular';
 import { CoreGroupsProvider } from '@providers/groups';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreCourseModuleMainActivityComponent } from '@core/course/classes/main-activity-component';
@@ -21,7 +21,6 @@ import { CoreUserProvider } from '@core/user/providers/user';
 import { AddonModWikiProvider, AddonModWikiSubwikiListData } from '../../providers/wiki';
 import { AddonModWikiOfflineProvider } from '../../providers/wiki-offline';
 import { AddonModWikiSyncProvider } from '../../providers/wiki-sync';
-import { CoreTabsComponent } from '@components/tabs/tabs';
 import { AddonModWikiSubwikiPickerComponent } from '../../components/subwiki-picker/subwiki-picker';
 import { CoreTagProvider } from '@core/tag/providers/tag';
 
@@ -33,7 +32,6 @@ import { CoreTagProvider } from '@core/tag/providers/tag';
     templateUrl: 'addon-mod-wiki-index.html',
 })
 export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComponent {
-    @ViewChild(CoreTabsComponent) tabs: CoreTabsComponent;
 
     @Input() action: string;
     @Input() pageId: number;
@@ -55,9 +53,6 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     loadedSubwikis: any[] = []; // The loaded subwikis.
     pageIsOffline: boolean; // Whether the loaded page is an offline page.
     pageContent: string; // Page content to display.
-    showHomeButton: boolean; // Whether to display the home button.
-    selectedTab = 0; // Tab to select at start.
-    map: any[] = []; // Map of pages, categorized by letter.
     subwikiData: AddonModWikiSubwikiListData = { // Data for the subwiki selector.
         subwikiSelected: 0,
         userSelected: 0,
@@ -66,25 +61,23 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
         count: 0
     };
     tagsEnabled: boolean;
+    currentPageObj: any; // Object of the current loaded page.
 
     protected syncEventName = AddonModWikiSyncProvider.AUTO_SYNCED;
     protected currentSubwiki: any; // Current selected subwiki.
     protected currentPage: number; // Current loaded page ID.
-    protected currentPageObj: any; // Object of the current loaded page.
     protected subwikiPages: any[]; // List of subwiki pages.
     protected newPageObserver: any; // Observer to check for new pages.
     protected ignoreManualSyncEvent: boolean; // Whether manual sync event should be ignored.
     protected manualSyncObserver: any; // An observer to watch for manual sync events.
     protected currentUserId: number; // Current user ID.
     protected hasEdited = false; // Whether the user has opened the edit page.
-    protected mapInitialized = false; // Whether the map was initialized.
-    protected initHomeButton = true; // Whether the init home button must be initialized.
 
     constructor(injector: Injector, protected wikiProvider: AddonModWikiProvider, @Optional() protected content: Content,
             protected wikiOffline: AddonModWikiOfflineProvider, protected wikiSync: AddonModWikiSyncProvider,
             protected navCtrl: NavController, protected utils: CoreUtilsProvider, protected groupsProvider: CoreGroupsProvider,
             protected userProvider: CoreUserProvider, private popoverCtrl: PopoverController,
-            private tagProvider: CoreTagProvider) {
+            private tagProvider: CoreTagProvider, protected modalCtrl: ModalController) {
         super(injector, content);
 
         this.pageStr = this.translate.instant('addon.mod_wiki.wikipage');
@@ -100,7 +93,6 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
         this.currentUserId = this.sitesProvider.getCurrentSiteUserId();
         this.isMainPage = !this.pageId && !this.pageTitle;
         this.currentPage = this.pageId;
-        this.selectedTab = this.action == 'map' ? 1 : 0;
 
         this.loadContent(false, true).then(() => {
             if (!this.wiki) {
@@ -118,6 +110,10 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
                     // Ignore errors.
                 });
             }
+        }).finally(() => {
+            if (this.action == 'map') {
+                this.openMap();
+            }
         });
 
         // Listen for manual sync events.
@@ -179,40 +175,6 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
         }
     }
 
-    /**
-     * Construct the map of pages.
-     *
-     * @param subwikiPages List of pages.
-     */
-    constructMap(subwikiPages: any[]): void {
-        let letter,
-            initialLetter;
-
-        this.map = [];
-        this.mapInitialized = true;
-        subwikiPages.sort((a, b) => {
-            const compareA = a.title.toLowerCase().trim(),
-                compareB = b.title.toLowerCase().trim();
-
-            return compareA.localeCompare(compareB);
-        });
-
-        subwikiPages.forEach((page) => {
-            const letterCandidate = page.title.charAt(0).toLocaleUpperCase();
-
-            // Should we create a new grouping?
-            if (letterCandidate !== initialLetter) {
-                initialLetter = letterCandidate;
-                letter = {label: letterCandidate, pages: []};
-
-                this.map.push(letter);
-            }
-
-            // Add the subwiki to the currently active grouping.
-            letter.pages.push(page);
-        });
-    }
-
     /**
      * Get the wiki data.
      *
@@ -248,11 +210,6 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
                 return Promise.reject(null);
             }
 
-            if (this.isCurrentView || this.initHomeButton) {
-                this.initHomeButton = false;
-                this.showHomeButton = !!this.getWikiHomeView();
-            }
-
             // Get module instance if it's empty.
             let promise;
             if (!this.module.id) {
@@ -397,7 +354,6 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
             }
 
             this.subwikiPages = this.wikiProvider.sortPagesByTitle(subwikiPages.concat(offlinePages));
-            this.constructMap(this.subwikiPages);
 
             // Reject if no currentPage selected from the subwikis given (if no subwikis available, do not reject).
             if (!this.currentPage && !this.pageTitle && this.subwikiPages.length > 0) {
@@ -492,17 +448,6 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
         }
     }
 
-    /**
-     * Go back to the initial page of the wiki.
-     */
-    goToWikiHome(): void {
-        const homeView = this.getWikiHomeView();
-
-        if (homeView) {
-            this.navCtrl.popTo(homeView);
-        }
-    }
-
     /**
      * Open the view to create the first page of the wiki.
      */
@@ -613,9 +558,39 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
 
             return;
         }
+    }
 
-        // No changes done.
-        this.tabs.selectTab(0);
+    /**
+     * Show the map.
+     *
+     * @param {MouseEvent} event Event.
+     */
+    openMap(event: MouseEvent): void {
+        const modal = this.modalCtrl.create('AddonModWikiMapPage', {
+            pages: this.subwikiPages,
+            selected: this.currentPageObj && this.currentPageObj.id,
+            homeView: this.getWikiHomeView()
+        }, { cssClass: 'core-modal-lateral',
+            showBackdrop: true,
+            enableBackdropDismiss: true,
+            enterAnimation: 'core-modal-lateral-transition',
+            leaveAnimation: 'core-modal-lateral-transition' });
+
+        // If the modal sends back a SCO, load it.
+        modal.onDidDismiss((page) => {
+            if (page) {
+                if (page.type == 'home') {
+                    // Go back to the initial page of the wiki.
+                    this.navCtrl.popTo(page.goto);
+                } else {
+                    this.goToPage(page.goto);
+                }
+            }
+        });
+
+        modal.present({
+            ev: event
+        });
     }
 
     /**
@@ -638,8 +613,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
                     wikiId: this.wiki.id,
                     subwikiId: subwikiId,
                     userId: userId,
-                    groupId: groupId,
-                    action: this.tabs.selected == 0 ? 'page' : 'map'
+                    groupId: groupId
                 });
             }
         }
@@ -731,8 +705,6 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     ionViewDidEnter(): void {
         super.ionViewDidEnter();
 
-        this.tabs && this.tabs.ionViewDidEnter();
-
         if (this.hasEdited) {
             this.hasEdited = false;
             this.showLoadingAndRefresh(true, false);
@@ -745,8 +717,6 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     ionViewDidLeave(): void {
         super.ionViewDidLeave();
 
-        this.tabs && this.tabs.ionViewDidLeave();
-
         if (this.navCtrl.getActive().component.name == 'AddonModWikiEditPage') {
             this.hasEdited = true;
         }
diff --git a/src/addon/mod/wiki/pages/map/map.html b/src/addon/mod/wiki/pages/map/map.html
new file mode 100644
index 000000000..4d1545519
--- /dev/null
+++ b/src/addon/mod/wiki/pages/map/map.html
@@ -0,0 +1,29 @@
+<ion-header>
+    <ion-navbar core-back-button>
+        <ion-title>{{ 'addon.mod_wiki.map' | translate }}</ion-title>
+        <ion-buttons end>
+            <button ion-button icon-only (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
+                <ion-icon name="close"></ion-icon>
+            </button>
+        </ion-buttons>
+    </ion-navbar>
+</ion-header>
+<ion-content>
+    <nav>
+        <ion-list>
+            <!-- Go to "home". -->
+            <a ion-item text-wrap *ngIf="homeView" (click)="goToWikiHome()">
+                <ion-icon name="home" item-start></ion-icon> {{ 'addon.mod_wiki.gowikihome' | translate }}
+            </a>
+            <ng-container *ngFor="let letter of map">
+                <ion-item-divider *ngIf="letter.label">
+                    {{ letter.label }}
+                </ion-item-divider>
+                <a ion-item text-wrap *ngFor="let page of letter.pages" (click)="goToPage(page)" [class.core-nav-item-selected]="selected == page.id">
+                    <ion-icon name="home" item-start *ngIf="page.firstpage"></ion-icon> {{ page.title }}
+                    <ion-note *ngIf="!page.id" item-end color="danger">{{ 'core.offline' | translate }}</ion-note>
+                </a>
+            </ng-container>
+        </ion-list>
+    </nav>
+</ion-content>
diff --git a/src/addon/mod/wiki/pages/map/map.module.ts b/src/addon/mod/wiki/pages/map/map.module.ts
new file mode 100644
index 000000000..cf9fa5738
--- /dev/null
+++ b/src/addon/mod/wiki/pages/map/map.module.ts
@@ -0,0 +1,33 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { TranslateModule } from '@ngx-translate/core';
+import { CoreComponentsModule } from '@components/components.module';
+import { CoreDirectivesModule } from '@directives/directives.module';
+import { AddonModWikiMapPage } from './map';
+
+@NgModule({
+    declarations: [
+        AddonModWikiMapPage,
+    ],
+    imports: [
+        CoreComponentsModule,
+        CoreDirectivesModule,
+        IonicPageModule.forChild(AddonModWikiMapPage),
+        TranslateModule.forChild()
+    ],
+})
+export class AddonModWikiMapPageModule {}
diff --git a/src/addon/mod/wiki/pages/map/map.ts b/src/addon/mod/wiki/pages/map/map.ts
new file mode 100644
index 000000000..e1fcb25ad
--- /dev/null
+++ b/src/addon/mod/wiki/pages/map/map.ts
@@ -0,0 +1,93 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Component } from '@angular/core';
+import { IonicPage, NavParams, ViewController } from 'ionic-angular';
+
+/**
+ * Modal to display the map of a Wiki.
+ */
+@IonicPage({ segment: 'addon-mod-wiki-map' })
+@Component({
+    selector: 'page-addon-mod-wiki-map',
+    templateUrl: 'map.html',
+})
+export class AddonModWikiMapPage {
+    map: any[] = []; // Map of pages, categorized by letter.
+    selected: number;
+    homeView: ViewController;
+
+    constructor(navParams: NavParams, protected viewCtrl: ViewController) {
+        this.constructMap(navParams.get('pages') || []);
+
+        this.selected = navParams.get('selected');
+        this.homeView = navParams.get('homeView');
+    }
+
+    /**
+     * Function called when a page is clicked.
+     *
+     * @param {any} page Clicked page.
+     */
+    goToPage(page: any): void {
+        this.viewCtrl.dismiss({type: 'page', goto: page});
+    }
+
+    /**
+     * Go back to the initial page of the wiki.
+     */
+    goToWikiHome(): void {
+        this.viewCtrl.dismiss({type: 'home', goto: this.homeView});
+    }
+
+    /**
+     * Construct the map of pages.
+     *
+     * @param {any[]} pages List of pages.
+     */
+    protected constructMap(pages: any[]): void {
+        let letter,
+            initialLetter;
+
+        this.map = [];
+        pages.sort((a, b) => {
+            const compareA = a.title.toLowerCase().trim(),
+                compareB = b.title.toLowerCase().trim();
+
+            return compareA.localeCompare(compareB);
+        });
+
+        pages.forEach((page) => {
+            const letterCandidate = page.title.charAt(0).toLocaleUpperCase();
+
+            // Should we create a new grouping?
+            if (letterCandidate !== initialLetter) {
+                initialLetter = letterCandidate;
+                letter = {label: letterCandidate, pages: []};
+
+                this.map.push(letter);
+            }
+
+            // Add the subwiki to the currently active grouping.
+            letter.pages.push(page);
+        });
+    }
+
+    /**
+     * Close modal.
+     */
+    closeModal(): void {
+        this.viewCtrl.dismiss();
+    }
+}

From 3f1114f34c26ab5d32424714c0599518edc8c298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 30 Aug 2019 09:44:36 +0200
Subject: [PATCH 033/257] MOBILE-3105 wiki: Code restyling

---
 .../index/addon-mod-wiki-index.html           |  5 +-
 .../mod/wiki/components/index/index.scss      |  1 +
 src/addon/mod/wiki/components/index/index.ts  | 66 +++++++------------
 src/addon/mod/wiki/pages/map/map.html         |  5 +-
 src/addon/mod/wiki/pages/map/map.ts           |  4 +-
 5 files changed, 33 insertions(+), 48 deletions(-)

diff --git a/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
index 749a85458..c16f7462c 100644
--- a/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -24,7 +24,7 @@
 
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
-    <div padding class="addon-mod_wiki-page-content">
+    <div padding *ngIf="(isMainPage && description) || pageIsOffline || hasOffline || pageWarning">
         <core-course-module-description *ngIf="isMainPage" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
 
         <!-- Wiki has something offline. -->
@@ -39,7 +39,8 @@
             <ion-icon name="warning"></ion-icon>
             {{ pageWarning }}
         </div>
-
+    </div>
+    <div padding class="addon-mod_wiki-page-content">
         <article [ngClass]="{'addon-mod_wiki-noedit': !canEdit}">
             <core-format-text *ngIf="pageContent" [component]="component" [componentId]="componentId" [text]="pageContent"></core-format-text>
             <core-empty-box *ngIf="!pageContent" icon="document" [message]="'addon.mod_wiki.nocontent' | translate" [inline]="true"></core-empty-box>
diff --git a/src/addon/mod/wiki/components/index/index.scss b/src/addon/mod/wiki/components/index/index.scss
index e320264d2..3a0249f11 100644
--- a/src/addon/mod/wiki/components/index/index.scss
+++ b/src/addon/mod/wiki/components/index/index.scss
@@ -12,6 +12,7 @@ ion-app.app-root addon-mod-wiki-index {
 
     .addon-mod_wiki-page-content {
         background-color: $white;
+        border-top: 1px solid $gray;
         @include darkmode() {
             background-color: $black;
         }
diff --git a/src/addon/mod/wiki/components/index/index.ts b/src/addon/mod/wiki/components/index/index.ts
index a7eab587f..f4780f4c8 100644
--- a/src/addon/mod/wiki/components/index/index.ts
+++ b/src/addon/mod/wiki/components/index/index.ts
@@ -145,31 +145,20 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     protected checkPageCreatedOrDiscarded(data: any): void {
         if (!this.currentPage && data) {
             // This is an offline page. Check if the page was created.
-            let pageId;
-
-            for (let i = 0, len = data.created.length; i < len; i++) {
-                const page = data.created[i];
-                if (page.title == this.pageTitle) {
-                    pageId = page.pageId;
-                    break;
-                }
-            }
-
-            if (pageId) {
+            const page = data.created.find((page) => page.title == this.pageTitle);
+            if (page) {
                 // Page was created, set the ID so it's retrieved from server.
-                this.currentPage = pageId;
+                this.currentPage = page.pageId;
                 this.pageIsOffline = false;
             } else {
                 // Page not found in created list, check if it was discarded.
-                for (let i = 0, len = data.discarded.length; i < len; i++) {
-                    const page = data.discarded[i];
-                    if (page.title == this.pageTitle) {
-                        // Page discarded, show warning.
-                        this.pageWarning = page.warning;
-                        this.pageContent = '';
-                        this.pageIsOffline = false;
-                        this.hasOffline = false;
-                    }
+                const page = data.discarded.find((page) => page.title == this.pageTitle);
+                if (page) {
+                    // Page discarded, show warning.
+                    this.pageWarning = page.warning;
+                    this.pageContent = '';
+                    this.pageIsOffline = false;
+                    this.hasOffline = false;
                 }
             }
         }
@@ -328,12 +317,9 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
 
             // If no page specified, search first page.
             if (!this.currentPage && !this.pageTitle) {
-                for (const i in subwikiPages) {
-                    const page = subwikiPages[i];
-                    if (page.firstpage) {
-                        this.currentPage = page.id;
-                        break;
-                    }
+                const firstPage = subwikiPages.find((page) => page.firstpage );
+                if (firstPage) {
+                    this.currentPage = firstPage.id;
                 }
             }
 
@@ -527,7 +513,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
      *
      * @param page Page to view.
      */
-    goToPage(page: any): void {
+    protected goToPage(page: any): void {
         if (!page.id) {
             // It's an offline page. Check if we are already in the same offline page.
             if (this.currentPage || !this.pageTitle || page.title != this.pageTitle) {
@@ -536,8 +522,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
                     courseId: this.courseId,
                     pageTitle: page.title,
                     wikiId: this.wiki.id,
-                    subwikiId: page.subwikiid,
-                    action: 'page'
+                    subwikiId: page.subwikiid
                 });
 
                 return;
@@ -551,8 +536,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
                     pageTitle: page.title,
                     pageId: page.id,
                     wikiId: page.wikiid,
-                    subwikiId: page.subwikiid,
-                    action: 'page'
+                    subwikiId: page.subwikiid
                 });
             });
 
@@ -563,9 +547,9 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
     /**
      * Show the map.
      *
-     * @param {MouseEvent} event Event.
+     * @param event Event.
      */
-    openMap(event: MouseEvent): void {
+    openMap(event?: MouseEvent): void {
         const modal = this.modalCtrl.create('AddonModWikiMapPage', {
             pages: this.subwikiPages,
             selected: this.currentPageObj && this.currentPageObj.id,
@@ -576,7 +560,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
             enterAnimation: 'core-modal-lateral-transition',
             leaveAnimation: 'core-modal-lateral-transition' });
 
-        // If the modal sends back a SCO, load it.
+        // If the modal sends back a page, load it.
         modal.onDidDismiss((page) => {
             if (page) {
                 if (page.type == 'home') {
@@ -984,9 +968,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
 
         if (multiLevelList) {
             // As we loop over each subwiki, add it to the current group
-            for (const i in subwikiList) {
-                const subwiki = subwikiList[i];
-
+            subwikiList.forEach((subwiki) => {
                 // Should we create a new grouping?
                 if (subwiki.groupid !== groupValue) {
                     grouping = {label: subwiki.groupLabel, subwikis: []};
@@ -997,16 +979,14 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
 
                 // Add the subwiki to the currently active grouping.
                 grouping.subwikis.push(subwiki);
-            }
+            });
         } else if (showMyGroupsLabel) {
             const noGrouping = {label: '', subwikis: []},
                 myGroupsGrouping = {label: this.translate.instant('core.mygroups'), subwikis: []},
                 otherGroupsGrouping = {label: this.translate.instant('core.othergroups'), subwikis: []};
 
             // As we loop over each subwiki, add it to the current group
-            for (const i in subwikiList) {
-                const subwiki = subwikiList[i];
-
+            subwikiList.forEach((subwiki) => {
                 // Add the subwiki to the currently active grouping.
                 if (typeof subwiki.canedit == 'undefined') {
                     noGrouping.subwikis.push(subwiki);
@@ -1015,7 +995,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
                 } else {
                     otherGroupsGrouping.subwikis.push(subwiki);
                 }
-            }
+            });
 
             // Add each grouping to the subwikis
             if (noGrouping.subwikis.length > 0) {
diff --git a/src/addon/mod/wiki/pages/map/map.html b/src/addon/mod/wiki/pages/map/map.html
index 4d1545519..93429cb91 100644
--- a/src/addon/mod/wiki/pages/map/map.html
+++ b/src/addon/mod/wiki/pages/map/map.html
@@ -21,7 +21,10 @@
                 </ion-item-divider>
                 <a ion-item text-wrap *ngFor="let page of letter.pages" (click)="goToPage(page)" [class.core-nav-item-selected]="selected == page.id">
                     <ion-icon name="home" item-start *ngIf="page.firstpage"></ion-icon> {{ page.title }}
-                    <ion-note *ngIf="!page.id" item-end color="danger">{{ 'core.offline' | translate }}</ion-note>
+                    <ion-note *ngIf="!page.id" item-end>
+                        <ion-icon name="time"></ion-icon>
+                        <span text-wrap>{{ 'core.notsent' | translate }}</span>
+                    </ion-note>
                 </a>
             </ng-container>
         </ion-list>
diff --git a/src/addon/mod/wiki/pages/map/map.ts b/src/addon/mod/wiki/pages/map/map.ts
index e1fcb25ad..30fb14133 100644
--- a/src/addon/mod/wiki/pages/map/map.ts
+++ b/src/addon/mod/wiki/pages/map/map.ts
@@ -38,7 +38,7 @@ export class AddonModWikiMapPage {
     /**
      * Function called when a page is clicked.
      *
-     * @param {any} page Clicked page.
+     * @param page Clicked page.
      */
     goToPage(page: any): void {
         this.viewCtrl.dismiss({type: 'page', goto: page});
@@ -54,7 +54,7 @@ export class AddonModWikiMapPage {
     /**
      * Construct the map of pages.
      *
-     * @param {any[]} pages List of pages.
+     * @param pages List of pages.
      */
     protected constructMap(pages: any[]): void {
         let letter,

From be6824d58c05ded076482e2adc43739399f254d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 23 Sep 2019 13:35:25 +0200
Subject: [PATCH 034/257] MOBILE-3167 blocks: Check block visibility

---
 src/core/block/components/block/block.ts                    | 6 ++++--
 src/core/block/components/block/core-block.html             | 2 +-
 .../components/course-blocks/core-block-course-blocks.html  | 2 +-
 src/core/courses/pages/dashboard/dashboard.html             | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/core/block/components/block/block.ts b/src/core/block/components/block/block.ts
index 3632c972f..5a7546e52 100644
--- a/src/core/block/components/block/block.ts
+++ b/src/core/block/components/block/block.ts
@@ -57,8 +57,10 @@ export class CoreBlockComponent implements OnInit, OnDestroy, DoCheck {
             return;
         }
 
-        // Get the data to render the block.
-        this.initBlock();
+        if (this.block.visible) {
+            // Get the data to render the block.
+            this.initBlock();
+        }
     }
 
     /**
diff --git a/src/core/block/components/block/core-block.html b/src/core/block/components/block/core-block.html
index 591977ecd..1c1e3a215 100644
--- a/src/core/block/components/block/core-block.html
+++ b/src/core/block/components/block/core-block.html
@@ -1,4 +1,4 @@
 <!-- Only render the block if it's supported. -->
-<div *ngIf="loaded && componentClass" class="{{class}}">
+<div *ngIf="loaded && componentClass && block.visible" class="{{class}}">
     <core-dynamic-component [component]="componentClass" [data]="data"></core-dynamic-component>
 </div>
diff --git a/src/core/block/components/course-blocks/core-block-course-blocks.html b/src/core/block/components/course-blocks/core-block-course-blocks.html
index a34ada03c..47494de17 100644
--- a/src/core/block/components/course-blocks/core-block-course-blocks.html
+++ b/src/core/block/components/course-blocks/core-block-course-blocks.html
@@ -7,7 +7,7 @@
         <ion-list>
             <!-- Course blocks. -->
             <ng-container *ngFor="let block of blocks">
-                <core-block [block]="block" contextLevel="course" [instanceId]="courseId" [extraData]="{'downloadEnabled': downloadEnabled}"></core-block>
+                <core-block *ngIf="block.visible" [block]="block" contextLevel="course" [instanceId]="courseId" [extraData]="{'downloadEnabled': downloadEnabled}"></core-block>
             </ng-container>
         </ion-list>
     </core-loading>
diff --git a/src/core/courses/pages/dashboard/dashboard.html b/src/core/courses/pages/dashboard/dashboard.html
index d94fcdd0a..4f030b26f 100644
--- a/src/core/courses/pages/dashboard/dashboard.html
+++ b/src/core/courses/pages/dashboard/dashboard.html
@@ -42,7 +42,7 @@
                         <ion-list>
                             <!-- Dashboard blocks. -->
                             <ng-container *ngFor="let block of blocks">
-                                <core-block [block]="block" contextLevel="user" [instanceId]="userId" [extraData]="{'downloadEnabled': downloadEnabled}"></core-block>
+                                <core-block *ngIf="block.visible" [block]="block" contextLevel="user" [instanceId]="userId" [extraData]="{'downloadEnabled': downloadEnabled}"></core-block>
                             </ng-container>
                         </ion-list>
 

From f985755fbfec2b6abb8fdeb7aae58cc3865bbe32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 24 Sep 2019 15:39:36 +0200
Subject: [PATCH 035/257] MOBILE-3168 tags: Reduce tag font size on blocks

---
 src/addon/block/blogtags/blogtags.scss | 1 +
 src/addon/block/tags/tags.scss         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/addon/block/blogtags/blogtags.scss b/src/addon/block/blogtags/blogtags.scss
index a974b45cb..ef3a6a4c8 100644
--- a/src/addon/block/blogtags/blogtags.scss
+++ b/src/addon/block/blogtags/blogtags.scss
@@ -1,6 +1,7 @@
 .addon-block-blog-tags core-block-pre-rendered {
     .core-block-content {
         ul.inline-list {
+            font-size: 80%;
             list-style: none;
             @include margin-horizontal(0);
             -webkit-padding-start: 0;
diff --git a/src/addon/block/tags/tags.scss b/src/addon/block/tags/tags.scss
index f4c54d167..c6704e962 100644
--- a/src/addon/block/tags/tags.scss
+++ b/src/addon/block/tags/tags.scss
@@ -1,6 +1,7 @@
 .addon-block-tags core-block-pre-rendered {
     .core-block-content {
         .tag_cloud {
+            font-size: 80%;
             text-align: center;
             ul.inline-list {
                 list-style: none;

From 697ef74d465f46c5bfb5fb4f898ba03529404504 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Fri, 6 Sep 2019 16:22:25 +0200
Subject: [PATCH 036/257] MOBILE-3120 forum: Don't display description in
 single discussion forums

---
 src/addon/mod/forum/components/index/addon-mod-forum-index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addon/mod/forum/components/index/addon-mod-forum-index.html b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
index 4c8be80bf..859e70d59 100644
--- a/src/addon/mod/forum/components/index/addon-mod-forum-index.html
+++ b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
@@ -19,7 +19,7 @@
             <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
         </ion-refresher>
         <core-loading [hideUntil]="loaded" class="core-loading-center">
-            <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" [note]="descriptionNote"></core-course-module-description>
+            <core-course-module-description *ngIf="forum && forum.type != 'single'" [description]="description" [component]="component" [componentId]="componentId" [note]="descriptionNote"></core-course-module-description>
 
             <!-- Forum discussions found to be synchronized -->
             <ion-card class="core-warning-card" icon-start *ngIf="hasOffline || hasOfflineRatings">

From 62a6913f30b238ec22c2c1b023407ff97e8e99da Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Fri, 6 Sep 2019 16:33:20 +0200
Subject: [PATCH 037/257] MOBILE-3120 imscp: Display description

---
 src/addon/mod/imscp/components/index/addon-mod-imscp-index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html
index a07aa6be4..775db0670 100644
--- a/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -16,6 +16,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
     <div class="addon-mod-imscp-container">
+        <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
         <core-navigation-bar [previous]="previousItem" [next]="nextItem" (action)="loadItem($event)" [info]="description" [title]="'core.description' | translate" [component]="component" [componentId]="componentId"></core-navigation-bar>
         <core-iframe [src]="src"></core-iframe>
     </div>

From f441ce79f7eabc4f882cf6fb767e2a76c3532126 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Fri, 6 Sep 2019 16:34:03 +0200
Subject: [PATCH 038/257] MOBILE-3120 lti: Display description if setting
 enabled

---
 src/addon/mod/lti/components/index/addon-mod-lti-index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addon/mod/lti/components/index/addon-mod-lti-index.html b/src/addon/mod/lti/components/index/addon-mod-lti-index.html
index 492303fa3..e46b4fdae 100644
--- a/src/addon/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addon/mod/lti/components/index/addon-mod-lti-index.html
@@ -11,9 +11,9 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <core-course-module-description *ngIf="lti && lti.showdescriptionlaunch" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
 
-    <div padding-horizontal>
+    <div padding>
         <button ion-button block icon-left (click)="launch()">
             <ion-icon name="link"></ion-icon>
             {{ 'addon.mod_lti.launchactivity' | translate }}

From eb8f286d59778869e89acb79b01e8d837876da79 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Fri, 6 Sep 2019 16:34:45 +0200
Subject: [PATCH 039/257] MOBILE-3120 resource: Display description if setting
 enabled

---
 .../resource/components/index/addon-mod-resource-index.html    | 2 +-
 src/addon/mod/resource/components/index/index.ts               | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/addon/mod/resource/components/index/addon-mod-resource-index.html b/src/addon/mod/resource/components/index/addon-mod-resource-index.html
index 45056cdcd..bfe0d9270 100644
--- a/src/addon/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addon/mod/resource/components/index/addon-mod-resource-index.html
@@ -13,7 +13,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description *ngIf="mode != 'iframe'" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <core-course-module-description *ngIf="mode != 'iframe' && (mode != 'embedded' || displayDescription)" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
 
     <ng-container *ngIf="mode == 'iframe'">
         <core-iframe [src]="src"></core-iframe>
diff --git a/src/addon/mod/resource/components/index/index.ts b/src/addon/mod/resource/components/index/index.ts
index 1717d360a..815aa1388 100644
--- a/src/addon/mod/resource/components/index/index.ts
+++ b/src/addon/mod/resource/components/index/index.ts
@@ -36,6 +36,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
     mode: string;
     src: string;
     contentText: string;
+    displayDescription = true;
 
     constructor(injector: Injector, private resourceProvider: AddonModResourceProvider, private courseProvider: CoreCourseProvider,
             private appProvider: CoreAppProvider, private prefetchHandler: AddonModResourcePrefetchHandler,
@@ -96,6 +97,8 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
         }).then((resource) => {
             if (resource) {
                 this.description = resource.intro || resource.description;
+                const options = this.textUtils.unserialize(resource.displayoptions) || {};
+                this.displayDescription = typeof options.printintro == 'undefined' || !!options.printintro;
                 this.dataRetrieved.emit(resource);
             }
 

From caa8ee76631ecd6da7b79ece12777ebe2037882b Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Fri, 6 Sep 2019 16:35:26 +0200
Subject: [PATCH 040/257] MOBILE-3120 survey: Don't display description if
 survey is done

---
 .../mod/survey/components/index/addon-mod-survey-index.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addon/mod/survey/components/index/addon-mod-survey-index.html b/src/addon/mod/survey/components/index/addon-mod-survey-index.html
index 3f5eec9f1..58f12a502 100644
--- a/src/addon/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addon/mod/survey/components/index/addon-mod-survey-index.html
@@ -14,10 +14,10 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <core-course-module-description *ngIf="survey && !survey.surveydone && !hasOffline" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
 
     <!-- Survey already done -->
-    <ion-card padding *ngIf="survey && survey.surveydone">
+    <ion-card padding *ngIf="survey && survey.surveydone">  
         <p padding>{{ 'addon.mod_survey.surveycompletednograph' | translate }}</p>
         <a ion-button block icon-start [href]="externalUrl" core-link>
             <ion-icon name="open" start></ion-icon>

From b7f201aeaf6670c66c16db2a95566b8648c13d4a Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Fri, 6 Sep 2019 16:36:04 +0200
Subject: [PATCH 041/257] MOBILE-3120 wiki: Display description in all pages

---
 src/addon/mod/wiki/components/index/addon-mod-wiki-index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
index c16f7462c..78033eeab 100644
--- a/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -24,8 +24,8 @@
 
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
-    <div padding *ngIf="(isMainPage && description) || pageIsOffline || hasOffline || pageWarning">
-        <core-course-module-description *ngIf="isMainPage" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <div padding *ngIf="description || pageIsOffline || hasOffline || pageWarning">
+        <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
 
         <!-- Wiki has something offline. -->
         <div class="core-warning-card" icon-start *ngIf="pageIsOffline || hasOffline">

From a1280122e0f73a853d1f051dfc26aff74f7f8850 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Fri, 6 Sep 2019 16:36:56 +0200
Subject: [PATCH 042/257] MOBILE-3120 workshop: Display description in setup
 phase only

---
 .../components/index/addon-mod-workshop-index.html     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
index c90bb99ae..14631e93c 100644
--- a/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -13,8 +13,6 @@
 
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
-    <core-course-module-description *ngIf="description" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
-
     <ion-card class="with-borders" *ngIf="phases">
         <a ion-item (click)="viewPhaseInfo()">
             <h2 stacked text-wrap>{{ phases[workshop.phase].title }}</h2>
@@ -39,6 +37,14 @@
         {{ 'core.hasdatatosync' | translate: {$a: moduleName} }}
     </div>
 
+    <!-- Description (setup phase only) -->
+    <ion-card *ngIf="description && workshop && workshop.phase == workshopPhases.PHASE_SETUP">
+        <ion-item text-wrap>
+            <h2>{{ 'core.description' | translate }}</h2>
+            <core-format-text [text]="description" [component]="component" [componentId]="componentId"></core-format-text>
+        </ion-item>
+    </ion-card>
+
     <div *ngIf="access && workshop && workshop.phase >= workshopPhases.PHASE_SUBMISSION">
         <!-- CLOSED PHASE -->
         <ng-container *ngIf="workshop.phase >= workshopPhases.PHASE_CLOSED">

From 4b98a592c7ef56263179efb85288115710cf379e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 9 Sep 2019 12:49:13 +0200
Subject: [PATCH 043/257] MOBILE-3123 style: Add some safe areas for notch

---
 .../addon-block-recentlyaccessedcourses.html  |  12 +-
 .../addon-block-recentlyaccesseditems.html    |   2 +-
 .../addon-block-starredcourses.html           |  12 +-
 .../timeline/addon-block-timeline.html        |  22 ++--
 .../entries/addon-blog-entries.html           |  14 +--
 .../calendar/addon-calendar-calendar.html     |   2 +-
 src/addon/calendar/pages/day/day.html         |   4 +-
 src/addon/files/pages/list/list.html          |   2 +-
 .../messages/pages/discussion/discussion.html |   4 +-
 .../index/addon-mod-book-index.html           |   2 +-
 .../index/addon-mod-chat-index.html           |   2 +-
 .../mod/chat/pages/sessions/sessions.html     |   4 +-
 .../index/addon-mod-data-index.html           |   2 +-
 .../index/addon-mod-imscp-index.html          |   2 +-
 .../components/index/addon-mod-lti-index.html |   2 +-
 .../index/addon-mod-page-index.html           |   2 +-
 .../index/addon-mod-quiz-index.html           |   4 +-
 src/addon/mod/quiz/pages/review/review.html   |   6 +-
 .../index/addon-mod-resource-index.html       |   2 +-
 .../index/addon-mod-scorm-index.html          |   4 +-
 .../index/addon-mod-survey-index.html         |   2 +-
 .../components/index/addon-mod-url-index.html |   4 +-
 .../mod/wiki/components/index/index.scss      |   1 +
 src/app/app.ios.scss                          |   7 +-
 src/app/app.md.scss                           |   4 +-
 src/app/app.scss                              |  95 ++++++++-------
 src/app/app.wp.scss                           |   4 +-
 src/components/file/file.scss                 |   2 +-
 src/components/loading/loading.scss           |  10 ++
 src/components/loading/loading.ts             |   2 +
 src/components/split-view/split-view.scss     |  40 +------
 src/core/block/components/block/block.scss    |   2 +-
 .../course-blocks/course-blocks.scss          |   2 +
 .../components/format/core-course-format.html |   2 +-
 .../course-module-description.scss            |  16 +++
 .../components/my-courses/my-courses.html     |   2 +-
 .../components/course/core-grades-course.html |   4 +-
 src/core/siteplugins/providers/helper.ts      |   3 +-
 src/core/tag/pages/search/search.html         |   4 +-
 src/theme/variables.scss                      | 113 +++++++++++++++++-
 40 files changed, 269 insertions(+), 156 deletions(-)
 create mode 100644 src/core/course/components/module-description/course-module-description.scss

diff --git a/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html b/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
index 0d83e5a7e..7aadba0cb 100644
--- a/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
+++ b/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
@@ -8,14 +8,12 @@
         <ion-spinner *ngIf="!prefetchCoursesData.icon || prefetchCoursesData.icon == 'spinner'"></ion-spinner>
     </div>
 </ion-item-divider>
-<core-loading [hideUntil]="loaded" class="core-loading-center">
+<core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
     <core-empty-box *ngIf="courses.length == 0" image="assets/img/icons/courses.svg" [message]="'addon.block_recentlyaccessedcourses.nocourses' | translate"></core-empty-box>
     <!-- List of courses. -->
-    <div class="safe-area-page">
-         <div class="core-horizontal-scroll">
-            <ng-container *ngFor="let course of courses">
-                <core-courses-course-progress [course]="course" class="core-recentlyaccessedcourses" [showDownload]="downloadEnabled"></core-courses-course-progress>
-            </ng-container>
-        </div>
+     <div class="core-horizontal-scroll">
+        <ng-container *ngFor="let course of courses">
+            <core-courses-course-progress [course]="course" class="core-recentlyaccessedcourses" [showDownload]="downloadEnabled"></core-courses-course-progress>
+        </ng-container>
     </div>
 </core-loading>
diff --git a/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html b/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
index f3538163d..f6e60ba65 100644
--- a/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
+++ b/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
@@ -1,7 +1,7 @@
 <ion-item-divider>
     <h2>{{ 'addon.block_recentlyaccesseditems.pluginname' | translate }}</h2>
 </ion-item-divider>
-<core-loading [hideUntil]="loaded" class="core-loading-center">
+<core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
     <div class="core-horizontal-scroll" *ngIf="items && items.length > 0">
         <div *ngFor="let item of items">
             <ion-card>
diff --git a/src/addon/block/starredcourses/components/starredcourses/addon-block-starredcourses.html b/src/addon/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
index a900b1f0f..a6b1d49b7 100644
--- a/src/addon/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
+++ b/src/addon/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
@@ -8,14 +8,12 @@
         <ion-spinner *ngIf="!prefetchCoursesData.icon || prefetchCoursesData.icon == 'spinner'"></ion-spinner>
     </div>
 </ion-item-divider>
-<core-loading [hideUntil]="loaded" class="core-loading-center">
+<core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
     <core-empty-box *ngIf="courses.length == 0" image="assets/img/icons/courses.svg" [message]="'addon.block_starredcourses.nocourses' | translate"></core-empty-box>
     <!-- List of courses. -->
-    <div class="safe-area-page">
-        <div class="core-horizontal-scroll">
-            <ng-container *ngFor="let course of courses">
-                <core-courses-course-progress [course]="course" class="core-block_starredcourses" [showDownload]="downloadEnabled"></core-courses-course-progress>
-            </ng-container>
-        </div>
+    <div class="core-horizontal-scroll">
+        <ng-container *ngFor="let course of courses">
+            <core-courses-course-progress [course]="course" class="core-block_starredcourses" [showDownload]="downloadEnabled"></core-courses-course-progress>
+        </ng-container>
     </div>
 </core-loading>
diff --git a/src/addon/block/timeline/components/timeline/addon-block-timeline.html b/src/addon/block/timeline/components/timeline/addon-block-timeline.html
index 0e160fdf0..62afe16e1 100644
--- a/src/addon/block/timeline/components/timeline/addon-block-timeline.html
+++ b/src/addon/block/timeline/components/timeline/addon-block-timeline.html
@@ -20,18 +20,16 @@
     <core-loading [hideUntil]="timeline.loaded" [hidden]="sort != 'sortbydates'" class="core-loading-center">
         <addon-block-timeline-events [events]="timeline.events" showCourse="true" [canLoadMore]="timeline.canLoadMore" (loadMore)="loadMoreTimeline()" [from]="dataFrom" [to]="dataTo"></addon-block-timeline-events>
     </core-loading>
-    <core-loading [hideUntil]="timelineCourses.loaded" [hidden]="sort != 'sortbycourses'" class="core-loading-center">
-        <div class="safe-area-page">
-            <ion-grid no-padding>
-                <ion-row no-padding>
-                    <ion-col *ngFor="let course of timelineCourses.courses" no-padding col-12 col-md-6>
-                        <core-courses-course-progress [course]="course">
-                            <addon-block-timeline-events [events]="course.events" [canLoadMore]="course.canLoadMore" (loadMore)="loadMoreCourse(course)" [from]="dataFrom" [to]="dataTo"></addon-block-timeline-events>
-                        </core-courses-course-progress>
-                    </ion-col>
-                </ion-row>
-            </ion-grid>
-        </div>
+    <core-loading [hideUntil]="timelineCourses.loaded" [hidden]="sort != 'sortbycourses'" class="core-loading-center safe-area-page">
+        <ion-grid no-padding>
+            <ion-row no-padding>
+                <ion-col *ngFor="let course of timelineCourses.courses" no-padding col-12 col-md-6>
+                    <core-courses-course-progress [course]="course">
+                        <addon-block-timeline-events [events]="course.events" [canLoadMore]="course.canLoadMore" (loadMore)="loadMoreCourse(course)" [from]="dataFrom" [to]="dataTo"></addon-block-timeline-events>
+                    </core-courses-course-progress>
+                </ion-col>
+            </ion-row>
+        </ion-grid>
         <core-empty-box *ngIf="timelineCourses.courses.length == 0" image="assets/img/icons/courses.svg" [message]="'addon.block_timeline.nocoursesinprogress' | translate"></core-empty-box>
     </core-loading>
 </core-loading>
\ No newline at end of file
diff --git a/src/addon/blog/components/entries/addon-blog-entries.html b/src/addon/blog/components/entries/addon-blog-entries.html
index b3a41ae72..f5ed012be 100644
--- a/src/addon/blog/components/entries/addon-blog-entries.html
+++ b/src/addon/blog/components/entries/addon-blog-entries.html
@@ -3,12 +3,10 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="loaded" class="core-loading-center">
-        <div class="safe-padding-horizontal">
-            <ion-item *ngIf="showMyEntriesToggle">
-                <ion-label>{{ 'addon.blog.showonlyyourentries' | translate }}</ion-label>
-                <ion-toggle [(ngModel)]="onlyMyEntries" (ionChange)="onlyMyEntriesToggleChanged(onlyMyEntries)">></ion-toggle>
-            </ion-item>
-        </div>
+        <ion-item *ngIf="showMyEntriesToggle">
+            <ion-label>{{ 'addon.blog.showonlyyourentries' | translate }}</ion-label>
+            <ion-toggle [(ngModel)]="onlyMyEntries" (ionChange)="onlyMyEntriesToggleChanged(onlyMyEntries)">></ion-toggle>
+        </ion-item>
         <core-empty-box *ngIf="entries && entries.length == 0" icon="fa-newspaper-o" [message]="'addon.blog.noentriesyet' | translate"></core-empty-box>
         <ng-container *ngFor="let entry of entries">
             <ion-card *ngIf="!onlyMyEntries || entry.userid == currentUserId">
@@ -28,7 +26,9 @@
                     </p>
                 </ion-item>
                 <ion-card-content>
-                    <core-format-text [text]="entry.summary" [component]="this.component" [componentId]="entry.id"></core-format-text>
+                    <ion-item>
+                        <core-format-text [text]="entry.summary" [component]="this.component" [componentId]="entry.id"></core-format-text>
+                    </ion-item>
                     <ion-item text-wrap *ngIf="tagsEnabled && entry.tags && entry.tags.length > 0">
                         <div item-start>{{ 'core.tag.tags' | translate }}:</div>
                         <core-tag-list [tags]="entry.tags"></core-tag-list>
diff --git a/src/addon/calendar/components/calendar/addon-calendar-calendar.html b/src/addon/calendar/components/calendar/addon-calendar-calendar.html
index 093b97064..460072acb 100644
--- a/src/addon/calendar/components/calendar/addon-calendar-calendar.html
+++ b/src/addon/calendar/components/calendar/addon-calendar-calendar.html
@@ -6,7 +6,7 @@
     </core-context-menu>
 </core-navbar-buttons>
 
-<core-loading [hideUntil]="loaded" class="core-loading-center">
+<core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
     <!-- Period name and arrows to navigate. -->
     <ion-grid no-padding class="addon-calendar-navigation">
         <ion-row align-items-center>
diff --git a/src/addon/calendar/pages/day/day.html b/src/addon/calendar/pages/day/day.html
index cb9102207..4f225959f 100644
--- a/src/addon/calendar/pages/day/day.html
+++ b/src/addon/calendar/pages/day/day.html
@@ -19,7 +19,7 @@
     </ion-refresher>
 
     <!-- Period name and arrows to navigate. -->
-    <ion-grid padding-top>
+    <ion-grid padding-top class="safe-area-page">
         <ion-row>
             <ion-col text-start *ngIf="currentMoment">
                 <a ion-button icon-only clear (click)="loadPrevious()" [title]="'addon.calendar.dayprev' | translate">
@@ -37,7 +37,7 @@
         </ion-row>
     </ion-grid>
 
-    <core-loading [hideUntil]="loaded">
+    <core-loading [hideUntil]="loaded" class="safe-area-page">
         <!-- There is data to be synchronized -->
         <ion-card class="core-warning-card" icon-start *ngIf="hasOffline">
             <ion-icon name="warning"></ion-icon> {{ 'core.hasdatatosync' | translate:{$a: 'core.day' | translate} }}
diff --git a/src/addon/files/pages/list/list.html b/src/addon/files/pages/list/list.html
index 06fdce330..4d467d824 100644
--- a/src/addon/files/pages/list/list.html
+++ b/src/addon/files/pages/list/list.html
@@ -8,7 +8,7 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="filesLoaded" *ngIf="showPrivateFiles || showSiteFiles">
+    <core-loading [hideUntil]="filesLoaded" *ngIf="showPrivateFiles || showSiteFiles" class="safe-area-page">
         <!-- Allow selecting the files to see: private or site. -->
         <div padding *ngIf="showPrivateFiles && showSiteFiles && !path">
             <ion-select [(ngModel)]="root" (ngModelChange)="rootChanged()" interface="popover" class="core-button-select">
diff --git a/src/addon/messages/pages/discussion/discussion.html b/src/addon/messages/pages/discussion/discussion.html
index 8363436b7..f29618655 100644
--- a/src/addon/messages/pages/discussion/discussion.html
+++ b/src/addon/messages/pages/discussion/discussion.html
@@ -25,7 +25,7 @@
     </core-navbar-buttons>
 </ion-header>
 <ion-content class="has-footer">
-    <core-loading [hideUntil]="loaded">
+    <core-loading [hideUntil]="loaded" class="safe-area-page">
         <!-- Load previous messages. -->
         <core-infinite-loading [enabled]="canLoadMore" (action)="loadPrevious($event)" position="top" [error]="loadMoreError"></core-infinite-loading>
 
@@ -34,7 +34,7 @@
             <p text-center><i>{{ 'addon.messages.selfconversationdefaultmessage' | translate }}</i></p>
         </ng-container>
 
-        <ion-list class="addon-messages-discussion-container safe-area-page" [class.addon-messages-discussion-group]="isGroup" [attr.aria-live]="'polite'">
+        <ion-list class="addon-messages-discussion-container" [class.addon-messages-discussion-group]="isGroup" [attr.aria-live]="'polite'">
             <ng-container *ngFor="let message of messages; index as index; last as last">
                 <h6 text-center *ngIf="message.showDate" class="addon-messages-date">
                     {{ message.timecreated | coreFormatDate: "strftimedayshort" }}
diff --git a/src/addon/mod/book/components/index/addon-mod-book-index.html b/src/addon/mod/book/components/index/addon-mod-book-index.html
index 13cc19b7e..3b1f0d214 100644
--- a/src/addon/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addon/mod/book/components/index/addon-mod-book-index.html
@@ -18,7 +18,7 @@
 
     <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
 
-    <div padding>
+    <div padding class="safe-padding-horizontal">
         <core-navigation-bar [previous]="previousChapter > 0 && previousChapter" [next]="nextChapter > 0 && nextChapter" (action)="changeChapter($event)"></core-navigation-bar>
         <core-format-text [component]="component" [componentId]="componentId" [text]="chapterContent"></core-format-text>
         <div margin-top *ngIf="tagsEnabled && contentsMap && contentsMap[currentChapter] && contentsMap[currentChapter].tags && contentsMap[currentChapter].tags.length > 0">
diff --git a/src/addon/mod/chat/components/index/addon-mod-chat-index.html b/src/addon/mod/chat/components/index/addon-mod-chat-index.html
index 3aaa3b0ce..a9bc1ebdc 100644
--- a/src/addon/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addon/mod/chat/components/index/addon-mod-chat-index.html
@@ -10,7 +10,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="core-loading-center">
+<core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
 
     <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
 
diff --git a/src/addon/mod/chat/pages/sessions/sessions.html b/src/addon/mod/chat/pages/sessions/sessions.html
index b78df54bc..acffafa23 100644
--- a/src/addon/mod/chat/pages/sessions/sessions.html
+++ b/src/addon/mod/chat/pages/sessions/sessions.html
@@ -28,9 +28,9 @@
                     <p *ngIf="session.duration">{{ session.duration | coreDuration }}</p>
                 </ion-item>
                 <ion-card-content>
-                    <p *ngFor="let user of session.sessionusers">
+                    <ion-item *ngFor="let user of session.sessionusers">
                         {{ user.userfullname }} <span *ngIf="user.messagecount">({{ user.messagecount }})</span>
-                    </p>
+                    </ion-item>
                 </ion-card-content>
                 <div *ngIf="session.sessionusers.length < session.allsessionusers.length">
                     <button ion-button clear (click)="showMoreUsers(session, $event)">
diff --git a/src/addon/mod/data/components/index/addon-mod-data-index.html b/src/addon/mod/data/components/index/addon-mod-data-index.html
index dd2beb9a0..cb7f30534 100644
--- a/src/addon/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addon/mod/data/components/index/addon-mod-data-index.html
@@ -66,7 +66,7 @@
         </div>
     </ng-container>
 
-    <div class="addon-data-contents addon-data-entries-{{data.id}}" *ngIf="!isEmpty">
+    <div class="addon-data-contents addon-data-entries-{{data.id}} safe-padding-horizontal" *ngIf="!isEmpty">
         <core-style [css]="data.csstemplate" prefix=".addon-data-entries-{{data.id}}"></core-style>
 
         <core-compile-html [text]="entriesRendered" [jsData]="jsData" [extraImports]="extraImports"></core-compile-html>
diff --git a/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html
index a07aa6be4..fe3930374 100644
--- a/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -14,7 +14,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="core-loading-center">
+<core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
     <div class="addon-mod-imscp-container">
         <core-navigation-bar [previous]="previousItem" [next]="nextItem" (action)="loadItem($event)" [info]="description" [title]="'core.description' | translate" [component]="component" [componentId]="componentId"></core-navigation-bar>
         <core-iframe [src]="src"></core-iframe>
diff --git a/src/addon/mod/lti/components/index/addon-mod-lti-index.html b/src/addon/mod/lti/components/index/addon-mod-lti-index.html
index 492303fa3..a4e3f2e1e 100644
--- a/src/addon/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addon/mod/lti/components/index/addon-mod-lti-index.html
@@ -9,7 +9,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="core-loading-center">
+<core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
 
     <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
 
diff --git a/src/addon/mod/page/components/index/addon-mod-page-index.html b/src/addon/mod/page/components/index/addon-mod-page-index.html
index 819cef352..d231a3874 100644
--- a/src/addon/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addon/mod/page/components/index/addon-mod-page-index.html
@@ -11,7 +11,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="core-loading-center">
+<core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
 
     <core-course-module-description *ngIf="displayDescription" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
 
diff --git a/src/addon/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addon/mod/quiz/components/index/addon-mod-quiz-index.html
index 7f7cb5b74..b6eba13f7 100644
--- a/src/addon/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addon/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -36,7 +36,9 @@
     <!-- List of user attempts. -->
     <ion-card class="addon-mod_quiz-table" *ngIf="quiz && attempts && attempts.length">
         <ion-card-header text-wrap>
-            <h2>{{ 'addon.mod_quiz.summaryofattempts' | translate }}</h2>
+            <div class="safe-padding-horizontal">
+                <h2>{{ 'addon.mod_quiz.summaryofattempts' | translate }}</h2>
+            </div>
         </ion-card-header>
         <ion-list>
             <!-- "Header" of the table -->
diff --git a/src/addon/mod/quiz/pages/review/review.html b/src/addon/mod/quiz/pages/review/review.html
index 3dba297ac..4d398ed27 100644
--- a/src/addon/mod/quiz/pages/review/review.html
+++ b/src/addon/mod/quiz/pages/review/review.html
@@ -18,8 +18,10 @@
         <!-- Review summary -->
         <ion-card *ngIf="attempt">
             <ion-card-header text-wrap>
-                <h2 *ngIf="attempt.preview">{{ 'addon.mod_quiz.reviewofpreview' | translate }}</h2>
-                <h2 *ngIf="!attempt.preview">{{ 'addon.mod_quiz.reviewofattempt' | translate:{$a: attempt.attempt} }}</h2>
+                <div class="safe-padding-horizontal">
+                    <h2 *ngIf="attempt.preview">{{ 'addon.mod_quiz.reviewofpreview' | translate }}</h2>
+                    <h2 *ngIf="!attempt.preview">{{ 'addon.mod_quiz.reviewofattempt' | translate:{$a: attempt.attempt} }}</h2>
+                </div>
             </ion-card-header>
             <ion-list>
                 <ion-item text-wrap no-lines>
diff --git a/src/addon/mod/resource/components/index/addon-mod-resource-index.html b/src/addon/mod/resource/components/index/addon-mod-resource-index.html
index 45056cdcd..8f57c0428 100644
--- a/src/addon/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addon/mod/resource/components/index/addon-mod-resource-index.html
@@ -11,7 +11,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="core-loading-center">
+<core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
 
     <core-course-module-description *ngIf="mode != 'iframe'" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
 
diff --git a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
index 5aeb8dec5..959fd819f 100644
--- a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -26,7 +26,9 @@
         <!-- Attempts status. -->
         <ion-card *ngIf="(scorm.displayattemptstatus || (scorm.offlineAttempts && scorm.offlineAttempts.length)) && !skip">
             <ion-card-header text-wrap>
-                <h2>{{ 'addon.mod_scorm.attempts' | translate }}</h2>
+                <div class="safe-padding-horizontal">
+                    <h2>{{ 'addon.mod_scorm.attempts' | translate }}</h2>
+                </div>
             </ion-card-header>
             <ion-list>
                 <ng-container *ngIf="scorm.displayattemptstatus">
diff --git a/src/addon/mod/survey/components/index/addon-mod-survey-index.html b/src/addon/mod/survey/components/index/addon-mod-survey-index.html
index 3f5eec9f1..d0d7c33d3 100644
--- a/src/addon/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addon/mod/survey/components/index/addon-mod-survey-index.html
@@ -12,7 +12,7 @@
 </core-navbar-buttons>
 
 <!-- Content. -->
-<core-loading [hideUntil]="loaded" class="core-loading-center">
+<core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
 
     <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
 
diff --git a/src/addon/mod/url/components/index/addon-mod-url-index.html b/src/addon/mod/url/components/index/addon-mod-url-index.html
index bf2d57265..2e3ae8b8b 100644
--- a/src/addon/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addon/mod/url/components/index/addon-mod-url-index.html
@@ -31,11 +31,11 @@
             <h2>{{ 'addon.mod_url.pointingtourl' | translate }}</h2>
             <p>{{ url }}</p>
         </ion-item>
-        <div padding>
+        <ion-item text-wrap>
             <a ion-button block (click)="go()" icon-start>
                 <ion-icon name="link" start></ion-icon>
                 {{ 'addon.mod_url.accessurl' | translate }}
             </a>
-        </div>
+        </ion-item>
     </ion-list>
 </core-loading>
diff --git a/src/addon/mod/wiki/components/index/index.scss b/src/addon/mod/wiki/components/index/index.scss
index 3a0249f11..e7edc2e28 100644
--- a/src/addon/mod/wiki/components/index/index.scss
+++ b/src/addon/mod/wiki/components/index/index.scss
@@ -13,6 +13,7 @@ ion-app.app-root addon-mod-wiki-index {
     .addon-mod_wiki-page-content {
         background-color: $white;
         border-top: 1px solid $gray;
+        @include safe-area-padding-horizontal(0px, 0px);
         @include darkmode() {
             background-color: $black;
         }
diff --git a/src/app/app.ios.scss b/src/app/app.ios.scss
index d90e3da7b..76b7d379d 100644
--- a/src/app/app.ios.scss
+++ b/src/app/app.ios.scss
@@ -37,7 +37,6 @@ ion-app.app-root.ios {
     @include margin-horizontal(0, null);
   }
 
-
   @each $color-name, $color-base, $color-contrast in get-colors($colors-ios) {
     .core-#{$color-name}-card {
       @extend .card-ios ;
@@ -48,10 +47,10 @@ ion-app.app-root.ios {
       }
 
       &[icon-start] {
-        @include padding(null, null, null, $card-ios-padding-left * 2 + 20);
+        @include safe-area-padding(null, null, null, $card-ios-padding-left * 2 + 20);
 
         ion-icon {
-          @include position(null, null, null, $card-ios-padding-left);
+          @include safe-area-position(null, null, null, $card-ios-padding-left);
         }
       }
     }
@@ -121,4 +120,4 @@ ion-app.app-root.ios {
       cursor: pointer;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/app.md.scss b/src/app/app.md.scss
index db1666048..a1efde285 100644
--- a/src/app/app.md.scss
+++ b/src/app/app.md.scss
@@ -43,10 +43,10 @@ ion-app.app-root.md {
       }
 
       &[icon-start] {
-        @include padding(null, null, null, $card-md-padding-left * 2 + 20);
+        @include safe-area-padding(null, null, null, $card-md-padding-left * 2 + 20);
 
         ion-icon {
-          @include position(null, null, null, $card-md-padding-left);
+          @include safe-area-position(null, null, null, $card-md-padding-left);
         }
       }
     }
diff --git a/src/app/app.scss b/src/app/app.scss
index a43d1efee..8f49c0974 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -738,13 +738,13 @@ ion-app.app-root {
       }
 
       &[icon-start] {
-        @include padding(null, null, null, 52px);
+        @include safe-area-padding(null, null, null, 52px);
         position: relative;
 
         > ion-icon {
           color: $color-base;
           position: absolute;
-          @include position(0, null, null, 16px);
+          @include safe-area-position(0, null, null, 16px);
           height: 100%;
           font-size: 24px;
           display: flex;
@@ -786,17 +786,7 @@ ion-app.app-root {
     }
 
     .core-#{$color-name}-selected-item {
-      @include safe-area-border-start(5px, solid, $color-base);
-
-      &.item-md {
-        @include padding(null, null, null, $item-md-padding-start - 5px);
-      }
-      &.item-ios {
-        @include padding(null, null, null, $item-ios-padding-start - 5px);
-      }
-      &.item-wp {
-        @include padding(null, null, null, $item-wp-padding-start - 5px);
-      }
+      @include core-selected-item($color-base);
     }
 
     .split-pane-main .core-#{$color-name}-selected-item {
@@ -852,6 +842,8 @@ ion-app.app-root {
 
   @media only screen and (min-height: 400px) and (min-width: 300px) {
       .core-modal-lateral {
+        @include core-split-area-end();
+
         .modal-wrapper {
           position: absolute;
           @include position(0 !important, 0 !important, 0 !important, auto);
@@ -1031,6 +1023,14 @@ ion-app.app-root {
     flex-flow: nowrap;
     overflow-x: scroll;
     flex-direction: row;
+
+    .item-ios.item-block {
+      @include padding-horizontal($item-ios-padding-end / 2, null);
+
+      .item-inner {
+        @include padding-horizontal(null, $item-ios-padding-end / 2);
+      }
+    }
   }
 
   ion-content.core-expand-max .scroll-content {
@@ -1095,11 +1095,6 @@ ion-app.app-root {
   }
 }
 
-[dir="ltr"] body, [dir="rtl"] body {
-  padding-top: constant(safe-area-inset-top); //for iOS 11.2
-  padding-top: env(safe-area-inset-top); //for iOS 11.1
-}
-
 body.keyboard-is-open {
   ion-content:not(.has-footer) {
     > .scroll-content, > .fixed-content {
@@ -1112,31 +1107,6 @@ body.keyboard-is-open {
   }
 }
 
-.safe-padding-horizontal{
-  @include safe-area-padding-horizontal(0px, 0px);
-}
-
-[padding].safe-padding-horizontal,
-ion-app.ios [padding].safe-padding-horizontal {
-  @include safe-area-padding-horizontal($content-padding, $content-padding);
-}
-
-ion-app.ios .split-pane-side,
-.split-pane-side {
-    .safe-padding-horizontal,
-    [padding].safe-padding-horizontal {
-      @include safe-area-padding-start(0px, $content-padding);
-    }
-}
-
-ion-app.ios .split-pane-main,
-.split-pane-main {
-    .safe-padding-horizontal,
-    [padding].safe-padding-horizontal {
-      @include safe-area-padding-end($content-padding, 0px);
-    }
-}
-
 details summary {
   pointer-events: auto;
 }
@@ -1239,3 +1209,42 @@ ion-app.platform-desktop {
     font-size: 28px;
   }
 }
+
+// Safe areas
+[dir="ltr"] body, [dir="rtl"] body {
+  padding-top: constant(safe-area-inset-top); //for iOS 11.2
+  padding-top: env(safe-area-inset-top); //for iOS 11.1
+}
+
+ion-app.app-root {
+  .safe-area-page,
+  .safe-padding-horizontal {
+    @include safe-area-padding-horizontal(0px, 0px);
+  }
+
+  [padding].safe-padding-horizontal,
+  &.ios [padding].safe-padding-horizontal {
+    @include safe-area-padding-horizontal($content-padding, $content-padding);
+  }
+
+  // Disable safe area padding.
+  ion-popover,
+  .safe-area-page,
+  .safe-padding-horizontal {
+    .item-ios.item-block {
+      @include padding-horizontal($item-ios-padding-end, null);
+
+      .item-inner {
+        @include padding-horizontal(null, $item-ios-padding-end / 2);
+      }
+    }
+  }
+
+  .item-ios[detail-push] .item-inner,
+  button.item-ios:not([detail-none]) .item-inner,
+  a.item-ios:not([detail-none]) .item-inner {
+    [item-end] {
+      @include safe-area-margin-horizontal(($item-ios-padding-start / 2), ($item-ios-padding-end / 2));
+    }
+  }
+}
diff --git a/src/app/app.wp.scss b/src/app/app.wp.scss
index 127e273b0..97a8317ae 100644
--- a/src/app/app.wp.scss
+++ b/src/app/app.wp.scss
@@ -40,10 +40,10 @@ ion-app.app-root.wp {
       }
 
       &[icon-start] {
-        @include padding(null, null, null, $card-wp-padding-left * 2 + 20);
+        @include safe-area-padding(null, null, null, $card-wp-padding-left * 2 + 20);
 
         ion-icon {
-          @include position(null, null, null, $card-wp-padding-left);
+          @include safe-area-position(null, null, null, $card-wp-padding-left);
         }
       }
     }
diff --git a/src/components/file/file.scss b/src/components/file/file.scss
index 227c565b8..9fa957c53 100644
--- a/src/components/file/file.scss
+++ b/src/components/file/file.scss
@@ -20,7 +20,7 @@ ion-app.app-root {
 
     core-file > .item.item-block > .item-inner {
         border-bottom: 0;
-        @include padding(null, 0, null, null);
+        @include safe-area-padding(null, 0px, null, null);
         .buttons {
             display: flex;
             flex-flow: row;
diff --git a/src/components/loading/loading.scss b/src/components/loading/loading.scss
index 8b4136eea..d4c5916ba 100644
--- a/src/components/loading/loading.scss
+++ b/src/components/loading/loading.scss
@@ -20,6 +20,16 @@ ion-app.app-root {
         &.core-loading-noheight .core-loading-content {
             height: auto;
         }
+
+        &.safe-area-page {
+            padding-left: 0 !important;
+            padding-right: 0 !important;
+
+            > .core-loading-content > *,
+            > .core-loading-content-loading > * {
+                @include safe-area-padding-horizontal(0px, 0px);
+            }
+        }
     }
 
     .scroll-content > core-loading,
diff --git a/src/components/loading/loading.ts b/src/components/loading/loading.ts
index 21cb4e92f..ad4c61032 100644
--- a/src/components/loading/loading.ts
+++ b/src/components/loading/loading.ts
@@ -84,11 +84,13 @@ export class CoreLoadingComponent implements OnInit, OnChanges {
                     setTimeout(() => {
                         // Change CSS to force calculate height.
                         this.content.nativeElement.classList.add('core-loading-content');
+                        this.content.nativeElement.classList.remove('core-loading-content-loading');
                     }, 500);
                 });
             } else {
                 this.element.classList.remove('core-loading-loaded');
                 this.content.nativeElement.classList.remove('core-loading-content');
+                this.content.nativeElement.classList.add('core-loading-content-loading');
             }
 
             // Trigger the event after a timeout since the elements inside ngIf haven't been added to DOM yet.
diff --git a/src/components/split-view/split-view.scss b/src/components/split-view/split-view.scss
index 4d1fe88aa..355e1ef4e 100644
--- a/src/components/split-view/split-view.scss
+++ b/src/components/split-view/split-view.scss
@@ -17,6 +17,11 @@ ion-app.app-root core-split-view {
     .split-pane-visible {
         .split-pane-main {
             display: block;
+            @include core-split-area-end();
+        }
+
+        .split-pane-side {
+            @include core-split-area-start();
         }
 
         .split-pane-side .core-split-item-selected {
@@ -27,12 +32,6 @@ ion-app.app-root core-split-view {
               background-color: $black;
             }
         }
-
-        .item-ios[detail-push] .item-inner,
-        button.item-ios:not([detail-none]) .item-inner,
-        a.item-ios:not([detail-none]) .item-inner {
-            @include background-position(end, $item-ios-padding-end - 2, center);
-        }
     }
     ion-header {
         display: none;
@@ -41,32 +40,3 @@ ion-app.app-root core-split-view {
         padding-top: 0  !important;
     }
 }
-
-.safe-area-page {
-    @include safe-area-padding-horizontal(0px, 0px);
-}
-
-ion-app.app-root .split-pane-visible .split-pane-side {
-  .safe-area-page  {
-    @include safe-area-padding-start(0px, 0px);
-
-    .core-split-item-selected {
-      @include border-start(5px, solid, $core-splitview-selected);
-    }
-  }
-
-  // Disable safe area padding.
-  .item-ios.item-block .item-inner {
-    @include padding-horizontal(null, $item-ios-padding-end / 2);
-  }
-}
-
-ion-app.app-root .split-pane-visible .split-pane-main {
-  .safe-area-page  {
-    @include safe-area-padding-end(0px, 0px);
-  }
-
-  .toolbar {
-    @include safe-area-padding-end(0px, 0px);
-  }
-}
diff --git a/src/core/block/components/block/block.scss b/src/core/block/components/block/block.scss
index 2ab0c8f20..95fcc68e7 100644
--- a/src/core/block/components/block/block.scss
+++ b/src/core/block/components/block/block.scss
@@ -19,7 +19,7 @@ ion-app.app-root core-block {
   }
 
   .item-divider {
-    @include safe-area-padding-horizontal(null, 0px);
+    @include padding-horizontal(null, 0px);
   }
 
   .item-divider .core-button-spinner {
diff --git a/src/core/block/components/course-blocks/course-blocks.scss b/src/core/block/components/course-blocks/course-blocks.scss
index ef2da86c0..b81858bc9 100644
--- a/src/core/block/components/course-blocks/course-blocks.scss
+++ b/src/core/block/components/course-blocks/course-blocks.scss
@@ -22,12 +22,14 @@ ion-app.app-root core-block-course-blocks {
                 box-shadow: none !important;
                 flex-grow: 1;
                 max-width: 100%;
+                @include core-split-area-start();
             }
 
             div.core-course-blocks-side {
                 max-width: $core-side-blocks-max-width;
                 min-width: $core-side-blocks-min-width;
                 @include border-start(1px, solid, $list-md-border-color);
+                @include core-split-area-end();
             }
 
             .core-course-blocks-content,
diff --git a/src/core/course/components/format/core-course-format.html b/src/core/course/components/format/core-course-format.html
index 40bcd52fe..7013b69f5 100644
--- a/src/core/course/components/format/core-course-format.html
+++ b/src/core/course/components/format/core-course-format.html
@@ -55,7 +55,7 @@
                 <core-infinite-loading [enabled]="canLoadMore" (action)="showMoreActivities($event)"></core-infinite-loading>
             </div>
 
-            <ion-buttons padding end class="core-course-section-nav-buttons" *ngIf="displaySectionSelector && sections && sections.length">
+            <ion-buttons padding end class="core-course-section-nav-buttons safe-padding-horizontal" *ngIf="displaySectionSelector && sections && sections.length">
                 <button *ngIf="previousSection" ion-button color="light" icon-only (click)="sectionChanged(previousSection)" title="{{ 'core.previous' | translate }}">
                     <ion-icon name="arrow-back" md="ios-arrow-back"></ion-icon>
                     <core-format-text class="accesshide" [text]="previousSection.formattedName || previousSection.name"></core-format-text>
diff --git a/src/core/course/components/module-description/course-module-description.scss b/src/core/course/components/module-description/course-module-description.scss
new file mode 100644
index 000000000..e34a0f102
--- /dev/null
+++ b/src/core/course/components/module-description/course-module-description.scss
@@ -0,0 +1,16 @@
+ion-app.app-root {
+    .safe-area-page,
+    .safe-padding-horizontal {
+        core-course-module-description {
+            padding-left: 0 !important;
+            padding-right: 0 !important;
+            .item-ios.item-block {
+                @include safe-area-padding-horizontal($item-ios-padding-end / 2, null);
+
+                .item-inner {
+                    @include safe-area-padding-horizontal(null, $item-ios-padding-end / 2);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/core/courses/components/my-courses/my-courses.html b/src/core/courses/components/my-courses/my-courses.html
index 06ca202b8..f6133e350 100644
--- a/src/core/courses/components/my-courses/my-courses.html
+++ b/src/core/courses/components/my-courses/my-courses.html
@@ -1,7 +1,7 @@
 <core-loading [hideUntil]="coursesLoaded">
     <ion-searchbar #searchbar *ngIf="showFilter" [(ngModel)]="filter" (ionInput)="filterChanged($event)" (ionCancel)="filterChanged()" [placeholder]="'core.courses.filtermycourses' | translate">
     </ion-searchbar>
-    <ion-grid no-padding>
+    <ion-grid no-padding class="safe-area-page">
         <ion-row no-padding>
             <ion-col *ngFor="let course of filteredCourses" no-padding col-12 col-sm-6 col-md-6 col-lg-4 col-xl-4 align-self-stretch>
                 <core-courses-course-progress [course]="course" class="core-courseoverview" showAll="true"></core-courses-course-progress>
diff --git a/src/core/grades/components/course/core-grades-course.html b/src/core/grades/components/course/core-grades-course.html
index 991a1d048..9832467c9 100644
--- a/src/core/grades/components/course/core-grades-course.html
+++ b/src/core/grades/components/course/core-grades-course.html
@@ -2,11 +2,11 @@
     <ion-refresher [enabled]="gradesLoaded" (ionRefresh)="refreshGrades($event)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-loading [hideUntil]="gradesLoaded">
+    <core-loading [hideUntil]="gradesLoaded" class="safe-area-page">
         <core-empty-box *ngIf="!gradesTable" icon="stats" [message]="'core.grades.nogradesreturned' | translate">
         </core-empty-box>
 
-        <div *ngIf="gradesTable" class="core-grades-container safe-area-page">
+        <div *ngIf="gradesTable" class="core-grades-container">
             <table cellspacing="0" cellpadding="0" class="core-grades-table">
                 <thead>
                     <tr>
diff --git a/src/core/siteplugins/providers/helper.ts b/src/core/siteplugins/providers/helper.ts
index 0544efa54..288ca0f0b 100644
--- a/src/core/siteplugins/providers/helper.ts
+++ b/src/core/siteplugins/providers/helper.ts
@@ -664,7 +664,8 @@ export class CoreSitePluginsHelperProvider {
 
         const uniqueName = this.sitePluginsProvider.getHandlerUniqueName(plugin, handlerName),
             blockName = (handlerSchema.moodlecomponent || plugin.component).replace('block_', ''),
-            titleString = (handlerSchema.displaydata && handlerSchema.displaydata.title) ? handlerSchema.displaydata.title : 'pluginname',
+            titleString = (handlerSchema.displaydata && handlerSchema.displaydata.title) ?
+                handlerSchema.displaydata.title : 'pluginname',
             prefixedTitle = this.getPrefixedString(plugin.addon, titleString);
 
         this.blockDelegate.registerHandler(
diff --git a/src/core/tag/pages/search/search.html b/src/core/tag/pages/search/search.html
index 5635d09d9..7fb46cba0 100644
--- a/src/core/tag/pages/search/search.html
+++ b/src/core/tag/pages/search/search.html
@@ -7,7 +7,7 @@
     <ion-refresher [enabled]="loaded" (ionRefresh)="refreshData($event)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <ion-grid>
+    <ion-grid class="safe-area-page">
         <ion-row>
             <ion-col col-12 [attr.col-sm-6]="collections && collections.length > 1 ? '' : null">
                 <core-search-box (onSubmit)="searchTags($event)" (onClear)="searchTags('')" [initialSearch]="query" [disabled]="searching" autocorrect="off" [spellcheck]="false" [autoFocus]="true" [lengthCheck]="0"></core-search-box>
@@ -20,7 +20,7 @@
             </ion-col>
         </ion-row>
     </ion-grid>
-    <core-loading [hideUntil]="loaded && !searching">
+    <core-loading [hideUntil]="loaded && !searching" class="safe-area-page">
         <core-empty-box *ngIf="!cloud || !cloud.tags || !cloud.tags.length" icon="pricetags" [message]="'core.tag.notagsfound' | translate: {$a: query}"></core-empty-box>
 
         <ng-container *ngIf="cloud && cloud.tags && cloud.tags.length > 0">
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index ff18d0e8f..f82a5a8fa 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -413,7 +413,6 @@ $core-dd-question-colors: $white, $blue-light, #DCDCDC, #D8BFD8, #87CEFA, #DAA52
   }
 }
 
-
 @mixin safe-area-border-end($px, $type, $color) {
   $safe-area-position: calc(constant(safe-area-inset-right) + #{$px});
   $safe-area-position-env: calc(env(safe-area-inset-right) + #{$px});
@@ -425,6 +424,29 @@ $core-dd-question-colors: $white, $blue-light, #DCDCDC, #D8BFD8, #87CEFA, #DAA52
   }
 }
 
+@mixin safe-area-margin-horizontal($start, $end: $start) {
+  $safe-area-end: null;
+  $safe-area-start: null;
+  $safe-area-start-env: null;
+  $safe-area-end-env: null;
+
+  @if ($end) {
+    $safe-area-end: calc(constant(safe-area-inset-right) + #{$end});
+    $safe-area-end-env: calc(env(safe-area-inset-right) + #{$end});
+  }
+  @if ($start) {
+    $safe-area-start: calc(constant(safe-area-inset-left) + #{$start});
+    $safe-area-start-env: calc(env(safe-area-inset-left) + #{$start});
+  }
+
+  @include margin-horizontal($start, $end);
+
+  @media screen and (orientation: landscape) {
+    @include margin-horizontal($safe-area-start, $safe-area-end);
+    @include margin-horizontal($safe-area-start-env, $safe-area-end-env);
+  }
+}
+
 @mixin safe-area-padding-start($start, $end) {
   $safe-area-start: calc(constant(safe-area-inset-left) + #{$start});
   $safe-area-start-env: calc(env(safe-area-inset-left) + #{$start});
@@ -449,6 +471,12 @@ $core-dd-question-colors: $white, $blue-light, #DCDCDC, #D8BFD8, #87CEFA, #DAA52
   }
 }
 
+@mixin safe-area-position($top: null, $end: null, $bottom: null, $start: null) {
+  @include safe-position-horizontal($start, $end);
+  top: $top;
+  bottom: $bottom;
+}
+
 @mixin horizontal_scroll_item($width, $min-width, $max-width) {
     flex: 0 0 $width;
     min-width: $min-width;
@@ -556,16 +584,91 @@ $core-dd-question-colors: $white, $blue-light, #DCDCDC, #D8BFD8, #87CEFA, #DAA52
 }
 
 @mixin core-selected-item($selected-color) {
-  @include border-start(5px, solid, $selected-color);
+  @include safe-area-border-start(5px, solid, $selected-color);
 
   &.item-md {
-      @include padding(null, null, null, $item-md-padding-start - 5px);
+      @include padding-horizontal($item-md-padding-start - 5px, null);
   }
   &.item-ios {
-      @include padding(null, null, null, $item-ios-padding-start - 5px);
+      @include padding-horizontal($item-ios-padding-start - 5px, null);
   }
   &.item-wp {
-      @include padding(null, null, null, $item-wp-padding-start - 5px);
+      @include padding-horizontal($item-wp-padding-start - 5px, null);
+  }
+}
+
+
+@mixin core-split-area-start() {
+  .safe-padding-horizontal,
+  [padding].safe-padding-horizontal {
+    @include safe-area-padding-start(0px, $content-padding);
+  }
+
+  .safe-area-page  {
+    @include safe-area-padding-start(0px, 0px);
+
+    .core-split-item-selected {
+      @include border-start(5px, solid, $core-splitview-selected);
+    }
+  }
+
+  core-loading.safe-area-page {
+    > .core-loading-content > *,
+    > .core-loading-content-loading > * {
+        @include safe-area-padding-start(0px, 0px);
+    }
+  }
+
+  // Disable safe area padding on the "end" side.
+  .item-ios.item-block .item-inner {
+    @include padding-horizontal(null, $item-ios-padding-end / 2);
+  }
+
+  @if $item-ios-detail-push-show == true {
+    .item-ios[detail-push] .item-inner,
+    button.item-ios:not([detail-none]) .item-inner,
+    a.item-ios:not([detail-none]) .item-inner {
+      @include padding-horizontal(null, 32px);
+      @include background-position(end, $item-ios-padding-end - 2, center);
+      [item-end] {
+        @include margin-horizontal(($item-ios-padding-start / 2), ($item-ios-padding-end / 2));
+      }
+    }
+  }
+
+  ion-fab[end] {
+    @include position-horizontal(null, $fab-content-margin);
+  }
+}
+
+@mixin core-split-area-end() {
+  .safe-padding-horizontal,
+  [padding].safe-padding-horizontal {
+    @include safe-area-padding-end($content-padding, 0px);
+  }
+
+  .safe-area-page  {
+    @include safe-area-padding-end(0px, 0px);
+  }
+
+  core-loading.safe-area-page {
+    > .core-loading-content > *,
+    > .core-loading-content-loading > * {
+        @include safe-area-padding-end(0px, 0px);
+    }
+  }
+
+  // Disable safe area padding on the "start" side.
+  .item-ios {
+    @include padding-horizontal($item-ios-padding-end / 2, null);
+  }
+
+  .toolbar {
+    @include safe-area-padding-end(0px, 0px);
+  }
+
+  .core-nav-item-selected, .item.core-nav-item-selected {
+    @include border-start(5px, solid, $core-splitview-selected);
   }
 }
 

From 86987a2b65d26e0954a2b31d8304f58364b327e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 26 Sep 2019 17:40:13 +0200
Subject: [PATCH 044/257] MOBILE-3026 menu: Change more icon

---
 src/core/mainmenu/pages/menu/menu.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/mainmenu/pages/menu/menu.html b/src/core/mainmenu/pages/menu/menu.html
index 9ee9cf395..42d50086c 100644
--- a/src/core/mainmenu/pages/menu/menu.html
+++ b/src/core/mainmenu/pages/menu/menu.html
@@ -1,5 +1,5 @@
 <core-ion-tabs #mainTabs [hidden]="!showTabs" [loaded]="loaded" tabsLayout="title-hide" [attr.tabsPlacement]="tabsPlacement">
     <core-ion-tab [enabled]="false" [show]="false" [root]="redirectPage" [rootParams]="redirectParams"></core-ion-tab>
     <core-ion-tab *ngFor="let tab of tabs" [root]="tab.page" [rootParams]="tab.pageParams" [tabTitle]="tab.title | translate" [tabIcon]="tab.icon" [tabBadge]="tab.badge" class="{{tab.class}}" [enabled]="!tab.hide" [show]="!tab.hide"></core-ion-tab>
-    <core-ion-tab root="CoreMainMenuMorePage" [tabTitle]="'core.more' | translate" tabIcon="more"></core-ion-tab>
+    <core-ion-tab root="CoreMainMenuMorePage" [tabTitle]="'core.more' | translate" tabIcon="menu"></core-ion-tab>
 </core-ion-tabs>

From 588d616d3cac6586bf3a7401c32136ce12a81bb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 26 Sep 2019 17:34:07 +0200
Subject: [PATCH 045/257] MOBILE-3026 network: Show offline and back online
 messages

---
 scripts/langindex.json                 |  4 +-
 src/app/app.component.ts               | 19 ++++++++-
 src/assets/lang/en.json                |  4 +-
 src/core/mainmenu/pages/menu/menu.html |  8 ++++
 src/core/mainmenu/pages/menu/menu.scss | 55 +++++++++++++++++++++++++-
 src/lang/en.json                       |  4 +-
 src/theme/variables.scss               |  2 +
 7 files changed, 91 insertions(+), 5 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index e8a555bb2..239844a19 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1959,5 +1959,7 @@
   "core.wsfunctionnotavailable": "local_moodlemobileapp",
   "core.year": "moodle",
   "core.years": "moodle",
-  "core.yes": "moodle"
+  "core.yes": "moodle",
+  "core.youreoffline": "local_moodlemobileapp",
+  "core.youreonline": "local_moodlemobileapp"
 }
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index e9bd35add..0462ec1cc 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -14,6 +14,7 @@
 
 import { Component, OnInit, NgZone } from '@angular/core';
 import { Platform, IonicApp } from 'ionic-angular';
+import { Network } from '@ionic-native/network';
 import { CoreAppProvider } from '@providers/app';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreLangProvider } from '@providers/lang';
@@ -42,7 +43,7 @@ export class MoodleMobileApp implements OnInit {
             private eventsProvider: CoreEventsProvider, private loginHelper: CoreLoginHelperProvider, private zone: NgZone,
             private appProvider: CoreAppProvider, private langProvider: CoreLangProvider, private sitesProvider: CoreSitesProvider,
             private screenOrientation: ScreenOrientation, private urlSchemesProvider: CoreCustomURLSchemesProvider,
-            private utils: CoreUtilsProvider, private urlUtils: CoreUrlUtilsProvider) {
+            private utils: CoreUtilsProvider, private urlUtils: CoreUrlUtilsProvider, private network: Network) {
         this.logger = logger.getInstance('AppComponent');
 
         platform.ready().then(() => {
@@ -109,6 +110,22 @@ export class MoodleMobileApp implements OnInit {
             this.loginHelper.sitePolicyNotAgreed(data.siteId);
         });
 
+        // Refresh online status when changes.
+        this.network.onchange().subscribe(() => {
+            // Execute the callback in the Angular zone, so change detection doesn't stop working.
+            this.zone.run(() => {
+                const isOnline = this.appProvider.isOnline();
+                document.body.classList.toggle('core-offline', !isOnline);
+                document.body.classList.toggle('core-online', isOnline);
+
+                if (isOnline) {
+                    setTimeout(() => {
+                        document.body.classList.remove('core-online');
+                    }, 3000);
+                }
+            });
+        });
+
         // Check URLs loaded in any InAppBrowser.
         this.eventsProvider.on(CoreEventsProvider.IAB_LOAD_START, (event) => {
             // URLs with a custom scheme can be prefixed with "http://" or "https://", we need to remove this.
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index d4514cc94..03b2b6efe 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1957,5 +1957,7 @@
     "core.wsfunctionnotavailable": "The web service function is not available.",
     "core.year": "year",
     "core.years": "years",
-    "core.yes": "Yes"
+    "core.yes": "Yes",
+    "core.youreoffline": "You are offline",
+    "core.youreonline": "You are back online"
 }
\ No newline at end of file
diff --git a/src/core/mainmenu/pages/menu/menu.html b/src/core/mainmenu/pages/menu/menu.html
index 42d50086c..b23b70a49 100644
--- a/src/core/mainmenu/pages/menu/menu.html
+++ b/src/core/mainmenu/pages/menu/menu.html
@@ -3,3 +3,11 @@
     <core-ion-tab *ngFor="let tab of tabs" [root]="tab.page" [rootParams]="tab.pageParams" [tabTitle]="tab.title | translate" [tabIcon]="tab.icon" [tabBadge]="tab.badge" class="{{tab.class}}" [enabled]="!tab.hide" [show]="!tab.hide"></core-ion-tab>
     <core-ion-tab root="CoreMainMenuMorePage" [tabTitle]="'core.more' | translate" tabIcon="menu"></core-ion-tab>
 </core-ion-tabs>
+<div class="core-network-message" [hidden]="!showTabs">
+    <div class="core-online-message">
+        {{ "core.youreonline" | translate }}
+    </div>
+    <div class="core-offline-message">
+        {{ "core.youreoffline" | translate }}
+    </div>
+</div>
diff --git a/src/core/mainmenu/pages/menu/menu.scss b/src/core/mainmenu/pages/menu/menu.scss
index a5114c071..8dfe143f8 100644
--- a/src/core/mainmenu/pages/menu/menu.scss
+++ b/src/core/mainmenu/pages/menu/menu.scss
@@ -1,8 +1,9 @@
 ion-app.app-root page-core-mainmenu {
-    ion-icon {
+    ion-icon.tab-button-icon {
         text-overflow: unset;
         overflow: visible;
         text-align: center;
+        transition: margin 500ms ease-in-out, transform 300ms ease-in-out;
     }
 
     .ion-md-fa-graduation-cap,
@@ -40,4 +41,56 @@ ion-app.app-root page-core-mainmenu {
         font-size: 23px;
         height: 23px;
     }
+
+    .core-network-message {
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        padding-left: 10px;
+        padding-right: 10px;
+        text-align: center;
+        color: white;
+        visibility: hidden;
+        height: 0;
+        transition: all 500ms ease-in-out;
+        opacity: .8;
+    }
+
+    .core-online-message,
+    .core-offline-message {
+        display: none;
+    }
+}
+
+
+.core-online ion-app.app-root page-core-mainmenu,
+.core-offline ion-app.app-root page-core-mainmenu {
+
+    core-ion-tabs[tabsplacement="bottom"] ion-icon.tab-button-icon {
+        margin-bottom: $core-network-message-height / 2;
+
+        &.icon-ios {
+            margin-bottom: 14px;
+        }
+    }
+
+    .core-network-message {
+        visibility: visible;
+        height: $core-network-message-height;
+        pointer-events: none;
+    }
+}
+
+.core-offline ion-app.app-root page-core-mainmenu .core-offline-message,
+.core-online ion-app.app-root page-core-mainmenu .core-online-message {
+    display: block;
+}
+
+.core-online ion-app.app-root page-core-mainmenu .core-network-message {
+    background: $green;
+}
+
+.core-offline ion-app.app-root page-core-mainmenu .core-network-message {
+    background: $red;
 }
diff --git a/src/lang/en.json b/src/lang/en.json
index 59183bdcf..808bf5738 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -293,5 +293,7 @@
     "wsfunctionnotavailable": "The web service function is not available.",
     "year": "year",
     "years": "years",
-    "yes": "Yes"
+    "yes": "Yes",
+    "youreoffline": "You are offline",
+    "youreonline": "You are back online"
 }
\ No newline at end of file
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index ff18d0e8f..7008fa4c3 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -188,6 +188,8 @@ $core-loading-spinner-color: $core-color !default;
 $core-spinner-color: $core-color !default;
 $core-button-outline-background-color: $white !default;
 
+$core-network-message-height: 16px !default;
+
 // Login.
 $core-login-page-background-color: radial-gradient(white, $gray-light) !default;
 $core-login-box-background-color: $white !default;

From bc569030b0958c9835d703ee63d0c18f960fa49d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 2 Sep 2019 12:00:42 +0200
Subject: [PATCH 046/257] MOBILE-3131 signup: Propagate country from age
 verification

---
 src/core/login/pages/email-signup/email-signup.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/core/login/pages/email-signup/email-signup.ts b/src/core/login/pages/email-signup/email-signup.ts
index cf25a4ab1..0af599a07 100644
--- a/src/core/login/pages/email-signup/email-signup.ts
+++ b/src/core/login/pages/email-signup/email-signup.ts
@@ -52,6 +52,7 @@ export class CoreLoginEmailSignupPage {
     // Data for age verification.
     ageVerificationForm: FormGroup;
     countryControl: FormControl;
+    signUpCountryControl: FormControl;
     isMinor = false; // Whether the user is minor age.
     ageDigitalConsentVerification: boolean; // Whether the age verification is enabled.
     supportName: string;
@@ -110,7 +111,8 @@ export class CoreLoginEmailSignupPage {
      */
     protected completeFormGroup(): void {
         this.signupForm.addControl('city', this.fb.control(this.settings.defaultcity || ''));
-        this.signupForm.addControl('country', this.fb.control(this.settings.country || ''));
+        this.signUpCountryControl = this.fb.control(this.settings.country || '');
+        this.signupForm.addControl('country', this.signUpCountryControl);
 
         // Add the name fields.
         for (const i in this.settings.namefields) {
@@ -333,6 +335,10 @@ export class CoreLoginEmailSignupPage {
 
         this.wsProvider.callAjax('core_auth_is_minor', params, {siteUrl: this.siteUrl}).then((result) => {
             if (!result.status) {
+                if (this.countryControl.value) {
+                    this.signUpCountryControl.setValue(this.countryControl.value);
+                }
+
                 // Not a minor, go ahead!
                 this.ageDigitalConsentVerification = false;
             } else {

From 4b1ce3b234d3ee9de601a01cf15417681b45264c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 26 Sep 2019 13:03:42 +0200
Subject: [PATCH 047/257] MOBILE-3166 tags: Remove auto focus from search box

---
 src/core/tag/pages/search/search.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/tag/pages/search/search.html b/src/core/tag/pages/search/search.html
index 5635d09d9..dae3ad9de 100644
--- a/src/core/tag/pages/search/search.html
+++ b/src/core/tag/pages/search/search.html
@@ -10,7 +10,7 @@
     <ion-grid>
         <ion-row>
             <ion-col col-12 [attr.col-sm-6]="collections && collections.length > 1 ? '' : null">
-                <core-search-box (onSubmit)="searchTags($event)" (onClear)="searchTags('')" [initialSearch]="query" [disabled]="searching" autocorrect="off" [spellcheck]="false" [autoFocus]="true" [lengthCheck]="0"></core-search-box>
+                <core-search-box (onSubmit)="searchTags($event)" (onClear)="searchTags('')" [initialSearch]="query" [disabled]="searching" autocorrect="off" [spellcheck]="false" [autoFocus]="false" [lengthCheck]="0"></core-search-box>
             </ion-col>
             <ion-col col-12 col-sm-6 *ngIf="collections && collections.length > 1">
                 <ion-select text-start [(ngModel)]="collectionId" (ngModelChange)="searchTags(query)" [disabled]="searching" interface="popover" class="core-button-select">

From 9077e59dabd66379f341d3ce3a6a3dd1f532b56e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 30 Sep 2019 12:54:16 +0200
Subject: [PATCH 048/257] MOBILE-3174 data: Update fields on PTR

---
 src/addon/mod/data/components/index/index.ts |  1 +
 src/addon/mod/data/pages/entry/entry.ts      |  1 +
 src/addon/mod/data/providers/data.ts         | 14 ++++++++++++++
 3 files changed, 16 insertions(+)

diff --git a/src/addon/mod/data/components/index/index.ts b/src/addon/mod/data/components/index/index.ts
index 3e5688421..4a5b45fc2 100644
--- a/src/addon/mod/data/components/index/index.ts
+++ b/src/addon/mod/data/components/index/index.ts
@@ -151,6 +151,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
             promises.push(this.dataProvider.invalidateDatabaseAccessInformationData(this.data.id));
             promises.push(this.groupsProvider.invalidateActivityGroupInfo(this.data.coursemodule));
             promises.push(this.dataProvider.invalidateEntriesData(this.data.id));
+            promises.push(this.dataProvider.invalidateFieldsData(this.data.id));
 
             if (this.hasComments) {
                 this.eventsProvider.trigger(CoreCommentsProvider.REFRESH_COMMENTS_EVENT, {
diff --git a/src/addon/mod/data/pages/entry/entry.ts b/src/addon/mod/data/pages/entry/entry.ts
index eec7f7367..b21c9c50d 100644
--- a/src/addon/mod/data/pages/entry/entry.ts
+++ b/src/addon/mod/data/pages/entry/entry.ts
@@ -216,6 +216,7 @@ export class AddonModDataEntryPage implements OnDestroy {
             promises.push(this.dataProvider.invalidateEntryData(this.data.id, this.entryId));
             promises.push(this.groupsProvider.invalidateActivityGroupInfo(this.data.coursemodule));
             promises.push(this.dataProvider.invalidateEntriesData(this.data.id));
+            promises.push(this.dataProvider.invalidateFieldsData(this.data.id));
 
             if (this.data.comments && this.entry && this.entry.id > 0 && this.commentsEnabled && this.comments) {
                 // Refresh comments. Don't add it to promises because we don't want the comments fetch to block the entry fetch.
diff --git a/src/addon/mod/data/providers/data.ts b/src/addon/mod/data/providers/data.ts
index 98de9d3ae..09bedf35a 100644
--- a/src/addon/mod/data/providers/data.ts
+++ b/src/addon/mod/data/providers/data.ts
@@ -830,6 +830,7 @@ export class AddonModDataProvider {
             // Do not invalidate module data before getting module info, we need it!
             ps.push(this.invalidateDatabaseData(courseId, siteId));
             ps.push(this.invalidateDatabaseWSData(data.id, siteId));
+            ps.push(this.invalidateFieldsData(data.id, siteId));
 
             return Promise.all(ps);
         }));
@@ -865,6 +866,19 @@ export class AddonModDataProvider {
         });
     }
 
+    /**
+     * Invalidates database fields data.
+     *
+     * @param dataId Data ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the data is invalidated.
+     */
+    invalidateFieldsData(dataId: number, siteId?: string): Promise<any> {
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            return site.invalidateWsCacheForKey(this.getFieldsCacheKey(dataId));
+        });
+    }
+
     /**
      * Invalidate the prefetched files.
      *

From c86bec7db2cd2062d06a1f63fff38eb1447c61d2 Mon Sep 17 00:00:00 2001
From: sam marshall <s.marshall@open.ac.uk>
Date: Tue, 1 Oct 2019 14:16:44 +0100
Subject: [PATCH 049/257] MOBILE-3180 Site plugins: Plugin pages offline can
 break navigation

For pages served via a site plugin, if the page has never been viewed
(there is no cached version) then if you try to view the page when
offline, the navigation broke because page loading never finished.

This change makes it finish page loading (with a blank page) if it
shows the error about failing to load it.
---
 .../siteplugins/components/plugin-content/plugin-content.ts   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/core/siteplugins/components/plugin-content/plugin-content.ts b/src/core/siteplugins/components/plugin-content/plugin-content.ts
index ede995524..b98fcc7d7 100644
--- a/src/core/siteplugins/components/plugin-content/plugin-content.ts
+++ b/src/core/siteplugins/components/plugin-content/plugin-content.ts
@@ -107,6 +107,10 @@ export class CoreSitePluginsPluginContentComponent implements OnInit, DoCheck {
 
             this.onContentLoaded.emit(refresh);
         }).catch((error) => {
+            // Make it think it's loaded - otherwise it sticks on 'loading' and stops navigation working.
+            this.content = '<div></div>';
+            this.onContentLoaded.emit(refresh);
+
             this.domUtils.showErrorModalDefault(error, 'core.errorloadingcontent', true);
         }).finally(() => {
             this.dataLoaded = true;

From 9884da00d464d4ca2ee90ce286091ac6fb7034ce Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Tue, 1 Oct 2019 15:26:30 +0200
Subject: [PATCH 050/257] MOBILE-2890 calendar: Improve new reminder UX

---
 src/addon/calendar/pages/event/event.html | 9 ++++-----
 src/addon/calendar/pages/event/event.ts   | 7 +------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/addon/calendar/pages/event/event.html b/src/addon/calendar/pages/event/event.html
index 176250dec..009c0bfa7 100644
--- a/src/addon/calendar/pages/event/event.html
+++ b/src/addon/calendar/pages/event/event.html
@@ -98,12 +98,11 @@
 
             <ng-container *ngIf="event.timestart + event.timeduration > currentTime">
                 <ion-item>
-                    <ion-label stacked><h2>{{ 'addon.calendar.setnewreminder' | translate }}</h2></ion-label>
-                    <ion-datetime [(ngModel)]="notificationTimeText" [placeholder]="'core.choosedots' | translate" [displayFormat]="notificationFormat" [min]="notificationMin" [max]="notificationMax"></ion-datetime>
-                </ion-item>
-                <ion-item>
-                    <button ion-button block color="primary" (click)="addNotificationTime($event)" [disabled]="!notificationTimeText">{{ 'core.save' | translate }}</button>
+                    <button ion-button block color="primary" (click)="notificationPicker.open()">
+                        {{ 'addon.calendar.setnewreminder' | translate }}
+                    </button>
                 </ion-item>
+                <ion-datetime #notificationPicker hidden [(ngModel)]="notificationTimeText" [displayFormat]="notificationFormat" [min]="notificationMin" [max]="notificationMax" [doneText]="'core.add' | translate"(ionChange)="addNotificationTime()"></ion-datetime>
             </ng-container>
         </ion-card>
     </core-loading>
diff --git a/src/addon/calendar/pages/event/event.ts b/src/addon/calendar/pages/event/event.ts
index 21b503b5a..8a0df6fb0 100644
--- a/src/addon/calendar/pages/event/event.ts
+++ b/src/addon/calendar/pages/event/event.ts
@@ -311,13 +311,8 @@ export class AddonCalendarEventPage implements OnDestroy {
 
     /**
      * Add a reminder for this event.
-     *
-     * @param e Click event.
      */
-    addNotificationTime(e: Event): void {
-        e.preventDefault();
-        e.stopPropagation();
-
+    addNotificationTime(): void {
         if (this.notificationTimeText && this.event && this.event.id) {
             let notificationTime = this.timeUtils.convertToTimestamp(this.notificationTimeText);
 

From 922429e0d12eae48857b4ebeade10e2583ae7500 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Tue, 1 Oct 2019 15:31:52 +0200
Subject: [PATCH 051/257] MOBILE-2890 calendar: Confirm delete reminder

---
 src/addon/calendar/pages/event/event.ts | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/addon/calendar/pages/event/event.ts b/src/addon/calendar/pages/event/event.ts
index 8a0df6fb0..83047a9e2 100644
--- a/src/addon/calendar/pages/event/event.ts
+++ b/src/addon/calendar/pages/event/event.ts
@@ -344,10 +344,22 @@ export class AddonCalendarEventPage implements OnDestroy {
         e.preventDefault();
         e.stopPropagation();
 
-        this.calendarProvider.deleteEventReminder(id).then(() => {
-            this.calendarProvider.getEventReminders(this.eventId).then((reminders) => {
-                this.reminders = reminders;
+        const message = this.translate.instant('core.areyousure');
+        const okText = this.translate.instant('core.delete');
+
+        this.domUtils.showConfirm(message, undefined, okText).then(() => {
+            const modal = this.domUtils.showModalLoading('core.deleting', true);
+            this.calendarProvider.deleteEventReminder(id).then(() => {
+                this.calendarProvider.getEventReminders(this.eventId).then((reminders) => {
+                    this.reminders = reminders;
+                });
+            }).catch((error) => {
+                this.domUtils.showErrorModalDefault(error, 'Error deleting reminder');
+            }).finally(() => {
+                modal.dismiss();
             });
+        }).catch(() => {
+            // Cancelled.
         });
     }
 

From 5b6ea2d25b38fd0686afdf4d07ba41ea9456917c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 9 Sep 2019 15:06:15 +0200
Subject: [PATCH 052/257] MOBILE-2497 notifications: Toggle all notifications
 in affirmative way

---
 .../pages/settings/settings.html              | 24 +++++++++----------
 .../notifications/pages/settings/settings.ts  | 10 ++++----
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/addon/notifications/pages/settings/settings.html b/src/addon/notifications/pages/settings/settings.html
index b9f76c243..b6502c2c0 100644
--- a/src/addon/notifications/pages/settings/settings.html
+++ b/src/addon/notifications/pages/settings/settings.html
@@ -24,8 +24,8 @@
         <ng-container *ngIf="notifPrefsEnabled">
             <ion-card>
                 <ion-item text-wrap *ngIf="preferences">
-                    <ion-label>{{ 'core.settings.disableall' | translate }}</ion-label>
-                    <ion-toggle [(ngModel)]="preferences.disableall" (ionChange)="disableAll(preferences.disableall)"></ion-toggle>
+                    <ion-label>{{ 'addon.notifications.notifications' | translate }}</ion-label>
+                    <ion-toggle [(ngModel)]="preferences.enableall" (ionChange)="enableAll(preferences.enableall)"></ion-toggle>
                 </ion-item>
                 <ion-item text-wrap *ngIf="canChangeSound">
                     <ion-label>{{ 'addon.notifications.playsound' | translate }}</ion-label>
@@ -53,25 +53,25 @@
                     <ion-row text-wrap class="hidden-phone" align-items-center>
                         <ion-col margin-horizontal>{{ notification.displayname }}</ion-col>
                         <ion-col col-2 text-center *ngFor="let state of ['loggedin', 'loggedoff']">
-                            <!-- If notifications not disabled, show toggle. -->
-                            <ion-spinner [hidden]="preferences.disableall || !(notification.currentProcessor[state] && notification.currentProcessor[state].updating)"></ion-spinner>
-                            <ion-toggle *ngIf="!preferences.disableall && !notification.currentProcessor.locked" [(ngModel)]="notification.currentProcessor[state].checked" (ionChange)="changePreference(notification, state)" [disabled]="notification.currentProcessor[state].updating">
+                            <!-- If notifications enabled, show toggle. -->
+                            <ion-spinner [hidden]="!preferences.enableall || !(notification.currentProcessor[state] && notification.currentProcessor[state].updating)"></ion-spinner>
+                            <ion-toggle *ngIf="preferences.enableall && !notification.currentProcessor.locked" [(ngModel)]="notification.currentProcessor[state].checked" (ionChange)="changePreference(notification, state)" [disabled]="notification.currentProcessor[state].updating">
                             </ion-toggle>
-                            <div padding class="text-gray" *ngIf="!preferences.disableall && notification.currentProcessor.locked">{{'core.settings.locked' | translate }}</div>
+                            <div padding class="text-gray" *ngIf="preferences.enableall && notification.currentProcessor.locked">{{'core.settings.locked' | translate }}</div>
                             <!-- If notifications are disabled, show "Disabled" instead of toggle. -->
-                            <span *ngIf="preferences.disableall">{{ 'core.settings.disabled' | translate }}</span>
+                            <span *ngIf="!preferences.enableall">{{ 'core.settings.disabled' | translate }}</span>
                         </ion-col>
                     </ion-row>
                     <!-- Phone view -->
                     <ion-list-header text-wrap no-margin class="hidden-tablet">{{ notification.displayname }}</ion-list-header>
-                    <!-- If notifications not disabled, show toggles. If notifications are disabled, show "Disabled" instead of toggle. -->
+                    <!-- If notifications enabled, show toggles. If notifications are disabled, show "Disabled" instead of toggle. -->
                     <ion-item *ngFor="let state of ['loggedin', 'loggedoff']" text-wrap class="hidden-tablet">
                         <ion-label>{{ 'core.settings.' + state | translate }}</ion-label>
-                        <ion-spinner item-end *ngIf="!preferences.disableall && (notification.currentProcessor[state] && notification.currentProcessor[state].updating)"></ion-spinner>
-                        <ion-toggle item-end *ngIf="!preferences.disableall && !notification.currentProcessor.locked" [(ngModel)]="notification.currentProcessor[state].checked" (ionChange)="changePreference(notification, state)" [disabled]="notification.currentProcessor[state].updating">
+                        <ion-spinner item-end *ngIf="preferences.enableall && (notification.currentProcessor[state] && notification.currentProcessor[state].updating)"></ion-spinner>
+                        <ion-toggle item-end *ngIf="preferences.enableall && !notification.currentProcessor.locked" [(ngModel)]="notification.currentProcessor[state].checked" (ionChange)="changePreference(notification, state)" [disabled]="notification.currentProcessor[state].updating">
                         </ion-toggle>
-                        <ion-note item-end *ngIf="!preferences.disableall && notification.currentProcessor.locked">{{'core.settings.locked' | translate }}</ion-note>
-                        <ion-note item-end *ngIf="preferences.disableall">{{ 'core.settings.disabled' | translate }}</ion-note>
+                        <ion-note item-end *ngIf="preferences.enableall && notification.currentProcessor.locked">{{'core.settings.locked' | translate }}</ion-note>
+                        <ion-note item-end *ngIf="!preferences.enableall">{{ 'core.settings.disabled' | translate }}</ion-note>
                     </ion-item>
                 </ng-container>
             </ion-card>
diff --git a/src/addon/notifications/pages/settings/settings.ts b/src/addon/notifications/pages/settings/settings.ts
index e4ca15b6f..254fa8108 100644
--- a/src/addon/notifications/pages/settings/settings.ts
+++ b/src/addon/notifications/pages/settings/settings.ts
@@ -96,7 +96,7 @@ export class AddonNotificationsSettingsPage implements OnDestroy {
                 return Promise.reject('No processor found');
             }
 
-            preferences.disableall = !!preferences.disableall; // Convert to boolean.
+            preferences.enableall = !preferences.disableall;
             this.preferences = preferences;
             this.loadProcessor(this.currentProcessor);
 
@@ -230,17 +230,17 @@ export class AddonNotificationsSettingsPage implements OnDestroy {
     }
 
     /**
-     * Disable all notifications changed.
+     * Enable all notifications changed.
      */
-    disableAll(disable: boolean): void {
+    enableAll(enable: boolean): void {
         const modal = this.domUtils.showModalLoading('core.sending', true);
-        this.userProvider.updateUserPreferences([], disable).then(() => {
+        this.userProvider.updateUserPreferences([], !enable).then(() => {
             // Update the preferences since they were modified.
             this.updatePreferencesAfterDelay();
         }).catch((message) => {
             // Show error and revert change.
             this.domUtils.showErrorModal(message);
-            this.preferences.disableall = !this.preferences.disableall;
+            this.preferences.enableall = !this.preferences.enableall;
         }).finally(() => {
             modal.dismiss();
         });

From efcb7af1a92fd398b5d1cef5e2cb698c4d87af4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 10 Sep 2019 09:09:23 +0200
Subject: [PATCH 053/257] MOBILE-3142 chat: Show user list on a lateral modal

---
 src/addon/mod/chat/pages/chat/chat.ts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/addon/mod/chat/pages/chat/chat.ts b/src/addon/mod/chat/pages/chat/chat.ts
index 47be73f24..0123de12d 100644
--- a/src/addon/mod/chat/pages/chat/chat.ts
+++ b/src/addon/mod/chat/pages/chat/chat.ts
@@ -116,7 +116,15 @@ export class AddonModChatChatPage {
      * Display the chat users modal.
      */
     showChatUsers(): void {
-        const modal = this.modalCtrl.create('AddonModChatUsersPage', {sessionId: this.sessionId});
+        // Create the toc modal.
+        const modal =  this.modalCtrl.create('AddonModChatUsersPage', {
+            sessionId: this.sessionId
+        }, { cssClass: 'core-modal-lateral',
+            showBackdrop: true,
+            enableBackdropDismiss: true,
+            enterAnimation: 'core-modal-lateral-transition',
+            leaveAnimation: 'core-modal-lateral-transition' });
+
         modal.onDidDismiss((data) => {
             if (data && data.talkTo) {
                 this.newMessage = `To ${data.talkTo}: `;
@@ -125,7 +133,10 @@ export class AddonModChatChatPage {
                 this.sendMessage('', data.beepTo);
             }
         });
-        modal.present();
+
+        modal.present({
+            ev: event
+        });
     }
 
     /**

From 4c151051eb6e60ffaa1f4914e9e1ceeb7ca790bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 10 Sep 2019 13:57:06 +0200
Subject: [PATCH 054/257] MOBILE-3142 chat: Change chat look and feel

---
 .../messages/pages/discussion/discussion.scss |  11 +-
 src/addon/mod/chat/lang/en.json               |   2 +
 src/addon/mod/chat/pages/chat/chat.html       |  82 ++++++++------
 src/addon/mod/chat/pages/chat/chat.scss       |   5 +-
 src/addon/mod/chat/pages/chat/chat.ts         | 106 ++++++++++++++++--
 src/addon/mod/chat/pages/users/users.ts       |   8 +-
 src/assets/lang/en.json                       |   2 +
 src/components/ion-tabs/ion-tabs.scss         |   3 +-
 .../core-send-message-form.html               |   2 +-
 .../send-message-form/send-message-form.ts    |   9 +-
 10 files changed, 173 insertions(+), 57 deletions(-)

diff --git a/src/addon/messages/pages/discussion/discussion.scss b/src/addon/messages/pages/discussion/discussion.scss
index 5b8ee2a35..4591793e5 100644
--- a/src/addon/messages/pages/discussion/discussion.scss
+++ b/src/addon/messages/pages/discussion/discussion.scss
@@ -4,8 +4,7 @@ $item-message-note-text: $gray-dark !default;
 $item-message-note-font-size: 75% !default;
 $item-message-mine-bg: $gray-light !default;
 
-ion-app.app-root page-addon-messages-discussion.ion-page {
-
+@mixin message-page {
     ion-content {
         background-color: $gray-lighter !important;
         @include darkmode() {
@@ -194,6 +193,12 @@ ion-app.app-root page-addon-messages-discussion.ion-page {
     .addon-message-not-mine.activated .tail {
         border-bottom-color: darken($item-message-bg, 10%);
     }
+}
+
+
+ion-app.app-root page-addon-messages-discussion.ion-page {
+
+    @include message-page();
 
     .toolbar-title {
         padding: 0;
@@ -224,4 +229,4 @@ ion-app.app-root page-addon-messages-discussion.ion-page {
 ion-app.app-root.ios page-addon-messages-discussion ion-footer .toolbar:last-child {
     padding-bottom: 4px;
     min-height: 0;
-}
\ No newline at end of file
+}
diff --git a/src/addon/mod/chat/lang/en.json b/src/addon/mod/chat/lang/en.json
index 4348b5d63..04c334410 100644
--- a/src/addon/mod/chat/lang/en.json
+++ b/src/addon/mod/chat/lang/en.json
@@ -9,10 +9,12 @@
     "errorwhilegettingchatusers": "Error while getting chat users.",
     "errorwhileretrievingmessages": "Error while retrieving messages from the server.",
     "errorwhilesendingmessage": "Error while sending the message.",
+    "messagebeepseveryone": "{{$a}} beeps everyone!",
     "messagebeepsyou": "{{$a}} has just beeped you!",
     "messageenter": "{{$a}} has just entered this chat",
     "messageexit": "{{$a}} has left this chat",
     "messages": "Messages",
+    "messageyoubeep": "You beeped {{$a}}",
     "modulenameplural": "Chats",
     "mustbeonlinetosendmessages": "You must be online to send messages.",
     "nomessages": "No messages yet",
diff --git a/src/addon/mod/chat/pages/chat/chat.html b/src/addon/mod/chat/pages/chat/chat.html
index 47f744618..4141ba329 100644
--- a/src/addon/mod/chat/pages/chat/chat.html
+++ b/src/addon/mod/chat/pages/chat/chat.html
@@ -8,55 +8,63 @@
         </ion-buttons>
     </ion-navbar>
 </ion-header>
-<ion-content  class="has-footer">
+<ion-content class="has-footer">
     <core-loading [hideUntil]="loaded">
-        <div aria-live="polite">
-            <div *ngFor="let message of messages; index as index; last as last">
+        <ion-list class="addon-messages-discussion-container safe-area-page" aria-live="polite">
+            <ng-container *ngFor="let message of messages; index as index; last as last">
 
-                <div text-center *ngIf="showDate(messages[index], messages[index - 1])" class="addon-mod-chat-notice">
-                    <ion-badge text-wrap color="light">
-                        <span>{{ message.timestamp * 1000 | coreFormatDate:"strftimedayshort" }}</span>
+                <h6 text-center *ngIf="message.showDate" class="addon-messages-date">
+                    {{ message.timestamp * 1000 | coreFormatDate:"strftimedayshort" }}
+                </h6>
+
+                <div text-center *ngIf="message.special" class="addon-mod-chat-notice">
+                    <ion-badge text-wrap color="success" *ngIf="message.system && message.message == 'enter'">
+                        <span><core-icon name="fa-sign-in"></core-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ 'addon.mod_chat.messageenter' | translate:{$a: message.userfullname} }}</span>
+                    </ion-badge>
+
+                    <ion-badge text-wrap color="danger" *ngIf="message.system && message.message == 'exit'">
+                        <span><core-icon name="fa-sign-out"></core-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ 'addon.mod_chat.messageexit' | translate:{$a: message.userfullname} }}</span>
+                    </ion-badge>
+
+                    <ion-badge text-wrap color="primary" *ngIf="message.beep == 'all'">
+                        <span><ion-icon name="notifications"></ion-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
+                        {{ 'addon.mod_chat.messagebeepseveryone' | translate:{$a: message.userfullname} }} </span>
+                    </ion-badge>
+
+                    <ion-badge text-wrap color="primary" *ngIf="message.userid != currentUserId && message.beep == currentUserId">
+                        <span><ion-icon name="notifications"></ion-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
+                        {{ 'addon.mod_chat.messagebeepsyou' | translate:{$a: message.userfullname} }} </span>
+                    </ion-badge>
+
+                    <ion-badge text-wrap color="light" *ngIf="message.userid == currentUserId && message.beep && message.beep != 'all'">
+                        <span><ion-icon name="notifications"></ion-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
+                        {{ 'addon.mod_chat.messageyoubeep' | translate:{$a: message.beepwho} }} </span>
                     </ion-badge>
                 </div>
 
-                <div text-center *ngIf="message.system && message.message == 'enter'" class="addon-mod-chat-notice">
-                    <ion-badge text-wrap color="light">
-                        <span>{{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ 'addon.mod_chat.messageenter' | translate:{$a: message.userfullname} }}</span>
-                    </ion-badge>
-                </div>
-
-                <div text-center *ngIf="message.system && message.message == 'exit'" class="addon-mod-chat-notice">
-                    <ion-badge text-wrap color="light">
-                        <span>{{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ 'addon.mod_chat.messageexit' | translate:{$a: message.userfullname} }}</span>
-                    </ion-badge>
-                </div>
-
-                <div text-center *ngIf="message.message == currentUserBeep" class="addon-mod-chat-notice">
-                    <ion-badge text-wrap color="light">
-                        <span>{{ 'addon.mod_chat.messagebeepsyou' | translate:{$a: message.userfullname} }}</span>
-                    </ion-badge>
-                </div>
-
-                <ion-item text-wrap *ngIf="!message.system && message.message.substr(0, 4) != 'beep'" class="addon-mod-chat-message">
-                    <ion-avatar core-user-avatar [user]="message" item-start></ion-avatar>
-                    <h2>
-                        <p float-end>{{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}</p>
-                        <core-format-text [text]="message.userfullname"></core-format-text>
+                <ion-item text-wrap *ngIf="!message.special" class="addon-message" [class.addon-message-mine]="message.userid == currentUserId" [class.addon-message-not-mine]="message.userid != currentUserId" [class.addon-message-no-user]="!message.showUserData" [@coreSlideInOut]="message.userid == currentUserId ? '' : 'fromLeft'">
+                    <!-- User data. -->
+                    <h2 class="addon-message-user">
+                        <ion-avatar item-start core-user-avatar [user]="message" [linkProfile]="false" *ngIf="message.showUserData"></ion-avatar>
+                        <div *ngIf="message.showUserData">{{ message.userfullname }}</div>
+                        <ion-note>{{ message.timestamp * 1000 | coreFormatDate: "strftimetime" }}</ion-note>
                     </h2>
-                    <core-format-text [text]="message.message" (afterRender)="last && scrollToBottom()"></core-format-text>
-                </ion-item>
-            </div>
 
-            <div text-center margin *ngIf="!messages || messages.length <= 0">
-                <p>{{ 'addon.mod_chat.nomessages' | translate}}</p>
-            </div>
-        </div>
+                    <p class="addon-message-text">
+                        <core-format-text [text]="message.message" (afterRender)="last && scrollToBottom()"></core-format-text>
+                    </p>
+                    <div class="tail" *ngIf="message.showTail"></div>
+                </ion-item>
+            </ng-container>
+
+        </ion-list>
+        <core-empty-box *ngIf="!messages || messages.length <= 0" icon="chatbubbles" [message]="'addon.mod_chat.nomessages' | translate"></core-empty-box>
     </core-loading>
 </ion-content>
 <ion-footer color="light" class="footer-adjustable">
     <ion-toolbar color="light" position="bottom">
         <p text-center *ngIf="!isOnline">{{ 'addon.mod_chat.mustbeonlinetosendmessages' | translate }}</p>
-        <core-send-message-form *ngIf="isOnline && polling && loaded" [message]="newMessage" (onSubmit)="sendMessage($event)" [showKeyboard]="showKeyboard" [placeholder]="'addon.messages.newmessage' | translate" (onResize)="resizeContent()"></core-send-message-form>
+        <core-send-message-form [sendDisabled]="sending" *ngIf="isOnline && polling && loaded" [message]="newMessage" (onSubmit)="sendMessage($event)" [showKeyboard]="showKeyboard" [placeholder]="'addon.messages.newmessage' | translate" (onResize)="resizeContent()"></core-send-message-form>
         <button *ngIf="isOnline && !polling && loaded" (click)="reconnect()" ion-button block color="light">{{ 'core.login.reconnect' | translate }}</button>
     </ion-toolbar>
 </ion-footer>
diff --git a/src/addon/mod/chat/pages/chat/chat.scss b/src/addon/mod/chat/pages/chat/chat.scss
index fe62c5619..3e34e5324 100644
--- a/src/addon/mod/chat/pages/chat/chat.scss
+++ b/src/addon/mod/chat/pages/chat/chat.scss
@@ -1,9 +1,8 @@
 ion-app.app-root page-addon-mod-chat-chat {
+    @include message-page();
+
     .addon-mod-chat-notice {
         margin-top: 10px;
         margin-bottom: 10px;
     }
-    .addon-mod-chat-message {
-        align-items: flex-start;
-    }
 }
diff --git a/src/addon/mod/chat/pages/chat/chat.ts b/src/addon/mod/chat/pages/chat/chat.ts
index 0123de12d..a8a0760cc 100644
--- a/src/addon/mod/chat/pages/chat/chat.ts
+++ b/src/addon/mod/chat/pages/chat/chat.ts
@@ -22,6 +22,8 @@ import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
 import { AddonModChatProvider, AddonModChatMessageWithUserData } from '../../providers/chat';
 import { Network } from '@ionic-native/network';
+import { coreSlideInOut } from '@classes/animations';
+import { CoreSendMessageFormComponent } from '@components/send-message-form/send-message-form';
 import * as moment from 'moment';
 
 /**
@@ -31,9 +33,11 @@ import * as moment from 'moment';
 @Component({
     selector: 'page-addon-mod-chat-chat',
     templateUrl: 'chat.html',
+    animations: [coreSlideInOut]
 })
 export class AddonModChatChatPage {
     @ViewChild(Content) content: Content;
+    @ViewChild(CoreSendMessageFormComponent) sendMessageForm: CoreSendMessageFormComponent;
 
     loaded = false;
     title: string;
@@ -41,7 +45,8 @@ export class AddonModChatChatPage {
     newMessage: string;
     polling: any;
     isOnline: boolean;
-    currentUserBeep: string;
+    currentUserId: number;
+    sending: boolean;
 
     protected logger;
     protected courseId: number;
@@ -53,6 +58,7 @@ export class AddonModChatChatPage {
     protected keyboardObserver: any;
     protected viewDestroyed = false;
     protected pollingRunning = false;
+    protected users = [];
 
     constructor(navParams: NavParams, logger: CoreLoggerProvider, network: Network,  zone: NgZone, private navCtrl: NavController,
             private chatProvider: AddonModChatProvider, private appProvider: CoreAppProvider, sitesProvider: CoreSitesProvider,
@@ -63,7 +69,7 @@ export class AddonModChatChatPage {
         this.courseId = navParams.get('courseId');
         this.title = navParams.get('title');
         this.logger = logger.getInstance('AddonModChoiceChoicePage');
-        this.currentUserBeep = 'beep ' + sitesProvider.getCurrentSiteUserId();
+        this.currentUserId = sitesProvider.getCurrentSiteUserId();
         this.isOnline = this.appProvider.isOnline();
         this.onlineObserver = network.onchange().subscribe(() => {
             // Execute the callback in the Angular zone, so change detection doesn't stop working.
@@ -127,11 +133,14 @@ export class AddonModChatChatPage {
 
         modal.onDidDismiss((data) => {
             if (data && data.talkTo) {
-                this.newMessage = `To ${data.talkTo}: `;
+                this.newMessage = `To ${data.talkTo}: ` + this.sendMessageForm.message;
             }
             if (data && data.beepTo) {
                 this.sendMessage('', data.beepTo);
             }
+            if (data && data.users) {
+                this.users = data.users;
+            }
         });
 
         modal.present({
@@ -139,6 +148,38 @@ export class AddonModChatChatPage {
         });
     }
 
+    /**
+     * Get the user fullname for a beep.
+     *
+     * @param  id User Id before parsing.
+     * @return User fullname.
+     */
+    protected getUserFullname(id: string): Promise<string> {
+        if (isNaN(parseInt(id, 10))) {
+            return Promise.resolve(id);
+        }
+
+        const user = this.users.find((user) => user.id == id);
+
+        if (user) {
+            return Promise.resolve(user.fullname);
+        }
+
+        return this.chatProvider.getChatUsers(this.sessionId).then((data) => {
+            this.users = data.users;
+            const user = this.users.find((user) => user.id == id);
+
+            if (user) {
+                return user.fullname;
+            }
+
+            return id;
+        }).catch((error) => {
+            // Ignore errors.
+            return id;
+        });
+    }
+
     /**
      * Convenience function to login the user.
      *
@@ -160,8 +201,33 @@ export class AddonModChatChatPage {
             this.lastTime = messagesInfo.chatnewlasttime || 0;
 
             return this.chatProvider.getMessagesUserData(messagesInfo.messages, this.courseId).then((messages) => {
-                this.messages = this.messages.concat(<AddonModChatMessageWithUserData[]> messages);
                 if (messages.length) {
+                    const previousLength = this.messages.length;
+                    this.messages = this.messages.concat(<AddonModChatMessageWithUserData[]> messages);
+
+                    // Calculate which messages need to display the date or user data.
+                    for (let index = previousLength ; index < this.messages.length; index++) {
+                        const message = this.messages[index];
+                        const prevMessage = index > 0 ? this.messages[index - 1] : null;
+
+                        message.showDate = this.showDate(message, prevMessage);
+                        message.beep = message.message.substr(0, 5) == 'beep ' && message.message.substr(5).trim();
+
+                        if (message.beep && message.beep != this.currentUserId) {
+                            this.getUserFullname(message.beep).then((fullname) => {
+                                message.beepwho = fullname;
+                            });
+                        }
+
+                        message.special = message.system || !!message.beep;
+
+                        message.showUserData = this.showUserData(message, prevMessage);
+                        prevMessage ?
+                            prevMessage.showTail = this.showTail(prevMessage, message) : null;
+                    }
+
+                    this.messages[this.messages.length - 1].showTail = true;
+
                     // New messages or beeps, scroll to bottom.
                     setTimeout(() => this.scrollToBottom());
                 }
@@ -196,6 +262,30 @@ export class AddonModChatChatPage {
         }
     }
 
+    /**
+     * Check if the user info should be displayed for the current message.
+     * User data is only displayed if the previous message was from another user.
+     *
+     * @param message Current message where to show the user info.
+     * @param prevMessage Previous message.
+     * @return Whether user data should be shown.
+     */
+    showUserData(message: any, prevMessage?: any): boolean {
+        return message.userid != this.currentUserId &&
+            (!prevMessage || prevMessage.userid != message.userid || message.showDate || prevMessage.special);
+    }
+
+    /**
+     * Check if a css tail should be shown.
+     *
+     * @param message Current message where to show the user info.
+     * @param nextMessage Next message.
+     * @return Whether user data should be shown.
+     */
+    showTail(message: any, nextMessage?: any): boolean {
+        return !nextMessage || nextMessage.userid != message.userid || nextMessage.showDate || nextMessage.special;
+    }
+
     /**
      * Convenience function to be called every certain time to fetch chat messages.
      *
@@ -259,9 +349,8 @@ export class AddonModChatChatPage {
             // Silent error.
             return;
         }
-        text = this.textUtils.replaceNewLines(text, '<br>');
 
-        const modal = this.domUtils.showModalLoading('core.sending', true);
+        this.sending = true;
         this.chatProvider.sendMessage(this.sessionId, text, beep).then(() => {
             // Update messages to show the sent message.
             this.fetchMessagesInterval().catch(() => {
@@ -272,9 +361,12 @@ export class AddonModChatChatPage {
               messages without the keyboard being closed. */
             this.appProvider.closeKeyboard();
 
+            this.newMessage = text;
+
             this.domUtils.showErrorModalDefault(error, 'addon.mod_chat.errorwhilesendingmessage', true);
         }).finally(() => {
-            modal.dismiss();
+            this.sending = false;
+            this.sendMessageForm.focus();
         });
     }
 
diff --git a/src/addon/mod/chat/pages/users/users.ts b/src/addon/mod/chat/pages/users/users.ts
index f54560ba3..3ec2b36e4 100644
--- a/src/addon/mod/chat/pages/users/users.ts
+++ b/src/addon/mod/chat/pages/users/users.ts
@@ -69,7 +69,7 @@ export class AddonModChatUsersPage {
      * Close the chat users modal.
      */
     closeModal(): void {
-        this.viewCtrl.dismiss();
+        this.viewCtrl.dismiss({users: this.users});
     }
 
     /**
@@ -77,8 +77,8 @@ export class AddonModChatUsersPage {
      *
      * @param user User object.
      */
-     talkTo(user: AddonModChatUser): void {
-        this.viewCtrl.dismiss({talkTo: user.fullname});
+    talkTo(user: AddonModChatUser): void {
+        this.viewCtrl.dismiss({talkTo: user.fullname, users: this.users});
     }
 
     /**
@@ -87,7 +87,7 @@ export class AddonModChatUsersPage {
      * @param user User object.
      */
     beepTo(user: AddonModChatUser): void {
-        this.viewCtrl.dismiss({beepTo: user.id});
+        this.viewCtrl.dismiss({beepTo: user.id, users: this.users});
     }
 
     /**
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index d4514cc94..2d744257b 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -432,10 +432,12 @@
     "addon.mod_chat.errorwhilegettingchatusers": "Error while getting chat users.",
     "addon.mod_chat.errorwhileretrievingmessages": "Error while retrieving messages from the server.",
     "addon.mod_chat.errorwhilesendingmessage": "Error while sending the message.",
+    "addon.mod_chat.messagebeepseveryone": "{{$a}} beeps everyone!",
     "addon.mod_chat.messagebeepsyou": "{{$a}} has just beeped you!",
     "addon.mod_chat.messageenter": "{{$a}} has just entered this chat",
     "addon.mod_chat.messageexit": "{{$a}} has left this chat",
     "addon.mod_chat.messages": "Messages",
+    "addon.mod_chat.messageyoubeep": "You beeped {{$a}}",
     "addon.mod_chat.modulenameplural": "Chats",
     "addon.mod_chat.mustbeonlinetosendmessages": "You must be online to send messages.",
     "addon.mod_chat.nomessages": "No messages yet",
diff --git a/src/components/ion-tabs/ion-tabs.scss b/src/components/ion-tabs/ion-tabs.scss
index 31f667650..ec2e85b66 100644
--- a/src/components/ion-tabs/ion-tabs.scss
+++ b/src/components/ion-tabs/ion-tabs.scss
@@ -60,7 +60,8 @@ ion-app.app-root core-ion-tabs {
             }
         }
 
-        .scroll-content, .fixed-content {
+        ion-content:not(.has-footer) > .scroll-content,
+        ion-content:not(.has-footer) > .fixed-content {
             margin-bottom: 0 !important;
         }
     }
diff --git a/src/components/send-message-form/core-send-message-form.html b/src/components/send-message-form/core-send-message-form.html
index b1829854a..8caa886c3 100644
--- a/src/components/send-message-form/core-send-message-form.html
+++ b/src/components/send-message-form/core-send-message-form.html
@@ -1,7 +1,7 @@
 <form>
     <textarea class="core-send-message-input" [core-auto-focus]="showKeyboard" [placeholder]="placeholder" rows="1" core-auto-rows [(ngModel)]="message" name="message" (onResize)="textareaResized()" (keydown.enter)="enterClicked($event)" (keydown.control.enter)="enterClicked($event, 'control')" (keydown.meta.enter)="enterClicked($event, 'meta')" aria-multiline="true"></textarea>
     <ion-buttons end>
-        <button ion-button icon-only clear="true" type="submit" [disabled]="!message" [attr.aria-label]="'core.send' | translate" [core-suppress-events] (onClick)="submitForm($event)">
+        <button ion-button icon-only clear="true" type="submit" [disabled]="!message || sendDisabled" [attr.aria-label]="'core.send' | translate" [core-suppress-events] (onClick)="submitForm($event)">
             <ion-icon name="send" color="dark"></ion-icon>
         </button>
     </ion-buttons>
diff --git a/src/components/send-message-form/send-message-form.ts b/src/components/send-message-form/send-message-form.ts
index 48a7a87c6..ac7f82578 100644
--- a/src/components/send-message-form/send-message-form.ts
+++ b/src/components/send-message-form/send-message-form.ts
@@ -19,6 +19,7 @@ import { CoreEventsProvider } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
+import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreConstants } from '@core/constants';
 
 /**
@@ -39,13 +40,15 @@ export class CoreSendMessageFormComponent implements OnInit {
     @Input() message: string; // Input text.
     @Input() placeholder = ''; // Placeholder for the input area.
     @Input() showKeyboard = false; // If keyboard is shown or not.
+    @Input() sendDisabled = false; // If send is disabled.
     @Output() onSubmit: EventEmitter<string>; // Send data when submitting the message form.
     @Output() onResize: EventEmitter<void>; // Emit when resizing the textarea.
 
     protected sendOnEnter: boolean;
 
     constructor(private utils: CoreUtilsProvider, private textUtils: CoreTextUtilsProvider, configProvider: CoreConfigProvider,
-            eventsProvider: CoreEventsProvider, sitesProvider: CoreSitesProvider, private appProvider: CoreAppProvider) {
+            eventsProvider: CoreEventsProvider, sitesProvider: CoreSitesProvider, private appProvider: CoreAppProvider,
+            private domUtils: CoreDomUtilsProvider) {
 
         this.onSubmit = new EventEmitter();
         this.onResize = new EventEmitter();
@@ -99,6 +102,10 @@ export class CoreSendMessageFormComponent implements OnInit {
      * @param other The name of the other key that was clicked, undefined if no other key.
      */
     enterClicked(e: Event, other: string): void {
+        if (this.sendDisabled) {
+            return;
+        }
+
         if (this.sendOnEnter && !other) {
             // Enter clicked, send the message.
             this.submitForm(e);

From e01cce68dcea0cb4dc91af4826dd829439f4a4a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 10 Sep 2019 14:28:24 +0200
Subject: [PATCH 055/257] MOBILE-3142 chat: Implement me command

---
 src/addon/mod/chat/pages/chat/chat.html | 5 +++++
 src/addon/mod/chat/pages/chat/chat.ts   | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/addon/mod/chat/pages/chat/chat.html b/src/addon/mod/chat/pages/chat/chat.html
index 4141ba329..2e08fe598 100644
--- a/src/addon/mod/chat/pages/chat/chat.html
+++ b/src/addon/mod/chat/pages/chat/chat.html
@@ -40,6 +40,11 @@
                         <span><ion-icon name="notifications"></ion-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
                         {{ 'addon.mod_chat.messageyoubeep' | translate:{$a: message.beepwho} }} </span>
                     </ion-badge>
+
+                    <ion-badge text-wrap color="info" *ngIf="!message.system && !message.beep">
+                        <span><core-icon name="fa-asterisk"></core-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
+                            <strong>{{ message.userfullname }} <core-format-text [text]="message.message" (afterRender)="last && scrollToBottom()"></core-format-text></strong></span>
+                    </ion-badge>
                 </div>
 
                 <ion-item text-wrap *ngIf="!message.special" class="addon-message" [class.addon-message-mine]="message.userid == currentUserId" [class.addon-message-not-mine]="message.userid != currentUserId" [class.addon-message-no-user]="!message.showUserData" [@coreSlideInOut]="message.userid == currentUserId ? '' : 'fromLeft'">
diff --git a/src/addon/mod/chat/pages/chat/chat.ts b/src/addon/mod/chat/pages/chat/chat.ts
index a8a0760cc..feba43697 100644
--- a/src/addon/mod/chat/pages/chat/chat.ts
+++ b/src/addon/mod/chat/pages/chat/chat.ts
@@ -221,6 +221,11 @@ export class AddonModChatChatPage {
 
                         message.special = message.system || !!message.beep;
 
+                        if (message.message.substr(0, 4) == '/me ') {
+                            message.special = true;
+                            message.message = message.message.substr(4).trim();
+                        }
+
                         message.showUserData = this.showUserData(message, prevMessage);
                         prevMessage ?
                             prevMessage.showTail = this.showTail(prevMessage, message) : null;

From 0dd869d59e4430c125c2c0a80acaedfe4b27c4d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 10 Sep 2019 14:59:08 +0200
Subject: [PATCH 056/257] MOBILE-3142 chat: Past sessions look and feel

---
 src/addon/mod/chat/chat.module.ts             |  2 +
 src/addon/mod/chat/pages/chat/chat.ts         | 63 ++-----------
 .../session-messages/session-messages.html    | 73 +++++++++------
 .../session-messages/session-messages.scss    |  5 +-
 .../session-messages/session-messages.ts      | 46 ++++++----
 src/addon/mod/chat/providers/helper.ts        | 88 +++++++++++++++++++
 6 files changed, 173 insertions(+), 104 deletions(-)
 create mode 100644 src/addon/mod/chat/providers/helper.ts

diff --git a/src/addon/mod/chat/chat.module.ts b/src/addon/mod/chat/chat.module.ts
index 7d90566e0..de0349837 100644
--- a/src/addon/mod/chat/chat.module.ts
+++ b/src/addon/mod/chat/chat.module.ts
@@ -18,6 +18,7 @@ import { CoreCourseModuleDelegate } from '@core/course/providers/module-delegate
 import { CoreCourseModulePrefetchDelegate } from '@core/course/providers/module-prefetch-delegate';
 import { AddonModChatComponentsModule } from './components/components.module';
 import { AddonModChatProvider } from './providers/chat';
+import { AddonModChatHelperProvider } from './providers/helper';
 import { AddonModChatLinkHandler } from './providers/link-handler';
 import { AddonModChatListLinkHandler } from './providers/list-link-handler';
 import { AddonModChatModuleHandler } from './providers/module-handler';
@@ -36,6 +37,7 @@ export const ADDON_MOD_CHAT_PROVIDERS: any[] = [
     ],
     providers: [
         AddonModChatProvider,
+        AddonModChatHelperProvider,
         AddonModChatLinkHandler,
         AddonModChatListLinkHandler,
         AddonModChatModuleHandler,
diff --git a/src/addon/mod/chat/pages/chat/chat.ts b/src/addon/mod/chat/pages/chat/chat.ts
index feba43697..880d2cd2a 100644
--- a/src/addon/mod/chat/pages/chat/chat.ts
+++ b/src/addon/mod/chat/pages/chat/chat.ts
@@ -21,10 +21,10 @@ import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
 import { AddonModChatProvider, AddonModChatMessageWithUserData } from '../../providers/chat';
+import { AddonModChatHelperProvider } from '../../providers/helper';
 import { Network } from '@ionic-native/network';
 import { coreSlideInOut } from '@classes/animations';
 import { CoreSendMessageFormComponent } from '@components/send-message-form/send-message-form';
-import * as moment from 'moment';
 
 /**
  * Page that displays a chat session.
@@ -62,8 +62,8 @@ export class AddonModChatChatPage {
 
     constructor(navParams: NavParams, logger: CoreLoggerProvider, network: Network,  zone: NgZone, private navCtrl: NavController,
             private chatProvider: AddonModChatProvider, private appProvider: CoreAppProvider, sitesProvider: CoreSitesProvider,
-            private modalCtrl: ModalController, private domUtils: CoreDomUtilsProvider, private textUtils: CoreTextUtilsProvider,
-            private eventsProvider: CoreEventsProvider) {
+            private modalCtrl: ModalController, private domUtils: CoreDomUtilsProvider,
+            private eventsProvider: CoreEventsProvider, private chatHelper: AddonModChatHelperProvider) {
 
         this.chatId = navParams.get('chatId');
         this.courseId = navParams.get('courseId');
@@ -210,25 +210,13 @@ export class AddonModChatChatPage {
                         const message = this.messages[index];
                         const prevMessage = index > 0 ? this.messages[index - 1] : null;
 
-                        message.showDate = this.showDate(message, prevMessage);
-                        message.beep = message.message.substr(0, 5) == 'beep ' && message.message.substr(5).trim();
+                        this.chatHelper.formatMessage(this.currentUserId, message, prevMessage);
 
                         if (message.beep && message.beep != this.currentUserId) {
                             this.getUserFullname(message.beep).then((fullname) => {
                                 message.beepwho = fullname;
                             });
                         }
-
-                        message.special = message.system || !!message.beep;
-
-                        if (message.message.substr(0, 4) == '/me ') {
-                            message.special = true;
-                            message.message = message.message.substr(4).trim();
-                        }
-
-                        message.showUserData = this.showUserData(message, prevMessage);
-                        prevMessage ?
-                            prevMessage.showTail = this.showTail(prevMessage, message) : null;
                     }
 
                     this.messages[this.messages.length - 1].showTail = true;
@@ -267,34 +255,10 @@ export class AddonModChatChatPage {
         }
     }
 
-    /**
-     * Check if the user info should be displayed for the current message.
-     * User data is only displayed if the previous message was from another user.
-     *
-     * @param message Current message where to show the user info.
-     * @param prevMessage Previous message.
-     * @return Whether user data should be shown.
-     */
-    showUserData(message: any, prevMessage?: any): boolean {
-        return message.userid != this.currentUserId &&
-            (!prevMessage || prevMessage.userid != message.userid || message.showDate || prevMessage.special);
-    }
-
-    /**
-     * Check if a css tail should be shown.
-     *
-     * @param message Current message where to show the user info.
-     * @param nextMessage Next message.
-     * @return Whether user data should be shown.
-     */
-    showTail(message: any, nextMessage?: any): boolean {
-        return !nextMessage || nextMessage.userid != message.userid || nextMessage.showDate || nextMessage.special;
-    }
-
     /**
      * Convenience function to be called every certain time to fetch chat messages.
      *
-     * @return Promised resolved when done.
+     * @return Promise resolved when done.
      */
     protected fetchMessagesInterval(): Promise<void> {
         this.logger.debug('Polling for messages');
@@ -324,22 +288,6 @@ export class AddonModChatChatPage {
         });
     }
 
-    /**
-     * Check if the date should be displayed between messages (when the day changes at midnight for example).
-     *
-     * @param message New message object.
-     * @param prevMessage Previous message object.
-     * @return True if messages are from diferent days, false othetwise.
-     */
-    showDate(message: AddonModChatMessageWithUserData, prevMessage: AddonModChatMessageWithUserData): boolean {
-        if (!prevMessage) {
-            return true;
-        }
-
-        // Check if day has changed.
-        return !moment(message.timestamp * 1000).isSame(prevMessage.timestamp * 1000, 'day');
-    }
-
     /**
      * Send a message to the chat.
      *
@@ -371,7 +319,6 @@ export class AddonModChatChatPage {
             this.domUtils.showErrorModalDefault(error, 'addon.mod_chat.errorwhilesendingmessage', true);
         }).finally(() => {
             this.sending = false;
-            this.sendMessageForm.focus();
         });
     }
 
diff --git a/src/addon/mod/chat/pages/session-messages/session-messages.html b/src/addon/mod/chat/pages/session-messages/session-messages.html
index a315ebecf..1383e37e0 100644
--- a/src/addon/mod/chat/pages/session-messages/session-messages.html
+++ b/src/addon/mod/chat/pages/session-messages/session-messages.html
@@ -8,33 +8,56 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="loaded">
-        <div *ngFor="let message of messages; index as index; last as last">
-            <div text-center *ngIf="showDate(messages[index], messages[index - 1])" class="addon-mod-chat-notice">
-                <ion-badge text-wrap color="light">
-                    <span>{{ message.timestamp * 1000 | coreFormatDate:"strftimedayshort" }}</span>
-                </ion-badge>
-            </div>
+        <ion-list class="addon-messages-discussion-container safe-area-page" aria-live="polite">
+            <ng-container *ngFor="let message of messages; index as index;">
+                <h6 text-center *ngIf="message.showDate" class="addon-messages-date">
+                    {{ message.timestamp * 1000 | coreFormatDate:"strftimedayshort" }}
+                </h6>
 
-            <div text-center *ngIf="message.issystem && message.message == 'enter'" class="addon-mod-chat-notice">
-                <ion-badge text-wrap color="light">
-                    <span>{{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ 'addon.mod_chat.messageenter' | translate:{$a: message.userfullname} }}</span>
-                </ion-badge>
-            </div>
+                <div text-center *ngIf="message.special" class="addon-mod-chat-notice">
+                    <ion-badge text-wrap color="success" *ngIf="message.issystem && message.message == 'enter'">
+                        <span><core-icon name="fa-sign-in"></core-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ 'addon.mod_chat.messageenter' | translate:{$a: message.userfullname} }}</span>
+                    </ion-badge>
 
-            <div text-center *ngIf="message.issystem && message.message == 'exit'" class="addon-mod-chat-notice">
-                <ion-badge text-wrap color="light">
-                    <span>{{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ 'addon.mod_chat.messageexit' | translate:{$a: message.userfullname} }}</span>
-                </ion-badge>
-            </div>
+                    <ion-badge text-wrap color="danger" *ngIf="message.issystem && message.message == 'exit'">
+                        <span><core-icon name="fa-sign-out"></core-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }} {{ 'addon.mod_chat.messageexit' | translate:{$a: message.userfullname} }}</span>
+                    </ion-badge>
 
-            <ion-item text-wrap *ngIf="!message.issystem && message.message.substr(0, 4) != 'beep'" class="addon-mod-chat-message">
-                <ion-avatar core-user-avatar [user]="message" item-start></ion-avatar>
-                <h2>
-                    <p float-end>{{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}</p>
-                    <core-format-text [text]="message.userfullname"></core-format-text>
-                </h2>
-                <core-format-text [text]="message.message"></core-format-text>
-            </ion-item>
-        </div>
+                    <ion-badge text-wrap color="primary" *ngIf="message.beep == 'all'">
+                        <span><ion-icon name="notifications"></ion-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
+                        {{ 'addon.mod_chat.messagebeepseveryone' | translate:{$a: message.userfullname} }} </span>
+                    </ion-badge>
+
+                    <ion-badge text-wrap color="primary" *ngIf="message.userid != currentUserId && message.beep == currentUserId">
+                        <span><ion-icon name="notifications"></ion-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
+                        {{ 'addon.mod_chat.messagebeepsyou' | translate:{$a: message.userfullname} }} </span>
+                    </ion-badge>
+
+                    <ion-badge text-wrap color="light" *ngIf="message.userid == currentUserId && message.beep && message.beep != 'all'">
+                        <span><ion-icon name="notifications"></ion-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
+                        {{ 'addon.mod_chat.messageyoubeep' | translate:{$a: message.beepwho} }} </span>
+                    </ion-badge>
+
+                    <ion-badge text-wrap color="info" *ngIf="!message.issystem && !message.beep">
+                        <span><core-icon name="fa-asterisk"></core-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
+                            <strong>{{ message.userfullname }} <core-format-text [text]="message.message"></core-format-text></strong></span>
+                    </ion-badge>
+                </div>
+
+                <ion-item text-wrap *ngIf="!message.special" class="addon-message" [class.addon-message-mine]="message.userid == currentUserId" [class.addon-message-not-mine]="message.userid != currentUserId" [class.addon-message-no-user]="!message.showUserData">
+                    <!-- User data. -->
+                    <h2 class="addon-message-user">
+                        <ion-avatar item-start core-user-avatar [user]="message" [linkProfile]="false" *ngIf="message.showUserData"></ion-avatar>
+                        <div *ngIf="message.showUserData">{{ message.userfullname }}</div>
+                        <ion-note>{{ message.timestamp * 1000 | coreFormatDate: "strftimetime" }}</ion-note>
+                    </h2>
+
+                    <p class="addon-message-text">
+                        <core-format-text [text]="message.message"></core-format-text>
+                    </p>
+                    <div class="tail" *ngIf="message.showTail"></div>
+                </ion-item>
+            </ng-container>
+        </ion-list>
     </core-loading>
 </ion-content>
diff --git a/src/addon/mod/chat/pages/session-messages/session-messages.scss b/src/addon/mod/chat/pages/session-messages/session-messages.scss
index a8d1e96e8..ec4792983 100644
--- a/src/addon/mod/chat/pages/session-messages/session-messages.scss
+++ b/src/addon/mod/chat/pages/session-messages/session-messages.scss
@@ -1,9 +1,8 @@
 ion-app.app-root page-addon-mod-chat-session-messages {
+    @include message-page();
+
     .addon-mod-chat-notice {
         margin-top: 10px;
         margin-bottom: 10px;
     }
-    .addon-mod-chat-message {
-        align-items: flex-start;
-    }
 }
diff --git a/src/addon/mod/chat/pages/session-messages/session-messages.ts b/src/addon/mod/chat/pages/session-messages/session-messages.ts
index 1a29a8365..3696a65c9 100644
--- a/src/addon/mod/chat/pages/session-messages/session-messages.ts
+++ b/src/addon/mod/chat/pages/session-messages/session-messages.ts
@@ -15,8 +15,10 @@
 import { Component } from '@angular/core';
 import { IonicPage, NavParams } from 'ionic-angular';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
+import { CoreSitesProvider } from '@providers/sites';
+import { CoreUserProvider } from '@core/user/providers/user';
 import { AddonModChatProvider, AddonModChatSessionMessageWithUserData } from '../../providers/chat';
-import * as moment from 'moment';
+import { AddonModChatHelperProvider } from '../../providers/helper';
 
 /**
  * Page that displays list of chat session messages.
@@ -28,6 +30,8 @@ import * as moment from 'moment';
 })
 export class AddonModChatSessionMessagesPage {
 
+    currentUserId: number;
+
     protected courseId: number;
     protected chatId: number;
     protected sessionStart: number;
@@ -36,12 +40,14 @@ export class AddonModChatSessionMessagesPage {
     protected loaded = false;
     protected messages: AddonModChatSessionMessageWithUserData[] = [];
 
-    constructor(navParams: NavParams, private domUtils: CoreDomUtilsProvider, private chatProvider: AddonModChatProvider) {
+    constructor(navParams: NavParams, private domUtils: CoreDomUtilsProvider, private chatProvider: AddonModChatProvider,
+        sitesProvider: CoreSitesProvider, private chatHelper: AddonModChatHelperProvider, private userProvider: CoreUserProvider) {
         this.courseId = navParams.get('courseId');
         this.chatId = navParams.get('chatId');
         this.groupId = navParams.get('groupId');
         this.sessionStart = navParams.get('sessionStart');
         this.sessionEnd = navParams.get('sessionEnd');
+        this.currentUserId = sitesProvider.getCurrentSiteUserId();
 
         this.fetchMessages();
     }
@@ -55,7 +61,7 @@ export class AddonModChatSessionMessagesPage {
         return this.chatProvider.getSessionMessages(this.chatId, this.sessionStart, this.sessionEnd, this.groupId)
                 .then((messages) => {
             return this.chatProvider.getMessagesUserData(messages, this.courseId).then((messages) => {
-                this.messages = <AddonModChatSessionMessageWithUserData[]> messages;
+
             });
         }).catch((error) => {
             this.domUtils.showErrorModalDefault(error, 'core.errorloadingcontent', true);
@@ -64,6 +70,25 @@ export class AddonModChatSessionMessagesPage {
         });
     }
 
+    /**
+     * Get the user fullname for a beep.
+     *
+     * @param  id User Id before parsing.
+     * @return User fullname.
+     */
+    protected getUserFullname(id: string): Promise<string> {
+        if (isNaN(parseInt(id, 10))) {
+            return Promise.resolve(id);
+        }
+
+        return this.userProvider.getProfile(parseInt(id, 10), this.courseId, true).then((user) => {
+            return user.fullname;
+        }).catch(() => {
+            // Error getting profile.
+            return  id;
+        });
+    }
+
     /**
      * Refresh session messages.
      *
@@ -77,19 +102,4 @@ export class AddonModChatSessionMessagesPage {
         });
     }
 
-   /**
-    * Check if the date should be displayed between messages (when the day changes at midnight for example).
-    *
-    * @param message New message object.
-    * @param prevMessage Previous message object.
-    * @return True if messages are from diferent days, false othetwise.
-    */
-   showDate(message: AddonModChatSessionMessageWithUserData, prevMessage: AddonModChatSessionMessageWithUserData): boolean {
-       if (!prevMessage) {
-           return true;
-       }
-
-       // Check if day has changed.
-       return !moment(message.timestamp * 1000).isSame(prevMessage.timestamp * 1000, 'day');
-   }
 }
diff --git a/src/addon/mod/chat/providers/helper.ts b/src/addon/mod/chat/providers/helper.ts
new file mode 100644
index 000000000..6e7b7fedf
--- /dev/null
+++ b/src/addon/mod/chat/providers/helper.ts
@@ -0,0 +1,88 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import * as moment from 'moment';
+import AddonModChatMessageWithUserData from './chat';
+
+/**
+ * Helper service that provides some features for quiz.
+ */
+@Injectable()
+export class AddonModChatHelperProvider {
+
+    /**
+     * Give some format info about messages.
+     *
+     * @param  currentUserId User Id.
+     * @param  message       Message in a discussion.
+     * @param  prevMessage Previous Message in a discussion (if any).
+     * @return Message with additional info.
+     */
+    formatMessage(currentUserId: number, message: AddonModChatMessageWithUserData, prevMessage?: any): any {
+        message.showDate = this.showDate(message, prevMessage);
+        message.beep = message.message.substr(0, 5) == 'beep ' && message.message.substr(5).trim();
+
+        message.special = message.issystem || message.system || !!message.beep;
+
+        if (message.message.substr(0, 4) == '/me ') {
+            message.special = true;
+            message.message = message.message.substr(4).trim();
+        }
+
+        message.showUserData = this.showUserData(currentUserId, message, prevMessage);
+        prevMessage ?
+            prevMessage.showTail = this.showTail(prevMessage, message) : null;
+    }
+
+    /**
+     * Check if the user info should be displayed for the current message.
+     * User data is only displayed if the previous message was from another user.
+     *
+     * @param message Current message where to show the user info.
+     * @param prevMessage Previous message.
+     * @return Whether user data should be shown.
+     */
+    protected showUserData(currentUserId: number, message: any, prevMessage?: any): boolean {
+        return message.userid != currentUserId &&
+            (!prevMessage || prevMessage.userid != message.userid || message.showDate || prevMessage.special);
+    }
+
+    /**
+     * Check if a css tail should be shown.
+     *
+     * @param message Current message where to show the user info.
+     * @param nextMessage Next message.
+     * @return Whether user data should be shown.
+     */
+    protected showTail(message: AddonModChatMessageWithUserData, nextMessage?: AddonModChatMessageWithUserData): boolean {
+        return !nextMessage || nextMessage.userid != message.userid || nextMessage.showDate || nextMessage.special;
+    }
+
+    /**
+     * Check if the date should be displayed between messages (when the day changes at midnight for example).
+     *
+     * @param  message     New message object.
+     * @param  prevMessage Previous message object.
+     * @return True if messages are from diferent days, false othetwise.
+     */
+    protected showDate(message: AddonModChatMessageWithUserData, prevMessage: AddonModChatMessageWithUserData): boolean {
+        if (!prevMessage) {
+            return true;
+        }
+
+        // Check if day has changed.
+        return !moment(message.timestamp * 1000).isSame(prevMessage.timestamp * 1000, 'day');
+    }
+}

From 273d88262c368869be0c44d8242fa7ba238d40a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 10 Sep 2019 16:40:53 +0200
Subject: [PATCH 057/257] MOBILE-3142 chat: Translate said to string

---
 scripts/langindex.json                  |  3 +++
 src/addon/mod/chat/lang/en.json         |  1 +
 src/addon/mod/chat/pages/chat/chat.html |  2 +-
 src/addon/mod/chat/pages/chat/chat.ts   |  2 +-
 src/addon/mod/chat/providers/helper.ts  | 20 +++++++++++++++++++-
 src/assets/lang/en.json                 |  1 +
 6 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index e8a555bb2..0ed0824bc 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -433,14 +433,17 @@
   "addon.mod_chat.errorwhilegettingchatusers": "local_moodlemobileapp",
   "addon.mod_chat.errorwhileretrievingmessages": "local_moodlemobileapp",
   "addon.mod_chat.errorwhilesendingmessage": "local_moodlemobileapp",
+  "addon.mod_chat.messagebeepseveryone": "chat",
   "addon.mod_chat.messagebeepsyou": "chat",
   "addon.mod_chat.messageenter": "chat",
   "addon.mod_chat.messageexit": "chat",
   "addon.mod_chat.messages": "chat",
+  "addon.mod_chat.messageyoubeep": "chat",
   "addon.mod_chat.modulenameplural": "chat",
   "addon.mod_chat.mustbeonlinetosendmessages": "local_moodlemobileapp",
   "addon.mod_chat.nomessages": "chat",
   "addon.mod_chat.nosessionsfound": "local_moodlemobileapp",
+  "addon.mod_chat.saidto": "chat",
   "addon.mod_chat.send": "chat",
   "addon.mod_chat.sessionstart": "chat",
   "addon.mod_chat.showincompletesessions": "local_moodlemobileapp",
diff --git a/src/addon/mod/chat/lang/en.json b/src/addon/mod/chat/lang/en.json
index 04c334410..ad8f86ce8 100644
--- a/src/addon/mod/chat/lang/en.json
+++ b/src/addon/mod/chat/lang/en.json
@@ -19,6 +19,7 @@
     "mustbeonlinetosendmessages": "You must be online to send messages.",
     "nomessages": "No messages yet",
     "nosessionsfound": "No sessions found",
+    "saidto": "said to",
     "send": "Send",
     "sessionstart": "The next chat session will start on {{$a.date}}, ({{$a.fromnow}} from now)",
     "showincompletesessions": "Show incomplete sessions",
diff --git a/src/addon/mod/chat/pages/chat/chat.html b/src/addon/mod/chat/pages/chat/chat.html
index 2e08fe598..7e3de79b3 100644
--- a/src/addon/mod/chat/pages/chat/chat.html
+++ b/src/addon/mod/chat/pages/chat/chat.html
@@ -69,7 +69,7 @@
 <ion-footer color="light" class="footer-adjustable">
     <ion-toolbar color="light" position="bottom">
         <p text-center *ngIf="!isOnline">{{ 'addon.mod_chat.mustbeonlinetosendmessages' | translate }}</p>
-        <core-send-message-form [sendDisabled]="sending" *ngIf="isOnline && polling && loaded" [message]="newMessage" (onSubmit)="sendMessage($event)" [showKeyboard]="showKeyboard" [placeholder]="'addon.messages.newmessage' | translate" (onResize)="resizeContent()"></core-send-message-form>
+        <core-send-message-form [sendDisabled]="sending" *ngIf="isOnline && polling && loaded" [message]="newMessage" (onSubmit)="sendMessage($event)" [placeholder]="'addon.messages.newmessage' | translate" (onResize)="resizeContent()"></core-send-message-form>
         <button *ngIf="isOnline && !polling && loaded" (click)="reconnect()" ion-button block color="light">{{ 'core.login.reconnect' | translate }}</button>
     </ion-toolbar>
 </ion-footer>
diff --git a/src/addon/mod/chat/pages/chat/chat.ts b/src/addon/mod/chat/pages/chat/chat.ts
index 880d2cd2a..de3640946 100644
--- a/src/addon/mod/chat/pages/chat/chat.ts
+++ b/src/addon/mod/chat/pages/chat/chat.ts
@@ -133,7 +133,7 @@ export class AddonModChatChatPage {
 
         modal.onDidDismiss((data) => {
             if (data && data.talkTo) {
-                this.newMessage = `To ${data.talkTo}: ` + this.sendMessageForm.message;
+                this.newMessage = `To ${data.talkTo}: ` + (this.sendMessageForm.message || '');
             }
             if (data && data.beepTo) {
                 this.sendMessage('', data.beepTo);
diff --git a/src/addon/mod/chat/providers/helper.ts b/src/addon/mod/chat/providers/helper.ts
index 6e7b7fedf..9c88bed68 100644
--- a/src/addon/mod/chat/providers/helper.ts
+++ b/src/addon/mod/chat/providers/helper.ts
@@ -13,6 +13,8 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import { CoreTextUtilsProvider } from '@providers/utils/text';
 import * as moment from 'moment';
 import AddonModChatMessageWithUserData from './chat';
 
@@ -22,6 +24,13 @@ import AddonModChatMessageWithUserData from './chat';
 @Injectable()
 export class AddonModChatHelperProvider {
 
+    static patternto = new RegExp(/^To\s([^:]+):(.*)/);
+
+    constructor(protected translate: TranslateService,
+        protected textUtils: CoreTextUtilsProvider) {
+
+    }
+
     /**
      * Give some format info about messages.
      *
@@ -30,7 +39,10 @@ export class AddonModChatHelperProvider {
      * @param  prevMessage Previous Message in a discussion (if any).
      * @return Message with additional info.
      */
-    formatMessage(currentUserId: number, message: AddonModChatMessageWithUserData, prevMessage?: any): any {
+    formatMessage(currentUserId: number, message: AddonModChatMessageWithUserData,
+            prevMessage?: AddonModChatMessageWithUserData): any {
+        message.message = message.message.trim();
+
         message.showDate = this.showDate(message, prevMessage);
         message.beep = message.message.substr(0, 5) == 'beep ' && message.message.substr(5).trim();
 
@@ -41,6 +53,12 @@ export class AddonModChatHelperProvider {
             message.message = message.message.substr(4).trim();
         }
 
+        if (!message.special && message.message.match(AddonModChatHelperProvider.patternto)) {
+            const matches = message.message.match(AddonModChatHelperProvider.patternto);
+            message.message = '<b>' + this.translate.instant('addon.mod_chat.saidto') +
+                '</b> <i>' + matches[1] + '</i>: ' + matches[2];
+        }
+
         message.showUserData = this.showUserData(currentUserId, message, prevMessage);
         prevMessage ?
             prevMessage.showTail = this.showTail(prevMessage, message) : null;
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 2d744257b..58ceb5175 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -442,6 +442,7 @@
     "addon.mod_chat.mustbeonlinetosendmessages": "You must be online to send messages.",
     "addon.mod_chat.nomessages": "No messages yet",
     "addon.mod_chat.nosessionsfound": "No sessions found",
+    "addon.mod_chat.saidto": "said to",
     "addon.mod_chat.send": "Send",
     "addon.mod_chat.sessionstart": "The next chat session will start on {{$a.date}}, ({{$a.fromnow}} from now)",
     "addon.mod_chat.showincompletesessions": "Show incomplete sessions",

From 81b03dedc9be64ef83c8d16a99b968455f736a95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 26 Sep 2019 09:22:05 +0200
Subject: [PATCH 058/257] MOBILE-3142 chat: Adapt return types on chat

---
 .../messages/pages/discussion/discussion.scss | 91 ++++++++++---------
 src/addon/mod/chat/pages/chat/chat.html       |  2 +-
 src/addon/mod/chat/pages/chat/chat.scss       |  2 +-
 src/addon/mod/chat/pages/chat/chat.ts         | 13 ++-
 .../session-messages/session-messages.html    |  2 +-
 .../session-messages/session-messages.scss    |  2 +-
 .../session-messages/session-messages.ts      | 24 ++++-
 src/addon/mod/chat/providers/chat.ts          |  9 +-
 src/addon/mod/chat/providers/helper.ts        | 42 +++++++--
 .../send-message-form/send-message-form.ts    |  4 +-
 src/theme/dark.scss                           |  2 +-
 11 files changed, 118 insertions(+), 75 deletions(-)

diff --git a/src/addon/messages/pages/discussion/discussion.scss b/src/addon/messages/pages/discussion/discussion.scss
index 4591793e5..0c2237fc2 100644
--- a/src/addon/messages/pages/discussion/discussion.scss
+++ b/src/addon/messages/pages/discussion/discussion.scss
@@ -34,7 +34,7 @@ $item-message-mine-bg: $gray-light !default;
     }
 
     // Message item.
-    .addon-message {
+    .item.item-block.addon-message {
         border: 0;
         border-radius: 4px;
         padding: 8px;
@@ -59,7 +59,7 @@ $item-message-mine-bg: $gray-light !default;
             flex-direction: row;
             justify-content: space-between;
             align-items: center;
-            margin-bottom: .5rem!important;
+            margin-bottom: .5rem;
             margin-top: 0;
             color: $text-color;
 
@@ -98,7 +98,7 @@ $item-message-mine-bg: $gray-light !default;
             background-color: darken($item-message-bg, 10%);
         }
 
-        &.item-block .item-inner {
+        .item-inner {
             border-bottom: 0;
             padding: 0;
             margin: 0;
@@ -130,6 +130,7 @@ $item-message-mine-bg: $gray-light !default;
             .icon {
                 font-size: 1.4em;
                 line-height: initial;
+                color: $danger;
             }
         }
 
@@ -141,10 +142,50 @@ $item-message-mine-bg: $gray-light !default;
             position: absolute;
             touch-action: none;
         }
+
+        // Defines when an item-message is the user's.
+        &.addon-message-mine {
+            background-color: $item-message-mine-bg;
+            align-self: flex-end;
+
+            &.activated {
+                background-color: darken($item-message-mine-bg, 10%);
+            }
+
+            .spinner {
+                @include float(end);
+                @include margin(2px, -3px, -2px, 5px);
+
+                svg {
+                  width: 16px;
+                  height: 16px;
+                }
+            }
+
+            .tail {
+                @include position(null, 0, 0, null);
+                @include margin-horizontal(null, -0.5rem);
+                border-bottom-color: $item-message-mine-bg;
+            }
+
+            &.activated .tail {
+                border-bottom-color: darken($item-message-mine-bg, 10%);
+            }
+        }
+
+        &.addon-message-not-mine .tail {
+            @include position(null, null, 0, 0);
+            @include margin-horizontal(-0.5rem, null);
+            border-bottom-color: $item-message-bg;
+        }
+
+        &.addon-message-not-mine.activated .tail {
+            border-bottom-color: darken($item-message-bg, 10%);
+        }
     }
 
-    .addon-message.addon-message-mine + .addon-message-no-user.addon-message-mine,
-    .addon-message.addon-message-not-mine + .addon-message-no-user.addon-message-not-mine {
+    .item.addon-message.addon-message-mine + .item.addon-message.addon-message-no-user.addon-message-mine,
+    .item.addon-message.addon-message-not-mine + .item.addon-message.addon-message-no-user.addon-message-not-mine {
         h2 {
             margin-bottom: 0;
         }
@@ -153,46 +194,6 @@ $item-message-mine-bg: $gray-light !default;
         border-top-right-radius: 0;
         border-top-left-radius: 0;
     }
-
-    // Defines when an item-message is the user's.
-    .addon-message-mine {
-        background-color: $item-message-mine-bg;
-        align-self: flex-end;
-
-        &.activated {
-            background-color: darken($item-message-mine-bg, 10%);
-        }
-
-        .spinner {
-            @include float(end);
-            @include margin(2px, -3px, -2px, 5px);
-
-            svg {
-              width: 16px;
-              height: 16px;
-            }
-        }
-
-        .tail {
-            @include position(null, 0, 0, null);
-            @include margin-horizontal(null, -0.5rem);
-            border-bottom-color: $item-message-mine-bg;
-        }
-
-        &.activated .tail {
-            border-bottom-color: darken($item-message-mine-bg, 10%);
-        }
-    }
-
-    .addon-message-not-mine .tail {
-        @include position(null, null, 0, 0);
-        @include margin-horizontal(-0.5rem, null);
-        border-bottom-color: $item-message-bg;
-    }
-
-    .addon-message-not-mine.activated .tail {
-        border-bottom-color: darken($item-message-bg, 10%);
-    }
 }
 
 
diff --git a/src/addon/mod/chat/pages/chat/chat.html b/src/addon/mod/chat/pages/chat/chat.html
index 7e3de79b3..220b2bab0 100644
--- a/src/addon/mod/chat/pages/chat/chat.html
+++ b/src/addon/mod/chat/pages/chat/chat.html
@@ -38,7 +38,7 @@
 
                     <ion-badge text-wrap color="light" *ngIf="message.userid == currentUserId && message.beep && message.beep != 'all'">
                         <span><ion-icon name="notifications"></ion-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
-                        {{ 'addon.mod_chat.messageyoubeep' | translate:{$a: message.beepwho} }} </span>
+                        {{ 'addon.mod_chat.messageyoubeep' | translate:{$a: message.beepWho} }} </span>
                     </ion-badge>
 
                     <ion-badge text-wrap color="info" *ngIf="!message.system && !message.beep">
diff --git a/src/addon/mod/chat/pages/chat/chat.scss b/src/addon/mod/chat/pages/chat/chat.scss
index 3e34e5324..e9eb2ef73 100644
--- a/src/addon/mod/chat/pages/chat/chat.scss
+++ b/src/addon/mod/chat/pages/chat/chat.scss
@@ -1,4 +1,4 @@
-ion-app.app-root page-addon-mod-chat-chat {
+ion-app.app-root page-addon-mod-chat-chat.ion-page {
     @include message-page();
 
     .addon-mod-chat-notice {
diff --git a/src/addon/mod/chat/pages/chat/chat.ts b/src/addon/mod/chat/pages/chat/chat.ts
index de3640946..18f5ce956 100644
--- a/src/addon/mod/chat/pages/chat/chat.ts
+++ b/src/addon/mod/chat/pages/chat/chat.ts
@@ -19,9 +19,8 @@ import { CoreEventsProvider } from '@providers/events';
 import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
-import { CoreTextUtilsProvider } from '@providers/utils/text';
-import { AddonModChatProvider, AddonModChatMessageWithUserData } from '../../providers/chat';
-import { AddonModChatHelperProvider } from '../../providers/helper';
+import { AddonModChatProvider } from '../../providers/chat';
+import { AddonModChatHelperProvider, AddonModChatMessageForView } from '../../providers/helper';
 import { Network } from '@ionic-native/network';
 import { coreSlideInOut } from '@classes/animations';
 import { CoreSendMessageFormComponent } from '@components/send-message-form/send-message-form';
@@ -41,7 +40,7 @@ export class AddonModChatChatPage {
 
     loaded = false;
     title: string;
-    messages: AddonModChatMessageWithUserData[] = [];
+    messages: AddonModChatMessageForView[] = [];
     newMessage: string;
     polling: any;
     isOnline: boolean;
@@ -203,7 +202,7 @@ export class AddonModChatChatPage {
             return this.chatProvider.getMessagesUserData(messagesInfo.messages, this.courseId).then((messages) => {
                 if (messages.length) {
                     const previousLength = this.messages.length;
-                    this.messages = this.messages.concat(<AddonModChatMessageWithUserData[]> messages);
+                    this.messages = this.messages.concat(<AddonModChatMessageForView[]> messages);
 
                     // Calculate which messages need to display the date or user data.
                     for (let index = previousLength ; index < this.messages.length; index++) {
@@ -212,9 +211,9 @@ export class AddonModChatChatPage {
 
                         this.chatHelper.formatMessage(this.currentUserId, message, prevMessage);
 
-                        if (message.beep && message.beep != this.currentUserId) {
+                        if (message.beep && message.beep != this.currentUserId + '') {
                             this.getUserFullname(message.beep).then((fullname) => {
-                                message.beepwho = fullname;
+                                message.beepWho = fullname;
                             });
                         }
                     }
diff --git a/src/addon/mod/chat/pages/session-messages/session-messages.html b/src/addon/mod/chat/pages/session-messages/session-messages.html
index 1383e37e0..1f2a2ce14 100644
--- a/src/addon/mod/chat/pages/session-messages/session-messages.html
+++ b/src/addon/mod/chat/pages/session-messages/session-messages.html
@@ -35,7 +35,7 @@
 
                     <ion-badge text-wrap color="light" *ngIf="message.userid == currentUserId && message.beep && message.beep != 'all'">
                         <span><ion-icon name="notifications"></ion-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
-                        {{ 'addon.mod_chat.messageyoubeep' | translate:{$a: message.beepwho} }} </span>
+                        {{ 'addon.mod_chat.messageyoubeep' | translate:{$a: message.beepWho} }} </span>
                     </ion-badge>
 
                     <ion-badge text-wrap color="info" *ngIf="!message.issystem && !message.beep">
diff --git a/src/addon/mod/chat/pages/session-messages/session-messages.scss b/src/addon/mod/chat/pages/session-messages/session-messages.scss
index ec4792983..ef01df6e2 100644
--- a/src/addon/mod/chat/pages/session-messages/session-messages.scss
+++ b/src/addon/mod/chat/pages/session-messages/session-messages.scss
@@ -1,4 +1,4 @@
-ion-app.app-root page-addon-mod-chat-session-messages {
+ion-app.app-root page-addon-mod-chat-session-messages.ion-page {
     @include message-page();
 
     .addon-mod-chat-notice {
diff --git a/src/addon/mod/chat/pages/session-messages/session-messages.ts b/src/addon/mod/chat/pages/session-messages/session-messages.ts
index 3696a65c9..a70eda770 100644
--- a/src/addon/mod/chat/pages/session-messages/session-messages.ts
+++ b/src/addon/mod/chat/pages/session-messages/session-messages.ts
@@ -17,8 +17,8 @@ import { IonicPage, NavParams } from 'ionic-angular';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreUserProvider } from '@core/user/providers/user';
-import { AddonModChatProvider, AddonModChatSessionMessageWithUserData } from '../../providers/chat';
-import { AddonModChatHelperProvider } from '../../providers/helper';
+import { AddonModChatProvider } from '../../providers/chat';
+import { AddonModChatHelperProvider, AddonModChatSessionMessageForView } from '../../providers/helper';
 
 /**
  * Page that displays list of chat session messages.
@@ -38,7 +38,7 @@ export class AddonModChatSessionMessagesPage {
     protected sessionEnd: number;
     protected groupId: number;
     protected loaded = false;
-    protected messages: AddonModChatSessionMessageWithUserData[] = [];
+    protected messages: AddonModChatSessionMessageForView[] = [];
 
     constructor(navParams: NavParams, private domUtils: CoreDomUtilsProvider, private chatProvider: AddonModChatProvider,
         sitesProvider: CoreSitesProvider, private chatHelper: AddonModChatHelperProvider, private userProvider: CoreUserProvider) {
@@ -61,7 +61,25 @@ export class AddonModChatSessionMessagesPage {
         return this.chatProvider.getSessionMessages(this.chatId, this.sessionStart, this.sessionEnd, this.groupId)
                 .then((messages) => {
             return this.chatProvider.getMessagesUserData(messages, this.courseId).then((messages) => {
+                this.messages = <AddonModChatSessionMessageForView[]> messages;
 
+                if (messages.length) {
+                    // Calculate which messages need to display the date or user data.
+                    for (let index = 0 ; index < this.messages.length; index++) {
+                        const message = this.messages[index];
+                        const prevMessage = index > 0 ? this.messages[index - 1] : null;
+
+                        this.chatHelper.formatMessage(this.currentUserId, message, prevMessage);
+
+                        if (message.beep && message.beep != this.currentUserId + '') {
+                            this.getUserFullname(message.beep).then((fullname) => {
+                                message.beepWho = fullname;
+                            });
+                        }
+                    }
+
+                    this.messages[this.messages.length - 1].showTail = true;
+                }
             });
         }).catch((error) => {
             this.domUtils.showErrorModalDefault(error, 'core.errorloadingcontent', true);
diff --git a/src/addon/mod/chat/providers/chat.ts b/src/addon/mod/chat/providers/chat.ts
index f656375a7..45a102a06 100644
--- a/src/addon/mod/chat/providers/chat.ts
+++ b/src/addon/mod/chat/providers/chat.ts
@@ -20,6 +20,7 @@ import { CoreCourseLogHelperProvider } from '@core/course/providers/log-helper';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreWSExternalWarning, CoreWSExternalFile } from '@providers/ws';
+import { AddonModChatMessageForView, AddonModChatSessionMessageForView } from './helper';
 
 /**
  * Service that provides some features for chats.
@@ -157,9 +158,9 @@ export class AddonModChatProvider {
      * @return Promise always resolved with the formatted messages.
      */
     getMessagesUserData(messages: (AddonModChatMessage | AddonModChatSessionMessage)[], courseId: number)
-            : Promise<(AddonModChatMessageWithUserData | AddonModChatSessionMessageWithUserData)[]> {
+            : Promise<(AddonModChatMessageForView | AddonModChatSessionMessageForView)[]> {
 
-        const promises = messages.map((message: AddonModChatMessageWithUserData | AddonModChatSessionMessageWithUserData) => {
+        const promises = messages.map((message: AddonModChatMessageForView | AddonModChatSessionMessageForView) => {
             return this.userProvider.getProfile(message.userid, courseId, true).then((user) => {
                 message.userfullname = user.fullname;
                 message.userprofileimageurl = user.profileimageurl;
@@ -448,7 +449,7 @@ export type AddonModChatMessage = {
 };
 
 /**
- * Message with user data
+ * Message with user data.
  */
 export type AddonModChatMessageWithUserData = AddonModChatMessage & AddonModChatMessageUserData;
 
@@ -484,7 +485,7 @@ export type AddonModChatSessionMessage = {
 };
 
 /**
- * Message with user data
+ * Session message with user data.
  */
 export type AddonModChatSessionMessageWithUserData = AddonModChatSessionMessage & AddonModChatMessageUserData;
 
diff --git a/src/addon/mod/chat/providers/helper.ts b/src/addon/mod/chat/providers/helper.ts
index 9c88bed68..c575b64a7 100644
--- a/src/addon/mod/chat/providers/helper.ts
+++ b/src/addon/mod/chat/providers/helper.ts
@@ -16,10 +16,10 @@ import { Injectable } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
 import * as moment from 'moment';
-import AddonModChatMessageWithUserData from './chat';
+import { AddonModChatMessageWithUserData, AddonModChatSessionMessageWithUserData } from './chat';
 
 /**
- * Helper service that provides some features for quiz.
+ * Helper service that provides some features for chat.
  */
 @Injectable()
 export class AddonModChatHelperProvider {
@@ -39,14 +39,15 @@ export class AddonModChatHelperProvider {
      * @param  prevMessage Previous Message in a discussion (if any).
      * @return Message with additional info.
      */
-    formatMessage(currentUserId: number, message: AddonModChatMessageWithUserData,
-            prevMessage?: AddonModChatMessageWithUserData): any {
+    formatMessage(currentUserId: number, message: AddonModChatMessageForView | AddonModChatSessionMessageForView,
+            prevMessage?: AddonModChatMessageForView | AddonModChatSessionMessageForView): any {
         message.message = message.message.trim();
 
         message.showDate = this.showDate(message, prevMessage);
         message.beep = message.message.substr(0, 5) == 'beep ' && message.message.substr(5).trim();
 
-        message.special = message.issystem || message.system || !!message.beep;
+        message.special = (<AddonModChatSessionMessageForView> message).issystem || (<AddonModChatMessageForView> message).system ||
+            !!message.beep;
 
         if (message.message.substr(0, 4) == '/me ') {
             message.special = true;
@@ -72,7 +73,8 @@ export class AddonModChatHelperProvider {
      * @param prevMessage Previous message.
      * @return Whether user data should be shown.
      */
-    protected showUserData(currentUserId: number, message: any, prevMessage?: any): boolean {
+    protected showUserData(currentUserId: number, message: AddonModChatMessageForView | AddonModChatSessionMessageForView,
+            prevMessage?: AddonModChatMessageForView | AddonModChatSessionMessageForView): boolean {
         return message.userid != currentUserId &&
             (!prevMessage || prevMessage.userid != message.userid || message.showDate || prevMessage.special);
     }
@@ -84,7 +86,8 @@ export class AddonModChatHelperProvider {
      * @param nextMessage Next message.
      * @return Whether user data should be shown.
      */
-    protected showTail(message: AddonModChatMessageWithUserData, nextMessage?: AddonModChatMessageWithUserData): boolean {
+    protected showTail(message: AddonModChatMessageForView | AddonModChatSessionMessageForView,
+            nextMessage?: AddonModChatMessageForView | AddonModChatSessionMessageForView): boolean {
         return !nextMessage || nextMessage.userid != message.userid || nextMessage.showDate || nextMessage.special;
     }
 
@@ -95,7 +98,8 @@ export class AddonModChatHelperProvider {
      * @param  prevMessage Previous message object.
      * @return True if messages are from diferent days, false othetwise.
      */
-    protected showDate(message: AddonModChatMessageWithUserData, prevMessage: AddonModChatMessageWithUserData): boolean {
+    protected showDate(message: AddonModChatMessageForView | AddonModChatSessionMessageForView,
+            prevMessage: AddonModChatMessageForView | AddonModChatSessionMessageForView): boolean {
         if (!prevMessage) {
             return true;
         }
@@ -104,3 +108,25 @@ export class AddonModChatHelperProvider {
         return !moment(message.timestamp * 1000).isSame(prevMessage.timestamp * 1000, 'day');
     }
 }
+
+/**
+ * Special info for view usage.
+ */
+type AddonModChatInfoForView = {
+    showDate?: boolean; // If date should be displayed before the message.
+    beep?: string; // User id of the beeped user or 'all'.
+    special?: boolean; // True if is an special message (system, beep or command).
+    showUserData?: boolean; // If user data should be displayed.
+    showTail?: boolean; // If tail should be displayed (decoration).
+    beepWho?: string; // Fullname of the beeped user.
+};
+
+/**
+ * Message with data for view usage.
+ */
+export type AddonModChatMessageForView = AddonModChatMessageWithUserData & AddonModChatInfoForView;
+
+/**
+ * Session message with data for view usage.
+ */
+export type AddonModChatSessionMessageForView = AddonModChatSessionMessageWithUserData & AddonModChatInfoForView;
diff --git a/src/components/send-message-form/send-message-form.ts b/src/components/send-message-form/send-message-form.ts
index ac7f82578..7076f0d4f 100644
--- a/src/components/send-message-form/send-message-form.ts
+++ b/src/components/send-message-form/send-message-form.ts
@@ -19,7 +19,6 @@ import { CoreEventsProvider } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
-import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreConstants } from '@core/constants';
 
 /**
@@ -47,8 +46,7 @@ export class CoreSendMessageFormComponent implements OnInit {
     protected sendOnEnter: boolean;
 
     constructor(private utils: CoreUtilsProvider, private textUtils: CoreTextUtilsProvider, configProvider: CoreConfigProvider,
-            eventsProvider: CoreEventsProvider, sitesProvider: CoreSitesProvider, private appProvider: CoreAppProvider,
-            private domUtils: CoreDomUtilsProvider) {
+            eventsProvider: CoreEventsProvider, sitesProvider: CoreSitesProvider, private appProvider: CoreAppProvider) {
 
         this.onSubmit = new EventEmitter();
         this.onResize = new EventEmitter();
diff --git a/src/theme/dark.scss b/src/theme/dark.scss
index 27800e723..fe18c049a 100644
--- a/src/theme/dark.scss
+++ b/src/theme/dark.scss
@@ -21,7 +21,7 @@ ion-app.app-root .ion-page {
     color: $core-dark-text-color;
     background-color: $core-dark-item-bg-color;
 
-    a {
+    a:not(.button) {
       color: $core-dark-link-color;
     }
 

From a809f624fede880734998b69889d231966eda3b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 26 Sep 2019 12:43:29 +0200
Subject: [PATCH 059/257] MOBILE-3175 other: Change Copyright author

---
 MainActivity.java                                               | 2 +-
 NOTICE                                                          | 2 +-
 gulpfile.js                                                     | 2 +-
 src/addon/badges/badges.module.ts                               | 2 +-
 src/addon/badges/pages/issued-badge/issued-badge.module.ts      | 2 +-
 src/addon/badges/pages/issued-badge/issued-badge.ts             | 2 +-
 src/addon/badges/pages/user-badges/user-badges.module.ts        | 2 +-
 src/addon/badges/pages/user-badges/user-badges.ts               | 2 +-
 src/addon/badges/providers/badge-link-handler.ts                | 2 +-
 src/addon/badges/providers/badges.ts                            | 2 +-
 src/addon/badges/providers/mybadges-link-handler.ts             | 2 +-
 src/addon/badges/providers/push-click-handler.ts                | 2 +-
 src/addon/badges/providers/user-handler.ts                      | 2 +-
 src/addon/block/activitymodules/activitymodules.module.ts       | 2 +-
 .../components/activitymodules/activitymodules.ts               | 2 +-
 src/addon/block/activitymodules/components/components.module.ts | 2 +-
 src/addon/block/activitymodules/providers/block-handler.ts      | 2 +-
 src/addon/block/badges/badges.module.ts                         | 2 +-
 src/addon/block/badges/providers/block-handler.ts               | 2 +-
 src/addon/block/blogmenu/blogmenu.module.ts                     | 2 +-
 src/addon/block/blogmenu/providers/block-handler.ts             | 2 +-
 src/addon/block/blogrecent/blogrecent.module.ts                 | 2 +-
 src/addon/block/blogrecent/providers/block-handler.ts           | 2 +-
 src/addon/block/blogtags/blogtags.module.ts                     | 2 +-
 src/addon/block/blogtags/providers/block-handler.ts             | 2 +-
 src/addon/block/calendarmonth/calendarmonth.module.ts           | 2 +-
 src/addon/block/calendarmonth/providers/block-handler.ts        | 2 +-
 src/addon/block/calendarupcoming/calendarupcoming.module.ts     | 2 +-
 src/addon/block/calendarupcoming/providers/block-handler.ts     | 2 +-
 src/addon/block/comments/comments.module.ts                     | 2 +-
 src/addon/block/comments/providers/block-handler.ts             | 2 +-
 src/addon/block/completionstatus/completionstatus.module.ts     | 2 +-
 src/addon/block/completionstatus/providers/block-handler.ts     | 2 +-
 src/addon/block/glossaryrandom/glossaryrandom.module.ts         | 2 +-
 src/addon/block/glossaryrandom/providers/block-handler.ts       | 2 +-
 src/addon/block/html/html.module.ts                             | 2 +-
 src/addon/block/html/providers/block-handler.ts                 | 2 +-
 src/addon/block/learningplans/learningplans.module.ts           | 2 +-
 src/addon/block/learningplans/providers/block-handler.ts        | 2 +-
 src/addon/block/myoverview/components/components.module.ts      | 2 +-
 src/addon/block/myoverview/components/myoverview/myoverview.ts  | 2 +-
 src/addon/block/myoverview/myoverview.module.ts                 | 2 +-
 src/addon/block/myoverview/providers/block-handler.ts           | 2 +-
 src/addon/block/newsitems/newsitems.module.ts                   | 2 +-
 src/addon/block/newsitems/providers/block-handler.ts            | 2 +-
 src/addon/block/onlineusers/onlineusers.module.ts               | 2 +-
 src/addon/block/onlineusers/providers/block-handler.ts          | 2 +-
 src/addon/block/privatefiles/privatefiles.module.ts             | 2 +-
 src/addon/block/privatefiles/providers/block-handler.ts         | 2 +-
 src/addon/block/recentactivity/providers/block-handler.ts       | 2 +-
 src/addon/block/recentactivity/recentactivity.module.ts         | 2 +-
 .../recentlyaccessedcourses/components/components.module.ts     | 2 +-
 .../recentlyaccessedcourses/recentlyaccessedcourses.ts          | 2 +-
 .../block/recentlyaccessedcourses/providers/block-handler.ts    | 2 +-
 .../recentlyaccessedcourses/recentlyaccessedcourses.module.ts   | 2 +-
 .../block/recentlyaccesseditems/components/components.module.ts | 2 +-
 .../components/recentlyaccesseditems/recentlyaccesseditems.ts   | 2 +-
 .../block/recentlyaccesseditems/providers/block-handler.ts      | 2 +-
 .../recentlyaccesseditems/providers/recentlyaccesseditems.ts    | 2 +-
 .../block/recentlyaccesseditems/recentlyaccesseditems.module.ts | 2 +-
 src/addon/block/rssclient/providers/block-handler.ts            | 2 +-
 src/addon/block/rssclient/rssclient.module.ts                   | 2 +-
 src/addon/block/selfcompletion/providers/block-handler.ts       | 2 +-
 src/addon/block/selfcompletion/selfcompletion.module.ts         | 2 +-
 src/addon/block/sitemainmenu/components/components.module.ts    | 2 +-
 .../block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts  | 2 +-
 src/addon/block/sitemainmenu/providers/block-handler.ts         | 2 +-
 src/addon/block/sitemainmenu/sitemainmenu.module.ts             | 2 +-
 src/addon/block/starredcourses/components/components.module.ts  | 2 +-
 .../starredcourses/components/starredcourses/starredcourses.ts  | 2 +-
 src/addon/block/starredcourses/providers/block-handler.ts       | 2 +-
 src/addon/block/starredcourses/starredcourses.module.ts         | 2 +-
 src/addon/block/tags/providers/block-handler.ts                 | 2 +-
 src/addon/block/tags/tags.module.ts                             | 2 +-
 src/addon/block/timeline/components/components.module.ts        | 2 +-
 src/addon/block/timeline/components/events/events.ts            | 2 +-
 src/addon/block/timeline/components/timeline/timeline.ts        | 2 +-
 src/addon/block/timeline/providers/block-handler.ts             | 2 +-
 src/addon/block/timeline/providers/timeline.ts                  | 2 +-
 src/addon/block/timeline/timeline.module.ts                     | 2 +-
 src/addon/blog/blog.module.ts                                   | 2 +-
 src/addon/blog/components/components.module.ts                  | 2 +-
 src/addon/blog/components/entries/entries.ts                    | 2 +-
 src/addon/blog/pages/entries/entries.module.ts                  | 2 +-
 src/addon/blog/pages/entries/entries.ts                         | 2 +-
 src/addon/blog/providers/blog.ts                                | 2 +-
 src/addon/blog/providers/course-option-handler.ts               | 2 +-
 src/addon/blog/providers/index-link-handler.ts                  | 2 +-
 src/addon/blog/providers/mainmenu-handler.ts                    | 2 +-
 src/addon/blog/providers/tag-area-handler.ts                    | 2 +-
 src/addon/blog/providers/user-handler.ts                        | 2 +-
 src/addon/calendar/calendar.module.ts                           | 2 +-
 src/addon/calendar/components/calendar/calendar.ts              | 2 +-
 src/addon/calendar/components/components.module.ts              | 2 +-
 .../calendar/components/upcoming-events/upcoming-events.ts      | 2 +-
 src/addon/calendar/pages/day/day.module.ts                      | 2 +-
 src/addon/calendar/pages/day/day.ts                             | 2 +-
 src/addon/calendar/pages/edit-event/edit-event.module.ts        | 2 +-
 src/addon/calendar/pages/edit-event/edit-event.ts               | 2 +-
 src/addon/calendar/pages/event/event.module.ts                  | 2 +-
 src/addon/calendar/pages/event/event.ts                         | 2 +-
 src/addon/calendar/pages/index/index.module.ts                  | 2 +-
 src/addon/calendar/pages/index/index.ts                         | 2 +-
 src/addon/calendar/pages/list/list.module.ts                    | 2 +-
 src/addon/calendar/pages/list/list.ts                           | 2 +-
 src/addon/calendar/pages/settings/settings.module.ts            | 2 +-
 src/addon/calendar/pages/settings/settings.ts                   | 2 +-
 src/addon/calendar/providers/calendar-offline.ts                | 2 +-
 src/addon/calendar/providers/calendar-sync.ts                   | 2 +-
 src/addon/calendar/providers/calendar.ts                        | 2 +-
 src/addon/calendar/providers/helper.ts                          | 2 +-
 src/addon/calendar/providers/mainmenu-handler.ts                | 2 +-
 src/addon/calendar/providers/sync-cron-handler.ts               | 2 +-
 src/addon/calendar/providers/view-link-handler.ts               | 2 +-
 src/addon/competency/competency.module.ts                       | 2 +-
 src/addon/competency/components/components.module.ts            | 2 +-
 src/addon/competency/components/course/course.ts                | 2 +-
 src/addon/competency/pages/competencies/competencies.module.ts  | 2 +-
 src/addon/competency/pages/competencies/competencies.ts         | 2 +-
 src/addon/competency/pages/competency/competency.module.ts      | 2 +-
 src/addon/competency/pages/competency/competency.ts             | 2 +-
 .../pages/competencysummary/competencysummary.module.ts         | 2 +-
 .../competency/pages/competencysummary/competencysummary.ts     | 2 +-
 .../pages/coursecompetencies/coursecompetencies.module.ts       | 2 +-
 .../competency/pages/coursecompetencies/coursecompetencies.ts   | 2 +-
 src/addon/competency/pages/plan/plan.module.ts                  | 2 +-
 src/addon/competency/pages/plan/plan.ts                         | 2 +-
 src/addon/competency/pages/planlist/planlist.module.ts          | 2 +-
 src/addon/competency/pages/planlist/planlist.ts                 | 2 +-
 src/addon/competency/providers/competency-link-handler.ts       | 2 +-
 src/addon/competency/providers/competency.ts                    | 2 +-
 src/addon/competency/providers/course-option-handler.ts         | 2 +-
 src/addon/competency/providers/helper.ts                        | 2 +-
 src/addon/competency/providers/mainmenu-handler.ts              | 2 +-
 src/addon/competency/providers/plan-link-handler.ts             | 2 +-
 src/addon/competency/providers/plans-link-handler.ts            | 2 +-
 src/addon/competency/providers/push-click-handler.ts            | 2 +-
 src/addon/competency/providers/user-competency-link-handler.ts  | 2 +-
 src/addon/competency/providers/user-handler.ts                  | 2 +-
 src/addon/coursecompletion/components/components.module.ts      | 2 +-
 src/addon/coursecompletion/components/report/report.ts          | 2 +-
 src/addon/coursecompletion/coursecompletion.module.ts           | 2 +-
 src/addon/coursecompletion/pages/report/report.module.ts        | 2 +-
 src/addon/coursecompletion/pages/report/report.ts               | 2 +-
 src/addon/coursecompletion/providers/course-option-handler.ts   | 2 +-
 src/addon/coursecompletion/providers/coursecompletion.ts        | 2 +-
 src/addon/coursecompletion/providers/user-handler.ts            | 2 +-
 src/addon/files/files.module.ts                                 | 2 +-
 src/addon/files/pages/list/list.module.ts                       | 2 +-
 src/addon/files/pages/list/list.ts                              | 2 +-
 src/addon/files/providers/files.ts                              | 2 +-
 src/addon/files/providers/helper.ts                             | 2 +-
 src/addon/files/providers/mainmenu-handler.ts                   | 2 +-
 src/addon/messageoutput/airnotifier/airnotifier.module.ts       | 2 +-
 .../messageoutput/airnotifier/pages/devices/devices.module.ts   | 2 +-
 src/addon/messageoutput/airnotifier/pages/devices/devices.ts    | 2 +-
 src/addon/messageoutput/airnotifier/providers/airnotifier.ts    | 2 +-
 src/addon/messageoutput/airnotifier/providers/handler.ts        | 2 +-
 src/addon/messageoutput/messageoutput.module.ts                 | 2 +-
 src/addon/messageoutput/providers/delegate.ts                   | 2 +-
 src/addon/messages/components/components.module.ts              | 2 +-
 .../components/confirmed-contacts/confirmed-contacts.ts         | 2 +-
 .../messages/components/contact-requests/contact-requests.ts    | 2 +-
 src/addon/messages/components/contacts/contacts.ts              | 2 +-
 src/addon/messages/components/discussions/discussions.ts        | 2 +-
 src/addon/messages/messages.module.ts                           | 2 +-
 src/addon/messages/pages/contacts/contacts.module.ts            | 2 +-
 src/addon/messages/pages/contacts/contacts.ts                   | 2 +-
 .../pages/conversation-info/conversation-info.module.ts         | 2 +-
 src/addon/messages/pages/conversation-info/conversation-info.ts | 2 +-
 src/addon/messages/pages/discussion/discussion.module.ts        | 2 +-
 src/addon/messages/pages/discussion/discussion.ts               | 2 +-
 .../pages/group-conversations/group-conversations.module.ts     | 2 +-
 .../messages/pages/group-conversations/group-conversations.ts   | 2 +-
 src/addon/messages/pages/index/index.module.ts                  | 2 +-
 src/addon/messages/pages/index/index.ts                         | 2 +-
 src/addon/messages/pages/search/search.module.ts                | 2 +-
 src/addon/messages/pages/search/search.ts                       | 2 +-
 src/addon/messages/pages/settings/settings.module.ts            | 2 +-
 src/addon/messages/pages/settings/settings.ts                   | 2 +-
 src/addon/messages/providers/contact-request-link-handler.ts    | 2 +-
 src/addon/messages/providers/discussion-link-handler.ts         | 2 +-
 src/addon/messages/providers/index-link-handler.ts              | 2 +-
 src/addon/messages/providers/mainmenu-handler.ts                | 2 +-
 src/addon/messages/providers/messages-offline.ts                | 2 +-
 src/addon/messages/providers/messages.ts                        | 2 +-
 src/addon/messages/providers/push-click-handler.ts              | 2 +-
 src/addon/messages/providers/settings-handler.ts                | 2 +-
 src/addon/messages/providers/sync-cron-handler.ts               | 2 +-
 src/addon/messages/providers/sync.ts                            | 2 +-
 src/addon/messages/providers/user-add-contact-handler.ts        | 2 +-
 src/addon/messages/providers/user-block-contact-handler.ts      | 2 +-
 src/addon/messages/providers/user-send-message-handler.ts       | 2 +-
 src/addon/mod/assign/assign.module.ts                           | 2 +-
 src/addon/mod/assign/classes/base-feedback-handler.ts           | 2 +-
 src/addon/mod/assign/classes/base-submission-handler.ts         | 2 +-
 src/addon/mod/assign/classes/feedback-plugin-component.ts       | 2 +-
 src/addon/mod/assign/classes/submission-plugin-component.ts     | 2 +-
 src/addon/mod/assign/components/components.module.ts            | 2 +-
 .../mod/assign/components/feedback-plugin/feedback-plugin.ts    | 2 +-
 src/addon/mod/assign/components/index/index.ts                  | 2 +-
 .../assign/components/submission-plugin/submission-plugin.ts    | 2 +-
 src/addon/mod/assign/components/submission/submission.ts        | 2 +-
 src/addon/mod/assign/feedback/comments/comments.module.ts       | 2 +-
 src/addon/mod/assign/feedback/comments/component/comments.ts    | 2 +-
 src/addon/mod/assign/feedback/comments/providers/handler.ts     | 2 +-
 src/addon/mod/assign/feedback/editpdf/component/editpdf.ts      | 2 +-
 src/addon/mod/assign/feedback/editpdf/editpdf.module.ts         | 2 +-
 src/addon/mod/assign/feedback/editpdf/providers/handler.ts      | 2 +-
 src/addon/mod/assign/feedback/feedback.module.ts                | 2 +-
 src/addon/mod/assign/feedback/file/component/file.ts            | 2 +-
 src/addon/mod/assign/feedback/file/file.module.ts               | 2 +-
 src/addon/mod/assign/feedback/file/providers/handler.ts         | 2 +-
 .../pages/edit-feedback-modal/edit-feedback-modal.module.ts     | 2 +-
 .../mod/assign/pages/edit-feedback-modal/edit-feedback-modal.ts | 2 +-
 src/addon/mod/assign/pages/edit/edit.module.ts                  | 2 +-
 src/addon/mod/assign/pages/edit/edit.ts                         | 2 +-
 src/addon/mod/assign/pages/index/index.module.ts                | 2 +-
 src/addon/mod/assign/pages/index/index.ts                       | 2 +-
 .../mod/assign/pages/submission-list/submission-list.module.ts  | 2 +-
 src/addon/mod/assign/pages/submission-list/submission-list.ts   | 2 +-
 .../assign/pages/submission-review/submission-review.module.ts  | 2 +-
 .../mod/assign/pages/submission-review/submission-review.ts     | 2 +-
 src/addon/mod/assign/providers/assign-offline.ts                | 2 +-
 src/addon/mod/assign/providers/assign-sync.ts                   | 2 +-
 src/addon/mod/assign/providers/assign.ts                        | 2 +-
 src/addon/mod/assign/providers/default-feedback-handler.ts      | 2 +-
 src/addon/mod/assign/providers/default-submission-handler.ts    | 2 +-
 src/addon/mod/assign/providers/feedback-delegate.ts             | 2 +-
 src/addon/mod/assign/providers/helper.ts                        | 2 +-
 src/addon/mod/assign/providers/index-link-handler.ts            | 2 +-
 src/addon/mod/assign/providers/list-link-handler.ts             | 2 +-
 src/addon/mod/assign/providers/module-handler.ts                | 2 +-
 src/addon/mod/assign/providers/prefetch-handler.ts              | 2 +-
 src/addon/mod/assign/providers/push-click-handler.ts            | 2 +-
 src/addon/mod/assign/providers/submission-delegate.ts           | 2 +-
 src/addon/mod/assign/providers/sync-cron-handler.ts             | 2 +-
 src/addon/mod/assign/submission/comments/comments.module.ts     | 2 +-
 src/addon/mod/assign/submission/comments/component/comments.ts  | 2 +-
 src/addon/mod/assign/submission/comments/providers/handler.ts   | 2 +-
 src/addon/mod/assign/submission/file/component/file.ts          | 2 +-
 src/addon/mod/assign/submission/file/file.module.ts             | 2 +-
 src/addon/mod/assign/submission/file/providers/handler.ts       | 2 +-
 .../mod/assign/submission/onlinetext/component/onlinetext.ts    | 2 +-
 src/addon/mod/assign/submission/onlinetext/onlinetext.module.ts | 2 +-
 src/addon/mod/assign/submission/onlinetext/providers/handler.ts | 2 +-
 src/addon/mod/assign/submission/submission.module.ts            | 2 +-
 src/addon/mod/book/book.module.ts                               | 2 +-
 src/addon/mod/book/components/components.module.ts              | 2 +-
 src/addon/mod/book/components/index/index.ts                    | 2 +-
 src/addon/mod/book/pages/index/index.module.ts                  | 2 +-
 src/addon/mod/book/pages/index/index.ts                         | 2 +-
 src/addon/mod/book/pages/toc/toc.module.ts                      | 2 +-
 src/addon/mod/book/pages/toc/toc.ts                             | 2 +-
 src/addon/mod/book/providers/book.ts                            | 2 +-
 src/addon/mod/book/providers/link-handler.ts                    | 2 +-
 src/addon/mod/book/providers/list-link-handler.ts               | 2 +-
 src/addon/mod/book/providers/module-handler.ts                  | 2 +-
 src/addon/mod/book/providers/prefetch-handler.ts                | 2 +-
 src/addon/mod/book/providers/tag-area-handler.ts                | 2 +-
 src/addon/mod/chat/chat.module.ts                               | 2 +-
 src/addon/mod/chat/components/components.module.ts              | 2 +-
 src/addon/mod/chat/components/index/index.ts                    | 2 +-
 src/addon/mod/chat/pages/chat/chat.module.ts                    | 2 +-
 src/addon/mod/chat/pages/chat/chat.ts                           | 2 +-
 src/addon/mod/chat/pages/index/index.module.ts                  | 2 +-
 src/addon/mod/chat/pages/index/index.ts                         | 2 +-
 .../mod/chat/pages/session-messages/session-messages.module.ts  | 2 +-
 src/addon/mod/chat/pages/session-messages/session-messages.ts   | 2 +-
 src/addon/mod/chat/pages/sessions/sessions.module.ts            | 2 +-
 src/addon/mod/chat/pages/sessions/sessions.ts                   | 2 +-
 src/addon/mod/chat/pages/users/users.module.ts                  | 2 +-
 src/addon/mod/chat/pages/users/users.ts                         | 2 +-
 src/addon/mod/chat/providers/chat.ts                            | 2 +-
 src/addon/mod/chat/providers/helper.ts                          | 2 +-
 src/addon/mod/chat/providers/link-handler.ts                    | 2 +-
 src/addon/mod/chat/providers/list-link-handler.ts               | 2 +-
 src/addon/mod/chat/providers/module-handler.ts                  | 2 +-
 src/addon/mod/chat/providers/prefetch-handler.ts                | 2 +-
 src/addon/mod/choice/choice.module.ts                           | 2 +-
 src/addon/mod/choice/components/components.module.ts            | 2 +-
 src/addon/mod/choice/components/index/index.ts                  | 2 +-
 src/addon/mod/choice/pages/index/index.module.ts                | 2 +-
 src/addon/mod/choice/pages/index/index.ts                       | 2 +-
 src/addon/mod/choice/providers/choice.ts                        | 2 +-
 src/addon/mod/choice/providers/link-handler.ts                  | 2 +-
 src/addon/mod/choice/providers/list-link-handler.ts             | 2 +-
 src/addon/mod/choice/providers/module-handler.ts                | 2 +-
 src/addon/mod/choice/providers/offline.ts                       | 2 +-
 src/addon/mod/choice/providers/prefetch-handler.ts              | 2 +-
 src/addon/mod/choice/providers/sync-cron-handler.ts             | 2 +-
 src/addon/mod/choice/providers/sync.ts                          | 2 +-
 src/addon/mod/data/classes/field-plugin-component.ts            | 2 +-
 src/addon/mod/data/components/action/action.ts                  | 2 +-
 src/addon/mod/data/components/components.module.ts              | 2 +-
 src/addon/mod/data/components/field-plugin/field-plugin.ts      | 2 +-
 src/addon/mod/data/components/index/index.ts                    | 2 +-
 src/addon/mod/data/data.module.ts                               | 2 +-
 src/addon/mod/data/fields/checkbox/checkbox.module.ts           | 2 +-
 src/addon/mod/data/fields/checkbox/component/checkbox.ts        | 2 +-
 src/addon/mod/data/fields/checkbox/providers/handler.ts         | 2 +-
 src/addon/mod/data/fields/date/component/date.ts                | 2 +-
 src/addon/mod/data/fields/date/date.module.ts                   | 2 +-
 src/addon/mod/data/fields/date/providers/handler.ts             | 2 +-
 src/addon/mod/data/fields/field.module.ts                       | 2 +-
 src/addon/mod/data/fields/file/component/file.ts                | 2 +-
 src/addon/mod/data/fields/file/file.module.ts                   | 2 +-
 src/addon/mod/data/fields/file/providers/handler.ts             | 2 +-
 src/addon/mod/data/fields/latlong/component/latlong.ts          | 2 +-
 src/addon/mod/data/fields/latlong/latlong.module.ts             | 2 +-
 src/addon/mod/data/fields/latlong/providers/handler.ts          | 2 +-
 src/addon/mod/data/fields/menu/component/menu.ts                | 2 +-
 src/addon/mod/data/fields/menu/menu.module.ts                   | 2 +-
 src/addon/mod/data/fields/menu/providers/handler.ts             | 2 +-
 src/addon/mod/data/fields/multimenu/component/multimenu.ts      | 2 +-
 src/addon/mod/data/fields/multimenu/multimenu.module.ts         | 2 +-
 src/addon/mod/data/fields/multimenu/providers/handler.ts        | 2 +-
 src/addon/mod/data/fields/number/component/number.ts            | 2 +-
 src/addon/mod/data/fields/number/number.module.ts               | 2 +-
 src/addon/mod/data/fields/number/providers/handler.ts           | 2 +-
 src/addon/mod/data/fields/picture/component/picture.ts          | 2 +-
 src/addon/mod/data/fields/picture/picture.module.ts             | 2 +-
 src/addon/mod/data/fields/picture/providers/handler.ts          | 2 +-
 src/addon/mod/data/fields/radiobutton/component/radiobutton.ts  | 2 +-
 src/addon/mod/data/fields/radiobutton/providers/handler.ts      | 2 +-
 src/addon/mod/data/fields/radiobutton/radiobutton.module.ts     | 2 +-
 src/addon/mod/data/fields/text/component/text.ts                | 2 +-
 src/addon/mod/data/fields/text/providers/handler.ts             | 2 +-
 src/addon/mod/data/fields/text/text.module.ts                   | 2 +-
 src/addon/mod/data/fields/textarea/component/textarea.ts        | 2 +-
 src/addon/mod/data/fields/textarea/providers/handler.ts         | 2 +-
 src/addon/mod/data/fields/textarea/textarea.module.ts           | 2 +-
 src/addon/mod/data/fields/url/component/url.ts                  | 2 +-
 src/addon/mod/data/fields/url/providers/handler.ts              | 2 +-
 src/addon/mod/data/fields/url/url.module.ts                     | 2 +-
 src/addon/mod/data/pages/edit/edit.module.ts                    | 2 +-
 src/addon/mod/data/pages/edit/edit.ts                           | 2 +-
 src/addon/mod/data/pages/entry/entry.module.ts                  | 2 +-
 src/addon/mod/data/pages/entry/entry.ts                         | 2 +-
 src/addon/mod/data/pages/index/index.module.ts                  | 2 +-
 src/addon/mod/data/pages/index/index.ts                         | 2 +-
 src/addon/mod/data/pages/search/search.module.ts                | 2 +-
 src/addon/mod/data/pages/search/search.ts                       | 2 +-
 src/addon/mod/data/providers/approve-link-handler.ts            | 2 +-
 src/addon/mod/data/providers/data.ts                            | 2 +-
 src/addon/mod/data/providers/default-field-handler.ts           | 2 +-
 src/addon/mod/data/providers/delete-link-handler.ts             | 2 +-
 src/addon/mod/data/providers/edit-link-handler.ts               | 2 +-
 src/addon/mod/data/providers/fields-delegate.ts                 | 2 +-
 src/addon/mod/data/providers/helper.ts                          | 2 +-
 src/addon/mod/data/providers/link-handler.ts                    | 2 +-
 src/addon/mod/data/providers/list-link-handler.ts               | 2 +-
 src/addon/mod/data/providers/module-handler.ts                  | 2 +-
 src/addon/mod/data/providers/offline.ts                         | 2 +-
 src/addon/mod/data/providers/prefetch-handler.ts                | 2 +-
 src/addon/mod/data/providers/show-link-handler.ts               | 2 +-
 src/addon/mod/data/providers/sync-cron-handler.ts               | 2 +-
 src/addon/mod/data/providers/sync.ts                            | 2 +-
 src/addon/mod/data/providers/tag-area-handler.ts                | 2 +-
 src/addon/mod/feedback/components/components.module.ts          | 2 +-
 src/addon/mod/feedback/components/index/index.ts                | 2 +-
 src/addon/mod/feedback/feedback.module.ts                       | 2 +-
 src/addon/mod/feedback/pages/attempt/attempt.module.ts          | 2 +-
 src/addon/mod/feedback/pages/attempt/attempt.ts                 | 2 +-
 src/addon/mod/feedback/pages/form/form.module.ts                | 2 +-
 src/addon/mod/feedback/pages/form/form.ts                       | 2 +-
 src/addon/mod/feedback/pages/index/index.module.ts              | 2 +-
 src/addon/mod/feedback/pages/index/index.ts                     | 2 +-
 .../mod/feedback/pages/nonrespondents/nonrespondents.module.ts  | 2 +-
 src/addon/mod/feedback/pages/nonrespondents/nonrespondents.ts   | 2 +-
 src/addon/mod/feedback/pages/respondents/respondents.module.ts  | 2 +-
 src/addon/mod/feedback/pages/respondents/respondents.ts         | 2 +-
 src/addon/mod/feedback/providers/analysis-link-handler.ts       | 2 +-
 src/addon/mod/feedback/providers/complete-link-handler.ts       | 2 +-
 src/addon/mod/feedback/providers/feedback.ts                    | 2 +-
 src/addon/mod/feedback/providers/helper.ts                      | 2 +-
 src/addon/mod/feedback/providers/link-handler.ts                | 2 +-
 src/addon/mod/feedback/providers/list-link-handler.ts           | 2 +-
 src/addon/mod/feedback/providers/module-handler.ts              | 2 +-
 src/addon/mod/feedback/providers/offline.ts                     | 2 +-
 src/addon/mod/feedback/providers/prefetch-handler.ts            | 2 +-
 src/addon/mod/feedback/providers/print-link-handler.ts          | 2 +-
 src/addon/mod/feedback/providers/push-click-handler.ts          | 2 +-
 src/addon/mod/feedback/providers/show-entries-link-handler.ts   | 2 +-
 .../mod/feedback/providers/show-non-respondents-link-handler.ts | 2 +-
 src/addon/mod/feedback/providers/sync-cron-handler.ts           | 2 +-
 src/addon/mod/feedback/providers/sync.ts                        | 2 +-
 src/addon/mod/folder/components/components.module.ts            | 2 +-
 src/addon/mod/folder/components/index/index.ts                  | 2 +-
 src/addon/mod/folder/folder.module.ts                           | 2 +-
 src/addon/mod/folder/pages/index/index.module.ts                | 2 +-
 src/addon/mod/folder/pages/index/index.ts                       | 2 +-
 src/addon/mod/folder/providers/folder.ts                        | 2 +-
 src/addon/mod/folder/providers/helper.ts                        | 2 +-
 src/addon/mod/folder/providers/link-handler.ts                  | 2 +-
 src/addon/mod/folder/providers/list-link-handler.ts             | 2 +-
 src/addon/mod/folder/providers/module-handler.ts                | 2 +-
 src/addon/mod/folder/providers/pluginfile-handler.ts            | 2 +-
 src/addon/mod/folder/providers/prefetch-handler.ts              | 2 +-
 src/addon/mod/forum/components/components.module.ts             | 2 +-
 src/addon/mod/forum/components/index/index.ts                   | 2 +-
 src/addon/mod/forum/components/post/post.ts                     | 2 +-
 src/addon/mod/forum/forum.module.ts                             | 2 +-
 src/addon/mod/forum/pages/discussion/discussion.module.ts       | 2 +-
 src/addon/mod/forum/pages/discussion/discussion.ts              | 2 +-
 src/addon/mod/forum/pages/index/index.module.ts                 | 2 +-
 src/addon/mod/forum/pages/index/index.ts                        | 2 +-
 .../mod/forum/pages/new-discussion/new-discussion.module.ts     | 2 +-
 src/addon/mod/forum/pages/new-discussion/new-discussion.ts      | 2 +-
 .../pages/sort-order-selector/sort-order-selector.module.ts     | 2 +-
 .../mod/forum/pages/sort-order-selector/sort-order-selector.ts  | 2 +-
 src/addon/mod/forum/providers/discussion-link-handler.ts        | 2 +-
 src/addon/mod/forum/providers/forum.ts                          | 2 +-
 src/addon/mod/forum/providers/helper.ts                         | 2 +-
 src/addon/mod/forum/providers/index-link-handler.ts             | 2 +-
 src/addon/mod/forum/providers/list-link-handler.ts              | 2 +-
 src/addon/mod/forum/providers/module-handler.ts                 | 2 +-
 src/addon/mod/forum/providers/offline.ts                        | 2 +-
 src/addon/mod/forum/providers/post-link-handler.ts              | 2 +-
 src/addon/mod/forum/providers/prefetch-handler.ts               | 2 +-
 src/addon/mod/forum/providers/push-click-handler.ts             | 2 +-
 src/addon/mod/forum/providers/sync-cron-handler.ts              | 2 +-
 src/addon/mod/forum/providers/sync.ts                           | 2 +-
 src/addon/mod/forum/providers/tag-area-handler.ts               | 2 +-
 src/addon/mod/glossary/components/components.module.ts          | 2 +-
 src/addon/mod/glossary/components/index/index.ts                | 2 +-
 src/addon/mod/glossary/components/mode-picker/mode-picker.ts    | 2 +-
 src/addon/mod/glossary/glossary.module.ts                       | 2 +-
 src/addon/mod/glossary/pages/edit/edit.module.ts                | 2 +-
 src/addon/mod/glossary/pages/edit/edit.ts                       | 2 +-
 src/addon/mod/glossary/pages/entry/entry.module.ts              | 2 +-
 src/addon/mod/glossary/pages/entry/entry.ts                     | 2 +-
 src/addon/mod/glossary/pages/index/index.module.ts              | 2 +-
 src/addon/mod/glossary/pages/index/index.ts                     | 2 +-
 src/addon/mod/glossary/providers/edit-link-handler.ts           | 2 +-
 src/addon/mod/glossary/providers/entry-link-handler.ts          | 2 +-
 src/addon/mod/glossary/providers/glossary.ts                    | 2 +-
 src/addon/mod/glossary/providers/helper.ts                      | 2 +-
 src/addon/mod/glossary/providers/index-link-handler.ts          | 2 +-
 src/addon/mod/glossary/providers/list-link-handler.ts           | 2 +-
 src/addon/mod/glossary/providers/module-handler.ts              | 2 +-
 src/addon/mod/glossary/providers/offline.ts                     | 2 +-
 src/addon/mod/glossary/providers/prefetch-handler.ts            | 2 +-
 src/addon/mod/glossary/providers/sync-cron-handler.ts           | 2 +-
 src/addon/mod/glossary/providers/sync.ts                        | 2 +-
 src/addon/mod/glossary/providers/tag-area-handler.ts            | 2 +-
 src/addon/mod/imscp/components/components.module.ts             | 2 +-
 src/addon/mod/imscp/components/index/index.ts                   | 2 +-
 src/addon/mod/imscp/imscp.module.ts                             | 2 +-
 src/addon/mod/imscp/pages/index/index.module.ts                 | 2 +-
 src/addon/mod/imscp/pages/index/index.ts                        | 2 +-
 src/addon/mod/imscp/pages/toc/toc.module.ts                     | 2 +-
 src/addon/mod/imscp/pages/toc/toc.ts                            | 2 +-
 src/addon/mod/imscp/providers/imscp.ts                          | 2 +-
 src/addon/mod/imscp/providers/link-handler.ts                   | 2 +-
 src/addon/mod/imscp/providers/list-link-handler.ts              | 2 +-
 src/addon/mod/imscp/providers/module-handler.ts                 | 2 +-
 src/addon/mod/imscp/providers/pluginfile-handler.ts             | 2 +-
 src/addon/mod/imscp/providers/prefetch-handler.ts               | 2 +-
 src/addon/mod/label/label.module.ts                             | 2 +-
 src/addon/mod/label/providers/label.ts                          | 2 +-
 src/addon/mod/label/providers/link-handler.ts                   | 2 +-
 src/addon/mod/label/providers/module-handler.ts                 | 2 +-
 src/addon/mod/label/providers/prefetch-handler.ts               | 2 +-
 src/addon/mod/lesson/components/components.module.ts            | 2 +-
 src/addon/mod/lesson/components/index/index.ts                  | 2 +-
 src/addon/mod/lesson/lesson.module.ts                           | 2 +-
 src/addon/mod/lesson/pages/index/index.module.ts                | 2 +-
 src/addon/mod/lesson/pages/index/index.ts                       | 2 +-
 src/addon/mod/lesson/pages/menu-modal/menu-modal.module.ts      | 2 +-
 src/addon/mod/lesson/pages/menu-modal/menu-modal.ts             | 2 +-
 .../mod/lesson/pages/password-modal/password-modal.module.ts    | 2 +-
 src/addon/mod/lesson/pages/password-modal/password-modal.ts     | 2 +-
 src/addon/mod/lesson/pages/player/player.module.ts              | 2 +-
 src/addon/mod/lesson/pages/player/player.ts                     | 2 +-
 src/addon/mod/lesson/pages/user-retake/user-retake.module.ts    | 2 +-
 src/addon/mod/lesson/pages/user-retake/user-retake.ts           | 2 +-
 src/addon/mod/lesson/providers/grade-link-handler.ts            | 2 +-
 src/addon/mod/lesson/providers/helper.ts                        | 2 +-
 src/addon/mod/lesson/providers/index-link-handler.ts            | 2 +-
 src/addon/mod/lesson/providers/lesson-offline.ts                | 2 +-
 src/addon/mod/lesson/providers/lesson-sync.ts                   | 2 +-
 src/addon/mod/lesson/providers/lesson.ts                        | 2 +-
 src/addon/mod/lesson/providers/list-link-handler.ts             | 2 +-
 src/addon/mod/lesson/providers/module-handler.ts                | 2 +-
 src/addon/mod/lesson/providers/prefetch-handler.ts              | 2 +-
 src/addon/mod/lesson/providers/push-click-handler.ts            | 2 +-
 src/addon/mod/lesson/providers/report-link-handler.ts           | 2 +-
 src/addon/mod/lesson/providers/sync-cron-handler.ts             | 2 +-
 src/addon/mod/lti/components/components.module.ts               | 2 +-
 src/addon/mod/lti/components/index/index.ts                     | 2 +-
 src/addon/mod/lti/lti.module.ts                                 | 2 +-
 src/addon/mod/lti/pages/index/index.module.ts                   | 2 +-
 src/addon/mod/lti/pages/index/index.ts                          | 2 +-
 src/addon/mod/lti/providers/link-handler.ts                     | 2 +-
 src/addon/mod/lti/providers/list-link-handler.ts                | 2 +-
 src/addon/mod/lti/providers/lti.ts                              | 2 +-
 src/addon/mod/lti/providers/module-handler.ts                   | 2 +-
 src/addon/mod/page/components/components.module.ts              | 2 +-
 src/addon/mod/page/components/index/index.ts                    | 2 +-
 src/addon/mod/page/page.module.ts                               | 2 +-
 src/addon/mod/page/pages/index/index.module.ts                  | 2 +-
 src/addon/mod/page/pages/index/index.ts                         | 2 +-
 src/addon/mod/page/providers/helper.ts                          | 2 +-
 src/addon/mod/page/providers/link-handler.ts                    | 2 +-
 src/addon/mod/page/providers/list-link-handler.ts               | 2 +-
 src/addon/mod/page/providers/module-handler.ts                  | 2 +-
 src/addon/mod/page/providers/page.ts                            | 2 +-
 src/addon/mod/page/providers/pluginfile-handler.ts              | 2 +-
 src/addon/mod/page/providers/prefetch-handler.ts                | 2 +-
 .../delaybetweenattempts/delaybetweenattempts.module.ts         | 2 +-
 .../quiz/accessrules/delaybetweenattempts/providers/handler.ts  | 2 +-
 src/addon/mod/quiz/accessrules/ipaddress/ipaddress.module.ts    | 2 +-
 src/addon/mod/quiz/accessrules/ipaddress/providers/handler.ts   | 2 +-
 .../mod/quiz/accessrules/numattempts/numattempts.module.ts      | 2 +-
 src/addon/mod/quiz/accessrules/numattempts/providers/handler.ts | 2 +-
 .../accessrules/offlineattempts/component/offlineattempts.ts    | 2 +-
 .../quiz/accessrules/offlineattempts/offlineattempts.module.ts  | 2 +-
 .../mod/quiz/accessrules/offlineattempts/providers/handler.ts   | 2 +-
 .../mod/quiz/accessrules/openclosedate/openclosedate.module.ts  | 2 +-
 .../mod/quiz/accessrules/openclosedate/providers/handler.ts     | 2 +-
 src/addon/mod/quiz/accessrules/password/component/password.ts   | 2 +-
 src/addon/mod/quiz/accessrules/password/password.module.ts      | 2 +-
 src/addon/mod/quiz/accessrules/password/providers/handler.ts    | 2 +-
 src/addon/mod/quiz/accessrules/safebrowser/providers/handler.ts | 2 +-
 .../mod/quiz/accessrules/safebrowser/safebrowser.module.ts      | 2 +-
 .../mod/quiz/accessrules/securewindow/providers/handler.ts      | 2 +-
 .../mod/quiz/accessrules/securewindow/securewindow.module.ts    | 2 +-
 src/addon/mod/quiz/accessrules/timelimit/component/timelimit.ts | 2 +-
 src/addon/mod/quiz/accessrules/timelimit/providers/handler.ts   | 2 +-
 src/addon/mod/quiz/accessrules/timelimit/timelimit.module.ts    | 2 +-
 src/addon/mod/quiz/classes/auto-save.ts                         | 2 +-
 src/addon/mod/quiz/components/components.module.ts              | 2 +-
 .../mod/quiz/components/connection-error/connection-error.ts    | 2 +-
 src/addon/mod/quiz/components/index/index.ts                    | 2 +-
 src/addon/mod/quiz/pages/attempt/attempt.module.ts              | 2 +-
 src/addon/mod/quiz/pages/attempt/attempt.ts                     | 2 +-
 src/addon/mod/quiz/pages/index/index.module.ts                  | 2 +-
 src/addon/mod/quiz/pages/index/index.ts                         | 2 +-
 .../mod/quiz/pages/navigation-modal/navigation-modal.module.ts  | 2 +-
 src/addon/mod/quiz/pages/navigation-modal/navigation-modal.ts   | 2 +-
 src/addon/mod/quiz/pages/player/player.module.ts                | 2 +-
 src/addon/mod/quiz/pages/player/player.ts                       | 2 +-
 .../mod/quiz/pages/preflight-modal/preflight-modal.module.ts    | 2 +-
 src/addon/mod/quiz/pages/preflight-modal/preflight-modal.ts     | 2 +-
 src/addon/mod/quiz/pages/review/review.module.ts                | 2 +-
 src/addon/mod/quiz/pages/review/review.ts                       | 2 +-
 src/addon/mod/quiz/providers/access-rules-delegate.ts           | 2 +-
 src/addon/mod/quiz/providers/grade-link-handler.ts              | 2 +-
 src/addon/mod/quiz/providers/helper.ts                          | 2 +-
 src/addon/mod/quiz/providers/index-link-handler.ts              | 2 +-
 src/addon/mod/quiz/providers/list-link-handler.ts               | 2 +-
 src/addon/mod/quiz/providers/module-handler.ts                  | 2 +-
 src/addon/mod/quiz/providers/prefetch-handler.ts                | 2 +-
 src/addon/mod/quiz/providers/push-click-handler.ts              | 2 +-
 src/addon/mod/quiz/providers/quiz-offline.ts                    | 2 +-
 src/addon/mod/quiz/providers/quiz-sync.ts                       | 2 +-
 src/addon/mod/quiz/providers/quiz.ts                            | 2 +-
 src/addon/mod/quiz/providers/review-link-handler.ts             | 2 +-
 src/addon/mod/quiz/providers/sync-cron-handler.ts               | 2 +-
 src/addon/mod/quiz/quiz.module.ts                               | 2 +-
 src/addon/mod/resource/components/components.module.ts          | 2 +-
 src/addon/mod/resource/components/index/index.ts                | 2 +-
 src/addon/mod/resource/pages/index/index.module.ts              | 2 +-
 src/addon/mod/resource/pages/index/index.ts                     | 2 +-
 src/addon/mod/resource/providers/helper.ts                      | 2 +-
 src/addon/mod/resource/providers/link-handler.ts                | 2 +-
 src/addon/mod/resource/providers/list-link-handler.ts           | 2 +-
 src/addon/mod/resource/providers/module-handler.ts              | 2 +-
 src/addon/mod/resource/providers/pluginfile-handler.ts          | 2 +-
 src/addon/mod/resource/providers/prefetch-handler.ts            | 2 +-
 src/addon/mod/resource/providers/resource.ts                    | 2 +-
 src/addon/mod/resource/resource.module.ts                       | 2 +-
 src/addon/mod/scorm/classes/data-model-12.ts                    | 2 +-
 src/addon/mod/scorm/components/components.module.ts             | 2 +-
 src/addon/mod/scorm/components/index/index.ts                   | 2 +-
 src/addon/mod/scorm/pages/index/index.module.ts                 | 2 +-
 src/addon/mod/scorm/pages/index/index.ts                        | 2 +-
 src/addon/mod/scorm/pages/player/player.module.ts               | 2 +-
 src/addon/mod/scorm/pages/player/player.ts                      | 2 +-
 src/addon/mod/scorm/pages/toc/toc.module.ts                     | 2 +-
 src/addon/mod/scorm/pages/toc/toc.ts                            | 2 +-
 src/addon/mod/scorm/providers/grade-link-handler.ts             | 2 +-
 src/addon/mod/scorm/providers/helper.ts                         | 2 +-
 src/addon/mod/scorm/providers/index-link-handler.ts             | 2 +-
 src/addon/mod/scorm/providers/list-link-handler.ts              | 2 +-
 src/addon/mod/scorm/providers/module-handler.ts                 | 2 +-
 src/addon/mod/scorm/providers/pluginfile-handler.ts             | 2 +-
 src/addon/mod/scorm/providers/prefetch-handler.ts               | 2 +-
 src/addon/mod/scorm/providers/scorm-offline.ts                  | 2 +-
 src/addon/mod/scorm/providers/scorm-sync.ts                     | 2 +-
 src/addon/mod/scorm/providers/scorm.ts                          | 2 +-
 src/addon/mod/scorm/providers/sync-cron-handler.ts              | 2 +-
 src/addon/mod/scorm/scorm.module.ts                             | 2 +-
 src/addon/mod/survey/components/components.module.ts            | 2 +-
 src/addon/mod/survey/components/index/index.ts                  | 2 +-
 src/addon/mod/survey/pages/index/index.module.ts                | 2 +-
 src/addon/mod/survey/pages/index/index.ts                       | 2 +-
 src/addon/mod/survey/providers/helper.ts                        | 2 +-
 src/addon/mod/survey/providers/link-handler.ts                  | 2 +-
 src/addon/mod/survey/providers/list-link-handler.ts             | 2 +-
 src/addon/mod/survey/providers/module-handler.ts                | 2 +-
 src/addon/mod/survey/providers/offline.ts                       | 2 +-
 src/addon/mod/survey/providers/prefetch-handler.ts              | 2 +-
 src/addon/mod/survey/providers/survey.ts                        | 2 +-
 src/addon/mod/survey/providers/sync-cron-handler.ts             | 2 +-
 src/addon/mod/survey/providers/sync.ts                          | 2 +-
 src/addon/mod/survey/survey.module.ts                           | 2 +-
 src/addon/mod/url/components/components.module.ts               | 2 +-
 src/addon/mod/url/components/index/index.ts                     | 2 +-
 src/addon/mod/url/pages/index/index.module.ts                   | 2 +-
 src/addon/mod/url/pages/index/index.ts                          | 2 +-
 src/addon/mod/url/providers/helper.ts                           | 2 +-
 src/addon/mod/url/providers/link-handler.ts                     | 2 +-
 src/addon/mod/url/providers/list-link-handler.ts                | 2 +-
 src/addon/mod/url/providers/module-handler.ts                   | 2 +-
 src/addon/mod/url/providers/url.ts                              | 2 +-
 src/addon/mod/url/url.module.ts                                 | 2 +-
 src/addon/mod/wiki/components/components.module.ts              | 2 +-
 src/addon/mod/wiki/components/index/index.ts                    | 2 +-
 src/addon/mod/wiki/components/subwiki-picker/subwiki-picker.ts  | 2 +-
 src/addon/mod/wiki/pages/edit/edit.module.ts                    | 2 +-
 src/addon/mod/wiki/pages/edit/edit.ts                           | 2 +-
 src/addon/mod/wiki/pages/index/index.module.ts                  | 2 +-
 src/addon/mod/wiki/pages/index/index.ts                         | 2 +-
 src/addon/mod/wiki/pages/map/map.module.ts                      | 2 +-
 src/addon/mod/wiki/pages/map/map.ts                             | 2 +-
 src/addon/mod/wiki/providers/create-link-handler.ts             | 2 +-
 src/addon/mod/wiki/providers/edit-link-handler.ts               | 2 +-
 src/addon/mod/wiki/providers/index-link-handler.ts              | 2 +-
 src/addon/mod/wiki/providers/list-link-handler.ts               | 2 +-
 src/addon/mod/wiki/providers/module-handler.ts                  | 2 +-
 src/addon/mod/wiki/providers/page-or-map-link-handler.ts        | 2 +-
 src/addon/mod/wiki/providers/prefetch-handler.ts                | 2 +-
 src/addon/mod/wiki/providers/sync-cron-handler.ts               | 2 +-
 src/addon/mod/wiki/providers/tag-area-handler.ts                | 2 +-
 src/addon/mod/wiki/providers/wiki-offline.ts                    | 2 +-
 src/addon/mod/wiki/providers/wiki-sync.ts                       | 2 +-
 src/addon/mod/wiki/providers/wiki.ts                            | 2 +-
 src/addon/mod/wiki/wiki.module.ts                               | 2 +-
 .../mod/workshop/assessment/accumulative/accumulative.module.ts | 2 +-
 .../workshop/assessment/accumulative/component/accumulative.ts  | 2 +-
 .../mod/workshop/assessment/accumulative/providers/handler.ts   | 2 +-
 src/addon/mod/workshop/assessment/assessment.module.ts          | 2 +-
 src/addon/mod/workshop/assessment/comments/comments.module.ts   | 2 +-
 .../mod/workshop/assessment/comments/component/comments.ts      | 2 +-
 src/addon/mod/workshop/assessment/comments/providers/handler.ts | 2 +-
 .../mod/workshop/assessment/numerrors/component/numerrors.ts    | 2 +-
 src/addon/mod/workshop/assessment/numerrors/numerrors.module.ts | 2 +-
 .../mod/workshop/assessment/numerrors/providers/handler.ts      | 2 +-
 src/addon/mod/workshop/assessment/rubric/component/rubric.ts    | 2 +-
 src/addon/mod/workshop/assessment/rubric/providers/handler.ts   | 2 +-
 src/addon/mod/workshop/assessment/rubric/rubric.module.ts       | 2 +-
 src/addon/mod/workshop/classes/assessment-strategy-component.ts | 2 +-
 .../components/assessment-strategy/assessment-strategy.ts       | 2 +-
 src/addon/mod/workshop/components/assessment/assessment.ts      | 2 +-
 src/addon/mod/workshop/components/components.module.ts          | 2 +-
 src/addon/mod/workshop/components/index/index.ts                | 2 +-
 src/addon/mod/workshop/components/submission/submission.ts      | 2 +-
 src/addon/mod/workshop/pages/assessment/assessment.module.ts    | 2 +-
 src/addon/mod/workshop/pages/assessment/assessment.ts           | 2 +-
 .../workshop/pages/edit-submission/edit-submission.module.ts    | 2 +-
 src/addon/mod/workshop/pages/edit-submission/edit-submission.ts | 2 +-
 src/addon/mod/workshop/pages/index/index.module.ts              | 2 +-
 src/addon/mod/workshop/pages/index/index.ts                     | 2 +-
 src/addon/mod/workshop/pages/phase/phase.module.ts              | 2 +-
 src/addon/mod/workshop/pages/phase/phase.ts                     | 2 +-
 src/addon/mod/workshop/pages/submission/submission.module.ts    | 2 +-
 src/addon/mod/workshop/pages/submission/submission.ts           | 2 +-
 .../mod/workshop/providers/assessment-strategy-delegate.ts      | 2 +-
 src/addon/mod/workshop/providers/helper.ts                      | 2 +-
 src/addon/mod/workshop/providers/link-handler.ts                | 2 +-
 src/addon/mod/workshop/providers/list-link-handler.ts           | 2 +-
 src/addon/mod/workshop/providers/module-handler.ts              | 2 +-
 src/addon/mod/workshop/providers/offline.ts                     | 2 +-
 src/addon/mod/workshop/providers/prefetch-handler.ts            | 2 +-
 src/addon/mod/workshop/providers/sync-cron-handler.ts           | 2 +-
 src/addon/mod/workshop/providers/sync.ts                        | 2 +-
 src/addon/mod/workshop/providers/workshop.ts                    | 2 +-
 src/addon/mod/workshop/workshop.module.ts                       | 2 +-
 src/addon/notes/components/components.module.ts                 | 2 +-
 src/addon/notes/components/list/list.ts                         | 2 +-
 src/addon/notes/notes.module.ts                                 | 2 +-
 src/addon/notes/pages/add/add.module.ts                         | 2 +-
 src/addon/notes/pages/add/add.ts                                | 2 +-
 src/addon/notes/pages/list/list.module.ts                       | 2 +-
 src/addon/notes/pages/list/list.ts                              | 2 +-
 src/addon/notes/providers/course-option-handler.ts              | 2 +-
 src/addon/notes/providers/notes-offline.ts                      | 2 +-
 src/addon/notes/providers/notes-sync.ts                         | 2 +-
 src/addon/notes/providers/notes.ts                              | 2 +-
 src/addon/notes/providers/sync-cron-handler.ts                  | 2 +-
 src/addon/notes/providers/user-handler.ts                       | 2 +-
 src/addon/notifications/components/actions/actions.ts           | 2 +-
 src/addon/notifications/components/components.module.ts         | 2 +-
 src/addon/notifications/notifications.module.ts                 | 2 +-
 src/addon/notifications/pages/list/list.module.ts               | 2 +-
 src/addon/notifications/pages/list/list.ts                      | 2 +-
 src/addon/notifications/pages/settings/settings.module.ts       | 2 +-
 src/addon/notifications/pages/settings/settings.ts              | 2 +-
 src/addon/notifications/providers/cron-handler.ts               | 2 +-
 src/addon/notifications/providers/helper.ts                     | 2 +-
 src/addon/notifications/providers/mainmenu-handler.ts           | 2 +-
 src/addon/notifications/providers/notifications.ts              | 2 +-
 src/addon/notifications/providers/push-click-handler.ts         | 2 +-
 src/addon/notifications/providers/settings-handler.ts           | 2 +-
 src/addon/qbehaviour/adaptive/adaptive.module.ts                | 2 +-
 src/addon/qbehaviour/adaptive/providers/handler.ts              | 2 +-
 .../qbehaviour/adaptivenopenalty/adaptivenopenalty.module.ts    | 2 +-
 src/addon/qbehaviour/adaptivenopenalty/providers/handler.ts     | 2 +-
 src/addon/qbehaviour/deferredcbm/component/deferredcbm.ts       | 2 +-
 src/addon/qbehaviour/deferredcbm/deferredcbm.module.ts          | 2 +-
 src/addon/qbehaviour/deferredcbm/providers/handler.ts           | 2 +-
 .../qbehaviour/deferredfeedback/deferredfeedback.module.ts      | 2 +-
 src/addon/qbehaviour/deferredfeedback/providers/handler.ts      | 2 +-
 src/addon/qbehaviour/immediatecbm/immediatecbm.module.ts        | 2 +-
 src/addon/qbehaviour/immediatecbm/providers/handler.ts          | 2 +-
 .../qbehaviour/immediatefeedback/immediatefeedback.module.ts    | 2 +-
 src/addon/qbehaviour/immediatefeedback/providers/handler.ts     | 2 +-
 .../qbehaviour/informationitem/component/informationitem.ts     | 2 +-
 src/addon/qbehaviour/informationitem/informationitem.module.ts  | 2 +-
 src/addon/qbehaviour/informationitem/providers/handler.ts       | 2 +-
 src/addon/qbehaviour/interactive/interactive.module.ts          | 2 +-
 src/addon/qbehaviour/interactive/providers/handler.ts           | 2 +-
 .../interactivecountback/interactivecountback.module.ts         | 2 +-
 src/addon/qbehaviour/interactivecountback/providers/handler.ts  | 2 +-
 src/addon/qbehaviour/manualgraded/manualgraded.module.ts        | 2 +-
 src/addon/qbehaviour/manualgraded/providers/handler.ts          | 2 +-
 src/addon/qbehaviour/qbehaviour.module.ts                       | 2 +-
 src/addon/qtype/calculated/calculated.module.ts                 | 2 +-
 src/addon/qtype/calculated/component/calculated.ts              | 2 +-
 src/addon/qtype/calculated/providers/handler.ts                 | 2 +-
 src/addon/qtype/calculatedmulti/calculatedmulti.module.ts       | 2 +-
 src/addon/qtype/calculatedmulti/providers/handler.ts            | 2 +-
 src/addon/qtype/calculatedsimple/calculatedsimple.module.ts     | 2 +-
 src/addon/qtype/calculatedsimple/providers/handler.ts           | 2 +-
 src/addon/qtype/ddimageortext/classes/ddimageortext.ts          | 2 +-
 src/addon/qtype/ddimageortext/component/ddimageortext.ts        | 2 +-
 src/addon/qtype/ddimageortext/ddimageortext.module.ts           | 2 +-
 src/addon/qtype/ddimageortext/providers/handler.ts              | 2 +-
 src/addon/qtype/ddmarker/classes/ddmarker.ts                    | 2 +-
 src/addon/qtype/ddmarker/classes/graphics_api.ts                | 2 +-
 src/addon/qtype/ddmarker/component/ddmarker.ts                  | 2 +-
 src/addon/qtype/ddmarker/ddmarker.module.ts                     | 2 +-
 src/addon/qtype/ddmarker/providers/handler.ts                   | 2 +-
 src/addon/qtype/ddwtos/classes/ddwtos.ts                        | 2 +-
 src/addon/qtype/ddwtos/component/ddwtos.ts                      | 2 +-
 src/addon/qtype/ddwtos/ddwtos.module.ts                         | 2 +-
 src/addon/qtype/ddwtos/providers/handler.ts                     | 2 +-
 src/addon/qtype/description/component/description.ts            | 2 +-
 src/addon/qtype/description/description.module.ts               | 2 +-
 src/addon/qtype/description/providers/handler.ts                | 2 +-
 src/addon/qtype/essay/component/essay.ts                        | 2 +-
 src/addon/qtype/essay/essay.module.ts                           | 2 +-
 src/addon/qtype/essay/providers/handler.ts                      | 2 +-
 src/addon/qtype/gapselect/component/gapselect.ts                | 2 +-
 src/addon/qtype/gapselect/gapselect.module.ts                   | 2 +-
 src/addon/qtype/gapselect/providers/handler.ts                  | 2 +-
 src/addon/qtype/match/component/match.ts                        | 2 +-
 src/addon/qtype/match/match.module.ts                           | 2 +-
 src/addon/qtype/match/providers/handler.ts                      | 2 +-
 src/addon/qtype/multianswer/component/multianswer.ts            | 2 +-
 src/addon/qtype/multianswer/multianswer.module.ts               | 2 +-
 src/addon/qtype/multianswer/providers/handler.ts                | 2 +-
 src/addon/qtype/multichoice/component/multichoice.ts            | 2 +-
 src/addon/qtype/multichoice/multichoice.module.ts               | 2 +-
 src/addon/qtype/multichoice/providers/handler.ts                | 2 +-
 src/addon/qtype/numerical/numerical.module.ts                   | 2 +-
 src/addon/qtype/numerical/providers/handler.ts                  | 2 +-
 src/addon/qtype/qtype.module.ts                                 | 2 +-
 src/addon/qtype/randomsamatch/providers/handler.ts              | 2 +-
 src/addon/qtype/randomsamatch/randomsamatch.module.ts           | 2 +-
 src/addon/qtype/shortanswer/component/shortanswer.ts            | 2 +-
 src/addon/qtype/shortanswer/providers/handler.ts                | 2 +-
 src/addon/qtype/shortanswer/shortanswer.module.ts               | 2 +-
 src/addon/qtype/truefalse/providers/handler.ts                  | 2 +-
 src/addon/qtype/truefalse/truefalse.module.ts                   | 2 +-
 src/addon/remotethemes/providers/remotethemes.ts                | 2 +-
 src/addon/remotethemes/remotethemes.module.ts                   | 2 +-
 .../pages/course-storage/course-storage.module.ts               | 2 +-
 src/addon/storagemanager/pages/course-storage/course-storage.ts | 2 +-
 src/addon/storagemanager/providers/coursemenu-handler.ts        | 2 +-
 src/addon/storagemanager/storagemanager.module.ts               | 2 +-
 src/addon/userprofilefield/checkbox/checkbox.module.ts          | 2 +-
 src/addon/userprofilefield/checkbox/component/checkbox.ts       | 2 +-
 src/addon/userprofilefield/checkbox/providers/handler.ts        | 2 +-
 src/addon/userprofilefield/datetime/component/datetime.ts       | 2 +-
 src/addon/userprofilefield/datetime/datetime.module.ts          | 2 +-
 src/addon/userprofilefield/datetime/providers/handler.ts        | 2 +-
 src/addon/userprofilefield/menu/component/menu.ts               | 2 +-
 src/addon/userprofilefield/menu/menu.module.ts                  | 2 +-
 src/addon/userprofilefield/menu/providers/handler.ts            | 2 +-
 src/addon/userprofilefield/text/component/text.ts               | 2 +-
 src/addon/userprofilefield/text/providers/handler.ts            | 2 +-
 src/addon/userprofilefield/text/text.module.ts                  | 2 +-
 src/addon/userprofilefield/textarea/component/textarea.ts       | 2 +-
 src/addon/userprofilefield/textarea/providers/handler.ts        | 2 +-
 src/addon/userprofilefield/textarea/textarea.module.ts          | 2 +-
 src/addon/userprofilefield/userprofilefield.module.ts           | 2 +-
 src/app/app.component.ts                                        | 2 +-
 src/app/app.module.ts                                           | 2 +-
 src/app/main.ts                                                 | 2 +-
 src/classes/animations.ts                                       | 2 +-
 src/classes/base-sync.ts                                        | 2 +-
 src/classes/cache.ts                                            | 2 +-
 src/classes/delegate.ts                                         | 2 +-
 src/classes/interceptor.ts                                      | 2 +-
 src/classes/modal-lateral-transition.ts                         | 2 +-
 src/classes/page-transition.ts                                  | 2 +-
 src/classes/site.ts                                             | 2 +-
 src/classes/sqlitedb.ts                                         | 2 +-
 src/components/attachments/attachments.ts                       | 2 +-
 src/components/bs-tooltip/bs-tooltip.ts                         | 2 +-
 src/components/chart/chart.ts                                   | 2 +-
 src/components/chrono/chrono.ts                                 | 2 +-
 src/components/components.module.ts                             | 2 +-
 src/components/context-menu/context-menu-item.ts                | 2 +-
 src/components/context-menu/context-menu-popover.ts             | 2 +-
 src/components/context-menu/context-menu.ts                     | 2 +-
 src/components/course-picker-menu/course-picker-menu-popover.ts | 2 +-
 src/components/download-refresh/download-refresh.ts             | 2 +-
 src/components/dynamic-component/dynamic-component.ts           | 2 +-
 src/components/empty-box/empty-box.ts                           | 2 +-
 src/components/file/file.ts                                     | 2 +-
 src/components/icon/icon.ts                                     | 2 +-
 src/components/iframe/iframe.ts                                 | 2 +-
 src/components/infinite-loading/infinite-loading.ts             | 2 +-
 src/components/input-errors/input-errors.ts                     | 2 +-
 src/components/ion-tabs/ion-tab.ts                              | 2 +-
 src/components/ion-tabs/ion-tabs.ts                             | 2 +-
 src/components/loading/loading.ts                               | 2 +-
 src/components/local-file/local-file.ts                         | 2 +-
 src/components/mark-required/mark-required.ts                   | 2 +-
 src/components/navbar-buttons/navbar-buttons.ts                 | 2 +-
 src/components/navigation-bar/navigation-bar.ts                 | 2 +-
 src/components/progress-bar/progress-bar.ts                     | 2 +-
 src/components/recaptcha/recaptcha.ts                           | 2 +-
 src/components/recaptcha/recaptchamodal.ts                      | 2 +-
 src/components/rich-text-editor/rich-text-editor.ts             | 2 +-
 src/components/search-box/search-box.ts                         | 2 +-
 src/components/send-message-form/send-message-form.ts           | 2 +-
 src/components/show-password/show-password.ts                   | 2 +-
 src/components/site-picker/site-picker.ts                       | 2 +-
 src/components/split-view/placeholder/placeholder.module.ts     | 2 +-
 src/components/split-view/placeholder/placeholder.ts            | 2 +-
 src/components/split-view/split-view.ts                         | 2 +-
 src/components/style/style.ts                                   | 2 +-
 src/components/tabs/tab.ts                                      | 2 +-
 src/components/tabs/tabs.ts                                     | 2 +-
 src/components/timer/timer.ts                                   | 2 +-
 src/components/user-avatar/user-avatar.ts                       | 2 +-
 src/core/block/block.module.ts                                  | 2 +-
 src/core/block/classes/base-block-component.ts                  | 2 +-
 src/core/block/classes/base-block-handler.ts                    | 2 +-
 src/core/block/components/block/block.ts                        | 2 +-
 src/core/block/components/components.module.ts                  | 2 +-
 src/core/block/components/course-blocks/course-blocks.ts        | 2 +-
 src/core/block/components/only-title-block/only-title-block.ts  | 2 +-
 .../block/components/pre-rendered-block/pre-rendered-block.ts   | 2 +-
 src/core/block/providers/default-block-handler.ts               | 2 +-
 src/core/block/providers/delegate.ts                            | 2 +-
 src/core/block/providers/helper.ts                              | 2 +-
 src/core/comments/comments.module.ts                            | 2 +-
 src/core/comments/components/comments/comments.ts               | 2 +-
 src/core/comments/components/components.module.ts               | 2 +-
 src/core/comments/pages/add/add.module.ts                       | 2 +-
 src/core/comments/pages/add/add.ts                              | 2 +-
 src/core/comments/pages/viewer/viewer.module.ts                 | 2 +-
 src/core/comments/pages/viewer/viewer.ts                        | 2 +-
 src/core/comments/providers/comments.ts                         | 2 +-
 src/core/comments/providers/offline.ts                          | 2 +-
 src/core/comments/providers/sync-cron-handler.ts                | 2 +-
 src/core/comments/providers/sync.ts                             | 2 +-
 src/core/compile/compile.module.ts                              | 2 +-
 src/core/compile/components/compile-html/compile-html.module.ts | 2 +-
 src/core/compile/components/compile-html/compile-html.ts        | 2 +-
 src/core/compile/providers/compile.ts                           | 2 +-
 src/core/constants.ts                                           | 2 +-
 src/core/contentlinks/classes/base-handler.ts                   | 2 +-
 src/core/contentlinks/classes/module-grade-handler.ts           | 2 +-
 src/core/contentlinks/classes/module-index-handler.ts           | 2 +-
 src/core/contentlinks/classes/module-list-handler.ts            | 2 +-
 src/core/contentlinks/contentlinks.module.ts                    | 2 +-
 src/core/contentlinks/pages/choose-site/choose-site.module.ts   | 2 +-
 src/core/contentlinks/pages/choose-site/choose-site.ts          | 2 +-
 src/core/contentlinks/providers/delegate.ts                     | 2 +-
 src/core/contentlinks/providers/helper.ts                       | 2 +-
 src/core/course/classes/activity-prefetch-handler.ts            | 2 +-
 src/core/course/classes/activity-sync.ts                        | 2 +-
 src/core/course/classes/main-activity-component.ts              | 2 +-
 src/core/course/classes/main-resource-component.ts              | 2 +-
 src/core/course/classes/module-prefetch-handler.ts              | 2 +-
 src/core/course/classes/resource-prefetch-handler.ts            | 2 +-
 src/core/course/components/components.module.ts                 | 2 +-
 src/core/course/components/format/format.ts                     | 2 +-
 .../course/components/module-completion/module-completion.ts    | 2 +-
 .../course/components/module-description/module-description.ts  | 2 +-
 src/core/course/components/module/module.ts                     | 2 +-
 src/core/course/components/tag-area/tag-area.ts                 | 2 +-
 .../course/components/unsupported-module/unsupported-module.ts  | 2 +-
 src/core/course/course.module.ts                                | 2 +-
 src/core/course/directives/directives.module.ts                 | 2 +-
 src/core/course/directives/download-module-main-file.ts         | 2 +-
 .../course/formats/singleactivity/components/singleactivity.ts  | 2 +-
 src/core/course/formats/singleactivity/providers/handler.ts     | 2 +-
 src/core/course/formats/singleactivity/singleactivity.module.ts | 2 +-
 src/core/course/formats/social/providers/handler.ts             | 2 +-
 src/core/course/formats/social/social.module.ts                 | 2 +-
 src/core/course/formats/topics/providers/handler.ts             | 2 +-
 src/core/course/formats/topics/topics.module.ts                 | 2 +-
 src/core/course/formats/weeks/providers/handler.ts              | 2 +-
 src/core/course/formats/weeks/weeks.module.ts                   | 2 +-
 src/core/course/pages/list-mod-type/list-mod-type.module.ts     | 2 +-
 src/core/course/pages/list-mod-type/list-mod-type.ts            | 2 +-
 .../course/pages/section-selector/section-selector.module.ts    | 2 +-
 src/core/course/pages/section-selector/section-selector.ts      | 2 +-
 src/core/course/pages/section/section.module.ts                 | 2 +-
 src/core/course/pages/section/section.ts                        | 2 +-
 .../pages/unsupported-module/unsupported-module.module.ts       | 2 +-
 src/core/course/pages/unsupported-module/unsupported-module.ts  | 2 +-
 src/core/course/providers/course-offline.ts                     | 2 +-
 src/core/course/providers/course-tag-area-handler.ts            | 2 +-
 src/core/course/providers/course.ts                             | 2 +-
 src/core/course/providers/default-format.ts                     | 2 +-
 src/core/course/providers/default-module.ts                     | 2 +-
 src/core/course/providers/format-delegate.ts                    | 2 +-
 src/core/course/providers/helper.ts                             | 2 +-
 src/core/course/providers/log-cron-handler.ts                   | 2 +-
 src/core/course/providers/log-helper.ts                         | 2 +-
 src/core/course/providers/module-delegate.ts                    | 2 +-
 src/core/course/providers/module-prefetch-delegate.ts           | 2 +-
 src/core/course/providers/modules-tag-area-handler.ts           | 2 +-
 src/core/course/providers/options-delegate.ts                   | 2 +-
 src/core/course/providers/sync-cron-handler.ts                  | 2 +-
 src/core/course/providers/sync.ts                               | 2 +-
 src/core/courses/components/components.module.ts                | 2 +-
 .../courses/components/course-list-item/course-list-item.ts     | 2 +-
 .../components/course-options-menu/course-options-menu.ts       | 2 +-
 src/core/courses/components/course-progress/course-progress.ts  | 2 +-
 src/core/courses/components/my-courses/my-courses.ts            | 2 +-
 src/core/courses/courses.module.ts                              | 2 +-
 .../courses/pages/available-courses/available-courses.module.ts | 2 +-
 src/core/courses/pages/available-courses/available-courses.ts   | 2 +-
 src/core/courses/pages/categories/categories.module.ts          | 2 +-
 src/core/courses/pages/categories/categories.ts                 | 2 +-
 src/core/courses/pages/course-preview/course-preview.module.ts  | 2 +-
 src/core/courses/pages/course-preview/course-preview.ts         | 2 +-
 src/core/courses/pages/dashboard/dashboard.module.ts            | 2 +-
 src/core/courses/pages/dashboard/dashboard.ts                   | 2 +-
 src/core/courses/pages/my-courses/my-courses.module.ts          | 2 +-
 src/core/courses/pages/my-courses/my-courses.ts                 | 2 +-
 src/core/courses/pages/search/search.module.ts                  | 2 +-
 src/core/courses/pages/search/search.ts                         | 2 +-
 .../pages/self-enrol-password/self-enrol-password.module.ts     | 2 +-
 .../courses/pages/self-enrol-password/self-enrol-password.ts    | 2 +-
 src/core/courses/providers/course-link-handler.ts               | 2 +-
 src/core/courses/providers/courses-index-link-handler.ts        | 2 +-
 src/core/courses/providers/courses.ts                           | 2 +-
 src/core/courses/providers/dashboard-link-handler.ts            | 2 +-
 src/core/courses/providers/dashboard.ts                         | 2 +-
 src/core/courses/providers/enrol-push-click-handler.ts          | 2 +-
 src/core/courses/providers/helper.ts                            | 2 +-
 src/core/courses/providers/mainmenu-handler.ts                  | 2 +-
 src/core/courses/providers/request-push-click-handler.ts        | 2 +-
 src/core/emulator/classes/filesystem.ts                         | 2 +-
 src/core/emulator/classes/inappbrowserobject.ts                 | 2 +-
 src/core/emulator/classes/sqlitedb.ts                           | 2 +-
 src/core/emulator/emulator.module.ts                            | 2 +-
 src/core/emulator/pages/capture-media/capture-media.module.ts   | 2 +-
 src/core/emulator/pages/capture-media/capture-media.ts          | 2 +-
 src/core/emulator/providers/badge.ts                            | 2 +-
 src/core/emulator/providers/camera.ts                           | 2 +-
 src/core/emulator/providers/capture-helper.ts                   | 2 +-
 src/core/emulator/providers/clipboard.ts                        | 2 +-
 src/core/emulator/providers/file-opener.ts                      | 2 +-
 src/core/emulator/providers/file-transfer.ts                    | 2 +-
 src/core/emulator/providers/file.ts                             | 2 +-
 src/core/emulator/providers/globalization.ts                    | 2 +-
 src/core/emulator/providers/helper.ts                           | 2 +-
 src/core/emulator/providers/inappbrowser.ts                     | 2 +-
 src/core/emulator/providers/local-notifications.ts              | 2 +-
 src/core/emulator/providers/media-capture.ts                    | 2 +-
 src/core/emulator/providers/network.ts                          | 2 +-
 src/core/emulator/providers/push.ts                             | 2 +-
 src/core/emulator/providers/zip.ts                              | 2 +-
 src/core/fileuploader/fileuploader.module.ts                    | 2 +-
 src/core/fileuploader/providers/album-handler.ts                | 2 +-
 src/core/fileuploader/providers/audio-handler.ts                | 2 +-
 src/core/fileuploader/providers/camera-handler.ts               | 2 +-
 src/core/fileuploader/providers/delegate.ts                     | 2 +-
 src/core/fileuploader/providers/file-handler.ts                 | 2 +-
 src/core/fileuploader/providers/fileuploader.ts                 | 2 +-
 src/core/fileuploader/providers/helper.ts                       | 2 +-
 src/core/fileuploader/providers/video-handler.ts                | 2 +-
 src/core/grades/components/components.module.ts                 | 2 +-
 src/core/grades/components/course/course.ts                     | 2 +-
 src/core/grades/grades.module.ts                                | 2 +-
 src/core/grades/pages/course/course.module.ts                   | 2 +-
 src/core/grades/pages/course/course.ts                          | 2 +-
 src/core/grades/pages/courses/courses.module.ts                 | 2 +-
 src/core/grades/pages/courses/courses.ts                        | 2 +-
 src/core/grades/pages/coursesplit/coursesplit.module.ts         | 2 +-
 src/core/grades/pages/coursesplit/coursesplit.ts                | 2 +-
 src/core/grades/pages/grade/grade.module.ts                     | 2 +-
 src/core/grades/pages/grade/grade.ts                            | 2 +-
 src/core/grades/providers/course-option-handler.ts              | 2 +-
 src/core/grades/providers/grades.ts                             | 2 +-
 src/core/grades/providers/helper.ts                             | 2 +-
 src/core/grades/providers/mainmenu-handler.ts                   | 2 +-
 src/core/grades/providers/overview-link-handler.ts              | 2 +-
 src/core/grades/providers/user-handler.ts                       | 2 +-
 src/core/grades/providers/user-link-handler.ts                  | 2 +-
 src/core/login/login.module.ts                                  | 2 +-
 src/core/login/pages/credentials/credentials.module.ts          | 2 +-
 src/core/login/pages/credentials/credentials.ts                 | 2 +-
 src/core/login/pages/email-signup/email-signup.module.ts        | 2 +-
 src/core/login/pages/email-signup/email-signup.ts               | 2 +-
 .../login/pages/forgotten-password/forgotten-password.module.ts | 2 +-
 src/core/login/pages/forgotten-password/forgotten-password.ts   | 2 +-
 src/core/login/pages/init/init.module.ts                        | 2 +-
 src/core/login/pages/init/init.ts                               | 2 +-
 src/core/login/pages/reconnect/reconnect.module.ts              | 2 +-
 src/core/login/pages/reconnect/reconnect.ts                     | 2 +-
 src/core/login/pages/site-error/site-error.module.ts            | 2 +-
 src/core/login/pages/site-error/site-error.ts                   | 2 +-
 src/core/login/pages/site-help/site-help.module.ts              | 2 +-
 src/core/login/pages/site-help/site-help.ts                     | 2 +-
 src/core/login/pages/site-policy/site-policy.module.ts          | 2 +-
 src/core/login/pages/site-policy/site-policy.ts                 | 2 +-
 src/core/login/pages/site/site.module.ts                        | 2 +-
 src/core/login/pages/site/site.ts                               | 2 +-
 src/core/login/pages/sites/sites.module.ts                      | 2 +-
 src/core/login/pages/sites/sites.ts                             | 2 +-
 src/core/login/providers/helper.ts                              | 2 +-
 src/core/mainmenu/mainmenu.module.ts                            | 2 +-
 src/core/mainmenu/pages/menu/menu.module.ts                     | 2 +-
 src/core/mainmenu/pages/menu/menu.ts                            | 2 +-
 src/core/mainmenu/pages/more/more.module.ts                     | 2 +-
 src/core/mainmenu/pages/more/more.ts                            | 2 +-
 src/core/mainmenu/providers/delegate.ts                         | 2 +-
 src/core/mainmenu/providers/mainmenu.ts                         | 2 +-
 src/core/pushnotifications/providers/delegate.ts                | 2 +-
 src/core/pushnotifications/providers/pushnotifications.ts       | 2 +-
 src/core/pushnotifications/providers/register-cron-handler.ts   | 2 +-
 src/core/pushnotifications/providers/unregister-cron-handler.ts | 2 +-
 src/core/pushnotifications/pushnotifications.module.ts          | 2 +-
 src/core/question/classes/base-behaviour-handler.ts             | 2 +-
 src/core/question/classes/base-question-component.ts            | 2 +-
 src/core/question/classes/base-question-handler.ts              | 2 +-
 src/core/question/components/components.module.ts               | 2 +-
 src/core/question/components/question/question.ts               | 2 +-
 src/core/question/providers/behaviour-delegate.ts               | 2 +-
 src/core/question/providers/default-behaviour-handler.ts        | 2 +-
 src/core/question/providers/default-question-handler.ts         | 2 +-
 src/core/question/providers/delegate.ts                         | 2 +-
 src/core/question/providers/helper.ts                           | 2 +-
 src/core/question/providers/question.ts                         | 2 +-
 src/core/question/question.module.ts                            | 2 +-
 src/core/rating/components/aggregate/aggregate.ts               | 2 +-
 src/core/rating/components/components.module.ts                 | 2 +-
 src/core/rating/components/rate/rate.ts                         | 2 +-
 src/core/rating/pages/ratings/ratings.module.ts                 | 2 +-
 src/core/rating/pages/ratings/ratings.ts                        | 2 +-
 src/core/rating/providers/offline.ts                            | 2 +-
 src/core/rating/providers/rating.ts                             | 2 +-
 src/core/rating/providers/sync.ts                               | 2 +-
 src/core/rating/rating.module.ts                                | 2 +-
 src/core/settings/pages/about/about.module.ts                   | 2 +-
 src/core/settings/pages/about/about.ts                          | 2 +-
 src/core/settings/pages/general/general.module.ts               | 2 +-
 src/core/settings/pages/general/general.ts                      | 2 +-
 src/core/settings/pages/list/list.module.ts                     | 2 +-
 src/core/settings/pages/list/list.ts                            | 2 +-
 src/core/settings/pages/space-usage/space-usage.module.ts       | 2 +-
 src/core/settings/pages/space-usage/space-usage.ts              | 2 +-
 .../settings/pages/synchronization/synchronization.module.ts    | 2 +-
 src/core/settings/pages/synchronization/synchronization.ts      | 2 +-
 src/core/settings/providers/delegate.ts                         | 2 +-
 src/core/settings/providers/helper.ts                           | 2 +-
 src/core/settings/settings.module.ts                            | 2 +-
 src/core/sharedfiles/pages/choose-site/choose-site.module.ts    | 2 +-
 src/core/sharedfiles/pages/choose-site/choose-site.ts           | 2 +-
 src/core/sharedfiles/pages/list/list.module.ts                  | 2 +-
 src/core/sharedfiles/pages/list/list.ts                         | 2 +-
 src/core/sharedfiles/providers/helper.ts                        | 2 +-
 src/core/sharedfiles/providers/sharedfiles.ts                   | 2 +-
 src/core/sharedfiles/providers/upload-handler.ts                | 2 +-
 src/core/sharedfiles/sharedfiles.module.ts                      | 2 +-
 src/core/sitehome/components/all-course-list/all-course-list.ts | 2 +-
 src/core/sitehome/components/categories/categories.ts           | 2 +-
 src/core/sitehome/components/components.module.ts               | 2 +-
 src/core/sitehome/components/course-search/course-search.ts     | 2 +-
 .../components/enrolled-course-list/enrolled-course-list.ts     | 2 +-
 src/core/sitehome/components/index/index.ts                     | 2 +-
 src/core/sitehome/components/news/news.ts                       | 2 +-
 src/core/sitehome/pages/index/index.module.ts                   | 2 +-
 src/core/sitehome/pages/index/index.ts                          | 2 +-
 src/core/sitehome/providers/index-link-handler.ts               | 2 +-
 src/core/sitehome/providers/sitehome.ts                         | 2 +-
 src/core/sitehome/sitehome.module.ts                            | 2 +-
 src/core/siteplugins/classes/call-ws-click-directive.ts         | 2 +-
 src/core/siteplugins/classes/call-ws-directive.ts               | 2 +-
 src/core/siteplugins/classes/compile-init-component.ts          | 2 +-
 .../siteplugins/classes/handlers/assign-feedback-handler.ts     | 2 +-
 .../siteplugins/classes/handlers/assign-submission-handler.ts   | 2 +-
 src/core/siteplugins/classes/handlers/base-handler.ts           | 2 +-
 src/core/siteplugins/classes/handlers/block-handler.ts          | 2 +-
 src/core/siteplugins/classes/handlers/course-format-handler.ts  | 2 +-
 src/core/siteplugins/classes/handlers/course-option-handler.ts  | 2 +-
 src/core/siteplugins/classes/handlers/main-menu-handler.ts      | 2 +-
 src/core/siteplugins/classes/handlers/message-output-handler.ts | 2 +-
 src/core/siteplugins/classes/handlers/module-handler.ts         | 2 +-
 .../siteplugins/classes/handlers/module-prefetch-handler.ts     | 2 +-
 .../siteplugins/classes/handlers/question-behaviour-handler.ts  | 2 +-
 src/core/siteplugins/classes/handlers/question-handler.ts       | 2 +-
 .../siteplugins/classes/handlers/quiz-access-rule-handler.ts    | 2 +-
 src/core/siteplugins/classes/handlers/settings-handler.ts       | 2 +-
 src/core/siteplugins/classes/handlers/user-handler.ts           | 2 +-
 .../siteplugins/classes/handlers/user-profile-field-handler.ts  | 2 +-
 .../classes/handlers/workshop-assessment-strategy-handler.ts    | 2 +-
 .../siteplugins/components/assign-feedback/assign-feedback.ts   | 2 +-
 .../components/assign-submission/assign-submission.ts           | 2 +-
 src/core/siteplugins/components/block/block.ts                  | 2 +-
 src/core/siteplugins/components/components.module.ts            | 2 +-
 src/core/siteplugins/components/course-format/course-format.ts  | 2 +-
 src/core/siteplugins/components/course-option/course-option.ts  | 2 +-
 src/core/siteplugins/components/module-index/module-index.ts    | 2 +-
 .../siteplugins/components/only-title-block/only-title-block.ts | 2 +-
 .../siteplugins/components/plugin-content/plugin-content.ts     | 2 +-
 .../components/question-behaviour/question-behaviour.ts         | 2 +-
 src/core/siteplugins/components/question/question.ts            | 2 +-
 .../siteplugins/components/quiz-access-rule/quiz-access-rule.ts | 2 +-
 .../components/user-profile-field/user-profile-field.ts         | 2 +-
 .../workshop-assessment-strategy.ts                             | 2 +-
 src/core/siteplugins/directives/call-ws-new-content.ts          | 2 +-
 src/core/siteplugins/directives/call-ws-on-load.ts              | 2 +-
 src/core/siteplugins/directives/call-ws.ts                      | 2 +-
 src/core/siteplugins/directives/directives.module.ts            | 2 +-
 src/core/siteplugins/directives/new-content.ts                  | 2 +-
 src/core/siteplugins/pages/module-index/module-index.module.ts  | 2 +-
 src/core/siteplugins/pages/module-index/module-index.ts         | 2 +-
 src/core/siteplugins/pages/plugin-page/plugin-page.module.ts    | 2 +-
 src/core/siteplugins/pages/plugin-page/plugin-page.ts           | 2 +-
 src/core/siteplugins/providers/helper.ts                        | 2 +-
 src/core/siteplugins/providers/siteplugins.ts                   | 2 +-
 src/core/siteplugins/siteplugins.module.ts                      | 2 +-
 src/core/tag/components/components.module.ts                    | 2 +-
 src/core/tag/components/feed/feed.ts                            | 2 +-
 src/core/tag/components/list/list.ts                            | 2 +-
 src/core/tag/pages/index-area/index-area.module.ts              | 2 +-
 src/core/tag/pages/index-area/index-area.ts                     | 2 +-
 src/core/tag/pages/index/index.module.ts                        | 2 +-
 src/core/tag/pages/index/index.ts                               | 2 +-
 src/core/tag/pages/search/search.module.ts                      | 2 +-
 src/core/tag/pages/search/search.ts                             | 2 +-
 src/core/tag/providers/area-delegate.ts                         | 2 +-
 src/core/tag/providers/helper.ts                                | 2 +-
 src/core/tag/providers/index-link-handler.ts                    | 2 +-
 src/core/tag/providers/mainmenu-handler.ts                      | 2 +-
 src/core/tag/providers/search-link-handler.ts                   | 2 +-
 src/core/tag/providers/tag.ts                                   | 2 +-
 src/core/tag/tag.module.ts                                      | 2 +-
 src/core/user/components/components.module.ts                   | 2 +-
 src/core/user/components/participants/participants.ts           | 2 +-
 src/core/user/components/tag-area/tag-area.ts                   | 2 +-
 .../user/components/user-profile-field/user-profile-field.ts    | 2 +-
 src/core/user/pages/about/about.module.ts                       | 2 +-
 src/core/user/pages/about/about.ts                              | 2 +-
 src/core/user/pages/participants/participants.module.ts         | 2 +-
 src/core/user/pages/participants/participants.ts                | 2 +-
 src/core/user/pages/profile/profile.module.ts                   | 2 +-
 src/core/user/pages/profile/profile.ts                          | 2 +-
 src/core/user/providers/course-option-handler.ts                | 2 +-
 src/core/user/providers/helper.ts                               | 2 +-
 src/core/user/providers/offline.ts                              | 2 +-
 src/core/user/providers/participants-link-handler.ts            | 2 +-
 src/core/user/providers/sync-cron-handler.ts                    | 2 +-
 src/core/user/providers/sync.ts                                 | 2 +-
 src/core/user/providers/tag-area-handler.ts                     | 2 +-
 src/core/user/providers/user-delegate.ts                        | 2 +-
 src/core/user/providers/user-handler.ts                         | 2 +-
 src/core/user/providers/user-link-handler.ts                    | 2 +-
 src/core/user/providers/user-profile-field-delegate.ts          | 2 +-
 src/core/user/providers/user.ts                                 | 2 +-
 src/core/user/user.module.ts                                    | 2 +-
 src/core/viewer/pages/iframe/iframe.module.ts                   | 2 +-
 src/core/viewer/pages/iframe/iframe.ts                          | 2 +-
 src/core/viewer/pages/image/image.module.ts                     | 2 +-
 src/core/viewer/pages/image/image.ts                            | 2 +-
 src/core/viewer/pages/text/text.module.ts                       | 2 +-
 src/core/viewer/pages/text/text.ts                              | 2 +-
 src/directives/auto-focus.ts                                    | 2 +-
 src/directives/auto-rows.ts                                     | 2 +-
 src/directives/back-button.ts                                   | 2 +-
 src/directives/directives.module.ts                             | 2 +-
 src/directives/download-file.ts                                 | 2 +-
 src/directives/external-content.ts                              | 2 +-
 src/directives/fab.ts                                           | 2 +-
 src/directives/format-text.ts                                   | 2 +-
 src/directives/keep-keyboard.ts                                 | 2 +-
 src/directives/link.ts                                          | 2 +-
 src/directives/long-press.ts                                    | 2 +-
 src/directives/supress-events.ts                                | 2 +-
 src/directives/user-link.ts                                     | 2 +-
 src/pipes/bytes-to-size.ts                                      | 2 +-
 src/pipes/create-links.ts                                       | 2 +-
 src/pipes/date-day-or-time.ts                                   | 2 +-
 src/pipes/duration.ts                                           | 2 +-
 src/pipes/format-date.ts                                        | 2 +-
 src/pipes/no-tags.ts                                            | 2 +-
 src/pipes/pipes.module.ts                                       | 2 +-
 src/pipes/seconds-to-hms.ts                                     | 2 +-
 src/pipes/time-ago.ts                                           | 2 +-
 src/pipes/to-locale-string.ts                                   | 2 +-
 src/providers/app.ts                                            | 2 +-
 src/providers/config.ts                                         | 2 +-
 src/providers/cron.ts                                           | 2 +-
 src/providers/db.ts                                             | 2 +-
 src/providers/events.ts                                         | 2 +-
 src/providers/file-helper.ts                                    | 2 +-
 src/providers/file-session.ts                                   | 2 +-
 src/providers/file.ts                                           | 2 +-
 src/providers/filepool.ts                                       | 2 +-
 src/providers/groups.ts                                         | 2 +-
 src/providers/init.ts                                           | 2 +-
 src/providers/lang.ts                                           | 2 +-
 src/providers/local-notifications.ts                            | 2 +-
 src/providers/logger.ts                                         | 2 +-
 src/providers/plugin-file-delegate.ts                           | 2 +-
 src/providers/sites-factory.ts                                  | 2 +-
 src/providers/sites.ts                                          | 2 +-
 src/providers/sync.ts                                           | 2 +-
 src/providers/update-manager.ts                                 | 2 +-
 src/providers/urlschemes.ts                                     | 2 +-
 src/providers/utils/dom.ts                                      | 2 +-
 src/providers/utils/iframe.ts                                   | 2 +-
 src/providers/utils/mimetype.ts                                 | 2 +-
 src/providers/utils/text.ts                                     | 2 +-
 src/providers/utils/time.ts                                     | 2 +-
 src/providers/utils/url.ts                                      | 2 +-
 src/providers/utils/utils.ts                                    | 2 +-
 src/providers/ws.ts                                             | 2 +-
 1242 files changed, 1242 insertions(+), 1242 deletions(-)

diff --git a/MainActivity.java b/MainActivity.java
index 74acfbb07..92a34c3c0 100755
--- a/MainActivity.java
+++ b/MainActivity.java
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/NOTICE b/NOTICE
index f8dca79e3..64a4824f2 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-(C) Copyright 2015 Martin Dougiamas
+(C) Copyright 2015 Moodle Pty Ltd.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/gulpfile.js b/gulpfile.js
index f0bc12a16..426ea8cc2 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -13,7 +13,7 @@ var gulp = require('gulp'),
     File = gutil.File,
     exec = require('child_process').exec,
     license = '' +
-        '// (C) Copyright 2015 Martin Dougiamas\n' +
+        '// (C) Copyright 2015 Moodle Pty Ltd.\n' +
         '//\n' +
         '// Licensed under the Apache License, Version 2.0 (the "License");\n' +
         '// you may not use this file except in compliance with the License.\n' +
diff --git a/src/addon/badges/badges.module.ts b/src/addon/badges/badges.module.ts
index 20163a208..a85fb49f5 100644
--- a/src/addon/badges/badges.module.ts
+++ b/src/addon/badges/badges.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/badges/pages/issued-badge/issued-badge.module.ts b/src/addon/badges/pages/issued-badge/issued-badge.module.ts
index cdc621998..a44bd34ef 100644
--- a/src/addon/badges/pages/issued-badge/issued-badge.module.ts
+++ b/src/addon/badges/pages/issued-badge/issued-badge.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/badges/pages/issued-badge/issued-badge.ts b/src/addon/badges/pages/issued-badge/issued-badge.ts
index ba99f1bc2..46977fd45 100644
--- a/src/addon/badges/pages/issued-badge/issued-badge.ts
+++ b/src/addon/badges/pages/issued-badge/issued-badge.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/badges/pages/user-badges/user-badges.module.ts b/src/addon/badges/pages/user-badges/user-badges.module.ts
index 2609cdf00..03c8ecbe8 100644
--- a/src/addon/badges/pages/user-badges/user-badges.module.ts
+++ b/src/addon/badges/pages/user-badges/user-badges.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/badges/pages/user-badges/user-badges.ts b/src/addon/badges/pages/user-badges/user-badges.ts
index d25b88627..70c7f04ed 100644
--- a/src/addon/badges/pages/user-badges/user-badges.ts
+++ b/src/addon/badges/pages/user-badges/user-badges.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/badges/providers/badge-link-handler.ts b/src/addon/badges/providers/badge-link-handler.ts
index 0f98f0f0d..21fd59ab7 100644
--- a/src/addon/badges/providers/badge-link-handler.ts
+++ b/src/addon/badges/providers/badge-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/badges/providers/badges.ts b/src/addon/badges/providers/badges.ts
index 79f0598ad..bfb70431e 100644
--- a/src/addon/badges/providers/badges.ts
+++ b/src/addon/badges/providers/badges.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/badges/providers/mybadges-link-handler.ts b/src/addon/badges/providers/mybadges-link-handler.ts
index f9ea5e8a3..7a3db5562 100644
--- a/src/addon/badges/providers/mybadges-link-handler.ts
+++ b/src/addon/badges/providers/mybadges-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/badges/providers/push-click-handler.ts b/src/addon/badges/providers/push-click-handler.ts
index c36e1e3e2..816a5cc47 100644
--- a/src/addon/badges/providers/push-click-handler.ts
+++ b/src/addon/badges/providers/push-click-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/badges/providers/user-handler.ts b/src/addon/badges/providers/user-handler.ts
index 5c8e705e3..22c7daa58 100644
--- a/src/addon/badges/providers/user-handler.ts
+++ b/src/addon/badges/providers/user-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/activitymodules/activitymodules.module.ts b/src/addon/block/activitymodules/activitymodules.module.ts
index 88fbb6e06..0a05e1cdc 100644
--- a/src/addon/block/activitymodules/activitymodules.module.ts
+++ b/src/addon/block/activitymodules/activitymodules.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts b/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts
index 6a96b2169..215ca90b5 100644
--- a/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts
+++ b/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/activitymodules/components/components.module.ts b/src/addon/block/activitymodules/components/components.module.ts
index 5cbc4cfd4..a5d1651b3 100644
--- a/src/addon/block/activitymodules/components/components.module.ts
+++ b/src/addon/block/activitymodules/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/activitymodules/providers/block-handler.ts b/src/addon/block/activitymodules/providers/block-handler.ts
index aeee44e52..53310d351 100644
--- a/src/addon/block/activitymodules/providers/block-handler.ts
+++ b/src/addon/block/activitymodules/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/badges/badges.module.ts b/src/addon/block/badges/badges.module.ts
index ff9c450d2..7b4a5ad38 100644
--- a/src/addon/block/badges/badges.module.ts
+++ b/src/addon/block/badges/badges.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/badges/providers/block-handler.ts b/src/addon/block/badges/providers/block-handler.ts
index 4b9b6971e..defc559c6 100644
--- a/src/addon/block/badges/providers/block-handler.ts
+++ b/src/addon/block/badges/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/blogmenu/blogmenu.module.ts b/src/addon/block/blogmenu/blogmenu.module.ts
index cbca10200..6c3b51dc8 100644
--- a/src/addon/block/blogmenu/blogmenu.module.ts
+++ b/src/addon/block/blogmenu/blogmenu.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/blogmenu/providers/block-handler.ts b/src/addon/block/blogmenu/providers/block-handler.ts
index 86446a1fe..b8d445b0f 100644
--- a/src/addon/block/blogmenu/providers/block-handler.ts
+++ b/src/addon/block/blogmenu/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/blogrecent/blogrecent.module.ts b/src/addon/block/blogrecent/blogrecent.module.ts
index 1ecdf6f7b..0f09c7e4b 100644
--- a/src/addon/block/blogrecent/blogrecent.module.ts
+++ b/src/addon/block/blogrecent/blogrecent.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/blogrecent/providers/block-handler.ts b/src/addon/block/blogrecent/providers/block-handler.ts
index 8fca85a70..7c3887c5b 100644
--- a/src/addon/block/blogrecent/providers/block-handler.ts
+++ b/src/addon/block/blogrecent/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/blogtags/blogtags.module.ts b/src/addon/block/blogtags/blogtags.module.ts
index a9ed3a090..7a36e6f4e 100644
--- a/src/addon/block/blogtags/blogtags.module.ts
+++ b/src/addon/block/blogtags/blogtags.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/blogtags/providers/block-handler.ts b/src/addon/block/blogtags/providers/block-handler.ts
index a73d45f17..0c2becf40 100644
--- a/src/addon/block/blogtags/providers/block-handler.ts
+++ b/src/addon/block/blogtags/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/calendarmonth/calendarmonth.module.ts b/src/addon/block/calendarmonth/calendarmonth.module.ts
index e3204ae8f..8388cc464 100644
--- a/src/addon/block/calendarmonth/calendarmonth.module.ts
+++ b/src/addon/block/calendarmonth/calendarmonth.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/calendarmonth/providers/block-handler.ts b/src/addon/block/calendarmonth/providers/block-handler.ts
index 4f1724ea6..1f4c46084 100644
--- a/src/addon/block/calendarmonth/providers/block-handler.ts
+++ b/src/addon/block/calendarmonth/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/calendarupcoming/calendarupcoming.module.ts b/src/addon/block/calendarupcoming/calendarupcoming.module.ts
index 345d17672..cc9d804f7 100644
--- a/src/addon/block/calendarupcoming/calendarupcoming.module.ts
+++ b/src/addon/block/calendarupcoming/calendarupcoming.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/calendarupcoming/providers/block-handler.ts b/src/addon/block/calendarupcoming/providers/block-handler.ts
index edadfb05c..4adc5dfb5 100644
--- a/src/addon/block/calendarupcoming/providers/block-handler.ts
+++ b/src/addon/block/calendarupcoming/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/comments/comments.module.ts b/src/addon/block/comments/comments.module.ts
index dce565e7d..ab09d9ac1 100644
--- a/src/addon/block/comments/comments.module.ts
+++ b/src/addon/block/comments/comments.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/comments/providers/block-handler.ts b/src/addon/block/comments/providers/block-handler.ts
index 594b262f7..526cc9d79 100644
--- a/src/addon/block/comments/providers/block-handler.ts
+++ b/src/addon/block/comments/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/completionstatus/completionstatus.module.ts b/src/addon/block/completionstatus/completionstatus.module.ts
index 37d448a93..c84115d9d 100644
--- a/src/addon/block/completionstatus/completionstatus.module.ts
+++ b/src/addon/block/completionstatus/completionstatus.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/completionstatus/providers/block-handler.ts b/src/addon/block/completionstatus/providers/block-handler.ts
index 7edac6643..d64fee217 100644
--- a/src/addon/block/completionstatus/providers/block-handler.ts
+++ b/src/addon/block/completionstatus/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/glossaryrandom/glossaryrandom.module.ts b/src/addon/block/glossaryrandom/glossaryrandom.module.ts
index e6d238957..df316f008 100644
--- a/src/addon/block/glossaryrandom/glossaryrandom.module.ts
+++ b/src/addon/block/glossaryrandom/glossaryrandom.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/glossaryrandom/providers/block-handler.ts b/src/addon/block/glossaryrandom/providers/block-handler.ts
index 8e54cf602..259b4616b 100644
--- a/src/addon/block/glossaryrandom/providers/block-handler.ts
+++ b/src/addon/block/glossaryrandom/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/html/html.module.ts b/src/addon/block/html/html.module.ts
index 1b81cf4ad..18cd3925d 100644
--- a/src/addon/block/html/html.module.ts
+++ b/src/addon/block/html/html.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/html/providers/block-handler.ts b/src/addon/block/html/providers/block-handler.ts
index 4d91839c1..5b5dda4f0 100644
--- a/src/addon/block/html/providers/block-handler.ts
+++ b/src/addon/block/html/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/learningplans/learningplans.module.ts b/src/addon/block/learningplans/learningplans.module.ts
index 167178d70..936aa8edb 100644
--- a/src/addon/block/learningplans/learningplans.module.ts
+++ b/src/addon/block/learningplans/learningplans.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/learningplans/providers/block-handler.ts b/src/addon/block/learningplans/providers/block-handler.ts
index e831019be..cc1396a78 100644
--- a/src/addon/block/learningplans/providers/block-handler.ts
+++ b/src/addon/block/learningplans/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/myoverview/components/components.module.ts b/src/addon/block/myoverview/components/components.module.ts
index 45930cb01..d345b508c 100644
--- a/src/addon/block/myoverview/components/components.module.ts
+++ b/src/addon/block/myoverview/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/myoverview/components/myoverview/myoverview.ts b/src/addon/block/myoverview/components/myoverview/myoverview.ts
index 06c57fd6e..2552c597b 100644
--- a/src/addon/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addon/block/myoverview/components/myoverview/myoverview.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/myoverview/myoverview.module.ts b/src/addon/block/myoverview/myoverview.module.ts
index 91e854546..6b26273e2 100644
--- a/src/addon/block/myoverview/myoverview.module.ts
+++ b/src/addon/block/myoverview/myoverview.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/myoverview/providers/block-handler.ts b/src/addon/block/myoverview/providers/block-handler.ts
index f7d434747..976c3c046 100644
--- a/src/addon/block/myoverview/providers/block-handler.ts
+++ b/src/addon/block/myoverview/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/newsitems/newsitems.module.ts b/src/addon/block/newsitems/newsitems.module.ts
index a3364ea5e..11af484ba 100644
--- a/src/addon/block/newsitems/newsitems.module.ts
+++ b/src/addon/block/newsitems/newsitems.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/newsitems/providers/block-handler.ts b/src/addon/block/newsitems/providers/block-handler.ts
index 86b12b57f..48e1692c3 100644
--- a/src/addon/block/newsitems/providers/block-handler.ts
+++ b/src/addon/block/newsitems/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/onlineusers/onlineusers.module.ts b/src/addon/block/onlineusers/onlineusers.module.ts
index 0df61ad7a..b243c7e8a 100644
--- a/src/addon/block/onlineusers/onlineusers.module.ts
+++ b/src/addon/block/onlineusers/onlineusers.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/onlineusers/providers/block-handler.ts b/src/addon/block/onlineusers/providers/block-handler.ts
index 78505b0de..a1bfc4e61 100644
--- a/src/addon/block/onlineusers/providers/block-handler.ts
+++ b/src/addon/block/onlineusers/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/privatefiles/privatefiles.module.ts b/src/addon/block/privatefiles/privatefiles.module.ts
index c9617c372..81c2a7f5f 100644
--- a/src/addon/block/privatefiles/privatefiles.module.ts
+++ b/src/addon/block/privatefiles/privatefiles.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/privatefiles/providers/block-handler.ts b/src/addon/block/privatefiles/providers/block-handler.ts
index 811aea153..7632f770b 100644
--- a/src/addon/block/privatefiles/providers/block-handler.ts
+++ b/src/addon/block/privatefiles/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/recentactivity/providers/block-handler.ts b/src/addon/block/recentactivity/providers/block-handler.ts
index b3d6042a4..832fdbcbc 100644
--- a/src/addon/block/recentactivity/providers/block-handler.ts
+++ b/src/addon/block/recentactivity/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/recentactivity/recentactivity.module.ts b/src/addon/block/recentactivity/recentactivity.module.ts
index cd0136763..4d20d2114 100644
--- a/src/addon/block/recentactivity/recentactivity.module.ts
+++ b/src/addon/block/recentactivity/recentactivity.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/recentlyaccessedcourses/components/components.module.ts b/src/addon/block/recentlyaccessedcourses/components/components.module.ts
index dde98101c..39e3c11a1 100644
--- a/src/addon/block/recentlyaccessedcourses/components/components.module.ts
+++ b/src/addon/block/recentlyaccessedcourses/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts b/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
index 7db55fcfd..62d429f49 100644
--- a/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
+++ b/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/recentlyaccessedcourses/providers/block-handler.ts b/src/addon/block/recentlyaccessedcourses/providers/block-handler.ts
index 0f70d2768..d562effe8 100644
--- a/src/addon/block/recentlyaccessedcourses/providers/block-handler.ts
+++ b/src/addon/block/recentlyaccessedcourses/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/recentlyaccessedcourses/recentlyaccessedcourses.module.ts b/src/addon/block/recentlyaccessedcourses/recentlyaccessedcourses.module.ts
index 99a9ad3fd..53ade7657 100644
--- a/src/addon/block/recentlyaccessedcourses/recentlyaccessedcourses.module.ts
+++ b/src/addon/block/recentlyaccessedcourses/recentlyaccessedcourses.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/recentlyaccesseditems/components/components.module.ts b/src/addon/block/recentlyaccesseditems/components/components.module.ts
index 1ce6d5557..bede51164 100644
--- a/src/addon/block/recentlyaccesseditems/components/components.module.ts
+++ b/src/addon/block/recentlyaccesseditems/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts b/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts
index 4c232f39f..f36f5ad74 100644
--- a/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts
+++ b/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/recentlyaccesseditems/providers/block-handler.ts b/src/addon/block/recentlyaccesseditems/providers/block-handler.ts
index 928f33e1b..5ba0425c9 100644
--- a/src/addon/block/recentlyaccesseditems/providers/block-handler.ts
+++ b/src/addon/block/recentlyaccesseditems/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/recentlyaccesseditems/providers/recentlyaccesseditems.ts b/src/addon/block/recentlyaccesseditems/providers/recentlyaccesseditems.ts
index 414b2366f..3eb38e75b 100644
--- a/src/addon/block/recentlyaccesseditems/providers/recentlyaccesseditems.ts
+++ b/src/addon/block/recentlyaccesseditems/providers/recentlyaccesseditems.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/recentlyaccesseditems/recentlyaccesseditems.module.ts b/src/addon/block/recentlyaccesseditems/recentlyaccesseditems.module.ts
index 5df77fe5f..3a9229176 100644
--- a/src/addon/block/recentlyaccesseditems/recentlyaccesseditems.module.ts
+++ b/src/addon/block/recentlyaccesseditems/recentlyaccesseditems.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/rssclient/providers/block-handler.ts b/src/addon/block/rssclient/providers/block-handler.ts
index 770f74398..e7ad835e3 100644
--- a/src/addon/block/rssclient/providers/block-handler.ts
+++ b/src/addon/block/rssclient/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/rssclient/rssclient.module.ts b/src/addon/block/rssclient/rssclient.module.ts
index b98c39ae5..402bd00ac 100644
--- a/src/addon/block/rssclient/rssclient.module.ts
+++ b/src/addon/block/rssclient/rssclient.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/selfcompletion/providers/block-handler.ts b/src/addon/block/selfcompletion/providers/block-handler.ts
index f9ea51d35..b9309609d 100644
--- a/src/addon/block/selfcompletion/providers/block-handler.ts
+++ b/src/addon/block/selfcompletion/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/selfcompletion/selfcompletion.module.ts b/src/addon/block/selfcompletion/selfcompletion.module.ts
index b101210b2..8330faa9d 100644
--- a/src/addon/block/selfcompletion/selfcompletion.module.ts
+++ b/src/addon/block/selfcompletion/selfcompletion.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/sitemainmenu/components/components.module.ts b/src/addon/block/sitemainmenu/components/components.module.ts
index a121183a5..9ca18bf78 100644
--- a/src/addon/block/sitemainmenu/components/components.module.ts
+++ b/src/addon/block/sitemainmenu/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts b/src/addon/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
index 19030b3cc..8568c8225 100644
--- a/src/addon/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
+++ b/src/addon/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/sitemainmenu/providers/block-handler.ts b/src/addon/block/sitemainmenu/providers/block-handler.ts
index b7118a5f4..305a46eb0 100644
--- a/src/addon/block/sitemainmenu/providers/block-handler.ts
+++ b/src/addon/block/sitemainmenu/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/sitemainmenu/sitemainmenu.module.ts b/src/addon/block/sitemainmenu/sitemainmenu.module.ts
index ace9f339e..5c475da1d 100644
--- a/src/addon/block/sitemainmenu/sitemainmenu.module.ts
+++ b/src/addon/block/sitemainmenu/sitemainmenu.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/starredcourses/components/components.module.ts b/src/addon/block/starredcourses/components/components.module.ts
index f24aff329..5cd67b4b6 100644
--- a/src/addon/block/starredcourses/components/components.module.ts
+++ b/src/addon/block/starredcourses/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts b/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts
index ca7e3156e..3e02be6a5 100644
--- a/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts
+++ b/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/starredcourses/providers/block-handler.ts b/src/addon/block/starredcourses/providers/block-handler.ts
index c65f01aff..a9bbc579e 100644
--- a/src/addon/block/starredcourses/providers/block-handler.ts
+++ b/src/addon/block/starredcourses/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/starredcourses/starredcourses.module.ts b/src/addon/block/starredcourses/starredcourses.module.ts
index 3d363ec79..96b973ef7 100644
--- a/src/addon/block/starredcourses/starredcourses.module.ts
+++ b/src/addon/block/starredcourses/starredcourses.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/tags/providers/block-handler.ts b/src/addon/block/tags/providers/block-handler.ts
index 963ae63f3..566bd6bfa 100644
--- a/src/addon/block/tags/providers/block-handler.ts
+++ b/src/addon/block/tags/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/tags/tags.module.ts b/src/addon/block/tags/tags.module.ts
index 4b57911c0..7367edbdc 100644
--- a/src/addon/block/tags/tags.module.ts
+++ b/src/addon/block/tags/tags.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/timeline/components/components.module.ts b/src/addon/block/timeline/components/components.module.ts
index c408138ef..465a66858 100644
--- a/src/addon/block/timeline/components/components.module.ts
+++ b/src/addon/block/timeline/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/timeline/components/events/events.ts b/src/addon/block/timeline/components/events/events.ts
index 07dbf0ac0..74424a614 100644
--- a/src/addon/block/timeline/components/events/events.ts
+++ b/src/addon/block/timeline/components/events/events.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/timeline/components/timeline/timeline.ts b/src/addon/block/timeline/components/timeline/timeline.ts
index 68e104bbe..1fa7a3f3b 100644
--- a/src/addon/block/timeline/components/timeline/timeline.ts
+++ b/src/addon/block/timeline/components/timeline/timeline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/timeline/providers/block-handler.ts b/src/addon/block/timeline/providers/block-handler.ts
index e116002b7..1b5044146 100644
--- a/src/addon/block/timeline/providers/block-handler.ts
+++ b/src/addon/block/timeline/providers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/timeline/providers/timeline.ts b/src/addon/block/timeline/providers/timeline.ts
index 66d4bcd43..95148ce26 100644
--- a/src/addon/block/timeline/providers/timeline.ts
+++ b/src/addon/block/timeline/providers/timeline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/block/timeline/timeline.module.ts b/src/addon/block/timeline/timeline.module.ts
index 92ed2cefc..084de8980 100644
--- a/src/addon/block/timeline/timeline.module.ts
+++ b/src/addon/block/timeline/timeline.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/blog/blog.module.ts b/src/addon/blog/blog.module.ts
index b697ba27a..0d642e012 100644
--- a/src/addon/blog/blog.module.ts
+++ b/src/addon/blog/blog.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/blog/components/components.module.ts b/src/addon/blog/components/components.module.ts
index efba08d7d..f8deceac2 100644
--- a/src/addon/blog/components/components.module.ts
+++ b/src/addon/blog/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/blog/components/entries/entries.ts b/src/addon/blog/components/entries/entries.ts
index e0e022245..fb103d306 100644
--- a/src/addon/blog/components/entries/entries.ts
+++ b/src/addon/blog/components/entries/entries.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/blog/pages/entries/entries.module.ts b/src/addon/blog/pages/entries/entries.module.ts
index a9cb5564f..c63779472 100644
--- a/src/addon/blog/pages/entries/entries.module.ts
+++ b/src/addon/blog/pages/entries/entries.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/blog/pages/entries/entries.ts b/src/addon/blog/pages/entries/entries.ts
index 220de15df..cab44eb7f 100644
--- a/src/addon/blog/pages/entries/entries.ts
+++ b/src/addon/blog/pages/entries/entries.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/blog/providers/blog.ts b/src/addon/blog/providers/blog.ts
index ab3cf1935..c57da1044 100644
--- a/src/addon/blog/providers/blog.ts
+++ b/src/addon/blog/providers/blog.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/blog/providers/course-option-handler.ts b/src/addon/blog/providers/course-option-handler.ts
index 769a75f5f..7632c8df7 100644
--- a/src/addon/blog/providers/course-option-handler.ts
+++ b/src/addon/blog/providers/course-option-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/blog/providers/index-link-handler.ts b/src/addon/blog/providers/index-link-handler.ts
index ab728fd06..dd613b72e 100644
--- a/src/addon/blog/providers/index-link-handler.ts
+++ b/src/addon/blog/providers/index-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/blog/providers/mainmenu-handler.ts b/src/addon/blog/providers/mainmenu-handler.ts
index 4f157e5bb..622adf650 100644
--- a/src/addon/blog/providers/mainmenu-handler.ts
+++ b/src/addon/blog/providers/mainmenu-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/blog/providers/tag-area-handler.ts b/src/addon/blog/providers/tag-area-handler.ts
index 7d38f48c2..0800db2f8 100644
--- a/src/addon/blog/providers/tag-area-handler.ts
+++ b/src/addon/blog/providers/tag-area-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/blog/providers/user-handler.ts b/src/addon/blog/providers/user-handler.ts
index 6911ba70d..b676c96b8 100644
--- a/src/addon/blog/providers/user-handler.ts
+++ b/src/addon/blog/providers/user-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/calendar.module.ts b/src/addon/calendar/calendar.module.ts
index 28765fad6..37f7f2017 100644
--- a/src/addon/calendar/calendar.module.ts
+++ b/src/addon/calendar/calendar.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/components/calendar/calendar.ts b/src/addon/calendar/components/calendar/calendar.ts
index cd9e1deda..05ca83e1d 100644
--- a/src/addon/calendar/components/calendar/calendar.ts
+++ b/src/addon/calendar/components/calendar/calendar.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/components/components.module.ts b/src/addon/calendar/components/components.module.ts
index 3928f6dd9..45656098d 100644
--- a/src/addon/calendar/components/components.module.ts
+++ b/src/addon/calendar/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/components/upcoming-events/upcoming-events.ts b/src/addon/calendar/components/upcoming-events/upcoming-events.ts
index 2dae78490..4b12725ea 100644
--- a/src/addon/calendar/components/upcoming-events/upcoming-events.ts
+++ b/src/addon/calendar/components/upcoming-events/upcoming-events.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/pages/day/day.module.ts b/src/addon/calendar/pages/day/day.module.ts
index c4e33dbb9..7a672b6c5 100644
--- a/src/addon/calendar/pages/day/day.module.ts
+++ b/src/addon/calendar/pages/day/day.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/pages/day/day.ts b/src/addon/calendar/pages/day/day.ts
index 87936754d..3730cd253 100644
--- a/src/addon/calendar/pages/day/day.ts
+++ b/src/addon/calendar/pages/day/day.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/pages/edit-event/edit-event.module.ts b/src/addon/calendar/pages/edit-event/edit-event.module.ts
index c5b20e969..32a1ac65a 100644
--- a/src/addon/calendar/pages/edit-event/edit-event.module.ts
+++ b/src/addon/calendar/pages/edit-event/edit-event.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/pages/edit-event/edit-event.ts b/src/addon/calendar/pages/edit-event/edit-event.ts
index a17e5cd5a..a1dd48d41 100644
--- a/src/addon/calendar/pages/edit-event/edit-event.ts
+++ b/src/addon/calendar/pages/edit-event/edit-event.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/pages/event/event.module.ts b/src/addon/calendar/pages/event/event.module.ts
index fe5029958..54d4d5e31 100644
--- a/src/addon/calendar/pages/event/event.module.ts
+++ b/src/addon/calendar/pages/event/event.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/pages/event/event.ts b/src/addon/calendar/pages/event/event.ts
index 21b503b5a..8bd8e9b18 100644
--- a/src/addon/calendar/pages/event/event.ts
+++ b/src/addon/calendar/pages/event/event.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/pages/index/index.module.ts b/src/addon/calendar/pages/index/index.module.ts
index bf925e799..91a657304 100644
--- a/src/addon/calendar/pages/index/index.module.ts
+++ b/src/addon/calendar/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/pages/index/index.ts b/src/addon/calendar/pages/index/index.ts
index e9dd336de..6ab4a88ba 100644
--- a/src/addon/calendar/pages/index/index.ts
+++ b/src/addon/calendar/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/pages/list/list.module.ts b/src/addon/calendar/pages/list/list.module.ts
index bfe0f7ecd..b5e7d1f99 100644
--- a/src/addon/calendar/pages/list/list.module.ts
+++ b/src/addon/calendar/pages/list/list.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/pages/list/list.ts b/src/addon/calendar/pages/list/list.ts
index 2bb675eda..5a0643ae1 100644
--- a/src/addon/calendar/pages/list/list.ts
+++ b/src/addon/calendar/pages/list/list.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/pages/settings/settings.module.ts b/src/addon/calendar/pages/settings/settings.module.ts
index f325d5f7a..d6abe8a15 100644
--- a/src/addon/calendar/pages/settings/settings.module.ts
+++ b/src/addon/calendar/pages/settings/settings.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/pages/settings/settings.ts b/src/addon/calendar/pages/settings/settings.ts
index 9027272db..cfd83d501 100644
--- a/src/addon/calendar/pages/settings/settings.ts
+++ b/src/addon/calendar/pages/settings/settings.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/providers/calendar-offline.ts b/src/addon/calendar/providers/calendar-offline.ts
index 868d8558b..072f579dc 100644
--- a/src/addon/calendar/providers/calendar-offline.ts
+++ b/src/addon/calendar/providers/calendar-offline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/providers/calendar-sync.ts b/src/addon/calendar/providers/calendar-sync.ts
index d237e0897..3dd0e6f16 100644
--- a/src/addon/calendar/providers/calendar-sync.ts
+++ b/src/addon/calendar/providers/calendar-sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/providers/calendar.ts b/src/addon/calendar/providers/calendar.ts
index 794e86796..cb8dd8485 100644
--- a/src/addon/calendar/providers/calendar.ts
+++ b/src/addon/calendar/providers/calendar.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/providers/helper.ts b/src/addon/calendar/providers/helper.ts
index 515ad44fa..7fd8362ea 100644
--- a/src/addon/calendar/providers/helper.ts
+++ b/src/addon/calendar/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/providers/mainmenu-handler.ts b/src/addon/calendar/providers/mainmenu-handler.ts
index 2b38a6507..47374f033 100644
--- a/src/addon/calendar/providers/mainmenu-handler.ts
+++ b/src/addon/calendar/providers/mainmenu-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/providers/sync-cron-handler.ts b/src/addon/calendar/providers/sync-cron-handler.ts
index a73e8d1a8..90e8b4c16 100644
--- a/src/addon/calendar/providers/sync-cron-handler.ts
+++ b/src/addon/calendar/providers/sync-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/calendar/providers/view-link-handler.ts b/src/addon/calendar/providers/view-link-handler.ts
index 630c4c4fb..15b1ce78f 100644
--- a/src/addon/calendar/providers/view-link-handler.ts
+++ b/src/addon/calendar/providers/view-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/competency.module.ts b/src/addon/competency/competency.module.ts
index b7aecb757..1d05db647 100644
--- a/src/addon/competency/competency.module.ts
+++ b/src/addon/competency/competency.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/components/components.module.ts b/src/addon/competency/components/components.module.ts
index 670d33720..8a1559965 100644
--- a/src/addon/competency/components/components.module.ts
+++ b/src/addon/competency/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/components/course/course.ts b/src/addon/competency/components/course/course.ts
index d6cfb77c9..b6d4f7fcb 100644
--- a/src/addon/competency/components/course/course.ts
+++ b/src/addon/competency/components/course/course.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/pages/competencies/competencies.module.ts b/src/addon/competency/pages/competencies/competencies.module.ts
index 2f4780f53..8e5f1fca5 100644
--- a/src/addon/competency/pages/competencies/competencies.module.ts
+++ b/src/addon/competency/pages/competencies/competencies.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/pages/competencies/competencies.ts b/src/addon/competency/pages/competencies/competencies.ts
index c3f945bf3..0a103f867 100644
--- a/src/addon/competency/pages/competencies/competencies.ts
+++ b/src/addon/competency/pages/competencies/competencies.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/pages/competency/competency.module.ts b/src/addon/competency/pages/competency/competency.module.ts
index 028abfa2d..ebc8079cd 100644
--- a/src/addon/competency/pages/competency/competency.module.ts
+++ b/src/addon/competency/pages/competency/competency.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/pages/competency/competency.ts b/src/addon/competency/pages/competency/competency.ts
index c7265f4e2..06c33666a 100644
--- a/src/addon/competency/pages/competency/competency.ts
+++ b/src/addon/competency/pages/competency/competency.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/pages/competencysummary/competencysummary.module.ts b/src/addon/competency/pages/competencysummary/competencysummary.module.ts
index 855095dbf..8be154249 100644
--- a/src/addon/competency/pages/competencysummary/competencysummary.module.ts
+++ b/src/addon/competency/pages/competencysummary/competencysummary.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/pages/competencysummary/competencysummary.ts b/src/addon/competency/pages/competencysummary/competencysummary.ts
index 27eccf836..774dedc0c 100644
--- a/src/addon/competency/pages/competencysummary/competencysummary.ts
+++ b/src/addon/competency/pages/competencysummary/competencysummary.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/pages/coursecompetencies/coursecompetencies.module.ts b/src/addon/competency/pages/coursecompetencies/coursecompetencies.module.ts
index 321018a96..0dd7b7598 100644
--- a/src/addon/competency/pages/coursecompetencies/coursecompetencies.module.ts
+++ b/src/addon/competency/pages/coursecompetencies/coursecompetencies.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/pages/coursecompetencies/coursecompetencies.ts b/src/addon/competency/pages/coursecompetencies/coursecompetencies.ts
index 42bb83f71..836d01a45 100644
--- a/src/addon/competency/pages/coursecompetencies/coursecompetencies.ts
+++ b/src/addon/competency/pages/coursecompetencies/coursecompetencies.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/pages/plan/plan.module.ts b/src/addon/competency/pages/plan/plan.module.ts
index bb7f48038..92b4a0cae 100644
--- a/src/addon/competency/pages/plan/plan.module.ts
+++ b/src/addon/competency/pages/plan/plan.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/pages/plan/plan.ts b/src/addon/competency/pages/plan/plan.ts
index a5ef30d5a..ba4e53f20 100644
--- a/src/addon/competency/pages/plan/plan.ts
+++ b/src/addon/competency/pages/plan/plan.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/pages/planlist/planlist.module.ts b/src/addon/competency/pages/planlist/planlist.module.ts
index 7a4e506fc..81c77d96c 100644
--- a/src/addon/competency/pages/planlist/planlist.module.ts
+++ b/src/addon/competency/pages/planlist/planlist.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/pages/planlist/planlist.ts b/src/addon/competency/pages/planlist/planlist.ts
index 0774d66d2..3802a02ec 100644
--- a/src/addon/competency/pages/planlist/planlist.ts
+++ b/src/addon/competency/pages/planlist/planlist.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/providers/competency-link-handler.ts b/src/addon/competency/providers/competency-link-handler.ts
index 9facae6b8..95c8362a6 100644
--- a/src/addon/competency/providers/competency-link-handler.ts
+++ b/src/addon/competency/providers/competency-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/providers/competency.ts b/src/addon/competency/providers/competency.ts
index 9be1e7068..b678704e7 100644
--- a/src/addon/competency/providers/competency.ts
+++ b/src/addon/competency/providers/competency.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/providers/course-option-handler.ts b/src/addon/competency/providers/course-option-handler.ts
index 8462d1ef2..32a6fd51d 100644
--- a/src/addon/competency/providers/course-option-handler.ts
+++ b/src/addon/competency/providers/course-option-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/providers/helper.ts b/src/addon/competency/providers/helper.ts
index 65f990a65..b956578d5 100644
--- a/src/addon/competency/providers/helper.ts
+++ b/src/addon/competency/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/providers/mainmenu-handler.ts b/src/addon/competency/providers/mainmenu-handler.ts
index eea927c3d..f3040968c 100644
--- a/src/addon/competency/providers/mainmenu-handler.ts
+++ b/src/addon/competency/providers/mainmenu-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/providers/plan-link-handler.ts b/src/addon/competency/providers/plan-link-handler.ts
index 07a7ae848..d03060f3b 100644
--- a/src/addon/competency/providers/plan-link-handler.ts
+++ b/src/addon/competency/providers/plan-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/providers/plans-link-handler.ts b/src/addon/competency/providers/plans-link-handler.ts
index 37a6f97c0..a423c1fc7 100644
--- a/src/addon/competency/providers/plans-link-handler.ts
+++ b/src/addon/competency/providers/plans-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/providers/push-click-handler.ts b/src/addon/competency/providers/push-click-handler.ts
index 2122fe313..c40509fec 100644
--- a/src/addon/competency/providers/push-click-handler.ts
+++ b/src/addon/competency/providers/push-click-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/providers/user-competency-link-handler.ts b/src/addon/competency/providers/user-competency-link-handler.ts
index 0af9deeef..3d1eafe35 100644
--- a/src/addon/competency/providers/user-competency-link-handler.ts
+++ b/src/addon/competency/providers/user-competency-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/competency/providers/user-handler.ts b/src/addon/competency/providers/user-handler.ts
index b377f4e4d..b2c07ebc0 100644
--- a/src/addon/competency/providers/user-handler.ts
+++ b/src/addon/competency/providers/user-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/coursecompletion/components/components.module.ts b/src/addon/coursecompletion/components/components.module.ts
index 140b2b3ff..5ed07218c 100644
--- a/src/addon/coursecompletion/components/components.module.ts
+++ b/src/addon/coursecompletion/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/coursecompletion/components/report/report.ts b/src/addon/coursecompletion/components/report/report.ts
index 640def927..2f3532f0a 100644
--- a/src/addon/coursecompletion/components/report/report.ts
+++ b/src/addon/coursecompletion/components/report/report.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/coursecompletion/coursecompletion.module.ts b/src/addon/coursecompletion/coursecompletion.module.ts
index db3699489..6ce5ebbfd 100644
--- a/src/addon/coursecompletion/coursecompletion.module.ts
+++ b/src/addon/coursecompletion/coursecompletion.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/coursecompletion/pages/report/report.module.ts b/src/addon/coursecompletion/pages/report/report.module.ts
index 83f0a10e6..0bb1284d5 100644
--- a/src/addon/coursecompletion/pages/report/report.module.ts
+++ b/src/addon/coursecompletion/pages/report/report.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/coursecompletion/pages/report/report.ts b/src/addon/coursecompletion/pages/report/report.ts
index d874ae161..eec7e95a8 100644
--- a/src/addon/coursecompletion/pages/report/report.ts
+++ b/src/addon/coursecompletion/pages/report/report.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/coursecompletion/providers/course-option-handler.ts b/src/addon/coursecompletion/providers/course-option-handler.ts
index fa71437db..0a7671657 100644
--- a/src/addon/coursecompletion/providers/course-option-handler.ts
+++ b/src/addon/coursecompletion/providers/course-option-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/coursecompletion/providers/coursecompletion.ts b/src/addon/coursecompletion/providers/coursecompletion.ts
index f303acddb..85ab726fd 100644
--- a/src/addon/coursecompletion/providers/coursecompletion.ts
+++ b/src/addon/coursecompletion/providers/coursecompletion.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/coursecompletion/providers/user-handler.ts b/src/addon/coursecompletion/providers/user-handler.ts
index 5e3924689..51f826b1a 100644
--- a/src/addon/coursecompletion/providers/user-handler.ts
+++ b/src/addon/coursecompletion/providers/user-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/files/files.module.ts b/src/addon/files/files.module.ts
index f87e1344b..b1233d7b3 100644
--- a/src/addon/files/files.module.ts
+++ b/src/addon/files/files.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/files/pages/list/list.module.ts b/src/addon/files/pages/list/list.module.ts
index 94fd35db4..ad8bf4652 100644
--- a/src/addon/files/pages/list/list.module.ts
+++ b/src/addon/files/pages/list/list.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/files/pages/list/list.ts b/src/addon/files/pages/list/list.ts
index 061025ed0..99b58c774 100644
--- a/src/addon/files/pages/list/list.ts
+++ b/src/addon/files/pages/list/list.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/files/providers/files.ts b/src/addon/files/providers/files.ts
index 05613b992..bae3eaf51 100644
--- a/src/addon/files/providers/files.ts
+++ b/src/addon/files/providers/files.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/files/providers/helper.ts b/src/addon/files/providers/helper.ts
index 7cb3fa32d..d1d0cf6fd 100644
--- a/src/addon/files/providers/helper.ts
+++ b/src/addon/files/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/files/providers/mainmenu-handler.ts b/src/addon/files/providers/mainmenu-handler.ts
index d362a44a8..acf2c811e 100644
--- a/src/addon/files/providers/mainmenu-handler.ts
+++ b/src/addon/files/providers/mainmenu-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messageoutput/airnotifier/airnotifier.module.ts b/src/addon/messageoutput/airnotifier/airnotifier.module.ts
index 1a060c0a4..b8a3b3ca6 100644
--- a/src/addon/messageoutput/airnotifier/airnotifier.module.ts
+++ b/src/addon/messageoutput/airnotifier/airnotifier.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messageoutput/airnotifier/pages/devices/devices.module.ts b/src/addon/messageoutput/airnotifier/pages/devices/devices.module.ts
index 22dc3b201..4f8239e39 100644
--- a/src/addon/messageoutput/airnotifier/pages/devices/devices.module.ts
+++ b/src/addon/messageoutput/airnotifier/pages/devices/devices.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messageoutput/airnotifier/pages/devices/devices.ts b/src/addon/messageoutput/airnotifier/pages/devices/devices.ts
index dfe0e5403..11b4f4cc6 100644
--- a/src/addon/messageoutput/airnotifier/pages/devices/devices.ts
+++ b/src/addon/messageoutput/airnotifier/pages/devices/devices.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messageoutput/airnotifier/providers/airnotifier.ts b/src/addon/messageoutput/airnotifier/providers/airnotifier.ts
index ff810dfc0..01d429774 100644
--- a/src/addon/messageoutput/airnotifier/providers/airnotifier.ts
+++ b/src/addon/messageoutput/airnotifier/providers/airnotifier.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messageoutput/airnotifier/providers/handler.ts b/src/addon/messageoutput/airnotifier/providers/handler.ts
index 555c6e238..7d8d10007 100644
--- a/src/addon/messageoutput/airnotifier/providers/handler.ts
+++ b/src/addon/messageoutput/airnotifier/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messageoutput/messageoutput.module.ts b/src/addon/messageoutput/messageoutput.module.ts
index 283f5d0a7..a2cc6e96f 100644
--- a/src/addon/messageoutput/messageoutput.module.ts
+++ b/src/addon/messageoutput/messageoutput.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messageoutput/providers/delegate.ts b/src/addon/messageoutput/providers/delegate.ts
index dc11821cb..d7251448d 100644
--- a/src/addon/messageoutput/providers/delegate.ts
+++ b/src/addon/messageoutput/providers/delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/components/components.module.ts b/src/addon/messages/components/components.module.ts
index 1c8091937..337c794e3 100644
--- a/src/addon/messages/components/components.module.ts
+++ b/src/addon/messages/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/components/confirmed-contacts/confirmed-contacts.ts b/src/addon/messages/components/confirmed-contacts/confirmed-contacts.ts
index b367bdee3..251d46e32 100644
--- a/src/addon/messages/components/confirmed-contacts/confirmed-contacts.ts
+++ b/src/addon/messages/components/confirmed-contacts/confirmed-contacts.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/components/contact-requests/contact-requests.ts b/src/addon/messages/components/contact-requests/contact-requests.ts
index 50f1afffe..6c889935d 100644
--- a/src/addon/messages/components/contact-requests/contact-requests.ts
+++ b/src/addon/messages/components/contact-requests/contact-requests.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/components/contacts/contacts.ts b/src/addon/messages/components/contacts/contacts.ts
index 16f5a62d3..2ba88635a 100644
--- a/src/addon/messages/components/contacts/contacts.ts
+++ b/src/addon/messages/components/contacts/contacts.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/components/discussions/discussions.ts b/src/addon/messages/components/discussions/discussions.ts
index ddbd5c3f2..629446b1a 100644
--- a/src/addon/messages/components/discussions/discussions.ts
+++ b/src/addon/messages/components/discussions/discussions.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/messages.module.ts b/src/addon/messages/messages.module.ts
index 8cc6a9b7b..a4bdffa38 100644
--- a/src/addon/messages/messages.module.ts
+++ b/src/addon/messages/messages.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/pages/contacts/contacts.module.ts b/src/addon/messages/pages/contacts/contacts.module.ts
index a69ec60b7..e85d44606 100644
--- a/src/addon/messages/pages/contacts/contacts.module.ts
+++ b/src/addon/messages/pages/contacts/contacts.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/pages/contacts/contacts.ts b/src/addon/messages/pages/contacts/contacts.ts
index cde871624..5ee6b6ff4 100644
--- a/src/addon/messages/pages/contacts/contacts.ts
+++ b/src/addon/messages/pages/contacts/contacts.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/pages/conversation-info/conversation-info.module.ts b/src/addon/messages/pages/conversation-info/conversation-info.module.ts
index f2b0cb96c..df49d4eed 100644
--- a/src/addon/messages/pages/conversation-info/conversation-info.module.ts
+++ b/src/addon/messages/pages/conversation-info/conversation-info.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/pages/conversation-info/conversation-info.ts b/src/addon/messages/pages/conversation-info/conversation-info.ts
index c3d030c6f..e0149077a 100644
--- a/src/addon/messages/pages/conversation-info/conversation-info.ts
+++ b/src/addon/messages/pages/conversation-info/conversation-info.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/pages/discussion/discussion.module.ts b/src/addon/messages/pages/discussion/discussion.module.ts
index edf7ef9cb..a3e020e3f 100644
--- a/src/addon/messages/pages/discussion/discussion.module.ts
+++ b/src/addon/messages/pages/discussion/discussion.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/pages/discussion/discussion.ts b/src/addon/messages/pages/discussion/discussion.ts
index e6fed3ca2..41013c2ac 100644
--- a/src/addon/messages/pages/discussion/discussion.ts
+++ b/src/addon/messages/pages/discussion/discussion.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/pages/group-conversations/group-conversations.module.ts b/src/addon/messages/pages/group-conversations/group-conversations.module.ts
index c3eb2d407..ba801e991 100644
--- a/src/addon/messages/pages/group-conversations/group-conversations.module.ts
+++ b/src/addon/messages/pages/group-conversations/group-conversations.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/pages/group-conversations/group-conversations.ts b/src/addon/messages/pages/group-conversations/group-conversations.ts
index 007d55b8f..ececc1ac2 100644
--- a/src/addon/messages/pages/group-conversations/group-conversations.ts
+++ b/src/addon/messages/pages/group-conversations/group-conversations.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/pages/index/index.module.ts b/src/addon/messages/pages/index/index.module.ts
index 23b66ee29..42d5cd30a 100644
--- a/src/addon/messages/pages/index/index.module.ts
+++ b/src/addon/messages/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/pages/index/index.ts b/src/addon/messages/pages/index/index.ts
index 44730992e..db1d3ebbd 100644
--- a/src/addon/messages/pages/index/index.ts
+++ b/src/addon/messages/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/pages/search/search.module.ts b/src/addon/messages/pages/search/search.module.ts
index c7513f688..9dc8db426 100644
--- a/src/addon/messages/pages/search/search.module.ts
+++ b/src/addon/messages/pages/search/search.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/pages/search/search.ts b/src/addon/messages/pages/search/search.ts
index 9268f58f0..a02203faf 100644
--- a/src/addon/messages/pages/search/search.ts
+++ b/src/addon/messages/pages/search/search.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/pages/settings/settings.module.ts b/src/addon/messages/pages/settings/settings.module.ts
index 6e9071710..70bd2b59e 100644
--- a/src/addon/messages/pages/settings/settings.module.ts
+++ b/src/addon/messages/pages/settings/settings.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/pages/settings/settings.ts b/src/addon/messages/pages/settings/settings.ts
index 1a8d9de5e..c8b07e34e 100644
--- a/src/addon/messages/pages/settings/settings.ts
+++ b/src/addon/messages/pages/settings/settings.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/providers/contact-request-link-handler.ts b/src/addon/messages/providers/contact-request-link-handler.ts
index 0b3696b41..ba08f3a97 100644
--- a/src/addon/messages/providers/contact-request-link-handler.ts
+++ b/src/addon/messages/providers/contact-request-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/providers/discussion-link-handler.ts b/src/addon/messages/providers/discussion-link-handler.ts
index 623738241..87462c9b6 100644
--- a/src/addon/messages/providers/discussion-link-handler.ts
+++ b/src/addon/messages/providers/discussion-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/providers/index-link-handler.ts b/src/addon/messages/providers/index-link-handler.ts
index e711070c3..215338116 100644
--- a/src/addon/messages/providers/index-link-handler.ts
+++ b/src/addon/messages/providers/index-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/providers/mainmenu-handler.ts b/src/addon/messages/providers/mainmenu-handler.ts
index f7e0547f2..acd560404 100644
--- a/src/addon/messages/providers/mainmenu-handler.ts
+++ b/src/addon/messages/providers/mainmenu-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/providers/messages-offline.ts b/src/addon/messages/providers/messages-offline.ts
index d9818cd83..f9909bc0b 100644
--- a/src/addon/messages/providers/messages-offline.ts
+++ b/src/addon/messages/providers/messages-offline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/providers/messages.ts b/src/addon/messages/providers/messages.ts
index 7b7d19447..0288cb13d 100644
--- a/src/addon/messages/providers/messages.ts
+++ b/src/addon/messages/providers/messages.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/providers/push-click-handler.ts b/src/addon/messages/providers/push-click-handler.ts
index 7e1fcad43..56e686a41 100644
--- a/src/addon/messages/providers/push-click-handler.ts
+++ b/src/addon/messages/providers/push-click-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/providers/settings-handler.ts b/src/addon/messages/providers/settings-handler.ts
index 870df829b..6c4d35447 100644
--- a/src/addon/messages/providers/settings-handler.ts
+++ b/src/addon/messages/providers/settings-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/providers/sync-cron-handler.ts b/src/addon/messages/providers/sync-cron-handler.ts
index 585414b39..6fbafe9dc 100644
--- a/src/addon/messages/providers/sync-cron-handler.ts
+++ b/src/addon/messages/providers/sync-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/providers/sync.ts b/src/addon/messages/providers/sync.ts
index 20a3a27c1..09e024884 100644
--- a/src/addon/messages/providers/sync.ts
+++ b/src/addon/messages/providers/sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/providers/user-add-contact-handler.ts b/src/addon/messages/providers/user-add-contact-handler.ts
index 913695dd9..7c885960e 100644
--- a/src/addon/messages/providers/user-add-contact-handler.ts
+++ b/src/addon/messages/providers/user-add-contact-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/providers/user-block-contact-handler.ts b/src/addon/messages/providers/user-block-contact-handler.ts
index d3c36e730..55912ac99 100644
--- a/src/addon/messages/providers/user-block-contact-handler.ts
+++ b/src/addon/messages/providers/user-block-contact-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/messages/providers/user-send-message-handler.ts b/src/addon/messages/providers/user-send-message-handler.ts
index 86759fb60..1824a7d71 100644
--- a/src/addon/messages/providers/user-send-message-handler.ts
+++ b/src/addon/messages/providers/user-send-message-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/assign.module.ts b/src/addon/mod/assign/assign.module.ts
index 74fe86c4e..7a6edbfd6 100644
--- a/src/addon/mod/assign/assign.module.ts
+++ b/src/addon/mod/assign/assign.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/classes/base-feedback-handler.ts b/src/addon/mod/assign/classes/base-feedback-handler.ts
index a63a11a82..56591e989 100644
--- a/src/addon/mod/assign/classes/base-feedback-handler.ts
+++ b/src/addon/mod/assign/classes/base-feedback-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/classes/base-submission-handler.ts b/src/addon/mod/assign/classes/base-submission-handler.ts
index 1c34ce157..95ab92636 100644
--- a/src/addon/mod/assign/classes/base-submission-handler.ts
+++ b/src/addon/mod/assign/classes/base-submission-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/classes/feedback-plugin-component.ts b/src/addon/mod/assign/classes/feedback-plugin-component.ts
index 0076ba466..991219c07 100644
--- a/src/addon/mod/assign/classes/feedback-plugin-component.ts
+++ b/src/addon/mod/assign/classes/feedback-plugin-component.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/classes/submission-plugin-component.ts b/src/addon/mod/assign/classes/submission-plugin-component.ts
index 552657b9d..3a466b675 100644
--- a/src/addon/mod/assign/classes/submission-plugin-component.ts
+++ b/src/addon/mod/assign/classes/submission-plugin-component.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/components/components.module.ts b/src/addon/mod/assign/components/components.module.ts
index b794ebe49..de3fbba1c 100644
--- a/src/addon/mod/assign/components/components.module.ts
+++ b/src/addon/mod/assign/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/components/feedback-plugin/feedback-plugin.ts b/src/addon/mod/assign/components/feedback-plugin/feedback-plugin.ts
index d28973ae8..c08c5c96f 100644
--- a/src/addon/mod/assign/components/feedback-plugin/feedback-plugin.ts
+++ b/src/addon/mod/assign/components/feedback-plugin/feedback-plugin.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/components/index/index.ts b/src/addon/mod/assign/components/index/index.ts
index 482a4d824..5b6c09ab4 100644
--- a/src/addon/mod/assign/components/index/index.ts
+++ b/src/addon/mod/assign/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/components/submission-plugin/submission-plugin.ts b/src/addon/mod/assign/components/submission-plugin/submission-plugin.ts
index de2d664aa..ae939d9be 100644
--- a/src/addon/mod/assign/components/submission-plugin/submission-plugin.ts
+++ b/src/addon/mod/assign/components/submission-plugin/submission-plugin.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/components/submission/submission.ts b/src/addon/mod/assign/components/submission/submission.ts
index b5fa53729..865c37ae6 100644
--- a/src/addon/mod/assign/components/submission/submission.ts
+++ b/src/addon/mod/assign/components/submission/submission.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/feedback/comments/comments.module.ts b/src/addon/mod/assign/feedback/comments/comments.module.ts
index c5905c452..491a88fde 100644
--- a/src/addon/mod/assign/feedback/comments/comments.module.ts
+++ b/src/addon/mod/assign/feedback/comments/comments.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/feedback/comments/component/comments.ts b/src/addon/mod/assign/feedback/comments/component/comments.ts
index 4a0edfac3..e46456aeb 100644
--- a/src/addon/mod/assign/feedback/comments/component/comments.ts
+++ b/src/addon/mod/assign/feedback/comments/component/comments.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/feedback/comments/providers/handler.ts b/src/addon/mod/assign/feedback/comments/providers/handler.ts
index 1533fd67d..559f00029 100644
--- a/src/addon/mod/assign/feedback/comments/providers/handler.ts
+++ b/src/addon/mod/assign/feedback/comments/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/feedback/editpdf/component/editpdf.ts b/src/addon/mod/assign/feedback/editpdf/component/editpdf.ts
index 8b86a6015..38ef466aa 100644
--- a/src/addon/mod/assign/feedback/editpdf/component/editpdf.ts
+++ b/src/addon/mod/assign/feedback/editpdf/component/editpdf.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/feedback/editpdf/editpdf.module.ts b/src/addon/mod/assign/feedback/editpdf/editpdf.module.ts
index defcb5e86..c003cd837 100644
--- a/src/addon/mod/assign/feedback/editpdf/editpdf.module.ts
+++ b/src/addon/mod/assign/feedback/editpdf/editpdf.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/feedback/editpdf/providers/handler.ts b/src/addon/mod/assign/feedback/editpdf/providers/handler.ts
index 5b2f8e0ef..c04319db8 100644
--- a/src/addon/mod/assign/feedback/editpdf/providers/handler.ts
+++ b/src/addon/mod/assign/feedback/editpdf/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/feedback/feedback.module.ts b/src/addon/mod/assign/feedback/feedback.module.ts
index ef504bc2a..fe4a39ab8 100644
--- a/src/addon/mod/assign/feedback/feedback.module.ts
+++ b/src/addon/mod/assign/feedback/feedback.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/feedback/file/component/file.ts b/src/addon/mod/assign/feedback/file/component/file.ts
index f6a51b58f..e9e036194 100644
--- a/src/addon/mod/assign/feedback/file/component/file.ts
+++ b/src/addon/mod/assign/feedback/file/component/file.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/feedback/file/file.module.ts b/src/addon/mod/assign/feedback/file/file.module.ts
index 3ce4230db..1024e5994 100644
--- a/src/addon/mod/assign/feedback/file/file.module.ts
+++ b/src/addon/mod/assign/feedback/file/file.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/feedback/file/providers/handler.ts b/src/addon/mod/assign/feedback/file/providers/handler.ts
index adc6da09d..89a5efdd7 100644
--- a/src/addon/mod/assign/feedback/file/providers/handler.ts
+++ b/src/addon/mod/assign/feedback/file/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.module.ts b/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.module.ts
index f7e67463d..e0b440478 100644
--- a/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.module.ts
+++ b/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.ts b/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.ts
index ace3043c0..41c02baaf 100644
--- a/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.ts
+++ b/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/pages/edit/edit.module.ts b/src/addon/mod/assign/pages/edit/edit.module.ts
index 8b02b1c96..0125765e6 100644
--- a/src/addon/mod/assign/pages/edit/edit.module.ts
+++ b/src/addon/mod/assign/pages/edit/edit.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/pages/edit/edit.ts b/src/addon/mod/assign/pages/edit/edit.ts
index f8569eb0f..7eccd3c20 100644
--- a/src/addon/mod/assign/pages/edit/edit.ts
+++ b/src/addon/mod/assign/pages/edit/edit.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/pages/index/index.module.ts b/src/addon/mod/assign/pages/index/index.module.ts
index ebaca9739..8b06a4404 100644
--- a/src/addon/mod/assign/pages/index/index.module.ts
+++ b/src/addon/mod/assign/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/pages/index/index.ts b/src/addon/mod/assign/pages/index/index.ts
index 3dedd405a..a4b3413b4 100644
--- a/src/addon/mod/assign/pages/index/index.ts
+++ b/src/addon/mod/assign/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/pages/submission-list/submission-list.module.ts b/src/addon/mod/assign/pages/submission-list/submission-list.module.ts
index 19a54ad06..6e791da75 100644
--- a/src/addon/mod/assign/pages/submission-list/submission-list.module.ts
+++ b/src/addon/mod/assign/pages/submission-list/submission-list.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/pages/submission-list/submission-list.ts b/src/addon/mod/assign/pages/submission-list/submission-list.ts
index c3a364b4d..1c1429011 100644
--- a/src/addon/mod/assign/pages/submission-list/submission-list.ts
+++ b/src/addon/mod/assign/pages/submission-list/submission-list.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/pages/submission-review/submission-review.module.ts b/src/addon/mod/assign/pages/submission-review/submission-review.module.ts
index 788b4f527..d22b9920e 100644
--- a/src/addon/mod/assign/pages/submission-review/submission-review.module.ts
+++ b/src/addon/mod/assign/pages/submission-review/submission-review.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/pages/submission-review/submission-review.ts b/src/addon/mod/assign/pages/submission-review/submission-review.ts
index 9c96c1c07..030b7c112 100644
--- a/src/addon/mod/assign/pages/submission-review/submission-review.ts
+++ b/src/addon/mod/assign/pages/submission-review/submission-review.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/providers/assign-offline.ts b/src/addon/mod/assign/providers/assign-offline.ts
index f870bae6d..29923f37f 100644
--- a/src/addon/mod/assign/providers/assign-offline.ts
+++ b/src/addon/mod/assign/providers/assign-offline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/providers/assign-sync.ts b/src/addon/mod/assign/providers/assign-sync.ts
index c61e09cfa..41b43f74e 100644
--- a/src/addon/mod/assign/providers/assign-sync.ts
+++ b/src/addon/mod/assign/providers/assign-sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/providers/assign.ts b/src/addon/mod/assign/providers/assign.ts
index 07a656c1a..44465a59f 100644
--- a/src/addon/mod/assign/providers/assign.ts
+++ b/src/addon/mod/assign/providers/assign.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/providers/default-feedback-handler.ts b/src/addon/mod/assign/providers/default-feedback-handler.ts
index cbc95c88a..28b34b4cf 100644
--- a/src/addon/mod/assign/providers/default-feedback-handler.ts
+++ b/src/addon/mod/assign/providers/default-feedback-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/providers/default-submission-handler.ts b/src/addon/mod/assign/providers/default-submission-handler.ts
index c18c71982..2e3ea3059 100644
--- a/src/addon/mod/assign/providers/default-submission-handler.ts
+++ b/src/addon/mod/assign/providers/default-submission-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/providers/feedback-delegate.ts b/src/addon/mod/assign/providers/feedback-delegate.ts
index 4565f64be..a548038c1 100644
--- a/src/addon/mod/assign/providers/feedback-delegate.ts
+++ b/src/addon/mod/assign/providers/feedback-delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/providers/helper.ts b/src/addon/mod/assign/providers/helper.ts
index d89d14c97..afea6aae7 100644
--- a/src/addon/mod/assign/providers/helper.ts
+++ b/src/addon/mod/assign/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/providers/index-link-handler.ts b/src/addon/mod/assign/providers/index-link-handler.ts
index f129eb1b9..014ef82fd 100644
--- a/src/addon/mod/assign/providers/index-link-handler.ts
+++ b/src/addon/mod/assign/providers/index-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/providers/list-link-handler.ts b/src/addon/mod/assign/providers/list-link-handler.ts
index 2e2b2de0d..ff80c18d6 100644
--- a/src/addon/mod/assign/providers/list-link-handler.ts
+++ b/src/addon/mod/assign/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/providers/module-handler.ts b/src/addon/mod/assign/providers/module-handler.ts
index baa09705f..9928356e6 100644
--- a/src/addon/mod/assign/providers/module-handler.ts
+++ b/src/addon/mod/assign/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/providers/prefetch-handler.ts b/src/addon/mod/assign/providers/prefetch-handler.ts
index 228e8e5ad..67d1fdfbf 100644
--- a/src/addon/mod/assign/providers/prefetch-handler.ts
+++ b/src/addon/mod/assign/providers/prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/providers/push-click-handler.ts b/src/addon/mod/assign/providers/push-click-handler.ts
index dd698cbd1..9dea85284 100644
--- a/src/addon/mod/assign/providers/push-click-handler.ts
+++ b/src/addon/mod/assign/providers/push-click-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/providers/submission-delegate.ts b/src/addon/mod/assign/providers/submission-delegate.ts
index 7b65d55ce..673955cb1 100644
--- a/src/addon/mod/assign/providers/submission-delegate.ts
+++ b/src/addon/mod/assign/providers/submission-delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/providers/sync-cron-handler.ts b/src/addon/mod/assign/providers/sync-cron-handler.ts
index e610567ac..593cd4c45 100644
--- a/src/addon/mod/assign/providers/sync-cron-handler.ts
+++ b/src/addon/mod/assign/providers/sync-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/submission/comments/comments.module.ts b/src/addon/mod/assign/submission/comments/comments.module.ts
index 06ea8bafd..769f3b819 100644
--- a/src/addon/mod/assign/submission/comments/comments.module.ts
+++ b/src/addon/mod/assign/submission/comments/comments.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/submission/comments/component/comments.ts b/src/addon/mod/assign/submission/comments/component/comments.ts
index a9d6c4784..6e6d6bb01 100644
--- a/src/addon/mod/assign/submission/comments/component/comments.ts
+++ b/src/addon/mod/assign/submission/comments/component/comments.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/submission/comments/providers/handler.ts b/src/addon/mod/assign/submission/comments/providers/handler.ts
index a608d2132..98dcca088 100644
--- a/src/addon/mod/assign/submission/comments/providers/handler.ts
+++ b/src/addon/mod/assign/submission/comments/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/submission/file/component/file.ts b/src/addon/mod/assign/submission/file/component/file.ts
index fec798d8c..137a3d902 100644
--- a/src/addon/mod/assign/submission/file/component/file.ts
+++ b/src/addon/mod/assign/submission/file/component/file.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/submission/file/file.module.ts b/src/addon/mod/assign/submission/file/file.module.ts
index 64c898ba8..e92dd77cd 100644
--- a/src/addon/mod/assign/submission/file/file.module.ts
+++ b/src/addon/mod/assign/submission/file/file.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/submission/file/providers/handler.ts b/src/addon/mod/assign/submission/file/providers/handler.ts
index 7fe7388dc..8ff4f6599 100644
--- a/src/addon/mod/assign/submission/file/providers/handler.ts
+++ b/src/addon/mod/assign/submission/file/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts b/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts
index b5c6d4045..06e064ab2 100644
--- a/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts
+++ b/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/submission/onlinetext/onlinetext.module.ts b/src/addon/mod/assign/submission/onlinetext/onlinetext.module.ts
index bed8c8545..88de4de1d 100644
--- a/src/addon/mod/assign/submission/onlinetext/onlinetext.module.ts
+++ b/src/addon/mod/assign/submission/onlinetext/onlinetext.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/submission/onlinetext/providers/handler.ts b/src/addon/mod/assign/submission/onlinetext/providers/handler.ts
index 69a84b85e..bc800d716 100644
--- a/src/addon/mod/assign/submission/onlinetext/providers/handler.ts
+++ b/src/addon/mod/assign/submission/onlinetext/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/assign/submission/submission.module.ts b/src/addon/mod/assign/submission/submission.module.ts
index a95495457..026731a5a 100644
--- a/src/addon/mod/assign/submission/submission.module.ts
+++ b/src/addon/mod/assign/submission/submission.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/book/book.module.ts b/src/addon/mod/book/book.module.ts
index ea425d1c8..71c086dfd 100644
--- a/src/addon/mod/book/book.module.ts
+++ b/src/addon/mod/book/book.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/book/components/components.module.ts b/src/addon/mod/book/components/components.module.ts
index 4cc338b6e..805a25124 100644
--- a/src/addon/mod/book/components/components.module.ts
+++ b/src/addon/mod/book/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/book/components/index/index.ts b/src/addon/mod/book/components/index/index.ts
index d419bbed0..6a6129f10 100644
--- a/src/addon/mod/book/components/index/index.ts
+++ b/src/addon/mod/book/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/book/pages/index/index.module.ts b/src/addon/mod/book/pages/index/index.module.ts
index 14d2d6a29..88032b387 100644
--- a/src/addon/mod/book/pages/index/index.module.ts
+++ b/src/addon/mod/book/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/book/pages/index/index.ts b/src/addon/mod/book/pages/index/index.ts
index fc95e6b4a..f9f53e160 100644
--- a/src/addon/mod/book/pages/index/index.ts
+++ b/src/addon/mod/book/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/book/pages/toc/toc.module.ts b/src/addon/mod/book/pages/toc/toc.module.ts
index 88e436a25..a96ddf55b 100644
--- a/src/addon/mod/book/pages/toc/toc.module.ts
+++ b/src/addon/mod/book/pages/toc/toc.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/book/pages/toc/toc.ts b/src/addon/mod/book/pages/toc/toc.ts
index 0478faf2c..3861191e5 100644
--- a/src/addon/mod/book/pages/toc/toc.ts
+++ b/src/addon/mod/book/pages/toc/toc.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/book/providers/book.ts b/src/addon/mod/book/providers/book.ts
index f5815f3c3..d9cf9cd8c 100644
--- a/src/addon/mod/book/providers/book.ts
+++ b/src/addon/mod/book/providers/book.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/book/providers/link-handler.ts b/src/addon/mod/book/providers/link-handler.ts
index bba613b19..cde3d391f 100644
--- a/src/addon/mod/book/providers/link-handler.ts
+++ b/src/addon/mod/book/providers/link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/book/providers/list-link-handler.ts b/src/addon/mod/book/providers/list-link-handler.ts
index 4b3f403d0..00d694c34 100644
--- a/src/addon/mod/book/providers/list-link-handler.ts
+++ b/src/addon/mod/book/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/book/providers/module-handler.ts b/src/addon/mod/book/providers/module-handler.ts
index 565b5a36c..01fa9a1c5 100644
--- a/src/addon/mod/book/providers/module-handler.ts
+++ b/src/addon/mod/book/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/book/providers/prefetch-handler.ts b/src/addon/mod/book/providers/prefetch-handler.ts
index d1055bbec..8a852e4f3 100644
--- a/src/addon/mod/book/providers/prefetch-handler.ts
+++ b/src/addon/mod/book/providers/prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/book/providers/tag-area-handler.ts b/src/addon/mod/book/providers/tag-area-handler.ts
index afa55b00b..8f226ff94 100644
--- a/src/addon/mod/book/providers/tag-area-handler.ts
+++ b/src/addon/mod/book/providers/tag-area-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/chat/chat.module.ts b/src/addon/mod/chat/chat.module.ts
index de0349837..45934fd7b 100644
--- a/src/addon/mod/chat/chat.module.ts
+++ b/src/addon/mod/chat/chat.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/chat/components/components.module.ts b/src/addon/mod/chat/components/components.module.ts
index 8caa6f720..6dfb975cc 100644
--- a/src/addon/mod/chat/components/components.module.ts
+++ b/src/addon/mod/chat/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/chat/components/index/index.ts b/src/addon/mod/chat/components/index/index.ts
index 73653b151..a4a3c2601 100644
--- a/src/addon/mod/chat/components/index/index.ts
+++ b/src/addon/mod/chat/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/chat/pages/chat/chat.module.ts b/src/addon/mod/chat/pages/chat/chat.module.ts
index 24979c427..7b26e45da 100644
--- a/src/addon/mod/chat/pages/chat/chat.module.ts
+++ b/src/addon/mod/chat/pages/chat/chat.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/chat/pages/chat/chat.ts b/src/addon/mod/chat/pages/chat/chat.ts
index 18f5ce956..1923bb5ee 100644
--- a/src/addon/mod/chat/pages/chat/chat.ts
+++ b/src/addon/mod/chat/pages/chat/chat.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/chat/pages/index/index.module.ts b/src/addon/mod/chat/pages/index/index.module.ts
index 158d4bfa5..9ee30df8f 100644
--- a/src/addon/mod/chat/pages/index/index.module.ts
+++ b/src/addon/mod/chat/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/chat/pages/index/index.ts b/src/addon/mod/chat/pages/index/index.ts
index 7eb57a4b9..b95eaab42 100644
--- a/src/addon/mod/chat/pages/index/index.ts
+++ b/src/addon/mod/chat/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/chat/pages/session-messages/session-messages.module.ts b/src/addon/mod/chat/pages/session-messages/session-messages.module.ts
index 816b70999..d5c1c8835 100644
--- a/src/addon/mod/chat/pages/session-messages/session-messages.module.ts
+++ b/src/addon/mod/chat/pages/session-messages/session-messages.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/chat/pages/session-messages/session-messages.ts b/src/addon/mod/chat/pages/session-messages/session-messages.ts
index a70eda770..7d80f18de 100644
--- a/src/addon/mod/chat/pages/session-messages/session-messages.ts
+++ b/src/addon/mod/chat/pages/session-messages/session-messages.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/chat/pages/sessions/sessions.module.ts b/src/addon/mod/chat/pages/sessions/sessions.module.ts
index 23e5cdc1e..1c8a8767d 100644
--- a/src/addon/mod/chat/pages/sessions/sessions.module.ts
+++ b/src/addon/mod/chat/pages/sessions/sessions.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/chat/pages/sessions/sessions.ts b/src/addon/mod/chat/pages/sessions/sessions.ts
index 1f6ddcf0d..683d01c57 100644
--- a/src/addon/mod/chat/pages/sessions/sessions.ts
+++ b/src/addon/mod/chat/pages/sessions/sessions.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/chat/pages/users/users.module.ts b/src/addon/mod/chat/pages/users/users.module.ts
index 169a368da..4400f39eb 100644
--- a/src/addon/mod/chat/pages/users/users.module.ts
+++ b/src/addon/mod/chat/pages/users/users.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/chat/pages/users/users.ts b/src/addon/mod/chat/pages/users/users.ts
index 3ec2b36e4..e3e3c4028 100644
--- a/src/addon/mod/chat/pages/users/users.ts
+++ b/src/addon/mod/chat/pages/users/users.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/chat/providers/chat.ts b/src/addon/mod/chat/providers/chat.ts
index 45a102a06..8fa311954 100644
--- a/src/addon/mod/chat/providers/chat.ts
+++ b/src/addon/mod/chat/providers/chat.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/chat/providers/helper.ts b/src/addon/mod/chat/providers/helper.ts
index c575b64a7..a7b0ecd07 100644
--- a/src/addon/mod/chat/providers/helper.ts
+++ b/src/addon/mod/chat/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/chat/providers/link-handler.ts b/src/addon/mod/chat/providers/link-handler.ts
index a8f727d85..73b77063d 100644
--- a/src/addon/mod/chat/providers/link-handler.ts
+++ b/src/addon/mod/chat/providers/link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/chat/providers/list-link-handler.ts b/src/addon/mod/chat/providers/list-link-handler.ts
index 19a32ed04..f56210b84 100644
--- a/src/addon/mod/chat/providers/list-link-handler.ts
+++ b/src/addon/mod/chat/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/chat/providers/module-handler.ts b/src/addon/mod/chat/providers/module-handler.ts
index 1a459766d..1befb4aff 100644
--- a/src/addon/mod/chat/providers/module-handler.ts
+++ b/src/addon/mod/chat/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/chat/providers/prefetch-handler.ts b/src/addon/mod/chat/providers/prefetch-handler.ts
index 11b3d9183..1e7d12ff1 100644
--- a/src/addon/mod/chat/providers/prefetch-handler.ts
+++ b/src/addon/mod/chat/providers/prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/choice/choice.module.ts b/src/addon/mod/choice/choice.module.ts
index 7b08793fb..ec5b9dc85 100644
--- a/src/addon/mod/choice/choice.module.ts
+++ b/src/addon/mod/choice/choice.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/choice/components/components.module.ts b/src/addon/mod/choice/components/components.module.ts
index a46e79922..866f3587f 100644
--- a/src/addon/mod/choice/components/components.module.ts
+++ b/src/addon/mod/choice/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/choice/components/index/index.ts b/src/addon/mod/choice/components/index/index.ts
index df0979741..66ed10c60 100644
--- a/src/addon/mod/choice/components/index/index.ts
+++ b/src/addon/mod/choice/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/choice/pages/index/index.module.ts b/src/addon/mod/choice/pages/index/index.module.ts
index bc19841ae..8dd0f81fb 100644
--- a/src/addon/mod/choice/pages/index/index.module.ts
+++ b/src/addon/mod/choice/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/choice/pages/index/index.ts b/src/addon/mod/choice/pages/index/index.ts
index 432dba56c..38005c282 100644
--- a/src/addon/mod/choice/pages/index/index.ts
+++ b/src/addon/mod/choice/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/choice/providers/choice.ts b/src/addon/mod/choice/providers/choice.ts
index 246903592..88808a6ba 100644
--- a/src/addon/mod/choice/providers/choice.ts
+++ b/src/addon/mod/choice/providers/choice.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/choice/providers/link-handler.ts b/src/addon/mod/choice/providers/link-handler.ts
index d7ea13f57..482d92ef5 100644
--- a/src/addon/mod/choice/providers/link-handler.ts
+++ b/src/addon/mod/choice/providers/link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/choice/providers/list-link-handler.ts b/src/addon/mod/choice/providers/list-link-handler.ts
index ad4aec0f6..df74bdcad 100644
--- a/src/addon/mod/choice/providers/list-link-handler.ts
+++ b/src/addon/mod/choice/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/choice/providers/module-handler.ts b/src/addon/mod/choice/providers/module-handler.ts
index 789e59508..0d6f4473b 100644
--- a/src/addon/mod/choice/providers/module-handler.ts
+++ b/src/addon/mod/choice/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/choice/providers/offline.ts b/src/addon/mod/choice/providers/offline.ts
index 0b8e4294e..ef7a15391 100644
--- a/src/addon/mod/choice/providers/offline.ts
+++ b/src/addon/mod/choice/providers/offline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/choice/providers/prefetch-handler.ts b/src/addon/mod/choice/providers/prefetch-handler.ts
index 053304bfe..b5757d410 100644
--- a/src/addon/mod/choice/providers/prefetch-handler.ts
+++ b/src/addon/mod/choice/providers/prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/choice/providers/sync-cron-handler.ts b/src/addon/mod/choice/providers/sync-cron-handler.ts
index 92c2317a7..986f3f09a 100644
--- a/src/addon/mod/choice/providers/sync-cron-handler.ts
+++ b/src/addon/mod/choice/providers/sync-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/choice/providers/sync.ts b/src/addon/mod/choice/providers/sync.ts
index 7d381308e..e5367ac1f 100644
--- a/src/addon/mod/choice/providers/sync.ts
+++ b/src/addon/mod/choice/providers/sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/classes/field-plugin-component.ts b/src/addon/mod/data/classes/field-plugin-component.ts
index 62c12f13e..ac622a505 100644
--- a/src/addon/mod/data/classes/field-plugin-component.ts
+++ b/src/addon/mod/data/classes/field-plugin-component.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/components/action/action.ts b/src/addon/mod/data/components/action/action.ts
index b7bca0b40..81051183d 100644
--- a/src/addon/mod/data/components/action/action.ts
+++ b/src/addon/mod/data/components/action/action.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/components/components.module.ts b/src/addon/mod/data/components/components.module.ts
index ef12a46b3..c824304ce 100644
--- a/src/addon/mod/data/components/components.module.ts
+++ b/src/addon/mod/data/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/components/field-plugin/field-plugin.ts b/src/addon/mod/data/components/field-plugin/field-plugin.ts
index fcab3b7dd..a1be01a3b 100644
--- a/src/addon/mod/data/components/field-plugin/field-plugin.ts
+++ b/src/addon/mod/data/components/field-plugin/field-plugin.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/components/index/index.ts b/src/addon/mod/data/components/index/index.ts
index 4a5b45fc2..2bfae1f2a 100644
--- a/src/addon/mod/data/components/index/index.ts
+++ b/src/addon/mod/data/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/data.module.ts b/src/addon/mod/data/data.module.ts
index 158865aec..3f4a8d963 100644
--- a/src/addon/mod/data/data.module.ts
+++ b/src/addon/mod/data/data.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/checkbox/checkbox.module.ts b/src/addon/mod/data/fields/checkbox/checkbox.module.ts
index 5ac3377f2..ddf3be9d2 100644
--- a/src/addon/mod/data/fields/checkbox/checkbox.module.ts
+++ b/src/addon/mod/data/fields/checkbox/checkbox.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/checkbox/component/checkbox.ts b/src/addon/mod/data/fields/checkbox/component/checkbox.ts
index 88a7d38c2..a84d7f6d5 100644
--- a/src/addon/mod/data/fields/checkbox/component/checkbox.ts
+++ b/src/addon/mod/data/fields/checkbox/component/checkbox.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/checkbox/providers/handler.ts b/src/addon/mod/data/fields/checkbox/providers/handler.ts
index e0b5aceb5..f28908f0c 100644
--- a/src/addon/mod/data/fields/checkbox/providers/handler.ts
+++ b/src/addon/mod/data/fields/checkbox/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/date/component/date.ts b/src/addon/mod/data/fields/date/component/date.ts
index c846032a8..0e4a3aa40 100644
--- a/src/addon/mod/data/fields/date/component/date.ts
+++ b/src/addon/mod/data/fields/date/component/date.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/date/date.module.ts b/src/addon/mod/data/fields/date/date.module.ts
index faf696cf5..62936608c 100644
--- a/src/addon/mod/data/fields/date/date.module.ts
+++ b/src/addon/mod/data/fields/date/date.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/date/providers/handler.ts b/src/addon/mod/data/fields/date/providers/handler.ts
index 8c4988971..be8a84350 100644
--- a/src/addon/mod/data/fields/date/providers/handler.ts
+++ b/src/addon/mod/data/fields/date/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/field.module.ts b/src/addon/mod/data/fields/field.module.ts
index 3bd3d9e3d..0e0467799 100644
--- a/src/addon/mod/data/fields/field.module.ts
+++ b/src/addon/mod/data/fields/field.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/file/component/file.ts b/src/addon/mod/data/fields/file/component/file.ts
index b5341afca..b223de280 100644
--- a/src/addon/mod/data/fields/file/component/file.ts
+++ b/src/addon/mod/data/fields/file/component/file.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/file/file.module.ts b/src/addon/mod/data/fields/file/file.module.ts
index b2d240329..4c2d0fdf3 100644
--- a/src/addon/mod/data/fields/file/file.module.ts
+++ b/src/addon/mod/data/fields/file/file.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/file/providers/handler.ts b/src/addon/mod/data/fields/file/providers/handler.ts
index db6706a14..cd0c3f0f8 100644
--- a/src/addon/mod/data/fields/file/providers/handler.ts
+++ b/src/addon/mod/data/fields/file/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/latlong/component/latlong.ts b/src/addon/mod/data/fields/latlong/component/latlong.ts
index 03f912cc3..f005e95ee 100644
--- a/src/addon/mod/data/fields/latlong/component/latlong.ts
+++ b/src/addon/mod/data/fields/latlong/component/latlong.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/latlong/latlong.module.ts b/src/addon/mod/data/fields/latlong/latlong.module.ts
index 5b9b4f11a..cfc2af9f6 100644
--- a/src/addon/mod/data/fields/latlong/latlong.module.ts
+++ b/src/addon/mod/data/fields/latlong/latlong.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/latlong/providers/handler.ts b/src/addon/mod/data/fields/latlong/providers/handler.ts
index 941466e83..fb67ca9c6 100644
--- a/src/addon/mod/data/fields/latlong/providers/handler.ts
+++ b/src/addon/mod/data/fields/latlong/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/menu/component/menu.ts b/src/addon/mod/data/fields/menu/component/menu.ts
index 7362cb6f6..462163521 100644
--- a/src/addon/mod/data/fields/menu/component/menu.ts
+++ b/src/addon/mod/data/fields/menu/component/menu.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/menu/menu.module.ts b/src/addon/mod/data/fields/menu/menu.module.ts
index 2c4a16427..f2a839e03 100644
--- a/src/addon/mod/data/fields/menu/menu.module.ts
+++ b/src/addon/mod/data/fields/menu/menu.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/menu/providers/handler.ts b/src/addon/mod/data/fields/menu/providers/handler.ts
index 6a928f5a5..104559f66 100644
--- a/src/addon/mod/data/fields/menu/providers/handler.ts
+++ b/src/addon/mod/data/fields/menu/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/multimenu/component/multimenu.ts b/src/addon/mod/data/fields/multimenu/component/multimenu.ts
index 933687535..1373015b0 100644
--- a/src/addon/mod/data/fields/multimenu/component/multimenu.ts
+++ b/src/addon/mod/data/fields/multimenu/component/multimenu.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/multimenu/multimenu.module.ts b/src/addon/mod/data/fields/multimenu/multimenu.module.ts
index 7b6b72d12..e2bdf031e 100644
--- a/src/addon/mod/data/fields/multimenu/multimenu.module.ts
+++ b/src/addon/mod/data/fields/multimenu/multimenu.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/multimenu/providers/handler.ts b/src/addon/mod/data/fields/multimenu/providers/handler.ts
index 060583426..1a7e1ce82 100644
--- a/src/addon/mod/data/fields/multimenu/providers/handler.ts
+++ b/src/addon/mod/data/fields/multimenu/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/number/component/number.ts b/src/addon/mod/data/fields/number/component/number.ts
index 73823be14..e43c3f43e 100644
--- a/src/addon/mod/data/fields/number/component/number.ts
+++ b/src/addon/mod/data/fields/number/component/number.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/number/number.module.ts b/src/addon/mod/data/fields/number/number.module.ts
index ce2acc789..69fa463d7 100644
--- a/src/addon/mod/data/fields/number/number.module.ts
+++ b/src/addon/mod/data/fields/number/number.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/number/providers/handler.ts b/src/addon/mod/data/fields/number/providers/handler.ts
index e40100258..a9a57d217 100644
--- a/src/addon/mod/data/fields/number/providers/handler.ts
+++ b/src/addon/mod/data/fields/number/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/picture/component/picture.ts b/src/addon/mod/data/fields/picture/component/picture.ts
index ab639cf6d..570a706dc 100644
--- a/src/addon/mod/data/fields/picture/component/picture.ts
+++ b/src/addon/mod/data/fields/picture/component/picture.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/picture/picture.module.ts b/src/addon/mod/data/fields/picture/picture.module.ts
index c666e1bad..ba85a3350 100644
--- a/src/addon/mod/data/fields/picture/picture.module.ts
+++ b/src/addon/mod/data/fields/picture/picture.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/picture/providers/handler.ts b/src/addon/mod/data/fields/picture/providers/handler.ts
index bd343ecd0..1ccbbd46c 100644
--- a/src/addon/mod/data/fields/picture/providers/handler.ts
+++ b/src/addon/mod/data/fields/picture/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/radiobutton/component/radiobutton.ts b/src/addon/mod/data/fields/radiobutton/component/radiobutton.ts
index 3e4122174..d4be0615d 100644
--- a/src/addon/mod/data/fields/radiobutton/component/radiobutton.ts
+++ b/src/addon/mod/data/fields/radiobutton/component/radiobutton.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/radiobutton/providers/handler.ts b/src/addon/mod/data/fields/radiobutton/providers/handler.ts
index 7025136e6..1f9fc210a 100644
--- a/src/addon/mod/data/fields/radiobutton/providers/handler.ts
+++ b/src/addon/mod/data/fields/radiobutton/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/radiobutton/radiobutton.module.ts b/src/addon/mod/data/fields/radiobutton/radiobutton.module.ts
index d361bc934..877e490f5 100644
--- a/src/addon/mod/data/fields/radiobutton/radiobutton.module.ts
+++ b/src/addon/mod/data/fields/radiobutton/radiobutton.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/text/component/text.ts b/src/addon/mod/data/fields/text/component/text.ts
index 9429a4d73..960759409 100644
--- a/src/addon/mod/data/fields/text/component/text.ts
+++ b/src/addon/mod/data/fields/text/component/text.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/text/providers/handler.ts b/src/addon/mod/data/fields/text/providers/handler.ts
index 7ede2628e..5e54570fd 100644
--- a/src/addon/mod/data/fields/text/providers/handler.ts
+++ b/src/addon/mod/data/fields/text/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/text/text.module.ts b/src/addon/mod/data/fields/text/text.module.ts
index a96ddf9de..9f288d343 100644
--- a/src/addon/mod/data/fields/text/text.module.ts
+++ b/src/addon/mod/data/fields/text/text.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/textarea/component/textarea.ts b/src/addon/mod/data/fields/textarea/component/textarea.ts
index 176601718..ba54212d7 100644
--- a/src/addon/mod/data/fields/textarea/component/textarea.ts
+++ b/src/addon/mod/data/fields/textarea/component/textarea.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/textarea/providers/handler.ts b/src/addon/mod/data/fields/textarea/providers/handler.ts
index 4e41f69a3..206a31b27 100644
--- a/src/addon/mod/data/fields/textarea/providers/handler.ts
+++ b/src/addon/mod/data/fields/textarea/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/textarea/textarea.module.ts b/src/addon/mod/data/fields/textarea/textarea.module.ts
index 8c63d53f7..3f7070ef7 100644
--- a/src/addon/mod/data/fields/textarea/textarea.module.ts
+++ b/src/addon/mod/data/fields/textarea/textarea.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/url/component/url.ts b/src/addon/mod/data/fields/url/component/url.ts
index 767f1e212..14dd7f62b 100644
--- a/src/addon/mod/data/fields/url/component/url.ts
+++ b/src/addon/mod/data/fields/url/component/url.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/url/providers/handler.ts b/src/addon/mod/data/fields/url/providers/handler.ts
index f3774f547..d6da62ad0 100644
--- a/src/addon/mod/data/fields/url/providers/handler.ts
+++ b/src/addon/mod/data/fields/url/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/fields/url/url.module.ts b/src/addon/mod/data/fields/url/url.module.ts
index 09cd8911e..e92cf2fb5 100644
--- a/src/addon/mod/data/fields/url/url.module.ts
+++ b/src/addon/mod/data/fields/url/url.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/pages/edit/edit.module.ts b/src/addon/mod/data/pages/edit/edit.module.ts
index fac3251a6..1cb6313f3 100644
--- a/src/addon/mod/data/pages/edit/edit.module.ts
+++ b/src/addon/mod/data/pages/edit/edit.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/pages/edit/edit.ts b/src/addon/mod/data/pages/edit/edit.ts
index 2d82e9f43..38a1bc2e8 100644
--- a/src/addon/mod/data/pages/edit/edit.ts
+++ b/src/addon/mod/data/pages/edit/edit.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/pages/entry/entry.module.ts b/src/addon/mod/data/pages/entry/entry.module.ts
index eb77745c6..326028728 100644
--- a/src/addon/mod/data/pages/entry/entry.module.ts
+++ b/src/addon/mod/data/pages/entry/entry.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/pages/entry/entry.ts b/src/addon/mod/data/pages/entry/entry.ts
index b21c9c50d..8bbf7207f 100644
--- a/src/addon/mod/data/pages/entry/entry.ts
+++ b/src/addon/mod/data/pages/entry/entry.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/pages/index/index.module.ts b/src/addon/mod/data/pages/index/index.module.ts
index 0215fd3f4..5b2501654 100644
--- a/src/addon/mod/data/pages/index/index.module.ts
+++ b/src/addon/mod/data/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/pages/index/index.ts b/src/addon/mod/data/pages/index/index.ts
index 4ddf93488..039891590 100644
--- a/src/addon/mod/data/pages/index/index.ts
+++ b/src/addon/mod/data/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/pages/search/search.module.ts b/src/addon/mod/data/pages/search/search.module.ts
index 09b8cfa41..b083cc1cc 100644
--- a/src/addon/mod/data/pages/search/search.module.ts
+++ b/src/addon/mod/data/pages/search/search.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/pages/search/search.ts b/src/addon/mod/data/pages/search/search.ts
index bad3b39c5..5aff12b6b 100644
--- a/src/addon/mod/data/pages/search/search.ts
+++ b/src/addon/mod/data/pages/search/search.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/providers/approve-link-handler.ts b/src/addon/mod/data/providers/approve-link-handler.ts
index bf4545516..f4c9bb5f4 100644
--- a/src/addon/mod/data/providers/approve-link-handler.ts
+++ b/src/addon/mod/data/providers/approve-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/providers/data.ts b/src/addon/mod/data/providers/data.ts
index 09bedf35a..0e70b084c 100644
--- a/src/addon/mod/data/providers/data.ts
+++ b/src/addon/mod/data/providers/data.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/providers/default-field-handler.ts b/src/addon/mod/data/providers/default-field-handler.ts
index d28bba2c8..bc9beba91 100644
--- a/src/addon/mod/data/providers/default-field-handler.ts
+++ b/src/addon/mod/data/providers/default-field-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/providers/delete-link-handler.ts b/src/addon/mod/data/providers/delete-link-handler.ts
index 64a585026..a4252719e 100644
--- a/src/addon/mod/data/providers/delete-link-handler.ts
+++ b/src/addon/mod/data/providers/delete-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/providers/edit-link-handler.ts b/src/addon/mod/data/providers/edit-link-handler.ts
index 8d724b864..44b2727c6 100644
--- a/src/addon/mod/data/providers/edit-link-handler.ts
+++ b/src/addon/mod/data/providers/edit-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/providers/fields-delegate.ts b/src/addon/mod/data/providers/fields-delegate.ts
index 0c935d7e9..9c668affa 100644
--- a/src/addon/mod/data/providers/fields-delegate.ts
+++ b/src/addon/mod/data/providers/fields-delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/providers/helper.ts b/src/addon/mod/data/providers/helper.ts
index 0bcb81bbe..9381d2c6b 100644
--- a/src/addon/mod/data/providers/helper.ts
+++ b/src/addon/mod/data/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/providers/link-handler.ts b/src/addon/mod/data/providers/link-handler.ts
index 2f8fd041f..622e18d6a 100644
--- a/src/addon/mod/data/providers/link-handler.ts
+++ b/src/addon/mod/data/providers/link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/providers/list-link-handler.ts b/src/addon/mod/data/providers/list-link-handler.ts
index fa2ec5b8c..5fb1a21c7 100644
--- a/src/addon/mod/data/providers/list-link-handler.ts
+++ b/src/addon/mod/data/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/providers/module-handler.ts b/src/addon/mod/data/providers/module-handler.ts
index 4e2297a32..b158e1828 100644
--- a/src/addon/mod/data/providers/module-handler.ts
+++ b/src/addon/mod/data/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/providers/offline.ts b/src/addon/mod/data/providers/offline.ts
index 5eb640c3b..d58794859 100644
--- a/src/addon/mod/data/providers/offline.ts
+++ b/src/addon/mod/data/providers/offline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/providers/prefetch-handler.ts b/src/addon/mod/data/providers/prefetch-handler.ts
index 91635ea8b..f44165df2 100644
--- a/src/addon/mod/data/providers/prefetch-handler.ts
+++ b/src/addon/mod/data/providers/prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/providers/show-link-handler.ts b/src/addon/mod/data/providers/show-link-handler.ts
index 3418245b4..5f4f3b22c 100644
--- a/src/addon/mod/data/providers/show-link-handler.ts
+++ b/src/addon/mod/data/providers/show-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/providers/sync-cron-handler.ts b/src/addon/mod/data/providers/sync-cron-handler.ts
index 88fd2441d..1cc7f19c2 100644
--- a/src/addon/mod/data/providers/sync-cron-handler.ts
+++ b/src/addon/mod/data/providers/sync-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/providers/sync.ts b/src/addon/mod/data/providers/sync.ts
index defc326f7..4cf76575d 100644
--- a/src/addon/mod/data/providers/sync.ts
+++ b/src/addon/mod/data/providers/sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/data/providers/tag-area-handler.ts b/src/addon/mod/data/providers/tag-area-handler.ts
index 70e19045f..1668554c1 100644
--- a/src/addon/mod/data/providers/tag-area-handler.ts
+++ b/src/addon/mod/data/providers/tag-area-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/components/components.module.ts b/src/addon/mod/feedback/components/components.module.ts
index 511fbdbd3..d7d016bc9 100644
--- a/src/addon/mod/feedback/components/components.module.ts
+++ b/src/addon/mod/feedback/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/components/index/index.ts b/src/addon/mod/feedback/components/index/index.ts
index 88e1537d3..57fe7a9f9 100644
--- a/src/addon/mod/feedback/components/index/index.ts
+++ b/src/addon/mod/feedback/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/feedback.module.ts b/src/addon/mod/feedback/feedback.module.ts
index 7811fc5cd..8478d9254 100644
--- a/src/addon/mod/feedback/feedback.module.ts
+++ b/src/addon/mod/feedback/feedback.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/pages/attempt/attempt.module.ts b/src/addon/mod/feedback/pages/attempt/attempt.module.ts
index df162f477..d440ae183 100644
--- a/src/addon/mod/feedback/pages/attempt/attempt.module.ts
+++ b/src/addon/mod/feedback/pages/attempt/attempt.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/pages/attempt/attempt.ts b/src/addon/mod/feedback/pages/attempt/attempt.ts
index 07d1dad49..4b17573e1 100644
--- a/src/addon/mod/feedback/pages/attempt/attempt.ts
+++ b/src/addon/mod/feedback/pages/attempt/attempt.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/pages/form/form.module.ts b/src/addon/mod/feedback/pages/form/form.module.ts
index c71c52917..99d0bdce6 100644
--- a/src/addon/mod/feedback/pages/form/form.module.ts
+++ b/src/addon/mod/feedback/pages/form/form.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/pages/form/form.ts b/src/addon/mod/feedback/pages/form/form.ts
index edfd72c16..3ee5f6ce9 100644
--- a/src/addon/mod/feedback/pages/form/form.ts
+++ b/src/addon/mod/feedback/pages/form/form.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/pages/index/index.module.ts b/src/addon/mod/feedback/pages/index/index.module.ts
index 5b7451a7f..118271d59 100644
--- a/src/addon/mod/feedback/pages/index/index.module.ts
+++ b/src/addon/mod/feedback/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/pages/index/index.ts b/src/addon/mod/feedback/pages/index/index.ts
index 2de96f1b1..b11341126 100644
--- a/src/addon/mod/feedback/pages/index/index.ts
+++ b/src/addon/mod/feedback/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.module.ts b/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.module.ts
index 2197062a0..c1dc531f4 100644
--- a/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.module.ts
+++ b/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.ts b/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.ts
index b42fd38f4..aab3cdac3 100644
--- a/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.ts
+++ b/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/pages/respondents/respondents.module.ts b/src/addon/mod/feedback/pages/respondents/respondents.module.ts
index d81210084..c126decc7 100644
--- a/src/addon/mod/feedback/pages/respondents/respondents.module.ts
+++ b/src/addon/mod/feedback/pages/respondents/respondents.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/pages/respondents/respondents.ts b/src/addon/mod/feedback/pages/respondents/respondents.ts
index 74e5ea7b4..e05ce6c70 100644
--- a/src/addon/mod/feedback/pages/respondents/respondents.ts
+++ b/src/addon/mod/feedback/pages/respondents/respondents.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/providers/analysis-link-handler.ts b/src/addon/mod/feedback/providers/analysis-link-handler.ts
index 4f11146e2..4e75348b2 100644
--- a/src/addon/mod/feedback/providers/analysis-link-handler.ts
+++ b/src/addon/mod/feedback/providers/analysis-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/providers/complete-link-handler.ts b/src/addon/mod/feedback/providers/complete-link-handler.ts
index 0a5d0af25..b8071a119 100644
--- a/src/addon/mod/feedback/providers/complete-link-handler.ts
+++ b/src/addon/mod/feedback/providers/complete-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/providers/feedback.ts b/src/addon/mod/feedback/providers/feedback.ts
index 10670e5f8..cdb16569e 100644
--- a/src/addon/mod/feedback/providers/feedback.ts
+++ b/src/addon/mod/feedback/providers/feedback.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/providers/helper.ts b/src/addon/mod/feedback/providers/helper.ts
index 64b3f5f2c..2639cb5c6 100644
--- a/src/addon/mod/feedback/providers/helper.ts
+++ b/src/addon/mod/feedback/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/providers/link-handler.ts b/src/addon/mod/feedback/providers/link-handler.ts
index fe080bf63..420db096d 100644
--- a/src/addon/mod/feedback/providers/link-handler.ts
+++ b/src/addon/mod/feedback/providers/link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/providers/list-link-handler.ts b/src/addon/mod/feedback/providers/list-link-handler.ts
index b9ecdd7a5..655efa066 100644
--- a/src/addon/mod/feedback/providers/list-link-handler.ts
+++ b/src/addon/mod/feedback/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/providers/module-handler.ts b/src/addon/mod/feedback/providers/module-handler.ts
index b5b6da733..6dc99f339 100644
--- a/src/addon/mod/feedback/providers/module-handler.ts
+++ b/src/addon/mod/feedback/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/providers/offline.ts b/src/addon/mod/feedback/providers/offline.ts
index 86d604e16..32c63b125 100644
--- a/src/addon/mod/feedback/providers/offline.ts
+++ b/src/addon/mod/feedback/providers/offline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/providers/prefetch-handler.ts b/src/addon/mod/feedback/providers/prefetch-handler.ts
index 07d3d0b84..d4c7edfcf 100644
--- a/src/addon/mod/feedback/providers/prefetch-handler.ts
+++ b/src/addon/mod/feedback/providers/prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/providers/print-link-handler.ts b/src/addon/mod/feedback/providers/print-link-handler.ts
index 978398fb0..92ba6e803 100644
--- a/src/addon/mod/feedback/providers/print-link-handler.ts
+++ b/src/addon/mod/feedback/providers/print-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/providers/push-click-handler.ts b/src/addon/mod/feedback/providers/push-click-handler.ts
index 27f288438..44753d590 100644
--- a/src/addon/mod/feedback/providers/push-click-handler.ts
+++ b/src/addon/mod/feedback/providers/push-click-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/providers/show-entries-link-handler.ts b/src/addon/mod/feedback/providers/show-entries-link-handler.ts
index 195e3f33d..981e02b7d 100644
--- a/src/addon/mod/feedback/providers/show-entries-link-handler.ts
+++ b/src/addon/mod/feedback/providers/show-entries-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/providers/show-non-respondents-link-handler.ts b/src/addon/mod/feedback/providers/show-non-respondents-link-handler.ts
index 8ed384cd6..8b19b76a8 100644
--- a/src/addon/mod/feedback/providers/show-non-respondents-link-handler.ts
+++ b/src/addon/mod/feedback/providers/show-non-respondents-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/providers/sync-cron-handler.ts b/src/addon/mod/feedback/providers/sync-cron-handler.ts
index 2e455497a..f9da19369 100644
--- a/src/addon/mod/feedback/providers/sync-cron-handler.ts
+++ b/src/addon/mod/feedback/providers/sync-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/feedback/providers/sync.ts b/src/addon/mod/feedback/providers/sync.ts
index 72072a3cf..f3643f219 100644
--- a/src/addon/mod/feedback/providers/sync.ts
+++ b/src/addon/mod/feedback/providers/sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/folder/components/components.module.ts b/src/addon/mod/folder/components/components.module.ts
index 42c787a25..cb4c5988e 100644
--- a/src/addon/mod/folder/components/components.module.ts
+++ b/src/addon/mod/folder/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/folder/components/index/index.ts b/src/addon/mod/folder/components/index/index.ts
index 55a89fb34..ae0bcfae0 100644
--- a/src/addon/mod/folder/components/index/index.ts
+++ b/src/addon/mod/folder/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/folder/folder.module.ts b/src/addon/mod/folder/folder.module.ts
index 72f29d68c..fd60a4ff4 100644
--- a/src/addon/mod/folder/folder.module.ts
+++ b/src/addon/mod/folder/folder.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/folder/pages/index/index.module.ts b/src/addon/mod/folder/pages/index/index.module.ts
index b0a275274..e3f60150b 100644
--- a/src/addon/mod/folder/pages/index/index.module.ts
+++ b/src/addon/mod/folder/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/folder/pages/index/index.ts b/src/addon/mod/folder/pages/index/index.ts
index 2131aa82e..74c63b22e 100644
--- a/src/addon/mod/folder/pages/index/index.ts
+++ b/src/addon/mod/folder/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/folder/providers/folder.ts b/src/addon/mod/folder/providers/folder.ts
index c472ce0f6..1f1281e57 100644
--- a/src/addon/mod/folder/providers/folder.ts
+++ b/src/addon/mod/folder/providers/folder.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/folder/providers/helper.ts b/src/addon/mod/folder/providers/helper.ts
index 38e4a4ae8..643e8e300 100644
--- a/src/addon/mod/folder/providers/helper.ts
+++ b/src/addon/mod/folder/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/folder/providers/link-handler.ts b/src/addon/mod/folder/providers/link-handler.ts
index 30db9d341..c71004b19 100644
--- a/src/addon/mod/folder/providers/link-handler.ts
+++ b/src/addon/mod/folder/providers/link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/folder/providers/list-link-handler.ts b/src/addon/mod/folder/providers/list-link-handler.ts
index 5f3fe1c82..5d64b422c 100644
--- a/src/addon/mod/folder/providers/list-link-handler.ts
+++ b/src/addon/mod/folder/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/folder/providers/module-handler.ts b/src/addon/mod/folder/providers/module-handler.ts
index b0a66e1ae..9cc5c3268 100644
--- a/src/addon/mod/folder/providers/module-handler.ts
+++ b/src/addon/mod/folder/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/folder/providers/pluginfile-handler.ts b/src/addon/mod/folder/providers/pluginfile-handler.ts
index ea5b6a576..cc4190e0b 100644
--- a/src/addon/mod/folder/providers/pluginfile-handler.ts
+++ b/src/addon/mod/folder/providers/pluginfile-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/folder/providers/prefetch-handler.ts b/src/addon/mod/folder/providers/prefetch-handler.ts
index f03180806..9e0f226d0 100644
--- a/src/addon/mod/folder/providers/prefetch-handler.ts
+++ b/src/addon/mod/folder/providers/prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/components/components.module.ts b/src/addon/mod/forum/components/components.module.ts
index 06cdabd01..b26b599fe 100644
--- a/src/addon/mod/forum/components/components.module.ts
+++ b/src/addon/mod/forum/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/components/index/index.ts b/src/addon/mod/forum/components/index/index.ts
index 78474fbd0..8edf898d8 100644
--- a/src/addon/mod/forum/components/index/index.ts
+++ b/src/addon/mod/forum/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/components/post/post.ts b/src/addon/mod/forum/components/post/post.ts
index d940e20da..36a91e531 100644
--- a/src/addon/mod/forum/components/post/post.ts
+++ b/src/addon/mod/forum/components/post/post.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/forum.module.ts b/src/addon/mod/forum/forum.module.ts
index b8463c714..f38bd9d5f 100644
--- a/src/addon/mod/forum/forum.module.ts
+++ b/src/addon/mod/forum/forum.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/pages/discussion/discussion.module.ts b/src/addon/mod/forum/pages/discussion/discussion.module.ts
index 9877a3397..90b84af3d 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.module.ts
+++ b/src/addon/mod/forum/pages/discussion/discussion.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/pages/discussion/discussion.ts b/src/addon/mod/forum/pages/discussion/discussion.ts
index 278f21f7d..1494b40b8 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.ts
+++ b/src/addon/mod/forum/pages/discussion/discussion.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/pages/index/index.module.ts b/src/addon/mod/forum/pages/index/index.module.ts
index c677d8d2e..b59f992bf 100644
--- a/src/addon/mod/forum/pages/index/index.module.ts
+++ b/src/addon/mod/forum/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/pages/index/index.ts b/src/addon/mod/forum/pages/index/index.ts
index 97b78dc3a..be2971ccd 100644
--- a/src/addon/mod/forum/pages/index/index.ts
+++ b/src/addon/mod/forum/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/pages/new-discussion/new-discussion.module.ts b/src/addon/mod/forum/pages/new-discussion/new-discussion.module.ts
index b94e61e1b..c0add2f4c 100644
--- a/src/addon/mod/forum/pages/new-discussion/new-discussion.module.ts
+++ b/src/addon/mod/forum/pages/new-discussion/new-discussion.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/pages/new-discussion/new-discussion.ts b/src/addon/mod/forum/pages/new-discussion/new-discussion.ts
index 1291edfaa..091753865 100644
--- a/src/addon/mod/forum/pages/new-discussion/new-discussion.ts
+++ b/src/addon/mod/forum/pages/new-discussion/new-discussion.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/pages/sort-order-selector/sort-order-selector.module.ts b/src/addon/mod/forum/pages/sort-order-selector/sort-order-selector.module.ts
index 9a10ae395..8cba267f7 100644
--- a/src/addon/mod/forum/pages/sort-order-selector/sort-order-selector.module.ts
+++ b/src/addon/mod/forum/pages/sort-order-selector/sort-order-selector.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/pages/sort-order-selector/sort-order-selector.ts b/src/addon/mod/forum/pages/sort-order-selector/sort-order-selector.ts
index eb69c3270..dcf10ab0f 100644
--- a/src/addon/mod/forum/pages/sort-order-selector/sort-order-selector.ts
+++ b/src/addon/mod/forum/pages/sort-order-selector/sort-order-selector.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/providers/discussion-link-handler.ts b/src/addon/mod/forum/providers/discussion-link-handler.ts
index 3b304cf5f..243a1d09d 100644
--- a/src/addon/mod/forum/providers/discussion-link-handler.ts
+++ b/src/addon/mod/forum/providers/discussion-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/providers/forum.ts b/src/addon/mod/forum/providers/forum.ts
index 2bb8872e2..55a568574 100644
--- a/src/addon/mod/forum/providers/forum.ts
+++ b/src/addon/mod/forum/providers/forum.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/providers/helper.ts b/src/addon/mod/forum/providers/helper.ts
index 202241d23..001337358 100644
--- a/src/addon/mod/forum/providers/helper.ts
+++ b/src/addon/mod/forum/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/providers/index-link-handler.ts b/src/addon/mod/forum/providers/index-link-handler.ts
index fce6e746f..ac0468cb9 100644
--- a/src/addon/mod/forum/providers/index-link-handler.ts
+++ b/src/addon/mod/forum/providers/index-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/providers/list-link-handler.ts b/src/addon/mod/forum/providers/list-link-handler.ts
index 49923c89b..1f0093d11 100644
--- a/src/addon/mod/forum/providers/list-link-handler.ts
+++ b/src/addon/mod/forum/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/providers/module-handler.ts b/src/addon/mod/forum/providers/module-handler.ts
index 860dea961..67839c7bc 100644
--- a/src/addon/mod/forum/providers/module-handler.ts
+++ b/src/addon/mod/forum/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/providers/offline.ts b/src/addon/mod/forum/providers/offline.ts
index 2a1f161a3..4679b8a7b 100644
--- a/src/addon/mod/forum/providers/offline.ts
+++ b/src/addon/mod/forum/providers/offline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/providers/post-link-handler.ts b/src/addon/mod/forum/providers/post-link-handler.ts
index 9dba78fb0..afe072aea 100644
--- a/src/addon/mod/forum/providers/post-link-handler.ts
+++ b/src/addon/mod/forum/providers/post-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/providers/prefetch-handler.ts b/src/addon/mod/forum/providers/prefetch-handler.ts
index 78ddd67d3..a8cf9d540 100644
--- a/src/addon/mod/forum/providers/prefetch-handler.ts
+++ b/src/addon/mod/forum/providers/prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/providers/push-click-handler.ts b/src/addon/mod/forum/providers/push-click-handler.ts
index 6c9bdced2..ce23e4f01 100644
--- a/src/addon/mod/forum/providers/push-click-handler.ts
+++ b/src/addon/mod/forum/providers/push-click-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/providers/sync-cron-handler.ts b/src/addon/mod/forum/providers/sync-cron-handler.ts
index 65a9bc73c..440d29068 100644
--- a/src/addon/mod/forum/providers/sync-cron-handler.ts
+++ b/src/addon/mod/forum/providers/sync-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/providers/sync.ts b/src/addon/mod/forum/providers/sync.ts
index 65441da66..a71def029 100644
--- a/src/addon/mod/forum/providers/sync.ts
+++ b/src/addon/mod/forum/providers/sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/forum/providers/tag-area-handler.ts b/src/addon/mod/forum/providers/tag-area-handler.ts
index 528cc8236..abeb5c680 100644
--- a/src/addon/mod/forum/providers/tag-area-handler.ts
+++ b/src/addon/mod/forum/providers/tag-area-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/components/components.module.ts b/src/addon/mod/glossary/components/components.module.ts
index c37c35d36..6567b7ca8 100644
--- a/src/addon/mod/glossary/components/components.module.ts
+++ b/src/addon/mod/glossary/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/components/index/index.ts b/src/addon/mod/glossary/components/index/index.ts
index 27d8d8b34..43feb2675 100644
--- a/src/addon/mod/glossary/components/index/index.ts
+++ b/src/addon/mod/glossary/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/components/mode-picker/mode-picker.ts b/src/addon/mod/glossary/components/mode-picker/mode-picker.ts
index d8a22f237..d7e51905c 100644
--- a/src/addon/mod/glossary/components/mode-picker/mode-picker.ts
+++ b/src/addon/mod/glossary/components/mode-picker/mode-picker.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/glossary.module.ts b/src/addon/mod/glossary/glossary.module.ts
index e3520fbe7..e1ad371ea 100644
--- a/src/addon/mod/glossary/glossary.module.ts
+++ b/src/addon/mod/glossary/glossary.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/pages/edit/edit.module.ts b/src/addon/mod/glossary/pages/edit/edit.module.ts
index 50cc3a93c..0f606e93e 100644
--- a/src/addon/mod/glossary/pages/edit/edit.module.ts
+++ b/src/addon/mod/glossary/pages/edit/edit.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/pages/edit/edit.ts b/src/addon/mod/glossary/pages/edit/edit.ts
index d61f40e96..7bb9e60eb 100644
--- a/src/addon/mod/glossary/pages/edit/edit.ts
+++ b/src/addon/mod/glossary/pages/edit/edit.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/pages/entry/entry.module.ts b/src/addon/mod/glossary/pages/entry/entry.module.ts
index 730943091..0825ef745 100644
--- a/src/addon/mod/glossary/pages/entry/entry.module.ts
+++ b/src/addon/mod/glossary/pages/entry/entry.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/pages/entry/entry.ts b/src/addon/mod/glossary/pages/entry/entry.ts
index 238185d53..16df7e03b 100644
--- a/src/addon/mod/glossary/pages/entry/entry.ts
+++ b/src/addon/mod/glossary/pages/entry/entry.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/pages/index/index.module.ts b/src/addon/mod/glossary/pages/index/index.module.ts
index 415f45272..4395a0c55 100644
--- a/src/addon/mod/glossary/pages/index/index.module.ts
+++ b/src/addon/mod/glossary/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/pages/index/index.ts b/src/addon/mod/glossary/pages/index/index.ts
index f653663ba..673aa39b1 100644
--- a/src/addon/mod/glossary/pages/index/index.ts
+++ b/src/addon/mod/glossary/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/providers/edit-link-handler.ts b/src/addon/mod/glossary/providers/edit-link-handler.ts
index 78da8a40d..5dd28d5e4 100644
--- a/src/addon/mod/glossary/providers/edit-link-handler.ts
+++ b/src/addon/mod/glossary/providers/edit-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/providers/entry-link-handler.ts b/src/addon/mod/glossary/providers/entry-link-handler.ts
index 9ae7f72b4..98ec8a6e3 100644
--- a/src/addon/mod/glossary/providers/entry-link-handler.ts
+++ b/src/addon/mod/glossary/providers/entry-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/providers/glossary.ts b/src/addon/mod/glossary/providers/glossary.ts
index b31e09900..d80820756 100644
--- a/src/addon/mod/glossary/providers/glossary.ts
+++ b/src/addon/mod/glossary/providers/glossary.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/providers/helper.ts b/src/addon/mod/glossary/providers/helper.ts
index 4f9c86636..cd5227e50 100644
--- a/src/addon/mod/glossary/providers/helper.ts
+++ b/src/addon/mod/glossary/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/providers/index-link-handler.ts b/src/addon/mod/glossary/providers/index-link-handler.ts
index d71be0005..5162325d8 100644
--- a/src/addon/mod/glossary/providers/index-link-handler.ts
+++ b/src/addon/mod/glossary/providers/index-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/providers/list-link-handler.ts b/src/addon/mod/glossary/providers/list-link-handler.ts
index 51c6057f6..b6a4ead66 100644
--- a/src/addon/mod/glossary/providers/list-link-handler.ts
+++ b/src/addon/mod/glossary/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/providers/module-handler.ts b/src/addon/mod/glossary/providers/module-handler.ts
index 9e2df7a4b..ea9cb06cb 100644
--- a/src/addon/mod/glossary/providers/module-handler.ts
+++ b/src/addon/mod/glossary/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/providers/offline.ts b/src/addon/mod/glossary/providers/offline.ts
index b50c3a34c..181e239d8 100644
--- a/src/addon/mod/glossary/providers/offline.ts
+++ b/src/addon/mod/glossary/providers/offline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/providers/prefetch-handler.ts b/src/addon/mod/glossary/providers/prefetch-handler.ts
index 5b852178c..2ce18b053 100644
--- a/src/addon/mod/glossary/providers/prefetch-handler.ts
+++ b/src/addon/mod/glossary/providers/prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/providers/sync-cron-handler.ts b/src/addon/mod/glossary/providers/sync-cron-handler.ts
index 52ed49b68..0eb156fe1 100644
--- a/src/addon/mod/glossary/providers/sync-cron-handler.ts
+++ b/src/addon/mod/glossary/providers/sync-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/providers/sync.ts b/src/addon/mod/glossary/providers/sync.ts
index da90b1f65..5ad4034c5 100644
--- a/src/addon/mod/glossary/providers/sync.ts
+++ b/src/addon/mod/glossary/providers/sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/glossary/providers/tag-area-handler.ts b/src/addon/mod/glossary/providers/tag-area-handler.ts
index fc1d3345e..a7323de00 100644
--- a/src/addon/mod/glossary/providers/tag-area-handler.ts
+++ b/src/addon/mod/glossary/providers/tag-area-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/imscp/components/components.module.ts b/src/addon/mod/imscp/components/components.module.ts
index 37a1cbeb2..9ff28b872 100644
--- a/src/addon/mod/imscp/components/components.module.ts
+++ b/src/addon/mod/imscp/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/imscp/components/index/index.ts b/src/addon/mod/imscp/components/index/index.ts
index 7ff8a0749..c6690b324 100644
--- a/src/addon/mod/imscp/components/index/index.ts
+++ b/src/addon/mod/imscp/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/imscp/imscp.module.ts b/src/addon/mod/imscp/imscp.module.ts
index 825af274f..bcafdaae5 100644
--- a/src/addon/mod/imscp/imscp.module.ts
+++ b/src/addon/mod/imscp/imscp.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/imscp/pages/index/index.module.ts b/src/addon/mod/imscp/pages/index/index.module.ts
index bc7feec3c..7aad119ef 100644
--- a/src/addon/mod/imscp/pages/index/index.module.ts
+++ b/src/addon/mod/imscp/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/imscp/pages/index/index.ts b/src/addon/mod/imscp/pages/index/index.ts
index 8300d2629..56d80259e 100644
--- a/src/addon/mod/imscp/pages/index/index.ts
+++ b/src/addon/mod/imscp/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/imscp/pages/toc/toc.module.ts b/src/addon/mod/imscp/pages/toc/toc.module.ts
index 28f970142..d28469b58 100644
--- a/src/addon/mod/imscp/pages/toc/toc.module.ts
+++ b/src/addon/mod/imscp/pages/toc/toc.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/imscp/pages/toc/toc.ts b/src/addon/mod/imscp/pages/toc/toc.ts
index 80f67f1b7..fe27fb416 100644
--- a/src/addon/mod/imscp/pages/toc/toc.ts
+++ b/src/addon/mod/imscp/pages/toc/toc.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/imscp/providers/imscp.ts b/src/addon/mod/imscp/providers/imscp.ts
index 45adb57f1..26591f768 100644
--- a/src/addon/mod/imscp/providers/imscp.ts
+++ b/src/addon/mod/imscp/providers/imscp.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/imscp/providers/link-handler.ts b/src/addon/mod/imscp/providers/link-handler.ts
index 7e7be9821..870f1ad0c 100644
--- a/src/addon/mod/imscp/providers/link-handler.ts
+++ b/src/addon/mod/imscp/providers/link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/imscp/providers/list-link-handler.ts b/src/addon/mod/imscp/providers/list-link-handler.ts
index eec7da06e..e973aadf8 100644
--- a/src/addon/mod/imscp/providers/list-link-handler.ts
+++ b/src/addon/mod/imscp/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/imscp/providers/module-handler.ts b/src/addon/mod/imscp/providers/module-handler.ts
index dc3abc139..577e7bfbe 100644
--- a/src/addon/mod/imscp/providers/module-handler.ts
+++ b/src/addon/mod/imscp/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/imscp/providers/pluginfile-handler.ts b/src/addon/mod/imscp/providers/pluginfile-handler.ts
index d15124b18..d67c455a3 100644
--- a/src/addon/mod/imscp/providers/pluginfile-handler.ts
+++ b/src/addon/mod/imscp/providers/pluginfile-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/imscp/providers/prefetch-handler.ts b/src/addon/mod/imscp/providers/prefetch-handler.ts
index 65d49dbbc..22b793f0c 100644
--- a/src/addon/mod/imscp/providers/prefetch-handler.ts
+++ b/src/addon/mod/imscp/providers/prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/label/label.module.ts b/src/addon/mod/label/label.module.ts
index 951242b36..696652a49 100644
--- a/src/addon/mod/label/label.module.ts
+++ b/src/addon/mod/label/label.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/label/providers/label.ts b/src/addon/mod/label/providers/label.ts
index 64e3d5c31..ec924ebd0 100644
--- a/src/addon/mod/label/providers/label.ts
+++ b/src/addon/mod/label/providers/label.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/label/providers/link-handler.ts b/src/addon/mod/label/providers/link-handler.ts
index c1ef6fd67..be593f328 100644
--- a/src/addon/mod/label/providers/link-handler.ts
+++ b/src/addon/mod/label/providers/link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/label/providers/module-handler.ts b/src/addon/mod/label/providers/module-handler.ts
index 6a8f72a75..06bfed785 100644
--- a/src/addon/mod/label/providers/module-handler.ts
+++ b/src/addon/mod/label/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/label/providers/prefetch-handler.ts b/src/addon/mod/label/providers/prefetch-handler.ts
index a52ad9ab8..d9679a430 100644
--- a/src/addon/mod/label/providers/prefetch-handler.ts
+++ b/src/addon/mod/label/providers/prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/components/components.module.ts b/src/addon/mod/lesson/components/components.module.ts
index 0acaaf970..a3ec028aa 100644
--- a/src/addon/mod/lesson/components/components.module.ts
+++ b/src/addon/mod/lesson/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/components/index/index.ts b/src/addon/mod/lesson/components/index/index.ts
index 1984da107..17dec12ee 100644
--- a/src/addon/mod/lesson/components/index/index.ts
+++ b/src/addon/mod/lesson/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/lesson.module.ts b/src/addon/mod/lesson/lesson.module.ts
index 0c1e194ec..8fcce6995 100644
--- a/src/addon/mod/lesson/lesson.module.ts
+++ b/src/addon/mod/lesson/lesson.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/pages/index/index.module.ts b/src/addon/mod/lesson/pages/index/index.module.ts
index 890814b05..609d9a349 100644
--- a/src/addon/mod/lesson/pages/index/index.module.ts
+++ b/src/addon/mod/lesson/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/pages/index/index.ts b/src/addon/mod/lesson/pages/index/index.ts
index 8899c8077..a48787281 100644
--- a/src/addon/mod/lesson/pages/index/index.ts
+++ b/src/addon/mod/lesson/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/pages/menu-modal/menu-modal.module.ts b/src/addon/mod/lesson/pages/menu-modal/menu-modal.module.ts
index 3147dc86e..28f4a1f40 100644
--- a/src/addon/mod/lesson/pages/menu-modal/menu-modal.module.ts
+++ b/src/addon/mod/lesson/pages/menu-modal/menu-modal.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/pages/menu-modal/menu-modal.ts b/src/addon/mod/lesson/pages/menu-modal/menu-modal.ts
index e9548064c..dfcece01b 100644
--- a/src/addon/mod/lesson/pages/menu-modal/menu-modal.ts
+++ b/src/addon/mod/lesson/pages/menu-modal/menu-modal.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/pages/password-modal/password-modal.module.ts b/src/addon/mod/lesson/pages/password-modal/password-modal.module.ts
index 1df852d5c..ea9b63c5c 100644
--- a/src/addon/mod/lesson/pages/password-modal/password-modal.module.ts
+++ b/src/addon/mod/lesson/pages/password-modal/password-modal.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/pages/password-modal/password-modal.ts b/src/addon/mod/lesson/pages/password-modal/password-modal.ts
index b1e7699a5..13fbfcdb1 100644
--- a/src/addon/mod/lesson/pages/password-modal/password-modal.ts
+++ b/src/addon/mod/lesson/pages/password-modal/password-modal.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/pages/player/player.module.ts b/src/addon/mod/lesson/pages/player/player.module.ts
index 5569515c0..361ae19ab 100644
--- a/src/addon/mod/lesson/pages/player/player.module.ts
+++ b/src/addon/mod/lesson/pages/player/player.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/pages/player/player.ts b/src/addon/mod/lesson/pages/player/player.ts
index 8c96a6721..4d9859d42 100644
--- a/src/addon/mod/lesson/pages/player/player.ts
+++ b/src/addon/mod/lesson/pages/player/player.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/pages/user-retake/user-retake.module.ts b/src/addon/mod/lesson/pages/user-retake/user-retake.module.ts
index 82f5f106e..4a625fcc8 100644
--- a/src/addon/mod/lesson/pages/user-retake/user-retake.module.ts
+++ b/src/addon/mod/lesson/pages/user-retake/user-retake.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/pages/user-retake/user-retake.ts b/src/addon/mod/lesson/pages/user-retake/user-retake.ts
index 48a8ff7e9..bbbb9e6c8 100644
--- a/src/addon/mod/lesson/pages/user-retake/user-retake.ts
+++ b/src/addon/mod/lesson/pages/user-retake/user-retake.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/providers/grade-link-handler.ts b/src/addon/mod/lesson/providers/grade-link-handler.ts
index 27bf35d6e..c608c692e 100644
--- a/src/addon/mod/lesson/providers/grade-link-handler.ts
+++ b/src/addon/mod/lesson/providers/grade-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/providers/helper.ts b/src/addon/mod/lesson/providers/helper.ts
index 0fadbf3f5..099ace894 100644
--- a/src/addon/mod/lesson/providers/helper.ts
+++ b/src/addon/mod/lesson/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/providers/index-link-handler.ts b/src/addon/mod/lesson/providers/index-link-handler.ts
index 6228dcbf4..62ffb8311 100644
--- a/src/addon/mod/lesson/providers/index-link-handler.ts
+++ b/src/addon/mod/lesson/providers/index-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/providers/lesson-offline.ts b/src/addon/mod/lesson/providers/lesson-offline.ts
index 7cfc872fb..53938e50b 100644
--- a/src/addon/mod/lesson/providers/lesson-offline.ts
+++ b/src/addon/mod/lesson/providers/lesson-offline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/providers/lesson-sync.ts b/src/addon/mod/lesson/providers/lesson-sync.ts
index d17c76200..f3c2d4303 100644
--- a/src/addon/mod/lesson/providers/lesson-sync.ts
+++ b/src/addon/mod/lesson/providers/lesson-sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/providers/lesson.ts b/src/addon/mod/lesson/providers/lesson.ts
index 69f5daca7..4c7a52711 100644
--- a/src/addon/mod/lesson/providers/lesson.ts
+++ b/src/addon/mod/lesson/providers/lesson.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/providers/list-link-handler.ts b/src/addon/mod/lesson/providers/list-link-handler.ts
index 273e6d6f8..1906cc07d 100644
--- a/src/addon/mod/lesson/providers/list-link-handler.ts
+++ b/src/addon/mod/lesson/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/providers/module-handler.ts b/src/addon/mod/lesson/providers/module-handler.ts
index a2e706cd0..426d6b0e9 100644
--- a/src/addon/mod/lesson/providers/module-handler.ts
+++ b/src/addon/mod/lesson/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/providers/prefetch-handler.ts b/src/addon/mod/lesson/providers/prefetch-handler.ts
index 80a32c44b..b424edf92 100644
--- a/src/addon/mod/lesson/providers/prefetch-handler.ts
+++ b/src/addon/mod/lesson/providers/prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/providers/push-click-handler.ts b/src/addon/mod/lesson/providers/push-click-handler.ts
index db47c4b56..85378bbf2 100644
--- a/src/addon/mod/lesson/providers/push-click-handler.ts
+++ b/src/addon/mod/lesson/providers/push-click-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/providers/report-link-handler.ts b/src/addon/mod/lesson/providers/report-link-handler.ts
index 790f110b2..bb6d8739c 100644
--- a/src/addon/mod/lesson/providers/report-link-handler.ts
+++ b/src/addon/mod/lesson/providers/report-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lesson/providers/sync-cron-handler.ts b/src/addon/mod/lesson/providers/sync-cron-handler.ts
index 446eb712c..8dab6edd0 100644
--- a/src/addon/mod/lesson/providers/sync-cron-handler.ts
+++ b/src/addon/mod/lesson/providers/sync-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lti/components/components.module.ts b/src/addon/mod/lti/components/components.module.ts
index d734384b9..a0ae72b9e 100644
--- a/src/addon/mod/lti/components/components.module.ts
+++ b/src/addon/mod/lti/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lti/components/index/index.ts b/src/addon/mod/lti/components/index/index.ts
index 2d5e3fd4e..ca933a8e5 100644
--- a/src/addon/mod/lti/components/index/index.ts
+++ b/src/addon/mod/lti/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lti/lti.module.ts b/src/addon/mod/lti/lti.module.ts
index 442a7f7f0..08d670c13 100644
--- a/src/addon/mod/lti/lti.module.ts
+++ b/src/addon/mod/lti/lti.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lti/pages/index/index.module.ts b/src/addon/mod/lti/pages/index/index.module.ts
index dda226660..1300091a8 100644
--- a/src/addon/mod/lti/pages/index/index.module.ts
+++ b/src/addon/mod/lti/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lti/pages/index/index.ts b/src/addon/mod/lti/pages/index/index.ts
index 7109d0d7d..697d93d81 100644
--- a/src/addon/mod/lti/pages/index/index.ts
+++ b/src/addon/mod/lti/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lti/providers/link-handler.ts b/src/addon/mod/lti/providers/link-handler.ts
index 2c69182cb..bc0c0a6b2 100644
--- a/src/addon/mod/lti/providers/link-handler.ts
+++ b/src/addon/mod/lti/providers/link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lti/providers/list-link-handler.ts b/src/addon/mod/lti/providers/list-link-handler.ts
index 1915f8430..5a474395d 100644
--- a/src/addon/mod/lti/providers/list-link-handler.ts
+++ b/src/addon/mod/lti/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lti/providers/lti.ts b/src/addon/mod/lti/providers/lti.ts
index 8ea9b09e9..c9d160692 100644
--- a/src/addon/mod/lti/providers/lti.ts
+++ b/src/addon/mod/lti/providers/lti.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/lti/providers/module-handler.ts b/src/addon/mod/lti/providers/module-handler.ts
index 36757b9a8..e6aa945c5 100644
--- a/src/addon/mod/lti/providers/module-handler.ts
+++ b/src/addon/mod/lti/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/page/components/components.module.ts b/src/addon/mod/page/components/components.module.ts
index be48ffd8e..d36a28733 100644
--- a/src/addon/mod/page/components/components.module.ts
+++ b/src/addon/mod/page/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/page/components/index/index.ts b/src/addon/mod/page/components/index/index.ts
index f8b1dd6ff..9ee38717e 100644
--- a/src/addon/mod/page/components/index/index.ts
+++ b/src/addon/mod/page/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/page/page.module.ts b/src/addon/mod/page/page.module.ts
index 5725b0266..fc357fec1 100644
--- a/src/addon/mod/page/page.module.ts
+++ b/src/addon/mod/page/page.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/page/pages/index/index.module.ts b/src/addon/mod/page/pages/index/index.module.ts
index b4d02aab9..7cb2aea16 100644
--- a/src/addon/mod/page/pages/index/index.module.ts
+++ b/src/addon/mod/page/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/page/pages/index/index.ts b/src/addon/mod/page/pages/index/index.ts
index 8b224d3df..7de352e1b 100644
--- a/src/addon/mod/page/pages/index/index.ts
+++ b/src/addon/mod/page/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/page/providers/helper.ts b/src/addon/mod/page/providers/helper.ts
index 13f7209a4..7b2f1852e 100644
--- a/src/addon/mod/page/providers/helper.ts
+++ b/src/addon/mod/page/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/page/providers/link-handler.ts b/src/addon/mod/page/providers/link-handler.ts
index 339a6e202..c49947c63 100644
--- a/src/addon/mod/page/providers/link-handler.ts
+++ b/src/addon/mod/page/providers/link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/page/providers/list-link-handler.ts b/src/addon/mod/page/providers/list-link-handler.ts
index d56ba9d85..0fcd97384 100644
--- a/src/addon/mod/page/providers/list-link-handler.ts
+++ b/src/addon/mod/page/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/page/providers/module-handler.ts b/src/addon/mod/page/providers/module-handler.ts
index f54293b51..39aff31f3 100644
--- a/src/addon/mod/page/providers/module-handler.ts
+++ b/src/addon/mod/page/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/page/providers/page.ts b/src/addon/mod/page/providers/page.ts
index f41739e9a..817e848b3 100644
--- a/src/addon/mod/page/providers/page.ts
+++ b/src/addon/mod/page/providers/page.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/page/providers/pluginfile-handler.ts b/src/addon/mod/page/providers/pluginfile-handler.ts
index dd7e928af..c17e6b626 100644
--- a/src/addon/mod/page/providers/pluginfile-handler.ts
+++ b/src/addon/mod/page/providers/pluginfile-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/page/providers/prefetch-handler.ts b/src/addon/mod/page/providers/prefetch-handler.ts
index 69043da50..5c37eebef 100644
--- a/src/addon/mod/page/providers/prefetch-handler.ts
+++ b/src/addon/mod/page/providers/prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/delaybetweenattempts/delaybetweenattempts.module.ts b/src/addon/mod/quiz/accessrules/delaybetweenattempts/delaybetweenattempts.module.ts
index 6d0317da2..6f408fc11 100644
--- a/src/addon/mod/quiz/accessrules/delaybetweenattempts/delaybetweenattempts.module.ts
+++ b/src/addon/mod/quiz/accessrules/delaybetweenattempts/delaybetweenattempts.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/delaybetweenattempts/providers/handler.ts b/src/addon/mod/quiz/accessrules/delaybetweenattempts/providers/handler.ts
index 518904872..c605d358c 100644
--- a/src/addon/mod/quiz/accessrules/delaybetweenattempts/providers/handler.ts
+++ b/src/addon/mod/quiz/accessrules/delaybetweenattempts/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/ipaddress/ipaddress.module.ts b/src/addon/mod/quiz/accessrules/ipaddress/ipaddress.module.ts
index 4a60d8c36..3b58baf47 100644
--- a/src/addon/mod/quiz/accessrules/ipaddress/ipaddress.module.ts
+++ b/src/addon/mod/quiz/accessrules/ipaddress/ipaddress.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/ipaddress/providers/handler.ts b/src/addon/mod/quiz/accessrules/ipaddress/providers/handler.ts
index e8d4616f0..6f763e4e7 100644
--- a/src/addon/mod/quiz/accessrules/ipaddress/providers/handler.ts
+++ b/src/addon/mod/quiz/accessrules/ipaddress/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/numattempts/numattempts.module.ts b/src/addon/mod/quiz/accessrules/numattempts/numattempts.module.ts
index ef194b2e8..9be84f679 100644
--- a/src/addon/mod/quiz/accessrules/numattempts/numattempts.module.ts
+++ b/src/addon/mod/quiz/accessrules/numattempts/numattempts.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/numattempts/providers/handler.ts b/src/addon/mod/quiz/accessrules/numattempts/providers/handler.ts
index e2027019d..00da772ed 100644
--- a/src/addon/mod/quiz/accessrules/numattempts/providers/handler.ts
+++ b/src/addon/mod/quiz/accessrules/numattempts/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/offlineattempts/component/offlineattempts.ts b/src/addon/mod/quiz/accessrules/offlineattempts/component/offlineattempts.ts
index 0e77aa893..6c26cda9e 100644
--- a/src/addon/mod/quiz/accessrules/offlineattempts/component/offlineattempts.ts
+++ b/src/addon/mod/quiz/accessrules/offlineattempts/component/offlineattempts.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/offlineattempts/offlineattempts.module.ts b/src/addon/mod/quiz/accessrules/offlineattempts/offlineattempts.module.ts
index 5cd1adfcf..0c94830b2 100644
--- a/src/addon/mod/quiz/accessrules/offlineattempts/offlineattempts.module.ts
+++ b/src/addon/mod/quiz/accessrules/offlineattempts/offlineattempts.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/offlineattempts/providers/handler.ts b/src/addon/mod/quiz/accessrules/offlineattempts/providers/handler.ts
index b5b84382a..ff8a0c6c3 100644
--- a/src/addon/mod/quiz/accessrules/offlineattempts/providers/handler.ts
+++ b/src/addon/mod/quiz/accessrules/offlineattempts/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/openclosedate/openclosedate.module.ts b/src/addon/mod/quiz/accessrules/openclosedate/openclosedate.module.ts
index 3c23691b1..7e944dffd 100644
--- a/src/addon/mod/quiz/accessrules/openclosedate/openclosedate.module.ts
+++ b/src/addon/mod/quiz/accessrules/openclosedate/openclosedate.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/openclosedate/providers/handler.ts b/src/addon/mod/quiz/accessrules/openclosedate/providers/handler.ts
index 09c5d8af2..a7c1ca4f2 100644
--- a/src/addon/mod/quiz/accessrules/openclosedate/providers/handler.ts
+++ b/src/addon/mod/quiz/accessrules/openclosedate/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/password/component/password.ts b/src/addon/mod/quiz/accessrules/password/component/password.ts
index 8bf5bed9b..da3a959b8 100644
--- a/src/addon/mod/quiz/accessrules/password/component/password.ts
+++ b/src/addon/mod/quiz/accessrules/password/component/password.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/password/password.module.ts b/src/addon/mod/quiz/accessrules/password/password.module.ts
index 7c33fa616..8063d7685 100644
--- a/src/addon/mod/quiz/accessrules/password/password.module.ts
+++ b/src/addon/mod/quiz/accessrules/password/password.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/password/providers/handler.ts b/src/addon/mod/quiz/accessrules/password/providers/handler.ts
index ac3c7a970..9195f5603 100644
--- a/src/addon/mod/quiz/accessrules/password/providers/handler.ts
+++ b/src/addon/mod/quiz/accessrules/password/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/safebrowser/providers/handler.ts b/src/addon/mod/quiz/accessrules/safebrowser/providers/handler.ts
index b17e263ea..6f50fa179 100644
--- a/src/addon/mod/quiz/accessrules/safebrowser/providers/handler.ts
+++ b/src/addon/mod/quiz/accessrules/safebrowser/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/safebrowser/safebrowser.module.ts b/src/addon/mod/quiz/accessrules/safebrowser/safebrowser.module.ts
index 6e326e8cf..9552bc5bd 100644
--- a/src/addon/mod/quiz/accessrules/safebrowser/safebrowser.module.ts
+++ b/src/addon/mod/quiz/accessrules/safebrowser/safebrowser.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/securewindow/providers/handler.ts b/src/addon/mod/quiz/accessrules/securewindow/providers/handler.ts
index 218061e1f..1dae317e0 100644
--- a/src/addon/mod/quiz/accessrules/securewindow/providers/handler.ts
+++ b/src/addon/mod/quiz/accessrules/securewindow/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/securewindow/securewindow.module.ts b/src/addon/mod/quiz/accessrules/securewindow/securewindow.module.ts
index 216f3b8b8..08617090d 100644
--- a/src/addon/mod/quiz/accessrules/securewindow/securewindow.module.ts
+++ b/src/addon/mod/quiz/accessrules/securewindow/securewindow.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/timelimit/component/timelimit.ts b/src/addon/mod/quiz/accessrules/timelimit/component/timelimit.ts
index 26c9f2f57..7b3764a78 100644
--- a/src/addon/mod/quiz/accessrules/timelimit/component/timelimit.ts
+++ b/src/addon/mod/quiz/accessrules/timelimit/component/timelimit.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/timelimit/providers/handler.ts b/src/addon/mod/quiz/accessrules/timelimit/providers/handler.ts
index 41a23fe40..aaf3d2d32 100644
--- a/src/addon/mod/quiz/accessrules/timelimit/providers/handler.ts
+++ b/src/addon/mod/quiz/accessrules/timelimit/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/accessrules/timelimit/timelimit.module.ts b/src/addon/mod/quiz/accessrules/timelimit/timelimit.module.ts
index 850c2fb49..04324c78b 100644
--- a/src/addon/mod/quiz/accessrules/timelimit/timelimit.module.ts
+++ b/src/addon/mod/quiz/accessrules/timelimit/timelimit.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/classes/auto-save.ts b/src/addon/mod/quiz/classes/auto-save.ts
index 8a7be1f77..1c52afaa2 100644
--- a/src/addon/mod/quiz/classes/auto-save.ts
+++ b/src/addon/mod/quiz/classes/auto-save.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/components/components.module.ts b/src/addon/mod/quiz/components/components.module.ts
index e08c92cd4..aa3de2838 100644
--- a/src/addon/mod/quiz/components/components.module.ts
+++ b/src/addon/mod/quiz/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/components/connection-error/connection-error.ts b/src/addon/mod/quiz/components/connection-error/connection-error.ts
index e6013e240..cf78619c7 100644
--- a/src/addon/mod/quiz/components/connection-error/connection-error.ts
+++ b/src/addon/mod/quiz/components/connection-error/connection-error.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/components/index/index.ts b/src/addon/mod/quiz/components/index/index.ts
index 52dd2930b..3a2157138 100644
--- a/src/addon/mod/quiz/components/index/index.ts
+++ b/src/addon/mod/quiz/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/pages/attempt/attempt.module.ts b/src/addon/mod/quiz/pages/attempt/attempt.module.ts
index 66257ff1b..f766e41e0 100644
--- a/src/addon/mod/quiz/pages/attempt/attempt.module.ts
+++ b/src/addon/mod/quiz/pages/attempt/attempt.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/pages/attempt/attempt.ts b/src/addon/mod/quiz/pages/attempt/attempt.ts
index ea7befc58..dae185cc3 100644
--- a/src/addon/mod/quiz/pages/attempt/attempt.ts
+++ b/src/addon/mod/quiz/pages/attempt/attempt.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/pages/index/index.module.ts b/src/addon/mod/quiz/pages/index/index.module.ts
index 3ee1e482e..73045fd3f 100644
--- a/src/addon/mod/quiz/pages/index/index.module.ts
+++ b/src/addon/mod/quiz/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/pages/index/index.ts b/src/addon/mod/quiz/pages/index/index.ts
index 2ad9ec51d..9d0172d41 100644
--- a/src/addon/mod/quiz/pages/index/index.ts
+++ b/src/addon/mod/quiz/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.module.ts b/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.module.ts
index 1152efb6f..886b0de8d 100644
--- a/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.module.ts
+++ b/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.ts b/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.ts
index 298153a42..4d1b1da6d 100644
--- a/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.ts
+++ b/src/addon/mod/quiz/pages/navigation-modal/navigation-modal.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/pages/player/player.module.ts b/src/addon/mod/quiz/pages/player/player.module.ts
index 7275025c4..1f6113f51 100644
--- a/src/addon/mod/quiz/pages/player/player.module.ts
+++ b/src/addon/mod/quiz/pages/player/player.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/pages/player/player.ts b/src/addon/mod/quiz/pages/player/player.ts
index dc4a38a64..81f7989d5 100644
--- a/src/addon/mod/quiz/pages/player/player.ts
+++ b/src/addon/mod/quiz/pages/player/player.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/pages/preflight-modal/preflight-modal.module.ts b/src/addon/mod/quiz/pages/preflight-modal/preflight-modal.module.ts
index a5fc75aa1..655074507 100644
--- a/src/addon/mod/quiz/pages/preflight-modal/preflight-modal.module.ts
+++ b/src/addon/mod/quiz/pages/preflight-modal/preflight-modal.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/pages/preflight-modal/preflight-modal.ts b/src/addon/mod/quiz/pages/preflight-modal/preflight-modal.ts
index f832b208e..590d03137 100644
--- a/src/addon/mod/quiz/pages/preflight-modal/preflight-modal.ts
+++ b/src/addon/mod/quiz/pages/preflight-modal/preflight-modal.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/pages/review/review.module.ts b/src/addon/mod/quiz/pages/review/review.module.ts
index a0d03f60f..d3b30b8bc 100644
--- a/src/addon/mod/quiz/pages/review/review.module.ts
+++ b/src/addon/mod/quiz/pages/review/review.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/pages/review/review.ts b/src/addon/mod/quiz/pages/review/review.ts
index fead003f9..5c2ef225d 100644
--- a/src/addon/mod/quiz/pages/review/review.ts
+++ b/src/addon/mod/quiz/pages/review/review.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/providers/access-rules-delegate.ts b/src/addon/mod/quiz/providers/access-rules-delegate.ts
index 788f2a191..919f8f1a2 100644
--- a/src/addon/mod/quiz/providers/access-rules-delegate.ts
+++ b/src/addon/mod/quiz/providers/access-rules-delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/providers/grade-link-handler.ts b/src/addon/mod/quiz/providers/grade-link-handler.ts
index 1775139e2..87b85fd38 100644
--- a/src/addon/mod/quiz/providers/grade-link-handler.ts
+++ b/src/addon/mod/quiz/providers/grade-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/providers/helper.ts b/src/addon/mod/quiz/providers/helper.ts
index 96683ce00..706c43f8a 100644
--- a/src/addon/mod/quiz/providers/helper.ts
+++ b/src/addon/mod/quiz/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/providers/index-link-handler.ts b/src/addon/mod/quiz/providers/index-link-handler.ts
index cb39371ad..11f99de3b 100644
--- a/src/addon/mod/quiz/providers/index-link-handler.ts
+++ b/src/addon/mod/quiz/providers/index-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/providers/list-link-handler.ts b/src/addon/mod/quiz/providers/list-link-handler.ts
index 1a19d89e2..61bfaa8f0 100644
--- a/src/addon/mod/quiz/providers/list-link-handler.ts
+++ b/src/addon/mod/quiz/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/providers/module-handler.ts b/src/addon/mod/quiz/providers/module-handler.ts
index cf8ea190f..822f196d7 100644
--- a/src/addon/mod/quiz/providers/module-handler.ts
+++ b/src/addon/mod/quiz/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/providers/prefetch-handler.ts b/src/addon/mod/quiz/providers/prefetch-handler.ts
index a06d15541..4801db409 100644
--- a/src/addon/mod/quiz/providers/prefetch-handler.ts
+++ b/src/addon/mod/quiz/providers/prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/providers/push-click-handler.ts b/src/addon/mod/quiz/providers/push-click-handler.ts
index 05958945f..9509d096a 100644
--- a/src/addon/mod/quiz/providers/push-click-handler.ts
+++ b/src/addon/mod/quiz/providers/push-click-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/providers/quiz-offline.ts b/src/addon/mod/quiz/providers/quiz-offline.ts
index e52cc1da6..6c1f5121e 100644
--- a/src/addon/mod/quiz/providers/quiz-offline.ts
+++ b/src/addon/mod/quiz/providers/quiz-offline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/providers/quiz-sync.ts b/src/addon/mod/quiz/providers/quiz-sync.ts
index 881cb4f81..b49891a58 100644
--- a/src/addon/mod/quiz/providers/quiz-sync.ts
+++ b/src/addon/mod/quiz/providers/quiz-sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/providers/quiz.ts b/src/addon/mod/quiz/providers/quiz.ts
index b13182ef8..b4df1d58e 100644
--- a/src/addon/mod/quiz/providers/quiz.ts
+++ b/src/addon/mod/quiz/providers/quiz.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/providers/review-link-handler.ts b/src/addon/mod/quiz/providers/review-link-handler.ts
index c903756fd..8fd018ca9 100644
--- a/src/addon/mod/quiz/providers/review-link-handler.ts
+++ b/src/addon/mod/quiz/providers/review-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/providers/sync-cron-handler.ts b/src/addon/mod/quiz/providers/sync-cron-handler.ts
index 439db41e3..622f556f6 100644
--- a/src/addon/mod/quiz/providers/sync-cron-handler.ts
+++ b/src/addon/mod/quiz/providers/sync-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/quiz/quiz.module.ts b/src/addon/mod/quiz/quiz.module.ts
index 93cc7ae2f..e77749f5f 100644
--- a/src/addon/mod/quiz/quiz.module.ts
+++ b/src/addon/mod/quiz/quiz.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/resource/components/components.module.ts b/src/addon/mod/resource/components/components.module.ts
index 1f2cdda66..cb608dcb2 100644
--- a/src/addon/mod/resource/components/components.module.ts
+++ b/src/addon/mod/resource/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/resource/components/index/index.ts b/src/addon/mod/resource/components/index/index.ts
index 815aa1388..6c33136a3 100644
--- a/src/addon/mod/resource/components/index/index.ts
+++ b/src/addon/mod/resource/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/resource/pages/index/index.module.ts b/src/addon/mod/resource/pages/index/index.module.ts
index 6d6dc347d..1a207614d 100644
--- a/src/addon/mod/resource/pages/index/index.module.ts
+++ b/src/addon/mod/resource/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/resource/pages/index/index.ts b/src/addon/mod/resource/pages/index/index.ts
index b1ae19404..331a1566d 100644
--- a/src/addon/mod/resource/pages/index/index.ts
+++ b/src/addon/mod/resource/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/resource/providers/helper.ts b/src/addon/mod/resource/providers/helper.ts
index cf315075a..e751bf2c5 100644
--- a/src/addon/mod/resource/providers/helper.ts
+++ b/src/addon/mod/resource/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/resource/providers/link-handler.ts b/src/addon/mod/resource/providers/link-handler.ts
index 2a84bbf49..39a1795de 100644
--- a/src/addon/mod/resource/providers/link-handler.ts
+++ b/src/addon/mod/resource/providers/link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/resource/providers/list-link-handler.ts b/src/addon/mod/resource/providers/list-link-handler.ts
index 161816640..5101685ad 100644
--- a/src/addon/mod/resource/providers/list-link-handler.ts
+++ b/src/addon/mod/resource/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/resource/providers/module-handler.ts b/src/addon/mod/resource/providers/module-handler.ts
index b4c6b1b32..5b0d8686e 100644
--- a/src/addon/mod/resource/providers/module-handler.ts
+++ b/src/addon/mod/resource/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/resource/providers/pluginfile-handler.ts b/src/addon/mod/resource/providers/pluginfile-handler.ts
index bfda5c467..b0b41368d 100644
--- a/src/addon/mod/resource/providers/pluginfile-handler.ts
+++ b/src/addon/mod/resource/providers/pluginfile-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/resource/providers/prefetch-handler.ts b/src/addon/mod/resource/providers/prefetch-handler.ts
index eee3a26ef..94a946ae4 100644
--- a/src/addon/mod/resource/providers/prefetch-handler.ts
+++ b/src/addon/mod/resource/providers/prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/resource/providers/resource.ts b/src/addon/mod/resource/providers/resource.ts
index 19305d71d..5445ec3b1 100644
--- a/src/addon/mod/resource/providers/resource.ts
+++ b/src/addon/mod/resource/providers/resource.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/resource/resource.module.ts b/src/addon/mod/resource/resource.module.ts
index 7d0726dca..d2d2be4e9 100644
--- a/src/addon/mod/resource/resource.module.ts
+++ b/src/addon/mod/resource/resource.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/classes/data-model-12.ts b/src/addon/mod/scorm/classes/data-model-12.ts
index 4c0fd345a..ef615fede 100644
--- a/src/addon/mod/scorm/classes/data-model-12.ts
+++ b/src/addon/mod/scorm/classes/data-model-12.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/components/components.module.ts b/src/addon/mod/scorm/components/components.module.ts
index 2a9c6569b..41b0313f8 100644
--- a/src/addon/mod/scorm/components/components.module.ts
+++ b/src/addon/mod/scorm/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/components/index/index.ts b/src/addon/mod/scorm/components/index/index.ts
index 530ac4e47..f2fd0a9a2 100644
--- a/src/addon/mod/scorm/components/index/index.ts
+++ b/src/addon/mod/scorm/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/pages/index/index.module.ts b/src/addon/mod/scorm/pages/index/index.module.ts
index 68bd2e47b..7f2fad09d 100644
--- a/src/addon/mod/scorm/pages/index/index.module.ts
+++ b/src/addon/mod/scorm/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/pages/index/index.ts b/src/addon/mod/scorm/pages/index/index.ts
index 1ed77747d..0a840bfd9 100644
--- a/src/addon/mod/scorm/pages/index/index.ts
+++ b/src/addon/mod/scorm/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/pages/player/player.module.ts b/src/addon/mod/scorm/pages/player/player.module.ts
index dd5e85b1f..ba78bcb70 100644
--- a/src/addon/mod/scorm/pages/player/player.module.ts
+++ b/src/addon/mod/scorm/pages/player/player.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/pages/player/player.ts b/src/addon/mod/scorm/pages/player/player.ts
index f4c0528a1..b197328e3 100644
--- a/src/addon/mod/scorm/pages/player/player.ts
+++ b/src/addon/mod/scorm/pages/player/player.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/pages/toc/toc.module.ts b/src/addon/mod/scorm/pages/toc/toc.module.ts
index 4f7684d1a..0a0197203 100644
--- a/src/addon/mod/scorm/pages/toc/toc.module.ts
+++ b/src/addon/mod/scorm/pages/toc/toc.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/pages/toc/toc.ts b/src/addon/mod/scorm/pages/toc/toc.ts
index 3d1074c12..c1e9ace50 100644
--- a/src/addon/mod/scorm/pages/toc/toc.ts
+++ b/src/addon/mod/scorm/pages/toc/toc.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/providers/grade-link-handler.ts b/src/addon/mod/scorm/providers/grade-link-handler.ts
index 9d3dd8674..8f99f504a 100644
--- a/src/addon/mod/scorm/providers/grade-link-handler.ts
+++ b/src/addon/mod/scorm/providers/grade-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/providers/helper.ts b/src/addon/mod/scorm/providers/helper.ts
index 17b9ddf3f..49fe8f6fd 100644
--- a/src/addon/mod/scorm/providers/helper.ts
+++ b/src/addon/mod/scorm/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/providers/index-link-handler.ts b/src/addon/mod/scorm/providers/index-link-handler.ts
index 3ade9ccf3..999c01595 100644
--- a/src/addon/mod/scorm/providers/index-link-handler.ts
+++ b/src/addon/mod/scorm/providers/index-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/providers/list-link-handler.ts b/src/addon/mod/scorm/providers/list-link-handler.ts
index ab366a609..c40c733dc 100644
--- a/src/addon/mod/scorm/providers/list-link-handler.ts
+++ b/src/addon/mod/scorm/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/providers/module-handler.ts b/src/addon/mod/scorm/providers/module-handler.ts
index 1fabceed2..b223bd918 100644
--- a/src/addon/mod/scorm/providers/module-handler.ts
+++ b/src/addon/mod/scorm/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/providers/pluginfile-handler.ts b/src/addon/mod/scorm/providers/pluginfile-handler.ts
index e9ed78e91..ccb1a3a6b 100644
--- a/src/addon/mod/scorm/providers/pluginfile-handler.ts
+++ b/src/addon/mod/scorm/providers/pluginfile-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/providers/prefetch-handler.ts b/src/addon/mod/scorm/providers/prefetch-handler.ts
index 175d1f8fa..8195d4789 100644
--- a/src/addon/mod/scorm/providers/prefetch-handler.ts
+++ b/src/addon/mod/scorm/providers/prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/providers/scorm-offline.ts b/src/addon/mod/scorm/providers/scorm-offline.ts
index 9c605f2dd..24542b1fe 100644
--- a/src/addon/mod/scorm/providers/scorm-offline.ts
+++ b/src/addon/mod/scorm/providers/scorm-offline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/providers/scorm-sync.ts b/src/addon/mod/scorm/providers/scorm-sync.ts
index 9a5cc7259..59ecbb813 100644
--- a/src/addon/mod/scorm/providers/scorm-sync.ts
+++ b/src/addon/mod/scorm/providers/scorm-sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/providers/scorm.ts b/src/addon/mod/scorm/providers/scorm.ts
index b0585a0f9..f2fadc93a 100644
--- a/src/addon/mod/scorm/providers/scorm.ts
+++ b/src/addon/mod/scorm/providers/scorm.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/providers/sync-cron-handler.ts b/src/addon/mod/scorm/providers/sync-cron-handler.ts
index e0fef8e95..2f1951ef4 100644
--- a/src/addon/mod/scorm/providers/sync-cron-handler.ts
+++ b/src/addon/mod/scorm/providers/sync-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/scorm/scorm.module.ts b/src/addon/mod/scorm/scorm.module.ts
index 95961aad6..7542353a7 100644
--- a/src/addon/mod/scorm/scorm.module.ts
+++ b/src/addon/mod/scorm/scorm.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/survey/components/components.module.ts b/src/addon/mod/survey/components/components.module.ts
index 7760befed..42ba457c4 100644
--- a/src/addon/mod/survey/components/components.module.ts
+++ b/src/addon/mod/survey/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/survey/components/index/index.ts b/src/addon/mod/survey/components/index/index.ts
index b51dfab60..dfa6696c3 100644
--- a/src/addon/mod/survey/components/index/index.ts
+++ b/src/addon/mod/survey/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/survey/pages/index/index.module.ts b/src/addon/mod/survey/pages/index/index.module.ts
index 5174d45a2..8cf33a393 100644
--- a/src/addon/mod/survey/pages/index/index.module.ts
+++ b/src/addon/mod/survey/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/survey/pages/index/index.ts b/src/addon/mod/survey/pages/index/index.ts
index ce2546b82..f5cda2208 100644
--- a/src/addon/mod/survey/pages/index/index.ts
+++ b/src/addon/mod/survey/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/survey/providers/helper.ts b/src/addon/mod/survey/providers/helper.ts
index 1553bd9d4..69807e090 100644
--- a/src/addon/mod/survey/providers/helper.ts
+++ b/src/addon/mod/survey/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/survey/providers/link-handler.ts b/src/addon/mod/survey/providers/link-handler.ts
index 0189bcc4a..fb986a5c6 100644
--- a/src/addon/mod/survey/providers/link-handler.ts
+++ b/src/addon/mod/survey/providers/link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/survey/providers/list-link-handler.ts b/src/addon/mod/survey/providers/list-link-handler.ts
index 5d856a4c0..509349dbd 100644
--- a/src/addon/mod/survey/providers/list-link-handler.ts
+++ b/src/addon/mod/survey/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/survey/providers/module-handler.ts b/src/addon/mod/survey/providers/module-handler.ts
index 14db300e5..318e084f5 100644
--- a/src/addon/mod/survey/providers/module-handler.ts
+++ b/src/addon/mod/survey/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/survey/providers/offline.ts b/src/addon/mod/survey/providers/offline.ts
index b9709ca0b..511f1db7c 100644
--- a/src/addon/mod/survey/providers/offline.ts
+++ b/src/addon/mod/survey/providers/offline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/survey/providers/prefetch-handler.ts b/src/addon/mod/survey/providers/prefetch-handler.ts
index b56636f8f..175825ab5 100644
--- a/src/addon/mod/survey/providers/prefetch-handler.ts
+++ b/src/addon/mod/survey/providers/prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/survey/providers/survey.ts b/src/addon/mod/survey/providers/survey.ts
index 428a3db39..3063c07e8 100644
--- a/src/addon/mod/survey/providers/survey.ts
+++ b/src/addon/mod/survey/providers/survey.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/survey/providers/sync-cron-handler.ts b/src/addon/mod/survey/providers/sync-cron-handler.ts
index e3b731569..b06f7c549 100644
--- a/src/addon/mod/survey/providers/sync-cron-handler.ts
+++ b/src/addon/mod/survey/providers/sync-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/survey/providers/sync.ts b/src/addon/mod/survey/providers/sync.ts
index 4ffc79cd0..0733baf8d 100644
--- a/src/addon/mod/survey/providers/sync.ts
+++ b/src/addon/mod/survey/providers/sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/survey/survey.module.ts b/src/addon/mod/survey/survey.module.ts
index 7a53a63a8..f57b47080 100644
--- a/src/addon/mod/survey/survey.module.ts
+++ b/src/addon/mod/survey/survey.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/url/components/components.module.ts b/src/addon/mod/url/components/components.module.ts
index e1d413330..524d2b391 100644
--- a/src/addon/mod/url/components/components.module.ts
+++ b/src/addon/mod/url/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/url/components/index/index.ts b/src/addon/mod/url/components/index/index.ts
index e7bcd6206..1bb02097b 100644
--- a/src/addon/mod/url/components/index/index.ts
+++ b/src/addon/mod/url/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/url/pages/index/index.module.ts b/src/addon/mod/url/pages/index/index.module.ts
index 0bad6f9ae..80291e456 100644
--- a/src/addon/mod/url/pages/index/index.module.ts
+++ b/src/addon/mod/url/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/url/pages/index/index.ts b/src/addon/mod/url/pages/index/index.ts
index 1b5fde2db..7320af4a2 100644
--- a/src/addon/mod/url/pages/index/index.ts
+++ b/src/addon/mod/url/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/url/providers/helper.ts b/src/addon/mod/url/providers/helper.ts
index 25a9f99e5..55d4c5c49 100644
--- a/src/addon/mod/url/providers/helper.ts
+++ b/src/addon/mod/url/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/url/providers/link-handler.ts b/src/addon/mod/url/providers/link-handler.ts
index 8d9cc9da0..26d02f5f3 100644
--- a/src/addon/mod/url/providers/link-handler.ts
+++ b/src/addon/mod/url/providers/link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/url/providers/list-link-handler.ts b/src/addon/mod/url/providers/list-link-handler.ts
index 857bb08fb..850b3a623 100644
--- a/src/addon/mod/url/providers/list-link-handler.ts
+++ b/src/addon/mod/url/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/url/providers/module-handler.ts b/src/addon/mod/url/providers/module-handler.ts
index d1ef86acd..151dd2a8c 100644
--- a/src/addon/mod/url/providers/module-handler.ts
+++ b/src/addon/mod/url/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/url/providers/url.ts b/src/addon/mod/url/providers/url.ts
index cd8f9e1fe..49f2cbe7f 100644
--- a/src/addon/mod/url/providers/url.ts
+++ b/src/addon/mod/url/providers/url.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/url/url.module.ts b/src/addon/mod/url/url.module.ts
index 868a87d75..1e9c7231b 100644
--- a/src/addon/mod/url/url.module.ts
+++ b/src/addon/mod/url/url.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/components/components.module.ts b/src/addon/mod/wiki/components/components.module.ts
index 638be75aa..9735928c2 100644
--- a/src/addon/mod/wiki/components/components.module.ts
+++ b/src/addon/mod/wiki/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/components/index/index.ts b/src/addon/mod/wiki/components/index/index.ts
index c4baac90d..0380e962a 100644
--- a/src/addon/mod/wiki/components/index/index.ts
+++ b/src/addon/mod/wiki/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/components/subwiki-picker/subwiki-picker.ts b/src/addon/mod/wiki/components/subwiki-picker/subwiki-picker.ts
index 858125544..942ddb71b 100644
--- a/src/addon/mod/wiki/components/subwiki-picker/subwiki-picker.ts
+++ b/src/addon/mod/wiki/components/subwiki-picker/subwiki-picker.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/pages/edit/edit.module.ts b/src/addon/mod/wiki/pages/edit/edit.module.ts
index b24ab2f09..20b25f6bc 100644
--- a/src/addon/mod/wiki/pages/edit/edit.module.ts
+++ b/src/addon/mod/wiki/pages/edit/edit.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/pages/edit/edit.ts b/src/addon/mod/wiki/pages/edit/edit.ts
index 9bcc6817b..160bfeeb2 100644
--- a/src/addon/mod/wiki/pages/edit/edit.ts
+++ b/src/addon/mod/wiki/pages/edit/edit.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/pages/index/index.module.ts b/src/addon/mod/wiki/pages/index/index.module.ts
index 190bf0fb7..b2458055a 100644
--- a/src/addon/mod/wiki/pages/index/index.module.ts
+++ b/src/addon/mod/wiki/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/pages/index/index.ts b/src/addon/mod/wiki/pages/index/index.ts
index b3cef20a7..7628bda31 100644
--- a/src/addon/mod/wiki/pages/index/index.ts
+++ b/src/addon/mod/wiki/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/pages/map/map.module.ts b/src/addon/mod/wiki/pages/map/map.module.ts
index cf9fa5738..75177b8dd 100644
--- a/src/addon/mod/wiki/pages/map/map.module.ts
+++ b/src/addon/mod/wiki/pages/map/map.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/pages/map/map.ts b/src/addon/mod/wiki/pages/map/map.ts
index 30fb14133..9de3fe745 100644
--- a/src/addon/mod/wiki/pages/map/map.ts
+++ b/src/addon/mod/wiki/pages/map/map.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/providers/create-link-handler.ts b/src/addon/mod/wiki/providers/create-link-handler.ts
index 048d41822..f56b8ee8e 100644
--- a/src/addon/mod/wiki/providers/create-link-handler.ts
+++ b/src/addon/mod/wiki/providers/create-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/providers/edit-link-handler.ts b/src/addon/mod/wiki/providers/edit-link-handler.ts
index 4373bc024..b6442157a 100644
--- a/src/addon/mod/wiki/providers/edit-link-handler.ts
+++ b/src/addon/mod/wiki/providers/edit-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/providers/index-link-handler.ts b/src/addon/mod/wiki/providers/index-link-handler.ts
index 212cbaa64..26286449e 100644
--- a/src/addon/mod/wiki/providers/index-link-handler.ts
+++ b/src/addon/mod/wiki/providers/index-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/providers/list-link-handler.ts b/src/addon/mod/wiki/providers/list-link-handler.ts
index 1be40c6ea..3645d1be3 100644
--- a/src/addon/mod/wiki/providers/list-link-handler.ts
+++ b/src/addon/mod/wiki/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/providers/module-handler.ts b/src/addon/mod/wiki/providers/module-handler.ts
index 1963d5def..85e40225d 100644
--- a/src/addon/mod/wiki/providers/module-handler.ts
+++ b/src/addon/mod/wiki/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/providers/page-or-map-link-handler.ts b/src/addon/mod/wiki/providers/page-or-map-link-handler.ts
index bcbe26978..cad304c40 100644
--- a/src/addon/mod/wiki/providers/page-or-map-link-handler.ts
+++ b/src/addon/mod/wiki/providers/page-or-map-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/providers/prefetch-handler.ts b/src/addon/mod/wiki/providers/prefetch-handler.ts
index 0097af2f6..d09fea4e4 100644
--- a/src/addon/mod/wiki/providers/prefetch-handler.ts
+++ b/src/addon/mod/wiki/providers/prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/providers/sync-cron-handler.ts b/src/addon/mod/wiki/providers/sync-cron-handler.ts
index 5d31464c8..fe854f560 100644
--- a/src/addon/mod/wiki/providers/sync-cron-handler.ts
+++ b/src/addon/mod/wiki/providers/sync-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/providers/tag-area-handler.ts b/src/addon/mod/wiki/providers/tag-area-handler.ts
index 2d06b73b2..a0fcaa301 100644
--- a/src/addon/mod/wiki/providers/tag-area-handler.ts
+++ b/src/addon/mod/wiki/providers/tag-area-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/providers/wiki-offline.ts b/src/addon/mod/wiki/providers/wiki-offline.ts
index 0c11d14d1..7b98dc034 100644
--- a/src/addon/mod/wiki/providers/wiki-offline.ts
+++ b/src/addon/mod/wiki/providers/wiki-offline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/providers/wiki-sync.ts b/src/addon/mod/wiki/providers/wiki-sync.ts
index 4bd73581a..174fedcf6 100644
--- a/src/addon/mod/wiki/providers/wiki-sync.ts
+++ b/src/addon/mod/wiki/providers/wiki-sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/providers/wiki.ts b/src/addon/mod/wiki/providers/wiki.ts
index f4fa688e2..ee9414c54 100644
--- a/src/addon/mod/wiki/providers/wiki.ts
+++ b/src/addon/mod/wiki/providers/wiki.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/wiki/wiki.module.ts b/src/addon/mod/wiki/wiki.module.ts
index 6396cac74..9d2c85269 100644
--- a/src/addon/mod/wiki/wiki.module.ts
+++ b/src/addon/mod/wiki/wiki.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/assessment/accumulative/accumulative.module.ts b/src/addon/mod/workshop/assessment/accumulative/accumulative.module.ts
index f20ce1fec..79091aeeb 100644
--- a/src/addon/mod/workshop/assessment/accumulative/accumulative.module.ts
+++ b/src/addon/mod/workshop/assessment/accumulative/accumulative.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/assessment/accumulative/component/accumulative.ts b/src/addon/mod/workshop/assessment/accumulative/component/accumulative.ts
index eabb8bf09..0e7aefb26 100644
--- a/src/addon/mod/workshop/assessment/accumulative/component/accumulative.ts
+++ b/src/addon/mod/workshop/assessment/accumulative/component/accumulative.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/assessment/accumulative/providers/handler.ts b/src/addon/mod/workshop/assessment/accumulative/providers/handler.ts
index b5b9e0962..a2fa5142c 100644
--- a/src/addon/mod/workshop/assessment/accumulative/providers/handler.ts
+++ b/src/addon/mod/workshop/assessment/accumulative/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/assessment/assessment.module.ts b/src/addon/mod/workshop/assessment/assessment.module.ts
index 3a77823ad..10855c8fb 100644
--- a/src/addon/mod/workshop/assessment/assessment.module.ts
+++ b/src/addon/mod/workshop/assessment/assessment.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/assessment/comments/comments.module.ts b/src/addon/mod/workshop/assessment/comments/comments.module.ts
index c8f91b558..1feb5958a 100644
--- a/src/addon/mod/workshop/assessment/comments/comments.module.ts
+++ b/src/addon/mod/workshop/assessment/comments/comments.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/assessment/comments/component/comments.ts b/src/addon/mod/workshop/assessment/comments/component/comments.ts
index 61a187536..da83af810 100644
--- a/src/addon/mod/workshop/assessment/comments/component/comments.ts
+++ b/src/addon/mod/workshop/assessment/comments/component/comments.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/assessment/comments/providers/handler.ts b/src/addon/mod/workshop/assessment/comments/providers/handler.ts
index 83922cc0e..592a84480 100644
--- a/src/addon/mod/workshop/assessment/comments/providers/handler.ts
+++ b/src/addon/mod/workshop/assessment/comments/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/assessment/numerrors/component/numerrors.ts b/src/addon/mod/workshop/assessment/numerrors/component/numerrors.ts
index cffa93995..c3fd4ba83 100644
--- a/src/addon/mod/workshop/assessment/numerrors/component/numerrors.ts
+++ b/src/addon/mod/workshop/assessment/numerrors/component/numerrors.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/assessment/numerrors/numerrors.module.ts b/src/addon/mod/workshop/assessment/numerrors/numerrors.module.ts
index d066236cb..fff4115e7 100644
--- a/src/addon/mod/workshop/assessment/numerrors/numerrors.module.ts
+++ b/src/addon/mod/workshop/assessment/numerrors/numerrors.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/assessment/numerrors/providers/handler.ts b/src/addon/mod/workshop/assessment/numerrors/providers/handler.ts
index 94e361d83..11729491d 100644
--- a/src/addon/mod/workshop/assessment/numerrors/providers/handler.ts
+++ b/src/addon/mod/workshop/assessment/numerrors/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/assessment/rubric/component/rubric.ts b/src/addon/mod/workshop/assessment/rubric/component/rubric.ts
index fda33b4d3..a4ee181d5 100644
--- a/src/addon/mod/workshop/assessment/rubric/component/rubric.ts
+++ b/src/addon/mod/workshop/assessment/rubric/component/rubric.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/assessment/rubric/providers/handler.ts b/src/addon/mod/workshop/assessment/rubric/providers/handler.ts
index 41a9eb6b1..ab4fb62c8 100644
--- a/src/addon/mod/workshop/assessment/rubric/providers/handler.ts
+++ b/src/addon/mod/workshop/assessment/rubric/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/assessment/rubric/rubric.module.ts b/src/addon/mod/workshop/assessment/rubric/rubric.module.ts
index 2b5392f31..c8a71406e 100644
--- a/src/addon/mod/workshop/assessment/rubric/rubric.module.ts
+++ b/src/addon/mod/workshop/assessment/rubric/rubric.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/classes/assessment-strategy-component.ts b/src/addon/mod/workshop/classes/assessment-strategy-component.ts
index 6c49dbb99..22a6a1ae7 100644
--- a/src/addon/mod/workshop/classes/assessment-strategy-component.ts
+++ b/src/addon/mod/workshop/classes/assessment-strategy-component.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/components/assessment-strategy/assessment-strategy.ts b/src/addon/mod/workshop/components/assessment-strategy/assessment-strategy.ts
index 6fe11499b..668a7821c 100644
--- a/src/addon/mod/workshop/components/assessment-strategy/assessment-strategy.ts
+++ b/src/addon/mod/workshop/components/assessment-strategy/assessment-strategy.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/components/assessment/assessment.ts b/src/addon/mod/workshop/components/assessment/assessment.ts
index 6df7556f9..a565bf5a6 100644
--- a/src/addon/mod/workshop/components/assessment/assessment.ts
+++ b/src/addon/mod/workshop/components/assessment/assessment.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/components/components.module.ts b/src/addon/mod/workshop/components/components.module.ts
index f8e20d0ad..775490396 100644
--- a/src/addon/mod/workshop/components/components.module.ts
+++ b/src/addon/mod/workshop/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/components/index/index.ts b/src/addon/mod/workshop/components/index/index.ts
index f20824ca7..23d5fc00f 100644
--- a/src/addon/mod/workshop/components/index/index.ts
+++ b/src/addon/mod/workshop/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/components/submission/submission.ts b/src/addon/mod/workshop/components/submission/submission.ts
index 235a8d179..b02bf8813 100644
--- a/src/addon/mod/workshop/components/submission/submission.ts
+++ b/src/addon/mod/workshop/components/submission/submission.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/pages/assessment/assessment.module.ts b/src/addon/mod/workshop/pages/assessment/assessment.module.ts
index 99417f1f6..21415631e 100644
--- a/src/addon/mod/workshop/pages/assessment/assessment.module.ts
+++ b/src/addon/mod/workshop/pages/assessment/assessment.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/pages/assessment/assessment.ts b/src/addon/mod/workshop/pages/assessment/assessment.ts
index e49d720a7..1fe9fe5aa 100644
--- a/src/addon/mod/workshop/pages/assessment/assessment.ts
+++ b/src/addon/mod/workshop/pages/assessment/assessment.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/pages/edit-submission/edit-submission.module.ts b/src/addon/mod/workshop/pages/edit-submission/edit-submission.module.ts
index c49f5e606..25e5e4073 100644
--- a/src/addon/mod/workshop/pages/edit-submission/edit-submission.module.ts
+++ b/src/addon/mod/workshop/pages/edit-submission/edit-submission.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/pages/edit-submission/edit-submission.ts b/src/addon/mod/workshop/pages/edit-submission/edit-submission.ts
index 5e82ed2fa..5c67457c5 100644
--- a/src/addon/mod/workshop/pages/edit-submission/edit-submission.ts
+++ b/src/addon/mod/workshop/pages/edit-submission/edit-submission.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/pages/index/index.module.ts b/src/addon/mod/workshop/pages/index/index.module.ts
index b18d9e2ef..5d9d3651d 100644
--- a/src/addon/mod/workshop/pages/index/index.module.ts
+++ b/src/addon/mod/workshop/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/pages/index/index.ts b/src/addon/mod/workshop/pages/index/index.ts
index 7ad7677da..52bca7912 100644
--- a/src/addon/mod/workshop/pages/index/index.ts
+++ b/src/addon/mod/workshop/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/pages/phase/phase.module.ts b/src/addon/mod/workshop/pages/phase/phase.module.ts
index 7cda380cf..bf971d310 100644
--- a/src/addon/mod/workshop/pages/phase/phase.module.ts
+++ b/src/addon/mod/workshop/pages/phase/phase.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/pages/phase/phase.ts b/src/addon/mod/workshop/pages/phase/phase.ts
index 3773fa727..5ea13890f 100644
--- a/src/addon/mod/workshop/pages/phase/phase.ts
+++ b/src/addon/mod/workshop/pages/phase/phase.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/pages/submission/submission.module.ts b/src/addon/mod/workshop/pages/submission/submission.module.ts
index 0c7c7fe8d..b393b059b 100644
--- a/src/addon/mod/workshop/pages/submission/submission.module.ts
+++ b/src/addon/mod/workshop/pages/submission/submission.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/pages/submission/submission.ts b/src/addon/mod/workshop/pages/submission/submission.ts
index 63580cdc8..db25df347 100644
--- a/src/addon/mod/workshop/pages/submission/submission.ts
+++ b/src/addon/mod/workshop/pages/submission/submission.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/providers/assessment-strategy-delegate.ts b/src/addon/mod/workshop/providers/assessment-strategy-delegate.ts
index d403d3cb6..2d5b7aae5 100644
--- a/src/addon/mod/workshop/providers/assessment-strategy-delegate.ts
+++ b/src/addon/mod/workshop/providers/assessment-strategy-delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/providers/helper.ts b/src/addon/mod/workshop/providers/helper.ts
index 9236845b2..66ae24140 100644
--- a/src/addon/mod/workshop/providers/helper.ts
+++ b/src/addon/mod/workshop/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/providers/link-handler.ts b/src/addon/mod/workshop/providers/link-handler.ts
index 6c06a0ca6..94637f4b2 100644
--- a/src/addon/mod/workshop/providers/link-handler.ts
+++ b/src/addon/mod/workshop/providers/link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/providers/list-link-handler.ts b/src/addon/mod/workshop/providers/list-link-handler.ts
index 3614949ec..d4c04d863 100644
--- a/src/addon/mod/workshop/providers/list-link-handler.ts
+++ b/src/addon/mod/workshop/providers/list-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/providers/module-handler.ts b/src/addon/mod/workshop/providers/module-handler.ts
index 4b25139ec..5764a1d80 100644
--- a/src/addon/mod/workshop/providers/module-handler.ts
+++ b/src/addon/mod/workshop/providers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/providers/offline.ts b/src/addon/mod/workshop/providers/offline.ts
index 734611ae9..b69b8dddc 100644
--- a/src/addon/mod/workshop/providers/offline.ts
+++ b/src/addon/mod/workshop/providers/offline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/providers/prefetch-handler.ts b/src/addon/mod/workshop/providers/prefetch-handler.ts
index 460923c06..940febd72 100644
--- a/src/addon/mod/workshop/providers/prefetch-handler.ts
+++ b/src/addon/mod/workshop/providers/prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/providers/sync-cron-handler.ts b/src/addon/mod/workshop/providers/sync-cron-handler.ts
index 94886e298..c295b8138 100644
--- a/src/addon/mod/workshop/providers/sync-cron-handler.ts
+++ b/src/addon/mod/workshop/providers/sync-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/providers/sync.ts b/src/addon/mod/workshop/providers/sync.ts
index 6e3366205..a7c87e2b4 100644
--- a/src/addon/mod/workshop/providers/sync.ts
+++ b/src/addon/mod/workshop/providers/sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/providers/workshop.ts b/src/addon/mod/workshop/providers/workshop.ts
index b356698ce..866b321a8 100644
--- a/src/addon/mod/workshop/providers/workshop.ts
+++ b/src/addon/mod/workshop/providers/workshop.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/mod/workshop/workshop.module.ts b/src/addon/mod/workshop/workshop.module.ts
index 3e52d8654..4d7d6779a 100644
--- a/src/addon/mod/workshop/workshop.module.ts
+++ b/src/addon/mod/workshop/workshop.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notes/components/components.module.ts b/src/addon/notes/components/components.module.ts
index 53a7a2457..33754fcc6 100644
--- a/src/addon/notes/components/components.module.ts
+++ b/src/addon/notes/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notes/components/list/list.ts b/src/addon/notes/components/list/list.ts
index c05cbbc05..57a9de314 100644
--- a/src/addon/notes/components/list/list.ts
+++ b/src/addon/notes/components/list/list.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notes/notes.module.ts b/src/addon/notes/notes.module.ts
index 002f60177..40b418b7d 100644
--- a/src/addon/notes/notes.module.ts
+++ b/src/addon/notes/notes.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notes/pages/add/add.module.ts b/src/addon/notes/pages/add/add.module.ts
index 404012014..bc4e43e23 100644
--- a/src/addon/notes/pages/add/add.module.ts
+++ b/src/addon/notes/pages/add/add.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notes/pages/add/add.ts b/src/addon/notes/pages/add/add.ts
index aed8e5364..15fd9da0a 100644
--- a/src/addon/notes/pages/add/add.ts
+++ b/src/addon/notes/pages/add/add.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notes/pages/list/list.module.ts b/src/addon/notes/pages/list/list.module.ts
index c983a9395..6178c4838 100644
--- a/src/addon/notes/pages/list/list.module.ts
+++ b/src/addon/notes/pages/list/list.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notes/pages/list/list.ts b/src/addon/notes/pages/list/list.ts
index 499ca2304..db6fb0703 100644
--- a/src/addon/notes/pages/list/list.ts
+++ b/src/addon/notes/pages/list/list.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notes/providers/course-option-handler.ts b/src/addon/notes/providers/course-option-handler.ts
index 9d5672961..4bd746cdc 100644
--- a/src/addon/notes/providers/course-option-handler.ts
+++ b/src/addon/notes/providers/course-option-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notes/providers/notes-offline.ts b/src/addon/notes/providers/notes-offline.ts
index 3b844062c..828ee24aa 100644
--- a/src/addon/notes/providers/notes-offline.ts
+++ b/src/addon/notes/providers/notes-offline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notes/providers/notes-sync.ts b/src/addon/notes/providers/notes-sync.ts
index 2cf8538c8..0ca1ec84a 100644
--- a/src/addon/notes/providers/notes-sync.ts
+++ b/src/addon/notes/providers/notes-sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notes/providers/notes.ts b/src/addon/notes/providers/notes.ts
index 12e476b8c..c0a2a85fb 100644
--- a/src/addon/notes/providers/notes.ts
+++ b/src/addon/notes/providers/notes.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notes/providers/sync-cron-handler.ts b/src/addon/notes/providers/sync-cron-handler.ts
index 97f50167c..25518cda3 100644
--- a/src/addon/notes/providers/sync-cron-handler.ts
+++ b/src/addon/notes/providers/sync-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notes/providers/user-handler.ts b/src/addon/notes/providers/user-handler.ts
index fe713086d..62e2eadb0 100644
--- a/src/addon/notes/providers/user-handler.ts
+++ b/src/addon/notes/providers/user-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notifications/components/actions/actions.ts b/src/addon/notifications/components/actions/actions.ts
index da5eece16..4ff7368f7 100644
--- a/src/addon/notifications/components/actions/actions.ts
+++ b/src/addon/notifications/components/actions/actions.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notifications/components/components.module.ts b/src/addon/notifications/components/components.module.ts
index a1eaa049a..76b933080 100644
--- a/src/addon/notifications/components/components.module.ts
+++ b/src/addon/notifications/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notifications/notifications.module.ts b/src/addon/notifications/notifications.module.ts
index 2a2b94021..863927401 100644
--- a/src/addon/notifications/notifications.module.ts
+++ b/src/addon/notifications/notifications.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notifications/pages/list/list.module.ts b/src/addon/notifications/pages/list/list.module.ts
index 56369935d..4aaf30d11 100644
--- a/src/addon/notifications/pages/list/list.module.ts
+++ b/src/addon/notifications/pages/list/list.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notifications/pages/list/list.ts b/src/addon/notifications/pages/list/list.ts
index 6a38c3a11..2046b00bc 100644
--- a/src/addon/notifications/pages/list/list.ts
+++ b/src/addon/notifications/pages/list/list.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notifications/pages/settings/settings.module.ts b/src/addon/notifications/pages/settings/settings.module.ts
index 2b6e9e500..9a4bbb57e 100644
--- a/src/addon/notifications/pages/settings/settings.module.ts
+++ b/src/addon/notifications/pages/settings/settings.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notifications/pages/settings/settings.ts b/src/addon/notifications/pages/settings/settings.ts
index 254fa8108..0431e91c5 100644
--- a/src/addon/notifications/pages/settings/settings.ts
+++ b/src/addon/notifications/pages/settings/settings.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notifications/providers/cron-handler.ts b/src/addon/notifications/providers/cron-handler.ts
index d191985b0..cd3a5c4a1 100644
--- a/src/addon/notifications/providers/cron-handler.ts
+++ b/src/addon/notifications/providers/cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notifications/providers/helper.ts b/src/addon/notifications/providers/helper.ts
index fce881a1e..13446781b 100644
--- a/src/addon/notifications/providers/helper.ts
+++ b/src/addon/notifications/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notifications/providers/mainmenu-handler.ts b/src/addon/notifications/providers/mainmenu-handler.ts
index 056ce4650..be415fbb2 100644
--- a/src/addon/notifications/providers/mainmenu-handler.ts
+++ b/src/addon/notifications/providers/mainmenu-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notifications/providers/notifications.ts b/src/addon/notifications/providers/notifications.ts
index cd7f37bfc..0b7d04fc7 100644
--- a/src/addon/notifications/providers/notifications.ts
+++ b/src/addon/notifications/providers/notifications.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notifications/providers/push-click-handler.ts b/src/addon/notifications/providers/push-click-handler.ts
index 546d151fb..425437ddb 100644
--- a/src/addon/notifications/providers/push-click-handler.ts
+++ b/src/addon/notifications/providers/push-click-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/notifications/providers/settings-handler.ts b/src/addon/notifications/providers/settings-handler.ts
index dea003ab7..95036ef59 100644
--- a/src/addon/notifications/providers/settings-handler.ts
+++ b/src/addon/notifications/providers/settings-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/adaptive/adaptive.module.ts b/src/addon/qbehaviour/adaptive/adaptive.module.ts
index adbae973f..5779b56e4 100644
--- a/src/addon/qbehaviour/adaptive/adaptive.module.ts
+++ b/src/addon/qbehaviour/adaptive/adaptive.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/adaptive/providers/handler.ts b/src/addon/qbehaviour/adaptive/providers/handler.ts
index 1d40c1c4f..fcb42e26c 100644
--- a/src/addon/qbehaviour/adaptive/providers/handler.ts
+++ b/src/addon/qbehaviour/adaptive/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/adaptivenopenalty/adaptivenopenalty.module.ts b/src/addon/qbehaviour/adaptivenopenalty/adaptivenopenalty.module.ts
index 6fa4c5683..66bd7364b 100644
--- a/src/addon/qbehaviour/adaptivenopenalty/adaptivenopenalty.module.ts
+++ b/src/addon/qbehaviour/adaptivenopenalty/adaptivenopenalty.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/adaptivenopenalty/providers/handler.ts b/src/addon/qbehaviour/adaptivenopenalty/providers/handler.ts
index f8e3ba977..d95f0610f 100644
--- a/src/addon/qbehaviour/adaptivenopenalty/providers/handler.ts
+++ b/src/addon/qbehaviour/adaptivenopenalty/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/deferredcbm/component/deferredcbm.ts b/src/addon/qbehaviour/deferredcbm/component/deferredcbm.ts
index 5aff68539..d85eccf09 100644
--- a/src/addon/qbehaviour/deferredcbm/component/deferredcbm.ts
+++ b/src/addon/qbehaviour/deferredcbm/component/deferredcbm.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/deferredcbm/deferredcbm.module.ts b/src/addon/qbehaviour/deferredcbm/deferredcbm.module.ts
index 3948f8abe..361b138c4 100644
--- a/src/addon/qbehaviour/deferredcbm/deferredcbm.module.ts
+++ b/src/addon/qbehaviour/deferredcbm/deferredcbm.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/deferredcbm/providers/handler.ts b/src/addon/qbehaviour/deferredcbm/providers/handler.ts
index fcb15cf3f..a32634c1f 100644
--- a/src/addon/qbehaviour/deferredcbm/providers/handler.ts
+++ b/src/addon/qbehaviour/deferredcbm/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/deferredfeedback/deferredfeedback.module.ts b/src/addon/qbehaviour/deferredfeedback/deferredfeedback.module.ts
index 99f39f0c5..3611bc8a0 100644
--- a/src/addon/qbehaviour/deferredfeedback/deferredfeedback.module.ts
+++ b/src/addon/qbehaviour/deferredfeedback/deferredfeedback.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/deferredfeedback/providers/handler.ts b/src/addon/qbehaviour/deferredfeedback/providers/handler.ts
index e2d39cb2b..0edf35d41 100644
--- a/src/addon/qbehaviour/deferredfeedback/providers/handler.ts
+++ b/src/addon/qbehaviour/deferredfeedback/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/immediatecbm/immediatecbm.module.ts b/src/addon/qbehaviour/immediatecbm/immediatecbm.module.ts
index a13e3e130..7a1a33cb3 100644
--- a/src/addon/qbehaviour/immediatecbm/immediatecbm.module.ts
+++ b/src/addon/qbehaviour/immediatecbm/immediatecbm.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/immediatecbm/providers/handler.ts b/src/addon/qbehaviour/immediatecbm/providers/handler.ts
index 4d26069ed..f4fe6649b 100644
--- a/src/addon/qbehaviour/immediatecbm/providers/handler.ts
+++ b/src/addon/qbehaviour/immediatecbm/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/immediatefeedback/immediatefeedback.module.ts b/src/addon/qbehaviour/immediatefeedback/immediatefeedback.module.ts
index 3d5e5ed66..781733ffe 100644
--- a/src/addon/qbehaviour/immediatefeedback/immediatefeedback.module.ts
+++ b/src/addon/qbehaviour/immediatefeedback/immediatefeedback.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/immediatefeedback/providers/handler.ts b/src/addon/qbehaviour/immediatefeedback/providers/handler.ts
index 0040878ea..4ec1fe768 100644
--- a/src/addon/qbehaviour/immediatefeedback/providers/handler.ts
+++ b/src/addon/qbehaviour/immediatefeedback/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/informationitem/component/informationitem.ts b/src/addon/qbehaviour/informationitem/component/informationitem.ts
index 057761bdb..3842fca29 100644
--- a/src/addon/qbehaviour/informationitem/component/informationitem.ts
+++ b/src/addon/qbehaviour/informationitem/component/informationitem.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/informationitem/informationitem.module.ts b/src/addon/qbehaviour/informationitem/informationitem.module.ts
index 0f45881a0..8fcb958c2 100644
--- a/src/addon/qbehaviour/informationitem/informationitem.module.ts
+++ b/src/addon/qbehaviour/informationitem/informationitem.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/informationitem/providers/handler.ts b/src/addon/qbehaviour/informationitem/providers/handler.ts
index f8f46f6e6..c30e2c800 100644
--- a/src/addon/qbehaviour/informationitem/providers/handler.ts
+++ b/src/addon/qbehaviour/informationitem/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/interactive/interactive.module.ts b/src/addon/qbehaviour/interactive/interactive.module.ts
index ab30d3e0a..f9bef6f89 100644
--- a/src/addon/qbehaviour/interactive/interactive.module.ts
+++ b/src/addon/qbehaviour/interactive/interactive.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/interactive/providers/handler.ts b/src/addon/qbehaviour/interactive/providers/handler.ts
index 6c25c2923..cf65a2d52 100644
--- a/src/addon/qbehaviour/interactive/providers/handler.ts
+++ b/src/addon/qbehaviour/interactive/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/interactivecountback/interactivecountback.module.ts b/src/addon/qbehaviour/interactivecountback/interactivecountback.module.ts
index bbe2dab24..d32d71246 100644
--- a/src/addon/qbehaviour/interactivecountback/interactivecountback.module.ts
+++ b/src/addon/qbehaviour/interactivecountback/interactivecountback.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/interactivecountback/providers/handler.ts b/src/addon/qbehaviour/interactivecountback/providers/handler.ts
index 0cebc7103..f8fa1d97e 100644
--- a/src/addon/qbehaviour/interactivecountback/providers/handler.ts
+++ b/src/addon/qbehaviour/interactivecountback/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/manualgraded/manualgraded.module.ts b/src/addon/qbehaviour/manualgraded/manualgraded.module.ts
index dbeaf1d34..eac6922b9 100644
--- a/src/addon/qbehaviour/manualgraded/manualgraded.module.ts
+++ b/src/addon/qbehaviour/manualgraded/manualgraded.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/manualgraded/providers/handler.ts b/src/addon/qbehaviour/manualgraded/providers/handler.ts
index 62c08d2b1..98da9c06d 100644
--- a/src/addon/qbehaviour/manualgraded/providers/handler.ts
+++ b/src/addon/qbehaviour/manualgraded/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qbehaviour/qbehaviour.module.ts b/src/addon/qbehaviour/qbehaviour.module.ts
index dbe1bf47c..d2bcdbba8 100644
--- a/src/addon/qbehaviour/qbehaviour.module.ts
+++ b/src/addon/qbehaviour/qbehaviour.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/calculated/calculated.module.ts b/src/addon/qtype/calculated/calculated.module.ts
index a819b755e..08bda73d1 100644
--- a/src/addon/qtype/calculated/calculated.module.ts
+++ b/src/addon/qtype/calculated/calculated.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/calculated/component/calculated.ts b/src/addon/qtype/calculated/component/calculated.ts
index c44cbdd56..946526117 100644
--- a/src/addon/qtype/calculated/component/calculated.ts
+++ b/src/addon/qtype/calculated/component/calculated.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/calculated/providers/handler.ts b/src/addon/qtype/calculated/providers/handler.ts
index 12ab450e8..c7832f91c 100644
--- a/src/addon/qtype/calculated/providers/handler.ts
+++ b/src/addon/qtype/calculated/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/calculatedmulti/calculatedmulti.module.ts b/src/addon/qtype/calculatedmulti/calculatedmulti.module.ts
index a5e7ee3eb..ad1357191 100644
--- a/src/addon/qtype/calculatedmulti/calculatedmulti.module.ts
+++ b/src/addon/qtype/calculatedmulti/calculatedmulti.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/calculatedmulti/providers/handler.ts b/src/addon/qtype/calculatedmulti/providers/handler.ts
index 9baf71fc0..63fcd7a3e 100644
--- a/src/addon/qtype/calculatedmulti/providers/handler.ts
+++ b/src/addon/qtype/calculatedmulti/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/calculatedsimple/calculatedsimple.module.ts b/src/addon/qtype/calculatedsimple/calculatedsimple.module.ts
index f4948e05a..8f7850e1d 100644
--- a/src/addon/qtype/calculatedsimple/calculatedsimple.module.ts
+++ b/src/addon/qtype/calculatedsimple/calculatedsimple.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/calculatedsimple/providers/handler.ts b/src/addon/qtype/calculatedsimple/providers/handler.ts
index 2e9e85062..e5f442b20 100644
--- a/src/addon/qtype/calculatedsimple/providers/handler.ts
+++ b/src/addon/qtype/calculatedsimple/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/ddimageortext/classes/ddimageortext.ts b/src/addon/qtype/ddimageortext/classes/ddimageortext.ts
index df0b3eb89..e3d1533bb 100644
--- a/src/addon/qtype/ddimageortext/classes/ddimageortext.ts
+++ b/src/addon/qtype/ddimageortext/classes/ddimageortext.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/ddimageortext/component/ddimageortext.ts b/src/addon/qtype/ddimageortext/component/ddimageortext.ts
index 38f65085a..9574648dd 100644
--- a/src/addon/qtype/ddimageortext/component/ddimageortext.ts
+++ b/src/addon/qtype/ddimageortext/component/ddimageortext.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/ddimageortext/ddimageortext.module.ts b/src/addon/qtype/ddimageortext/ddimageortext.module.ts
index 82ec397bb..25507b299 100644
--- a/src/addon/qtype/ddimageortext/ddimageortext.module.ts
+++ b/src/addon/qtype/ddimageortext/ddimageortext.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/ddimageortext/providers/handler.ts b/src/addon/qtype/ddimageortext/providers/handler.ts
index 73b571027..1774415fb 100644
--- a/src/addon/qtype/ddimageortext/providers/handler.ts
+++ b/src/addon/qtype/ddimageortext/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/ddmarker/classes/ddmarker.ts b/src/addon/qtype/ddmarker/classes/ddmarker.ts
index 2e279a5fb..d5199c656 100644
--- a/src/addon/qtype/ddmarker/classes/ddmarker.ts
+++ b/src/addon/qtype/ddmarker/classes/ddmarker.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/ddmarker/classes/graphics_api.ts b/src/addon/qtype/ddmarker/classes/graphics_api.ts
index ae75138fc..770031f3b 100644
--- a/src/addon/qtype/ddmarker/classes/graphics_api.ts
+++ b/src/addon/qtype/ddmarker/classes/graphics_api.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/ddmarker/component/ddmarker.ts b/src/addon/qtype/ddmarker/component/ddmarker.ts
index d21555a03..0e778196c 100644
--- a/src/addon/qtype/ddmarker/component/ddmarker.ts
+++ b/src/addon/qtype/ddmarker/component/ddmarker.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/ddmarker/ddmarker.module.ts b/src/addon/qtype/ddmarker/ddmarker.module.ts
index 839fe9350..16ffc5612 100644
--- a/src/addon/qtype/ddmarker/ddmarker.module.ts
+++ b/src/addon/qtype/ddmarker/ddmarker.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/ddmarker/providers/handler.ts b/src/addon/qtype/ddmarker/providers/handler.ts
index c2220a45e..2e8195ff5 100644
--- a/src/addon/qtype/ddmarker/providers/handler.ts
+++ b/src/addon/qtype/ddmarker/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/ddwtos/classes/ddwtos.ts b/src/addon/qtype/ddwtos/classes/ddwtos.ts
index 48f869ec3..0e33cac95 100644
--- a/src/addon/qtype/ddwtos/classes/ddwtos.ts
+++ b/src/addon/qtype/ddwtos/classes/ddwtos.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/ddwtos/component/ddwtos.ts b/src/addon/qtype/ddwtos/component/ddwtos.ts
index 710fbef3c..b144a4013 100644
--- a/src/addon/qtype/ddwtos/component/ddwtos.ts
+++ b/src/addon/qtype/ddwtos/component/ddwtos.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/ddwtos/ddwtos.module.ts b/src/addon/qtype/ddwtos/ddwtos.module.ts
index 0508ddb5a..7f0044937 100644
--- a/src/addon/qtype/ddwtos/ddwtos.module.ts
+++ b/src/addon/qtype/ddwtos/ddwtos.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/ddwtos/providers/handler.ts b/src/addon/qtype/ddwtos/providers/handler.ts
index 2f1a9ded0..d310e27b2 100644
--- a/src/addon/qtype/ddwtos/providers/handler.ts
+++ b/src/addon/qtype/ddwtos/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/description/component/description.ts b/src/addon/qtype/description/component/description.ts
index 55c323b0c..1c9870d0b 100644
--- a/src/addon/qtype/description/component/description.ts
+++ b/src/addon/qtype/description/component/description.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/description/description.module.ts b/src/addon/qtype/description/description.module.ts
index fa64bb94d..c5fcfca79 100644
--- a/src/addon/qtype/description/description.module.ts
+++ b/src/addon/qtype/description/description.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/description/providers/handler.ts b/src/addon/qtype/description/providers/handler.ts
index fbb98071c..9fcb36ebf 100644
--- a/src/addon/qtype/description/providers/handler.ts
+++ b/src/addon/qtype/description/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/essay/component/essay.ts b/src/addon/qtype/essay/component/essay.ts
index 3d68a0915..8cd380933 100644
--- a/src/addon/qtype/essay/component/essay.ts
+++ b/src/addon/qtype/essay/component/essay.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/essay/essay.module.ts b/src/addon/qtype/essay/essay.module.ts
index 9c3d58ba6..da95a1363 100644
--- a/src/addon/qtype/essay/essay.module.ts
+++ b/src/addon/qtype/essay/essay.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/essay/providers/handler.ts b/src/addon/qtype/essay/providers/handler.ts
index 61aa89c44..9206b4e4e 100644
--- a/src/addon/qtype/essay/providers/handler.ts
+++ b/src/addon/qtype/essay/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/gapselect/component/gapselect.ts b/src/addon/qtype/gapselect/component/gapselect.ts
index 0c8287511..34de237db 100644
--- a/src/addon/qtype/gapselect/component/gapselect.ts
+++ b/src/addon/qtype/gapselect/component/gapselect.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/gapselect/gapselect.module.ts b/src/addon/qtype/gapselect/gapselect.module.ts
index f95b7b790..25e2a3293 100644
--- a/src/addon/qtype/gapselect/gapselect.module.ts
+++ b/src/addon/qtype/gapselect/gapselect.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/gapselect/providers/handler.ts b/src/addon/qtype/gapselect/providers/handler.ts
index c0afd80b1..50b83068e 100644
--- a/src/addon/qtype/gapselect/providers/handler.ts
+++ b/src/addon/qtype/gapselect/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/match/component/match.ts b/src/addon/qtype/match/component/match.ts
index 936bc8a32..b986ac00c 100644
--- a/src/addon/qtype/match/component/match.ts
+++ b/src/addon/qtype/match/component/match.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/match/match.module.ts b/src/addon/qtype/match/match.module.ts
index f140418a4..8d032e71e 100644
--- a/src/addon/qtype/match/match.module.ts
+++ b/src/addon/qtype/match/match.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/match/providers/handler.ts b/src/addon/qtype/match/providers/handler.ts
index 9b52e4979..90d87d1d1 100644
--- a/src/addon/qtype/match/providers/handler.ts
+++ b/src/addon/qtype/match/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/multianswer/component/multianswer.ts b/src/addon/qtype/multianswer/component/multianswer.ts
index 77ebea6f0..5fa7ce6ca 100644
--- a/src/addon/qtype/multianswer/component/multianswer.ts
+++ b/src/addon/qtype/multianswer/component/multianswer.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/multianswer/multianswer.module.ts b/src/addon/qtype/multianswer/multianswer.module.ts
index b1c37c051..87458fd45 100644
--- a/src/addon/qtype/multianswer/multianswer.module.ts
+++ b/src/addon/qtype/multianswer/multianswer.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/multianswer/providers/handler.ts b/src/addon/qtype/multianswer/providers/handler.ts
index a05fdbc59..798dcf572 100644
--- a/src/addon/qtype/multianswer/providers/handler.ts
+++ b/src/addon/qtype/multianswer/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/multichoice/component/multichoice.ts b/src/addon/qtype/multichoice/component/multichoice.ts
index e481c0f2f..ca2e46caa 100644
--- a/src/addon/qtype/multichoice/component/multichoice.ts
+++ b/src/addon/qtype/multichoice/component/multichoice.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/multichoice/multichoice.module.ts b/src/addon/qtype/multichoice/multichoice.module.ts
index a0e36e755..5aea5339d 100644
--- a/src/addon/qtype/multichoice/multichoice.module.ts
+++ b/src/addon/qtype/multichoice/multichoice.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/multichoice/providers/handler.ts b/src/addon/qtype/multichoice/providers/handler.ts
index ca4d0f413..92424fbd2 100644
--- a/src/addon/qtype/multichoice/providers/handler.ts
+++ b/src/addon/qtype/multichoice/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/numerical/numerical.module.ts b/src/addon/qtype/numerical/numerical.module.ts
index b3ed56bbf..ed4ce256e 100644
--- a/src/addon/qtype/numerical/numerical.module.ts
+++ b/src/addon/qtype/numerical/numerical.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/numerical/providers/handler.ts b/src/addon/qtype/numerical/providers/handler.ts
index 5ecf9a947..b68cc15ac 100644
--- a/src/addon/qtype/numerical/providers/handler.ts
+++ b/src/addon/qtype/numerical/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/qtype.module.ts b/src/addon/qtype/qtype.module.ts
index 9959ae0ed..2b2c3bbd5 100644
--- a/src/addon/qtype/qtype.module.ts
+++ b/src/addon/qtype/qtype.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/randomsamatch/providers/handler.ts b/src/addon/qtype/randomsamatch/providers/handler.ts
index 67d8d23ae..a0eede940 100644
--- a/src/addon/qtype/randomsamatch/providers/handler.ts
+++ b/src/addon/qtype/randomsamatch/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/randomsamatch/randomsamatch.module.ts b/src/addon/qtype/randomsamatch/randomsamatch.module.ts
index 4920b0506..53e72cf1e 100644
--- a/src/addon/qtype/randomsamatch/randomsamatch.module.ts
+++ b/src/addon/qtype/randomsamatch/randomsamatch.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/shortanswer/component/shortanswer.ts b/src/addon/qtype/shortanswer/component/shortanswer.ts
index b737b280a..0cc904986 100644
--- a/src/addon/qtype/shortanswer/component/shortanswer.ts
+++ b/src/addon/qtype/shortanswer/component/shortanswer.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/shortanswer/providers/handler.ts b/src/addon/qtype/shortanswer/providers/handler.ts
index a4daa2823..f9629fa75 100644
--- a/src/addon/qtype/shortanswer/providers/handler.ts
+++ b/src/addon/qtype/shortanswer/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/shortanswer/shortanswer.module.ts b/src/addon/qtype/shortanswer/shortanswer.module.ts
index 313a23b75..bb16c81dc 100644
--- a/src/addon/qtype/shortanswer/shortanswer.module.ts
+++ b/src/addon/qtype/shortanswer/shortanswer.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/truefalse/providers/handler.ts b/src/addon/qtype/truefalse/providers/handler.ts
index 24f2efdfe..f811dfa65 100644
--- a/src/addon/qtype/truefalse/providers/handler.ts
+++ b/src/addon/qtype/truefalse/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/qtype/truefalse/truefalse.module.ts b/src/addon/qtype/truefalse/truefalse.module.ts
index 641a26d15..f6e6eae68 100644
--- a/src/addon/qtype/truefalse/truefalse.module.ts
+++ b/src/addon/qtype/truefalse/truefalse.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/remotethemes/providers/remotethemes.ts b/src/addon/remotethemes/providers/remotethemes.ts
index f4d863740..cba1cafe3 100644
--- a/src/addon/remotethemes/providers/remotethemes.ts
+++ b/src/addon/remotethemes/providers/remotethemes.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/remotethemes/remotethemes.module.ts b/src/addon/remotethemes/remotethemes.module.ts
index 4330cc9a8..b5ded1e3e 100644
--- a/src/addon/remotethemes/remotethemes.module.ts
+++ b/src/addon/remotethemes/remotethemes.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/storagemanager/pages/course-storage/course-storage.module.ts b/src/addon/storagemanager/pages/course-storage/course-storage.module.ts
index 19db12630..ae12c685a 100644
--- a/src/addon/storagemanager/pages/course-storage/course-storage.module.ts
+++ b/src/addon/storagemanager/pages/course-storage/course-storage.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/storagemanager/pages/course-storage/course-storage.ts b/src/addon/storagemanager/pages/course-storage/course-storage.ts
index 800ac1edf..eb605fc57 100644
--- a/src/addon/storagemanager/pages/course-storage/course-storage.ts
+++ b/src/addon/storagemanager/pages/course-storage/course-storage.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/storagemanager/providers/coursemenu-handler.ts b/src/addon/storagemanager/providers/coursemenu-handler.ts
index b3e0f6b57..e03d02eed 100644
--- a/src/addon/storagemanager/providers/coursemenu-handler.ts
+++ b/src/addon/storagemanager/providers/coursemenu-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/storagemanager/storagemanager.module.ts b/src/addon/storagemanager/storagemanager.module.ts
index 9590abb60..c4b10a802 100644
--- a/src/addon/storagemanager/storagemanager.module.ts
+++ b/src/addon/storagemanager/storagemanager.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/userprofilefield/checkbox/checkbox.module.ts b/src/addon/userprofilefield/checkbox/checkbox.module.ts
index ac828e8d4..8c7b92724 100644
--- a/src/addon/userprofilefield/checkbox/checkbox.module.ts
+++ b/src/addon/userprofilefield/checkbox/checkbox.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/userprofilefield/checkbox/component/checkbox.ts b/src/addon/userprofilefield/checkbox/component/checkbox.ts
index 328153ff1..0212563d4 100644
--- a/src/addon/userprofilefield/checkbox/component/checkbox.ts
+++ b/src/addon/userprofilefield/checkbox/component/checkbox.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/userprofilefield/checkbox/providers/handler.ts b/src/addon/userprofilefield/checkbox/providers/handler.ts
index 5981f6f95..0c63b417b 100644
--- a/src/addon/userprofilefield/checkbox/providers/handler.ts
+++ b/src/addon/userprofilefield/checkbox/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/userprofilefield/datetime/component/datetime.ts b/src/addon/userprofilefield/datetime/component/datetime.ts
index 8da732a64..e1b287627 100644
--- a/src/addon/userprofilefield/datetime/component/datetime.ts
+++ b/src/addon/userprofilefield/datetime/component/datetime.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/userprofilefield/datetime/datetime.module.ts b/src/addon/userprofilefield/datetime/datetime.module.ts
index dd2b3f85d..05054e3c8 100644
--- a/src/addon/userprofilefield/datetime/datetime.module.ts
+++ b/src/addon/userprofilefield/datetime/datetime.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/userprofilefield/datetime/providers/handler.ts b/src/addon/userprofilefield/datetime/providers/handler.ts
index 6076dd63c..875ca740c 100644
--- a/src/addon/userprofilefield/datetime/providers/handler.ts
+++ b/src/addon/userprofilefield/datetime/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/userprofilefield/menu/component/menu.ts b/src/addon/userprofilefield/menu/component/menu.ts
index 6e7ab22b9..59642861a 100644
--- a/src/addon/userprofilefield/menu/component/menu.ts
+++ b/src/addon/userprofilefield/menu/component/menu.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/userprofilefield/menu/menu.module.ts b/src/addon/userprofilefield/menu/menu.module.ts
index df81f32b5..138c65ad4 100644
--- a/src/addon/userprofilefield/menu/menu.module.ts
+++ b/src/addon/userprofilefield/menu/menu.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/userprofilefield/menu/providers/handler.ts b/src/addon/userprofilefield/menu/providers/handler.ts
index 928d84db7..0be1f3dfc 100644
--- a/src/addon/userprofilefield/menu/providers/handler.ts
+++ b/src/addon/userprofilefield/menu/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/userprofilefield/text/component/text.ts b/src/addon/userprofilefield/text/component/text.ts
index e07e7f732..089a58bb0 100644
--- a/src/addon/userprofilefield/text/component/text.ts
+++ b/src/addon/userprofilefield/text/component/text.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/userprofilefield/text/providers/handler.ts b/src/addon/userprofilefield/text/providers/handler.ts
index 644faf0df..a177b4fdd 100644
--- a/src/addon/userprofilefield/text/providers/handler.ts
+++ b/src/addon/userprofilefield/text/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/userprofilefield/text/text.module.ts b/src/addon/userprofilefield/text/text.module.ts
index 8bc58388f..f4c8f894f 100644
--- a/src/addon/userprofilefield/text/text.module.ts
+++ b/src/addon/userprofilefield/text/text.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/userprofilefield/textarea/component/textarea.ts b/src/addon/userprofilefield/textarea/component/textarea.ts
index 1728d56c0..79919bd35 100644
--- a/src/addon/userprofilefield/textarea/component/textarea.ts
+++ b/src/addon/userprofilefield/textarea/component/textarea.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/userprofilefield/textarea/providers/handler.ts b/src/addon/userprofilefield/textarea/providers/handler.ts
index a3ae461ce..740e1fd87 100644
--- a/src/addon/userprofilefield/textarea/providers/handler.ts
+++ b/src/addon/userprofilefield/textarea/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/userprofilefield/textarea/textarea.module.ts b/src/addon/userprofilefield/textarea/textarea.module.ts
index 1a307b685..f64fc285d 100644
--- a/src/addon/userprofilefield/textarea/textarea.module.ts
+++ b/src/addon/userprofilefield/textarea/textarea.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/userprofilefield/userprofilefield.module.ts b/src/addon/userprofilefield/userprofilefield.module.ts
index b99616335..e9e5f4d04 100644
--- a/src/addon/userprofilefield/userprofilefield.module.ts
+++ b/src/addon/userprofilefield/userprofilefield.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 0462ec1cc..be27768aa 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index c843dce54..4d55ba341 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/app/main.ts b/src/app/main.ts
index 69be48980..23d30e15b 100644
--- a/src/app/main.ts
+++ b/src/app/main.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/classes/animations.ts b/src/classes/animations.ts
index cb28a609b..361335b33 100644
--- a/src/classes/animations.ts
+++ b/src/classes/animations.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/classes/base-sync.ts b/src/classes/base-sync.ts
index dbf8358bf..14bea2fd7 100644
--- a/src/classes/base-sync.ts
+++ b/src/classes/base-sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/classes/cache.ts b/src/classes/cache.ts
index f4989b2d6..bc1f905ce 100644
--- a/src/classes/cache.ts
+++ b/src/classes/cache.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/classes/delegate.ts b/src/classes/delegate.ts
index 560e81645..ca6cea0e5 100644
--- a/src/classes/delegate.ts
+++ b/src/classes/delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/classes/interceptor.ts b/src/classes/interceptor.ts
index 9399c0a76..81a1f45c9 100644
--- a/src/classes/interceptor.ts
+++ b/src/classes/interceptor.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/classes/modal-lateral-transition.ts b/src/classes/modal-lateral-transition.ts
index 69d4db3c0..33856a157 100644
--- a/src/classes/modal-lateral-transition.ts
+++ b/src/classes/modal-lateral-transition.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/classes/page-transition.ts b/src/classes/page-transition.ts
index 575e08c1e..50c2329ff 100644
--- a/src/classes/page-transition.ts
+++ b/src/classes/page-transition.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/classes/site.ts b/src/classes/site.ts
index f3c2ff9b8..84e7bdaaf 100644
--- a/src/classes/site.ts
+++ b/src/classes/site.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/classes/sqlitedb.ts b/src/classes/sqlitedb.ts
index 011690982..239a5edcf 100644
--- a/src/classes/sqlitedb.ts
+++ b/src/classes/sqlitedb.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/attachments/attachments.ts b/src/components/attachments/attachments.ts
index 6f5f2ea16..efb6bd21e 100644
--- a/src/components/attachments/attachments.ts
+++ b/src/components/attachments/attachments.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/bs-tooltip/bs-tooltip.ts b/src/components/bs-tooltip/bs-tooltip.ts
index 8248fa9f1..55d413731 100644
--- a/src/components/bs-tooltip/bs-tooltip.ts
+++ b/src/components/bs-tooltip/bs-tooltip.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/chart/chart.ts b/src/components/chart/chart.ts
index f34d43242..8d67b8853 100644
--- a/src/components/chart/chart.ts
+++ b/src/components/chart/chart.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/chrono/chrono.ts b/src/components/chrono/chrono.ts
index 8783416af..6dd993060 100644
--- a/src/components/chrono/chrono.ts
+++ b/src/components/chrono/chrono.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/components.module.ts b/src/components/components.module.ts
index c47653a06..2a57451cf 100644
--- a/src/components/components.module.ts
+++ b/src/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/context-menu/context-menu-item.ts b/src/components/context-menu/context-menu-item.ts
index 9c9b6c182..9df9e728e 100644
--- a/src/components/context-menu/context-menu-item.ts
+++ b/src/components/context-menu/context-menu-item.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/context-menu/context-menu-popover.ts b/src/components/context-menu/context-menu-popover.ts
index 070e4362d..d96804d6d 100644
--- a/src/components/context-menu/context-menu-popover.ts
+++ b/src/components/context-menu/context-menu-popover.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/context-menu/context-menu.ts b/src/components/context-menu/context-menu.ts
index 3a8daf25c..ba7fc8a5a 100644
--- a/src/components/context-menu/context-menu.ts
+++ b/src/components/context-menu/context-menu.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/course-picker-menu/course-picker-menu-popover.ts b/src/components/course-picker-menu/course-picker-menu-popover.ts
index 8a6fd955a..01e553660 100644
--- a/src/components/course-picker-menu/course-picker-menu-popover.ts
+++ b/src/components/course-picker-menu/course-picker-menu-popover.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/download-refresh/download-refresh.ts b/src/components/download-refresh/download-refresh.ts
index b231514ca..67f855e29 100644
--- a/src/components/download-refresh/download-refresh.ts
+++ b/src/components/download-refresh/download-refresh.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/dynamic-component/dynamic-component.ts b/src/components/dynamic-component/dynamic-component.ts
index 58bb372ac..c2ed305b7 100644
--- a/src/components/dynamic-component/dynamic-component.ts
+++ b/src/components/dynamic-component/dynamic-component.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/empty-box/empty-box.ts b/src/components/empty-box/empty-box.ts
index 827cde39a..5c693c84c 100644
--- a/src/components/empty-box/empty-box.ts
+++ b/src/components/empty-box/empty-box.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/file/file.ts b/src/components/file/file.ts
index 30aa5b588..a1c97cf3e 100644
--- a/src/components/file/file.ts
+++ b/src/components/file/file.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/icon/icon.ts b/src/components/icon/icon.ts
index 38c96f1fb..ffe497983 100644
--- a/src/components/icon/icon.ts
+++ b/src/components/icon/icon.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/iframe/iframe.ts b/src/components/iframe/iframe.ts
index aa7584337..1f544a633 100644
--- a/src/components/iframe/iframe.ts
+++ b/src/components/iframe/iframe.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/infinite-loading/infinite-loading.ts b/src/components/infinite-loading/infinite-loading.ts
index 5d19ac215..1e636fcd2 100644
--- a/src/components/infinite-loading/infinite-loading.ts
+++ b/src/components/infinite-loading/infinite-loading.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/input-errors/input-errors.ts b/src/components/input-errors/input-errors.ts
index 2c4b5361d..cf12d126d 100644
--- a/src/components/input-errors/input-errors.ts
+++ b/src/components/input-errors/input-errors.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/ion-tabs/ion-tab.ts b/src/components/ion-tabs/ion-tab.ts
index a8c409f33..0d656594f 100644
--- a/src/components/ion-tabs/ion-tab.ts
+++ b/src/components/ion-tabs/ion-tab.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/ion-tabs/ion-tabs.ts b/src/components/ion-tabs/ion-tabs.ts
index f410ad3fe..da3c1e4f2 100644
--- a/src/components/ion-tabs/ion-tabs.ts
+++ b/src/components/ion-tabs/ion-tabs.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/loading/loading.ts b/src/components/loading/loading.ts
index ad4c61032..4d658fbd6 100644
--- a/src/components/loading/loading.ts
+++ b/src/components/loading/loading.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/local-file/local-file.ts b/src/components/local-file/local-file.ts
index 025ffe751..f6ee67eaa 100644
--- a/src/components/local-file/local-file.ts
+++ b/src/components/local-file/local-file.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/mark-required/mark-required.ts b/src/components/mark-required/mark-required.ts
index 28df17ed9..5a8da5d1a 100644
--- a/src/components/mark-required/mark-required.ts
+++ b/src/components/mark-required/mark-required.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/navbar-buttons/navbar-buttons.ts b/src/components/navbar-buttons/navbar-buttons.ts
index c3332006e..8c45b8c14 100644
--- a/src/components/navbar-buttons/navbar-buttons.ts
+++ b/src/components/navbar-buttons/navbar-buttons.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/navigation-bar/navigation-bar.ts b/src/components/navigation-bar/navigation-bar.ts
index 0a0db162d..b5c2b0b42 100644
--- a/src/components/navigation-bar/navigation-bar.ts
+++ b/src/components/navigation-bar/navigation-bar.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/progress-bar/progress-bar.ts b/src/components/progress-bar/progress-bar.ts
index 1a417af91..5fae25e17 100644
--- a/src/components/progress-bar/progress-bar.ts
+++ b/src/components/progress-bar/progress-bar.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/recaptcha/recaptcha.ts b/src/components/recaptcha/recaptcha.ts
index f04f99ef3..8710c761a 100644
--- a/src/components/recaptcha/recaptcha.ts
+++ b/src/components/recaptcha/recaptcha.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/recaptcha/recaptchamodal.ts b/src/components/recaptcha/recaptchamodal.ts
index b84e98f70..1280e569f 100644
--- a/src/components/recaptcha/recaptchamodal.ts
+++ b/src/components/recaptcha/recaptchamodal.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/rich-text-editor/rich-text-editor.ts b/src/components/rich-text-editor/rich-text-editor.ts
index 68c4651e0..83d4baaef 100644
--- a/src/components/rich-text-editor/rich-text-editor.ts
+++ b/src/components/rich-text-editor/rich-text-editor.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/search-box/search-box.ts b/src/components/search-box/search-box.ts
index 36a42cb0d..3846e2f77 100644
--- a/src/components/search-box/search-box.ts
+++ b/src/components/search-box/search-box.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/send-message-form/send-message-form.ts b/src/components/send-message-form/send-message-form.ts
index 7076f0d4f..7b5761e39 100644
--- a/src/components/send-message-form/send-message-form.ts
+++ b/src/components/send-message-form/send-message-form.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/show-password/show-password.ts b/src/components/show-password/show-password.ts
index 61dea32ef..6ccf84a05 100644
--- a/src/components/show-password/show-password.ts
+++ b/src/components/show-password/show-password.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/site-picker/site-picker.ts b/src/components/site-picker/site-picker.ts
index 51538eec7..e58dfda86 100644
--- a/src/components/site-picker/site-picker.ts
+++ b/src/components/site-picker/site-picker.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/split-view/placeholder/placeholder.module.ts b/src/components/split-view/placeholder/placeholder.module.ts
index d17ef7a88..cb6b7f0c9 100644
--- a/src/components/split-view/placeholder/placeholder.module.ts
+++ b/src/components/split-view/placeholder/placeholder.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/split-view/placeholder/placeholder.ts b/src/components/split-view/placeholder/placeholder.ts
index 1afaeda4b..3152506d4 100644
--- a/src/components/split-view/placeholder/placeholder.ts
+++ b/src/components/split-view/placeholder/placeholder.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/split-view/split-view.ts b/src/components/split-view/split-view.ts
index 4a63bfe72..11f6e4dbd 100644
--- a/src/components/split-view/split-view.ts
+++ b/src/components/split-view/split-view.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/style/style.ts b/src/components/style/style.ts
index 344327cd0..a554bceca 100644
--- a/src/components/style/style.ts
+++ b/src/components/style/style.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/tabs/tab.ts b/src/components/tabs/tab.ts
index 763376374..e8866d8ca 100644
--- a/src/components/tabs/tab.ts
+++ b/src/components/tabs/tab.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/tabs/tabs.ts b/src/components/tabs/tabs.ts
index e60ea9b10..f01de69d2 100644
--- a/src/components/tabs/tabs.ts
+++ b/src/components/tabs/tabs.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/timer/timer.ts b/src/components/timer/timer.ts
index 52bf54e02..f8d70cdfb 100644
--- a/src/components/timer/timer.ts
+++ b/src/components/timer/timer.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/components/user-avatar/user-avatar.ts b/src/components/user-avatar/user-avatar.ts
index 22c6fe5a2..d537765df 100644
--- a/src/components/user-avatar/user-avatar.ts
+++ b/src/components/user-avatar/user-avatar.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/block/block.module.ts b/src/core/block/block.module.ts
index 6361d2c2d..d39945ab2 100644
--- a/src/core/block/block.module.ts
+++ b/src/core/block/block.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/block/classes/base-block-component.ts b/src/core/block/classes/base-block-component.ts
index e3c7e75f6..bd2a39ff4 100644
--- a/src/core/block/classes/base-block-component.ts
+++ b/src/core/block/classes/base-block-component.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/block/classes/base-block-handler.ts b/src/core/block/classes/base-block-handler.ts
index 8e5447d79..acc6e3448 100644
--- a/src/core/block/classes/base-block-handler.ts
+++ b/src/core/block/classes/base-block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/block/components/block/block.ts b/src/core/block/components/block/block.ts
index 5a7546e52..17134ed69 100644
--- a/src/core/block/components/block/block.ts
+++ b/src/core/block/components/block/block.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/block/components/components.module.ts b/src/core/block/components/components.module.ts
index 70627f6bf..be1e427b5 100644
--- a/src/core/block/components/components.module.ts
+++ b/src/core/block/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/block/components/course-blocks/course-blocks.ts b/src/core/block/components/course-blocks/course-blocks.ts
index e973eac72..a95a77178 100644
--- a/src/core/block/components/course-blocks/course-blocks.ts
+++ b/src/core/block/components/course-blocks/course-blocks.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/block/components/only-title-block/only-title-block.ts b/src/core/block/components/only-title-block/only-title-block.ts
index 2c1145003..cb5fde462 100644
--- a/src/core/block/components/only-title-block/only-title-block.ts
+++ b/src/core/block/components/only-title-block/only-title-block.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/block/components/pre-rendered-block/pre-rendered-block.ts b/src/core/block/components/pre-rendered-block/pre-rendered-block.ts
index 0acd1712f..a88659e36 100644
--- a/src/core/block/components/pre-rendered-block/pre-rendered-block.ts
+++ b/src/core/block/components/pre-rendered-block/pre-rendered-block.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/block/providers/default-block-handler.ts b/src/core/block/providers/default-block-handler.ts
index 23257b2c5..a5c6415b4 100644
--- a/src/core/block/providers/default-block-handler.ts
+++ b/src/core/block/providers/default-block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/block/providers/delegate.ts b/src/core/block/providers/delegate.ts
index 2f9d96fdc..3fcf573ca 100644
--- a/src/core/block/providers/delegate.ts
+++ b/src/core/block/providers/delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/block/providers/helper.ts b/src/core/block/providers/helper.ts
index 9272bca16..a29fa37d2 100644
--- a/src/core/block/providers/helper.ts
+++ b/src/core/block/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/comments/comments.module.ts b/src/core/comments/comments.module.ts
index a216cde81..cb9f8cf55 100644
--- a/src/core/comments/comments.module.ts
+++ b/src/core/comments/comments.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/comments/components/comments/comments.ts b/src/core/comments/components/comments/comments.ts
index d37e325c8..ae310eae8 100644
--- a/src/core/comments/components/comments/comments.ts
+++ b/src/core/comments/components/comments/comments.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/comments/components/components.module.ts b/src/core/comments/components/components.module.ts
index 32d57b82e..f8d2dbf9b 100644
--- a/src/core/comments/components/components.module.ts
+++ b/src/core/comments/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/comments/pages/add/add.module.ts b/src/core/comments/pages/add/add.module.ts
index a6b6661a0..669e9fd35 100644
--- a/src/core/comments/pages/add/add.module.ts
+++ b/src/core/comments/pages/add/add.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/comments/pages/add/add.ts b/src/core/comments/pages/add/add.ts
index bfabd4535..414109138 100644
--- a/src/core/comments/pages/add/add.ts
+++ b/src/core/comments/pages/add/add.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/comments/pages/viewer/viewer.module.ts b/src/core/comments/pages/viewer/viewer.module.ts
index 3326cfe19..bc1350258 100644
--- a/src/core/comments/pages/viewer/viewer.module.ts
+++ b/src/core/comments/pages/viewer/viewer.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/comments/pages/viewer/viewer.ts b/src/core/comments/pages/viewer/viewer.ts
index db0973235..63f88471b 100644
--- a/src/core/comments/pages/viewer/viewer.ts
+++ b/src/core/comments/pages/viewer/viewer.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/comments/providers/comments.ts b/src/core/comments/providers/comments.ts
index 04438b4fe..faff7a892 100644
--- a/src/core/comments/providers/comments.ts
+++ b/src/core/comments/providers/comments.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/comments/providers/offline.ts b/src/core/comments/providers/offline.ts
index 3979c9cb7..dd24113da 100644
--- a/src/core/comments/providers/offline.ts
+++ b/src/core/comments/providers/offline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/comments/providers/sync-cron-handler.ts b/src/core/comments/providers/sync-cron-handler.ts
index 76d9e1529..6ee3701d6 100644
--- a/src/core/comments/providers/sync-cron-handler.ts
+++ b/src/core/comments/providers/sync-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/comments/providers/sync.ts b/src/core/comments/providers/sync.ts
index 6e1003e98..651cb12fa 100644
--- a/src/core/comments/providers/sync.ts
+++ b/src/core/comments/providers/sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/compile/compile.module.ts b/src/core/compile/compile.module.ts
index 610277494..38cb113b9 100644
--- a/src/core/compile/compile.module.ts
+++ b/src/core/compile/compile.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/compile/components/compile-html/compile-html.module.ts b/src/core/compile/components/compile-html/compile-html.module.ts
index 72d030a00..2dc6560ac 100644
--- a/src/core/compile/components/compile-html/compile-html.module.ts
+++ b/src/core/compile/components/compile-html/compile-html.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/compile/components/compile-html/compile-html.ts b/src/core/compile/components/compile-html/compile-html.ts
index cf0bb0863..e72143d5a 100644
--- a/src/core/compile/components/compile-html/compile-html.ts
+++ b/src/core/compile/components/compile-html/compile-html.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/compile/providers/compile.ts b/src/core/compile/providers/compile.ts
index 1cb152a84..b394538b4 100644
--- a/src/core/compile/providers/compile.ts
+++ b/src/core/compile/providers/compile.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/constants.ts b/src/core/constants.ts
index ccd5f9c71..de6898658 100644
--- a/src/core/constants.ts
+++ b/src/core/constants.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/contentlinks/classes/base-handler.ts b/src/core/contentlinks/classes/base-handler.ts
index ca23fd706..3d74b8f38 100644
--- a/src/core/contentlinks/classes/base-handler.ts
+++ b/src/core/contentlinks/classes/base-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/contentlinks/classes/module-grade-handler.ts b/src/core/contentlinks/classes/module-grade-handler.ts
index 865a32d9e..67fc2bdf9 100644
--- a/src/core/contentlinks/classes/module-grade-handler.ts
+++ b/src/core/contentlinks/classes/module-grade-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/contentlinks/classes/module-index-handler.ts b/src/core/contentlinks/classes/module-index-handler.ts
index 2ada678f5..859d72c1d 100644
--- a/src/core/contentlinks/classes/module-index-handler.ts
+++ b/src/core/contentlinks/classes/module-index-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/contentlinks/classes/module-list-handler.ts b/src/core/contentlinks/classes/module-list-handler.ts
index 6365a1ad9..36a3f6381 100644
--- a/src/core/contentlinks/classes/module-list-handler.ts
+++ b/src/core/contentlinks/classes/module-list-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/contentlinks/contentlinks.module.ts b/src/core/contentlinks/contentlinks.module.ts
index 0abe605db..ce70cc762 100644
--- a/src/core/contentlinks/contentlinks.module.ts
+++ b/src/core/contentlinks/contentlinks.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/contentlinks/pages/choose-site/choose-site.module.ts b/src/core/contentlinks/pages/choose-site/choose-site.module.ts
index 881bde925..ec52dfed5 100644
--- a/src/core/contentlinks/pages/choose-site/choose-site.module.ts
+++ b/src/core/contentlinks/pages/choose-site/choose-site.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/contentlinks/pages/choose-site/choose-site.ts b/src/core/contentlinks/pages/choose-site/choose-site.ts
index 0808e130d..2506a4551 100644
--- a/src/core/contentlinks/pages/choose-site/choose-site.ts
+++ b/src/core/contentlinks/pages/choose-site/choose-site.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/contentlinks/providers/delegate.ts b/src/core/contentlinks/providers/delegate.ts
index 340f1eb17..b323f60be 100644
--- a/src/core/contentlinks/providers/delegate.ts
+++ b/src/core/contentlinks/providers/delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/contentlinks/providers/helper.ts b/src/core/contentlinks/providers/helper.ts
index dd2f6e35b..54bb261c1 100644
--- a/src/core/contentlinks/providers/helper.ts
+++ b/src/core/contentlinks/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/classes/activity-prefetch-handler.ts b/src/core/course/classes/activity-prefetch-handler.ts
index 54f19c06b..c98a702fc 100644
--- a/src/core/course/classes/activity-prefetch-handler.ts
+++ b/src/core/course/classes/activity-prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/classes/activity-sync.ts b/src/core/course/classes/activity-sync.ts
index ae076f069..9a6f0595b 100644
--- a/src/core/course/classes/activity-sync.ts
+++ b/src/core/course/classes/activity-sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/classes/main-activity-component.ts b/src/core/course/classes/main-activity-component.ts
index 6e1f0b23c..5b2d7f830 100644
--- a/src/core/course/classes/main-activity-component.ts
+++ b/src/core/course/classes/main-activity-component.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/classes/main-resource-component.ts b/src/core/course/classes/main-resource-component.ts
index 854d194f6..3ffae46fe 100644
--- a/src/core/course/classes/main-resource-component.ts
+++ b/src/core/course/classes/main-resource-component.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/classes/module-prefetch-handler.ts b/src/core/course/classes/module-prefetch-handler.ts
index 0bae87e2b..8173f615b 100644
--- a/src/core/course/classes/module-prefetch-handler.ts
+++ b/src/core/course/classes/module-prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/classes/resource-prefetch-handler.ts b/src/core/course/classes/resource-prefetch-handler.ts
index f3ce201e1..2847d3e69 100644
--- a/src/core/course/classes/resource-prefetch-handler.ts
+++ b/src/core/course/classes/resource-prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/components/components.module.ts b/src/core/course/components/components.module.ts
index 1f09dcd6f..07af875ec 100644
--- a/src/core/course/components/components.module.ts
+++ b/src/core/course/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/components/format/format.ts b/src/core/course/components/format/format.ts
index f15589083..a439bc728 100644
--- a/src/core/course/components/format/format.ts
+++ b/src/core/course/components/format/format.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/components/module-completion/module-completion.ts b/src/core/course/components/module-completion/module-completion.ts
index 7d4141d43..df4f4ceb2 100644
--- a/src/core/course/components/module-completion/module-completion.ts
+++ b/src/core/course/components/module-completion/module-completion.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/components/module-description/module-description.ts b/src/core/course/components/module-description/module-description.ts
index 5e650c389..0e19d86b1 100644
--- a/src/core/course/components/module-description/module-description.ts
+++ b/src/core/course/components/module-description/module-description.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/components/module/module.ts b/src/core/course/components/module/module.ts
index 8acfd8dc2..3ae0be2bc 100644
--- a/src/core/course/components/module/module.ts
+++ b/src/core/course/components/module/module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/components/tag-area/tag-area.ts b/src/core/course/components/tag-area/tag-area.ts
index fa37a678e..e60925d3a 100644
--- a/src/core/course/components/tag-area/tag-area.ts
+++ b/src/core/course/components/tag-area/tag-area.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/components/unsupported-module/unsupported-module.ts b/src/core/course/components/unsupported-module/unsupported-module.ts
index 4c655e857..c606d4658 100644
--- a/src/core/course/components/unsupported-module/unsupported-module.ts
+++ b/src/core/course/components/unsupported-module/unsupported-module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/course.module.ts b/src/core/course/course.module.ts
index 52a686a40..3ac31d675 100644
--- a/src/core/course/course.module.ts
+++ b/src/core/course/course.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/directives/directives.module.ts b/src/core/course/directives/directives.module.ts
index 9b43d41cc..180635253 100644
--- a/src/core/course/directives/directives.module.ts
+++ b/src/core/course/directives/directives.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/directives/download-module-main-file.ts b/src/core/course/directives/download-module-main-file.ts
index e562a3216..915e3a771 100644
--- a/src/core/course/directives/download-module-main-file.ts
+++ b/src/core/course/directives/download-module-main-file.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/formats/singleactivity/components/singleactivity.ts b/src/core/course/formats/singleactivity/components/singleactivity.ts
index 946b9ea8d..c0dc391dc 100644
--- a/src/core/course/formats/singleactivity/components/singleactivity.ts
+++ b/src/core/course/formats/singleactivity/components/singleactivity.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/formats/singleactivity/providers/handler.ts b/src/core/course/formats/singleactivity/providers/handler.ts
index d85d68ed7..c9edd07db 100644
--- a/src/core/course/formats/singleactivity/providers/handler.ts
+++ b/src/core/course/formats/singleactivity/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/formats/singleactivity/singleactivity.module.ts b/src/core/course/formats/singleactivity/singleactivity.module.ts
index a35d4ad93..1c4675d7c 100644
--- a/src/core/course/formats/singleactivity/singleactivity.module.ts
+++ b/src/core/course/formats/singleactivity/singleactivity.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/formats/social/providers/handler.ts b/src/core/course/formats/social/providers/handler.ts
index fd4c7f5bb..e46732a2c 100644
--- a/src/core/course/formats/social/providers/handler.ts
+++ b/src/core/course/formats/social/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/formats/social/social.module.ts b/src/core/course/formats/social/social.module.ts
index 0ee3677fa..60bbf98be 100644
--- a/src/core/course/formats/social/social.module.ts
+++ b/src/core/course/formats/social/social.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/formats/topics/providers/handler.ts b/src/core/course/formats/topics/providers/handler.ts
index d4a3c4457..43f8064f7 100644
--- a/src/core/course/formats/topics/providers/handler.ts
+++ b/src/core/course/formats/topics/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/formats/topics/topics.module.ts b/src/core/course/formats/topics/topics.module.ts
index 97cedcc73..7d5c1c78a 100644
--- a/src/core/course/formats/topics/topics.module.ts
+++ b/src/core/course/formats/topics/topics.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/formats/weeks/providers/handler.ts b/src/core/course/formats/weeks/providers/handler.ts
index 66245bbbe..bfed9b033 100644
--- a/src/core/course/formats/weeks/providers/handler.ts
+++ b/src/core/course/formats/weeks/providers/handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/formats/weeks/weeks.module.ts b/src/core/course/formats/weeks/weeks.module.ts
index b26e66f44..ea250bea8 100644
--- a/src/core/course/formats/weeks/weeks.module.ts
+++ b/src/core/course/formats/weeks/weeks.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/pages/list-mod-type/list-mod-type.module.ts b/src/core/course/pages/list-mod-type/list-mod-type.module.ts
index 1de8ec959..9de52733b 100644
--- a/src/core/course/pages/list-mod-type/list-mod-type.module.ts
+++ b/src/core/course/pages/list-mod-type/list-mod-type.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/pages/list-mod-type/list-mod-type.ts b/src/core/course/pages/list-mod-type/list-mod-type.ts
index 759c3d47d..42700fa85 100644
--- a/src/core/course/pages/list-mod-type/list-mod-type.ts
+++ b/src/core/course/pages/list-mod-type/list-mod-type.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/pages/section-selector/section-selector.module.ts b/src/core/course/pages/section-selector/section-selector.module.ts
index 897696b62..5ceb20e03 100644
--- a/src/core/course/pages/section-selector/section-selector.module.ts
+++ b/src/core/course/pages/section-selector/section-selector.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/pages/section-selector/section-selector.ts b/src/core/course/pages/section-selector/section-selector.ts
index 381132fba..c86cf171c 100644
--- a/src/core/course/pages/section-selector/section-selector.ts
+++ b/src/core/course/pages/section-selector/section-selector.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/pages/section/section.module.ts b/src/core/course/pages/section/section.module.ts
index db558c4c3..8761e43ff 100644
--- a/src/core/course/pages/section/section.module.ts
+++ b/src/core/course/pages/section/section.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/pages/section/section.ts b/src/core/course/pages/section/section.ts
index f5e61c060..907e88518 100644
--- a/src/core/course/pages/section/section.ts
+++ b/src/core/course/pages/section/section.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/pages/unsupported-module/unsupported-module.module.ts b/src/core/course/pages/unsupported-module/unsupported-module.module.ts
index d3772a0da..41e6dec4d 100644
--- a/src/core/course/pages/unsupported-module/unsupported-module.module.ts
+++ b/src/core/course/pages/unsupported-module/unsupported-module.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/pages/unsupported-module/unsupported-module.ts b/src/core/course/pages/unsupported-module/unsupported-module.ts
index e52c44b1f..8ecd58f00 100644
--- a/src/core/course/pages/unsupported-module/unsupported-module.ts
+++ b/src/core/course/pages/unsupported-module/unsupported-module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/providers/course-offline.ts b/src/core/course/providers/course-offline.ts
index 4a5db05af..9def3150c 100644
--- a/src/core/course/providers/course-offline.ts
+++ b/src/core/course/providers/course-offline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/providers/course-tag-area-handler.ts b/src/core/course/providers/course-tag-area-handler.ts
index 6a40f6371..1aaa1343a 100644
--- a/src/core/course/providers/course-tag-area-handler.ts
+++ b/src/core/course/providers/course-tag-area-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/providers/course.ts b/src/core/course/providers/course.ts
index ed2d9fc7e..832eeda4c 100644
--- a/src/core/course/providers/course.ts
+++ b/src/core/course/providers/course.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/providers/default-format.ts b/src/core/course/providers/default-format.ts
index 56a0c2840..df3e7f401 100644
--- a/src/core/course/providers/default-format.ts
+++ b/src/core/course/providers/default-format.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/providers/default-module.ts b/src/core/course/providers/default-module.ts
index 1e5af3d8d..c69e280a6 100644
--- a/src/core/course/providers/default-module.ts
+++ b/src/core/course/providers/default-module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/providers/format-delegate.ts b/src/core/course/providers/format-delegate.ts
index 9fecdf9a3..87279b01e 100644
--- a/src/core/course/providers/format-delegate.ts
+++ b/src/core/course/providers/format-delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/providers/helper.ts b/src/core/course/providers/helper.ts
index a82b1508b..30b0e0dff 100644
--- a/src/core/course/providers/helper.ts
+++ b/src/core/course/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/providers/log-cron-handler.ts b/src/core/course/providers/log-cron-handler.ts
index deb0a7474..26ba8a309 100644
--- a/src/core/course/providers/log-cron-handler.ts
+++ b/src/core/course/providers/log-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/providers/log-helper.ts b/src/core/course/providers/log-helper.ts
index 8e69c34c3..f2319aad3 100644
--- a/src/core/course/providers/log-helper.ts
+++ b/src/core/course/providers/log-helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/providers/module-delegate.ts b/src/core/course/providers/module-delegate.ts
index eacadec21..6edf4bdd9 100644
--- a/src/core/course/providers/module-delegate.ts
+++ b/src/core/course/providers/module-delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/providers/module-prefetch-delegate.ts b/src/core/course/providers/module-prefetch-delegate.ts
index 65278fe82..58cda1d91 100644
--- a/src/core/course/providers/module-prefetch-delegate.ts
+++ b/src/core/course/providers/module-prefetch-delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/providers/modules-tag-area-handler.ts b/src/core/course/providers/modules-tag-area-handler.ts
index a3285e10e..fb8ebf6d1 100644
--- a/src/core/course/providers/modules-tag-area-handler.ts
+++ b/src/core/course/providers/modules-tag-area-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/providers/options-delegate.ts b/src/core/course/providers/options-delegate.ts
index 0fb67a195..9d2745056 100644
--- a/src/core/course/providers/options-delegate.ts
+++ b/src/core/course/providers/options-delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/providers/sync-cron-handler.ts b/src/core/course/providers/sync-cron-handler.ts
index 4b07c449e..6dc8c17e4 100644
--- a/src/core/course/providers/sync-cron-handler.ts
+++ b/src/core/course/providers/sync-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/course/providers/sync.ts b/src/core/course/providers/sync.ts
index c7cb473ce..ef5ea7462 100644
--- a/src/core/course/providers/sync.ts
+++ b/src/core/course/providers/sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/components/components.module.ts b/src/core/courses/components/components.module.ts
index ccb458973..bdd0965ca 100644
--- a/src/core/courses/components/components.module.ts
+++ b/src/core/courses/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/components/course-list-item/course-list-item.ts b/src/core/courses/components/course-list-item/course-list-item.ts
index 7c5e34f62..776a13a5d 100644
--- a/src/core/courses/components/course-list-item/course-list-item.ts
+++ b/src/core/courses/components/course-list-item/course-list-item.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/components/course-options-menu/course-options-menu.ts b/src/core/courses/components/course-options-menu/course-options-menu.ts
index 99abb36a9..02aae3630 100644
--- a/src/core/courses/components/course-options-menu/course-options-menu.ts
+++ b/src/core/courses/components/course-options-menu/course-options-menu.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/components/course-progress/course-progress.ts b/src/core/courses/components/course-progress/course-progress.ts
index 1db3c9098..60dc67d30 100644
--- a/src/core/courses/components/course-progress/course-progress.ts
+++ b/src/core/courses/components/course-progress/course-progress.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/components/my-courses/my-courses.ts b/src/core/courses/components/my-courses/my-courses.ts
index 3135892c8..1c51b5b31 100644
--- a/src/core/courses/components/my-courses/my-courses.ts
+++ b/src/core/courses/components/my-courses/my-courses.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/courses.module.ts b/src/core/courses/courses.module.ts
index a166ad5db..3d8ad776c 100644
--- a/src/core/courses/courses.module.ts
+++ b/src/core/courses/courses.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/pages/available-courses/available-courses.module.ts b/src/core/courses/pages/available-courses/available-courses.module.ts
index 3decb3196..ea3cff2bf 100644
--- a/src/core/courses/pages/available-courses/available-courses.module.ts
+++ b/src/core/courses/pages/available-courses/available-courses.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/pages/available-courses/available-courses.ts b/src/core/courses/pages/available-courses/available-courses.ts
index 9a69fe49b..f029b4880 100644
--- a/src/core/courses/pages/available-courses/available-courses.ts
+++ b/src/core/courses/pages/available-courses/available-courses.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/pages/categories/categories.module.ts b/src/core/courses/pages/categories/categories.module.ts
index c60b37cc3..b5b4162da 100644
--- a/src/core/courses/pages/categories/categories.module.ts
+++ b/src/core/courses/pages/categories/categories.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/pages/categories/categories.ts b/src/core/courses/pages/categories/categories.ts
index 10b84803e..596eef44c 100644
--- a/src/core/courses/pages/categories/categories.ts
+++ b/src/core/courses/pages/categories/categories.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/pages/course-preview/course-preview.module.ts b/src/core/courses/pages/course-preview/course-preview.module.ts
index 2a34ddf92..60c0102a2 100644
--- a/src/core/courses/pages/course-preview/course-preview.module.ts
+++ b/src/core/courses/pages/course-preview/course-preview.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/pages/course-preview/course-preview.ts b/src/core/courses/pages/course-preview/course-preview.ts
index 0be65494d..639b4d52f 100644
--- a/src/core/courses/pages/course-preview/course-preview.ts
+++ b/src/core/courses/pages/course-preview/course-preview.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/pages/dashboard/dashboard.module.ts b/src/core/courses/pages/dashboard/dashboard.module.ts
index 90258ff39..a7cd359dd 100644
--- a/src/core/courses/pages/dashboard/dashboard.module.ts
+++ b/src/core/courses/pages/dashboard/dashboard.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/pages/dashboard/dashboard.ts b/src/core/courses/pages/dashboard/dashboard.ts
index 2c2ccd993..ac309713c 100644
--- a/src/core/courses/pages/dashboard/dashboard.ts
+++ b/src/core/courses/pages/dashboard/dashboard.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/pages/my-courses/my-courses.module.ts b/src/core/courses/pages/my-courses/my-courses.module.ts
index 9ba564f6c..57eb58a3d 100644
--- a/src/core/courses/pages/my-courses/my-courses.module.ts
+++ b/src/core/courses/pages/my-courses/my-courses.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/pages/my-courses/my-courses.ts b/src/core/courses/pages/my-courses/my-courses.ts
index 3ca35b8a9..e3be229b9 100644
--- a/src/core/courses/pages/my-courses/my-courses.ts
+++ b/src/core/courses/pages/my-courses/my-courses.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/pages/search/search.module.ts b/src/core/courses/pages/search/search.module.ts
index 561f0dded..57a51cb46 100644
--- a/src/core/courses/pages/search/search.module.ts
+++ b/src/core/courses/pages/search/search.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/pages/search/search.ts b/src/core/courses/pages/search/search.ts
index c64795460..e3d56dcfb 100644
--- a/src/core/courses/pages/search/search.ts
+++ b/src/core/courses/pages/search/search.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/pages/self-enrol-password/self-enrol-password.module.ts b/src/core/courses/pages/self-enrol-password/self-enrol-password.module.ts
index 3c24736b0..09eea4572 100644
--- a/src/core/courses/pages/self-enrol-password/self-enrol-password.module.ts
+++ b/src/core/courses/pages/self-enrol-password/self-enrol-password.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/pages/self-enrol-password/self-enrol-password.ts b/src/core/courses/pages/self-enrol-password/self-enrol-password.ts
index e304ad8b5..a646dacb4 100644
--- a/src/core/courses/pages/self-enrol-password/self-enrol-password.ts
+++ b/src/core/courses/pages/self-enrol-password/self-enrol-password.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/providers/course-link-handler.ts b/src/core/courses/providers/course-link-handler.ts
index 249ef5594..b94813f4c 100644
--- a/src/core/courses/providers/course-link-handler.ts
+++ b/src/core/courses/providers/course-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/providers/courses-index-link-handler.ts b/src/core/courses/providers/courses-index-link-handler.ts
index 150fb9421..599d52037 100644
--- a/src/core/courses/providers/courses-index-link-handler.ts
+++ b/src/core/courses/providers/courses-index-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/providers/courses.ts b/src/core/courses/providers/courses.ts
index 160fe5b5d..50a6f0511 100644
--- a/src/core/courses/providers/courses.ts
+++ b/src/core/courses/providers/courses.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/providers/dashboard-link-handler.ts b/src/core/courses/providers/dashboard-link-handler.ts
index 32c25891b..23ec0d1ac 100644
--- a/src/core/courses/providers/dashboard-link-handler.ts
+++ b/src/core/courses/providers/dashboard-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/providers/dashboard.ts b/src/core/courses/providers/dashboard.ts
index ebf5c538b..380e0506c 100644
--- a/src/core/courses/providers/dashboard.ts
+++ b/src/core/courses/providers/dashboard.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/providers/enrol-push-click-handler.ts b/src/core/courses/providers/enrol-push-click-handler.ts
index 93016330f..635a776e5 100644
--- a/src/core/courses/providers/enrol-push-click-handler.ts
+++ b/src/core/courses/providers/enrol-push-click-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/providers/helper.ts b/src/core/courses/providers/helper.ts
index 7289734d3..d278ced6f 100644
--- a/src/core/courses/providers/helper.ts
+++ b/src/core/courses/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/providers/mainmenu-handler.ts b/src/core/courses/providers/mainmenu-handler.ts
index 81f5f3e01..846463659 100644
--- a/src/core/courses/providers/mainmenu-handler.ts
+++ b/src/core/courses/providers/mainmenu-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/courses/providers/request-push-click-handler.ts b/src/core/courses/providers/request-push-click-handler.ts
index 4f9246595..fbe3a739e 100644
--- a/src/core/courses/providers/request-push-click-handler.ts
+++ b/src/core/courses/providers/request-push-click-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/classes/filesystem.ts b/src/core/emulator/classes/filesystem.ts
index 8aa3333dc..ef7b53f91 100644
--- a/src/core/emulator/classes/filesystem.ts
+++ b/src/core/emulator/classes/filesystem.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/classes/inappbrowserobject.ts b/src/core/emulator/classes/inappbrowserobject.ts
index 513061406..2214aa274 100644
--- a/src/core/emulator/classes/inappbrowserobject.ts
+++ b/src/core/emulator/classes/inappbrowserobject.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/classes/sqlitedb.ts b/src/core/emulator/classes/sqlitedb.ts
index fd39efa59..7e5b4368d 100644
--- a/src/core/emulator/classes/sqlitedb.ts
+++ b/src/core/emulator/classes/sqlitedb.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/emulator.module.ts b/src/core/emulator/emulator.module.ts
index fd903e89b..b6307b4e1 100644
--- a/src/core/emulator/emulator.module.ts
+++ b/src/core/emulator/emulator.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/pages/capture-media/capture-media.module.ts b/src/core/emulator/pages/capture-media/capture-media.module.ts
index aea07d2a5..8f4fa29a2 100644
--- a/src/core/emulator/pages/capture-media/capture-media.module.ts
+++ b/src/core/emulator/pages/capture-media/capture-media.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/pages/capture-media/capture-media.ts b/src/core/emulator/pages/capture-media/capture-media.ts
index 5c9377569..77c1ec99e 100644
--- a/src/core/emulator/pages/capture-media/capture-media.ts
+++ b/src/core/emulator/pages/capture-media/capture-media.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/providers/badge.ts b/src/core/emulator/providers/badge.ts
index f3d843c9f..85fb0cbca 100644
--- a/src/core/emulator/providers/badge.ts
+++ b/src/core/emulator/providers/badge.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/providers/camera.ts b/src/core/emulator/providers/camera.ts
index 4fe7eaa00..ee2a194ff 100644
--- a/src/core/emulator/providers/camera.ts
+++ b/src/core/emulator/providers/camera.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/providers/capture-helper.ts b/src/core/emulator/providers/capture-helper.ts
index 33d174d09..e20fb64d8 100644
--- a/src/core/emulator/providers/capture-helper.ts
+++ b/src/core/emulator/providers/capture-helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/providers/clipboard.ts b/src/core/emulator/providers/clipboard.ts
index bf3a8e081..da91ce391 100644
--- a/src/core/emulator/providers/clipboard.ts
+++ b/src/core/emulator/providers/clipboard.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/providers/file-opener.ts b/src/core/emulator/providers/file-opener.ts
index d739950c5..7326633a4 100644
--- a/src/core/emulator/providers/file-opener.ts
+++ b/src/core/emulator/providers/file-opener.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/providers/file-transfer.ts b/src/core/emulator/providers/file-transfer.ts
index c3b250c9c..816fe675e 100644
--- a/src/core/emulator/providers/file-transfer.ts
+++ b/src/core/emulator/providers/file-transfer.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/providers/file.ts b/src/core/emulator/providers/file.ts
index 46c1b89e9..d219d1d68 100644
--- a/src/core/emulator/providers/file.ts
+++ b/src/core/emulator/providers/file.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/providers/globalization.ts b/src/core/emulator/providers/globalization.ts
index c5b902c54..c5f65d032 100644
--- a/src/core/emulator/providers/globalization.ts
+++ b/src/core/emulator/providers/globalization.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/providers/helper.ts b/src/core/emulator/providers/helper.ts
index f389d3458..f48ea7d68 100644
--- a/src/core/emulator/providers/helper.ts
+++ b/src/core/emulator/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/providers/inappbrowser.ts b/src/core/emulator/providers/inappbrowser.ts
index 3c151cebb..ca0c76ffe 100644
--- a/src/core/emulator/providers/inappbrowser.ts
+++ b/src/core/emulator/providers/inappbrowser.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/providers/local-notifications.ts b/src/core/emulator/providers/local-notifications.ts
index e8f506255..d3234bcd8 100644
--- a/src/core/emulator/providers/local-notifications.ts
+++ b/src/core/emulator/providers/local-notifications.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/providers/media-capture.ts b/src/core/emulator/providers/media-capture.ts
index 9abd354d2..ef2aca625 100644
--- a/src/core/emulator/providers/media-capture.ts
+++ b/src/core/emulator/providers/media-capture.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/providers/network.ts b/src/core/emulator/providers/network.ts
index df4c523f4..cc036247e 100644
--- a/src/core/emulator/providers/network.ts
+++ b/src/core/emulator/providers/network.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/providers/push.ts b/src/core/emulator/providers/push.ts
index 6ae083d5f..47e997a2e 100644
--- a/src/core/emulator/providers/push.ts
+++ b/src/core/emulator/providers/push.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/emulator/providers/zip.ts b/src/core/emulator/providers/zip.ts
index ae5fdc204..3170023ad 100644
--- a/src/core/emulator/providers/zip.ts
+++ b/src/core/emulator/providers/zip.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/fileuploader/fileuploader.module.ts b/src/core/fileuploader/fileuploader.module.ts
index e50bfd4f2..e94e8882c 100644
--- a/src/core/fileuploader/fileuploader.module.ts
+++ b/src/core/fileuploader/fileuploader.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/fileuploader/providers/album-handler.ts b/src/core/fileuploader/providers/album-handler.ts
index c1e7ca08f..e00c8c1e3 100644
--- a/src/core/fileuploader/providers/album-handler.ts
+++ b/src/core/fileuploader/providers/album-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/fileuploader/providers/audio-handler.ts b/src/core/fileuploader/providers/audio-handler.ts
index c7cb5ac2c..8e4ae96ed 100644
--- a/src/core/fileuploader/providers/audio-handler.ts
+++ b/src/core/fileuploader/providers/audio-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/fileuploader/providers/camera-handler.ts b/src/core/fileuploader/providers/camera-handler.ts
index fb290aab5..3cac835d4 100644
--- a/src/core/fileuploader/providers/camera-handler.ts
+++ b/src/core/fileuploader/providers/camera-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/fileuploader/providers/delegate.ts b/src/core/fileuploader/providers/delegate.ts
index 3bfea08b7..a0de9d939 100644
--- a/src/core/fileuploader/providers/delegate.ts
+++ b/src/core/fileuploader/providers/delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/fileuploader/providers/file-handler.ts b/src/core/fileuploader/providers/file-handler.ts
index 45449cc00..9d4c92462 100644
--- a/src/core/fileuploader/providers/file-handler.ts
+++ b/src/core/fileuploader/providers/file-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/fileuploader/providers/fileuploader.ts b/src/core/fileuploader/providers/fileuploader.ts
index 90c172b1e..520e5e631 100644
--- a/src/core/fileuploader/providers/fileuploader.ts
+++ b/src/core/fileuploader/providers/fileuploader.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/fileuploader/providers/helper.ts b/src/core/fileuploader/providers/helper.ts
index 8ae78e070..b812f8014 100644
--- a/src/core/fileuploader/providers/helper.ts
+++ b/src/core/fileuploader/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/fileuploader/providers/video-handler.ts b/src/core/fileuploader/providers/video-handler.ts
index 6d9fb58f8..bc6f192b5 100644
--- a/src/core/fileuploader/providers/video-handler.ts
+++ b/src/core/fileuploader/providers/video-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/grades/components/components.module.ts b/src/core/grades/components/components.module.ts
index 8088706e7..b20fa5369 100644
--- a/src/core/grades/components/components.module.ts
+++ b/src/core/grades/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/grades/components/course/course.ts b/src/core/grades/components/course/course.ts
index 51703f87b..15fdbfaa2 100644
--- a/src/core/grades/components/course/course.ts
+++ b/src/core/grades/components/course/course.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/grades/grades.module.ts b/src/core/grades/grades.module.ts
index 498b3d5d9..113527cd2 100644
--- a/src/core/grades/grades.module.ts
+++ b/src/core/grades/grades.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/grades/pages/course/course.module.ts b/src/core/grades/pages/course/course.module.ts
index 629df2410..7048108a8 100644
--- a/src/core/grades/pages/course/course.module.ts
+++ b/src/core/grades/pages/course/course.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/grades/pages/course/course.ts b/src/core/grades/pages/course/course.ts
index af07df6a3..952020e9c 100644
--- a/src/core/grades/pages/course/course.ts
+++ b/src/core/grades/pages/course/course.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/grades/pages/courses/courses.module.ts b/src/core/grades/pages/courses/courses.module.ts
index 40339d8ff..b42df4bb5 100644
--- a/src/core/grades/pages/courses/courses.module.ts
+++ b/src/core/grades/pages/courses/courses.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/grades/pages/courses/courses.ts b/src/core/grades/pages/courses/courses.ts
index fe186edd8..17a6e12e9 100644
--- a/src/core/grades/pages/courses/courses.ts
+++ b/src/core/grades/pages/courses/courses.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/grades/pages/coursesplit/coursesplit.module.ts b/src/core/grades/pages/coursesplit/coursesplit.module.ts
index 175aaf3d5..0113e8273 100644
--- a/src/core/grades/pages/coursesplit/coursesplit.module.ts
+++ b/src/core/grades/pages/coursesplit/coursesplit.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/grades/pages/coursesplit/coursesplit.ts b/src/core/grades/pages/coursesplit/coursesplit.ts
index beca318b2..c685f4a0b 100644
--- a/src/core/grades/pages/coursesplit/coursesplit.ts
+++ b/src/core/grades/pages/coursesplit/coursesplit.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/grades/pages/grade/grade.module.ts b/src/core/grades/pages/grade/grade.module.ts
index 6e6c55fa9..5171c4bea 100644
--- a/src/core/grades/pages/grade/grade.module.ts
+++ b/src/core/grades/pages/grade/grade.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/grades/pages/grade/grade.ts b/src/core/grades/pages/grade/grade.ts
index dcdad5290..b95796af1 100644
--- a/src/core/grades/pages/grade/grade.ts
+++ b/src/core/grades/pages/grade/grade.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/grades/providers/course-option-handler.ts b/src/core/grades/providers/course-option-handler.ts
index a927a0d09..b42519c99 100644
--- a/src/core/grades/providers/course-option-handler.ts
+++ b/src/core/grades/providers/course-option-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/grades/providers/grades.ts b/src/core/grades/providers/grades.ts
index b2f35b266..6242dc76f 100644
--- a/src/core/grades/providers/grades.ts
+++ b/src/core/grades/providers/grades.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/grades/providers/helper.ts b/src/core/grades/providers/helper.ts
index 86cf0fa19..236f05cc8 100644
--- a/src/core/grades/providers/helper.ts
+++ b/src/core/grades/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/grades/providers/mainmenu-handler.ts b/src/core/grades/providers/mainmenu-handler.ts
index 389c4f3b3..98d50c59a 100644
--- a/src/core/grades/providers/mainmenu-handler.ts
+++ b/src/core/grades/providers/mainmenu-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/grades/providers/overview-link-handler.ts b/src/core/grades/providers/overview-link-handler.ts
index 7794d17d5..f6ddee6ad 100644
--- a/src/core/grades/providers/overview-link-handler.ts
+++ b/src/core/grades/providers/overview-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/grades/providers/user-handler.ts b/src/core/grades/providers/user-handler.ts
index 41d79addf..d4e59a646 100644
--- a/src/core/grades/providers/user-handler.ts
+++ b/src/core/grades/providers/user-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/grades/providers/user-link-handler.ts b/src/core/grades/providers/user-link-handler.ts
index 9235c6d04..dda0b39ca 100644
--- a/src/core/grades/providers/user-link-handler.ts
+++ b/src/core/grades/providers/user-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/login.module.ts b/src/core/login/login.module.ts
index cb1a902ec..524654955 100644
--- a/src/core/login/login.module.ts
+++ b/src/core/login/login.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/credentials/credentials.module.ts b/src/core/login/pages/credentials/credentials.module.ts
index 98918503d..85086a9ab 100644
--- a/src/core/login/pages/credentials/credentials.module.ts
+++ b/src/core/login/pages/credentials/credentials.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/credentials/credentials.ts b/src/core/login/pages/credentials/credentials.ts
index 41c0b541f..de94968cf 100644
--- a/src/core/login/pages/credentials/credentials.ts
+++ b/src/core/login/pages/credentials/credentials.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/email-signup/email-signup.module.ts b/src/core/login/pages/email-signup/email-signup.module.ts
index c0db4ac71..27a91c364 100644
--- a/src/core/login/pages/email-signup/email-signup.module.ts
+++ b/src/core/login/pages/email-signup/email-signup.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/email-signup/email-signup.ts b/src/core/login/pages/email-signup/email-signup.ts
index 0af599a07..ffb8a6f42 100644
--- a/src/core/login/pages/email-signup/email-signup.ts
+++ b/src/core/login/pages/email-signup/email-signup.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/forgotten-password/forgotten-password.module.ts b/src/core/login/pages/forgotten-password/forgotten-password.module.ts
index 050a769f8..a61027049 100644
--- a/src/core/login/pages/forgotten-password/forgotten-password.module.ts
+++ b/src/core/login/pages/forgotten-password/forgotten-password.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/forgotten-password/forgotten-password.ts b/src/core/login/pages/forgotten-password/forgotten-password.ts
index e2e2805a4..b1d5d6785 100644
--- a/src/core/login/pages/forgotten-password/forgotten-password.ts
+++ b/src/core/login/pages/forgotten-password/forgotten-password.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/init/init.module.ts b/src/core/login/pages/init/init.module.ts
index 9a0744bc9..c12db00be 100644
--- a/src/core/login/pages/init/init.module.ts
+++ b/src/core/login/pages/init/init.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/init/init.ts b/src/core/login/pages/init/init.ts
index d7691fd04..0ca100be9 100644
--- a/src/core/login/pages/init/init.ts
+++ b/src/core/login/pages/init/init.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/reconnect/reconnect.module.ts b/src/core/login/pages/reconnect/reconnect.module.ts
index 412de6c45..3725e5a1a 100644
--- a/src/core/login/pages/reconnect/reconnect.module.ts
+++ b/src/core/login/pages/reconnect/reconnect.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/reconnect/reconnect.ts b/src/core/login/pages/reconnect/reconnect.ts
index 5dc8ca1fa..33ad5b0db 100644
--- a/src/core/login/pages/reconnect/reconnect.ts
+++ b/src/core/login/pages/reconnect/reconnect.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/site-error/site-error.module.ts b/src/core/login/pages/site-error/site-error.module.ts
index a7276f0a7..73332b1e1 100644
--- a/src/core/login/pages/site-error/site-error.module.ts
+++ b/src/core/login/pages/site-error/site-error.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/site-error/site-error.ts b/src/core/login/pages/site-error/site-error.ts
index c9db8ccb5..5d4df0e53 100644
--- a/src/core/login/pages/site-error/site-error.ts
+++ b/src/core/login/pages/site-error/site-error.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/site-help/site-help.module.ts b/src/core/login/pages/site-help/site-help.module.ts
index 8aa07277d..c933e70ad 100644
--- a/src/core/login/pages/site-help/site-help.module.ts
+++ b/src/core/login/pages/site-help/site-help.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/site-help/site-help.ts b/src/core/login/pages/site-help/site-help.ts
index ff71e891a..90d948b75 100644
--- a/src/core/login/pages/site-help/site-help.ts
+++ b/src/core/login/pages/site-help/site-help.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/site-policy/site-policy.module.ts b/src/core/login/pages/site-policy/site-policy.module.ts
index 21e868074..5be288d63 100644
--- a/src/core/login/pages/site-policy/site-policy.module.ts
+++ b/src/core/login/pages/site-policy/site-policy.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/site-policy/site-policy.ts b/src/core/login/pages/site-policy/site-policy.ts
index 265505ad6..d60a19551 100644
--- a/src/core/login/pages/site-policy/site-policy.ts
+++ b/src/core/login/pages/site-policy/site-policy.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/site/site.module.ts b/src/core/login/pages/site/site.module.ts
index 230f60cd6..37036231c 100644
--- a/src/core/login/pages/site/site.module.ts
+++ b/src/core/login/pages/site/site.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/site/site.ts b/src/core/login/pages/site/site.ts
index 55aafa984..f96eb9c3e 100644
--- a/src/core/login/pages/site/site.ts
+++ b/src/core/login/pages/site/site.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/sites/sites.module.ts b/src/core/login/pages/sites/sites.module.ts
index 7913b8d6d..01d709ffc 100644
--- a/src/core/login/pages/sites/sites.module.ts
+++ b/src/core/login/pages/sites/sites.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/pages/sites/sites.ts b/src/core/login/pages/sites/sites.ts
index 48719413a..91deeca18 100644
--- a/src/core/login/pages/sites/sites.ts
+++ b/src/core/login/pages/sites/sites.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/login/providers/helper.ts b/src/core/login/providers/helper.ts
index d46ad4a3e..d08b1ff0c 100644
--- a/src/core/login/providers/helper.ts
+++ b/src/core/login/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/mainmenu/mainmenu.module.ts b/src/core/mainmenu/mainmenu.module.ts
index 7873056cb..01964edf4 100644
--- a/src/core/mainmenu/mainmenu.module.ts
+++ b/src/core/mainmenu/mainmenu.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/mainmenu/pages/menu/menu.module.ts b/src/core/mainmenu/pages/menu/menu.module.ts
index 23a7ab49d..5062fae60 100644
--- a/src/core/mainmenu/pages/menu/menu.module.ts
+++ b/src/core/mainmenu/pages/menu/menu.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/mainmenu/pages/menu/menu.ts b/src/core/mainmenu/pages/menu/menu.ts
index afda6473a..c444675b4 100644
--- a/src/core/mainmenu/pages/menu/menu.ts
+++ b/src/core/mainmenu/pages/menu/menu.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/mainmenu/pages/more/more.module.ts b/src/core/mainmenu/pages/more/more.module.ts
index 0c5705079..b1d215f38 100644
--- a/src/core/mainmenu/pages/more/more.module.ts
+++ b/src/core/mainmenu/pages/more/more.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/mainmenu/pages/more/more.ts b/src/core/mainmenu/pages/more/more.ts
index 84d1b86c8..257fb27c7 100644
--- a/src/core/mainmenu/pages/more/more.ts
+++ b/src/core/mainmenu/pages/more/more.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/mainmenu/providers/delegate.ts b/src/core/mainmenu/providers/delegate.ts
index f42550d8b..9f07edc13 100644
--- a/src/core/mainmenu/providers/delegate.ts
+++ b/src/core/mainmenu/providers/delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/mainmenu/providers/mainmenu.ts b/src/core/mainmenu/providers/mainmenu.ts
index 8181b1067..b10d186f5 100644
--- a/src/core/mainmenu/providers/mainmenu.ts
+++ b/src/core/mainmenu/providers/mainmenu.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/pushnotifications/providers/delegate.ts b/src/core/pushnotifications/providers/delegate.ts
index e15e28c60..b8b10cbd7 100644
--- a/src/core/pushnotifications/providers/delegate.ts
+++ b/src/core/pushnotifications/providers/delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/pushnotifications/providers/pushnotifications.ts b/src/core/pushnotifications/providers/pushnotifications.ts
index 8e55142a0..216936f54 100644
--- a/src/core/pushnotifications/providers/pushnotifications.ts
+++ b/src/core/pushnotifications/providers/pushnotifications.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/pushnotifications/providers/register-cron-handler.ts b/src/core/pushnotifications/providers/register-cron-handler.ts
index ea03c062f..76dd0c928 100644
--- a/src/core/pushnotifications/providers/register-cron-handler.ts
+++ b/src/core/pushnotifications/providers/register-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/pushnotifications/providers/unregister-cron-handler.ts b/src/core/pushnotifications/providers/unregister-cron-handler.ts
index a2c87c179..9bf4ae196 100644
--- a/src/core/pushnotifications/providers/unregister-cron-handler.ts
+++ b/src/core/pushnotifications/providers/unregister-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/pushnotifications/pushnotifications.module.ts b/src/core/pushnotifications/pushnotifications.module.ts
index a907ab8ac..12496465d 100644
--- a/src/core/pushnotifications/pushnotifications.module.ts
+++ b/src/core/pushnotifications/pushnotifications.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/question/classes/base-behaviour-handler.ts b/src/core/question/classes/base-behaviour-handler.ts
index 88bf3ed61..852d7dfc5 100644
--- a/src/core/question/classes/base-behaviour-handler.ts
+++ b/src/core/question/classes/base-behaviour-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/question/classes/base-question-component.ts b/src/core/question/classes/base-question-component.ts
index 4d3275fc9..bff3d7c69 100644
--- a/src/core/question/classes/base-question-component.ts
+++ b/src/core/question/classes/base-question-component.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/question/classes/base-question-handler.ts b/src/core/question/classes/base-question-handler.ts
index 5cc31dde5..745536c5a 100644
--- a/src/core/question/classes/base-question-handler.ts
+++ b/src/core/question/classes/base-question-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/question/components/components.module.ts b/src/core/question/components/components.module.ts
index 77d33aa74..fa9ca7a92 100644
--- a/src/core/question/components/components.module.ts
+++ b/src/core/question/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/question/components/question/question.ts b/src/core/question/components/question/question.ts
index 8d1ee9f1c..88cb7bafa 100644
--- a/src/core/question/components/question/question.ts
+++ b/src/core/question/components/question/question.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/question/providers/behaviour-delegate.ts b/src/core/question/providers/behaviour-delegate.ts
index 77ee65506..db0d052de 100644
--- a/src/core/question/providers/behaviour-delegate.ts
+++ b/src/core/question/providers/behaviour-delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/question/providers/default-behaviour-handler.ts b/src/core/question/providers/default-behaviour-handler.ts
index 6609f033a..382d0f4db 100644
--- a/src/core/question/providers/default-behaviour-handler.ts
+++ b/src/core/question/providers/default-behaviour-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/question/providers/default-question-handler.ts b/src/core/question/providers/default-question-handler.ts
index 9aa3688f1..73ba6c175 100644
--- a/src/core/question/providers/default-question-handler.ts
+++ b/src/core/question/providers/default-question-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/question/providers/delegate.ts b/src/core/question/providers/delegate.ts
index 5c78d4e95..3d53a059c 100644
--- a/src/core/question/providers/delegate.ts
+++ b/src/core/question/providers/delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/question/providers/helper.ts b/src/core/question/providers/helper.ts
index 0ebd3eac8..5a9719a0c 100644
--- a/src/core/question/providers/helper.ts
+++ b/src/core/question/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/question/providers/question.ts b/src/core/question/providers/question.ts
index d8372a358..30e2ef73b 100644
--- a/src/core/question/providers/question.ts
+++ b/src/core/question/providers/question.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/question/question.module.ts b/src/core/question/question.module.ts
index 6028fc61a..ee758f591 100644
--- a/src/core/question/question.module.ts
+++ b/src/core/question/question.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/rating/components/aggregate/aggregate.ts b/src/core/rating/components/aggregate/aggregate.ts
index f763ddfa3..c6cbde85d 100644
--- a/src/core/rating/components/aggregate/aggregate.ts
+++ b/src/core/rating/components/aggregate/aggregate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/rating/components/components.module.ts b/src/core/rating/components/components.module.ts
index d9563e376..2985e2370 100644
--- a/src/core/rating/components/components.module.ts
+++ b/src/core/rating/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/rating/components/rate/rate.ts b/src/core/rating/components/rate/rate.ts
index a8426ea78..bb8a1d2e6 100644
--- a/src/core/rating/components/rate/rate.ts
+++ b/src/core/rating/components/rate/rate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/rating/pages/ratings/ratings.module.ts b/src/core/rating/pages/ratings/ratings.module.ts
index 62bf4821b..5b76d3105 100644
--- a/src/core/rating/pages/ratings/ratings.module.ts
+++ b/src/core/rating/pages/ratings/ratings.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/rating/pages/ratings/ratings.ts b/src/core/rating/pages/ratings/ratings.ts
index 1b0980ae2..379120e43 100644
--- a/src/core/rating/pages/ratings/ratings.ts
+++ b/src/core/rating/pages/ratings/ratings.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/rating/providers/offline.ts b/src/core/rating/providers/offline.ts
index 1de0b00b0..61c2de80f 100644
--- a/src/core/rating/providers/offline.ts
+++ b/src/core/rating/providers/offline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/rating/providers/rating.ts b/src/core/rating/providers/rating.ts
index bbdd1d454..cb4250c65 100644
--- a/src/core/rating/providers/rating.ts
+++ b/src/core/rating/providers/rating.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/rating/providers/sync.ts b/src/core/rating/providers/sync.ts
index e7f292d36..915059d92 100644
--- a/src/core/rating/providers/sync.ts
+++ b/src/core/rating/providers/sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/rating/rating.module.ts b/src/core/rating/rating.module.ts
index e7c512467..cf0aecad3 100644
--- a/src/core/rating/rating.module.ts
+++ b/src/core/rating/rating.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/settings/pages/about/about.module.ts b/src/core/settings/pages/about/about.module.ts
index 4b7725ea6..521cb7b03 100644
--- a/src/core/settings/pages/about/about.module.ts
+++ b/src/core/settings/pages/about/about.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/settings/pages/about/about.ts b/src/core/settings/pages/about/about.ts
index 373f0d90e..4f4474d0a 100644
--- a/src/core/settings/pages/about/about.ts
+++ b/src/core/settings/pages/about/about.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/settings/pages/general/general.module.ts b/src/core/settings/pages/general/general.module.ts
index 3a3125219..bf6ef6e4e 100644
--- a/src/core/settings/pages/general/general.module.ts
+++ b/src/core/settings/pages/general/general.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/settings/pages/general/general.ts b/src/core/settings/pages/general/general.ts
index 720e8fbdc..c211798a6 100644
--- a/src/core/settings/pages/general/general.ts
+++ b/src/core/settings/pages/general/general.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/settings/pages/list/list.module.ts b/src/core/settings/pages/list/list.module.ts
index 56cc21396..bec88bfb9 100644
--- a/src/core/settings/pages/list/list.module.ts
+++ b/src/core/settings/pages/list/list.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/settings/pages/list/list.ts b/src/core/settings/pages/list/list.ts
index 3c50f1350..604ef9069 100644
--- a/src/core/settings/pages/list/list.ts
+++ b/src/core/settings/pages/list/list.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/settings/pages/space-usage/space-usage.module.ts b/src/core/settings/pages/space-usage/space-usage.module.ts
index 07e590a91..d586969c9 100644
--- a/src/core/settings/pages/space-usage/space-usage.module.ts
+++ b/src/core/settings/pages/space-usage/space-usage.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/settings/pages/space-usage/space-usage.ts b/src/core/settings/pages/space-usage/space-usage.ts
index 0a782a9c6..2464d2a67 100644
--- a/src/core/settings/pages/space-usage/space-usage.ts
+++ b/src/core/settings/pages/space-usage/space-usage.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/settings/pages/synchronization/synchronization.module.ts b/src/core/settings/pages/synchronization/synchronization.module.ts
index e159f4800..46be44638 100644
--- a/src/core/settings/pages/synchronization/synchronization.module.ts
+++ b/src/core/settings/pages/synchronization/synchronization.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/settings/pages/synchronization/synchronization.ts b/src/core/settings/pages/synchronization/synchronization.ts
index 4238282d1..c478c4ad8 100644
--- a/src/core/settings/pages/synchronization/synchronization.ts
+++ b/src/core/settings/pages/synchronization/synchronization.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/settings/providers/delegate.ts b/src/core/settings/providers/delegate.ts
index e3e5fb2b4..ea5557024 100644
--- a/src/core/settings/providers/delegate.ts
+++ b/src/core/settings/providers/delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/settings/providers/helper.ts b/src/core/settings/providers/helper.ts
index 8579f96e0..dbbeb4510 100644
--- a/src/core/settings/providers/helper.ts
+++ b/src/core/settings/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/settings/settings.module.ts b/src/core/settings/settings.module.ts
index 25693befa..35e01317d 100644
--- a/src/core/settings/settings.module.ts
+++ b/src/core/settings/settings.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sharedfiles/pages/choose-site/choose-site.module.ts b/src/core/sharedfiles/pages/choose-site/choose-site.module.ts
index 4711cc588..fb90e4a2b 100644
--- a/src/core/sharedfiles/pages/choose-site/choose-site.module.ts
+++ b/src/core/sharedfiles/pages/choose-site/choose-site.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sharedfiles/pages/choose-site/choose-site.ts b/src/core/sharedfiles/pages/choose-site/choose-site.ts
index e1622c50c..7579a24bf 100644
--- a/src/core/sharedfiles/pages/choose-site/choose-site.ts
+++ b/src/core/sharedfiles/pages/choose-site/choose-site.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sharedfiles/pages/list/list.module.ts b/src/core/sharedfiles/pages/list/list.module.ts
index 2211d812f..d0b603ff7 100644
--- a/src/core/sharedfiles/pages/list/list.module.ts
+++ b/src/core/sharedfiles/pages/list/list.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sharedfiles/pages/list/list.ts b/src/core/sharedfiles/pages/list/list.ts
index 72e1db6e9..ec408963c 100644
--- a/src/core/sharedfiles/pages/list/list.ts
+++ b/src/core/sharedfiles/pages/list/list.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sharedfiles/providers/helper.ts b/src/core/sharedfiles/providers/helper.ts
index 449905abf..f5475061f 100644
--- a/src/core/sharedfiles/providers/helper.ts
+++ b/src/core/sharedfiles/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sharedfiles/providers/sharedfiles.ts b/src/core/sharedfiles/providers/sharedfiles.ts
index 0c31bf8a1..f95c1dc29 100644
--- a/src/core/sharedfiles/providers/sharedfiles.ts
+++ b/src/core/sharedfiles/providers/sharedfiles.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sharedfiles/providers/upload-handler.ts b/src/core/sharedfiles/providers/upload-handler.ts
index 6eab53615..61a73efc9 100644
--- a/src/core/sharedfiles/providers/upload-handler.ts
+++ b/src/core/sharedfiles/providers/upload-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sharedfiles/sharedfiles.module.ts b/src/core/sharedfiles/sharedfiles.module.ts
index 692ace04d..09ebb0d4b 100644
--- a/src/core/sharedfiles/sharedfiles.module.ts
+++ b/src/core/sharedfiles/sharedfiles.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sitehome/components/all-course-list/all-course-list.ts b/src/core/sitehome/components/all-course-list/all-course-list.ts
index 3f551b4b6..531c54ca2 100644
--- a/src/core/sitehome/components/all-course-list/all-course-list.ts
+++ b/src/core/sitehome/components/all-course-list/all-course-list.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sitehome/components/categories/categories.ts b/src/core/sitehome/components/categories/categories.ts
index 47c31b611..af7de07df 100644
--- a/src/core/sitehome/components/categories/categories.ts
+++ b/src/core/sitehome/components/categories/categories.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sitehome/components/components.module.ts b/src/core/sitehome/components/components.module.ts
index 55f9916d9..b4a32e20c 100644
--- a/src/core/sitehome/components/components.module.ts
+++ b/src/core/sitehome/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sitehome/components/course-search/course-search.ts b/src/core/sitehome/components/course-search/course-search.ts
index e861f18e8..3becb13b0 100644
--- a/src/core/sitehome/components/course-search/course-search.ts
+++ b/src/core/sitehome/components/course-search/course-search.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sitehome/components/enrolled-course-list/enrolled-course-list.ts b/src/core/sitehome/components/enrolled-course-list/enrolled-course-list.ts
index b50290d2f..d2d4e8c2c 100644
--- a/src/core/sitehome/components/enrolled-course-list/enrolled-course-list.ts
+++ b/src/core/sitehome/components/enrolled-course-list/enrolled-course-list.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sitehome/components/index/index.ts b/src/core/sitehome/components/index/index.ts
index efc92458d..524743108 100644
--- a/src/core/sitehome/components/index/index.ts
+++ b/src/core/sitehome/components/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sitehome/components/news/news.ts b/src/core/sitehome/components/news/news.ts
index e029ce558..3bd648dbe 100644
--- a/src/core/sitehome/components/news/news.ts
+++ b/src/core/sitehome/components/news/news.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sitehome/pages/index/index.module.ts b/src/core/sitehome/pages/index/index.module.ts
index c9fb97017..a71f81d42 100644
--- a/src/core/sitehome/pages/index/index.module.ts
+++ b/src/core/sitehome/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sitehome/pages/index/index.ts b/src/core/sitehome/pages/index/index.ts
index a66018fec..2af21d2e9 100644
--- a/src/core/sitehome/pages/index/index.ts
+++ b/src/core/sitehome/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sitehome/providers/index-link-handler.ts b/src/core/sitehome/providers/index-link-handler.ts
index 2f57e218b..5e40129e0 100644
--- a/src/core/sitehome/providers/index-link-handler.ts
+++ b/src/core/sitehome/providers/index-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sitehome/providers/sitehome.ts b/src/core/sitehome/providers/sitehome.ts
index 207916fe9..6b03b67be 100644
--- a/src/core/sitehome/providers/sitehome.ts
+++ b/src/core/sitehome/providers/sitehome.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/sitehome/sitehome.module.ts b/src/core/sitehome/sitehome.module.ts
index 60491cc58..9601a7805 100644
--- a/src/core/sitehome/sitehome.module.ts
+++ b/src/core/sitehome/sitehome.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/call-ws-click-directive.ts b/src/core/siteplugins/classes/call-ws-click-directive.ts
index eb88363fe..28d3ecec6 100644
--- a/src/core/siteplugins/classes/call-ws-click-directive.ts
+++ b/src/core/siteplugins/classes/call-ws-click-directive.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/call-ws-directive.ts b/src/core/siteplugins/classes/call-ws-directive.ts
index fb4f7d1f8..f1d31934a 100644
--- a/src/core/siteplugins/classes/call-ws-directive.ts
+++ b/src/core/siteplugins/classes/call-ws-directive.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/compile-init-component.ts b/src/core/siteplugins/classes/compile-init-component.ts
index c71fe3b6f..e8157c9aa 100644
--- a/src/core/siteplugins/classes/compile-init-component.ts
+++ b/src/core/siteplugins/classes/compile-init-component.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/handlers/assign-feedback-handler.ts b/src/core/siteplugins/classes/handlers/assign-feedback-handler.ts
index 527c6bb3e..12c816836 100644
--- a/src/core/siteplugins/classes/handlers/assign-feedback-handler.ts
+++ b/src/core/siteplugins/classes/handlers/assign-feedback-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/handlers/assign-submission-handler.ts b/src/core/siteplugins/classes/handlers/assign-submission-handler.ts
index 85de62cb0..d9b6afeca 100644
--- a/src/core/siteplugins/classes/handlers/assign-submission-handler.ts
+++ b/src/core/siteplugins/classes/handlers/assign-submission-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/handlers/base-handler.ts b/src/core/siteplugins/classes/handlers/base-handler.ts
index dc68d6b43..1344aa7c5 100644
--- a/src/core/siteplugins/classes/handlers/base-handler.ts
+++ b/src/core/siteplugins/classes/handlers/base-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/handlers/block-handler.ts b/src/core/siteplugins/classes/handlers/block-handler.ts
index 25602a22e..a7cf18060 100644
--- a/src/core/siteplugins/classes/handlers/block-handler.ts
+++ b/src/core/siteplugins/classes/handlers/block-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/handlers/course-format-handler.ts b/src/core/siteplugins/classes/handlers/course-format-handler.ts
index 83a1d5149..a75339790 100644
--- a/src/core/siteplugins/classes/handlers/course-format-handler.ts
+++ b/src/core/siteplugins/classes/handlers/course-format-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/handlers/course-option-handler.ts b/src/core/siteplugins/classes/handlers/course-option-handler.ts
index 4bc1f7ce2..29800bbbf 100644
--- a/src/core/siteplugins/classes/handlers/course-option-handler.ts
+++ b/src/core/siteplugins/classes/handlers/course-option-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/handlers/main-menu-handler.ts b/src/core/siteplugins/classes/handlers/main-menu-handler.ts
index 09be56f52..431164e07 100644
--- a/src/core/siteplugins/classes/handlers/main-menu-handler.ts
+++ b/src/core/siteplugins/classes/handlers/main-menu-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/handlers/message-output-handler.ts b/src/core/siteplugins/classes/handlers/message-output-handler.ts
index 51e636e78..3c8d9b996 100644
--- a/src/core/siteplugins/classes/handlers/message-output-handler.ts
+++ b/src/core/siteplugins/classes/handlers/message-output-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/handlers/module-handler.ts b/src/core/siteplugins/classes/handlers/module-handler.ts
index bb454ea11..00466c2f9 100644
--- a/src/core/siteplugins/classes/handlers/module-handler.ts
+++ b/src/core/siteplugins/classes/handlers/module-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/handlers/module-prefetch-handler.ts b/src/core/siteplugins/classes/handlers/module-prefetch-handler.ts
index 91788299b..96ceb2db0 100644
--- a/src/core/siteplugins/classes/handlers/module-prefetch-handler.ts
+++ b/src/core/siteplugins/classes/handlers/module-prefetch-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/handlers/question-behaviour-handler.ts b/src/core/siteplugins/classes/handlers/question-behaviour-handler.ts
index 62ad964b9..508a40777 100644
--- a/src/core/siteplugins/classes/handlers/question-behaviour-handler.ts
+++ b/src/core/siteplugins/classes/handlers/question-behaviour-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/handlers/question-handler.ts b/src/core/siteplugins/classes/handlers/question-handler.ts
index 51ce3885c..8e3a9bc28 100644
--- a/src/core/siteplugins/classes/handlers/question-handler.ts
+++ b/src/core/siteplugins/classes/handlers/question-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/handlers/quiz-access-rule-handler.ts b/src/core/siteplugins/classes/handlers/quiz-access-rule-handler.ts
index c72ba32ca..0f116051d 100644
--- a/src/core/siteplugins/classes/handlers/quiz-access-rule-handler.ts
+++ b/src/core/siteplugins/classes/handlers/quiz-access-rule-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/handlers/settings-handler.ts b/src/core/siteplugins/classes/handlers/settings-handler.ts
index ee788d317..d3de29f45 100644
--- a/src/core/siteplugins/classes/handlers/settings-handler.ts
+++ b/src/core/siteplugins/classes/handlers/settings-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/handlers/user-handler.ts b/src/core/siteplugins/classes/handlers/user-handler.ts
index bb5b6bbf7..29266d048 100644
--- a/src/core/siteplugins/classes/handlers/user-handler.ts
+++ b/src/core/siteplugins/classes/handlers/user-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/handlers/user-profile-field-handler.ts b/src/core/siteplugins/classes/handlers/user-profile-field-handler.ts
index 0dfebb1c0..23aeeee19 100644
--- a/src/core/siteplugins/classes/handlers/user-profile-field-handler.ts
+++ b/src/core/siteplugins/classes/handlers/user-profile-field-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/classes/handlers/workshop-assessment-strategy-handler.ts b/src/core/siteplugins/classes/handlers/workshop-assessment-strategy-handler.ts
index e04c5b1b4..7dc297460 100644
--- a/src/core/siteplugins/classes/handlers/workshop-assessment-strategy-handler.ts
+++ b/src/core/siteplugins/classes/handlers/workshop-assessment-strategy-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/components/assign-feedback/assign-feedback.ts b/src/core/siteplugins/components/assign-feedback/assign-feedback.ts
index e7e236261..983632468 100644
--- a/src/core/siteplugins/components/assign-feedback/assign-feedback.ts
+++ b/src/core/siteplugins/components/assign-feedback/assign-feedback.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/components/assign-submission/assign-submission.ts b/src/core/siteplugins/components/assign-submission/assign-submission.ts
index 572d76158..4aa27e3d4 100644
--- a/src/core/siteplugins/components/assign-submission/assign-submission.ts
+++ b/src/core/siteplugins/components/assign-submission/assign-submission.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/components/block/block.ts b/src/core/siteplugins/components/block/block.ts
index c3375a90f..7a817fb88 100644
--- a/src/core/siteplugins/components/block/block.ts
+++ b/src/core/siteplugins/components/block/block.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/components/components.module.ts b/src/core/siteplugins/components/components.module.ts
index abba3cd8c..5f2d15816 100644
--- a/src/core/siteplugins/components/components.module.ts
+++ b/src/core/siteplugins/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/components/course-format/course-format.ts b/src/core/siteplugins/components/course-format/course-format.ts
index 76c21493b..93a965000 100644
--- a/src/core/siteplugins/components/course-format/course-format.ts
+++ b/src/core/siteplugins/components/course-format/course-format.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/components/course-option/course-option.ts b/src/core/siteplugins/components/course-option/course-option.ts
index 54d534c45..26adaf219 100644
--- a/src/core/siteplugins/components/course-option/course-option.ts
+++ b/src/core/siteplugins/components/course-option/course-option.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/components/module-index/module-index.ts b/src/core/siteplugins/components/module-index/module-index.ts
index c5947c0ca..ef0a1b0db 100644
--- a/src/core/siteplugins/components/module-index/module-index.ts
+++ b/src/core/siteplugins/components/module-index/module-index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/components/only-title-block/only-title-block.ts b/src/core/siteplugins/components/only-title-block/only-title-block.ts
index b0ceaa456..8b1a3987f 100644
--- a/src/core/siteplugins/components/only-title-block/only-title-block.ts
+++ b/src/core/siteplugins/components/only-title-block/only-title-block.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/components/plugin-content/plugin-content.ts b/src/core/siteplugins/components/plugin-content/plugin-content.ts
index ede995524..c257f79cf 100644
--- a/src/core/siteplugins/components/plugin-content/plugin-content.ts
+++ b/src/core/siteplugins/components/plugin-content/plugin-content.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/components/question-behaviour/question-behaviour.ts b/src/core/siteplugins/components/question-behaviour/question-behaviour.ts
index 17970be85..4e3cc8a70 100644
--- a/src/core/siteplugins/components/question-behaviour/question-behaviour.ts
+++ b/src/core/siteplugins/components/question-behaviour/question-behaviour.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/components/question/question.ts b/src/core/siteplugins/components/question/question.ts
index 2765ea707..193f59741 100644
--- a/src/core/siteplugins/components/question/question.ts
+++ b/src/core/siteplugins/components/question/question.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/components/quiz-access-rule/quiz-access-rule.ts b/src/core/siteplugins/components/quiz-access-rule/quiz-access-rule.ts
index b80f62c76..1e3f59371 100644
--- a/src/core/siteplugins/components/quiz-access-rule/quiz-access-rule.ts
+++ b/src/core/siteplugins/components/quiz-access-rule/quiz-access-rule.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/components/user-profile-field/user-profile-field.ts b/src/core/siteplugins/components/user-profile-field/user-profile-field.ts
index 201b95930..e39f7f704 100644
--- a/src/core/siteplugins/components/user-profile-field/user-profile-field.ts
+++ b/src/core/siteplugins/components/user-profile-field/user-profile-field.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/components/workshop-assessment-strategy/workshop-assessment-strategy.ts b/src/core/siteplugins/components/workshop-assessment-strategy/workshop-assessment-strategy.ts
index 5c5b8c53f..19aad1746 100644
--- a/src/core/siteplugins/components/workshop-assessment-strategy/workshop-assessment-strategy.ts
+++ b/src/core/siteplugins/components/workshop-assessment-strategy/workshop-assessment-strategy.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/directives/call-ws-new-content.ts b/src/core/siteplugins/directives/call-ws-new-content.ts
index 159085d6d..8bc307951 100644
--- a/src/core/siteplugins/directives/call-ws-new-content.ts
+++ b/src/core/siteplugins/directives/call-ws-new-content.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/directives/call-ws-on-load.ts b/src/core/siteplugins/directives/call-ws-on-load.ts
index ecbe9a12d..ec5d653ce 100644
--- a/src/core/siteplugins/directives/call-ws-on-load.ts
+++ b/src/core/siteplugins/directives/call-ws-on-load.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/directives/call-ws.ts b/src/core/siteplugins/directives/call-ws.ts
index 4f5b65e69..16bc262dd 100644
--- a/src/core/siteplugins/directives/call-ws.ts
+++ b/src/core/siteplugins/directives/call-ws.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/directives/directives.module.ts b/src/core/siteplugins/directives/directives.module.ts
index 4197acace..17ceccfab 100644
--- a/src/core/siteplugins/directives/directives.module.ts
+++ b/src/core/siteplugins/directives/directives.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/directives/new-content.ts b/src/core/siteplugins/directives/new-content.ts
index 1158b5dd6..7981e49a0 100644
--- a/src/core/siteplugins/directives/new-content.ts
+++ b/src/core/siteplugins/directives/new-content.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/pages/module-index/module-index.module.ts b/src/core/siteplugins/pages/module-index/module-index.module.ts
index 0f5f72666..21094066e 100644
--- a/src/core/siteplugins/pages/module-index/module-index.module.ts
+++ b/src/core/siteplugins/pages/module-index/module-index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/pages/module-index/module-index.ts b/src/core/siteplugins/pages/module-index/module-index.ts
index 7203d804a..9d082069c 100644
--- a/src/core/siteplugins/pages/module-index/module-index.ts
+++ b/src/core/siteplugins/pages/module-index/module-index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/pages/plugin-page/plugin-page.module.ts b/src/core/siteplugins/pages/plugin-page/plugin-page.module.ts
index a0637d5e6..d5f853896 100644
--- a/src/core/siteplugins/pages/plugin-page/plugin-page.module.ts
+++ b/src/core/siteplugins/pages/plugin-page/plugin-page.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/pages/plugin-page/plugin-page.ts b/src/core/siteplugins/pages/plugin-page/plugin-page.ts
index 9156aa30c..75c81bc53 100644
--- a/src/core/siteplugins/pages/plugin-page/plugin-page.ts
+++ b/src/core/siteplugins/pages/plugin-page/plugin-page.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/providers/helper.ts b/src/core/siteplugins/providers/helper.ts
index 288ca0f0b..5c992ff6f 100644
--- a/src/core/siteplugins/providers/helper.ts
+++ b/src/core/siteplugins/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/providers/siteplugins.ts b/src/core/siteplugins/providers/siteplugins.ts
index 0ba03045d..6ebcef76a 100644
--- a/src/core/siteplugins/providers/siteplugins.ts
+++ b/src/core/siteplugins/providers/siteplugins.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/siteplugins/siteplugins.module.ts b/src/core/siteplugins/siteplugins.module.ts
index f71eac427..084b555d9 100644
--- a/src/core/siteplugins/siteplugins.module.ts
+++ b/src/core/siteplugins/siteplugins.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/tag/components/components.module.ts b/src/core/tag/components/components.module.ts
index 8960002cd..e58f2a376 100644
--- a/src/core/tag/components/components.module.ts
+++ b/src/core/tag/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/tag/components/feed/feed.ts b/src/core/tag/components/feed/feed.ts
index 5c554f7c3..460519bcf 100644
--- a/src/core/tag/components/feed/feed.ts
+++ b/src/core/tag/components/feed/feed.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/tag/components/list/list.ts b/src/core/tag/components/list/list.ts
index 6abbf3d7f..12ad65bc6 100644
--- a/src/core/tag/components/list/list.ts
+++ b/src/core/tag/components/list/list.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/tag/pages/index-area/index-area.module.ts b/src/core/tag/pages/index-area/index-area.module.ts
index 87a49cd7f..8dd77cebe 100644
--- a/src/core/tag/pages/index-area/index-area.module.ts
+++ b/src/core/tag/pages/index-area/index-area.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/tag/pages/index-area/index-area.ts b/src/core/tag/pages/index-area/index-area.ts
index a5e76402f..ba7f9819d 100644
--- a/src/core/tag/pages/index-area/index-area.ts
+++ b/src/core/tag/pages/index-area/index-area.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/tag/pages/index/index.module.ts b/src/core/tag/pages/index/index.module.ts
index bb3cd138d..b0efbe4d5 100644
--- a/src/core/tag/pages/index/index.module.ts
+++ b/src/core/tag/pages/index/index.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/tag/pages/index/index.ts b/src/core/tag/pages/index/index.ts
index ed9fbe805..e80a28718 100644
--- a/src/core/tag/pages/index/index.ts
+++ b/src/core/tag/pages/index/index.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/tag/pages/search/search.module.ts b/src/core/tag/pages/search/search.module.ts
index 29776ce68..084c9605c 100644
--- a/src/core/tag/pages/search/search.module.ts
+++ b/src/core/tag/pages/search/search.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/tag/pages/search/search.ts b/src/core/tag/pages/search/search.ts
index c79edfa28..5fd2d42ab 100644
--- a/src/core/tag/pages/search/search.ts
+++ b/src/core/tag/pages/search/search.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/tag/providers/area-delegate.ts b/src/core/tag/providers/area-delegate.ts
index ac1693ec1..724a2cd93 100644
--- a/src/core/tag/providers/area-delegate.ts
+++ b/src/core/tag/providers/area-delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/tag/providers/helper.ts b/src/core/tag/providers/helper.ts
index f62cac0ec..e2bba0547 100644
--- a/src/core/tag/providers/helper.ts
+++ b/src/core/tag/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/tag/providers/index-link-handler.ts b/src/core/tag/providers/index-link-handler.ts
index e94bca812..07efb60e3 100644
--- a/src/core/tag/providers/index-link-handler.ts
+++ b/src/core/tag/providers/index-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/tag/providers/mainmenu-handler.ts b/src/core/tag/providers/mainmenu-handler.ts
index 60f7b1e8c..ae841a214 100644
--- a/src/core/tag/providers/mainmenu-handler.ts
+++ b/src/core/tag/providers/mainmenu-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/tag/providers/search-link-handler.ts b/src/core/tag/providers/search-link-handler.ts
index e0b16f7df..c7bbede43 100644
--- a/src/core/tag/providers/search-link-handler.ts
+++ b/src/core/tag/providers/search-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/tag/providers/tag.ts b/src/core/tag/providers/tag.ts
index 0f993914a..fc208a2c1 100644
--- a/src/core/tag/providers/tag.ts
+++ b/src/core/tag/providers/tag.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/tag/tag.module.ts b/src/core/tag/tag.module.ts
index 970e66e46..07aad9c86 100644
--- a/src/core/tag/tag.module.ts
+++ b/src/core/tag/tag.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/components/components.module.ts b/src/core/user/components/components.module.ts
index e741ad964..a2f772ed8 100644
--- a/src/core/user/components/components.module.ts
+++ b/src/core/user/components/components.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/components/participants/participants.ts b/src/core/user/components/participants/participants.ts
index 236345e90..ccc1b0b83 100644
--- a/src/core/user/components/participants/participants.ts
+++ b/src/core/user/components/participants/participants.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/components/tag-area/tag-area.ts b/src/core/user/components/tag-area/tag-area.ts
index 8c4f01612..d420fcdf0 100644
--- a/src/core/user/components/tag-area/tag-area.ts
+++ b/src/core/user/components/tag-area/tag-area.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/components/user-profile-field/user-profile-field.ts b/src/core/user/components/user-profile-field/user-profile-field.ts
index 30d54b753..774591461 100644
--- a/src/core/user/components/user-profile-field/user-profile-field.ts
+++ b/src/core/user/components/user-profile-field/user-profile-field.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/pages/about/about.module.ts b/src/core/user/pages/about/about.module.ts
index 736e06435..939075a06 100644
--- a/src/core/user/pages/about/about.module.ts
+++ b/src/core/user/pages/about/about.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/pages/about/about.ts b/src/core/user/pages/about/about.ts
index 96ab5b210..3c87a2716 100644
--- a/src/core/user/pages/about/about.ts
+++ b/src/core/user/pages/about/about.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/pages/participants/participants.module.ts b/src/core/user/pages/participants/participants.module.ts
index 57d0d5e5d..40c211bbb 100644
--- a/src/core/user/pages/participants/participants.module.ts
+++ b/src/core/user/pages/participants/participants.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/pages/participants/participants.ts b/src/core/user/pages/participants/participants.ts
index ae2a470c8..9c4b01a1f 100644
--- a/src/core/user/pages/participants/participants.ts
+++ b/src/core/user/pages/participants/participants.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/pages/profile/profile.module.ts b/src/core/user/pages/profile/profile.module.ts
index 2511d5573..6185cc7d8 100644
--- a/src/core/user/pages/profile/profile.module.ts
+++ b/src/core/user/pages/profile/profile.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/pages/profile/profile.ts b/src/core/user/pages/profile/profile.ts
index c60bb9a2f..05a36e6e0 100644
--- a/src/core/user/pages/profile/profile.ts
+++ b/src/core/user/pages/profile/profile.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/providers/course-option-handler.ts b/src/core/user/providers/course-option-handler.ts
index 5d1c61d33..b0407191d 100644
--- a/src/core/user/providers/course-option-handler.ts
+++ b/src/core/user/providers/course-option-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/providers/helper.ts b/src/core/user/providers/helper.ts
index 876ea1aa0..97daa62d5 100644
--- a/src/core/user/providers/helper.ts
+++ b/src/core/user/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/providers/offline.ts b/src/core/user/providers/offline.ts
index 470a52c9d..cfd4be00b 100644
--- a/src/core/user/providers/offline.ts
+++ b/src/core/user/providers/offline.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/providers/participants-link-handler.ts b/src/core/user/providers/participants-link-handler.ts
index 501ecc937..c5a1a1635 100644
--- a/src/core/user/providers/participants-link-handler.ts
+++ b/src/core/user/providers/participants-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/providers/sync-cron-handler.ts b/src/core/user/providers/sync-cron-handler.ts
index 5ee16c66d..48eb4ab74 100644
--- a/src/core/user/providers/sync-cron-handler.ts
+++ b/src/core/user/providers/sync-cron-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/providers/sync.ts b/src/core/user/providers/sync.ts
index 58cbf6ea7..e0a7fb2bb 100644
--- a/src/core/user/providers/sync.ts
+++ b/src/core/user/providers/sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/providers/tag-area-handler.ts b/src/core/user/providers/tag-area-handler.ts
index 3bd607f44..32b30851d 100644
--- a/src/core/user/providers/tag-area-handler.ts
+++ b/src/core/user/providers/tag-area-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/providers/user-delegate.ts b/src/core/user/providers/user-delegate.ts
index 0e74b38f8..588bb817d 100644
--- a/src/core/user/providers/user-delegate.ts
+++ b/src/core/user/providers/user-delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/providers/user-handler.ts b/src/core/user/providers/user-handler.ts
index 862dde6a5..212b9e057 100644
--- a/src/core/user/providers/user-handler.ts
+++ b/src/core/user/providers/user-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/providers/user-link-handler.ts b/src/core/user/providers/user-link-handler.ts
index 6fd64e759..f82c07bc3 100644
--- a/src/core/user/providers/user-link-handler.ts
+++ b/src/core/user/providers/user-link-handler.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/providers/user-profile-field-delegate.ts b/src/core/user/providers/user-profile-field-delegate.ts
index a059ad1a5..4acef8d5e 100644
--- a/src/core/user/providers/user-profile-field-delegate.ts
+++ b/src/core/user/providers/user-profile-field-delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/providers/user.ts b/src/core/user/providers/user.ts
index 1541cecf5..e42a974be 100644
--- a/src/core/user/providers/user.ts
+++ b/src/core/user/providers/user.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/user/user.module.ts b/src/core/user/user.module.ts
index 0370243a6..59ffb67c7 100644
--- a/src/core/user/user.module.ts
+++ b/src/core/user/user.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/viewer/pages/iframe/iframe.module.ts b/src/core/viewer/pages/iframe/iframe.module.ts
index 0430f4a0c..958c3e40c 100644
--- a/src/core/viewer/pages/iframe/iframe.module.ts
+++ b/src/core/viewer/pages/iframe/iframe.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/viewer/pages/iframe/iframe.ts b/src/core/viewer/pages/iframe/iframe.ts
index 8bcec245b..fb130528f 100644
--- a/src/core/viewer/pages/iframe/iframe.ts
+++ b/src/core/viewer/pages/iframe/iframe.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/viewer/pages/image/image.module.ts b/src/core/viewer/pages/image/image.module.ts
index f3f864171..3f079b3a7 100644
--- a/src/core/viewer/pages/image/image.module.ts
+++ b/src/core/viewer/pages/image/image.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/viewer/pages/image/image.ts b/src/core/viewer/pages/image/image.ts
index b1e7ced87..c19119715 100644
--- a/src/core/viewer/pages/image/image.ts
+++ b/src/core/viewer/pages/image/image.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/viewer/pages/text/text.module.ts b/src/core/viewer/pages/text/text.module.ts
index 08a594bc3..acf320e54 100644
--- a/src/core/viewer/pages/text/text.module.ts
+++ b/src/core/viewer/pages/text/text.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/viewer/pages/text/text.ts b/src/core/viewer/pages/text/text.ts
index 9139d5473..6ab1e7bf3 100644
--- a/src/core/viewer/pages/text/text.ts
+++ b/src/core/viewer/pages/text/text.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/directives/auto-focus.ts b/src/directives/auto-focus.ts
index 5d6e2446d..162f3bbbc 100644
--- a/src/directives/auto-focus.ts
+++ b/src/directives/auto-focus.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/directives/auto-rows.ts b/src/directives/auto-rows.ts
index 6bd56aa22..868fc44b7 100644
--- a/src/directives/auto-rows.ts
+++ b/src/directives/auto-rows.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/directives/back-button.ts b/src/directives/back-button.ts
index 100c2adfd..0a14f881c 100644
--- a/src/directives/back-button.ts
+++ b/src/directives/back-button.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/directives/directives.module.ts b/src/directives/directives.module.ts
index 6b58c1054..1217c26ce 100644
--- a/src/directives/directives.module.ts
+++ b/src/directives/directives.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/directives/download-file.ts b/src/directives/download-file.ts
index c8ecebc23..99c8a59e4 100644
--- a/src/directives/download-file.ts
+++ b/src/directives/download-file.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/directives/external-content.ts b/src/directives/external-content.ts
index d86493a80..1879772c7 100644
--- a/src/directives/external-content.ts
+++ b/src/directives/external-content.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/directives/fab.ts b/src/directives/fab.ts
index 828c1cec5..f32da9b27 100644
--- a/src/directives/fab.ts
+++ b/src/directives/fab.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/directives/format-text.ts b/src/directives/format-text.ts
index bada2a967..a723f2116 100644
--- a/src/directives/format-text.ts
+++ b/src/directives/format-text.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/directives/keep-keyboard.ts b/src/directives/keep-keyboard.ts
index 1c99b27ea..7cb57b5af 100644
--- a/src/directives/keep-keyboard.ts
+++ b/src/directives/keep-keyboard.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/directives/link.ts b/src/directives/link.ts
index 53ac98f78..5ccfe3c64 100644
--- a/src/directives/link.ts
+++ b/src/directives/link.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/directives/long-press.ts b/src/directives/long-press.ts
index 2b6e84569..e7f385d14 100644
--- a/src/directives/long-press.ts
+++ b/src/directives/long-press.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/directives/supress-events.ts b/src/directives/supress-events.ts
index 5c35bb8f2..5ee971c18 100644
--- a/src/directives/supress-events.ts
+++ b/src/directives/supress-events.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/directives/user-link.ts b/src/directives/user-link.ts
index 981e489b1..7359ee3f8 100644
--- a/src/directives/user-link.ts
+++ b/src/directives/user-link.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/pipes/bytes-to-size.ts b/src/pipes/bytes-to-size.ts
index 620e1782f..f2b37ddfc 100644
--- a/src/pipes/bytes-to-size.ts
+++ b/src/pipes/bytes-to-size.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/pipes/create-links.ts b/src/pipes/create-links.ts
index b7a5453e4..c0a2a66af 100644
--- a/src/pipes/create-links.ts
+++ b/src/pipes/create-links.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/pipes/date-day-or-time.ts b/src/pipes/date-day-or-time.ts
index ed90d1193..8a99c076a 100644
--- a/src/pipes/date-day-or-time.ts
+++ b/src/pipes/date-day-or-time.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/pipes/duration.ts b/src/pipes/duration.ts
index 4be29d433..8af08da6e 100644
--- a/src/pipes/duration.ts
+++ b/src/pipes/duration.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/pipes/format-date.ts b/src/pipes/format-date.ts
index e01f62645..6cff3f5bc 100644
--- a/src/pipes/format-date.ts
+++ b/src/pipes/format-date.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/pipes/no-tags.ts b/src/pipes/no-tags.ts
index cc415e720..c1da56431 100644
--- a/src/pipes/no-tags.ts
+++ b/src/pipes/no-tags.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/pipes/pipes.module.ts b/src/pipes/pipes.module.ts
index 7667b224b..a4bd5024f 100644
--- a/src/pipes/pipes.module.ts
+++ b/src/pipes/pipes.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/pipes/seconds-to-hms.ts b/src/pipes/seconds-to-hms.ts
index dd2913936..be95a30a7 100644
--- a/src/pipes/seconds-to-hms.ts
+++ b/src/pipes/seconds-to-hms.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/pipes/time-ago.ts b/src/pipes/time-ago.ts
index cbb67e3df..e2462c9ac 100644
--- a/src/pipes/time-ago.ts
+++ b/src/pipes/time-ago.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/pipes/to-locale-string.ts b/src/pipes/to-locale-string.ts
index be74e7f64..0503c9770 100644
--- a/src/pipes/to-locale-string.ts
+++ b/src/pipes/to-locale-string.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/app.ts b/src/providers/app.ts
index 5e9336eb7..615b68ecb 100644
--- a/src/providers/app.ts
+++ b/src/providers/app.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/config.ts b/src/providers/config.ts
index f5f42b573..38039bff6 100644
--- a/src/providers/config.ts
+++ b/src/providers/config.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/cron.ts b/src/providers/cron.ts
index 0970f12e0..dbf9ce3e1 100644
--- a/src/providers/cron.ts
+++ b/src/providers/cron.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/db.ts b/src/providers/db.ts
index 20c94218e..6805c82e1 100644
--- a/src/providers/db.ts
+++ b/src/providers/db.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/events.ts b/src/providers/events.ts
index 243d4a3d4..2371b7fc5 100644
--- a/src/providers/events.ts
+++ b/src/providers/events.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/file-helper.ts b/src/providers/file-helper.ts
index 91b91c8c8..1c082111e 100644
--- a/src/providers/file-helper.ts
+++ b/src/providers/file-helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/file-session.ts b/src/providers/file-session.ts
index bd71659e3..79798ae0f 100644
--- a/src/providers/file-session.ts
+++ b/src/providers/file-session.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/file.ts b/src/providers/file.ts
index 916a2fb7c..32dc56bc4 100644
--- a/src/providers/file.ts
+++ b/src/providers/file.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/filepool.ts b/src/providers/filepool.ts
index 8f45b4a0e..f2e8afdac 100644
--- a/src/providers/filepool.ts
+++ b/src/providers/filepool.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/groups.ts b/src/providers/groups.ts
index f4bf56593..d0c96e8d2 100644
--- a/src/providers/groups.ts
+++ b/src/providers/groups.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/init.ts b/src/providers/init.ts
index e0a8d331d..f44e6f79e 100644
--- a/src/providers/init.ts
+++ b/src/providers/init.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/lang.ts b/src/providers/lang.ts
index acf8ec8ca..58838037f 100644
--- a/src/providers/lang.ts
+++ b/src/providers/lang.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/local-notifications.ts b/src/providers/local-notifications.ts
index 712f3eac8..3967f8cfe 100644
--- a/src/providers/local-notifications.ts
+++ b/src/providers/local-notifications.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/logger.ts b/src/providers/logger.ts
index f3d989b32..1453f8cbf 100644
--- a/src/providers/logger.ts
+++ b/src/providers/logger.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/plugin-file-delegate.ts b/src/providers/plugin-file-delegate.ts
index 8708e7810..b6b9851b0 100644
--- a/src/providers/plugin-file-delegate.ts
+++ b/src/providers/plugin-file-delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/sites-factory.ts b/src/providers/sites-factory.ts
index 5bb68cd11..f97d334cb 100644
--- a/src/providers/sites-factory.ts
+++ b/src/providers/sites-factory.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/sites.ts b/src/providers/sites.ts
index 5eafef8d8..5616f3dd2 100644
--- a/src/providers/sites.ts
+++ b/src/providers/sites.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/sync.ts b/src/providers/sync.ts
index ec8f91653..739d1b59f 100644
--- a/src/providers/sync.ts
+++ b/src/providers/sync.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/update-manager.ts b/src/providers/update-manager.ts
index d8a27d5bf..24ddb9f79 100644
--- a/src/providers/update-manager.ts
+++ b/src/providers/update-manager.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/urlschemes.ts b/src/providers/urlschemes.ts
index 74e0da4ee..9b8fe5e76 100644
--- a/src/providers/urlschemes.ts
+++ b/src/providers/urlschemes.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/utils/dom.ts b/src/providers/utils/dom.ts
index 9de6e424d..7e96d421b 100644
--- a/src/providers/utils/dom.ts
+++ b/src/providers/utils/dom.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/utils/iframe.ts b/src/providers/utils/iframe.ts
index 5ccbab10b..f02aea2b6 100644
--- a/src/providers/utils/iframe.ts
+++ b/src/providers/utils/iframe.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/utils/mimetype.ts b/src/providers/utils/mimetype.ts
index 0e6e82d63..d45d9af87 100644
--- a/src/providers/utils/mimetype.ts
+++ b/src/providers/utils/mimetype.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/utils/text.ts b/src/providers/utils/text.ts
index a33025210..9a6b7f005 100644
--- a/src/providers/utils/text.ts
+++ b/src/providers/utils/text.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/utils/time.ts b/src/providers/utils/time.ts
index a35317c34..ca0d464fe 100644
--- a/src/providers/utils/time.ts
+++ b/src/providers/utils/time.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/utils/url.ts b/src/providers/utils/url.ts
index 7edd7174f..ac85237d7 100644
--- a/src/providers/utils/url.ts
+++ b/src/providers/utils/url.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/utils/utils.ts b/src/providers/utils/utils.ts
index 736cf84cd..8165bb6c2 100644
--- a/src/providers/utils/utils.ts
+++ b/src/providers/utils/utils.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/providers/ws.ts b/src/providers/ws.ts
index 4bd4ac412..e98455c4a 100644
--- a/src/providers/ws.ts
+++ b/src/providers/ws.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

From 3eb47b3f89ac5836e94c61f436e9bc58d809c1fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 2 Oct 2019 09:17:15 +0200
Subject: [PATCH 060/257] MOBILE-2497 notifications: Fix TS types problem

---
 src/addon/notifications/providers/notifications.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/addon/notifications/providers/notifications.ts b/src/addon/notifications/providers/notifications.ts
index 0b7d04fc7..3a2234ada 100644
--- a/src/addon/notifications/providers/notifications.ts
+++ b/src/addon/notifications/providers/notifications.ts
@@ -449,6 +449,7 @@ export type AddonNotificationsNotificationPreferences = {
     disableall: number | boolean; // Whether all the preferences are disabled.
     processors: AddonNotificationsNotificationPreferencesProcessor[]; // Config form values.
     components: AddonNotificationsNotificationPreferencesComponent[]; // Available components.
+    enableall?: boolean; // Calculated in the app. Whether all the preferences are enabled.
 };
 
 /**

From ef40dfe74c4aa126d7766d6dd54428bdda2ac165 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Thu, 26 Sep 2019 13:13:32 +0200
Subject: [PATCH 061/257] MOBILE-2159 core: Geolocation support

---
 config.xml                                 |   6 +
 package-lock.json                          | 178 +++++++++++++++------
 package.json                               |   5 +
 src/core/emulator/emulator.module.ts       |  10 ++
 src/core/emulator/providers/geolocation.ts |  55 +++++++
 5 files changed, 208 insertions(+), 46 deletions(-)
 create mode 100644 src/core/emulator/providers/geolocation.ts

diff --git a/config.xml b/config.xml
index 819ed63e5..486b7deb8 100644
--- a/config.xml
+++ b/config.xml
@@ -114,6 +114,9 @@
         <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
         <icon height="1024" src="resources/ios/icon/icon-1024.png" width="1024" />
         <splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
+        <edit-config file="*-Info.plist" mode="merge" target="NSLocationWhenInUseUsageDescription">
+            <string>We need your location so you can attach it as part of your submissions.</string>
+        </edit-config>
     </platform>
     <plugin name="com-darryncampbell-cordova-plugin-intent" spec="^1.1.8" />
     <plugin name="cordova-android-support-gradle-release" spec="^3.0.1">
@@ -129,6 +132,9 @@
     <plugin name="cordova-plugin-file" spec="^6.0.2" />
     <plugin name="cordova-plugin-file-opener2" spec="2.0.19" />
     <plugin name="cordova-plugin-file-transfer" spec="^1.7.1" />
+    <plugin name="cordova-plugin-geolocation" spec="^4.0.2">
+        <variable name="GEOLOCATION_USAGE_DESCRIPTION" value="We need your location so you can attach it as part of your submissions." />
+    </plugin>
     <plugin name="cordova-plugin-globalization" spec="^1.11.0" />
     <plugin name="cordova-plugin-inappbrowser" spec="^3.1.0" />
     <plugin name="cordova-plugin-ionic-keyboard" spec="^2.1.3" />
diff --git a/package-lock.json b/package-lock.json
index 4088d7a77..e67d1a2b2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -145,6 +145,11 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/file-transfer/-/file-transfer-4.17.0.tgz",
       "integrity": "sha512-GtCnjCMH02r5BLONYkPjcYDAXSHmrO9t8jPY5LoI29bx2B6vwX+NFBARHPNSFPEwRi1zZKs/J0uJ1hkhDzOvxg=="
     },
+    "@ionic-native/geolocation": {
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-4.17.0.tgz",
+      "integrity": "sha512-VgMOAP/Kjnpx4cwufFbx/DeoSoERfHt7X+I5aiOVo3J9w2rICUK3jyEccWVP0FPAfcIMrJoofpFK88TeY7O+tg=="
+    },
     "@ionic-native/globalization": {
       "version": "4.17.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/globalization/-/globalization-4.17.0.tgz",
@@ -498,7 +503,8 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -519,12 +525,14 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -539,17 +547,20 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -666,7 +677,8 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "ini": {
               "version": "1.3.5",
@@ -678,6 +690,7 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -692,6 +705,7 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -699,12 +713,14 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -723,6 +739,7 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -803,7 +820,8 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -815,6 +833,7 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -900,7 +919,8 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -936,6 +956,7 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -955,6 +976,7 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -998,12 +1020,14 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             }
           }
         },
@@ -7453,6 +7477,11 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-file-transfer/-/cordova-plugin-file-transfer-1.7.1.tgz",
       "integrity": "sha1-p12L4uvDu5sjxbG70ZkhTsJnWGs="
     },
+    "cordova-plugin-geolocation": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-geolocation/-/cordova-plugin-geolocation-4.0.2.tgz",
+      "integrity": "sha512-QGThnPKzPxESHkruZlpE0+5aFBVOet8al0vIJ7laSUOQHIC1dd/JY6peVIbtLboKi5Dap1wCKRubOqPqH8xcQA=="
+    },
     "cordova-plugin-globalization": {
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-globalization/-/cordova-plugin-globalization-1.11.0.tgz",
@@ -7469,7 +7498,7 @@
       "integrity": "sha512-6ucQ6FdlLdBm8kJfFnzozmBTjru/0xekHP/dAhjoCZggkGRlgs8TsUJFkxa/bV+qi7Dlo50JjmpE4UMWAO+aOQ=="
     },
     "cordova-plugin-local-notification": {
-      "version": "git+https://github.com/moodlemobile/cordova-plugin-local-notification.git#5b2f3073a1c1fb39cad3566be792445c343db2c6",
+      "version": "git+https://github.com/moodlemobile/cordova-plugin-local-notification.git#c7430c4f4f8b8c82d051aea49d87da0b4f6a8b1e",
       "from": "git+https://github.com/moodlemobile/cordova-plugin-local-notification.git#moodle"
     },
     "cordova-plugin-media-capture": {
@@ -9152,7 +9181,8 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -9170,11 +9200,13 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -9187,15 +9219,18 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -9298,7 +9333,8 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -9308,6 +9344,7 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -9320,17 +9357,20 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -9347,6 +9387,7 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -9425,7 +9466,8 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -9435,6 +9477,7 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -9510,7 +9553,8 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -9540,6 +9584,7 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -9557,6 +9602,7 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -9595,11 +9641,13 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         }
       }
     },
@@ -10025,7 +10073,8 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -10046,12 +10095,14 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -10066,17 +10117,20 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -10193,7 +10247,8 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "ini": {
               "version": "1.3.5",
@@ -10205,6 +10260,7 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -10219,6 +10275,7 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -10226,12 +10283,14 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -10250,6 +10309,7 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -10330,7 +10390,8 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -10342,6 +10403,7 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -10427,7 +10489,8 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -10463,6 +10526,7 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -10482,6 +10546,7 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -10525,12 +10590,14 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             }
           }
         },
@@ -13567,7 +13634,7 @@
       "integrity": "sha512-1wvc3iQOQpEBaQbXgLxA2JUiLSQ2azdF/bF29ghXDiQJWSpQ1BF8gSuqttM8WZoj081Ps8OKL0gYxdDBkFNPqA=="
     },
     "phonegap-plugin-push": {
-      "version": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#cf8101e86adb774ae1d7ad6b65fb9d8802673f4b",
+      "version": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#cb332d5ec8a1a0d43916fc6d35455fe6bea7a7f9",
       "from": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v3",
       "requires": {
         "babel-plugin-add-header-comment": "^1.0.3",
@@ -16303,7 +16370,8 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -16324,12 +16392,14 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -16344,17 +16414,20 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -16471,7 +16544,8 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "ini": {
               "version": "1.3.5",
@@ -16483,6 +16557,7 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -16497,6 +16572,7 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -16504,12 +16580,14 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -16528,6 +16606,7 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -16608,7 +16687,8 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -16620,6 +16700,7 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -16705,7 +16786,8 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -16741,6 +16823,7 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -16760,6 +16843,7 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -16803,12 +16887,14 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             }
           }
         },
diff --git a/package.json b/package.json
index 8f366c35e..9e7dedecd 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,7 @@
     "@ionic-native/file": "^4.17.0",
     "@ionic-native/file-opener": "^4.17.0",
     "@ionic-native/file-transfer": "^4.17.0",
+    "@ionic-native/geolocation": "4.17.0",
     "@ionic-native/globalization": "^4.17.0",
     "@ionic-native/in-app-browser": "^4.17.0",
     "@ionic-native/keyboard": "^4.17.0",
@@ -93,6 +94,7 @@
     "cordova-plugin-file": "^6.0.2",
     "cordova-plugin-file-opener2": "2.0.19",
     "cordova-plugin-file-transfer": "^1.7.1",
+    "cordova-plugin-geolocation": "^4.0.2",
     "cordova-plugin-globalization": "^1.11.0",
     "cordova-plugin-inappbrowser": "^3.1.0",
     "cordova-plugin-ionic-keyboard": "^2.1.3",
@@ -177,6 +179,9 @@
       "phonegap-plugin-push": {
         "ANDROID_SUPPORT_V13_VERSION": "27.+",
         "FCM_VERSION": "17.0.+"
+      },
+      "cordova-plugin-geolocation": {
+        "GEOLOCATION_USAGE_DESCRIPTION": "To locate you"
       }
     }
   },
diff --git a/src/core/emulator/emulator.module.ts b/src/core/emulator/emulator.module.ts
index b6307b4e1..a24a2b08e 100644
--- a/src/core/emulator/emulator.module.ts
+++ b/src/core/emulator/emulator.module.ts
@@ -23,6 +23,7 @@ import { Device } from '@ionic-native/device';
 import { File } from '@ionic-native/file';
 import { FileOpener } from '@ionic-native/file-opener';
 import { FileTransfer } from '@ionic-native/file-transfer';
+import { Geolocation } from '@ionic-native/geolocation';
 import { Globalization } from '@ionic-native/globalization';
 import { InAppBrowser } from '@ionic-native/in-app-browser';
 import { Keyboard } from '@ionic-native/keyboard';
@@ -43,6 +44,7 @@ import { ClipboardMock } from './providers/clipboard';
 import { FileMock } from './providers/file';
 import { FileOpenerMock } from './providers/file-opener';
 import { FileTransferMock } from './providers/file-transfer';
+import { GeolocationMock } from './providers/geolocation';
 import { GlobalizationMock } from './providers/globalization';
 import { InAppBrowserMock } from './providers/inappbrowser';
 import { LocalNotificationsMock } from './providers/local-notifications';
@@ -70,6 +72,7 @@ export const IONIC_NATIVE_PROVIDERS = [
     File,
     FileOpener,
     FileTransfer,
+    Geolocation,
     Globalization,
     InAppBrowser,
     Keyboard,
@@ -148,6 +151,13 @@ export const IONIC_NATIVE_PROVIDERS = [
                 return appProvider.isMobile() ? new FileTransfer() : new FileTransferMock(appProvider, fileProvider);
             }
         },
+        {
+            provide: Geolocation,
+            deps: [CoreAppProvider],
+            useFactory: (appProvider: CoreAppProvider): Geolocation => {
+                return appProvider.isMobile() ? new Geolocation() : new GeolocationMock();
+            }
+        },
         {
             provide: Globalization,
             deps: [CoreAppProvider],
diff --git a/src/core/emulator/providers/geolocation.ts b/src/core/emulator/providers/geolocation.ts
new file mode 100644
index 000000000..cf9e9a632
--- /dev/null
+++ b/src/core/emulator/providers/geolocation.ts
@@ -0,0 +1,55 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { Geolocation, GeolocationOptions, Geoposition } from '@ionic-native/geolocation';
+import { Observable, Subscriber } from 'rxjs';
+import { TeardownLogic } from 'rxjs/Subscription';
+
+/**
+ * Emulates the Cordova Geolocation plugin in desktop apps and in browser.
+ */
+@Injectable()
+export class GeolocationMock extends Geolocation {
+
+    /**
+     * Get the device's current position.
+     *
+     * @param options The geolocation options.
+     * @returns Returns a Promise that resolves with the position of the device, or rejects with an error.
+     */
+    getCurrentPosition(options?: GeolocationOptions): Promise<Geoposition> {
+        return new Promise((resolve, reject): any => {
+            return navigator.geolocation.getCurrentPosition(resolve, reject, options);
+        });
+    }
+
+    /**
+     * Watch the current device's position.  Clear the watch by unsubscribing from
+     * Observable changes.
+     *
+     * @param options The geolocation options.
+     * @returns Returns an Observable that notifies with the position of the device, or errors.
+     */
+    watchPosition(options?: GeolocationOptions): Observable<Geoposition> {
+        return new Observable<Geoposition>((subscriber: Subscriber<Geoposition>): TeardownLogic => {
+            const watchId = navigator.geolocation.watchPosition(
+                subscriber.next.bind(subscriber), subscriber.error.bind(subscriber), options);
+
+            return (): void => {
+                navigator.geolocation.clearWatch(watchId);
+            };
+        });
+    }
+}

From e83ff1b711ecad59dfb244ed010366a86bd184e5 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Thu, 26 Sep 2019 13:15:08 +0200
Subject: [PATCH 062/257] MOBILE-2159 data: Geolocation button in latlong
 fields

---
 scripts/langindex.json                        |  2 ++
 .../addon-mod-data-field-latlong.html         |  6 ++++
 .../data/fields/latlong/component/latlong.ts  | 30 ++++++++++++++++++-
 src/addon/mod/data/lang/en.json               |  2 ++
 src/assets/lang/en.json                       |  2 ++
 5 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index dec428131..fc5464421 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -494,10 +494,12 @@
   "addon.mod_data.expired": "data",
   "addon.mod_data.fields": "data",
   "addon.mod_data.foundrecords": "data",
+  "addon.mod_data.gettinglocation": "local_moodlemobileapp",
   "addon.mod_data.latlongboth": "data",
   "addon.mod_data.menuchoose": "data",
   "addon.mod_data.modulenameplural": "data",
   "addon.mod_data.more": "data",
+  "addon.mod_data.mylocation": "local_moodlemobileapp",
   "addon.mod_data.nomatch": "data",
   "addon.mod_data.norecords": "data",
   "addon.mod_data.notapproved": "data",
diff --git a/src/addon/mod/data/fields/latlong/component/addon-mod-data-field-latlong.html b/src/addon/mod/data/fields/latlong/component/addon-mod-data-field-latlong.html
index c8acdf842..5b22625b9 100644
--- a/src/addon/mod/data/fields/latlong/component/addon-mod-data-field-latlong.html
+++ b/src/addon/mod/data/fields/latlong/component/addon-mod-data-field-latlong.html
@@ -10,6 +10,12 @@
         <ion-input type="text" [formControlName]="'f_'+field.id+'_1'" maxlength="10"></ion-input>
         <span class="placeholder-icon" item-right>°E</span>
     </div>
+    <div *ngIf="mode == 'edit'" class="addon-data-lantlong">
+        <button ion-button icon-left (click)="getLocation($event)">
+            <ion-icon name="locate"></ion-icon>
+            {{ 'addon.mod_data.mylocation' | translate }}
+        </button>
+    </div>
     <core-input-errors *ngIf="error && mode == 'edit'" [control]="form.controls['f_'+field.id]" [errorText]="error"></core-input-errors>
 </span>
 
diff --git a/src/addon/mod/data/fields/latlong/component/latlong.ts b/src/addon/mod/data/fields/latlong/component/latlong.ts
index f005e95ee..767487e9d 100644
--- a/src/addon/mod/data/fields/latlong/component/latlong.ts
+++ b/src/addon/mod/data/fields/latlong/component/latlong.ts
@@ -14,7 +14,9 @@
 import { Component } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
 import { Platform } from 'ionic-angular';
+import { Geolocation, GeolocationOptions } from '@ionic-native/geolocation';
 import { AddonModDataFieldPluginComponent } from '../../../classes/field-plugin-component';
+import { CoreDomUtilsProvider } from '@providers/utils/dom';
 
 /**
  * Component to render data latlong field.
@@ -28,7 +30,8 @@ export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginCo
     north: number;
     east: number;
 
-    constructor(protected fb: FormBuilder, private platform: Platform) {
+    constructor(protected fb: FormBuilder, private platform: Platform, private geolocation: Geolocation,
+            private domUtils: CoreDomUtilsProvider) {
         super(fb);
     }
 
@@ -94,4 +97,29 @@ export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginCo
         this.north = (value && parseFloat(value.content)) || null;
         this.east = (value && parseFloat(value.content1)) || null;
     }
+
+    /**
+     * Get user location.
+     *
+     * @param {Event} $event The event.
+     */
+    getLocation(event: Event): void {
+        event.preventDefault();
+
+        const modal = this.domUtils.showModalLoading('addon.mod_data.gettinglocation', true);
+
+        const options: GeolocationOptions = {
+            enableHighAccuracy: true,
+            timeout: 30000
+        };
+
+        this.geolocation.getCurrentPosition(options).then((result) => {
+            this.form.controls['f_' + this.field.id + '_0'].setValue(result.coords.latitude);
+            this.form.controls['f_' + this.field.id + '_1'].setValue(result.coords.longitude);
+        }).catch((error) => {
+            this.domUtils.showErrorModalDefault(error,  'Error getting location');
+        }).finally(() => {
+            modal.dismiss();
+        });
+    }
 }
diff --git a/src/addon/mod/data/lang/en.json b/src/addon/mod/data/lang/en.json
index 219ec090c..54de61215 100644
--- a/src/addon/mod/data/lang/en.json
+++ b/src/addon/mod/data/lang/en.json
@@ -20,10 +20,12 @@
     "expired": "Sorry, this activity closed on {{$a}} and is no longer available",
     "fields": "Fields",
     "foundrecords": "Found records: {{$a.num}}/{{$a.max}} (<a href=\"{{$a.reseturl}}\">Reset filters</a>)",
+    "gettinglocation": "Getting location",
     "latlongboth": "Both latitude and longitude are required.",
     "menuchoose": "Choose...",
     "modulenameplural": "Databases",
     "more": "More",
+    "mylocation": "My location",
     "nomatch": "No matching entries found!",
     "norecords": "No entries in database",
     "notapproved": "Entry is not approved yet.",
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 748bb45f2..a82e7ef5a 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -493,10 +493,12 @@
     "addon.mod_data.expired": "Sorry, this activity closed on {{$a}} and is no longer available",
     "addon.mod_data.fields": "Fields",
     "addon.mod_data.foundrecords": "Found records: {{$a.num}}/{{$a.max}} (<a href=\"{{$a.reseturl}}\">Reset filters</a>)",
+    "addon.mod_data.gettinglocation": "Getting location",
     "addon.mod_data.latlongboth": "Both latitude and longitude are required.",
     "addon.mod_data.menuchoose": "Choose...",
     "addon.mod_data.modulenameplural": "Databases",
     "addon.mod_data.more": "More",
+    "addon.mod_data.mylocation": "My location",
     "addon.mod_data.nomatch": "No matching entries found!",
     "addon.mod_data.norecords": "No entries in database",
     "addon.mod_data.notapproved": "Entry is not approved yet.",

From 456426ac6d6629457ff1e474015717fd96f0c314 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 17 Sep 2019 13:28:15 +0200
Subject: [PATCH 063/257] MOBILE-2491 filter: Create filter provider

---
 src/app/app.module.ts               |   2 +
 src/core/filter/filter.module.ts    |  32 +++++
 src/core/filter/providers/filter.ts | 184 ++++++++++++++++++++++++++++
 3 files changed, 218 insertions(+)
 create mode 100644 src/core/filter/filter.module.ts
 create mode 100644 src/core/filter/providers/filter.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 4d55ba341..740759df7 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -82,6 +82,7 @@ import { CoreCommentsModule } from '@core/comments/comments.module';
 import { CoreBlockModule } from '@core/block/block.module';
 import { CoreRatingModule } from '@core/rating/rating.module';
 import { CoreTagModule } from '@core/tag/tag.module';
+import { CoreFilterModule } from '@core/filter/filter.module';
 
 // Addon modules.
 import { AddonBadgesModule } from '@addon/badges/badges.module';
@@ -227,6 +228,7 @@ export const WP_PROVIDER: any = null;
         CoreRatingModule,
         CorePushNotificationsModule,
         CoreTagModule,
+        CoreFilterModule,
         AddonBadgesModule,
         AddonBlogModule,
         AddonCalendarModule,
diff --git a/src/core/filter/filter.module.ts b/src/core/filter/filter.module.ts
new file mode 100644
index 000000000..f0762912f
--- /dev/null
+++ b/src/core/filter/filter.module.ts
@@ -0,0 +1,32 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { CoreFilterProvider } from './providers/filter';
+
+// List of providers (without handlers).
+export const CORE_FILTER_PROVIDERS: any[] = [
+    CoreFilterProvider
+];
+
+@NgModule({
+    declarations: [
+    ],
+    imports: [
+    ],
+    providers: [
+        CoreFilterProvider
+    ]
+})
+export class CoreFilterModule { }
diff --git a/src/core/filter/providers/filter.ts b/src/core/filter/providers/filter.ts
new file mode 100644
index 000000000..bdb88578e
--- /dev/null
+++ b/src/core/filter/providers/filter.ts
@@ -0,0 +1,184 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreLoggerProvider } from '@providers/logger';
+import { CoreSitesProvider } from '@providers/sites';
+import { CoreSite } from '@classes/site';
+import { CoreWSExternalWarning } from '@providers/ws';
+
+/**
+ * Service to provide filter functionalities.
+ */
+@Injectable()
+export class CoreFilterProvider {
+
+    protected ROOT_CACHE_KEY = 'mmFilter:';
+
+    protected logger;
+
+    constructor(logger: CoreLoggerProvider, private sitesProvider: CoreSitesProvider) {
+        this.logger = logger.getInstance('CoreFilterProvider');
+    }
+
+    /**
+     * Returns whether or not WS get available in context is avalaible.
+     *
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if ws is avalaible, false otherwise.
+     * @since 3.4
+     */
+    canGetAvailableInContext(siteId?: string): Promise<boolean> {
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            return site.wsAvailable('core_filters_get_available_in_context');
+        });
+    }
+
+    /**
+     * Get cache key for available in contexts WS calls.
+     *
+     * @param contexts The contexts to check.
+     * @return Cache key.
+     */
+    protected getAvailableInContextsCacheKey(contexts: {contextlevel: string, instanceid: number}[]): string {
+        return this.getAvailableInContextsPrefixCacheKey() + JSON.stringify(contexts);
+    }
+
+    /**
+     * Get prefixed cache key for available in contexts WS calls.
+     *
+     * @return Cache key.
+     */
+    protected getAvailableInContextsPrefixCacheKey(): string {
+        return this.ROOT_CACHE_KEY + 'availableInContexts:';
+    }
+
+    /**
+     * Get the filters available in several contexts.
+     *
+     * @param contexts The contexts to check.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the filters classified by context.
+     */
+    getAvailableInContexts(contexts: {contextlevel: string, instanceid: number}[], siteId?: string)
+            : Promise<{[contextlevel: string]: {[instanceid: number]: CoreFilterFilter[]}}> {
+
+        return this.sitesProvider.getSite(siteId).then((site) => {
+
+            const data = {
+                    contexts: contexts,
+                },
+                preSets = {
+                    cacheKey: this.getAvailableInContextsCacheKey(contexts),
+                    updateFrequency: CoreSite.FREQUENCY_RARELY
+                };
+
+            return site.read('core_filters_get_available_in_context', data, preSets)
+                    .then((result: CoreFilterGetAvailableInContextResult) => {
+
+                const classified: {[contextlevel: string]: {[instanceid: number]: CoreFilterFilter[]}} = {};
+
+                // Initialize all contexts.
+                contexts.forEach((context) => {
+                    classified[context.contextlevel] = {};
+                    classified[context.contextlevel][context.instanceid] = [];
+                });
+
+                if (contexts.length == 1) {
+                    // Only 1 context, no need to iterate over the filters.
+                    classified[contexts[0].contextlevel][contexts[0].instanceid] = result.filters;
+
+                    return classified;
+                }
+
+                result.filters.forEach((filter) => {
+                    classified[filter.contextlevel][filter.instanceid].push(filter);
+                });
+
+                return classified;
+            });
+        });
+    }
+
+    /**
+     * Get the filters available in a certain context.
+     *
+     * @param contextLevel The context level to check.
+     * @param instanceId The instance ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the filters.
+     */
+    getAvailableInContext(contextLevel: string, instanceId: number, siteId?: string): Promise<CoreFilterFilter[]> {
+        return this.getAvailableInContexts([{contextlevel: contextLevel, instanceid: instanceId}], siteId).then((result) => {
+            return result[contextLevel][instanceId];
+        });
+    }
+
+    /**
+     * Invalidates all available in context WS calls.
+     *
+     * @param siteId Site ID (empty for current site).
+     * @return Promise resolved when the data is invalidated.
+     */
+    invalidateAllAvailableInContext(siteId?: string): Promise<any> {
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            return site.invalidateWsCacheForKeyStartingWith(this.getAvailableInContextsPrefixCacheKey());
+        });
+    }
+
+    /**
+     * Invalidates available in context WS call.
+     *
+     * @param contexts The contexts to check.
+     * @param siteId Site ID (empty for current site).
+     * @return Promise resolved when the data is invalidated.
+     */
+    invalidateAvailableInContexts(contexts: {contextlevel: string, instanceid: number}[], siteId?: string): Promise<any> {
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            return site.invalidateWsCacheForKey(this.getAvailableInContextsCacheKey(contexts));
+        });
+    }
+
+    /**
+     * Invalidates available in context WS call.
+     *
+     * @param contextLevel The context level to check.
+     * @param instanceId The instance ID.
+     * @param siteId Site ID (empty for current site).
+     * @return Promise resolved when the data is invalidated.
+     */
+    invalidateAvailableInContext(contextLevel: string, instanceId: number, siteId?: string): Promise<any> {
+        return this.invalidateAvailableInContexts([{contextlevel: contextLevel, instanceid: instanceId}], siteId);
+    }
+}
+
+/**
+ * Filter object returned by core_filters_get_available_in_context.
+ */
+export type CoreFilterFilter = {
+    contextlevel: string; // The context level where the filters are: (coursecat, course, module).
+    instanceid: number; // The instance id of item associated with the context.
+    contextid: number; // The context id.
+    filter: string; // Filter plugin name.
+    localstate: number; // Filter state: 1 for on, -1 for off, 0 if inherit.
+    inheritedstate: number; // 1 or 0 to use when localstate is set to inherit.
+};
+
+/**
+ * Result of core_filters_get_available_in_context.
+ */
+export type CoreFilterGetAvailableInContextResult = {
+    filters: CoreFilterFilter[]; // Available filters.
+    warning: CoreWSExternalWarning[]; // List of warnings.
+};

From 26a3b4a9de7266e9111fbb20f73a280a28399a97 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 20 Sep 2019 09:27:50 +0200
Subject: [PATCH 064/257] MOBILE-2491 filter: Create filter delegate

---
 src/classes/delegate.ts                     |  22 +++
 src/core/filter/filter.module.ts            |   9 +-
 src/core/filter/providers/default-filter.ts |  64 ++++++++
 src/core/filter/providers/delegate.ts       | 155 ++++++++++++++++++++
 4 files changed, 248 insertions(+), 2 deletions(-)
 create mode 100644 src/core/filter/providers/default-filter.ts
 create mode 100644 src/core/filter/providers/delegate.ts

diff --git a/src/classes/delegate.ts b/src/classes/delegate.ts
index ca6cea0e5..db31ff907 100644
--- a/src/classes/delegate.ts
+++ b/src/classes/delegate.ts
@@ -79,6 +79,21 @@ export class CoreDelegate {
      */
     protected updatePromises: {[siteId: string]: {[name: string]: Promise<any>}} = {};
 
+    /**
+     * Whether handlers have been initialized.
+     */
+    protected handlersInitialized = false;
+
+    /**
+     * Promise to wait for handlers to be initialized.
+     */
+    protected handlersInitPromise: Promise<any>;
+
+    /**
+     * Function to resolve the handlers init promise.
+     */
+    protected handlersInitResolve: (value?: any) => void;
+
     /**
      * Constructor of the Delegate.
      *
@@ -92,6 +107,10 @@ export class CoreDelegate {
             protected eventsProvider?: CoreEventsProvider) {
         this.logger = this.loggerProvider.getInstance(delegateName);
 
+        this.handlersInitPromise = new Promise((resolve): void => {
+            this.handlersInitResolve = resolve;
+        });
+
         if (eventsProvider) {
             // Update handlers on this cases.
             eventsProvider.on(CoreEventsProvider.LOGIN, this.updateHandlers.bind(this));
@@ -315,6 +334,9 @@ export class CoreDelegate {
 
             // Verify that this call is the last one that was started.
             if (this.isLastUpdateCall(now)) {
+                this.handlersInitialized = true;
+                this.handlersInitResolve();
+
                 this.updateData();
             }
         });
diff --git a/src/core/filter/filter.module.ts b/src/core/filter/filter.module.ts
index f0762912f..20b0073c0 100644
--- a/src/core/filter/filter.module.ts
+++ b/src/core/filter/filter.module.ts
@@ -14,10 +14,13 @@
 
 import { NgModule } from '@angular/core';
 import { CoreFilterProvider } from './providers/filter';
+import { CoreFilterDelegate } from './providers/delegate';
+import { CoreFilterDefaultHandler } from './providers/default-filter';
 
 // List of providers (without handlers).
 export const CORE_FILTER_PROVIDERS: any[] = [
-    CoreFilterProvider
+    CoreFilterProvider,
+    CoreFilterDelegate
 ];
 
 @NgModule({
@@ -26,7 +29,9 @@ export const CORE_FILTER_PROVIDERS: any[] = [
     imports: [
     ],
     providers: [
-        CoreFilterProvider
+        CoreFilterProvider,
+        CoreFilterDelegate,
+        CoreFilterDefaultHandler
     ]
 })
 export class CoreFilterModule { }
diff --git a/src/core/filter/providers/default-filter.ts b/src/core/filter/providers/default-filter.ts
new file mode 100644
index 000000000..d339a4c8d
--- /dev/null
+++ b/src/core/filter/providers/default-filter.ts
@@ -0,0 +1,64 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreFilterHandler } from './delegate';
+import { CoreFilterFilter } from './filter';
+
+/**
+ * Default handler used when the module doesn't have a specific implementation.
+ */
+@Injectable()
+export class CoreFilterDefaultHandler implements CoreFilterHandler {
+    name = 'CoreFilterDefaultHandler';
+    filterName = 'default';
+
+    constructor() {
+        // Nothing to do.
+    }
+
+    /**
+     * Filter some text.
+     *
+     * @param text The text to filter.
+     * @param filter The filter.
+     * @param options Options passed to the filters.
+     * @return Filtered text (or promise resolved with the filtered text).
+     */
+    filter(text: string, filter: CoreFilterFilter, options: any): string | Promise<string> {
+        return text;
+    }
+
+    /**
+     * Whether or not the handler is enabled on a site level.
+     *
+     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     */
+    isEnabled(): boolean | Promise<boolean> {
+        return true;
+    }
+
+    /**
+     * Setup the filter to be used.
+     *
+     * Please notice this method iwill be called for each piece of text being filtered, so it is responsible
+     * for controlling its own execution cardinality.
+     *
+     * @param filter The filter.
+     * @return Promise resolved when done, or nothing if it's synchronous.
+     */
+    setup(filter: CoreFilterFilter): void | Promise<any> {
+        // Nothing to do.
+    }
+}
diff --git a/src/core/filter/providers/delegate.ts b/src/core/filter/providers/delegate.ts
new file mode 100644
index 000000000..4d5913c6a
--- /dev/null
+++ b/src/core/filter/providers/delegate.ts
@@ -0,0 +1,155 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreEventsProvider } from '@providers/events';
+import { CoreLoggerProvider } from '@providers/logger';
+import { CoreSitesProvider } from '@providers/sites';
+import { CoreFilterFilter } from './filter';
+import { CoreFilterDefaultHandler } from './default-filter';
+import { CoreDelegate, CoreDelegateHandler } from '@classes/delegate';
+
+/**
+ * Interface that all filter handlers must implement.
+ */
+export interface CoreFilterHandler extends CoreDelegateHandler {
+    /**
+     * Name of the filter. It should match the "filter" field returned in core_filters_get_available_in_context.
+     */
+    filterName: string;
+
+    /**
+     * Filter some text.
+     *
+     * @param text The text to filter.
+     * @param filter The filter.
+     * @param options Options passed to the filters.
+     * @return Filtered text (or promise resolved with the filtered text).
+     */
+    filter(text: string, filter: CoreFilterFilter, options: any): string | Promise<string>;
+
+    /**
+     * Setup the filter to be used.
+     *
+     * Please notice this method iwill be called for each piece of text being filtered, so it is responsible
+     * for controlling its own execution cardinality.
+     *
+     * @param filter The filter.
+     * @return Promise resolved when done, or nothing if it's synchronous.
+     */
+    setup(filter: CoreFilterFilter): void | Promise<any>;
+}
+
+/**
+ * Delegate to register filters.
+ */
+@Injectable()
+export class CoreFilterDelegate extends CoreDelegate {
+    protected featurePrefix = 'CoreFilterDelegate_';
+    protected handlerNameProperty = 'filterName';
+
+    constructor(loggerProvider: CoreLoggerProvider, protected sitesProvider: CoreSitesProvider, eventsProvider: CoreEventsProvider,
+            protected defaultHandler: CoreFilterDefaultHandler) {
+        super('CoreFilterDelegate', loggerProvider, sitesProvider, eventsProvider);
+    }
+
+    /**
+     * Apply a list of filters to some content.
+     *
+     * @param text The text to filter.
+     * @param filters Filters to apply.
+     * @param options Options passed to the filters.
+     * @param skipFilters Names of filters that shouldn't be applied.
+     * @return Promise resolved with the filtered text.
+     */
+    filterText(text: string, filters: CoreFilterFilter[], options?: any, skipFilters?: string[]): Promise<string> {
+        if (!text) {
+            return Promise.resolve(text);
+        }
+
+        // Wait for filters to be initialized.
+        return this.handlersInitPromise.then(() => {
+
+            let promise: Promise<string> = Promise.resolve(text);
+
+            filters = filters || [];
+            options = options || {};
+
+            filters.forEach((filter) => {
+                if (skipFilters && skipFilters.indexOf(filter.filter) != -1) {
+                    // Skip this filter.
+                    return;
+                }
+
+                if (filter.localstate == -1 || (filter.localstate == 0 && filter.inheritedstate == -1)) {
+                    // Filter is disabled, ignore it.
+                    return;
+                }
+
+                promise = promise.then((text) => {
+                    return this.executeFunctionOnEnabled(filter.filter, 'filter', [text, filter, options]);
+                });
+            });
+
+            return promise.then((text) => {
+                // Remove <nolink> tags for XHTML compatibility.
+                text = text.replace(/<\/?nolink>/gi, '');
+
+                return text;
+            });
+        });
+    }
+
+    /**
+     * Get filters that have an enabled handler.
+     *
+     * @param contextLevel Context level of the filters.
+     * @param instanceId Instance ID.
+     * @return Filters.
+     */
+    getEnabledFilters(contextLevel: string, instanceId: number): CoreFilterFilter[] {
+        const filters: CoreFilterFilter[] = [];
+
+        for (const name in this.enabledHandlers) {
+            const handler = <CoreFilterHandler> this.enabledHandlers[name];
+
+            filters.push({
+                contextid: -1,
+                contextlevel: contextLevel,
+                filter: handler.filterName,
+                inheritedstate: 1,
+                instanceid: instanceId,
+                localstate: 1
+            });
+        }
+
+        return filters;
+    }
+
+    /**
+     * Setup filters to be applied to some content.
+     *
+     * @param filters Filters to apply.
+     * @return Promise resolved when done.
+     */
+    setupFilters(filters: CoreFilterFilter[]): Promise<any> {
+        const promises: Promise<any>[] = [];
+
+        filters.forEach((filter) => {
+            promises.push(this.executeFunctionOnEnabled(filter.filter, 'setup', [filter]));
+        });
+
+        return Promise.all(promises);
+    }
+}

From 7e6a46b02867560514c566ef568b42ecdcf6d8c1 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Thu, 3 Oct 2019 15:46:42 +0200
Subject: [PATCH 065/257] MOBILE-3093 login: Change password page

---
 scripts/langindex.json                        |  7 ++
 src/app/app.component.ts                      |  2 +-
 src/assets/lang/en.json                       |  7 ++
 src/core/login/lang/en.json                   |  7 ++
 .../change-password/change-password.html      | 27 ++++++++
 .../change-password/change-password.module.ts | 33 +++++++++
 .../pages/change-password/change-password.ts  | 69 +++++++++++++++++++
 src/core/login/providers/helper.ts            | 44 +++++++++++-
 src/core/mainmenu/pages/more/more.ts          |  8 +--
 9 files changed, 196 insertions(+), 8 deletions(-)
 create mode 100644 src/core/login/pages/change-password/change-password.html
 create mode 100644 src/core/login/pages/change-password/change-password.module.ts
 create mode 100644 src/core/login/pages/change-password/change-password.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index fc5464421..6e12a847e 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1564,6 +1564,12 @@
   "core.login.auth_email": "auth_email/pluginname",
   "core.login.authenticating": "local_moodlemobileapp",
   "core.login.cancel": "moodle",
+  "core.login.changepassword": "moodle",
+  "core.login.changepasswordbutton": "local_moodlemobileapp",
+  "core.login.changepasswordhelp": "local_moodlemobileapp",
+  "core.login.changepassowrdinstructions": "local_moodlemobileapp",
+  "core.login.changepasswordlogoutinstructions": "local_moodlemobileapp",
+  "core.login.changepasswordreconnectinstructions": "local_moodlemobileapp",
   "core.login.checksiteversion": "local_moodlemobileapp",
   "core.login.confirmdeletesite": "local_moodlemobileapp",
   "core.login.connect": "local_moodlemobileapp",
@@ -1585,6 +1591,7 @@
   "core.login.errorupdatesite": "local_moodlemobileapp",
   "core.login.findyoursite": "local_moodlemobileapp",
   "core.login.firsttime": "moodle",
+  "core.login.forcepasswordchangenotice": "moodle",
   "core.login.forgotten": "moodle",
   "core.login.getanothercaptcha": "auth",
   "core.login.help": "moodle",
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index be27768aa..439ce5867 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -99,7 +99,7 @@ export class MoodleMobileApp implements OnInit {
 
         // Listen for passwordchange and usernotfullysetup events to open InAppBrowser.
         this.eventsProvider.on(CoreEventsProvider.PASSWORD_CHANGE_FORCED, (data) => {
-            this.loginHelper.openInAppForEdit(data.siteId, '/login/change_password.php', 'core.forcepasswordchangenotice', true);
+            this.loginHelper.passwordChangeForced(data.siteId);
         });
         this.eventsProvider.on(CoreEventsProvider.USER_NOT_FULLY_SETUP, (data) => {
             this.loginHelper.openInAppForEdit(data.siteId, '/user/edit.php', 'core.usernotfullysetup');
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index a82e7ef5a..064ce267d 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1562,6 +1562,12 @@
     "core.login.auth_email": "Email-based self-registration",
     "core.login.authenticating": "Authenticating",
     "core.login.cancel": "Cancel",
+    "core.login.changepassowrdinstructions": "You cannot change your password in the app. Please click the following button to open the site in a web browser to change your password. Take into account you need to close the browser after changing the password as you will not be redirected to the app.",
+    "core.login.changepassword": "Change password",
+    "core.login.changepasswordbutton": "Open the change password page",
+    "core.login.changepasswordhelp": "If you have problems changing your password, please contact your site administrator. \"Site Administrators\" are the people who manages the Moodle at your school/university/company or learning organisation. If you don't know how to contact them, please contact your teachers/trainers.",
+    "core.login.changepasswordlogoutinstructions": "If you prefer to change site or log out, please click the following button:",
+    "core.login.changepasswordreconnectinstructions": "Click the following button to reconnect to the site. (Take into account that if you didn't change your password successfully, you would return to the previous screen).",
     "core.login.checksiteversion": "Check that your site uses Moodle 2.4 or later.",
     "core.login.confirmdeletesite": "Are you sure you want to delete the site {{sitename}}?",
     "core.login.connect": "Connect!",
@@ -1583,6 +1589,7 @@
     "core.login.errorupdatesite": "An error occurred while updating the site's token.",
     "core.login.findyoursite": "Find your site",
     "core.login.firsttime": "Is this your first time here?",
+    "core.login.forcepasswordchangenotice": "You must change your password to proceed.",
     "core.login.forgotten": "Forgotten your username or password?",
     "core.login.getanothercaptcha": "Get another CAPTCHA",
     "core.login.help": "Help",
diff --git a/src/core/login/lang/en.json b/src/core/login/lang/en.json
index 4328c6d3e..a33582b45 100644
--- a/src/core/login/lang/en.json
+++ b/src/core/login/lang/en.json
@@ -3,6 +3,12 @@
     "authenticating": "Authenticating",
     "cancel": "Cancel",
     "checksiteversion": "Check that your site uses Moodle 2.4 or later.",
+    "changepassword": "Change password",
+    "changepasswordbutton": "Open the change password page",
+    "changepasswordhelp": "If you have problems changing your password, please contact your site administrator. \"Site Administrators\" are the people who manages the Moodle at your school/university/company or learning organisation. If you don't know how to contact them, please contact your teachers/trainers.",
+    "changepassowrdinstructions": "You cannot change your password in the app. Please click the following button to open the site in a web browser to change your password. Take into account you need to close the browser after changing the password as you will not be redirected to the app.",
+    "changepasswordlogoutinstructions": "If you prefer to change site or log out, please click the following button:",
+    "changepasswordreconnectinstructions": "Click the following button to reconnect to the site. (Take into account that if you didn't change your password successfully, you would return to the previous screen).",
     "confirmdeletesite": "Are you sure you want to delete the site {{sitename}}?",
     "connect": "Connect!",
     "connecttomoodle": "Connect to Moodle",
@@ -23,6 +29,7 @@
     "errorupdatesite": "An error occurred while updating the site's token.",
     "findyoursite": "Find your site",
     "firsttime": "Is this your first time here?",
+    "forcepasswordchangenotice": "You must change your password to proceed.",
     "forgotten": "Forgotten your username or password?",
     "getanothercaptcha": "Get another CAPTCHA",
     "help": "Help",
diff --git a/src/core/login/pages/change-password/change-password.html b/src/core/login/pages/change-password/change-password.html
new file mode 100644
index 000000000..9bbd96064
--- /dev/null
+++ b/src/core/login/pages/change-password/change-password.html
@@ -0,0 +1,27 @@
+<ion-header>
+    <ion-navbar core-back-button>
+        <ion-title>{{ 'core.login.changepassword' | translate }}</ion-title>
+        <ion-buttons end>
+            <button ion-button icon-only (click)="showHelp()" [attr.aria-label]="'core.help' | translate">
+                <ion-icon name="help-circle"></ion-icon>
+            </button>
+        </ion-buttons>
+    </ion-navbar>
+</ion-header>
+<ion-content padding class="core-center-view">
+    <ion-list>
+        <ion-item text-wrap *ngIf="!changingPassword">
+            <h2>{{ 'core.login.forcepasswordchangenotice' | translate }}</h2>
+            <p padding-vertical>{{ 'core.login.changepassowrdinstructions' | translate }}</p>
+            <button text-wrap ion-button block (click)="openChangePasswordPage()">{{ 'core.login.changepasswordbutton' | translate }}</button>
+        </ion-item>
+        <ion-item text-wrap *ngIf="changingPassword">
+            <p padding-bottom>{{ 'core.login.changepasswordreconnectinstructions' | translate }}</p>
+            <button text-wrap ion-button block (click)="login()">{{ 'core.login.reconnect' | translate }}</button>
+        </ion-item>
+        <ion-item text-wrap>
+            <p padding-bottom>{{ 'core.login.changepasswordlogoutinstructions' | translate }}</p>
+            <button text-wrap ion-button block color="light" (click)="logout()">{{ logoutLabel | translate }}</button>
+        </ion-item>
+    </ion-list>
+</ion-content>
diff --git a/src/core/login/pages/change-password/change-password.module.ts b/src/core/login/pages/change-password/change-password.module.ts
new file mode 100644
index 000000000..b505ebe48
--- /dev/null
+++ b/src/core/login/pages/change-password/change-password.module.ts
@@ -0,0 +1,33 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { TranslateModule } from '@ngx-translate/core';
+import { CoreLoginChangePasswordPage } from './change-password';
+import { CoreComponentsModule } from '@components/components.module';
+import { CoreDirectivesModule } from '@directives/directives.module';
+
+@NgModule({
+    declarations: [
+        CoreLoginChangePasswordPage
+    ],
+    imports: [
+        CoreComponentsModule,
+        CoreDirectivesModule,
+        IonicPageModule.forChild(CoreLoginChangePasswordPage),
+        TranslateModule.forChild()
+    ]
+})
+export class CoreLoginChangePasswordPageModule {}
diff --git a/src/core/login/pages/change-password/change-password.ts b/src/core/login/pages/change-password/change-password.ts
new file mode 100644
index 000000000..ae894cb50
--- /dev/null
+++ b/src/core/login/pages/change-password/change-password.ts
@@ -0,0 +1,69 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Component } from '@angular/core';
+import { IonicPage } from 'ionic-angular';
+import { TranslateService } from '@ngx-translate/core';
+import { CoreSitesProvider } from '@providers/sites';
+import { CoreLoginHelperProvider } from '../../providers/helper';
+import { CoreDomUtilsProvider } from '@providers/utils/dom';
+
+/**
+ * Page that shows instructions to change the password.
+ */
+@IonicPage({ segment: 'core-login-change-password' })
+@Component({
+    selector: 'page-core-change-password',
+    templateUrl: 'change-password.html',
+})
+export class CoreLoginChangePasswordPage {
+    changingPassword = false;
+    logoutLabel: string;
+
+    constructor(private translate: TranslateService, private sitesProvider: CoreSitesProvider,
+            private loginHelper: CoreLoginHelperProvider, private domUtls: CoreDomUtilsProvider) {
+        this.logoutLabel = this.loginHelper.getLogoutLabel();
+    }
+
+    /**
+     * Show a help modal.
+     */
+    showHelp(): void {
+        this.domUtls.showAlert(this.translate.instant('core.help'), this.translate.instant('core.login.changepasswordhelp'));
+    }
+
+    /**
+     * Open the change password page in a browser.
+     */
+    openChangePasswordPage(): void {
+        this.loginHelper.openInAppForEdit(this.sitesProvider.getCurrentSiteId(), '/login/change_password.php', undefined, true);
+        this.changingPassword = true;
+    }
+
+    /**
+     * Login the user.
+     */
+    login(): void {
+        this.loginHelper.goToSiteInitialPage();
+        this.changingPassword = false;
+    }
+
+    /**
+     * Logout the user.
+     */
+    logout(): void {
+        this.sitesProvider.logout();
+        this.changingPassword = false;
+    }
+}
diff --git a/src/core/login/providers/helper.ts b/src/core/login/providers/helper.ts
index d08b1ff0c..428acfbb1 100644
--- a/src/core/login/providers/helper.ts
+++ b/src/core/login/providers/helper.ts
@@ -32,6 +32,7 @@ import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreConfigConstants } from '../../../configconstants';
 import { CoreConstants } from '@core/constants';
 import { Md5 } from 'ts-md5/dist/md5';
+import { CoreSite } from '@classes/site';
 
 /**
  * Data related to a SSO authentication.
@@ -367,6 +368,19 @@ export class CoreLoginHelperProvider {
         return errors;
     }
 
+    /**
+     * Returns the logout label of a site.
+     *
+     * @param site Site. If not defined, use current site.
+     * @return The string key.
+     */
+    getLogoutLabel(site?: CoreSite): string {
+        site = site || this.sitesProvider.getCurrentSite();
+        const config = site.getStoredConfig();
+
+        return 'core.mainmenu.' + (config && config.tool_mobile_forcelogout == '1' ? 'logout' : 'changesite');
+    }
+
     /**
      * Get the site policy.
      *
@@ -796,7 +810,7 @@ export class CoreLoginHelperProvider {
         this.utils.openInApp(siteUrl + '/login/forgot_password.php');
     }
 
-    /*
+    /**
      * Function to open in app browser to change password or complete user profile.
      *
      * @param siteId The site ID.
@@ -804,7 +818,7 @@ export class CoreLoginHelperProvider {
      * @param alertMessage The key of the message to display before opening the in app browser.
      * @param invalidateCache Whether to invalidate site's cache (e.g. when the user is forced to change password).
      */
-    openInAppForEdit(siteId: string, path: string, alertMessage: string, invalidateCache?: boolean): void {
+    openInAppForEdit(siteId: string, path: string, alertMessage?: string, invalidateCache?: boolean): void {
         if (!siteId || siteId !== this.sitesProvider.getCurrentSiteId()) {
             // Site that triggered the event is not current site, nothing to do.
             return;
@@ -824,7 +838,9 @@ export class CoreLoginHelperProvider {
             }
 
             // Open change password.
-            alertMessage = this.translate.instant(alertMessage) + '<br>' + this.translate.instant('core.redirectingtosite');
+            if (alertMessage) {
+                alertMessage = this.translate.instant(alertMessage) + '<br>' + this.translate.instant('core.redirectingtosite');
+            }
             currentSite.openInAppWithAutoLogin(siteUrl + path, undefined, alertMessage).then(() => {
                 this.waitingForBrowser = true;
             }).finally(() => {
@@ -833,6 +849,28 @@ export class CoreLoginHelperProvider {
         }
     }
 
+    /**
+     * Function that should be called when password change is forced. Reserved for core use.
+     *
+     * @param siteId The site ID.
+     */
+    passwordChangeForced(siteId: string): void {
+        const currentSite = this.sitesProvider.getCurrentSite();
+        if (!currentSite || siteId !== currentSite.getId()) {
+            return; // Site that triggered the event is not current site.
+        }
+
+        const rootNavCtrl = this.appProvider.getRootNavController(),
+        activePage = rootNavCtrl.getActive();
+
+        // If current page is already change password, stop.
+        if (activePage && activePage.component && activePage.component.name == 'CoreLoginChangePasswordPage') {
+            return;
+        }
+
+        rootNavCtrl.setRoot('CoreLoginChangePasswordPage', {siteId});
+    }
+
     /**
      * Prepare the app to perform SSO login.
      *
diff --git a/src/core/mainmenu/pages/more/more.ts b/src/core/mainmenu/pages/more/more.ts
index 257fb27c7..6d4bcb649 100644
--- a/src/core/mainmenu/pages/more/more.ts
+++ b/src/core/mainmenu/pages/more/more.ts
@@ -18,6 +18,7 @@ import { CoreEventsProvider } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreMainMenuDelegate, CoreMainMenuHandlerData } from '../../providers/delegate';
 import { CoreMainMenuProvider, CoreMainMenuCustomItem } from '../../providers/mainmenu';
+import { CoreLoginHelperProvider } from '@core/login/providers/helper';
 
 /**
  * Page that displays the list of main menu options that aren't in the tabs.
@@ -46,7 +47,7 @@ export class CoreMainMenuMorePage implements OnDestroy {
 
     constructor(private menuDelegate: CoreMainMenuDelegate, private sitesProvider: CoreSitesProvider,
             private navCtrl: NavController, private mainMenuProvider: CoreMainMenuProvider,
-            eventsProvider: CoreEventsProvider) {
+            eventsProvider: CoreEventsProvider, private loginHelper: CoreLoginHelperProvider) {
 
         this.langObserver = eventsProvider.on(CoreEventsProvider.LANGUAGE_CHANGED, this.loadSiteInfo.bind(this));
         this.updateSiteObserver = eventsProvider.on(CoreEventsProvider.SITE_UPDATED, this.loadSiteInfo.bind(this),
@@ -104,13 +105,12 @@ export class CoreMainMenuMorePage implements OnDestroy {
      * Load the site info required by the view.
      */
     protected loadSiteInfo(): void {
-        const currentSite = this.sitesProvider.getCurrentSite(),
-            config = currentSite.getStoredConfig();
+        const currentSite = this.sitesProvider.getCurrentSite();
 
         this.siteInfo = currentSite.getInfo();
         this.siteName = currentSite.getSiteName();
         this.siteUrl = currentSite.getURL();
-        this.logoutLabel = 'core.mainmenu.' + (config && config.tool_mobile_forcelogout == '1' ? 'logout' : 'changesite');
+        this.logoutLabel = this.loginHelper.getLogoutLabel(currentSite);
         this.showWeb = !currentSite.isFeatureDisabled('CoreMainMenuDelegate_website');
         this.showHelp = !currentSite.isFeatureDisabled('CoreMainMenuDelegate_help');
 

From d7a5a65e4f2309cc4130d03973583222df11c0cb Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Thu, 3 Oct 2019 16:57:08 +0200
Subject: [PATCH 066/257] MOBILE-3093 cordova: Fix build with Cordova 9

---
 config.xml        |    2 +-
 package-lock.json | 6673 ++++++++++++---------------------------------
 package.json      |    4 +-
 3 files changed, 1678 insertions(+), 5001 deletions(-)

diff --git a/config.xml b/config.xml
index 486b7deb8..2b57d9d63 100644
--- a/config.xml
+++ b/config.xml
@@ -146,7 +146,7 @@
     <plugin name="cordova-plugin-statusbar" spec="^2.4.3" />
     <plugin name="cordova-plugin-whitelist" spec="^1.3.4" />
     <plugin name="cordova-plugin-zip" spec="^3.1.0" />
-    <plugin name="cordova-sqlite-storage" spec="^2.6.0" />
+    <plugin name="cordova-sqlite-storage" spec="^3.4.0" />
     <plugin name="nl.kingsquare.cordova.background-audio" spec="^1.0.1" />
     <plugin name="phonegap-plugin-push" spec="https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v3">
         <variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
diff --git a/package-lock.json b/package-lock.json
index e67d1a2b2..a5a04e889 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1168,6 +1168,15 @@
         }
       }
     },
+    "@mrmlnc/readdir-enhanced": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
+      "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
+      "requires": {
+        "call-me-maybe": "^1.0.1",
+        "glob-to-regexp": "^0.3.0"
+      }
+    },
     "@ngx-translate/core": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-8.0.0.tgz",
@@ -1178,6 +1187,11 @@
       "resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-2.0.1.tgz",
       "integrity": "sha1-qmd4jmS/qGUmkad7Ais7QDEgkRM="
     },
+    "@nodelib/fs.stat": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
+      "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
+    },
     "@types/cordova": {
       "version": "0.0.34",
       "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
@@ -1209,6 +1223,26 @@
       "resolved": "https://registry.npmjs.org/@types/cordova-plugin-network-information/-/cordova-plugin-network-information-0.0.3.tgz",
       "integrity": "sha1-+iycaufkxX8Tt39pXaTtuzr6oBY="
     },
+    "@types/events": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
+      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="
+    },
+    "@types/glob": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
+      "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
+      "requires": {
+        "@types/events": "*",
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
+    },
     "@types/node": {
       "version": "8.10.19",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.19.tgz",
@@ -1228,7 +1262,6 @@
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
       "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
-      "dev": true,
       "requires": {
         "mime-types": "~2.1.18",
         "negotiator": "0.6.1"
@@ -1304,6 +1337,43 @@
       "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
       "integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE="
     },
+    "ansi-align": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
+      "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
+      "requires": {
+        "string-width": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
     "ansi-colors": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
@@ -1322,6 +1392,11 @@
         "ansi-wrap": "0.1.0"
       }
     },
+    "ansi-escapes": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
+    },
     "ansi-gray": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
@@ -1350,7 +1425,6 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
       "requires": {
         "color-convert": "^1.9.0"
       },
@@ -1359,7 +1433,6 @@
           "version": "1.9.2",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz",
           "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==",
-          "dev": true,
           "requires": {
             "color-name": "1.1.1"
           }
@@ -1367,8 +1440,7 @@
         "color-name": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz",
-          "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=",
-          "dev": true
+          "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok="
         }
       }
     },
@@ -1461,8 +1533,7 @@
     "arr-union": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
     },
     "array-differ": {
       "version": "1.0.0",
@@ -1479,14 +1550,12 @@
     "array-find-index": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
     },
     "array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-      "dev": true
+      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
     },
     "array-initial": {
       "version": "1.1.0",
@@ -1548,11 +1617,18 @@
         }
       }
     },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "requires": {
+        "array-uniq": "^1.0.1"
+      }
+    },
     "array-uniq": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
     },
     "array-unique": {
       "version": "0.2.1",
@@ -1562,8 +1638,7 @@
     "asn1": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-      "dev": true
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
     },
     "asn1.js": {
       "version": "4.10.1",
@@ -1605,20 +1680,17 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
     },
     "async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
       "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
-      "dev": true,
       "requires": {
         "lodash": "^4.17.11"
       }
@@ -1670,14 +1742,12 @@
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "atob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz",
-      "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=",
-      "dev": true
+      "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio="
     },
     "autoprefixer": {
       "version": "7.2.6",
@@ -1696,14 +1766,12 @@
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
-      "dev": true
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
     },
     "babel-code-frame": {
       "version": "6.26.0",
@@ -1774,7 +1842,6 @@
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
       "requires": {
         "cache-base": "^1.0.1",
         "class-utils": "^0.3.5",
@@ -1789,7 +1856,6 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
           "requires": {
             "is-descriptor": "^1.0.0"
           }
@@ -1798,7 +1864,6 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -1807,7 +1872,6 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -1816,7 +1880,6 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -1826,14 +1889,12 @@
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         },
         "kind-of": {
           "version": "6.0.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
         }
       }
     },
@@ -1846,7 +1907,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
       "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-      "dev": true,
       "optional": true,
       "requires": {
         "tweetnacl": "^0.14.3"
@@ -1944,7 +2004,6 @@
       "version": "1.18.3",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
       "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
-      "dev": true,
       "requires": {
         "bytes": "3.0.0",
         "content-type": "~1.0.4",
@@ -1958,6 +2017,54 @@
         "type-is": "~1.6.16"
       }
     },
+    "boxen": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
+      "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
+      "requires": {
+        "ansi-align": "^2.0.0",
+        "camelcase": "^4.0.0",
+        "chalk": "^2.0.1",
+        "cli-boxes": "^1.0.0",
+        "string-width": "^2.0.0",
+        "term-size": "^1.2.0",
+        "widest-line": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
     "bplist-creator": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz",
@@ -2207,8 +2314,7 @@
     "builtin-modules": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-      "dev": true
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
     },
     "builtin-status-codes": {
       "version": "3.0.0",
@@ -2216,17 +2322,20 @@
       "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
       "dev": true
     },
+    "builtins": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
+      "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og="
+    },
     "bytes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-      "dev": true
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
     },
     "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
       "requires": {
         "collection-visit": "^1.0.0",
         "component-emitter": "^1.2.1",
@@ -2242,11 +2351,20 @@
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         }
       }
     },
+    "call-me-maybe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
+      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms="
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
+    },
     "camelcase": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
@@ -2269,11 +2387,15 @@
       "integrity": "sha512-ekW8NQ3/FvokviDxhdKLZZAx7PptXNwxKgXtnR5y+PR3hckwuP3yJ1Ir+4/c97dsHNqtAyfKUGdw8P4EYzBNgw==",
       "dev": true
     },
+    "capture-stack-trace": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
+      "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw=="
+    },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "center-align": {
       "version": "0.1.3",
@@ -2289,13 +2411,17 @@
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
       "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-      "dev": true,
       "requires": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
         "supports-color": "^5.3.0"
       }
     },
+    "chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
+    },
     "chart.js": {
       "version": "2.7.2",
       "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.7.2.tgz",
@@ -2347,8 +2473,7 @@
     "ci-info": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz",
-      "integrity": "sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==",
-      "dev": true
+      "integrity": "sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg=="
     },
     "cipher-base": {
       "version": "1.0.4",
@@ -2364,7 +2489,6 @@
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
         "define-property": "^0.2.5",
@@ -2376,7 +2500,6 @@
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -2384,8 +2507,7 @@
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         }
       }
     },
@@ -2398,11 +2520,15 @@
         "source-map": "~0.6.0"
       }
     },
+    "cli-boxes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
+      "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM="
+    },
     "cli-cursor": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
       "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-      "dev": true,
       "requires": {
         "restore-cursor": "^2.0.0"
       }
@@ -2413,6 +2539,11 @@
       "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==",
       "dev": true
     },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
+    },
     "cliui": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
@@ -2491,7 +2622,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "dev": true,
       "requires": {
         "map-visit": "^1.0.0",
         "object-visit": "^1.0.0"
@@ -2528,7 +2658,6 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
       "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
-      "dev": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
@@ -2548,8 +2677,36 @@
     "component-emitter": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-      "dev": true
+      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+    },
+    "compressible": {
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
+      "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==",
+      "requires": {
+        "mime-db": ">= 1.40.0 < 2"
+      },
+      "dependencies": {
+        "mime-db": {
+          "version": "1.42.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz",
+          "integrity": "sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ=="
+        }
+      }
+    },
+    "compression": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "requires": {
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
+      }
     },
     "concat-map": {
       "version": "0.0.1",
@@ -2577,6 +2734,31 @@
         "source-map": "^0.6.1"
       }
     },
+    "conf": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/conf/-/conf-1.4.0.tgz",
+      "integrity": "sha512-bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg==",
+      "requires": {
+        "dot-prop": "^4.1.0",
+        "env-paths": "^1.0.0",
+        "make-dir": "^1.0.0",
+        "pkg-up": "^2.0.0",
+        "write-file-atomic": "^2.3.0"
+      }
+    },
+    "configstore": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz",
+      "integrity": "sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==",
+      "requires": {
+        "dot-prop": "^4.1.0",
+        "graceful-fs": "^4.1.2",
+        "make-dir": "^1.0.0",
+        "unique-string": "^1.0.0",
+        "write-file-atomic": "^2.0.0",
+        "xdg-basedir": "^3.0.0"
+      }
+    },
     "console-browserify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
@@ -2601,14 +2783,12 @@
     "content-disposition": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
-      "dev": true
+      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
     },
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
     },
     "continuable-cache": {
       "version": "0.3.1",
@@ -2628,20 +2808,17 @@
     "cookie": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
-      "dev": true
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
     },
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
-      "dev": true
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
     },
     "copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
     },
     "copy-props": {
       "version": "2.0.4",
@@ -2654,3045 +2831,29 @@
       }
     },
     "cordova": {
-      "version": "8.1.2",
-      "resolved": "https://registry.npmjs.org/cordova/-/cordova-8.1.2.tgz",
-      "integrity": "sha512-IfslM3MP42CA/ebVJVlit6FhQ2P6Fercwx9NNQjkVs0wahEwqamL4bcqh1gKiTti7+/ZsDtBRSVmRv+y7LcTbg==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/cordova/-/cordova-9.0.0.tgz",
+      "integrity": "sha512-zWEPo9uGj9KNcEhU2Lpo3r4HYK21tL+at496N2LLnuCWuWVndv6QWed8+EYl/08rrcNshrEtfzXj9Ux6vQm2PQ==",
       "requires": {
-        "configstore": "^3.1.2",
-        "cordova-common": "^2.2.0",
-        "cordova-lib": "8.1.1",
-        "editor": "1.0.0",
-        "insight": "^0.8.4",
-        "loud-rejection": "^1.6.0",
+        "configstore": "^4.0.0",
+        "cordova-common": "^3.1.0",
+        "cordova-lib": "^9.0.0",
+        "editor": "^1.0.0",
+        "insight": "^0.10.1",
+        "loud-rejection": "^2.0.0",
         "nopt": "^4.0.1",
         "update-notifier": "^2.5.0"
       },
       "dependencies": {
-        "JSONStream": {
-          "version": "1.3.4",
-          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.4.tgz",
-          "integrity": "sha512-Y7vfi3I5oMOYIr+WxV8NZxDSwcbNgzdKYsTNInmycOq9bUYwGg9ryu57Wg5NLmCjqdFPNUmpMBo3kSJN9tCbXg==",
-          "requires": {
-            "jsonparse": "^1.2.0",
-            "through": ">=2.2.7 <3"
-          }
-        },
-        "abbrev": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-          "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
-        },
-        "accepts": {
-          "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
-          "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
-          "requires": {
-            "mime-types": "~2.1.18",
-            "negotiator": "0.6.1"
-          }
-        },
-        "acorn": {
-          "version": "5.7.3",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-          "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="
-        },
-        "acorn-jsx": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
-          "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
-          "requires": {
-            "acorn": "^3.0.4"
-          },
-          "dependencies": {
-            "acorn": {
-              "version": "3.3.0",
-              "resolved": "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-              "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo="
-            }
-          }
-        },
-        "acorn-node": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.6.0.tgz",
-          "integrity": "sha512-ZsysjEh+Y3i14f7YXCAKJy99RXbd56wHKYBzN4FlFtICIZyFpYwK6OwNJhcz8A/FMtxoUZkJofH1v9KIfNgWmw==",
-          "requires": {
-            "acorn": "^6.0.1",
-            "acorn-walk": "^6.0.1",
-            "xtend": "^4.0.1"
-          },
-          "dependencies": {
-            "acorn": {
-              "version": "6.0.2",
-              "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.2.tgz",
-              "integrity": "sha512-GXmKIvbrN3TV7aVqAzVFaMW8F8wzVX7voEBRO3bDA64+EX37YSayggRJP5Xig6HYHBkWKpFg9W5gg6orklubhg=="
-            }
-          }
-        },
-        "acorn-walk": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.0.tgz",
-          "integrity": "sha512-ugTb7Lq7u4GfWSqqpwE0bGyoBZNMTok/zDBXxfEG0QM50jNlGhIWjRC1pPN7bvV1anhF+bs+/gNcRw+o55Evbg=="
-        },
-        "ajv": {
-          "version": "5.5.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-          "requires": {
-            "co": "^4.6.0",
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0"
-          }
-        },
-        "ajv-keywords": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
-          "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I="
-        },
-        "aliasify": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/aliasify/-/aliasify-2.1.0.tgz",
-          "integrity": "sha1-fDCCW5RQueYYW6J1M+r24gZ9S0I=",
-          "requires": {
-            "browserify-transform-tools": "~1.7.0"
-          }
-        },
-        "amdefine": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-          "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-          "optional": true
-        },
-        "ansi": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
-          "integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE="
-        },
-        "ansi-align": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
-          "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
-          "requires": {
-            "string-width": "^2.0.0"
-          }
-        },
-        "ansi-escapes": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
-          "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw=="
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
-        },
-        "argparse": {
-          "version": "1.0.10",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-          "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-          "requires": {
-            "sprintf-js": "~1.0.2"
-          }
-        },
-        "array-filter": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
-          "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw="
-        },
-        "array-find-index": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-          "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
-        },
-        "array-flatten": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
-        },
-        "array-map": {
-          "version": "0.0.0",
-          "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
-          "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI="
-        },
-        "array-reduce": {
-          "version": "0.0.0",
-          "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz",
-          "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys="
-        },
-        "array-union": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-          "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-          "requires": {
-            "array-uniq": "^1.0.1"
-          }
-        },
-        "array-uniq": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-          "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
-        },
-        "arrify": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-          "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
-        },
-        "asn1": {
-          "version": "0.2.4",
-          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-          "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-          "requires": {
-            "safer-buffer": "~2.1.0"
-          }
-        },
-        "asn1.js": {
-          "version": "4.10.1",
-          "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-          "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
-          "requires": {
-            "bn.js": "^4.0.0",
-            "inherits": "^2.0.1",
-            "minimalistic-assert": "^1.0.0"
-          }
-        },
-        "assert": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
-          "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
-          "requires": {
-            "util": "0.10.3"
-          },
-          "dependencies": {
-            "inherits": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-              "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
-            },
-            "util": {
-              "version": "0.10.3",
-              "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-              "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-              "requires": {
-                "inherits": "2.0.1"
-              }
-            }
-          }
-        },
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        },
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
-        },
-        "asynckit": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-          "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-        },
-        "aws-sign2": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-          "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
-        },
-        "aws4": {
-          "version": "1.8.0",
-          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-          "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
-        },
-        "babel-code-frame": {
-          "version": "6.26.0",
-          "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-          "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-          "requires": {
-            "chalk": "^1.1.3",
-            "esutils": "^2.0.2",
-            "js-tokens": "^3.0.2"
-          }
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-        },
-        "base64-js": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz",
-          "integrity": "sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE="
-        },
-        "bcrypt-pbkdf": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-          "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-          "optional": true,
-          "requires": {
-            "tweetnacl": "^0.14.3"
-          }
-        },
-        "big-integer": {
-          "version": "1.6.36",
-          "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.36.tgz",
-          "integrity": "sha512-t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg=="
-        },
-        "block-stream": {
-          "version": "0.0.9",
-          "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-          "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-          "requires": {
-            "inherits": "~2.0.0"
-          }
-        },
-        "bn.js": {
-          "version": "4.11.8",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-          "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
-        },
-        "body-parser": {
-          "version": "1.18.2",
-          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
-          "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
-          "requires": {
-            "bytes": "3.0.0",
-            "content-type": "~1.0.4",
-            "debug": "2.6.9",
-            "depd": "~1.1.1",
-            "http-errors": "~1.6.2",
-            "iconv-lite": "0.4.19",
-            "on-finished": "~2.3.0",
-            "qs": "6.5.1",
-            "raw-body": "2.3.2",
-            "type-is": "~1.6.15"
-          }
-        },
-        "boxen": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
-          "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
-          "requires": {
-            "ansi-align": "^2.0.0",
-            "camelcase": "^4.0.0",
-            "chalk": "^2.0.1",
-            "cli-boxes": "^1.0.0",
-            "string-width": "^2.0.0",
-            "term-size": "^1.2.0",
-            "widest-line": "^2.0.0"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "3.2.1",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-              "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-              "requires": {
-                "color-convert": "^1.9.0"
-              }
-            },
-            "chalk": {
-              "version": "2.4.1",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-              "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-              "requires": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
-              }
-            },
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "bplist-creator": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz",
-          "integrity": "sha1-N98VNgkoJLh8QvlXsBNEEXNyrkU=",
-          "requires": {
-            "stream-buffers": "~2.2.0"
-          }
-        },
-        "bplist-parser": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
-          "integrity": "sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=",
-          "requires": {
-            "big-integer": "^1.6.7"
-          }
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-          "requires": {
-            "balanced-match": "^1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "brorand": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-          "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
-        },
-        "browser-pack": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz",
-          "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==",
-          "requires": {
-            "JSONStream": "^1.0.3",
-            "combine-source-map": "~0.8.0",
-            "defined": "^1.0.0",
-            "safe-buffer": "^5.1.1",
-            "through2": "^2.0.0",
-            "umd": "^3.0.0"
-          }
-        },
-        "browser-resolve": {
-          "version": "1.11.3",
-          "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
-          "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
-          "requires": {
-            "resolve": "1.1.7"
-          },
-          "dependencies": {
-            "resolve": {
-              "version": "1.1.7",
-              "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-              "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
-            }
-          }
-        },
-        "browserify": {
-          "version": "14.4.0",
-          "resolved": "https://registry.npmjs.org/browserify/-/browserify-14.4.0.tgz",
-          "integrity": "sha1-CJo0Y69Y0OSNjNQHCz90ZU1avKk=",
-          "requires": {
-            "JSONStream": "^1.0.3",
-            "assert": "^1.4.0",
-            "browser-pack": "^6.0.1",
-            "browser-resolve": "^1.11.0",
-            "browserify-zlib": "~0.1.2",
-            "buffer": "^5.0.2",
-            "cached-path-relative": "^1.0.0",
-            "concat-stream": "~1.5.1",
-            "console-browserify": "^1.1.0",
-            "constants-browserify": "~1.0.0",
-            "crypto-browserify": "^3.0.0",
-            "defined": "^1.0.0",
-            "deps-sort": "^2.0.0",
-            "domain-browser": "~1.1.0",
-            "duplexer2": "~0.1.2",
-            "events": "~1.1.0",
-            "glob": "^7.1.0",
-            "has": "^1.0.0",
-            "htmlescape": "^1.1.0",
-            "https-browserify": "^1.0.0",
-            "inherits": "~2.0.1",
-            "insert-module-globals": "^7.0.0",
-            "labeled-stream-splicer": "^2.0.0",
-            "module-deps": "^4.0.8",
-            "os-browserify": "~0.1.1",
-            "parents": "^1.0.1",
-            "path-browserify": "~0.0.0",
-            "process": "~0.11.0",
-            "punycode": "^1.3.2",
-            "querystring-es3": "~0.2.0",
-            "read-only-stream": "^2.0.0",
-            "readable-stream": "^2.0.2",
-            "resolve": "^1.1.4",
-            "shasum": "^1.0.0",
-            "shell-quote": "^1.6.1",
-            "stream-browserify": "^2.0.0",
-            "stream-http": "^2.0.0",
-            "string_decoder": "~1.0.0",
-            "subarg": "^1.0.0",
-            "syntax-error": "^1.1.1",
-            "through2": "^2.0.0",
-            "timers-browserify": "^1.0.1",
-            "tty-browserify": "~0.0.0",
-            "url": "~0.11.0",
-            "util": "~0.10.1",
-            "vm-browserify": "~0.0.1",
-            "xtend": "^4.0.0"
-          },
-          "dependencies": {
-            "glob": {
-              "version": "7.1.3",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-              "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-              "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-              }
-            }
-          }
-        },
-        "browserify-aes": {
-          "version": "1.2.0",
-          "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-          "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-          "requires": {
-            "buffer-xor": "^1.0.3",
-            "cipher-base": "^1.0.0",
-            "create-hash": "^1.1.0",
-            "evp_bytestokey": "^1.0.3",
-            "inherits": "^2.0.1",
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "browserify-cipher": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-          "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-          "requires": {
-            "browserify-aes": "^1.0.4",
-            "browserify-des": "^1.0.0",
-            "evp_bytestokey": "^1.0.0"
-          }
-        },
-        "browserify-des": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-          "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-          "requires": {
-            "cipher-base": "^1.0.1",
-            "des.js": "^1.0.0",
-            "inherits": "^2.0.1",
-            "safe-buffer": "^5.1.2"
-          }
-        },
-        "browserify-rsa": {
-          "version": "4.0.1",
-          "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-          "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-          "requires": {
-            "bn.js": "^4.1.0",
-            "randombytes": "^2.0.1"
-          }
-        },
-        "browserify-sign": {
-          "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-          "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
-          "requires": {
-            "bn.js": "^4.1.1",
-            "browserify-rsa": "^4.0.0",
-            "create-hash": "^1.1.0",
-            "create-hmac": "^1.1.2",
-            "elliptic": "^6.0.0",
-            "inherits": "^2.0.1",
-            "parse-asn1": "^5.0.0"
-          }
-        },
-        "browserify-transform-tools": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/browserify-transform-tools/-/browserify-transform-tools-1.7.0.tgz",
-          "integrity": "sha1-g+J3Ih9jJZvtLn6yooOpcKUB9MQ=",
-          "requires": {
-            "falafel": "^2.0.0",
-            "through": "^2.3.7"
-          }
-        },
-        "browserify-zlib": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-          "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
-          "requires": {
-            "pako": "~0.2.0"
-          }
-        },
-        "buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
-          "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
-          "requires": {
-            "base64-js": "^1.0.2",
-            "ieee754": "^1.1.4"
-          }
-        },
-        "buffer-from": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-          "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
-        },
-        "buffer-xor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-          "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
-        },
-        "builtin-modules": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-          "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
-        },
-        "builtin-status-codes": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-          "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
-        },
-        "builtins": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
-          "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og="
-        },
-        "bytes": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
-        },
-        "cached-path-relative": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz",
-          "integrity": "sha1-0JxLUoAKpMB44t2BqGmqyQ0uVOc="
-        },
-        "caller-path": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-          "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-          "requires": {
-            "callsites": "^0.2.0"
-          }
-        },
-        "callsites": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-          "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo="
-        },
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
-        },
-        "capture-stack-trace": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
-          "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw=="
-        },
-        "caseless": {
-          "version": "0.12.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "chardet": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
-          "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I="
-        },
-        "ci-info": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
-          "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A=="
-        },
-        "cipher-base": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-          "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-          "requires": {
-            "inherits": "^2.0.1",
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "circular-json": {
-          "version": "0.3.3",
-          "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-          "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="
-        },
-        "cli-boxes": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
-          "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM="
-        },
-        "cli-cursor": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-          "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-          "requires": {
-            "restore-cursor": "^2.0.0"
-          }
-        },
-        "cli-width": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-          "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
-        },
-        "co": {
-          "version": "4.6.0",
-          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-        },
-        "combine-source-map": {
-          "version": "0.8.0",
-          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz",
-          "integrity": "sha1-pY0N8ELBhvz4IqjoAV9UUNLXmos=",
-          "requires": {
-            "convert-source-map": "~1.1.0",
-            "inline-source-map": "~0.6.0",
-            "lodash.memoize": "~3.0.3",
-            "source-map": "~0.5.3"
-          }
-        },
-        "combined-stream": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
-          "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
-          "requires": {
-            "delayed-stream": "~1.0.0"
-          }
-        },
-        "commander": {
-          "version": "2.17.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
-          "optional": true
-        },
-        "compressible": {
-          "version": "2.0.15",
-          "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz",
-          "integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==",
-          "requires": {
-            "mime-db": ">= 1.36.0 < 2"
-          }
-        },
-        "compression": {
-          "version": "1.7.3",
-          "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
-          "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
-          "requires": {
-            "accepts": "~1.3.5",
-            "bytes": "3.0.0",
-            "compressible": "~2.0.14",
-            "debug": "2.6.9",
-            "on-headers": "~1.0.1",
-            "safe-buffer": "5.1.2",
-            "vary": "~1.1.2"
-          }
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-        },
-        "concat-stream": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz",
-          "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=",
-          "requires": {
-            "inherits": "~2.0.1",
-            "readable-stream": "~2.0.0",
-            "typedarray": "~0.0.5"
-          },
-          "dependencies": {
-            "isarray": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-              "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-            },
-            "process-nextick-args": {
-              "version": "1.0.7",
-              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-              "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
-            },
-            "readable-stream": {
-              "version": "2.0.6",
-              "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-              "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.1",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~1.0.6",
-                "string_decoder": "~0.10.x",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "string_decoder": {
-              "version": "0.10.31",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-              "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-            }
-          }
-        },
-        "configstore": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
-          "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
-          "requires": {
-            "dot-prop": "^4.1.0",
-            "graceful-fs": "^4.1.2",
-            "make-dir": "^1.0.0",
-            "unique-string": "^1.0.0",
-            "write-file-atomic": "^2.0.0",
-            "xdg-basedir": "^3.0.0"
-          }
-        },
-        "console-browserify": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-          "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-          "requires": {
-            "date-now": "^0.1.4"
-          }
-        },
-        "constants-browserify": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-          "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
-        },
-        "contains-path": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
-          "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo="
-        },
-        "content-disposition": {
-          "version": "0.5.2",
-          "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-          "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
-        },
-        "content-type": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-          "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
-        },
-        "convert-source-map": {
-          "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz",
-          "integrity": "sha1-SCnId+n+SbMWHzvzZziI4gRpmGA="
-        },
-        "cookie": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-          "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
-        },
-        "cookie-signature": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-          "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
-        },
-        "cordova-app-hello-world": {
-          "version": "3.12.0",
-          "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.12.0.tgz",
-          "integrity": "sha1-Jw4Gtnsq6UvP7mWS7TnrQjA9GG8="
-        },
-        "cordova-common": {
-          "version": "2.2.5",
-          "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.5.tgz",
-          "integrity": "sha1-+TzvKtSUz8v1bEbj1hKqqctfzDI=",
-          "requires": {
-            "ansi": "^0.3.1",
-            "bplist-parser": "^0.1.0",
-            "cordova-registry-mapper": "^1.1.8",
-            "elementtree": "0.1.6",
-            "glob": "^5.0.13",
-            "minimatch": "^3.0.0",
-            "plist": "^2.1.0",
-            "q": "^1.4.1",
-            "shelljs": "^0.5.3",
-            "underscore": "^1.8.3",
-            "unorm": "^1.3.3"
-          }
-        },
-        "cordova-create": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/cordova-create/-/cordova-create-1.1.2.tgz",
-          "integrity": "sha1-g7CScbN40cA7x9mnhv7dYEhcPM8=",
-          "requires": {
-            "cordova-app-hello-world": "^3.11.0",
-            "cordova-common": "^2.2.0",
-            "cordova-fetch": "^1.3.0",
-            "q": "1.0.1",
-            "shelljs": "0.3.0",
-            "valid-identifier": "0.0.1"
-          },
-          "dependencies": {
-            "q": {
-              "version": "1.0.1",
-              "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz",
-              "integrity": "sha1-EYcq7t7okmgRCxCnGESP+xARKhQ="
-            },
-            "shelljs": {
-              "version": "0.3.0",
-              "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
-              "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E="
-            }
-          }
-        },
-        "cordova-fetch": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.3.1.tgz",
-          "integrity": "sha512-/0PNQUPxHvVcjlzVQcydD5BQtfx1XdCfzQ2KigdtZma5oVVUtR4IxfnYB15RuT/GVb/SGRLvR5AIi2Gd5Gb+mg==",
-          "requires": {
-            "cordova-common": "^2.2.5",
-            "dependency-ls": "^1.1.0",
-            "hosted-git-info": "^2.5.0",
-            "is-git-url": "^1.0.0",
-            "is-url": "^1.2.1",
-            "q": "^1.4.1",
-            "shelljs": "^0.7.0"
-          },
-          "dependencies": {
-            "glob": {
-              "version": "7.1.3",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-              "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-              "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-              }
-            },
-            "shelljs": {
-              "version": "0.7.8",
-              "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz",
-              "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
-              "requires": {
-                "glob": "^7.0.0",
-                "interpret": "^1.0.0",
-                "rechoir": "^0.6.2"
-              }
-            }
-          }
-        },
-        "cordova-js": {
-          "version": "4.2.4",
-          "resolved": "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.4.tgz",
-          "integrity": "sha512-Qy0O3w/gwbIqIJzlyCy60nPwJlF1c74ELpsfDIGXB92/uST5nQSSUDVDP4UOfb/c6OU7yPqxhCWOGROyTYKPDw==",
-          "requires": {
-            "browserify": "14.4.0"
-          }
-        },
-        "cordova-lib": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/cordova-lib/-/cordova-lib-8.1.1.tgz",
-          "integrity": "sha512-PcrlEGRGubV2c9ThcSwoVtN/1hKQ0qtwRopl4188rD10gjtt8K+NSKrnRqh6Ia5PouVUUOZBrlhBxDd5BRbfeg==",
-          "requires": {
-            "aliasify": "^2.1.0",
-            "cordova-common": "^2.2.0",
-            "cordova-create": "^1.1.0",
-            "cordova-fetch": "^1.3.0",
-            "cordova-js": "^4.2.2",
-            "cordova-serve": "^2.0.0",
-            "dep-graph": "1.1.0",
-            "dependency-ls": "^1.1.1",
-            "detect-indent": "^5.0.0",
-            "elementtree": "^0.1.7",
-            "glob": "^7.1.2",
-            "init-package-json": "^1.2.0",
-            "nopt": "4.0.1",
-            "opener": "^1.4.3",
-            "plist": "2.0.1",
-            "properties-parser": "0.3.1",
-            "q": "^1.5.1",
-            "read-chunk": "^2.1.0",
-            "request": "^2.88.0",
-            "semver": "^5.3.0",
-            "shebang-command": "^1.2.0",
-            "shelljs": "0.3.0",
-            "tar": "^2.2.1",
-            "underscore": "^1.9.0",
-            "unorm": "^1.4.1",
-            "valid-identifier": "0.0.1",
-            "which": "^1.3.1",
-            "xcode": "^1.0.0"
-          },
-          "dependencies": {
-            "base64-js": {
-              "version": "1.1.2",
-              "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz",
-              "integrity": "sha1-1kAMrBxMZgl22Q0HoENR2JOV9eg="
-            },
-            "elementtree": {
-              "version": "0.1.7",
-              "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
-              "integrity": "sha1-mskb5uUvtuYkTE5UpKw+2K6OKcA=",
-              "requires": {
-                "sax": "1.1.4"
-              }
-            },
-            "glob": {
-              "version": "7.1.3",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-              "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-              "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-              }
-            },
-            "plist": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/plist/-/plist-2.0.1.tgz",
-              "integrity": "sha1-CjLKlIGxw2TpLhjcVch23p0B2os=",
-              "requires": {
-                "base64-js": "1.1.2",
-                "xmlbuilder": "8.2.2",
-                "xmldom": "0.1.x"
-              }
-            },
-            "sax": {
-              "version": "1.1.4",
-              "resolved": "http://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
-              "integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk="
-            },
-            "shelljs": {
-              "version": "0.3.0",
-              "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
-              "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E="
-            }
-          }
-        },
-        "cordova-registry-mapper": {
-          "version": "1.1.15",
-          "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz",
-          "integrity": "sha1-4kS5GFuBdUc7/2B5MkkFEV+D3Hw="
-        },
-        "cordova-serve": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-2.0.1.tgz",
-          "integrity": "sha512-3Xl1D5eyiQlY5ow6Kn/say0us2TqSw/zgQmyTLxbewTngQZ1CIqxmqD7EFGoCNBrB4HsdPmpiSpFCitybKQN9g==",
-          "requires": {
-            "chalk": "^1.1.1",
-            "compression": "^1.6.0",
-            "express": "^4.13.3",
-            "opn": "^5.3.0",
-            "shelljs": "^0.5.3"
-          }
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-        },
-        "create-ecdh": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-          "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-          "requires": {
-            "bn.js": "^4.1.0",
-            "elliptic": "^6.0.0"
-          }
-        },
-        "create-error-class": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
-          "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
-          "requires": {
-            "capture-stack-trace": "^1.0.0"
-          }
-        },
-        "create-hash": {
-          "version": "1.2.0",
-          "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-          "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-          "requires": {
-            "cipher-base": "^1.0.1",
-            "inherits": "^2.0.1",
-            "md5.js": "^1.3.4",
-            "ripemd160": "^2.0.1",
-            "sha.js": "^2.4.0"
-          }
-        },
-        "create-hmac": {
-          "version": "1.1.7",
-          "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-          "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-          "requires": {
-            "cipher-base": "^1.0.3",
-            "create-hash": "^1.1.0",
-            "inherits": "^2.0.1",
-            "ripemd160": "^2.0.0",
-            "safe-buffer": "^5.0.1",
-            "sha.js": "^2.4.8"
-          }
-        },
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "crypto-browserify": {
-          "version": "3.12.0",
-          "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-          "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-          "requires": {
-            "browserify-cipher": "^1.0.0",
-            "browserify-sign": "^4.0.0",
-            "create-ecdh": "^4.0.0",
-            "create-hash": "^1.1.0",
-            "create-hmac": "^1.1.0",
-            "diffie-hellman": "^5.0.0",
-            "inherits": "^2.0.1",
-            "pbkdf2": "^3.0.3",
-            "public-encrypt": "^4.0.0",
-            "randombytes": "^2.0.0",
-            "randomfill": "^1.0.3"
-          }
-        },
-        "crypto-random-string": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
-          "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4="
-        },
-        "currently-unhandled": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-          "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-          "requires": {
-            "array-find-index": "^1.0.1"
-          }
-        },
-        "dashdash": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-          "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-          "requires": {
-            "assert-plus": "^1.0.0"
-          }
-        },
-        "date-now": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-          "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "deep-extend": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-          "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
-        },
-        "deep-is": {
-          "version": "0.1.3",
-          "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-          "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
-        },
-        "defined": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
-          "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM="
-        },
-        "del": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
-          "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
-          "requires": {
-            "globby": "^5.0.0",
-            "is-path-cwd": "^1.0.0",
-            "is-path-in-cwd": "^1.0.0",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "rimraf": "^2.2.8"
-          },
-          "dependencies": {
-            "pify": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-            }
-          }
-        },
-        "delayed-stream": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-          "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-        },
-        "dep-graph": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz",
-          "integrity": "sha1-+t6GqSeZqBPptCURzfPfpsyNvv4=",
-          "requires": {
-            "underscore": "1.2.1"
-          },
-          "dependencies": {
-            "underscore": {
-              "version": "1.2.1",
-              "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz",
-              "integrity": "sha1-/FxrB2VnPZKi1KyLTcCqiHAuK9Q="
-            }
-          }
-        },
-        "depd": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-          "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
-        },
-        "dependency-ls": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/dependency-ls/-/dependency-ls-1.1.1.tgz",
-          "integrity": "sha1-BIGwfwI9dM4xEZLlxpDRPhhgAFQ=",
-          "requires": {
-            "q": "1.4.1"
-          },
-          "dependencies": {
-            "q": {
-              "version": "1.4.1",
-              "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
-              "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4="
-            }
-          }
-        },
-        "deps-sort": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz",
-          "integrity": "sha1-CRckkC6EZYJg65EHSMzNGvbiH7U=",
-          "requires": {
-            "JSONStream": "^1.0.3",
-            "shasum": "^1.0.0",
-            "subarg": "^1.0.0",
-            "through2": "^2.0.0"
-          }
-        },
-        "des.js": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
-          "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
-          "requires": {
-            "inherits": "^2.0.1",
-            "minimalistic-assert": "^1.0.0"
-          }
-        },
-        "destroy": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-          "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
-        },
-        "detect-indent": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz",
-          "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50="
-        },
-        "detective": {
-          "version": "4.7.1",
-          "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz",
-          "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
-          "requires": {
-            "acorn": "^5.2.1",
-            "defined": "^1.0.0"
-          }
-        },
-        "diffie-hellman": {
-          "version": "5.0.3",
-          "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-          "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-          "requires": {
-            "bn.js": "^4.1.0",
-            "miller-rabin": "^4.0.0",
-            "randombytes": "^2.0.0"
-          }
-        },
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "domain-browser": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
-          "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw="
-        },
-        "dot-prop": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-          "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
-          "requires": {
-            "is-obj": "^1.0.0"
-          }
-        },
-        "duplexer2": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-          "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-          "requires": {
-            "readable-stream": "^2.0.2"
-          }
-        },
-        "duplexer3": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-          "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
-        },
-        "ecc-jsbn": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-          "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-          "optional": true,
-          "requires": {
-            "jsbn": "~0.1.0",
-            "safer-buffer": "^2.1.0"
-          }
-        },
-        "editor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz",
-          "integrity": "sha1-YMf4e9YrzGqJT6jM1q+3gjok90I="
-        },
-        "ee-first": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-          "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
-        },
-        "elementtree": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz",
-          "integrity": "sha1-KsTEbqMFFsjEy9teOsdBjlkt4gw=",
-          "requires": {
-            "sax": "0.3.5"
-          }
-        },
-        "elliptic": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
-          "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
-          "requires": {
-            "bn.js": "^4.4.0",
-            "brorand": "^1.0.1",
-            "hash.js": "^1.0.0",
-            "hmac-drbg": "^1.0.0",
-            "inherits": "^2.0.1",
-            "minimalistic-assert": "^1.0.0",
-            "minimalistic-crypto-utils": "^1.0.0"
-          }
-        },
-        "encodeurl": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-          "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
-        },
-        "error-ex": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-          "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-          "requires": {
-            "is-arrayish": "^0.2.1"
-          }
-        },
-        "escape-html": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-          "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-        },
-        "escodegen": {
-          "version": "1.8.1",
-          "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-          "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
-          "requires": {
-            "esprima": "^2.7.1",
-            "estraverse": "^1.9.1",
-            "esutils": "^2.0.2",
-            "optionator": "^0.8.1",
-            "source-map": "~0.2.0"
-          },
-          "dependencies": {
-            "esprima": {
-              "version": "2.7.3",
-              "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-              "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
-            },
-            "estraverse": {
-              "version": "1.9.3",
-              "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-              "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q="
-            },
-            "source-map": {
-              "version": "0.2.0",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-              "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
-              "optional": true,
-              "requires": {
-                "amdefine": ">=0.0.4"
-              }
-            }
-          }
-        },
-        "eslint": {
-          "version": "4.19.1",
-          "resolved": "http://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
-          "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
-          "requires": {
-            "ajv": "^5.3.0",
-            "babel-code-frame": "^6.22.0",
-            "chalk": "^2.1.0",
-            "concat-stream": "^1.6.0",
-            "cross-spawn": "^5.1.0",
-            "debug": "^3.1.0",
-            "doctrine": "^2.1.0",
-            "eslint-scope": "^3.7.1",
-            "eslint-visitor-keys": "^1.0.0",
-            "espree": "^3.5.4",
-            "esquery": "^1.0.0",
-            "esutils": "^2.0.2",
-            "file-entry-cache": "^2.0.0",
-            "functional-red-black-tree": "^1.0.1",
-            "glob": "^7.1.2",
-            "globals": "^11.0.1",
-            "ignore": "^3.3.3",
-            "imurmurhash": "^0.1.4",
-            "inquirer": "^3.0.6",
-            "is-resolvable": "^1.0.0",
-            "js-yaml": "^3.9.1",
-            "json-stable-stringify-without-jsonify": "^1.0.1",
-            "levn": "^0.3.0",
-            "lodash": "^4.17.4",
-            "minimatch": "^3.0.2",
-            "mkdirp": "^0.5.1",
-            "natural-compare": "^1.4.0",
-            "optionator": "^0.8.2",
-            "path-is-inside": "^1.0.2",
-            "pluralize": "^7.0.0",
-            "progress": "^2.0.0",
-            "regexpp": "^1.0.1",
-            "require-uncached": "^1.0.3",
-            "semver": "^5.3.0",
-            "strip-ansi": "^4.0.0",
-            "strip-json-comments": "~2.0.1",
-            "table": "4.0.2",
-            "text-table": "~0.2.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-            },
-            "ansi-styles": {
-              "version": "3.2.1",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-              "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-              "requires": {
-                "color-convert": "^1.9.0"
-              }
-            },
-            "chalk": {
-              "version": "2.4.1",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-              "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-              "requires": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
-              }
-            },
-            "concat-stream": {
-              "version": "1.6.2",
-              "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-              "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-              "requires": {
-                "buffer-from": "^1.0.0",
-                "inherits": "^2.0.3",
-                "readable-stream": "^2.2.2",
-                "typedarray": "^0.0.6"
-              }
-            },
-            "debug": {
-              "version": "3.2.5",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz",
-              "integrity": "sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==",
-              "requires": {
-                "ms": "^2.1.1"
-              }
-            },
-            "glob": {
-              "version": "7.1.3",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-              "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-              "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-              }
-            },
-            "ms": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-              "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            },
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "eslint-config-semistandard": {
-          "version": "12.0.1",
-          "resolved": "https://registry.npmjs.org/eslint-config-semistandard/-/eslint-config-semistandard-12.0.1.tgz",
-          "integrity": "sha512-4zaPW5uRFasf2uRZkE19Y+W84KBV3q+oyWYOsgUN+5DQXE5HCsh7ZxeWDXxozk7NPycGm0kXcsJzLe5GZ1jCeg=="
-        },
-        "eslint-config-standard": {
-          "version": "11.0.0",
-          "resolved": "http://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-11.0.0.tgz",
-          "integrity": "sha512-oDdENzpViEe5fwuRCWla7AXQd++/oyIp8zP+iP9jiUPG6NBj3SHgdgtl/kTn00AjeN+1HNvavTKmYbMo+xMOlw=="
-        },
-        "eslint-import-resolver-node": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz",
-          "integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==",
-          "requires": {
-            "debug": "^2.6.9",
-            "resolve": "^1.5.0"
-          }
-        },
-        "eslint-module-utils": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz",
-          "integrity": "sha1-snA2LNiLGkitMIl2zn+lTphBF0Y=",
-          "requires": {
-            "debug": "^2.6.8",
-            "pkg-dir": "^1.0.0"
-          }
-        },
-        "eslint-plugin-import": {
-          "version": "2.14.0",
-          "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz",
-          "integrity": "sha512-FpuRtniD/AY6sXByma2Wr0TXvXJ4nA/2/04VPlfpmUDPOpOY264x+ILiwnrk/k4RINgDAyFZByxqPUbSQ5YE7g==",
-          "requires": {
-            "contains-path": "^0.1.0",
-            "debug": "^2.6.8",
-            "doctrine": "1.5.0",
-            "eslint-import-resolver-node": "^0.3.1",
-            "eslint-module-utils": "^2.2.0",
-            "has": "^1.0.1",
-            "lodash": "^4.17.4",
-            "minimatch": "^3.0.3",
-            "read-pkg-up": "^2.0.0",
-            "resolve": "^1.6.0"
-          },
-          "dependencies": {
-            "doctrine": {
-              "version": "1.5.0",
-              "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-              "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-              "requires": {
-                "esutils": "^2.0.2",
-                "isarray": "^1.0.0"
-              }
-            },
-            "isarray": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-              "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-            }
-          }
-        },
-        "eslint-plugin-node": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-5.2.1.tgz",
-          "integrity": "sha512-xhPXrh0Vl/b7870uEbaumb2Q+LxaEcOQ3kS1jtIXanBAwpMre1l5q/l2l/hESYJGEFKuI78bp6Uw50hlpr7B+g==",
-          "requires": {
-            "ignore": "^3.3.6",
-            "minimatch": "^3.0.4",
-            "resolve": "^1.3.3",
-            "semver": "5.3.0"
-          },
-          "dependencies": {
-            "semver": {
-              "version": "5.3.0",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-              "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
-            }
-          }
-        },
-        "eslint-plugin-promise": {
-          "version": "3.8.0",
-          "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.8.0.tgz",
-          "integrity": "sha512-JiFL9UFR15NKpHyGii1ZcvmtIqa3UTwiDAGb8atSffe43qJ3+1czVGN6UtkklpcJ2DVnqvTMzEKRaJdBkAL2aQ=="
-        },
-        "eslint-plugin-standard": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.1.0.tgz",
-          "integrity": "sha512-fVcdyuKRr0EZ4fjWl3c+gp1BANFJD1+RaWa2UPYfMZ6jCtp5RG00kSaXnK/dE5sYzt4kaWJ9qdxqUfc0d9kX0w=="
-        },
-        "eslint-scope": {
-          "version": "3.7.3",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
-          "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
-          "requires": {
-            "esrecurse": "^4.1.0",
-            "estraverse": "^4.1.1"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-          "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="
-        },
-        "espree": {
-          "version": "3.5.4",
-          "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
-          "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
-          "requires": {
-            "acorn": "^5.5.0",
-            "acorn-jsx": "^3.0.0"
-          }
-        },
-        "esprima": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-        },
-        "esquery": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-          "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
-          "requires": {
-            "estraverse": "^4.0.0"
-          }
-        },
-        "esrecurse": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-          "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-          "requires": {
-            "estraverse": "^4.1.0"
-          }
-        },
-        "estraverse": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-          "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM="
-        },
-        "esutils": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-          "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
-        },
-        "etag": {
-          "version": "1.8.1",
-          "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-          "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
-        },
-        "events": {
-          "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz",
-          "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
-        },
-        "evp_bytestokey": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-          "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-          "requires": {
-            "md5.js": "^1.3.4",
-            "safe-buffer": "^5.1.1"
-          }
-        },
-        "execa": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-          "requires": {
-            "cross-spawn": "^5.0.1",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "exit-hook": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
-          "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g="
-        },
-        "express": {
-          "version": "4.16.3",
-          "resolved": "http://registry.npmjs.org/express/-/express-4.16.3.tgz",
-          "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=",
-          "requires": {
-            "accepts": "~1.3.5",
-            "array-flatten": "1.1.1",
-            "body-parser": "1.18.2",
-            "content-disposition": "0.5.2",
-            "content-type": "~1.0.4",
-            "cookie": "0.3.1",
-            "cookie-signature": "1.0.6",
-            "debug": "2.6.9",
-            "depd": "~1.1.2",
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "etag": "~1.8.1",
-            "finalhandler": "1.1.1",
-            "fresh": "0.5.2",
-            "merge-descriptors": "1.0.1",
-            "methods": "~1.1.2",
-            "on-finished": "~2.3.0",
-            "parseurl": "~1.3.2",
-            "path-to-regexp": "0.1.7",
-            "proxy-addr": "~2.0.3",
-            "qs": "6.5.1",
-            "range-parser": "~1.2.0",
-            "safe-buffer": "5.1.1",
-            "send": "0.16.2",
-            "serve-static": "1.13.2",
-            "setprototypeof": "1.1.0",
-            "statuses": "~1.4.0",
-            "type-is": "~1.6.16",
-            "utils-merge": "1.0.1",
-            "vary": "~1.1.2"
-          },
-          "dependencies": {
-            "safe-buffer": {
-              "version": "5.1.1",
-              "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-              "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-            }
-          }
-        },
-        "extend": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-        },
-        "external-editor": {
-          "version": "2.2.0",
-          "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
-          "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
-          "requires": {
-            "chardet": "^0.4.0",
-            "iconv-lite": "^0.4.17",
-            "tmp": "^0.0.33"
-          }
-        },
-        "extsprintf": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-          "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-        },
-        "falafel": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz",
-          "integrity": "sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=",
-          "requires": {
-            "acorn": "^5.0.0",
-            "foreach": "^2.0.5",
-            "isarray": "0.0.1",
-            "object-keys": "^1.0.6"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
-        },
-        "fast-json-stable-stringify": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-          "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
-        },
-        "fast-levenshtein": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-          "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
-        },
-        "figures": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-          "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-          "requires": {
-            "escape-string-regexp": "^1.0.5"
-          }
-        },
-        "file-entry-cache": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-          "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
-          "requires": {
-            "flat-cache": "^1.2.1",
-            "object-assign": "^4.0.1"
-          }
-        },
-        "finalhandler": {
-          "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
-          "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
-          "requires": {
-            "debug": "2.6.9",
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "on-finished": "~2.3.0",
-            "parseurl": "~1.3.2",
-            "statuses": "~1.4.0",
-            "unpipe": "~1.0.0"
-          }
-        },
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "flat-cache": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
-          "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
-          "requires": {
-            "circular-json": "^0.3.1",
-            "del": "^2.0.2",
-            "graceful-fs": "^4.1.2",
-            "write": "^0.2.1"
-          }
-        },
-        "foreach": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-          "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
-        },
-        "forever-agent": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-          "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-        },
-        "form-data": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
-          "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "1.0.6",
-            "mime-types": "^2.1.12"
-          },
-          "dependencies": {
-            "combined-stream": {
-              "version": "1.0.6",
-              "resolved": "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
-              "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
-              "requires": {
-                "delayed-stream": "~1.0.0"
-              }
-            }
-          }
-        },
-        "forwarded": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-          "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
-        },
-        "fresh": {
-          "version": "0.5.2",
-          "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-          "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-        },
-        "fstream": {
-          "version": "1.0.11",
-          "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-          "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "inherits": "~2.0.0",
-            "mkdirp": ">=0.5 0",
-            "rimraf": "2"
-          }
-        },
-        "function-bind": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-          "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-        },
-        "functional-red-black-tree": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-          "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
-        },
-        "get-assigned-identifiers": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz",
-          "integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ=="
-        },
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
-        },
-        "getpass": {
-          "version": "0.1.7",
-          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-          "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-          "requires": {
-            "assert-plus": "^1.0.0"
-          }
-        },
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "global-dirs": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
-          "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
-          "requires": {
-            "ini": "^1.3.4"
-          }
-        },
-        "globals": {
-          "version": "11.7.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz",
-          "integrity": "sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg=="
-        },
-        "globby": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-          "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-          "requires": {
-            "array-union": "^1.0.1",
-            "arrify": "^1.0.0",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          },
-          "dependencies": {
-            "glob": {
-              "version": "7.1.3",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-              "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-              "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-              }
-            },
-            "pify": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-            }
-          }
-        },
-        "got": {
-          "version": "6.7.1",
-          "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz",
-          "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
-          "requires": {
-            "create-error-class": "^3.0.0",
-            "duplexer3": "^0.1.4",
-            "get-stream": "^3.0.0",
-            "is-redirect": "^1.0.0",
-            "is-retry-allowed": "^1.0.0",
-            "is-stream": "^1.0.0",
-            "lowercase-keys": "^1.0.0",
-            "safe-buffer": "^5.0.1",
-            "timed-out": "^4.0.0",
-            "unzip-response": "^2.0.1",
-            "url-parse-lax": "^1.0.0"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.1.11",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
-        },
-        "handlebars": {
-          "version": "4.0.12",
-          "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz",
-          "integrity": "sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==",
-          "requires": {
-            "async": "^2.5.0",
-            "optimist": "^0.6.1",
-            "source-map": "^0.6.1",
-            "uglify-js": "^3.1.4"
-          },
-          "dependencies": {
-            "async": {
-              "version": "2.6.1",
-              "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
-              "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
-              "requires": {
-                "lodash": "^4.17.10"
-              }
-            },
-            "source-map": {
-              "version": "0.6.1",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-              "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-            }
-          }
-        },
-        "har-schema": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-          "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-        },
-        "har-validator": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz",
-          "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==",
-          "requires": {
-            "ajv": "^5.3.0",
-            "har-schema": "^2.0.0"
-          }
-        },
-        "has": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-          "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-          "requires": {
-            "function-bind": "^1.1.1"
-          }
-        },
-        "has-ansi": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-          "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-        },
-        "hash-base": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-          "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-          "requires": {
-            "inherits": "^2.0.1",
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "hash.js": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.5.tgz",
-          "integrity": "sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "minimalistic-assert": "^1.0.1"
-          }
-        },
-        "hmac-drbg": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-          "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-          "requires": {
-            "hash.js": "^1.0.3",
-            "minimalistic-assert": "^1.0.0",
-            "minimalistic-crypto-utils": "^1.0.1"
-          }
-        },
-        "hosted-git-info": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
-          "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
-        },
-        "htmlescape": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz",
-          "integrity": "sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E="
-        },
-        "http-errors": {
-          "version": "1.6.3",
-          "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-          "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.1.0",
-            "statuses": ">= 1.4.0 < 2"
-          }
-        },
-        "http-signature": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-          "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-          "requires": {
-            "assert-plus": "^1.0.0",
-            "jsprim": "^1.2.2",
-            "sshpk": "^1.7.0"
-          }
-        },
-        "https-browserify": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-          "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
-        },
-        "iconv-lite": {
-          "version": "0.4.19",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-          "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
-        },
-        "ieee754": {
-          "version": "1.1.12",
-          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
-          "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA=="
-        },
-        "ignore": {
-          "version": "3.3.10",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-          "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="
-        },
-        "import-lazy": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-          "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM="
-        },
-        "imurmurhash": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-          "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
-        },
-        "indexof": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-          "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-        },
-        "ini": {
-          "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-          "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
-        },
-        "init-package-json": {
-          "version": "1.10.3",
-          "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.3.tgz",
-          "integrity": "sha512-zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw==",
-          "requires": {
-            "glob": "^7.1.1",
-            "npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0",
-            "promzard": "^0.3.0",
-            "read": "~1.0.1",
-            "read-package-json": "1 || 2",
-            "semver": "2.x || 3.x || 4 || 5",
-            "validate-npm-package-license": "^3.0.1",
-            "validate-npm-package-name": "^3.0.0"
-          },
-          "dependencies": {
-            "glob": {
-              "version": "7.1.3",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-              "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-              "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-              }
-            }
-          }
-        },
-        "inline-source-map": {
-          "version": "0.6.2",
-          "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz",
-          "integrity": "sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU=",
-          "requires": {
-            "source-map": "~0.5.3"
-          }
-        },
-        "inquirer": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
-          "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
-          "requires": {
-            "ansi-escapes": "^3.0.0",
-            "chalk": "^2.0.0",
-            "cli-cursor": "^2.1.0",
-            "cli-width": "^2.0.0",
-            "external-editor": "^2.0.4",
-            "figures": "^2.0.0",
-            "lodash": "^4.3.0",
-            "mute-stream": "0.0.7",
-            "run-async": "^2.2.0",
-            "rx-lite": "^4.0.8",
-            "rx-lite-aggregates": "^4.0.8",
-            "string-width": "^2.1.0",
-            "strip-ansi": "^4.0.0",
-            "through": "^2.3.6"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-            },
-            "ansi-styles": {
-              "version": "3.2.1",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-              "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-              "requires": {
-                "color-convert": "^1.9.0"
-              }
-            },
-            "chalk": {
-              "version": "2.4.1",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-              "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-              "requires": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
-              }
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            },
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "insert-module-globals": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.0.tgz",
-          "integrity": "sha512-VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw==",
-          "requires": {
-            "JSONStream": "^1.0.3",
-            "acorn-node": "^1.5.2",
-            "combine-source-map": "^0.8.0",
-            "concat-stream": "^1.6.1",
-            "is-buffer": "^1.1.0",
-            "path-is-absolute": "^1.0.1",
-            "process": "~0.11.0",
-            "through2": "^2.0.0",
-            "undeclared-identifiers": "^1.1.2",
-            "xtend": "^4.0.0"
-          },
-          "dependencies": {
-            "concat-stream": {
-              "version": "1.6.2",
-              "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-              "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-              "requires": {
-                "buffer-from": "^1.0.0",
-                "inherits": "^2.0.3",
-                "readable-stream": "^2.2.2",
-                "typedarray": "^0.0.6"
-              }
-            }
-          }
-        },
-        "insight": {
-          "version": "0.8.4",
-          "resolved": "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz",
-          "integrity": "sha1-ZxyvZbR8n+jD0bMgbPRbshG3WIQ=",
-          "requires": {
-            "async": "^1.4.2",
-            "chalk": "^1.0.0",
-            "configstore": "^1.0.0",
-            "inquirer": "^0.10.0",
-            "lodash.debounce": "^3.0.1",
-            "object-assign": "^4.0.1",
-            "os-name": "^1.0.0",
-            "request": "^2.74.0",
-            "tough-cookie": "^2.0.0",
-            "uuid": "^3.0.0"
-          },
-          "dependencies": {
-            "ansi-escapes": {
-              "version": "1.4.0",
-              "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
-              "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4="
-            },
-            "cli-cursor": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-              "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
-              "requires": {
-                "restore-cursor": "^1.0.1"
-              }
-            },
-            "cli-width": {
-              "version": "1.1.1",
-              "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz",
-              "integrity": "sha1-pNKT72frt7iNSk1CwMzwDE0eNm0="
-            },
-            "configstore": {
-              "version": "1.4.0",
-              "resolved": "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz",
-              "integrity": "sha1-w1eB0FAdJowlxUuLF/YkDopPsCE=",
-              "requires": {
-                "graceful-fs": "^4.1.2",
-                "mkdirp": "^0.5.0",
-                "object-assign": "^4.0.1",
-                "os-tmpdir": "^1.0.0",
-                "osenv": "^0.1.0",
-                "uuid": "^2.0.1",
-                "write-file-atomic": "^1.1.2",
-                "xdg-basedir": "^2.0.0"
-              },
-              "dependencies": {
-                "uuid": {
-                  "version": "2.0.3",
-                  "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
-                  "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho="
-                }
-              }
-            },
-            "figures": {
-              "version": "1.7.0",
-              "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-              "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-              "requires": {
-                "escape-string-regexp": "^1.0.5",
-                "object-assign": "^4.1.0"
-              }
-            },
-            "inquirer": {
-              "version": "0.10.1",
-              "resolved": "http://registry.npmjs.org/inquirer/-/inquirer-0.10.1.tgz",
-              "integrity": "sha1-6iXkzmnKFF4FyZ5G3P7AXkASWUo=",
-              "requires": {
-                "ansi-escapes": "^1.1.0",
-                "ansi-regex": "^2.0.0",
-                "chalk": "^1.0.0",
-                "cli-cursor": "^1.0.1",
-                "cli-width": "^1.0.1",
-                "figures": "^1.3.5",
-                "lodash": "^3.3.1",
-                "readline2": "^1.0.1",
-                "run-async": "^0.1.0",
-                "rx-lite": "^3.1.2",
-                "strip-ansi": "^3.0.0",
-                "through": "^2.3.6"
-              }
-            },
-            "lodash": {
-              "version": "3.10.1",
-              "resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-              "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
-            },
-            "onetime": {
-              "version": "1.1.0",
-              "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-              "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k="
-            },
-            "restore-cursor": {
-              "version": "1.0.1",
-              "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-              "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
-              "requires": {
-                "exit-hook": "^1.0.0",
-                "onetime": "^1.0.0"
-              }
-            },
-            "run-async": {
-              "version": "0.1.0",
-              "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
-              "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
-              "requires": {
-                "once": "^1.3.0"
-              }
-            },
-            "rx-lite": {
-              "version": "3.1.2",
-              "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
-              "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI="
-            },
-            "write-file-atomic": {
-              "version": "1.3.4",
-              "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
-              "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
-              "requires": {
-                "graceful-fs": "^4.1.11",
-                "imurmurhash": "^0.1.4",
-                "slide": "^1.1.5"
-              }
-            },
-            "xdg-basedir": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
-              "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
-              "requires": {
-                "os-homedir": "^1.0.0"
-              }
-            }
-          }
-        },
-        "interpret": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
-          "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ="
-        },
-        "ipaddr.js": {
-          "version": "1.8.0",
-          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
-          "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4="
-        },
-        "is-arrayish": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-          "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-        },
-        "is-builtin-module": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-          "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-          "requires": {
-            "builtin-modules": "^1.0.0"
-          }
-        },
-        "is-ci": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
-          "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
-          "requires": {
-            "ci-info": "^1.5.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "is-git-url": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-git-url/-/is-git-url-1.0.0.tgz",
-          "integrity": "sha1-U/aEzRQyhbUsMkS05vKCU1J69ms="
-        },
-        "is-installed-globally": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz",
-          "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
-          "requires": {
-            "global-dirs": "^0.1.0",
-            "is-path-inside": "^1.0.0"
-          }
-        },
-        "is-npm": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
-          "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ="
-        },
-        "is-obj": {
-          "version": "1.0.1",
-          "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-          "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
-        },
-        "is-path-cwd": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-          "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0="
-        },
-        "is-path-in-cwd": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-          "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
-          "requires": {
-            "is-path-inside": "^1.0.0"
-          }
-        },
-        "is-path-inside": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-          "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-          "requires": {
-            "path-is-inside": "^1.0.1"
-          }
-        },
-        "is-promise": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-          "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
-        },
-        "is-redirect": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-          "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ="
-        },
-        "is-resolvable": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-          "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
-        },
-        "is-retry-allowed": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-          "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ="
-        },
-        "is-stream": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-        },
-        "is-typedarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-          "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-        },
-        "is-url": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
-          "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="
-        },
-        "is-wsl": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-          "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0="
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-        },
-        "isexe": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-          "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-        },
-        "isstream": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-          "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-        },
-        "istanbul": {
-          "version": "0.4.5",
-          "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
-          "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
-          "requires": {
-            "abbrev": "1.0.x",
-            "async": "1.x",
-            "escodegen": "1.8.x",
-            "esprima": "2.7.x",
-            "glob": "^5.0.15",
-            "handlebars": "^4.0.1",
-            "js-yaml": "3.x",
-            "mkdirp": "0.5.x",
-            "nopt": "3.x",
-            "once": "1.x",
-            "resolve": "1.1.x",
-            "supports-color": "^3.1.0",
-            "which": "^1.1.1",
-            "wordwrap": "^1.0.0"
-          },
-          "dependencies": {
-            "abbrev": {
-              "version": "1.0.9",
-              "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-              "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU="
-            },
-            "esprima": {
-              "version": "2.7.3",
-              "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-              "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
-            },
-            "has-flag": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-              "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-            },
-            "nopt": {
-              "version": "3.0.6",
-              "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-              "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-              "requires": {
-                "abbrev": "1"
-              }
-            },
-            "resolve": {
-              "version": "1.1.7",
-              "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-              "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
-            },
-            "supports-color": {
-              "version": "3.2.3",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-              "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-              "requires": {
-                "has-flag": "^1.0.0"
-              }
-            }
-          }
-        },
-        "jasmine": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.2.0.tgz",
-          "integrity": "sha512-qv6TZ32r+slrQz8fbx2EhGbD9zlJo3NwPrpLK1nE8inILtZO9Fap52pyHk7mNTh4tG50a+1+tOiWVT3jO5I0Sg==",
-          "requires": {
-            "glob": "^7.0.6",
-            "jasmine-core": "~3.2.0"
-          },
-          "dependencies": {
-            "glob": {
-              "version": "7.1.3",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-              "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-              "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-              }
-            }
-          }
-        },
-        "jasmine-core": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.2.1.tgz",
-          "integrity": "sha512-pa9tbBWgU0EE4SWgc85T4sa886ufuQdsgruQANhECYjwqgV4z7Vw/499aCaP8ZH79JDS4vhm8doDG9HO4+e4sA=="
-        },
-        "js-tokens": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
-        },
-        "js-yaml": {
-          "version": "3.12.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
-          "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
-          "requires": {
-            "argparse": "^1.0.7",
-            "esprima": "^4.0.0"
-          }
-        },
-        "jsbn": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-          "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-          "optional": true
-        },
-        "json-parse-better-errors": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-          "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
-        },
-        "json-schema": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-          "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-        },
-        "json-schema-traverse": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
-        },
-        "json-stable-stringify": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
-          "integrity": "sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=",
-          "requires": {
-            "jsonify": "~0.0.0"
-          }
-        },
-        "json-stable-stringify-without-jsonify": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-          "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
-        },
-        "json-stringify-safe": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-          "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-        },
-        "jsonify": {
-          "version": "0.0.0",
-          "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-          "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
-        },
-        "jsonparse": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-          "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
-        },
-        "jsprim": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-          "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-          "requires": {
-            "assert-plus": "1.0.0",
-            "extsprintf": "1.3.0",
-            "json-schema": "0.2.3",
-            "verror": "1.10.0"
-          }
-        },
-        "labeled-stream-splicer": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz",
-          "integrity": "sha512-MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==",
-          "requires": {
-            "inherits": "^2.0.1",
-            "isarray": "^2.0.4",
-            "stream-splicer": "^2.0.0"
-          },
-          "dependencies": {
-            "isarray": {
-              "version": "2.0.4",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz",
-              "integrity": "sha512-GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA=="
-            }
-          }
-        },
-        "latest-version": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
-          "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
-          "requires": {
-            "package-json": "^4.0.0"
-          }
-        },
-        "levn": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-          "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-          "requires": {
-            "prelude-ls": "~1.1.2",
-            "type-check": "~0.3.2"
-          }
-        },
-        "load-json-file": {
-          "version": "2.0.0",
-          "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "strip-bom": "^3.0.0"
-          },
-          "dependencies": {
-            "pify": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-            }
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          },
-          "dependencies": {
-            "path-exists": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-              "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
-            }
-          }
-        },
-        "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
-        },
-        "lodash._getnative": {
-          "version": "3.9.1",
-          "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-          "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
-        },
-        "lodash.debounce": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-3.1.1.tgz",
-          "integrity": "sha1-gSIRw3ipTMKdWqTjNGzwv846ffU=",
-          "requires": {
-            "lodash._getnative": "^3.0.0"
-          }
-        },
-        "lodash.memoize": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
-          "integrity": "sha1-LcvSwofLwKVcxCMovQxzYVDVPj8="
-        },
         "loud-rejection": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-          "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-2.2.0.tgz",
+          "integrity": "sha512-S0FayMXku80toa5sZ6Ro4C+s+EtFDCsyJNG/AzFMfX3AxD5Si4dZsgzm/kKnbOxHl5Cv8jBlno8+3XYIh2pNjQ==",
           "requires": {
             "currently-unhandled": "^0.4.1",
-            "signal-exit": "^3.0.0"
+            "signal-exit": "^3.0.2"
           }
         },
-        "lowercase-keys": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-          "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
-        },
-        "lru-cache": {
-          "version": "4.1.3",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
-          "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          },
-          "dependencies": {
-            "yallist": {
-              "version": "2.1.2",
-              "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-              "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
-            }
-          }
-        },
-        "make-dir": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-          "requires": {
-            "pify": "^3.0.0"
-          }
-        },
-        "md5.js": {
-          "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-          "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-          "requires": {
-            "hash-base": "^3.0.0",
-            "inherits": "^2.0.1",
-            "safe-buffer": "^5.1.2"
-          }
-        },
-        "media-typer": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-          "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
-        },
-        "merge-descriptors": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-          "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
-        },
-        "methods": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-          "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
-        },
-        "miller-rabin": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-          "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-          "requires": {
-            "bn.js": "^4.0.0",
-            "brorand": "^1.0.1"
-          }
-        },
-        "mime": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
-        },
-        "mime-db": {
-          "version": "1.36.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz",
-          "integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw=="
-        },
-        "mime-types": {
-          "version": "2.1.20",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz",
-          "integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==",
-          "requires": {
-            "mime-db": "~1.36.0"
-          }
-        },
-        "mimic-fn": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
-        },
-        "minimalistic-assert": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-          "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
-        },
-        "minimalistic-crypto-utils": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-          "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-          "requires": {
-            "minimist": "0.0.8"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "0.0.8",
-              "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-              "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-            }
-          }
-        },
-        "module-deps": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz",
-          "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
-          "requires": {
-            "JSONStream": "^1.0.3",
-            "browser-resolve": "^1.7.0",
-            "cached-path-relative": "^1.0.0",
-            "concat-stream": "~1.5.0",
-            "defined": "^1.0.0",
-            "detective": "^4.0.0",
-            "duplexer2": "^0.1.2",
-            "inherits": "^2.0.1",
-            "parents": "^1.0.0",
-            "readable-stream": "^2.0.2",
-            "resolve": "^1.1.3",
-            "stream-combiner2": "^1.1.1",
-            "subarg": "^1.0.0",
-            "through2": "^2.0.0",
-            "xtend": "^4.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "mute-stream": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-          "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
-        },
-        "natural-compare": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-          "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
-        },
-        "negotiator": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-          "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
-        },
         "nopt": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
@@ -5701,1617 +2862,6 @@
             "abbrev": "1",
             "osenv": "^0.1.4"
           }
-        },
-        "normalize-package-data": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-          "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-          "requires": {
-            "hosted-git-info": "^2.1.4",
-            "is-builtin-module": "^1.0.0",
-            "semver": "2 || 3 || 4 || 5",
-            "validate-npm-package-license": "^3.0.1"
-          }
-        },
-        "npm-package-arg": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz",
-          "integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
-          "requires": {
-            "hosted-git-info": "^2.6.0",
-            "osenv": "^0.1.5",
-            "semver": "^5.5.0",
-            "validate-npm-package-name": "^3.0.0"
-          }
-        },
-        "npm-run-path": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-          "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-          "requires": {
-            "path-key": "^2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-        },
-        "oauth-sign": {
-          "version": "0.9.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-        },
-        "object-keys": {
-          "version": "1.0.12",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
-          "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag=="
-        },
-        "on-finished": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-          "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-          "requires": {
-            "ee-first": "1.1.1"
-          }
-        },
-        "on-headers": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
-          "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c="
-        },
-        "once": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "onetime": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-          "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-          "requires": {
-            "mimic-fn": "^1.0.0"
-          }
-        },
-        "opener": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz",
-          "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA=="
-        },
-        "opn": {
-          "version": "5.4.0",
-          "resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
-          "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
-          "requires": {
-            "is-wsl": "^1.1.0"
-          }
-        },
-        "optimist": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-          "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-          "requires": {
-            "minimist": "~0.0.1",
-            "wordwrap": "~0.0.2"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "0.0.10",
-              "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-              "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
-            },
-            "wordwrap": {
-              "version": "0.0.3",
-              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-              "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
-            }
-          }
-        },
-        "optionator": {
-          "version": "0.8.2",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-          "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-          "requires": {
-            "deep-is": "~0.1.3",
-            "fast-levenshtein": "~2.0.4",
-            "levn": "~0.3.0",
-            "prelude-ls": "~1.1.2",
-            "type-check": "~0.3.2",
-            "wordwrap": "~1.0.0"
-          }
-        },
-        "os-browserify": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz",
-          "integrity": "sha1-ScoCk+CxlZCl9d4Qx/JlphfY/lQ="
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-          "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
-        },
-        "os-name": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz",
-          "integrity": "sha1-GzefZINa98Wn9JizV8uVIVwVnt8=",
-          "requires": {
-            "osx-release": "^1.0.0",
-            "win-release": "^1.0.0"
-          }
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-          "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
-        },
-        "osenv": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-          "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-          "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
-          }
-        },
-        "osx-release": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/osx-release/-/osx-release-1.1.0.tgz",
-          "integrity": "sha1-8heRGigTaUmvG/kwiyQeJzfTzWw=",
-          "requires": {
-            "minimist": "^1.1.0"
-          }
-        },
-        "p-finally": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-          "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
-        },
-        "package-json": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
-          "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
-          "requires": {
-            "got": "^6.7.1",
-            "registry-auth-token": "^3.0.1",
-            "registry-url": "^3.0.3",
-            "semver": "^5.1.0"
-          }
-        },
-        "pako": {
-          "version": "0.2.9",
-          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-          "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU="
-        },
-        "parents": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
-          "integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=",
-          "requires": {
-            "path-platform": "~0.11.15"
-          }
-        },
-        "parse-asn1": {
-          "version": "5.1.1",
-          "resolved": "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
-          "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
-          "requires": {
-            "asn1.js": "^4.0.0",
-            "browserify-aes": "^1.0.0",
-            "create-hash": "^1.1.0",
-            "evp_bytestokey": "^1.0.0",
-            "pbkdf2": "^3.0.3"
-          }
-        },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
-        "parseurl": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
-          "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
-        },
-        "path-browserify": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-          "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "requires": {
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-        },
-        "path-is-inside": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-          "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
-        },
-        "path-key": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
-        },
-        "path-parse": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-          "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
-        },
-        "path-platform": {
-          "version": "0.11.15",
-          "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
-          "integrity": "sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I="
-        },
-        "path-to-regexp": {
-          "version": "0.1.7",
-          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-          "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
-        },
-        "path-type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-          "requires": {
-            "pify": "^2.0.0"
-          },
-          "dependencies": {
-            "pify": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-            }
-          }
-        },
-        "pbkdf2": {
-          "version": "3.0.17",
-          "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
-          "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
-          "requires": {
-            "create-hash": "^1.1.2",
-            "create-hmac": "^1.1.4",
-            "ripemd160": "^2.0.1",
-            "safe-buffer": "^5.0.1",
-            "sha.js": "^2.4.8"
-          }
-        },
-        "pegjs": {
-          "version": "0.10.0",
-          "resolved": "http://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz",
-          "integrity": "sha1-z4uvrm7d/0tafvsYUmnqr0YQ3b0="
-        },
-        "performance-now": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
-        },
-        "pinkie": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-          "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
-        },
-        "pinkie-promise": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-          "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-          "requires": {
-            "pinkie": "^2.0.0"
-          }
-        },
-        "pkg-dir": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
-          "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
-          "requires": {
-            "find-up": "^1.0.0"
-          }
-        },
-        "plist": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz",
-          "integrity": "sha1-V8zbeggh3yGDEhejytVOPhRqECU=",
-          "requires": {
-            "base64-js": "1.2.0",
-            "xmlbuilder": "8.2.2",
-            "xmldom": "0.1.x"
-          }
-        },
-        "pluralize": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-          "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow=="
-        },
-        "prelude-ls": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-          "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
-        },
-        "prepend-http": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-          "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
-        },
-        "process": {
-          "version": "0.11.10",
-          "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-          "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
-        },
-        "progress": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
-          "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8="
-        },
-        "promzard": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz",
-          "integrity": "sha1-JqXW7ox97kyxIggwWs+5O6OCqe4=",
-          "requires": {
-            "read": "1"
-          }
-        },
-        "properties-parser": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz",
-          "integrity": "sha1-ExbpU5/7/ZOEXjabIRAiq9R4dxo=",
-          "requires": {
-            "string.prototype.codepointat": "^0.2.0"
-          }
-        },
-        "proxy-addr": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
-          "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
-          "requires": {
-            "forwarded": "~0.1.2",
-            "ipaddr.js": "1.8.0"
-          }
-        },
-        "pseudomap": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-          "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
-        },
-        "psl": {
-          "version": "1.1.29",
-          "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz",
-          "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ=="
-        },
-        "public-encrypt": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-          "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-          "requires": {
-            "bn.js": "^4.1.0",
-            "browserify-rsa": "^4.0.0",
-            "create-hash": "^1.1.0",
-            "parse-asn1": "^5.0.0",
-            "randombytes": "^2.0.1",
-            "safe-buffer": "^5.1.2"
-          }
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
-        },
-        "q": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-          "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
-        },
-        "qs": {
-          "version": "6.5.1",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
-        },
-        "querystring": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-          "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
-        },
-        "querystring-es3": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-          "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
-        },
-        "randombytes": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-          "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
-          "requires": {
-            "safe-buffer": "^5.1.0"
-          }
-        },
-        "randomfill": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-          "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-          "requires": {
-            "randombytes": "^2.0.5",
-            "safe-buffer": "^5.1.0"
-          }
-        },
-        "range-parser": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-          "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
-        },
-        "raw-body": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
-          "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
-          "requires": {
-            "bytes": "3.0.0",
-            "http-errors": "1.6.2",
-            "iconv-lite": "0.4.19",
-            "unpipe": "1.0.0"
-          },
-          "dependencies": {
-            "depd": {
-              "version": "1.1.1",
-              "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-              "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k="
-            },
-            "http-errors": {
-              "version": "1.6.2",
-              "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
-              "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
-              "requires": {
-                "depd": "1.1.1",
-                "inherits": "2.0.3",
-                "setprototypeof": "1.0.3",
-                "statuses": ">= 1.3.1 < 2"
-              }
-            },
-            "setprototypeof": {
-              "version": "1.0.3",
-              "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
-              "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
-            }
-          }
-        },
-        "rc": {
-          "version": "1.2.8",
-          "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-          "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-          "requires": {
-            "deep-extend": "^0.6.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
-          }
-        },
-        "read": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-          "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
-          "requires": {
-            "mute-stream": "~0.0.4"
-          }
-        },
-        "read-chunk": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-2.1.0.tgz",
-          "integrity": "sha1-agTAkoAF7Z1C4aasVgDhnLx/9lU=",
-          "requires": {
-            "pify": "^3.0.0",
-            "safe-buffer": "^5.1.1"
-          }
-        },
-        "read-only-stream": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz",
-          "integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=",
-          "requires": {
-            "readable-stream": "^2.0.2"
-          }
-        },
-        "read-package-json": {
-          "version": "2.0.13",
-          "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.13.tgz",
-          "integrity": "sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==",
-          "requires": {
-            "glob": "^7.1.1",
-            "graceful-fs": "^4.1.2",
-            "json-parse-better-errors": "^1.0.1",
-            "normalize-package-data": "^2.0.0",
-            "slash": "^1.0.0"
-          },
-          "dependencies": {
-            "glob": {
-              "version": "7.1.3",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-              "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-              "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-              }
-            }
-          }
-        },
-        "read-pkg": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-          "requires": {
-            "load-json-file": "^2.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^2.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-          "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^2.0.0"
-          },
-          "dependencies": {
-            "find-up": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-              "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-              "requires": {
-                "locate-path": "^2.0.0"
-              }
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          },
-          "dependencies": {
-            "isarray": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-              "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-              "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "readline2": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
-          "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "mute-stream": "0.0.5"
-          },
-          "dependencies": {
-            "is-fullwidth-code-point": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-              "requires": {
-                "number-is-nan": "^1.0.0"
-              }
-            },
-            "mute-stream": {
-              "version": "0.0.5",
-              "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
-              "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA="
-            }
-          }
-        },
-        "rechoir": {
-          "version": "0.6.2",
-          "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-          "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-          "requires": {
-            "resolve": "^1.1.6"
-          }
-        },
-        "regexpp": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
-          "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw=="
-        },
-        "registry-auth-token": {
-          "version": "3.3.2",
-          "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
-          "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
-          "requires": {
-            "rc": "^1.1.6",
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "registry-url": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
-          "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
-          "requires": {
-            "rc": "^1.0.1"
-          }
-        },
-        "request": {
-          "version": "2.88.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-          "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-          "requires": {
-            "aws-sign2": "~0.7.0",
-            "aws4": "^1.8.0",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.6",
-            "extend": "~3.0.2",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.3.2",
-            "har-validator": "~5.1.0",
-            "http-signature": "~1.2.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.19",
-            "oauth-sign": "~0.9.0",
-            "performance-now": "^2.1.0",
-            "qs": "~6.5.2",
-            "safe-buffer": "^5.1.2",
-            "tough-cookie": "~2.4.3",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.3.2"
-          },
-          "dependencies": {
-            "qs": {
-              "version": "6.5.2",
-              "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-              "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
-            }
-          }
-        },
-        "require-uncached": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
-          "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-          "requires": {
-            "caller-path": "^0.1.0",
-            "resolve-from": "^1.0.0"
-          }
-        },
-        "resolve": {
-          "version": "1.8.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz",
-          "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
-          "requires": {
-            "path-parse": "^1.0.5"
-          }
-        },
-        "resolve-from": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-          "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY="
-        },
-        "restore-cursor": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-          "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-          "requires": {
-            "onetime": "^2.0.0",
-            "signal-exit": "^3.0.2"
-          }
-        },
-        "rewire": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/rewire/-/rewire-4.0.1.tgz",
-          "integrity": "sha512-+7RQ/BYwTieHVXetpKhT11UbfF6v1kGhKFrtZN7UDL2PybMsSt/rpLWeEUGF5Ndsl1D5BxiCB14VDJyoX+noYw==",
-          "requires": {
-            "eslint": "^4.19.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-          "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-          "requires": {
-            "glob": "^7.0.5"
-          },
-          "dependencies": {
-            "glob": {
-              "version": "7.1.3",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-              "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-              "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-              }
-            }
-          }
-        },
-        "ripemd160": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-          "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-          "requires": {
-            "hash-base": "^3.0.0",
-            "inherits": "^2.0.1"
-          }
-        },
-        "run-async": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-          "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
-          "requires": {
-            "is-promise": "^2.1.0"
-          }
-        },
-        "rx-lite": {
-          "version": "4.0.8",
-          "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
-          "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ="
-        },
-        "rx-lite-aggregates": {
-          "version": "4.0.8",
-          "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
-          "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
-          "requires": {
-            "rx-lite": "*"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-        },
-        "safer-buffer": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-          "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-        },
-        "sax": {
-          "version": "0.3.5",
-          "resolved": "http://registry.npmjs.org/sax/-/sax-0.3.5.tgz",
-          "integrity": "sha1-iPz8H3PAyLvVt8d2ttPzUB7tBz0="
-        },
-        "semver": {
-          "version": "5.5.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz",
-          "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw=="
-        },
-        "semver-diff": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
-          "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
-          "requires": {
-            "semver": "^5.0.3"
-          }
-        },
-        "send": {
-          "version": "0.16.2",
-          "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-          "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
-          "requires": {
-            "debug": "2.6.9",
-            "depd": "~1.1.2",
-            "destroy": "~1.0.4",
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "etag": "~1.8.1",
-            "fresh": "0.5.2",
-            "http-errors": "~1.6.2",
-            "mime": "1.4.1",
-            "ms": "2.0.0",
-            "on-finished": "~2.3.0",
-            "range-parser": "~1.2.0",
-            "statuses": "~1.4.0"
-          }
-        },
-        "serve-static": {
-          "version": "1.13.2",
-          "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
-          "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
-          "requires": {
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "parseurl": "~1.3.2",
-            "send": "0.16.2"
-          }
-        },
-        "setprototypeof": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
-        },
-        "sha.js": {
-          "version": "2.4.11",
-          "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-          "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-          "requires": {
-            "inherits": "^2.0.1",
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "shasum": {
-          "version": "1.0.2",
-          "resolved": "http://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
-          "integrity": "sha1-5wEjENj0F/TetXEhUOVni4euVl8=",
-          "requires": {
-            "json-stable-stringify": "~0.0.0",
-            "sha.js": "~2.4.4"
-          }
-        },
-        "shebang-command": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-          "requires": {
-            "shebang-regex": "^1.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
-        },
-        "shell-quote": {
-          "version": "1.6.1",
-          "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
-          "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
-          "requires": {
-            "array-filter": "~0.0.0",
-            "array-map": "~0.0.0",
-            "array-reduce": "~0.0.0",
-            "jsonify": "~0.0.0"
-          }
-        },
-        "shelljs": {
-          "version": "0.5.3",
-          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz",
-          "integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM="
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
-        },
-        "simple-concat": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz",
-          "integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY="
-        },
-        "simple-plist": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz",
-          "integrity": "sha1-cXZts1IyaSjPOoByQrp2IyJjZyM=",
-          "requires": {
-            "bplist-creator": "0.0.7",
-            "bplist-parser": "0.1.1",
-            "plist": "2.0.1"
-          },
-          "dependencies": {
-            "base64-js": {
-              "version": "1.1.2",
-              "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz",
-              "integrity": "sha1-1kAMrBxMZgl22Q0HoENR2JOV9eg="
-            },
-            "plist": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/plist/-/plist-2.0.1.tgz",
-              "integrity": "sha1-CjLKlIGxw2TpLhjcVch23p0B2os=",
-              "requires": {
-                "base64-js": "1.1.2",
-                "xmlbuilder": "8.2.2",
-                "xmldom": "0.1.x"
-              }
-            }
-          }
-        },
-        "slash": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-          "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU="
-        },
-        "slice-ansi": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-          "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0"
-          }
-        },
-        "slide": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
-          "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc="
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "spdx-correct": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
-          "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
-          "requires": {
-            "spdx-expression-parse": "^3.0.0",
-            "spdx-license-ids": "^3.0.0"
-          }
-        },
-        "spdx-exceptions": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz",
-          "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg=="
-        },
-        "spdx-expression-parse": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-          "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
-          "requires": {
-            "spdx-exceptions": "^2.1.0",
-            "spdx-license-ids": "^3.0.0"
-          }
-        },
-        "spdx-license-ids": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz",
-          "integrity": "sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w=="
-        },
-        "sprintf-js": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-          "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-        },
-        "sshpk": {
-          "version": "1.14.2",
-          "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz",
-          "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=",
-          "requires": {
-            "asn1": "~0.2.3",
-            "assert-plus": "^1.0.0",
-            "bcrypt-pbkdf": "^1.0.0",
-            "dashdash": "^1.12.0",
-            "ecc-jsbn": "~0.1.1",
-            "getpass": "^0.1.1",
-            "jsbn": "~0.1.0",
-            "safer-buffer": "^2.0.2",
-            "tweetnacl": "~0.14.0"
-          }
-        },
-        "statuses": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-          "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
-        },
-        "stream-browserify": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
-          "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
-          "requires": {
-            "inherits": "~2.0.1",
-            "readable-stream": "^2.0.2"
-          }
-        },
-        "stream-buffers": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz",
-          "integrity": "sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ="
-        },
-        "stream-combiner2": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
-          "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
-          "requires": {
-            "duplexer2": "~0.1.0",
-            "readable-stream": "^2.0.2"
-          }
-        },
-        "stream-http": {
-          "version": "2.8.3",
-          "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-          "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-          "requires": {
-            "builtin-status-codes": "^3.0.0",
-            "inherits": "^2.0.1",
-            "readable-stream": "^2.3.6",
-            "to-arraybuffer": "^1.0.0",
-            "xtend": "^4.0.0"
-          }
-        },
-        "stream-splicer": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz",
-          "integrity": "sha1-G2O+Q4oTPktnHMGTUZdgAXWRDYM=",
-          "requires": {
-            "inherits": "^2.0.1",
-            "readable-stream": "^2.0.2"
-          }
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
-          }
-        },
-        "string.prototype.codepointat": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz",
-          "integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="
-        },
-        "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
-        },
-        "strip-eof": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-          "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
-        },
-        "subarg": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
-          "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=",
-          "requires": {
-            "minimist": "^1.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-        },
-        "syntax-error": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz",
-          "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==",
-          "requires": {
-            "acorn-node": "^1.2.0"
-          }
-        },
-        "table": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
-          "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
-          "requires": {
-            "ajv": "^5.2.3",
-            "ajv-keywords": "^2.1.0",
-            "chalk": "^2.1.0",
-            "lodash": "^4.17.4",
-            "slice-ansi": "1.0.0",
-            "string-width": "^2.1.1"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "3.2.1",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-              "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-              "requires": {
-                "color-convert": "^1.9.0"
-              }
-            },
-            "chalk": {
-              "version": "2.4.1",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-              "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-              "requires": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
-              }
-            },
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "tar": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-          "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-          "requires": {
-            "block-stream": "*",
-            "fstream": "^1.0.2",
-            "inherits": "2"
-          }
-        },
-        "term-size": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
-          "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
-          "requires": {
-            "execa": "^0.7.0"
-          }
-        },
-        "text-table": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-          "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
-        },
-        "through": {
-          "version": "2.3.8",
-          "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
-          "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-        },
-        "through2": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-          "requires": {
-            "readable-stream": "^2.1.5",
-            "xtend": "~4.0.1"
-          }
-        },
-        "timed-out": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
-          "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8="
-        },
-        "timers-browserify": {
-          "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
-          "integrity": "sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=",
-          "requires": {
-            "process": "~0.11.0"
-          }
-        },
-        "tmp": {
-          "version": "0.0.33",
-          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-          "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-          "requires": {
-            "os-tmpdir": "~1.0.2"
-          }
-        },
-        "to-arraybuffer": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-          "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
-        },
-        "tough-cookie": {
-          "version": "2.4.3",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-          "requires": {
-            "psl": "^1.1.24",
-            "punycode": "^1.4.1"
-          }
-        },
-        "tty-browserify": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
-          "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="
-        },
-        "tunnel-agent": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-          "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-          "requires": {
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "tweetnacl": {
-          "version": "0.14.5",
-          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-          "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-          "optional": true
-        },
-        "type-check": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-          "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-          "requires": {
-            "prelude-ls": "~1.1.2"
-          }
-        },
-        "type-is": {
-          "version": "1.6.16",
-          "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-          "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
-          "requires": {
-            "media-typer": "0.3.0",
-            "mime-types": "~2.1.18"
-          }
-        },
-        "typedarray": {
-          "version": "0.0.6",
-          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-          "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
-        },
-        "uglify-js": {
-          "version": "3.4.9",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
-          "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
-          "optional": true,
-          "requires": {
-            "commander": "~2.17.1",
-            "source-map": "~0.6.1"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.6.1",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-              "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-              "optional": true
-            }
-          }
-        },
-        "umd": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz",
-          "integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow=="
-        },
-        "undeclared-identifiers": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.2.tgz",
-          "integrity": "sha512-13EaeocO4edF/3JKime9rD7oB6QI8llAGhgn5fKOPyfkJbRb6NFv9pYV6dFEmpa4uRjKeBqLZP8GpuzqHlKDMQ==",
-          "requires": {
-            "acorn-node": "^1.3.0",
-            "get-assigned-identifiers": "^1.2.0",
-            "simple-concat": "^1.0.0",
-            "xtend": "^4.0.1"
-          }
-        },
-        "underscore": {
-          "version": "1.9.1",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
-          "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
-        },
-        "unique-string": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-          "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
-          "requires": {
-            "crypto-random-string": "^1.0.0"
-          }
-        },
-        "unorm": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz",
-          "integrity": "sha1-NkIA1fE2RsqLzURJAnEzVhR5IwA="
-        },
-        "unpipe": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-          "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
-        },
-        "unzip-response": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
-          "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c="
-        },
-        "update-notifier": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
-          "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
-          "requires": {
-            "boxen": "^1.2.1",
-            "chalk": "^2.0.1",
-            "configstore": "^3.0.0",
-            "import-lazy": "^2.1.0",
-            "is-ci": "^1.0.10",
-            "is-installed-globally": "^0.1.0",
-            "is-npm": "^1.0.0",
-            "latest-version": "^3.0.0",
-            "semver-diff": "^2.0.0",
-            "xdg-basedir": "^3.0.0"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "3.2.1",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-              "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-              "requires": {
-                "color-convert": "^1.9.0"
-              }
-            },
-            "chalk": {
-              "version": "2.4.1",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-              "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-              "requires": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
-              }
-            },
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "url": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-          "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-          "requires": {
-            "punycode": "1.3.2",
-            "querystring": "0.2.0"
-          },
-          "dependencies": {
-            "punycode": {
-              "version": "1.3.2",
-              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-              "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
-            }
-          }
-        },
-        "url-parse-lax": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-          "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
-          "requires": {
-            "prepend-http": "^1.0.1"
-          }
-        },
-        "util": {
-          "version": "0.10.4",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-          "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
-          "requires": {
-            "inherits": "2.0.3"
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-        },
-        "utils-merge": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-          "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
-        },
-        "uuid": {
-          "version": "3.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
-        },
-        "valid-identifier": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.1.tgz",
-          "integrity": "sha1-7x1wk6nTKH4/zpLfkW+GFrI/kLQ="
-        },
-        "validate-npm-package-license": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-          "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-          "requires": {
-            "spdx-correct": "^3.0.0",
-            "spdx-expression-parse": "^3.0.0"
-          }
-        },
-        "validate-npm-package-name": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-          "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
-          "requires": {
-            "builtins": "^1.0.3"
-          }
-        },
-        "vary": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-          "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
-        },
-        "verror": {
-          "version": "1.10.0",
-          "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-          "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-          "requires": {
-            "assert-plus": "^1.0.0",
-            "core-util-is": "1.0.2",
-            "extsprintf": "^1.2.0"
-          }
-        },
-        "vm-browserify": {
-          "version": "0.0.4",
-          "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-          "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-          "requires": {
-            "indexof": "0.0.1"
-          }
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        },
-        "widest-line": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz",
-          "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=",
-          "requires": {
-            "string-width": "^2.1.1"
-          }
-        },
-        "win-release": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz",
-          "integrity": "sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=",
-          "requires": {
-            "semver": "^5.0.1"
-          }
-        },
-        "wordwrap": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-        },
-        "write": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-          "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
-          "requires": {
-            "mkdirp": "^0.5.1"
-          }
-        },
-        "write-file-atomic": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
-          "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "imurmurhash": "^0.1.4",
-            "signal-exit": "^3.0.2"
-          }
-        },
-        "xcode": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/xcode/-/xcode-1.0.0.tgz",
-          "integrity": "sha1-4fWxRDJF3tOMGAeW3xoQ/e2ghOw=",
-          "requires": {
-            "pegjs": "^0.10.0",
-            "simple-plist": "^0.2.1",
-            "uuid": "3.0.1"
-          },
-          "dependencies": {
-            "uuid": {
-              "version": "3.0.1",
-              "resolved": "http://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
-              "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE="
-            }
-          }
-        },
-        "xdg-basedir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
-          "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ="
-        },
-        "xmlbuilder": {
-          "version": "8.2.2",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz",
-          "integrity": "sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M="
-        },
-        "xmldom": {
-          "version": "0.1.27",
-          "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
-          "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
-        },
-        "xtend": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
         }
       }
     },
@@ -7356,6 +2906,11 @@
         }
       }
     },
+    "cordova-app-hello-world": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-4.0.0.tgz",
+      "integrity": "sha512-hTNYHUJT5YyMa1cQQE1naGyU6Eh5D5Jl33sMnCh3+q15ZwWTL/TOy3k8+mUvjTp8bwhO5eECGKULYoVO+fp9ZA=="
+    },
     "cordova-clipboard": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/cordova-clipboard/-/cordova-clipboard-1.3.0.tgz",
@@ -7415,6 +2970,89 @@
         }
       }
     },
+    "cordova-create": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-create/-/cordova-create-2.0.0.tgz",
+      "integrity": "sha512-72CaGg/7x+tiZlzeXKQXLTc8Jh4tbwLdu4Ib97kJ6+R3bcew/Yv/l2cVA2E0CaCuOCtouTqwi+YLcA2I4dPFTQ==",
+      "requires": {
+        "cordova-app-hello-world": "^4.0.0",
+        "cordova-common": "^3.1.0",
+        "cordova-fetch": "^2.0.0",
+        "fs-extra": "^7.0.1",
+        "import-fresh": "^3.0.0",
+        "is-url": "^1.2.4",
+        "isobject": "^3.0.1",
+        "path-is-inside": "^1.0.2",
+        "tmp": "0.0.33",
+        "valid-identifier": "0.0.2"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        }
+      }
+    },
+    "cordova-fetch": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-2.0.1.tgz",
+      "integrity": "sha512-q21PeobERzE3Drli5htcl5X9Mtfvodih5VkqIwdRUsjDBCPv+I6ZonRjYGbNnXhYrYx7dm0m0j/7/Smf6Av3hg==",
+      "requires": {
+        "cordova-common": "^3.1.0",
+        "fs-extra": "^7.0.1",
+        "npm-package-arg": "^6.1.0",
+        "pify": "^4.0.1",
+        "resolve": "^1.10.0",
+        "semver": "^5.6.0",
+        "which": "^1.3.1"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "path-parse": {
+          "version": "1.0.6",
+          "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+          "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+        },
+        "resolve": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+          "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
+      }
+    },
     "cordova-ios": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-5.0.1.tgz",
@@ -7442,6 +3080,51 @@
         }
       }
     },
+    "cordova-lib": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/cordova-lib/-/cordova-lib-9.0.1.tgz",
+      "integrity": "sha512-P9nQhq91gLOyKZkamvKNzzK89gLDpq8rKue/Vu7NUSgNzhPkiWW0w+6VRTbj/9QGVM9w2uDVhB9c9f6rrTXzCw==",
+      "requires": {
+        "cordova-common": "^3.1.0",
+        "cordova-create": "^2.0.0",
+        "cordova-fetch": "^2.0.0",
+        "cordova-serve": "^3.0.0",
+        "dep-graph": "1.1.0",
+        "detect-indent": "^5.0.0",
+        "elementtree": "^0.1.7",
+        "fs-extra": "^7.0.1",
+        "globby": "^9.1.0",
+        "indent-string": "^3.2.0",
+        "init-package-json": "^1.10.3",
+        "md5-file": "^4.0.0",
+        "read-chunk": "^3.1.0",
+        "semver": "^5.6.0",
+        "shebang-command": "^1.2.0",
+        "underscore": "^1.9.1"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "indent-string": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+          "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok="
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
+      }
+    },
     "cordova-plugin-badge": {
       "version": "0.8.8",
       "resolved": "https://registry.npmjs.org/cordova-plugin-badge/-/cordova-plugin-badge-0.8.8.tgz",
@@ -7536,18 +3219,30 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-zip/-/cordova-plugin-zip-3.1.0.tgz",
       "integrity": "sha1-F2yCSOog058c+VnvXmFWrMqWshc="
     },
-    "cordova-sqlite-storage": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/cordova-sqlite-storage/-/cordova-sqlite-storage-2.6.0.tgz",
-      "integrity": "sha512-m+KylFwNRsQloJ6TZihupfma2muXkmNglh8cFSiJQqriTTm6eq0gyPaAuKxgoPswe679G+0aUai07NFC/f0GGQ==",
+    "cordova-serve": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-3.0.0.tgz",
+      "integrity": "sha512-h479g/5a0PXn//yiFuMrD5MDEbB+mtihNkWcE6uD/aCh/6z0FRZ9sWH3NfZbHDB+Bp1yGLYsjbH8LZBL8KOQ0w==",
       "requires": {
-        "cordova-sqlite-storage-dependencies": "1.2.1"
+        "chalk": "^2.4.1",
+        "compression": "^1.6.0",
+        "express": "^4.13.3",
+        "opn": "^5.3.0",
+        "which": "^1.3.0"
+      }
+    },
+    "cordova-sqlite-storage": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/cordova-sqlite-storage/-/cordova-sqlite-storage-3.4.0.tgz",
+      "integrity": "sha512-Uavq3HulVIYXxTFCp5aafiQhYrZF0/cGlyN76RYhIftcD5IRhza9+ghhV5abJYvuGlzY+p9dM5hPcjnYxfAH+g==",
+      "requires": {
+        "cordova-sqlite-storage-dependencies": "2.1.0"
       }
     },
     "cordova-sqlite-storage-dependencies": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/cordova-sqlite-storage-dependencies/-/cordova-sqlite-storage-dependencies-1.2.1.tgz",
-      "integrity": "sha512-4ihQApBGVKR1QZ4oOSGctKFfthtCfiWMTcIIfxe97vKxlvGr9NyXOvYG9vXU9S7yVR7Ua+Rj47hkE7pQIKvQTg=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cordova-sqlite-storage-dependencies/-/cordova-sqlite-storage-dependencies-2.1.0.tgz",
+      "integrity": "sha512-m0cPOWPzckAqS0/e7v+xtcM+FrHrw63qgh5T91JdkXMKCK8sN9bDoqVNJHZ5E9y7sRO7liMUIDm6Dz439RYqGA=="
     },
     "cordova-support-google-services": {
       "version": "1.2.1",
@@ -7574,6 +3269,14 @@
         "elliptic": "^6.0.0"
       }
     },
+    "create-error-class": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
+      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
+      "requires": {
+        "capture-stack-trace": "^1.0.0"
+      }
+    },
     "create-hash": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
@@ -7605,7 +3308,6 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
       "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-      "dev": true,
       "requires": {
         "lru-cache": "^4.0.1",
         "shebang-command": "^1.2.0",
@@ -7631,11 +3333,15 @@
         "randomfill": "^1.0.3"
       }
     },
+    "crypto-random-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
+      "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4="
+    },
     "currently-unhandled": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "dev": true,
       "requires": {
         "array-find-index": "^1.0.1"
       }
@@ -7653,7 +3359,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
       },
@@ -7661,8 +3366,7 @@
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
@@ -7682,7 +3386,6 @@
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
       "requires": {
         "ms": "2.0.0"
       }
@@ -7696,8 +3399,7 @@
     "decode-uri-component": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
     },
     "dedent": {
       "version": "0.7.0",
@@ -7709,6 +3411,11 @@
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
       "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
     },
+    "deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
+    },
     "default-compare": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
@@ -7745,7 +3452,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
       "requires": {
         "is-descriptor": "^1.0.2",
         "isobject": "^3.0.1"
@@ -7755,7 +3461,6 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -7764,7 +3469,6 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -7773,7 +3477,6 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -7783,14 +3486,12 @@
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         },
         "kind-of": {
           "version": "6.0.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
         }
       }
     },
@@ -7802,8 +3503,7 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "delegates": {
       "version": "1.0.0",
@@ -7811,11 +3511,25 @@
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
       "dev": true
     },
+    "dep-graph": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz",
+      "integrity": "sha1-+t6GqSeZqBPptCURzfPfpsyNvv4=",
+      "requires": {
+        "underscore": "1.2.1"
+      },
+      "dependencies": {
+        "underscore": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz",
+          "integrity": "sha1-/FxrB2VnPZKi1KyLTcCqiHAuK9Q="
+        }
+      }
+    },
     "depd": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "dev": true
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
     },
     "des.js": {
       "version": "1.0.0",
@@ -7830,8 +3544,7 @@
     "destroy": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-      "dev": true
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
     },
     "detect-file": {
       "version": "1.0.0",
@@ -7839,6 +3552,11 @@
       "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
       "dev": true
     },
+    "detect-indent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz",
+      "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50="
+    },
     "detect-libc": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
@@ -7862,6 +3580,29 @@
         "randombytes": "^2.0.0"
       }
     },
+    "dir-glob": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
+      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
+      "requires": {
+        "path-type": "^3.0.0"
+      },
+      "dependencies": {
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+        }
+      }
+    },
     "doctrine": {
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz",
@@ -7892,6 +3633,14 @@
       "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
       "dev": true
     },
+    "dot-prop": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
+      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+      "requires": {
+        "is-obj": "^1.0.0"
+      }
+    },
     "dotenv": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
@@ -7957,6 +3706,11 @@
         }
       }
     },
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
+    },
     "duplexify": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
@@ -7983,17 +3737,20 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
       "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-      "dev": true,
       "optional": true,
       "requires": {
         "jsbn": "~0.1.0"
       }
     },
+    "editor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz",
+      "integrity": "sha1-YMf4e9YrzGqJT6jM1q+3gjok90I="
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-      "dev": true
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "ejs": {
       "version": "2.6.1",
@@ -8250,14 +4007,12 @@
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "dev": true
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
     },
     "end-of-stream": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
       "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-      "dev": true,
       "requires": {
         "once": "^1.4.0"
       }
@@ -8287,8 +4042,7 @@
     "env-paths": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz",
-      "integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=",
-      "dev": true
+      "integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA="
     },
     "errno": {
       "version": "0.1.7",
@@ -8424,14 +4178,12 @@
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
     },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escope": {
       "version": "3.6.0",
@@ -8481,8 +4233,7 @@
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-      "dev": true
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
     },
     "event-emitter": {
       "version": "0.3.5",
@@ -8514,7 +4265,6 @@
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
       "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-      "dev": true,
       "requires": {
         "cross-spawn": "^5.0.1",
         "get-stream": "^3.0.0",
@@ -8554,7 +4304,6 @@
       "version": "4.16.4",
       "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
       "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
-      "dev": true,
       "requires": {
         "accepts": "~1.3.5",
         "array-flatten": "1.1.1",
@@ -8591,8 +4340,7 @@
         "path-to-regexp": {
           "version": "0.1.7",
           "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-          "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-          "dev": true
+          "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
         }
       }
     },
@@ -8606,7 +4354,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
       "requires": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
@@ -8616,13 +4363,32 @@
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
           "requires": {
             "is-plain-object": "^2.0.4"
           }
         }
       }
     },
+    "external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "requires": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.4.24",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        }
+      }
+    },
     "extglob": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
@@ -8634,8 +4400,7 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "fancy-log": {
       "version": "1.3.2",
@@ -8653,6 +4418,301 @@
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
       "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
     },
+    "fast-glob": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
+      "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
+      "requires": {
+        "@mrmlnc/readdir-enhanced": "^2.2.1",
+        "@nodelib/fs.stat": "^1.1.2",
+        "glob-parent": "^3.1.0",
+        "is-glob": "^4.0.0",
+        "merge2": "^1.2.3",
+        "micromatch": "^3.1.10"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "requires": {
+                "is-accessor-descriptor": "^0.1.6",
+                "is-data-descriptor": "^0.1.4",
+                "kind-of": "^5.0.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+        },
+        "is-glob": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        }
+      }
+    },
     "fast-json-parse": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz",
@@ -8672,6 +4732,14 @@
         "websocket-driver": ">=0.5.1"
       }
     },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
     "filename-regex": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
@@ -8693,7 +4761,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
       "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
-      "dev": true,
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
@@ -9080,14 +5147,12 @@
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
       "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
       "requires": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.6",
@@ -9097,14 +5162,12 @@
     "forwarded": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-      "dev": true
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
     },
     "fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "dev": true,
       "requires": {
         "map-cache": "^0.2.2"
       }
@@ -9112,8 +5175,7 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-      "dev": true
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
     },
     "fs-extra": {
       "version": "4.0.3",
@@ -9708,20 +5770,17 @@
     "get-stream": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
     },
     "get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
     },
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
       },
@@ -9729,8 +5788,7 @@
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
@@ -9809,6 +5867,11 @@
         }
       }
     },
+    "glob-to-regexp": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
+      "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs="
+    },
     "glob-watcher": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz",
@@ -10745,6 +6808,14 @@
         }
       }
     },
+    "global-dirs": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
+      "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
+      "requires": {
+        "ini": "^1.3.4"
+      }
+    },
     "global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
@@ -10769,6 +6840,46 @@
         "which": "^1.2.14"
       }
     },
+    "globby": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz",
+      "integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==",
+      "requires": {
+        "@types/glob": "^7.1.1",
+        "array-union": "^1.0.2",
+        "dir-glob": "^2.2.2",
+        "fast-glob": "^2.2.6",
+        "glob": "^7.1.3",
+        "ignore": "^4.0.3",
+        "pify": "^4.0.1",
+        "slash": "^2.0.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+        },
+        "slash": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="
+        }
+      }
+    },
     "globule": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
@@ -10789,6 +6900,24 @@
         "sparkles": "^1.0.0"
       }
     },
+    "got": {
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+      "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
+      "requires": {
+        "create-error-class": "^3.0.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^3.0.0",
+        "is-redirect": "^1.0.0",
+        "is-retry-allowed": "^1.0.0",
+        "is-stream": "^1.0.0",
+        "lowercase-keys": "^1.0.0",
+        "safe-buffer": "^5.0.1",
+        "timed-out": "^4.0.0",
+        "unzip-response": "^2.0.1",
+        "url-parse-lax": "^1.0.0"
+      }
+    },
     "graceful-fs": {
       "version": "4.1.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
@@ -11028,14 +7157,12 @@
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
       "version": "5.1.3",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
       "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "dev": true,
       "requires": {
         "ajv": "^6.5.5",
         "har-schema": "^2.0.0"
@@ -11045,7 +7172,6 @@
           "version": "6.9.1",
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
           "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
-          "dev": true,
           "requires": {
             "fast-deep-equal": "^2.0.1",
             "fast-json-stable-stringify": "^2.0.0",
@@ -11056,14 +7182,12 @@
         "fast-deep-equal": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
         },
         "json-schema-traverse": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
         }
       }
     },
@@ -11087,8 +7211,7 @@
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
     "has-gulplog": {
       "version": "0.1.0",
@@ -11115,7 +7238,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "dev": true,
       "requires": {
         "get-value": "^2.0.6",
         "has-values": "^1.0.0",
@@ -11125,8 +7247,7 @@
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         }
       }
     },
@@ -11134,7 +7255,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "dev": true,
       "requires": {
         "is-number": "^3.0.0",
         "kind-of": "^4.0.0"
@@ -11144,7 +7264,6 @@
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
           },
@@ -11153,7 +7272,6 @@
               "version": "3.2.2",
               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
               "requires": {
                 "is-buffer": "^1.1.5"
               }
@@ -11164,7 +7282,6 @@
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -11214,14 +7331,12 @@
     "hosted-git-info": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz",
-      "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==",
-      "dev": true
+      "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw=="
     },
     "http-errors": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
       "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-      "dev": true,
       "requires": {
         "depd": "~1.1.2",
         "inherits": "2.0.3",
@@ -11239,7 +7354,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
         "jsprim": "^1.2.2",
@@ -11256,7 +7370,6 @@
       "version": "0.4.23",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
       "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
-      "dev": true,
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3"
       }
@@ -11267,11 +7380,35 @@
       "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
       "dev": true
     },
+    "ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
+    },
     "immediate": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
       "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
     },
+    "import-fresh": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz",
+      "integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==",
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
+    "import-lazy": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
+      "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM="
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+    },
     "in-publish": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
@@ -11310,8 +7447,168 @@
     "ini": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-      "dev": true
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+    },
+    "init-package-json": {
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.3.tgz",
+      "integrity": "sha512-zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw==",
+      "requires": {
+        "glob": "^7.1.1",
+        "npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0",
+        "promzard": "^0.3.0",
+        "read": "~1.0.1",
+        "read-package-json": "1 || 2",
+        "semver": "2.x || 3.x || 4 || 5",
+        "validate-npm-package-license": "^3.0.1",
+        "validate-npm-package-name": "^3.0.0"
+      }
+    },
+    "inquirer": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
+      "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
+      "requires": {
+        "ansi-escapes": "^3.2.0",
+        "chalk": "^2.4.2",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^2.0.0",
+        "lodash": "^4.17.12",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rxjs": "^6.4.0",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^5.1.0",
+        "through": "^2.3.6"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "mute-stream": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+          "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
+        },
+        "rxjs": {
+          "version": "6.5.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
+          "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+            }
+          }
+        }
+      }
+    },
+    "insight": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/insight/-/insight-0.10.3.tgz",
+      "integrity": "sha512-YOncxSN6Omh+1Oqxt+OJAvJVMDKw7l6IEG0wT2cTMGxjsTcroOGW4IR926QDzxg/uZHcFZ2cZbckDWdZhc2pZw==",
+      "requires": {
+        "async": "^2.6.2",
+        "chalk": "^2.4.2",
+        "conf": "^1.4.0",
+        "inquirer": "^6.3.1",
+        "lodash.debounce": "^4.0.8",
+        "os-name": "^3.1.0",
+        "request": "^2.88.0",
+        "tough-cookie": "^3.0.1",
+        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "macos-release": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.3.0.tgz",
+          "integrity": "sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA=="
+        },
+        "os-name": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz",
+          "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==",
+          "requires": {
+            "macos-release": "^2.2.0",
+            "windows-release": "^3.1.0"
+          }
+        },
+        "punycode": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+        },
+        "tough-cookie": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
+          "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+          "requires": {
+            "ip-regex": "^2.1.0",
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          }
+        }
+      }
     },
     "install": {
       "version": "0.8.9",
@@ -11366,11 +7663,15 @@
         }
       }
     },
+    "ip-regex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
+    },
     "ipaddr.js": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
-      "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=",
-      "dev": true
+      "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4="
     },
     "is-absolute": {
       "version": "1.0.0",
@@ -11386,7 +7687,6 @@
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
       "requires": {
         "kind-of": "^3.0.2"
       }
@@ -11414,7 +7714,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-      "dev": true,
       "requires": {
         "builtin-modules": "^1.0.0"
       }
@@ -11428,7 +7727,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz",
       "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==",
-      "dev": true,
       "requires": {
         "ci-info": "^1.0.0"
       }
@@ -11437,7 +7735,6 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
       "requires": {
         "kind-of": "^3.0.2"
       }
@@ -11451,7 +7748,6 @@
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
       "requires": {
         "is-accessor-descriptor": "^0.1.6",
         "is-data-descriptor": "^0.1.4",
@@ -11461,8 +7757,7 @@
         "kind-of": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
         }
       }
     },
@@ -11515,6 +7810,15 @@
         "is-extglob": "^1.0.0"
       }
     },
+    "is-installed-globally": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz",
+      "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
+      "requires": {
+        "global-dirs": "^0.1.0",
+        "is-path-inside": "^1.0.0"
+      }
+    },
     "is-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
@@ -11527,6 +7831,11 @@
       "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
       "dev": true
     },
+    "is-npm": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
+      "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ="
+    },
     "is-number": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
@@ -11535,11 +7844,15 @@
         "kind-of": "^3.0.2"
       }
     },
+    "is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
+    },
     "is-odd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
       "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
-      "dev": true,
       "requires": {
         "is-number": "^4.0.0"
       },
@@ -11547,16 +7860,22 @@
         "is-number": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
         }
       }
     },
+    "is-path-inside": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+      "requires": {
+        "path-is-inside": "^1.0.1"
+      }
+    },
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
       "requires": {
         "isobject": "^3.0.1"
       },
@@ -11564,8 +7883,7 @@
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         }
       }
     },
@@ -11579,6 +7897,16 @@
       "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
       "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
     },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
+    },
+    "is-redirect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ="
+    },
     "is-regex": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
@@ -11596,11 +7924,15 @@
         "is-unc-path": "^1.0.0"
       }
     },
+    "is-retry-allowed": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="
+    },
     "is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "dev": true
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
     },
     "is-symbol": {
       "version": "1.0.1",
@@ -11610,8 +7942,7 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "is-unc-path": {
       "version": "1.0.0",
@@ -11622,6 +7953,11 @@
         "unc-path-regex": "^0.1.2"
       }
     },
+    "is-url": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
+      "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="
+    },
     "is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
@@ -11637,8 +7973,12 @@
     "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
+    },
+    "is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0="
     },
     "isarray": {
       "version": "1.0.0",
@@ -11670,8 +8010,7 @@
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "js-base64": {
       "version": "2.5.1",
@@ -11699,7 +8038,6 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true,
       "optional": true
     },
     "json-loader": {
@@ -11708,11 +8046,15 @@
       "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
       "dev": true
     },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
+    },
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "json-schema-traverse": {
       "version": "0.4.1",
@@ -11728,8 +8070,7 @@
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "json5": {
       "version": "1.0.1",
@@ -11752,7 +8093,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
       "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
@@ -11763,8 +8103,7 @@
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
@@ -11829,6 +8168,14 @@
         "es6-weak-map": "^2.0.1"
       }
     },
+    "latest-version": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
+      "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
+      "requires": {
+        "package-json": "^4.0.0"
+      }
+    },
     "lazy-cache": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
@@ -11932,7 +8279,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
       "requires": {
         "p-locate": "^2.0.0",
         "path-exists": "^3.0.0"
@@ -11941,16 +8287,14 @@
         "path-exists": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
         }
       }
     },
     "lodash": {
       "version": "4.17.15",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-      "dev": true
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
     },
     "lodash._basecopy": {
       "version": "3.0.1",
@@ -12018,6 +8362,11 @@
       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
       "dev": true
     },
+    "lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
+    },
     "lodash.escape": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
@@ -12114,11 +8463,15 @@
         "signal-exit": "^3.0.0"
       }
     },
+    "lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
+    },
     "lru-cache": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
       "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "dev": true,
       "requires": {
         "pseudomap": "^1.0.2",
         "yallist": "^2.1.2"
@@ -12139,6 +8492,21 @@
         "vlq": "^0.2.2"
       }
     },
+    "make-dir": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "requires": {
+        "pify": "^3.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+        }
+      }
+    },
     "make-iterator": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
@@ -12159,8 +8527,7 @@
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
     },
     "map-obj": {
       "version": "1.0.1",
@@ -12172,7 +8539,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
       "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "dev": true,
       "requires": {
         "object-visit": "^1.0.0"
       }
@@ -12497,6 +8863,11 @@
       "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
       "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="
     },
+    "md5-file": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-4.0.0.tgz",
+      "integrity": "sha512-UC0qFwyAjn4YdPpKaDNw6gNxRf7Mcx7jC1UGCY4boCzgvU2Aoc1mOGzTtrjjLKhM5ivsnhoKpQVxKPp+1j1qwg=="
+    },
     "md5.js": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
@@ -12511,8 +8882,7 @@
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "dev": true
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
     "mem": {
       "version": "1.1.0",
@@ -12554,14 +8924,17 @@
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-      "dev": true
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+    },
+    "merge2": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz",
+      "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw=="
     },
     "methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-      "dev": true
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
     "micromatch": {
       "version": "2.3.11",
@@ -12596,20 +8969,17 @@
     "mime": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-      "dev": true
+      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
     },
     "mime-db": {
       "version": "1.38.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
-      "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==",
-      "dev": true
+      "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="
     },
     "mime-types": {
       "version": "2.1.22",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
       "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
-      "dev": true,
       "requires": {
         "mime-db": "~1.38.0"
       }
@@ -12617,8 +8987,7 @@
     "mimic-fn": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-      "dev": true
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
     },
     "minimalistic-assert": {
       "version": "1.0.1",
@@ -12649,7 +9018,6 @@
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
       "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "dev": true,
       "requires": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
@@ -12659,7 +9027,6 @@
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
           "requires": {
             "is-plain-object": "^2.0.4"
           }
@@ -12689,8 +9056,7 @@
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "multipipe": {
       "version": "0.1.2",
@@ -12707,6 +9073,11 @@
       "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
       "dev": true
     },
+    "mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
+    },
     "nan": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
@@ -12717,7 +9088,6 @@
       "version": "1.2.9",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz",
       "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
-      "dev": true,
       "requires": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
@@ -12736,28 +9106,24 @@
         "arr-diff": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
         },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-          "dev": true
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
         },
         "kind-of": {
           "version": "6.0.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
         }
       }
     },
     "negotiator": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
-      "dev": true
+      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
     },
     "neo-async": {
       "version": "2.6.0",
@@ -13100,7 +9466,6 @@
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
       "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-      "dev": true,
       "requires": {
         "hosted-git-info": "^2.1.4",
         "is-builtin-module": "^1.0.0",
@@ -13131,11 +9496,33 @@
         "once": "^1.3.2"
       }
     },
+    "npm-package-arg": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
+      "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+      "requires": {
+        "hosted-git-info": "^2.7.1",
+        "osenv": "^0.1.5",
+        "semver": "^5.6.0",
+        "validate-npm-package-name": "^3.0.0"
+      },
+      "dependencies": {
+        "hosted-git-info": {
+          "version": "2.8.4",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz",
+          "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ=="
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
+      }
+    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "dev": true,
       "requires": {
         "path-key": "^2.0.0"
       }
@@ -13167,8 +9554,7 @@
     "oauth-sign": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
     },
     "object-assign": {
       "version": "4.1.1",
@@ -13180,7 +9566,6 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
       "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "dev": true,
       "requires": {
         "copy-descriptor": "^0.1.0",
         "define-property": "^0.2.5",
@@ -13191,7 +9576,6 @@
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -13212,7 +9596,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
       "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "dev": true,
       "requires": {
         "isobject": "^3.0.0"
       },
@@ -13220,8 +9603,7 @@
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         }
       }
     },
@@ -13300,7 +9682,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
       "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
       "requires": {
         "isobject": "^3.0.1"
       },
@@ -13308,8 +9689,7 @@
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         }
       }
     },
@@ -13346,11 +9726,15 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
       "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dev": true,
       "requires": {
         "ee-first": "1.1.1"
       }
     },
+    "on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
+    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -13363,11 +9747,18 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
       "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-      "dev": true,
       "requires": {
         "mimic-fn": "^1.0.0"
       }
     },
+    "opn": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
+      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
+      "requires": {
+        "is-wsl": "^1.1.0"
+      }
+    },
     "ora": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/ora/-/ora-1.4.0.tgz",
@@ -13436,14 +9827,12 @@
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
     },
     "p-limit": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
       "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dev": true,
       "requires": {
         "p-try": "^1.0.0"
       }
@@ -13452,7 +9841,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
       "requires": {
         "p-limit": "^1.1.0"
       }
@@ -13460,14 +9848,32 @@
     "p-try": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
+    },
+    "package-json": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
+      "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
+      "requires": {
+        "got": "^6.7.1",
+        "registry-auth-token": "^3.0.1",
+        "registry-url": "^3.0.3",
+        "semver": "^5.1.0"
+      }
     },
     "pako": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
       "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg=="
     },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
     "parse-asn1": {
       "version": "5.1.4",
       "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
@@ -13522,14 +9928,12 @@
     "parseurl": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
-      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
-      "dev": true
+      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
     },
     "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
     },
     "path-browserify": {
       "version": "0.0.0",
@@ -13540,8 +9944,7 @@
     "path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-      "dev": true
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA="
     },
     "path-exists": {
       "version": "2.1.0",
@@ -13557,6 +9960,11 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
+    },
     "path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
@@ -13625,8 +10033,7 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "phonegap-plugin-multidex": {
       "version": "1.0.0",
@@ -13662,6 +10069,24 @@
         "pinkie": "^2.0.0"
       }
     },
+    "pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
+      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
+      "requires": {
+        "find-up": "^2.1.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        }
+      }
+    },
     "plist": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
@@ -13727,8 +10152,7 @@
     "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "dev": true
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
     },
     "postcss": {
       "version": "6.0.23",
@@ -13747,6 +10171,11 @@
       "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
       "dev": true
     },
+    "prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
+    },
     "preserve": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
@@ -13779,6 +10208,14 @@
         "function-bind": "^1.1.1"
       }
     },
+    "promzard": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz",
+      "integrity": "sha1-JqXW7ox97kyxIggwWs+5O6OCqe4=",
+      "requires": {
+        "read": "1"
+      }
+    },
     "properties-parser": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz",
@@ -13791,7 +10228,6 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
       "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
-      "dev": true,
       "requires": {
         "forwarded": "~0.1.2",
         "ipaddr.js": "1.8.0"
@@ -13812,14 +10248,12 @@
     "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-      "dev": true
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
     },
     "psl": {
       "version": "1.1.29",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz",
-      "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==",
-      "dev": true
+      "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ=="
     },
     "public-encrypt": {
       "version": "4.0.3",
@@ -13859,8 +10293,7 @@
     "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-      "dev": true
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
     },
     "q": {
       "version": "1.5.1",
@@ -13870,8 +10303,7 @@
     "qs": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "dev": true
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
     },
     "querystring": {
       "version": "0.2.0",
@@ -13929,14 +10361,12 @@
     "range-parser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
-      "dev": true
+      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
     },
     "raw-body": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
       "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
-      "dev": true,
       "requires": {
         "bytes": "3.0.0",
         "http-errors": "1.6.3",
@@ -13944,6 +10374,41 @@
         "unpipe": "1.0.0"
       }
     },
+    "rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "requires": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      }
+    },
+    "read": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+      "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
+      "requires": {
+        "mute-stream": "~0.0.4"
+      }
+    },
+    "read-chunk": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-3.2.0.tgz",
+      "integrity": "sha512-CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ==",
+      "requires": {
+        "pify": "^4.0.1",
+        "with-open-file": "^0.1.6"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+        }
+      }
+    },
     "read-config-file": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.1.0.tgz",
@@ -14002,6 +10467,25 @@
         }
       }
     },
+    "read-package-json": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.0.tgz",
+      "integrity": "sha512-KLhu8M1ZZNkMcrq1+0UJbR8Dii8KZUqB0Sha4mOx/bknfKI/fyrQVrG/YIt2UOtG667sD8+ee4EXMM91W9dC+A==",
+      "requires": {
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.1.2",
+        "json-parse-better-errors": "^1.0.1",
+        "normalize-package-data": "^2.0.0",
+        "slash": "^1.0.0"
+      },
+      "dependencies": {
+        "slash": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+          "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU="
+        }
+      }
+    },
     "read-pkg": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
@@ -14084,12 +10568,28 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dev": true,
       "requires": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
       }
     },
+    "registry-auth-token": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
+      "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
+      "requires": {
+        "rc": "^1.1.6",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "registry-url": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
+      "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
+      "requires": {
+        "rc": "^1.0.1"
+      }
+    },
     "remove-bom-buffer": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
@@ -14156,7 +10656,6 @@
       "version": "2.88.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
       "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-      "dev": true,
       "requires": {
         "aws-sign2": "~0.7.0",
         "aws4": "^1.8.0",
@@ -14183,8 +10682,7 @@
         "extend": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-          "dev": true
+          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
         }
       }
     },
@@ -14219,6 +10717,11 @@
         "global-modules": "^1.0.0"
       }
     },
+    "resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
+    },
     "resolve-options": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
@@ -14231,14 +10734,12 @@
     "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "dev": true
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
     },
     "restore-cursor": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
       "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-      "dev": true,
       "requires": {
         "onetime": "^2.0.0",
         "signal-exit": "^3.0.2"
@@ -14255,8 +10756,7 @@
     "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
     },
     "right-align": {
       "version": "0.1.3",
@@ -14609,6 +11109,14 @@
         }
       }
     },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
+    },
     "rxjs": {
       "version": "5.5.11",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz",
@@ -14632,7 +11140,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "dev": true,
       "requires": {
         "ret": "~0.1.10"
       }
@@ -14640,8 +11147,7 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sanitize-filename": {
       "version": "1.6.1",
@@ -14696,6 +11202,14 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
       "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
     },
+    "semver-diff": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
+      "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
+      "requires": {
+        "semver": "^5.0.3"
+      }
+    },
     "semver-greatest-satisfied-range": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
@@ -14709,7 +11223,6 @@
       "version": "0.16.2",
       "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
       "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
-      "dev": true,
       "requires": {
         "debug": "2.6.9",
         "depd": "~1.1.2",
@@ -14730,7 +11243,6 @@
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
       "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
-      "dev": true,
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
@@ -14758,7 +11270,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
       "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "dev": true,
       "requires": {
         "extend-shallow": "^2.0.1",
         "is-extendable": "^0.1.1",
@@ -14770,7 +11281,6 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -14786,8 +11296,7 @@
     "setprototypeof": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-      "dev": true
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
     },
     "sha.js": {
       "version": "2.4.11",
@@ -14820,8 +11329,7 @@
     "signal-exit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
     "simctl": {
       "version": "2.0.0",
@@ -14859,7 +11367,6 @@
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "dev": true,
       "requires": {
         "base": "^0.11.1",
         "debug": "^2.2.0",
@@ -14875,7 +11382,6 @@
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -14884,7 +11390,6 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -14892,8 +11397,7 @@
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
         }
       }
     },
@@ -14901,7 +11405,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
       "requires": {
         "define-property": "^1.0.0",
         "isobject": "^3.0.0",
@@ -14912,7 +11415,6 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
           "requires": {
             "is-descriptor": "^1.0.0"
           }
@@ -14921,7 +11423,6 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -14930,7 +11431,6 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -14939,7 +11439,6 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -14949,14 +11448,12 @@
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         },
         "kind-of": {
           "version": "6.0.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
         }
       }
     },
@@ -14964,7 +11461,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
       "requires": {
         "kind-of": "^3.2.0"
       }
@@ -14984,7 +11480,6 @@
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
       "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-      "dev": true,
       "requires": {
         "atob": "^2.1.1",
         "decode-uri-component": "^0.2.0",
@@ -15005,8 +11500,7 @@
     "source-map-url": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
-      "dev": true
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
     },
     "sparkles": {
       "version": "1.0.1",
@@ -15029,7 +11523,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
       "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
-      "dev": true,
       "requires": {
         "spdx-expression-parse": "^3.0.0",
         "spdx-license-ids": "^3.0.0"
@@ -15038,14 +11531,12 @@
     "spdx-exceptions": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz",
-      "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==",
-      "dev": true
+      "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg=="
     },
     "spdx-expression-parse": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
       "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
-      "dev": true,
       "requires": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
@@ -15054,14 +11545,12 @@
     "spdx-license-ids": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz",
-      "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==",
-      "dev": true
+      "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA=="
     },
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
       "requires": {
         "extend-shallow": "^3.0.0"
       }
@@ -15076,7 +11565,6 @@
       "version": "1.14.2",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz",
       "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=",
-      "dev": true,
       "requires": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -15092,8 +11580,7 @@
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
@@ -15113,7 +11600,6 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "dev": true,
       "requires": {
         "define-property": "^0.2.5",
         "object-copy": "^0.1.0"
@@ -15123,7 +11609,6 @@
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -15133,8 +11618,7 @@
     "statuses": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-      "dev": true
+      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
     },
     "stdout-stream": {
       "version": "1.4.1",
@@ -15246,8 +11730,7 @@
     "strip-eof": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-      "dev": true
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
     },
     "strip-indent": {
       "version": "1.0.1",
@@ -15258,6 +11741,11 @@
         "get-stdin": "^4.0.1"
       }
     },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+    },
     "sumchecker": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz",
@@ -15271,7 +11759,6 @@
       "version": "5.4.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
       "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-      "dev": true,
       "requires": {
         "has-flag": "^3.0.0"
       }
@@ -15401,6 +11888,14 @@
         "lazy-val": "^1.0.3"
       }
     },
+    "term-size": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
+      "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
+      "requires": {
+        "execa": "^0.7.0"
+      }
+    },
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -15432,6 +11927,11 @@
       "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
       "dev": true
     },
+    "timed-out": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8="
+    },
     "timers-browserify": {
       "version": "2.0.10",
       "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
@@ -15472,6 +11972,14 @@
         }
       }
     },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
     "to-absolute-glob": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
@@ -15492,7 +12000,6 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "dev": true,
       "requires": {
         "kind-of": "^3.0.2"
       }
@@ -15501,7 +12008,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dev": true,
       "requires": {
         "define-property": "^2.0.2",
         "extend-shallow": "^3.0.2",
@@ -15513,7 +12019,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
       "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
       "requires": {
         "is-number": "^3.0.0",
         "repeat-string": "^1.6.1"
@@ -15523,7 +12028,6 @@
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
           }
@@ -15543,7 +12047,6 @@
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
       "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-      "dev": true,
       "requires": {
         "psl": "^1.1.24",
         "punycode": "^1.4.1"
@@ -15652,7 +12155,6 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
       "requires": {
         "safe-buffer": "^5.0.1"
       }
@@ -15661,14 +12163,12 @@
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true,
       "optional": true
     },
     "type-is": {
       "version": "1.6.16",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
       "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
-      "dev": true,
       "requires": {
         "media-typer": "0.3.0",
         "mime-types": "~2.1.18"
@@ -15814,7 +12314,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
       "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
@@ -15832,6 +12331,14 @@
         "through2-filter": "^3.0.0"
       }
     },
+    "unique-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+      "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
+      "requires": {
+        "crypto-random-string": "^1.0.0"
+      }
+    },
     "universalify": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
@@ -15845,14 +12352,12 @@
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
     },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dev": true,
       "requires": {
         "has-value": "^0.3.1",
         "isobject": "^3.0.0"
@@ -15862,7 +12367,6 @@
           "version": "0.3.1",
           "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
           "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-          "dev": true,
           "requires": {
             "get-value": "^2.0.3",
             "has-values": "^0.1.4",
@@ -15873,7 +12377,6 @@
               "version": "2.1.0",
               "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
               "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-              "dev": true,
               "requires": {
                 "isarray": "1.0.0"
               }
@@ -15883,23 +12386,58 @@
         "has-values": {
           "version": "0.1.4",
           "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-          "dev": true
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
         },
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
         }
       }
     },
+    "unzip-response": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
+      "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c="
+    },
     "upath": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
       "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
       "dev": true
     },
+    "update-notifier": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
+      "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
+      "requires": {
+        "boxen": "^1.2.1",
+        "chalk": "^2.0.1",
+        "configstore": "^3.0.0",
+        "import-lazy": "^2.1.0",
+        "is-ci": "^1.0.10",
+        "is-installed-globally": "^0.1.0",
+        "is-npm": "^1.0.0",
+        "latest-version": "^3.0.0",
+        "semver-diff": "^2.0.0",
+        "xdg-basedir": "^3.0.0"
+      },
+      "dependencies": {
+        "configstore": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
+          "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
+          "requires": {
+            "dot-prop": "^4.1.0",
+            "graceful-fs": "^4.1.2",
+            "make-dir": "^1.0.0",
+            "unique-string": "^1.0.0",
+            "write-file-atomic": "^2.0.0",
+            "xdg-basedir": "^3.0.0"
+          }
+        }
+      }
+    },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -15918,8 +12456,7 @@
     "urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
     },
     "url": {
       "version": "0.11.0",
@@ -15939,11 +12476,18 @@
         }
       }
     },
+    "url-parse-lax": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+      "requires": {
+        "prepend-http": "^1.0.1"
+      }
+    },
     "use": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz",
       "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==",
-      "dev": true,
       "requires": {
         "kind-of": "^6.0.2"
       },
@@ -15951,8 +12495,7 @@
         "kind-of": {
           "version": "6.0.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
         }
       }
     },
@@ -15979,8 +12522,7 @@
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "dev": true
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
     "uuid": {
       "version": "3.3.2",
@@ -15996,16 +12538,28 @@
         "homedir-polyfill": "^1.0.1"
       }
     },
+    "valid-identifier": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.2.tgz",
+      "integrity": "sha512-zaSmOW6ykXwrkX0YTuFUSoALNEKGaQHpxBJQLb3TXspRNDpBwbfrIQCZqAQ0LKBlKuyn2YOq7NNd6415hvZ33g=="
+    },
     "validate-npm-package-license": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz",
       "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==",
-      "dev": true,
       "requires": {
         "spdx-correct": "^3.0.0",
         "spdx-expression-parse": "^3.0.0"
       }
     },
+    "validate-npm-package-name": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
+      "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+      "requires": {
+        "builtins": "^1.0.3"
+      }
+    },
     "value-or-function": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
@@ -16015,14 +12569,12 @@
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-      "dev": true
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
     },
     "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
@@ -16032,8 +12584,7 @@
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
@@ -17322,6 +13873,43 @@
         "string-width": "^1.0.2 || 2"
       }
     },
+    "widest-line": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",
+      "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==",
+      "requires": {
+        "string-width": "^2.1.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
     "win-release": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz",
@@ -17337,6 +13925,81 @@
       "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
       "dev": true
     },
+    "windows-release": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.2.0.tgz",
+      "integrity": "sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==",
+      "requires": {
+        "execa": "^1.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
+    },
+    "with-open-file": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.6.tgz",
+      "integrity": "sha512-SQS05JekbtwQSgCYlBsZn/+m2gpn4zWsqpCYIrCHva0+ojXcnmUEPsBN6Ipoz3vmY/81k5PvYEWSxER2g4BTqA==",
+      "requires": {
+        "p-finally": "^1.0.0",
+        "p-try": "^2.1.0",
+        "pify": "^4.0.1"
+      },
+      "dependencies": {
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+        }
+      }
+    },
     "wordwrap": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
@@ -17358,6 +14021,16 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
+    "write-file-atomic": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
+      "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.2"
+      }
+    },
     "ws": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.2.tgz",
@@ -17378,6 +14051,11 @@
         "uuid": "^3.3.2"
       }
     },
+    "xdg-basedir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
+      "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ="
+    },
     "xml-escape": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/xml-escape/-/xml-escape-1.1.0.tgz",
@@ -17418,8 +14096,7 @@
     "yallist": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-      "dev": true
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
     },
     "yargs": {
       "version": "7.1.0",
diff --git a/package.json b/package.json
index 9e7dedecd..b9ef3e13e 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "ajv": "^6.10.2",
     "chart.js": "^2.7.2",
     "com-darryncampbell-cordova-plugin-intent": "^1.1.7",
-    "cordova": "8.1.2",
+    "cordova": "9.0.0",
     "cordova-android": "8.0.0",
     "cordova-android-support-gradle-release": "^3.0.1",
     "cordova-clipboard": "^1.3.0",
@@ -106,7 +106,7 @@
     "cordova-plugin-statusbar": "^2.4.3",
     "cordova-plugin-whitelist": "^1.3.4",
     "cordova-plugin-zip": "^3.1.0",
-    "cordova-sqlite-storage": "^2.6.0",
+    "cordova-sqlite-storage": "^3.4.0",
     "cordova-support-google-services": "^1.2.1",
     "es6-promise-plugin": "^4.2.2",
     "font-awesome": "^4.7.0",

From 88323319bc7287469c4c395b7fac441a31ee554c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 20 Sep 2019 11:18:36 +0200
Subject: [PATCH 067/257] MOBILE-2491 filter: Implement basic filters

---
 .../activitynames/activitynames.module.ts     |  34 +++++
 .../filter/activitynames/providers/handler.ts |  32 ++++
 src/addon/filter/censor/censor.module.ts      |  34 +++++
 src/addon/filter/censor/providers/handler.ts  |  32 ++++
 src/addon/filter/data/data.module.ts          |  34 +++++
 src/addon/filter/data/providers/handler.ts    |  32 ++++
 .../emailprotect/emailprotect.module.ts       |  34 +++++
 .../filter/emailprotect/providers/handler.ts  |  32 ++++
 src/addon/filter/emoticon/emoticon.module.ts  |  34 +++++
 .../filter/emoticon/providers/handler.ts      |  32 ++++
 src/addon/filter/filter.module.ts             |  47 ++++++
 src/addon/filter/glossary/glossary.module.ts  |  34 +++++
 .../filter/glossary/providers/handler.ts      |  32 ++++
 .../filter/mediaplugin/mediaplugin.module.ts  |  34 +++++
 .../filter/mediaplugin/providers/handler.ts   | 137 ++++++++++++++++++
 .../filter/multilang/multilang.module.ts      |  34 +++++
 .../filter/multilang/providers/handler.ts     |  81 +++++++++++
 src/addon/filter/tex/providers/handler.ts     |  32 ++++
 src/addon/filter/tex/tex.module.ts            |  34 +++++
 src/addon/filter/tidy/providers/handler.ts    |  32 ++++
 src/addon/filter/tidy/tidy.module.ts          |  34 +++++
 .../filter/urltolink/providers/handler.ts     |  32 ++++
 .../filter/urltolink/urltolink.module.ts      |  34 +++++
 src/app/app.module.ts                         |   4 +-
 src/core/filter/providers/delegate.ts         |   4 +-
 src/directives/format-text.ts                 |  85 -----------
 src/providers/utils/text.ts                   |   1 +
 27 files changed, 933 insertions(+), 88 deletions(-)
 create mode 100644 src/addon/filter/activitynames/activitynames.module.ts
 create mode 100644 src/addon/filter/activitynames/providers/handler.ts
 create mode 100644 src/addon/filter/censor/censor.module.ts
 create mode 100644 src/addon/filter/censor/providers/handler.ts
 create mode 100644 src/addon/filter/data/data.module.ts
 create mode 100644 src/addon/filter/data/providers/handler.ts
 create mode 100644 src/addon/filter/emailprotect/emailprotect.module.ts
 create mode 100644 src/addon/filter/emailprotect/providers/handler.ts
 create mode 100644 src/addon/filter/emoticon/emoticon.module.ts
 create mode 100644 src/addon/filter/emoticon/providers/handler.ts
 create mode 100644 src/addon/filter/filter.module.ts
 create mode 100644 src/addon/filter/glossary/glossary.module.ts
 create mode 100644 src/addon/filter/glossary/providers/handler.ts
 create mode 100644 src/addon/filter/mediaplugin/mediaplugin.module.ts
 create mode 100644 src/addon/filter/mediaplugin/providers/handler.ts
 create mode 100644 src/addon/filter/multilang/multilang.module.ts
 create mode 100644 src/addon/filter/multilang/providers/handler.ts
 create mode 100644 src/addon/filter/tex/providers/handler.ts
 create mode 100644 src/addon/filter/tex/tex.module.ts
 create mode 100644 src/addon/filter/tidy/providers/handler.ts
 create mode 100644 src/addon/filter/tidy/tidy.module.ts
 create mode 100644 src/addon/filter/urltolink/providers/handler.ts
 create mode 100644 src/addon/filter/urltolink/urltolink.module.ts

diff --git a/src/addon/filter/activitynames/activitynames.module.ts b/src/addon/filter/activitynames/activitynames.module.ts
new file mode 100644
index 000000000..b3e5d5da7
--- /dev/null
+++ b/src/addon/filter/activitynames/activitynames.module.ts
@@ -0,0 +1,34 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { IonicModule } from 'ionic-angular';
+import { CoreFilterDelegate } from '@core/filter/providers/delegate';
+import { AddonFilterActivityNamesHandler } from './providers/handler';
+
+@NgModule({
+    declarations: [
+    ],
+    imports: [
+        IonicModule
+    ],
+    providers: [
+        AddonFilterActivityNamesHandler
+    ]
+})
+export class AddonFilterActivityNamesModule {
+    constructor(filterDelegate: CoreFilterDelegate, handler: AddonFilterActivityNamesHandler) {
+        filterDelegate.registerHandler(handler);
+    }
+}
diff --git a/src/addon/filter/activitynames/providers/handler.ts b/src/addon/filter/activitynames/providers/handler.ts
new file mode 100644
index 000000000..8e55846bb
--- /dev/null
+++ b/src/addon/filter/activitynames/providers/handler.ts
@@ -0,0 +1,32 @@
+
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+
+/**
+ * Handler to support the Activity names filter.
+ */
+@Injectable()
+export class AddonFilterActivityNamesHandler extends CoreFilterDefaultHandler {
+    name = 'AddonFilterActivityNamesHandler';
+    filterName = 'activitynames';
+
+    constructor() {
+        super();
+
+        // This filter is handled by Moodle, nothing to do in the app.
+    }
+}
diff --git a/src/addon/filter/censor/censor.module.ts b/src/addon/filter/censor/censor.module.ts
new file mode 100644
index 000000000..126a7bfb2
--- /dev/null
+++ b/src/addon/filter/censor/censor.module.ts
@@ -0,0 +1,34 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { IonicModule } from 'ionic-angular';
+import { CoreFilterDelegate } from '@core/filter/providers/delegate';
+import { AddonFilterCensorHandler } from './providers/handler';
+
+@NgModule({
+    declarations: [
+    ],
+    imports: [
+        IonicModule
+    ],
+    providers: [
+        AddonFilterCensorHandler
+    ]
+})
+export class AddonFilterCensorModule {
+    constructor(filterDelegate: CoreFilterDelegate, handler: AddonFilterCensorHandler) {
+        filterDelegate.registerHandler(handler);
+    }
+}
diff --git a/src/addon/filter/censor/providers/handler.ts b/src/addon/filter/censor/providers/handler.ts
new file mode 100644
index 000000000..874d86ef9
--- /dev/null
+++ b/src/addon/filter/censor/providers/handler.ts
@@ -0,0 +1,32 @@
+
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+
+/**
+ * Handler to support the Word censorship filter.
+ */
+@Injectable()
+export class AddonFilterCensorHandler extends CoreFilterDefaultHandler {
+    name = 'AddonFilterCensorHandler';
+    filterName = 'censor';
+
+    constructor() {
+        super();
+
+        // This filter is handled by Moodle, nothing to do in the app.
+    }
+}
diff --git a/src/addon/filter/data/data.module.ts b/src/addon/filter/data/data.module.ts
new file mode 100644
index 000000000..1272618d8
--- /dev/null
+++ b/src/addon/filter/data/data.module.ts
@@ -0,0 +1,34 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { IonicModule } from 'ionic-angular';
+import { CoreFilterDelegate } from '@core/filter/providers/delegate';
+import { AddonFilterDataHandler } from './providers/handler';
+
+@NgModule({
+    declarations: [
+    ],
+    imports: [
+        IonicModule
+    ],
+    providers: [
+        AddonFilterDataHandler
+    ]
+})
+export class AddonFilterDataModule {
+    constructor(filterDelegate: CoreFilterDelegate, handler: AddonFilterDataHandler) {
+        filterDelegate.registerHandler(handler);
+    }
+}
diff --git a/src/addon/filter/data/providers/handler.ts b/src/addon/filter/data/providers/handler.ts
new file mode 100644
index 000000000..f01cadb1d
--- /dev/null
+++ b/src/addon/filter/data/providers/handler.ts
@@ -0,0 +1,32 @@
+
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+
+/**
+ * Handler to support the Database auto-link filter.
+ */
+@Injectable()
+export class AddonFilterDataHandler extends CoreFilterDefaultHandler {
+    name = 'AddonFilterDataHandler';
+    filterName = 'data';
+
+    constructor() {
+        super();
+
+        // This filter is handled by Moodle, nothing to do in the app.
+    }
+}
diff --git a/src/addon/filter/emailprotect/emailprotect.module.ts b/src/addon/filter/emailprotect/emailprotect.module.ts
new file mode 100644
index 000000000..d746dfc37
--- /dev/null
+++ b/src/addon/filter/emailprotect/emailprotect.module.ts
@@ -0,0 +1,34 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { IonicModule } from 'ionic-angular';
+import { CoreFilterDelegate } from '@core/filter/providers/delegate';
+import { AddonFilterEmailProtectHandler } from './providers/handler';
+
+@NgModule({
+    declarations: [
+    ],
+    imports: [
+        IonicModule
+    ],
+    providers: [
+        AddonFilterEmailProtectHandler
+    ]
+})
+export class AddonFilterEmailProtectModule {
+    constructor(filterDelegate: CoreFilterDelegate, handler: AddonFilterEmailProtectHandler) {
+        filterDelegate.registerHandler(handler);
+    }
+}
diff --git a/src/addon/filter/emailprotect/providers/handler.ts b/src/addon/filter/emailprotect/providers/handler.ts
new file mode 100644
index 000000000..e7971386c
--- /dev/null
+++ b/src/addon/filter/emailprotect/providers/handler.ts
@@ -0,0 +1,32 @@
+
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+
+/**
+ * Handler to support the Email protection filter.
+ */
+@Injectable()
+export class AddonFilterEmailProtectHandler extends CoreFilterDefaultHandler {
+    name = 'AddonFilterEmailProtectHandler';
+    filterName = 'emailprotect';
+
+    constructor() {
+        super();
+
+        // This filter is handled by Moodle, nothing to do in the app.
+    }
+}
diff --git a/src/addon/filter/emoticon/emoticon.module.ts b/src/addon/filter/emoticon/emoticon.module.ts
new file mode 100644
index 000000000..5237286f9
--- /dev/null
+++ b/src/addon/filter/emoticon/emoticon.module.ts
@@ -0,0 +1,34 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { IonicModule } from 'ionic-angular';
+import { CoreFilterDelegate } from '@core/filter/providers/delegate';
+import { AddonFilterEmoticonHandler } from './providers/handler';
+
+@NgModule({
+    declarations: [
+    ],
+    imports: [
+        IonicModule
+    ],
+    providers: [
+        AddonFilterEmoticonHandler
+    ]
+})
+export class AddonFilterEmoticonModule {
+    constructor(filterDelegate: CoreFilterDelegate, handler: AddonFilterEmoticonHandler) {
+        filterDelegate.registerHandler(handler);
+    }
+}
diff --git a/src/addon/filter/emoticon/providers/handler.ts b/src/addon/filter/emoticon/providers/handler.ts
new file mode 100644
index 000000000..39c2ffe33
--- /dev/null
+++ b/src/addon/filter/emoticon/providers/handler.ts
@@ -0,0 +1,32 @@
+
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+
+/**
+ * Handler to support the Emoticon filter.
+ */
+@Injectable()
+export class AddonFilterEmoticonHandler extends CoreFilterDefaultHandler {
+    name = 'AddonFilterEmoticonHandler';
+    filterName = 'emoticon';
+
+    constructor() {
+        super();
+
+        // This filter is handled by Moodle, nothing to do in the app.
+    }
+}
diff --git a/src/addon/filter/filter.module.ts b/src/addon/filter/filter.module.ts
new file mode 100644
index 000000000..b20447e06
--- /dev/null
+++ b/src/addon/filter/filter.module.ts
@@ -0,0 +1,47 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { AddonFilterActivityNamesModule } from './activitynames/activitynames.module';
+import { AddonFilterCensorModule } from './censor/censor.module';
+import { AddonFilterDataModule } from './data/data.module';
+import { AddonFilterEmailProtectModule } from './emailprotect/emailprotect.module';
+import { AddonFilterEmoticonModule } from './emoticon/emoticon.module';
+import { AddonFilterGlossaryModule } from './glossary/glossary.module';
+import { AddonFilterMediaPluginModule } from './mediaplugin/mediaplugin.module';
+import { AddonFilterMultilangModule } from './multilang/multilang.module';
+import { AddonFilterTexModule } from './tex/tex.module';
+import { AddonFilterTidyModule } from './tidy/tidy.module';
+import { AddonFilterUrlToLinkModule } from './urltolink/urltolink.module';
+
+@NgModule({
+    declarations: [],
+    imports: [
+        AddonFilterActivityNamesModule,
+        AddonFilterCensorModule,
+        AddonFilterDataModule,
+        AddonFilterEmailProtectModule,
+        AddonFilterEmoticonModule,
+        AddonFilterGlossaryModule,
+        AddonFilterMediaPluginModule,
+        AddonFilterMultilangModule,
+        AddonFilterTexModule,
+        AddonFilterTidyModule,
+        AddonFilterUrlToLinkModule
+    ],
+    providers: [
+    ],
+    exports: []
+})
+export class AddonFilterModule { }
diff --git a/src/addon/filter/glossary/glossary.module.ts b/src/addon/filter/glossary/glossary.module.ts
new file mode 100644
index 000000000..337bffbbc
--- /dev/null
+++ b/src/addon/filter/glossary/glossary.module.ts
@@ -0,0 +1,34 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { IonicModule } from 'ionic-angular';
+import { CoreFilterDelegate } from '@core/filter/providers/delegate';
+import { AddonFilterGlossaryHandler } from './providers/handler';
+
+@NgModule({
+    declarations: [
+    ],
+    imports: [
+        IonicModule
+    ],
+    providers: [
+        AddonFilterGlossaryHandler
+    ]
+})
+export class AddonFilterGlossaryModule {
+    constructor(filterDelegate: CoreFilterDelegate, handler: AddonFilterGlossaryHandler) {
+        filterDelegate.registerHandler(handler);
+    }
+}
diff --git a/src/addon/filter/glossary/providers/handler.ts b/src/addon/filter/glossary/providers/handler.ts
new file mode 100644
index 000000000..f7e38d553
--- /dev/null
+++ b/src/addon/filter/glossary/providers/handler.ts
@@ -0,0 +1,32 @@
+
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+
+/**
+ * Handler to support the Glossary auto-link filter.
+ */
+@Injectable()
+export class AddonFilterGlossaryHandler extends CoreFilterDefaultHandler {
+    name = 'AddonFilterGlossaryHandler';
+    filterName = 'glossary';
+
+    constructor() {
+        super();
+
+        // This filter is handled by Moodle, nothing to do in the app.
+    }
+}
diff --git a/src/addon/filter/mediaplugin/mediaplugin.module.ts b/src/addon/filter/mediaplugin/mediaplugin.module.ts
new file mode 100644
index 000000000..2ef135ddd
--- /dev/null
+++ b/src/addon/filter/mediaplugin/mediaplugin.module.ts
@@ -0,0 +1,34 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { IonicModule } from 'ionic-angular';
+import { CoreFilterDelegate } from '@core/filter/providers/delegate';
+import { AddonFilterMediaPluginHandler } from './providers/handler';
+
+@NgModule({
+    declarations: [
+    ],
+    imports: [
+        IonicModule
+    ],
+    providers: [
+        AddonFilterMediaPluginHandler
+    ]
+})
+export class AddonFilterMediaPluginModule {
+    constructor(filterDelegate: CoreFilterDelegate, handler: AddonFilterMediaPluginHandler) {
+        filterDelegate.registerHandler(handler);
+    }
+}
diff --git a/src/addon/filter/mediaplugin/providers/handler.ts b/src/addon/filter/mediaplugin/providers/handler.ts
new file mode 100644
index 000000000..29da3de94
--- /dev/null
+++ b/src/addon/filter/mediaplugin/providers/handler.ts
@@ -0,0 +1,137 @@
+
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+import { CoreFilterFilter } from '@core/filter/providers/filter';
+import { CoreTextUtilsProvider } from '@providers/utils/text';
+
+/**
+ * Handler to support the Multimedia filter.
+ */
+@Injectable()
+export class AddonFilterMediaPluginHandler extends CoreFilterDefaultHandler {
+    name = 'AddonFilterMediaPluginHandler';
+    filterName = 'mediaplugin';
+
+    constructor(private textUtils: CoreTextUtilsProvider) {
+        super();
+    }
+
+    /**
+     * Filter some text.
+     *
+     * @param text The text to filter.
+     * @param filter The filter.
+     * @param options Options passed to the filters.
+     * @return Filtered text (or promise resolved with the filtered text).
+     */
+    filter(text: string, filter: CoreFilterFilter, options: any): string | Promise<string> {
+
+        const div = document.createElement('div');
+        div.innerHTML = text;
+
+        const videos = Array.from(div.querySelectorAll('video'));
+
+        videos.forEach((video) => {
+            this.treatVideoFilters(video);
+        });
+
+        return div.innerHTML;
+    }
+
+    /**
+     * Treat video filters. Currently only treating youtube video using video JS.
+     *
+     * @param el Video element.
+     * @param navCtrl NavController to use.
+     */
+    protected treatVideoFilters(video: HTMLElement): void {
+        // Treat Video JS Youtube video links and translate them to iframes.
+        if (!video.classList.contains('video-js')) {
+            return;
+        }
+
+        const data = this.textUtils.parseJSON(video.getAttribute('data-setup') || video.getAttribute('data-setup-lazy') || '{}'),
+            youtubeData = data.techOrder && data.techOrder[0] && data.techOrder[0] == 'youtube' &&
+                    this.parseYoutubeUrl(data.sources && data.sources[0] && data.sources[0].src);
+
+        if (!youtubeData || !youtubeData.videoId) {
+            return;
+        }
+
+        const iframe = document.createElement('iframe');
+        iframe.id = video.id;
+        iframe.src = 'https://www.youtube.com/embed/' + youtubeData.videoId; // Don't apply other params to align with Moodle web.
+        iframe.setAttribute('frameborder', '0');
+        iframe.setAttribute('allowfullscreen', '1');
+        iframe.width = '100%';
+        iframe.height = '300';
+
+        // Replace video tag by the iframe.
+        video.parentNode.replaceChild(iframe, video);
+    }
+
+    /**
+     * Parse a YouTube URL.
+     * Based on Youtube.parseUrl from Moodle media/player/videojs/amd/src/Youtube-lazy.js
+     *
+     * @param url URL of the video.
+     * @return Data of the video.
+     */
+    protected parseYoutubeUrl(url: string): {videoId: string, listId?: string, start?: number} {
+        const result = {
+            videoId: null,
+            listId: null,
+            start: null
+        };
+
+        if (!url) {
+            return result;
+        }
+
+        url = this.textUtils.decodeHTML(url);
+
+        // Get the video ID.
+        let match = url.match(/^.*(youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/);
+
+        if (match && match[2].length === 11) {
+            result.videoId = match[2];
+        }
+
+        // Now get the playlist (if any).
+        match = url.match(/[?&]list=([^#\&\?]+)/);
+
+        if (match && match[1]) {
+            result.listId = match[1];
+        }
+
+        // Now get the start time (if any).
+        match = url.match(/[?&]start=(\d+)/);
+
+        if (match && match[1]) {
+            result.start = parseInt(match[1], 10);
+        } else {
+            // No start param, but it could have a time param.
+            match = url.match(/[?&]t=(\d+h)?(\d+m)?(\d+s)?/);
+            if (match) {
+                result.start = (match[1] ? parseInt(match[1], 10) * 3600 : 0) + (match[2] ? parseInt(match[2], 10) * 60 : 0) +
+                        (match[3] ? parseInt(match[3], 10) : 0);
+            }
+        }
+
+        return result;
+    }
+}
diff --git a/src/addon/filter/multilang/multilang.module.ts b/src/addon/filter/multilang/multilang.module.ts
new file mode 100644
index 000000000..149cdfd0c
--- /dev/null
+++ b/src/addon/filter/multilang/multilang.module.ts
@@ -0,0 +1,34 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { IonicModule } from 'ionic-angular';
+import { CoreFilterDelegate } from '@core/filter/providers/delegate';
+import { AddonFilterMultilangHandler } from './providers/handler';
+
+@NgModule({
+    declarations: [
+    ],
+    imports: [
+        IonicModule
+    ],
+    providers: [
+        AddonFilterMultilangHandler
+    ]
+})
+export class AddonFilterMultilangModule {
+    constructor(filterDelegate: CoreFilterDelegate, handler: AddonFilterMultilangHandler) {
+        filterDelegate.registerHandler(handler);
+    }
+}
diff --git a/src/addon/filter/multilang/providers/handler.ts b/src/addon/filter/multilang/providers/handler.ts
new file mode 100644
index 000000000..e689d9769
--- /dev/null
+++ b/src/addon/filter/multilang/providers/handler.ts
@@ -0,0 +1,81 @@
+
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreSitesProvider } from '@providers/sites';
+import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+import { CoreFilterFilter } from '@core/filter/providers/filter';
+import { CoreLangProvider } from '@providers/lang';
+
+/**
+ * Handler to support the Multilang filter.
+ */
+@Injectable()
+export class AddonFilterMultilangHandler extends CoreFilterDefaultHandler {
+    name = 'AddonFilterMultilangHandler';
+    filterName = 'multilang';
+
+    constructor(private langProvider: CoreLangProvider,
+            private sitesProvider: CoreSitesProvider) {
+        super();
+    }
+
+    /**
+     * Whether or not the handler is enabled on a site level.
+     *
+     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     */
+    isEnabled(): boolean | Promise<boolean> {
+        // In Moodle versions older than 3.7, some specific content can be received unfiltered. Filter it in the app.
+        const currentSite = this.sitesProvider.getCurrentSite();
+
+        return !currentSite.isVersionGreaterEqualThan('3.7');
+    }
+
+    /**
+     * Filter some text.
+     *
+     * @param text The text to filter.
+     * @param filter The filter.
+     * @param options Options passed to the filters.
+     * @return Filtered text (or promise resolved with the filtered text).
+     */
+    filter(text: string, filter: CoreFilterFilter, options: any): string | Promise<string> {
+
+        return this.langProvider.getCurrentLanguage().then((language) => {
+            // Match the current language.
+            const anyLangRegEx = /<(?:lang|span)[^>]+lang="[a-zA-Z0-9_-]+"[^>]*>(.*?)<\/(?:lang|span)>/g;
+            let currentLangRegEx = new RegExp('<(?:lang|span)[^>]+lang="' + language + '"[^>]*>(.*?)<\/(?:lang|span)>', 'g');
+
+            if (!text.match(currentLangRegEx)) {
+                // Current lang not found. Try to find the first language.
+                const matches = text.match(anyLangRegEx);
+                if (matches && matches[0]) {
+                    language = matches[0].match(/lang="([a-zA-Z0-9_-]+)"/)[1];
+                    currentLangRegEx = new RegExp('<(?:lang|span)[^>]+lang="' + language + '"[^>]*>(.*?)<\/(?:lang|span)>', 'g');
+                } else {
+                    // No multi-lang tag found, stop.
+                    return text;
+                }
+            }
+            // Extract contents of current language.
+            text = text.replace(currentLangRegEx, '$1');
+            // Delete the rest of languages
+            text = text.replace(anyLangRegEx, '');
+
+            return text;
+        });
+    }
+}
diff --git a/src/addon/filter/tex/providers/handler.ts b/src/addon/filter/tex/providers/handler.ts
new file mode 100644
index 000000000..a02e8e7c7
--- /dev/null
+++ b/src/addon/filter/tex/providers/handler.ts
@@ -0,0 +1,32 @@
+
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+
+/**
+ * Handler to support the TeX notation filter.
+ */
+@Injectable()
+export class AddonFilterTexHandler extends CoreFilterDefaultHandler {
+    name = 'AddonFilterTexHandler';
+    filterName = 'tex';
+
+    constructor() {
+        super();
+
+        // This filter is handled by Moodle, nothing to do in the app.
+    }
+}
diff --git a/src/addon/filter/tex/tex.module.ts b/src/addon/filter/tex/tex.module.ts
new file mode 100644
index 000000000..21084238b
--- /dev/null
+++ b/src/addon/filter/tex/tex.module.ts
@@ -0,0 +1,34 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { IonicModule } from 'ionic-angular';
+import { CoreFilterDelegate } from '@core/filter/providers/delegate';
+import { AddonFilterTexHandler } from './providers/handler';
+
+@NgModule({
+    declarations: [
+    ],
+    imports: [
+        IonicModule
+    ],
+    providers: [
+        AddonFilterTexHandler
+    ]
+})
+export class AddonFilterTexModule {
+    constructor(filterDelegate: CoreFilterDelegate, handler: AddonFilterTexHandler) {
+        filterDelegate.registerHandler(handler);
+    }
+}
diff --git a/src/addon/filter/tidy/providers/handler.ts b/src/addon/filter/tidy/providers/handler.ts
new file mode 100644
index 000000000..e0fff232d
--- /dev/null
+++ b/src/addon/filter/tidy/providers/handler.ts
@@ -0,0 +1,32 @@
+
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+
+/**
+ * Handler to support the HTML tidy filter.
+ */
+@Injectable()
+export class AddonFilterTidyHandler extends CoreFilterDefaultHandler {
+    name = 'AddonFilterTidyHandler';
+    filterName = 'tidy';
+
+    constructor() {
+        super();
+
+        // This filter is handled by Moodle, nothing to do in the app.
+    }
+}
diff --git a/src/addon/filter/tidy/tidy.module.ts b/src/addon/filter/tidy/tidy.module.ts
new file mode 100644
index 000000000..ab0b43098
--- /dev/null
+++ b/src/addon/filter/tidy/tidy.module.ts
@@ -0,0 +1,34 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { IonicModule } from 'ionic-angular';
+import { CoreFilterDelegate } from '@core/filter/providers/delegate';
+import { AddonFilterTidyHandler } from './providers/handler';
+
+@NgModule({
+    declarations: [
+    ],
+    imports: [
+        IonicModule
+    ],
+    providers: [
+        AddonFilterTidyHandler
+    ]
+})
+export class AddonFilterTidyModule {
+    constructor(filterDelegate: CoreFilterDelegate, handler: AddonFilterTidyHandler) {
+        filterDelegate.registerHandler(handler);
+    }
+}
diff --git a/src/addon/filter/urltolink/providers/handler.ts b/src/addon/filter/urltolink/providers/handler.ts
new file mode 100644
index 000000000..d23c392b3
--- /dev/null
+++ b/src/addon/filter/urltolink/providers/handler.ts
@@ -0,0 +1,32 @@
+
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+
+/**
+ * Handler to support the URL to link and images filter.
+ */
+@Injectable()
+export class AddonFilterUrlToLinkHandler extends CoreFilterDefaultHandler {
+    name = 'AddonFilterUrlToLinkHandler';
+    filterName = 'urltolink';
+
+    constructor() {
+        super();
+
+        // This filter is handled by Moodle, nothing to do in the app.
+    }
+}
diff --git a/src/addon/filter/urltolink/urltolink.module.ts b/src/addon/filter/urltolink/urltolink.module.ts
new file mode 100644
index 000000000..afbdbf15c
--- /dev/null
+++ b/src/addon/filter/urltolink/urltolink.module.ts
@@ -0,0 +1,34 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { IonicModule } from 'ionic-angular';
+import { CoreFilterDelegate } from '@core/filter/providers/delegate';
+import { AddonFilterUrlToLinkHandler } from './providers/handler';
+
+@NgModule({
+    declarations: [
+    ],
+    imports: [
+        IonicModule
+    ],
+    providers: [
+        AddonFilterUrlToLinkHandler
+    ]
+})
+export class AddonFilterUrlToLinkModule {
+    constructor(filterDelegate: CoreFilterDelegate, handler: AddonFilterUrlToLinkHandler) {
+        filterDelegate.registerHandler(handler);
+    }
+}
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 740759df7..6f9966fa8 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -148,6 +148,7 @@ import { AddonRemoteThemesModule } from '@addon/remotethemes/remotethemes.module
 import { AddonQbehaviourModule } from '@addon/qbehaviour/qbehaviour.module';
 import { AddonQtypeModule } from '@addon/qtype/qtype.module';
 import { AddonStorageManagerModule } from '@addon/storagemanager/storagemanager.module';
+import { AddonFilterModule } from '@addon/filter/filter.module';
 
 // For translate loader. AoT requires an exported function for factories.
 export function createTranslateLoader(http: HttpClient): TranslateHttpLoader {
@@ -290,7 +291,8 @@ export const WP_PROVIDER: any = null;
         AddonRemoteThemesModule,
         AddonQbehaviourModule,
         AddonQtypeModule,
-        AddonStorageManagerModule
+        AddonStorageManagerModule,
+        AddonFilterModule
     ],
     bootstrap: [IonicApp],
     entryComponents: [
diff --git a/src/core/filter/providers/delegate.ts b/src/core/filter/providers/delegate.ts
index 4d5913c6a..4fd742262 100644
--- a/src/core/filter/providers/delegate.ts
+++ b/src/core/filter/providers/delegate.ts
@@ -74,8 +74,8 @@ export class CoreFilterDelegate extends CoreDelegate {
      * @return Promise resolved with the filtered text.
      */
     filterText(text: string, filters: CoreFilterFilter[], options?: any, skipFilters?: string[]): Promise<string> {
-        if (!text) {
-            return Promise.resolve(text);
+        if (!text || typeof text != 'string') {
+            return Promise.resolve('');
         }
 
         // Wait for filters to be initialized.
diff --git a/src/directives/format-text.ts b/src/directives/format-text.ts
index a723f2116..88fb67c20 100644
--- a/src/directives/format-text.ts
+++ b/src/directives/format-text.ts
@@ -425,7 +425,6 @@ export class CoreFormatTextDirective implements OnChanges {
             });
 
             videos.forEach((video) => {
-                this.treatVideoFilters(video, navCtrl);
                 this.treatMedia(video);
             });
 
@@ -549,40 +548,6 @@ export class CoreFormatTextDirective implements OnChanges {
         this.showMoreDisplayed = false;
     }
 
-    /**
-     * Treat video filters. Currently only treating youtube video using video JS.
-     *
-     * @param el Video element.
-     * @param navCtrl NavController to use.
-     */
-    protected treatVideoFilters(video: HTMLElement, navCtrl: NavController): void {
-        // Treat Video JS Youtube video links and translate them to iframes.
-        if (!video.classList.contains('video-js')) {
-            return;
-        }
-
-        const data = this.textUtils.parseJSON(video.getAttribute('data-setup') || video.getAttribute('data-setup-lazy') || '{}'),
-            youtubeData = data.techOrder && data.techOrder[0] && data.techOrder[0] == 'youtube' &&
-                    this.parseYoutubeUrl(data.sources && data.sources[0] && data.sources[0].src);
-
-        if (!youtubeData || !youtubeData.videoId) {
-            return;
-        }
-
-        const iframe = document.createElement('iframe');
-        iframe.id = video.id;
-        iframe.src = 'https://www.youtube.com/embed/' + youtubeData.videoId; // Don't apply other params to align with Moodle web.
-        iframe.setAttribute('frameborder', '0');
-        iframe.setAttribute('allowfullscreen', '1');
-        iframe.width = '100%';
-        iframe.height = '300';
-
-        // Replace video tag by the iframe.
-        video.parentNode.replaceChild(iframe, video);
-
-        this.iframeUtils.treatFrame(iframe, false, navCtrl);
-    }
-
     /**
      * Add media adapt class and apply CoreExternalContentDirective to the media element and its sources and tracks.
      *
@@ -693,54 +658,4 @@ export class CoreFormatTextDirective implements OnChanges {
 
         this.iframeUtils.treatFrame(iframe, false, navCtrl);
     }
-
-    /**
-     * Parse a YouTube URL.
-     * Based on Youtube.parseUrl from Moodle media/player/videojs/amd/src/Youtube-lazy.js
-     *
-     * @param url URL of the video.
-     */
-    protected parseYoutubeUrl(url: string): {videoId: string, listId?: string, start?: number} {
-        const result = {
-            videoId: null,
-            listId: null,
-            start: null
-        };
-
-        if (!url) {
-            return result;
-        }
-
-        url = this.textUtils.decodeHTML(url);
-
-        // Get the video ID.
-        let match = url.match(/^.*(youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/);
-
-        if (match && match[2].length === 11) {
-            result.videoId = match[2];
-        }
-
-        // Now get the playlist (if any).
-        match = url.match(/[?&]list=([^#\&\?]+)/);
-
-        if (match && match[1]) {
-            result.listId = match[1];
-        }
-
-        // Now get the start time (if any).
-        match = url.match(/[?&]start=(\d+)/);
-
-        if (match && match[1]) {
-            result.start = parseInt(match[1], 10);
-        } else {
-            // No start param, but it could have a time param.
-            match = url.match(/[?&]t=(\d+h)?(\d+m)?(\d+s)?/);
-            if (match) {
-                result.start = (match[1] ? parseInt(match[1], 10) * 3600 : 0) + (match[2] ? parseInt(match[2], 10) * 60 : 0) +
-                        (match[3] ? parseInt(match[3], 10) : 0);
-            }
-        }
-
-        return result;
-    }
 }
diff --git a/src/providers/utils/text.ts b/src/providers/utils/text.ts
index 9a6b7f005..262662da6 100644
--- a/src/providers/utils/text.ts
+++ b/src/providers/utils/text.ts
@@ -732,6 +732,7 @@ export class CoreTextUtilsProvider {
      *
      * @param text The text to be treated.
      * @return Promise resolved with the formatted text.
+     * @deprecated since 3.8.0. Now this is handled by AddonFilterMultilangHandler.
      */
     treatMultilangTags(text: string): Promise<string> {
         if (!text || typeof text != 'string') {

From 952ce4939b5d4b9ce659c6b2af02610f79034825 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 30 Sep 2019 09:05:49 +0200
Subject: [PATCH 068/257] MOBILE-2491 filter: Apply filters to all views that
 need it

---
 .../pages/issued-badge/issued-badge.html      |  36 ++-
 .../badges/pages/user-badges/user-badges.html |   2 +-
 .../addon-block-activitymodules.html          |   2 +-
 .../addon-block-recentlyaccesseditems.html    |   4 +-
 .../addon-block-sitemainmenu.html             |   2 +-
 .../components/sitemainmenu/sitemainmenu.ts   |   1 +
 .../events/addon-block-timeline-events.html   |   4 +-
 .../entries/addon-blog-entries.html           |   4 +-
 src/addon/blog/components/entries/entries.ts  |  30 +++
 .../addon-calendar-upcoming-events.html       |   4 +-
 src/addon/calendar/pages/day/day.html         |   4 +-
 .../calendar/pages/edit-event/edit-event.ts   |   7 +-
 src/addon/calendar/pages/event/event.html     |  14 +-
 src/addon/calendar/pages/event/event.ts       |   3 +
 src/addon/calendar/pages/list/list.html       |   2 +-
 src/addon/calendar/providers/helper.ts        |  19 +-
 .../course/addon-competency-course.html       |  12 +-
 .../competency/components/course/course.ts    |   6 +-
 .../pages/competency/competency.html          |   8 +-
 .../competency/pages/competency/competency.ts |  17 +-
 .../competencysummary/competencysummary.html  |   2 +-
 .../competencysummary/competencysummary.ts    |  20 +-
 src/addon/competency/pages/plan/plan.html     |   4 +-
 src/addon/competency/providers/competency.ts  |   4 +-
 .../addon-course-completion-report.html       |  12 +-
 src/addon/files/pages/list/list.html          |   2 +-
 .../addon-messages-confirmed-contacts.html    |   2 +-
 .../addon-messages-contact-requests.html      |   2 +-
 .../contacts/addon-messages-contacts.html     |   2 +-
 .../addon-messages-discussions.html           |  10 +-
 .../components/discussions/discussions.ts     |   2 +
 .../conversation-info/conversation-info.html  |   6 +-
 .../conversation-info/conversation-info.ts    |   5 +-
 .../messages/pages/discussion/discussion.html |   4 +-
 .../messages/pages/discussion/discussion.ts   |   2 +
 .../group-conversations.html                  |   8 +-
 .../group-conversations.ts                    |   2 +
 src/addon/messages/pages/search/search.html   |   4 +-
 src/addon/messages/pages/search/search.ts     |   3 +
 .../messages/providers/mainmenu-handler.ts    |   7 +-
 .../addon-mod-assign-feedback-plugin.html     |   2 +-
 .../index/addon-mod-assign-index.html         |   2 +-
 .../mod/assign/components/index/index.ts      |   2 +-
 .../addon-mod-assign-submission-plugin.html   |   2 +-
 .../addon-mod-assign-submission.html          |   8 +-
 .../addon-mod-assign-feedback-comments.html   |   2 +-
 .../feedback/comments/component/comments.ts   |   3 +-
 .../edit-feedback-modal.html                  |   2 +-
 src/addon/mod/assign/pages/edit/edit.html     |   4 +-
 src/addon/mod/assign/pages/index/index.html   |   2 +-
 .../submission-list/submission-list.html      |   2 +-
 .../submission-review/submission-review.html  |   2 +-
 ...ddon-mod-assign-submission-onlinetext.html |   2 +-
 .../onlinetext/component/onlinetext.ts        |   3 +-
 .../index/addon-mod-book-index.html           |   4 +-
 src/addon/mod/book/components/index/index.ts  |   1 +
 src/addon/mod/book/pages/index/index.html     |   2 +-
 src/addon/mod/book/pages/toc/toc.html         |   2 +-
 src/addon/mod/book/pages/toc/toc.ts           |   2 +
 .../index/addon-mod-chat-index.html           |   2 +-
 src/addon/mod/chat/components/index/index.ts  |   7 +-
 src/addon/mod/chat/pages/chat/chat.html       |   6 +-
 src/addon/mod/chat/pages/chat/chat.ts         |   3 +
 src/addon/mod/chat/pages/index/index.html     |   2 +-
 .../session-messages/session-messages.html    |   4 +-
 .../session-messages/session-messages.ts      |   6 +-
 src/addon/mod/chat/pages/sessions/sessions.ts |   3 +-
 src/addon/mod/chat/pages/users/users.html     |   2 +-
 .../index/addon-mod-choice-index.html         |  10 +-
 src/addon/mod/choice/pages/index/index.html   |   2 +-
 .../index/addon-mod-data-index.html           |   2 +-
 .../addon-mod-data-field-checkbox.html        |   2 +-
 .../component/addon-mod-data-field-date.html  |   2 +-
 .../component/addon-mod-data-field-menu.html  |   2 +-
 .../addon-mod-data-field-multimenu.html       |   2 +-
 .../addon-mod-data-field-number.html          |   2 +-
 .../addon-mod-data-field-radiobutton.html     |   2 +-
 .../component/addon-mod-data-field-text.html  |   2 +-
 .../addon-mod-data-field-textarea.html        |   2 +-
 src/addon/mod/data/pages/edit/edit.html       |   2 +-
 src/addon/mod/data/pages/entry/entry.html     |   2 +-
 src/addon/mod/data/pages/index/index.html     |   2 +-
 .../index/addon-mod-feedback-index.html       |  12 +-
 .../mod/feedback/pages/attempt/attempt.html   |   9 +-
 src/addon/mod/feedback/pages/form/form.html   |  14 +-
 src/addon/mod/feedback/pages/index/index.html |   2 +-
 .../pages/nonrespondents/nonrespondents.html  |   2 +-
 .../pages/respondents/respondents.html        |   2 +-
 .../index/addon-mod-folder-index.html         |   2 +-
 src/addon/mod/folder/pages/index/index.html   |   2 +-
 .../index/addon-mod-forum-index.html          |   6 +-
 .../components/post/addon-mod-forum-post.html |   4 +-
 .../forum/pages/discussion/discussion.html    |   2 +-
 src/addon/mod/forum/pages/index/index.html    |   2 +-
 .../sort-order-selector.html                  |   2 +-
 .../index/addon-mod-glossary-index.html       |   2 +-
 .../mod/glossary/components/index/index.ts    |   2 +
 src/addon/mod/glossary/pages/edit/edit.html   |   2 +-
 src/addon/mod/glossary/pages/entry/entry.html |  10 +-
 src/addon/mod/glossary/pages/index/index.html |   2 +-
 .../index/addon-mod-imscp-index.html          |   3 +-
 src/addon/mod/imscp/pages/index/index.html    |   2 +-
 .../index/addon-mod-lesson-index.html         |   4 +-
 src/addon/mod/lesson/pages/index/index.html   |   2 +-
 .../lesson/pages/menu-modal/menu-modal.html   |   2 +-
 src/addon/mod/lesson/pages/player/player.html |  50 ++--
 .../lesson/pages/user-retake/user-retake.html |  22 +-
 .../components/index/addon-mod-lti-index.html |   2 +-
 src/addon/mod/lti/pages/index/index.html      |   2 +-
 .../index/addon-mod-page-index.html           |   4 +-
 src/addon/mod/page/pages/index/index.html     |   2 +-
 .../index/addon-mod-quiz-index.html           |   6 +-
 src/addon/mod/quiz/pages/attempt/attempt.html |   4 +-
 src/addon/mod/quiz/pages/index/index.html     |   2 +-
 src/addon/mod/quiz/pages/player/player.html   |   6 +-
 src/addon/mod/quiz/pages/review/review.html   |   8 +-
 .../index/addon-mod-resource-index.html       |   4 +-
 src/addon/mod/resource/pages/index/index.html |   2 +-
 .../index/addon-mod-scorm-index.html          |   6 +-
 src/addon/mod/scorm/pages/index/index.html    |   2 +-
 src/addon/mod/scorm/pages/player/player.html  |   2 +-
 src/addon/mod/scorm/pages/player/player.ts    |   3 +-
 src/addon/mod/scorm/pages/toc/toc.html        |   2 +-
 src/addon/mod/scorm/pages/toc/toc.ts          |   2 +
 .../index/addon-mod-survey-index.html         |   4 +-
 src/addon/mod/survey/pages/index/index.html   |   2 +-
 .../components/index/addon-mod-url-index.html |   2 +-
 src/addon/mod/url/pages/index/index.html      |   2 +-
 .../index/addon-mod-wiki-index.html           |   4 +-
 src/addon/mod/wiki/components/index/index.ts  |   3 +-
 src/addon/mod/wiki/pages/edit/edit.html       |   2 +-
 src/addon/mod/wiki/pages/index/index.html     |   2 +-
 src/addon/mod/wiki/pages/map/map.html         |   2 +-
 src/addon/mod/wiki/pages/map/map.ts           |   2 +
 ...shop-assessment-strategy-accumulative.html |   4 +-
 ...workshop-assessment-strategy-comments.html |   4 +-
 ...orkshop-assessment-strategy-numerrors.html |   8 +-
 ...d-workshop-assessment-strategy-rubric.html |   4 +-
 .../classes/assessment-strategy-component.ts  |   1 +
 ...ddon-mod-workshop-assessment-strategy.html |   2 +-
 .../assessment-strategy.ts                    |   4 +-
 .../index/addon-mod-workshop-index.html       |  14 +-
 .../addon-mod-workshop-submission.html        |   8 +-
 .../workshop/pages/assessment/assessment.html |   4 +-
 .../edit-submission/edit-submission.html      |   2 +-
 src/addon/mod/workshop/pages/index/index.html |   2 +-
 src/addon/mod/workshop/pages/phase/phase.html |   2 +-
 .../workshop/pages/submission/submission.html |   6 +-
 .../components/list/addon-notes-list.html     |   4 +-
 src/addon/notes/components/list/list.ts       |   4 +
 src/addon/notifications/pages/list/list.html  |   6 +-
 src/addon/notifications/pages/list/list.ts    |   3 +
 .../addon-qbehaviour-deferredcbm.html         |   4 +-
 .../deferredcbm/component/deferredcbm.ts      |   2 +
 .../component/informationitem.ts              |   2 +
 .../component/addon-qtype-calculated.html     |   6 +-
 .../component/addon-qtype-ddimageortext.html  |   4 +-
 .../component/addon-qtype-ddmarker.html       |   4 +-
 .../ddwtos/component/addon-qtype-ddwtos.html  |   4 +-
 src/addon/qtype/ddwtos/component/ddwtos.ts    |   3 +-
 .../component/addon-qtype-description.html    |   2 +-
 .../essay/component/addon-qtype-essay.html    |   6 +-
 .../component/addon-qtype-gapselect.html      |   2 +-
 .../qtype/gapselect/component/gapselect.ts    |   3 +-
 .../match/component/addon-qtype-match.html    |   4 +-
 .../component/addon-qtype-multianswer.html    |   2 +-
 .../multianswer/component/multianswer.ts      |   3 +-
 .../component/addon-qtype-multichoice.html    |  12 +-
 .../component/addon-qtype-shortanswer.html    |   2 +-
 .../checkbox/component/checkbox.ts            |   2 +
 .../datetime/component/datetime.ts            |   2 +
 .../addon-user-profile-field-menu.html        |   2 +-
 .../userprofilefield/menu/component/menu.ts   |   2 +
 .../addon-user-profile-field-text.html        |   2 +-
 .../userprofilefield/text/component/text.ts   |   2 +
 .../addon-user-profile-field-textarea.html    |   2 +-
 .../textarea/component/textarea.ts            |   2 +
 .../core-context-menu-popover.html            |   2 +-
 .../core-course-picker-menu-popover.html      |   2 +-
 .../navigation-bar/navigation-bar.ts          |   5 +-
 src/components/site-picker/site-picker.ts     |   7 +-
 .../core-block-only-title.html                |   2 +-
 .../core-block-pre-rendered.html              |   6 +-
 src/core/comments/pages/viewer/viewer.html    |   6 +-
 .../pages/choose-site/choose-site.html        |   2 +-
 .../course/classes/main-resource-component.ts |   3 +-
 .../components/format/core-course-format.html |   8 +-
 .../module-completion/module-completion.ts    |  13 +-
 .../core-course-module-description.html       |   2 +-
 .../module-description/module-description.ts  |   2 +
 .../components/module/core-course-module.html |  10 +-
 .../core-course-unsupported-module.html       |   2 +-
 .../pages/list-mod-type/list-mod-type.html    |   2 +-
 .../section-selector/section-selector.html    |   4 +-
 .../section-selector/section-selector.ts      |   3 +
 src/core/course/pages/section/section.html    |   2 +-
 src/core/course/pages/section/section.ts      |   7 +-
 .../unsupported-module.html                   |   2 +-
 .../unsupported-module/unsupported-module.ts  |   3 +-
 .../core-courses-course-list-item.html        |   2 +-
 .../core-courses-course-progress.html         |   4 +-
 .../courses/pages/categories/categories.html  |   8 +-
 .../pages/course-preview/course-preview.html  |  12 +-
 .../courses/pages/dashboard/dashboard.html    |   2 +-
 src/core/courses/pages/dashboard/dashboard.ts |   2 +
 src/core/filter/providers/filter.ts           | 223 +++++++++++++++++-
 src/core/grades/pages/courses/courses.html    |   2 +-
 src/core/grades/pages/grade/grade.html        |  22 +-
 .../login/pages/credentials/credentials.html  |   4 +-
 .../pages/email-signup/email-signup.html      |   4 +-
 src/core/login/pages/reconnect/reconnect.html |   2 +-
 .../login/pages/site-error/site-error.html    |   2 +-
 src/core/login/pages/site-help/site-help.html |   2 +-
 src/core/login/pages/sites/sites.html         |   2 +-
 src/core/login/pages/sites/sites.ts           |   8 +-
 src/core/mainmenu/pages/more/more.html        |   2 +-
 src/core/mainmenu/pages/more/more.ts          |   2 +
 .../providers/pushnotifications.ts            |  14 +-
 .../classes/base-question-component.ts        |   2 +
 .../components/question/core-question.html    |   4 +-
 .../question/components/question/question.ts  |   4 +
 src/core/question/providers/helper.ts         |   9 +-
 src/core/rating/pages/ratings/ratings.html    |   2 +-
 .../pages/space-usage/space-usage.html        |   2 +-
 .../settings/pages/space-usage/space-usage.ts |   8 +-
 .../synchronization/synchronization.html      |   2 +-
 .../pages/choose-site/choose-site.html        |   2 +-
 src/core/sharedfiles/pages/list/list.html     |   2 +-
 .../components/index/core-sitehome-index.html |   2 +-
 .../components/module-index/module-index.ts   |   3 +-
 .../participants/core-user-participants.html  |   2 +-
 .../user-profile-field/user-profile-field.ts  |   4 +
 src/core/user/pages/about/about.html          |  25 +-
 src/core/user/pages/profile/profile.html      |   8 +-
 src/core/viewer/pages/text/text.html          |   2 +-
 src/core/viewer/pages/text/text.ts            |   6 +
 src/directives/format-text.ts                 |  38 ++-
 src/providers/sites.ts                        |   8 +-
 src/providers/utils/text.ts                   |  12 +-
 239 files changed, 901 insertions(+), 475 deletions(-)

diff --git a/src/addon/badges/pages/issued-badge/issued-badge.html b/src/addon/badges/pages/issued-badge/issued-badge.html
index 0dcc1e810..75ee12adf 100644
--- a/src/addon/badges/pages/issued-badge/issued-badge.html
+++ b/src/addon/badges/pages/issued-badge/issued-badge.html
@@ -24,9 +24,7 @@
             </ion-item-divider>
             <ion-item text-wrap>
                 <h2>{{ 'core.name' | translate}}</h2>
-                <p>
-                    <core-format-text clean="true" [text]="user.fullname"></core-format-text>
-                </p>
+                <p>{{ user.fullname }}</p>
             </ion-item>
         </ion-item-group>
 
@@ -36,14 +34,12 @@
             </ion-item-divider>
             <ion-item text-wrap *ngIf="badge.issuername">
                 <h2>{{ 'addon.badges.issuername' | translate}}</h2>
-                <p>
-                    <core-format-text clean="true" [text]="badge.issuername"></core-format-text>
-                </p>
+                <p>{{ badge.issuername }}</p>
             </ion-item>
             <ion-item text-wrap *ngIf="badge.issuercontact">
                 <h2>{{ 'addon.badges.contact' | translate}}</h2>
                 <p><a href="mailto:{{badge.issuercontact}}" core-link auto-login="no">
-                    <core-format-text [text]="badge.issuercontact"></core-format-text>
+                    {{ badge.issuercontact }}
                 </a></p>
             </ion-item>
         </ion-item-group>
@@ -66,9 +62,7 @@
             </ion-item>
             <ion-item text-wrap *ngIf="badge.description">
                 <h2>{{ 'core.description' | translate}}</h2>
-                <p>
-                    <core-format-text clean="true" [text]="badge.description"></core-format-text>
-                </p>
+                <p>{{ badge.description }}</p>
             </ion-item>
             <ion-item text-wrap *ngIf="badge.imageauthorname">
                 <h2>{{ 'addon.badges.imageauthorname' | translate}}</h2>
@@ -77,23 +71,23 @@
             <ion-item text-wrap *ngIf="badge.imageauthoremail">
                 <h2>{{ 'addon.badges.imageauthoremail' | translate}}</h2>
                 <p><a href="mailto:{{badge.imageauthoremail}}" core-link auto-login="no">
-                    <core-format-text [text]="badge.imageauthoremail"></core-format-text>
+                    {{ badge.imageauthoremail }}
                 </a></p>
             </ion-item>
             <ion-item text-wrap *ngIf="badge.imageauthorurl">
                 <h2>{{ 'addon.badges.imageauthorurl' | translate}}</h2>
                 <p><a [href]="badge.imageauthorurl" core-link auto-login="no">
-                    <core-format-text [text]="badge.imageauthorurl"></core-format-text>
+                    {{ badge.imageauthorurl }}
                 </a></p>
             </ion-item>
             <ion-item text-wrap *ngIf="badge.imagecaption">
                 <h2>{{ 'addon.badges.imagecaption' | translate}}</h2>
-                <p><core-format-text [text]="badge.imagecaption"></core-format-text></p>
+                <p>{{ badge.imagecaption }}</p>
             </ion-item>
             <ion-item text-wrap *ngIf="course.fullname">
                 <h2>{{ 'core.course' | translate}}</h2>
                 <p>
-                    <core-format-text [text]="course.fullname"></core-format-text>
+                    <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="courseId"></core-format-text>
                 </p>
             </ion-item>
             <!-- Criteria (not yet avalaible) -->
@@ -131,13 +125,13 @@
             <ion-item text-wrap *ngIf="badge.endorsement.issueremail">
                 <h2>{{ 'addon.badges.issueremail' | translate}}</h2>
                 <p><a href="mailto:{{badge.endorsement.issueremail}}" core-link auto-login="no">
-                    <core-format-text [text]="badge.endorsement.issueremail"></core-format-text>
+                    {{ badge.endorsement.issueremail }}
                 </a></p>
             </ion-item>
             <ion-item text-wrap *ngIf="badge.endorsement.issuerurl">
                 <h2>{{ 'addon.badges.issuerurl' | translate}}</h2>
                 <p><a [href]="badge.endorsement.issuerurl" core-link auto-login="no">
-                    <core-format-text [text]="badge.endorsement.issuerurl"></core-format-text>
+                    {{ badge.endorsement.issuerurl }}
                 </a></p>
             </ion-item>
             <ion-item text-wrap *ngIf="badge.endorsement.dateissued">
@@ -147,14 +141,12 @@
             <ion-item text-wrap *ngIf="badge.endorsement.claimid">
                 <h2>{{ 'addon.badges.claimid' | translate}}</h2>
                 <p><a [href]="badge.endorsement.claimid" core-link auto-login="no">
-                    <core-format-text [text]="badge.endorsement.claimid"></core-format-text>
+                    {{ badge.endorsement.claimid }}
                 </a></p>
             </ion-item>
             <ion-item text-wrap *ngIf="badge.endorsement.claimcomment">
                 <h2>{{ 'addon.badges.claimcomment' | translate}}</h2>
-                <p>
-                    <core-format-text [text]="badge.endorsement.claimcomment"></core-format-text>
-                </p>
+                <p>{{ badge.endorsement.claimcomment }}</p>
             </ion-item>
         </ion-item-group>
 
@@ -164,7 +156,7 @@
                 <h2>{{ 'addon.badges.relatedbages' | translate}}</h2>
             </ion-item-divider>
             <ion-item text-wrap *ngFor="let relatedBadge of badge.relatedbadges">
-                <h2><core-format-text [text]="relatedBadge.name"></core-format-text></h2>
+                <h2><{{ relatedBadge.name }}</h2>
             </ion-item>
             <ion-item text-wrap *ngIf="badge.relatedbadges.length == 0">
                 <h2>{{ 'addon.badges.norelated' | translate}}</h2>
@@ -177,7 +169,7 @@
                 <h2>{{ 'addon.badges.alignment' | translate}}</h2>
             </ion-item-divider>
             <a ion-item text-wrap *ngFor="let alignment of badge.alignment" [href]="alignment.targeturl" core-link auto-login="no">
-                <h2><core-format-text [text]="alignment.targetname"></core-format-text></h2>
+                <h2>{{ alignment.targetname }}</h2>
             </a>
             <ion-item text-wrap *ngIf="badge.alignment.length == 0">
                 <h2>{{ 'addon.badges.noalignment' | translate}}</h2>
diff --git a/src/addon/badges/pages/user-badges/user-badges.html b/src/addon/badges/pages/user-badges/user-badges.html
index 6a2a33a24..315e9af08 100644
--- a/src/addon/badges/pages/user-badges/user-badges.html
+++ b/src/addon/badges/pages/user-badges/user-badges.html
@@ -17,7 +17,7 @@
                     <ion-avatar item-start>
                         <img [src]="badge.badgeurl" [alt]="badge.name" item-start core-external-content>
                     </ion-avatar>
-                    <h2><core-format-text [text]="badge.name"></core-format-text></h2>
+                    <h2>{{ badge.name }}</h2>
                     <p>{{ badge.dateissued * 1000 | coreFormatDate :'strftimedatetimeshort' }}</p>
                     <ion-badge item-end color="danger" *ngIf="badge.dateexpire && currentTime >= badge.dateexpire">
                         {{ 'addon.badges.expired' | translate }}
diff --git a/src/addon/block/activitymodules/components/activitymodules/addon-block-activitymodules.html b/src/addon/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
index 7711b65f6..342e38924 100644
--- a/src/addon/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
+++ b/src/addon/block/activitymodules/components/activitymodules/addon-block-activitymodules.html
@@ -4,6 +4,6 @@
 <core-loading [hideUntil]="loaded" class="core-loading-center">
     <a ion-item text-wrap *ngFor="let entry of entries" class="item-media" detail-none [navPush]="'CoreCourseListModTypePage'" [navParams]="{title: entry.name, courseId: instanceId, modName: entry.modName}">
         <img item-start [src]="entry.icon" alt="" role="presentation" class="core-module-icon">
-        <core-format-text [text]="entry.name"></core-format-text>
+        {{ entry.name }}
     </a>
 </core-loading>
diff --git a/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html b/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
index f6e60ba65..dbf92f587 100644
--- a/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
+++ b/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
@@ -7,8 +7,8 @@
             <ion-card>
                 <a ion-item text-wrap detail-none class="core-course-module-handler item-media" (click)="action($event, item)" [title]="item.name">
                     <img item-start [src]="item.iconUrl" alt="" role="presentation" *ngIf="item.iconUrl" class="core-module-icon">
-                    <h2><core-format-text [text]="item.name"></core-format-text></h2>
-                    <p><core-format-text [text]="item.coursename"></core-format-text></p>
+                    <h2><core-format-text [text]="item.name" contextLevel="module" [contextInstanceId]="item.cmid"></core-format-text></h2>
+                    <p><core-format-text [text]="item.coursename" contextLevel="course" [contextInstanceId]="item.courseid"></core-format-text></p>
                 </a>
             </ion-card>
         </div>
diff --git a/src/addon/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html b/src/addon/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
index f9a5b7f82..49dfb8748 100644
--- a/src/addon/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
+++ b/src/addon/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
@@ -4,7 +4,7 @@
 <core-loading [hideUntil]="loaded" class="core-loading-center">
     <ng-container *ngIf="mainMenuBlock">
         <ion-item text-wrap *ngIf="mainMenuBlock.summary">
-            <core-format-text [text]="mainMenuBlock.summary"></core-format-text>
+            <core-format-text [text]="mainMenuBlock.summary" [component]="component" [componentId]="siteHomeId" contextLevel="course" [contextInstanceId]="siteHomeId"></core-format-text>
         </ion-item>
 
         <core-course-module *ngFor="let module of mainMenuBlock.modules" [module]="module" [courseId]="siteHomeId" [downloadEnabled]="downloadEnabled" [section]="mainMenuBlock"></core-course-module>
diff --git a/src/addon/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts b/src/addon/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
index 8568c8225..20651772a 100644
--- a/src/addon/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
+++ b/src/addon/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
@@ -30,6 +30,7 @@ import { CoreBlockBaseComponent } from '@core/block/classes/base-block-component
 export class AddonBlockSiteMainMenuComponent extends CoreBlockBaseComponent implements OnInit {
     @Input() downloadEnabled: boolean;
 
+    component = 'AddonBlockSiteMainMenu';
     mainMenuBlock: any;
     siteHomeId: number;
 
diff --git a/src/addon/block/timeline/components/events/addon-block-timeline-events.html b/src/addon/block/timeline/components/events/addon-block-timeline-events.html
index 46af070cc..22e5445f7 100644
--- a/src/addon/block/timeline/components/events/addon-block-timeline-events.html
+++ b/src/addon/block/timeline/components/events/addon-block-timeline-events.html
@@ -5,9 +5,9 @@
     <ng-container *ngFor="let event of dayEvents.events">
         <a ion-item text-wrap detail-none class="core-course-module-handler item-media" (click)="action($event, event.url)" [title]="event.name">
             <img item-start [src]="event.iconUrl" alt="" role="presentation" *ngIf="event.iconUrl" class="core-module-icon">
-            <h2><core-format-text [text]="event.name"></core-format-text></h2>
+            <h2><core-format-text [text]="event.name" contextLevel="module" [contextInstanceId]="event.id"></core-format-text></h2>
             <p *ngIf="showCourse">
-                <core-format-text [text]="event.course.fullnamedisplay"></core-format-text>
+                <core-format-text [text]="event.course.fullnamedisplay" contextLevel="course" [contextInstanceId]="event.course.id"></core-format-text>
             </p>
 
             <button ion-button clear class="hidden-tablet" (click)="action($event, event.action.url)" [title]="event.action.name" [disabled]="!event.action.actionable" *ngIf="event.action">
diff --git a/src/addon/blog/components/entries/addon-blog-entries.html b/src/addon/blog/components/entries/addon-blog-entries.html
index f5ed012be..557bf3ed3 100644
--- a/src/addon/blog/components/entries/addon-blog-entries.html
+++ b/src/addon/blog/components/entries/addon-blog-entries.html
@@ -13,7 +13,7 @@
                 <ion-item text-wrap>
                     <ion-avatar core-user-avatar [user]="entry.user" item-start [courseId]="entry.courseid"></ion-avatar>
                     <h2>
-                        <core-format-text [text]="entry.subject"></core-format-text>
+                        <core-format-text [text]="entry.subject" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text>
                         <ion-note float-end padding-left text-end>
                             {{ 'addon.blog.' + entry.publishTranslated | translate}}
                         </ion-note>
@@ -27,7 +27,7 @@
                 </ion-item>
                 <ion-card-content>
                     <ion-item>
-                        <core-format-text [text]="entry.summary" [component]="this.component" [componentId]="entry.id"></core-format-text>
+                        <core-format-text [text]="entry.summary" [component]="this.component" [componentId]="entry.id" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text>
                     </ion-item>
                     <ion-item text-wrap *ngIf="tagsEnabled && entry.tags && entry.tags.length > 0">
                         <div item-start>{{ 'core.tag.tags' | translate }}:</div>
diff --git a/src/addon/blog/components/entries/entries.ts b/src/addon/blog/components/entries/entries.ts
index fb103d306..29b225c09 100644
--- a/src/addon/blog/components/entries/entries.ts
+++ b/src/addon/blog/components/entries/entries.ts
@@ -42,6 +42,7 @@ export class AddonBlogEntriesComponent implements OnInit {
     protected userPageLoaded = 0;
     protected canLoadMoreEntries = false;
     protected canLoadMoreUserEntries = true;
+    protected siteHomeId: number;
 
     @ViewChild(Content) content: Content;
 
@@ -55,11 +56,14 @@ export class AddonBlogEntriesComponent implements OnInit {
     component = AddonBlogProvider.COMPONENT;
     commentsEnabled: boolean;
     tagsEnabled: boolean;
+    contextLevel: string;
+    contextInstanceId: number;
 
     constructor(protected blogProvider: AddonBlogProvider, protected domUtils: CoreDomUtilsProvider,
             protected userProvider: CoreUserProvider, sitesProvider: CoreSitesProvider, protected utils: CoreUtilsProvider,
             protected commentsProvider: CoreCommentsProvider, private tagProvider: CoreTagProvider) {
         this.currentUserId = sitesProvider.getCurrentSiteUserId();
+        this.siteHomeId = sitesProvider.getCurrentSiteHomeId();
     }
 
     /**
@@ -91,6 +95,18 @@ export class AddonBlogEntriesComponent implements OnInit {
             this.filter['tagid'] = this.tagId;
         }
 
+        // Calculate the context level.
+        if (this.userId && !this.courseId && !this.cmId) {
+            this.contextLevel = 'user';
+            this.contextInstanceId = this.userId;
+        } else if (this.courseId && this.courseId != this.siteHomeId) {
+            this.contextLevel = 'course';
+            this.contextInstanceId = this.courseId;
+        } else {
+            this.contextLevel = 'system';
+            this.contextInstanceId = this.siteHomeId;
+        }
+
         this.commentsEnabled = !this.commentsProvider.areCommentsDisabledInSite();
         this.tagsEnabled = this.tagProvider.areTagsAvailableInSite();
 
@@ -134,6 +150,18 @@ export class AddonBlogEntriesComponent implements OnInit {
                         break;
                 }
 
+                // Calculate the context. This code was inspired by calendar events, Moodle doesn't do this for blogs.
+                if (entry.moduleid || entry.coursemoduleid) {
+                    entry.contextLevel = 'module';
+                    entry.contextInstanceId = entry.moduleid || entry.coursemoduleid;
+                } else if (entry.courseid) {
+                    entry.contextLevel = 'course';
+                    entry.contextInstanceId = entry.courseid;
+                } else {
+                    entry.contextLevel = 'user';
+                    entry.contextInstanceId = entry.userid;
+                }
+
                 return this.userProvider.getProfile(entry.userid, entry.courseid, true).then((user) => {
                     entry.user = user;
                 }).catch(() => {
@@ -245,4 +273,6 @@ export class AddonBlogEntriesComponent implements OnInit {
 type AddonBlogPostFormatted = AddonBlogPost & {
     publishTranslated?: string; // Calculated in the app. Key of the string to translate the publish state of the post.
     user?: any; // Calculated in the app. Data of the user that wrote the post.
+    contextLevel?: string; // Calculated in the app. The context level of the entry.
+    contextInstanceId?: number; // Calculated in the app. The context instance id.
 };
diff --git a/src/addon/calendar/components/upcoming-events/addon-calendar-upcoming-events.html b/src/addon/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
index c9ff2ded7..9650b070c 100644
--- a/src/addon/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
+++ b/src/addon/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
@@ -7,8 +7,8 @@
             <a ion-item text-wrap [title]="event.name" (click)="eventClicked(event)" [class.core-split-item-selected]="event.id == eventId" class="addon-calendar-event" [ngClass]="['addon-calendar-eventtype-'+event.eventtype]">
                 <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" item-start class="core-module-icon">
                 <core-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" item-start></core-icon>
-                <h2><core-format-text [text]="event.name"></core-format-text></h2>
-                <p><core-format-text [text]="event.formattedtime"></core-format-text></p>
+                <h2><core-format-text [text]="event.name" [contextLevel]="event.contextLevel" [contextInstanceId]="event.contextInstanceId"></core-format-text></h2>
+                <p [innerHTML]="event.formattedtime"></p>
                 <ion-note *ngIf="event.offline && !event.deleted" item-end>
                     <ion-icon name="time"></ion-icon>
                     <span text-wrap>{{ 'core.notsent' | translate }}</span>
diff --git a/src/addon/calendar/pages/day/day.html b/src/addon/calendar/pages/day/day.html
index 4f225959f..913e5ea4e 100644
--- a/src/addon/calendar/pages/day/day.html
+++ b/src/addon/calendar/pages/day/day.html
@@ -51,8 +51,8 @@
                 <ion-item text-wrap [title]="event.name" (click)="gotoEvent(event.id)" [class.item-dimmed]="event.ispast" class="addon-calendar-event" [ngClass]="['addon-calendar-eventtype-'+event.eventtype]">
                     <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" item-start class="core-module-icon">
                     <core-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" item-start></core-icon>
-                    <h2><core-format-text [text]="event.name"></core-format-text></h2>
-                    <p><core-format-text [text]="event.formattedtime"></core-format-text></p>
+                    <h2><core-format-text [text]="event.name" [contextLevel]="event.contextLevel" [contextInstanceId]="event.contextInstanceId"></core-format-text></h2>
+                    <p [innerHTML]="event.formattedtime"></p>
                     <ion-note *ngIf="event.offline && !event.deleted" item-end>
                         <ion-icon name="time"></ion-icon>
                         <span text-wrap>{{ 'core.notsent' | translate }}</span>
diff --git a/src/addon/calendar/pages/edit-event/edit-event.ts b/src/addon/calendar/pages/edit-event/edit-event.ts
index a1dd48d41..18f0e5feb 100644
--- a/src/addon/calendar/pages/edit-event/edit-event.ts
+++ b/src/addon/calendar/pages/edit-event/edit-event.ts
@@ -21,7 +21,6 @@ import { CoreGroupsProvider } from '@providers/groups';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreSyncProvider } from '@providers/sync';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
-import { CoreTextUtilsProvider } from '@providers/utils/text';
 import { CoreTimeUtilsProvider } from '@providers/utils/time';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
@@ -32,6 +31,7 @@ import { AddonCalendarOfflineProvider } from '../../providers/calendar-offline';
 import { AddonCalendarHelperProvider } from '../../providers/helper';
 import { AddonCalendarSyncProvider } from '../../providers/calendar-sync';
 import { CoreSite } from '@classes/site';
+import { CoreFilterProvider } from '@core/filter/providers/filter';
 
 /**
  * Page that displays a form to create/edit an event.
@@ -81,7 +81,6 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
             private navCtrl: NavController,
             private translate: TranslateService,
             private domUtils: CoreDomUtilsProvider,
-            private textUtils: CoreTextUtilsProvider,
             private timeUtils: CoreTimeUtilsProvider,
             private eventsProvider: CoreEventsProvider,
             private groupsProvider: CoreGroupsProvider,
@@ -94,6 +93,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
             private calendarSync: AddonCalendarSyncProvider,
             private fb: FormBuilder,
             private syncProvider: CoreSyncProvider,
+            private filterProvider: CoreFilterProvider,
             @Optional() private svComponent: CoreSplitViewComponent) {
 
         this.eventId = navParams.get('eventId');
@@ -244,7 +244,8 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
                     // Format the name of the courses.
                     const subPromises = [];
                     courses.forEach((course) => {
-                        subPromises.push(this.textUtils.formatText(course.fullname).then((text) => {
+                        subPromises.push(this.filterProvider.getFiltersAndFormatText(course.fullname, 'course', course.id)
+                                .then((text) => {
                             course.fullname = text;
                         }).catch(() => {
                             // Ignore errors.
diff --git a/src/addon/calendar/pages/event/event.html b/src/addon/calendar/pages/event/event.html
index 009c0bfa7..704a23bec 100644
--- a/src/addon/calendar/pages/event/event.html
+++ b/src/addon/calendar/pages/event/event.html
@@ -3,7 +3,7 @@
         <ion-title>
             <img *ngIf="event && event.moduleIcon" src="{{event.moduleIcon}}" alt="" role="presentation" class="core-module-icon">
             <core-icon *ngIf="event && event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" item-start></core-icon>
-            <core-format-text *ngIf="event" [text]="event.name"></core-format-text>
+            <core-format-text *ngIf="event" [text]="event.name" [contextLevel]="event.contextLevel" [contextInstanceId]="event.contextInstanceId"></core-format-text>
         </ion-title>
         <ion-buttons end>
             <!-- The context menu will be added in here. -->
@@ -34,14 +34,14 @@
                     <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" item-start alt="" role="presentation" class="core-module-icon">
                     <core-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" item-start></core-icon>
                     <h2>{{ 'addon.calendar.eventname' | translate }}</h2>
-                    <p><core-format-text [text]="event.name"></core-format-text></p>
+                    <p><core-format-text [text]="event.name" [contextLevel]="event.contextLevel" [contextInstanceId]="event.contextInstanceId"></core-format-text></p>
                     <ion-note item-end *ngIf="event.deleted">
                         <ion-icon name="trash"></ion-icon> {{ 'core.deletedoffline' | translate }}
                     </ion-note>
                 </ion-item>
                 <ion-item>
                     <h2>{{ 'addon.calendar.when' | translate }}</h2>
-                    <p><core-format-text [text]="event.formattedtime"></core-format-text></p>
+                    <p [innerHTML]="event.formattedtime"></p>
                     <ion-note item-end *ngIf="!isSplitViewOn && event.deleted">
                         <ion-icon name="trash"></ion-icon> {{ 'core.deletedoffline' | translate }}
                     </ion-note>
@@ -52,7 +52,7 @@
                 </ion-item>
                 <a ion-item text-wrap *ngIf="courseName" [href]="courseUrl" core-link capture="true">
                     <h2>{{ 'core.course' | translate}}</h2>
-                    <p><core-format-text [text]="courseName"></core-format-text></p>
+                    <p><core-format-text [text]="courseName" contextLevel="course" [contextInstanceId]="courseId"></core-format-text></p>
                 </a>
                 <ion-item text-wrap *ngIf="groupName">
                     <h2>{{ 'core.group' | translate}}</h2>
@@ -60,19 +60,19 @@
                 </ion-item>
                 <a ion-item text-wrap *ngIf="categoryPath">
                     <h2>{{ 'core.category' | translate}}</h2>
-                    <p><core-format-text [text]="categoryPath"></core-format-text></p>
+                    <p><core-format-text [text]="categoryPath" contextLevel="category" [contextInstanceId]="event.category.id"></core-format-text></p>
                 </a>
                 <ion-item text-wrap *ngIf="event.description">
                     <h2>{{ 'core.description' | translate}}</h2>
                     <p>
-                        <core-format-text [text]="event.description"></core-format-text>
+                        <core-format-text [text]="event.description" [contextLevel]="event.contextLevel" [contextInstanceId]="event.contextInstanceId"></core-format-text>
                     </p>
                 </ion-item>
                 <ion-item text-wrap *ngIf="event.location">
                     <h2>{{ 'core.location' | translate}}</h2>
                     <p>
                         <a [href]="event.encodedLocation" core-link auto-login="no">
-                            <core-format-text [text]="event.location"></core-format-text>
+                            <core-format-text [text]="event.location" [contextLevel]="event.contextLevel" [contextInstanceId]="event.contextInstanceId"></core-format-text>
                         </a>
                     </p>
                 </ion-item>
diff --git a/src/addon/calendar/pages/event/event.ts b/src/addon/calendar/pages/event/event.ts
index 7fa231bc3..9d12d644b 100644
--- a/src/addon/calendar/pages/event/event.ts
+++ b/src/addon/calendar/pages/event/event.ts
@@ -57,6 +57,7 @@ export class AddonCalendarEventPage implements OnDestroy {
     notificationMax: string;
     notificationTimeText: string;
     event: any = {};
+    courseId: number;
     courseName: string;
     groupName: string;
     courseUrl = '';
@@ -250,11 +251,13 @@ export class AddonCalendarEventPage implements OnDestroy {
 
             // If the event belongs to a course, get the course name and the URL to view it.
             if (canGetById && event.course && event.course.id != this.siteHomeId) {
+                this.courseId = event.course.id;
                 this.courseName = event.course.fullname;
                 this.courseUrl = event.course.viewurl;
             } else if (event.courseid && event.courseid != this.siteHomeId) {
                 // Retrieve the course.
                 promises.push(this.coursesProvider.getUserCourse(event.courseid, true).then((course) => {
+                    this.courseId = course.id;
                     this.courseName = course.fullname;
                     this.courseUrl = currentSite ? this.textUtils.concatenatePaths(currentSite.siteUrl,
                             '/course/view.php?id=' + event.courseid) : '';
diff --git a/src/addon/calendar/pages/list/list.html b/src/addon/calendar/pages/list/list.html
index a400360b4..973184953 100644
--- a/src/addon/calendar/pages/list/list.html
+++ b/src/addon/calendar/pages/list/list.html
@@ -35,7 +35,7 @@
                     <a ion-item text-wrap [title]="event.name" (click)="gotoEvent(event.id)" [class.core-split-item-selected]="event.id == eventId" class="addon-calendar-event" [ngClass]="['addon-calendar-eventtype-'+event.eventtype]">
                         <img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" item-start class="core-module-icon">
                         <core-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" item-start></core-icon>
-                        <h2><core-format-text [text]="event.name"></core-format-text></h2>
+                        <h2><core-format-text [text]="event.name" [contextLevel]="event.contextLevel" [contextInstanceId]="event.contextInstanceId"></core-format-text></h2>
                         <p>
                             {{ event.timestart * 1000 | coreFormatDate: "strftimetime" }}
                             <span *ngIf="event.timeduration && event.endsSameDay"> - {{ (event.timestart + event.timeduration) * 1000 | coreFormatDate: "strftimetime" }}</span>
diff --git a/src/addon/calendar/providers/helper.ts b/src/addon/calendar/providers/helper.ts
index 7fd8362ea..8ff3e2810 100644
--- a/src/addon/calendar/providers/helper.ts
+++ b/src/addon/calendar/providers/helper.ts
@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
 import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreCourseProvider } from '@core/course/providers/course';
-import { AddonCalendarProvider, AddonCalendarCalendarEvent } from './calendar';
+import { AddonCalendarProvider } from './calendar';
 import { CoreConstants } from '@core/constants';
 import { CoreConfigProvider } from '@providers/config';
 import { CoreUtilsProvider } from '@providers/utils/utils';
@@ -130,7 +130,7 @@ export class AddonCalendarHelperProvider {
      *
      * @param e Event to format.
      */
-    formatEventData(e: AddonCalendarCalendarEvent): void {
+    formatEventData(e: any): void {
         e.eventIcon = this.EVENTICONS[e.eventtype] || '';
         if (!e.eventIcon) {
             e.eventIcon = this.courseProvider.getModuleIconSrc(e.modulename);
@@ -139,6 +139,21 @@ export class AddonCalendarHelperProvider {
 
         e.formattedType = this.calendarProvider.getEventType(e);
 
+        // Calculate context.
+        const categoryId = e.category ? e.category.id : e.categoryid,
+            courseId = e.course ? e.course.id : e.courseid;
+
+        if (categoryId > 0) {
+            e.contextLevel = 'category';
+            e.contextInstanceId = categoryId;
+        } else if (courseId > 0) {
+            e.contextLevel = 'course';
+            e.contextInstanceId = courseId;
+        } else {
+            e.contextLevel = 'user';
+            e.contextInstanceId = e.userid;
+        }
+
         if (typeof e.duration != 'undefined') {
             // It's an offline event, add some calculated data.
             e.format = 1;
diff --git a/src/addon/competency/components/course/addon-competency-course.html b/src/addon/competency/components/course/addon-competency-course.html
index 041646947..4ccccd2bc 100644
--- a/src/addon/competency/components/course/addon-competency-course.html
+++ b/src/addon/competency/components/course/addon-competency-course.html
@@ -30,7 +30,7 @@
         <ion-card *ngIf="user">
              <ion-item text-wrap>
                 <ion-avatar core-user-avatar [user]="user" item-start></ion-avatar>
-                <h2><core-format-text [text]="user.fullname"></core-format-text></h2>
+                <h2>{{ user.fullname }}</h2>
             </ion-item>
         </ion-card>
         <core-empty-box *ngIf="competencies && competencies.statistics.competencycount == 0" icon="ribbon" message="{{ 'addon.competency.nocompetenciesincourse' | translate }}"></core-empty-box>
@@ -43,7 +43,7 @@
                 </ion-item>
                 <ion-item text-wrap>
                     <p *ngIf="competency.competency.description">
-                        <core-format-text [text]=" competency.competency.description "></core-format-text>
+                        <core-format-text [text]="competency.competency.description" contextLevel="course" [contextInstanceId]="courseId"></core-format-text>
                     </p>
                     <div>
                         <strong>{{ 'addon.competency.path' | translate }}</strong>
@@ -59,9 +59,7 @@
                     <div *ngIf="competencies.statistics.canmanagecoursecompetencies">
                         <strong>{{ 'addon.competency.uponcoursecompletion' | translate }}</strong>
                          <ng-container *ngFor="let ruleoutcome of competency.ruleoutcomeoptions">
-                            <span *ngIf="ruleoutcome.selected">
-                                <core-format-text [text]="ruleoutcome.text"></core-format-text>
-                            </span>
+                            <span *ngIf="ruleoutcome.selected">{{ ruleoutcome.text }}</span>
                         </ng-container>
                     </div>
                     <div>
@@ -71,7 +69,7 @@
                         </p>
                         <a ion-item text-wrap *ngFor="let activity of competency.coursemodules" [href]="activity.url" [title]="activity.name" core-link capture="true" class="core-course-module-handler item-media">
                             <img item-start [src]="activity.iconurl" core-external-content alt="" role="presentation" *ngIf="activity.iconurl" class="core-module-icon">
-                            <core-format-text [text]="activity.name"></core-format-text>
+                            <core-format-text [text]="activity.name" contextLevel="module" [contextInstanceId]="activity.id"></core-format-text>
                         </a>
                     </div>
                     <div *ngIf="competency.plans">
@@ -80,7 +78,7 @@
                             {{ 'addon.competency.nouserplanswithcompetency' | translate }}
                         </p>
                         <a ion-item text-wrap *ngFor="let plan of competency.plans" [href]="plan.url" [title]="plan.name" core-link capture="true">
-                            <core-format-text [text]="plan.name"></core-format-text>
+                            <core-format-text [text]="plan.name" contextLevel="user" [contextInstanceId]="plan.userid"></core-format-text>
                         </a>
                     </div>
                 </ion-item>
diff --git a/src/addon/competency/components/course/course.ts b/src/addon/competency/components/course/course.ts
index b6d4f7fcb..ba92de5a5 100644
--- a/src/addon/competency/components/course/course.ts
+++ b/src/addon/competency/components/course/course.ts
@@ -86,7 +86,11 @@ export class AddonCompetencyCourseComponent {
      * @param competencyId
      */
     openCompetencySummary(competencyId: number): void {
-        this.navCtrl.push('AddonCompetencyCompetencySummaryPage', {competencyId});
+        this.navCtrl.push('AddonCompetencyCompetencySummaryPage', {
+            competencyId,
+            contextLevel: 'course',
+            contextInstanceId: this.courseId
+        });
     }
 
     /**
diff --git a/src/addon/competency/pages/competency/competency.html b/src/addon/competency/pages/competency/competency.html
index 20b6876a2..1835fb1bc 100644
--- a/src/addon/competency/pages/competency/competency.html
+++ b/src/addon/competency/pages/competency/competency.html
@@ -11,13 +11,13 @@
         <ion-card *ngIf="user">
             <ion-item text-wrap>
                 <ion-avatar core-user-avatar [user]="user" item-start></ion-avatar>
-                <h2><core-format-text [text]="user.fullname"></core-format-text></h2>
+                <h2>{{ user.fullname }}</h2>
             </ion-item>
         </ion-card>
 
         <ion-card *ngIf="competency">
             <ion-item text-wrap *ngIf="competency.competency.competency.description">
-                <core-format-text [text]="competency.competency.competency.description"></core-format-text>
+                <core-format-text [text]="competency.competency.competency.description" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text>
             </ion-item>
             <ion-item text-wrap>
                 <strong>{{ 'addon.competency.path' | translate }}</strong>
@@ -48,7 +48,7 @@
                 </p>
                 <a ion-item text-wrap *ngFor="let activity of coursemodules" [href]="activity.url" [title]="activity.name" core-link capture="true">
                     <img item-start core-external-content [src]="activity.iconurl" alt="" role="presentation" *ngIf="activity.iconurl" class="core-module-icon">
-                    <core-format-text [text]="activity.name"></core-format-text>
+                    <core-format-text [text]="activity.name" contextLevel="module" [contextInstanceId]="activity.id"></core-format-text>
                 </a>
             </ion-item>
             <ion-item text-wrap *ngIf="userCompetency.status">
@@ -84,7 +84,7 @@
                 <ion-item text-wrap>
                     <p><ion-badge color="dark">{{ evidence.gradename }}</ion-badge></p>
                     <p margin-top *ngIf="evidence.description">{{ evidence.description }}</p>
-                    <blockquote *ngIf="evidence.note"><core-format-text [text]="evidence.note"></core-format-text></blockquote>
+                    <blockquote *ngIf="evidence.note">{{ evidence.note }}</blockquote>
                 </ion-item>
             </ion-card>
         </div>
diff --git a/src/addon/competency/pages/competency/competency.ts b/src/addon/competency/pages/competency/competency.ts
index 06c33666a..e125c51bc 100644
--- a/src/addon/competency/pages/competency/competency.ts
+++ b/src/addon/competency/pages/competency/competency.ts
@@ -46,6 +46,8 @@ export class AddonCompetencyCompetencyPage {
     user: CoreUserSummary;
     competency: AddonCompetencyUserCompetencySummary;
     userCompetency: AddonCompetencyUserCompetencyPlan | AddonCompetencyUserCompetency | AddonCompetencyUserCompetencyCourse;
+    contextLevel: string;
+    contextInstanceId: number;
 
     constructor(private navCtrl: NavController, navParams: NavParams, private translate: TranslateService,
             private sitesProvider: CoreSitesProvider, private domUtils: CoreDomUtilsProvider,
@@ -99,6 +101,15 @@ export class AddonCompetencyCompetencyPage {
 
         return promise.then((competency) => {
 
+            // Calculate the context.
+            if (this.courseId) {
+                this.contextLevel = 'course';
+                this.contextInstanceId = this.courseId;
+            } else {
+                this.contextLevel = 'user';
+                this.contextInstanceId = this.userId || competency.usercompetencysummary.user.id;
+            }
+
             this.competency = competency.usercompetencysummary;
             this.userCompetency = this.competency.usercompetencyplan || this.competency.usercompetency;
 
@@ -155,6 +166,10 @@ export class AddonCompetencyCompetencyPage {
     openCompetencySummary(competencyId: number): void {
         // Decide which navCtrl to use. If this page is inside a split view, use the split view's master nav.
         const navCtrl = this.svComponent ? this.svComponent.getMasterNav() : this.navCtrl;
-        navCtrl.push('AddonCompetencyCompetencySummaryPage', {competencyId});
+        navCtrl.push('AddonCompetencyCompetencySummaryPage', {
+            competencyId,
+            contextLevel: this.contextLevel,
+            contextInstanceId: this.contextInstanceId
+        });
     }
 }
diff --git a/src/addon/competency/pages/competencysummary/competencysummary.html b/src/addon/competency/pages/competencysummary/competencysummary.html
index 8df0e9bcc..d00b4ba50 100644
--- a/src/addon/competency/pages/competencysummary/competencysummary.html
+++ b/src/addon/competency/pages/competencysummary/competencysummary.html
@@ -10,7 +10,7 @@
     <core-loading [hideUntil]="competencyLoaded">
         <ion-card *ngIf="competency">
             <ion-item text-wrap *ngIf="competency.competency.description">
-                <core-format-text [text]="competency.competency.description"></core-format-text>
+                <core-format-text [text]="competency.competency.description" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text>
             </ion-item>
             <ion-item text-wrap>
                 <strong>{{ 'addon.competency.path' | translate }}</strong>
diff --git a/src/addon/competency/pages/competencysummary/competencysummary.ts b/src/addon/competency/pages/competencysummary/competencysummary.ts
index 774dedc0c..085854ce5 100644
--- a/src/addon/competency/pages/competencysummary/competencysummary.ts
+++ b/src/addon/competency/pages/competencysummary/competencysummary.ts
@@ -30,10 +30,14 @@ export class AddonCompetencyCompetencySummaryPage {
     competencyLoaded = false;
     competencyId: number;
     competency: AddonCompetencySummary;
+    contextLevel: string;
+    contextInstanceId: number;
 
     constructor(private navCtrl: NavController, navParams: NavParams, private domUtils: CoreDomUtilsProvider,
             @Optional() private svComponent: CoreSplitViewComponent, private competencyProvider: AddonCompetencyProvider) {
         this.competencyId = navParams.get('competencyId');
+        this.contextLevel = navParams.get('contextLevel');
+        this.contextInstanceId = navParams.get('contextInstanceId');
     }
 
     /**
@@ -57,8 +61,14 @@ export class AddonCompetencyCompetencySummaryPage {
      * @return Promise resolved when done.
      */
     protected fetchCompetency(): Promise<void> {
-        return this.competencyProvider.getCompetencySummary(this.competencyId).then((competency) => {
-            this.competency = competency;
+        return this.competencyProvider.getCompetencySummary(this.competencyId).then((result) => {
+            if (!this.contextLevel || typeof this.contextInstanceId == 'undefined') {
+                // Context not specified, use user context.
+                this.contextLevel = 'user';
+                this.contextInstanceId = result.usercompetency.userid;
+            }
+
+            this.competency = result.competency;
         }).catch((message) => {
             this.domUtils.showErrorModalDefault(message, 'Error getting competency summary data.');
         });
@@ -85,6 +95,10 @@ export class AddonCompetencyCompetencySummaryPage {
     openCompetencySummary(competencyId: number): void {
         // Decide which navCtrl to use. If this page is inside a split view, use the split view's master nav.
         const navCtrl = this.svComponent ? this.svComponent.getMasterNav() : this.navCtrl;
-        navCtrl.push('AddonCompetencyCompetencySummaryPage', {competencyId});
+        navCtrl.push('AddonCompetencyCompetencySummaryPage', {
+            competencyId,
+            contextLevel: this.contextLevel,
+            contextInstanceId: this.contextInstanceId
+        });
     }
 }
diff --git a/src/addon/competency/pages/plan/plan.html b/src/addon/competency/pages/plan/plan.html
index 1d965ebf2..f45818688 100644
--- a/src/addon/competency/pages/plan/plan.html
+++ b/src/addon/competency/pages/plan/plan.html
@@ -11,13 +11,13 @@
         <ion-card *ngIf="user">
             <ion-item text-wrap>
                 <ion-avatar core-user-avatar [user]="user" item-start></ion-avatar>
-                <h2><core-format-text [text]="user.fullname"></core-format-text></h2>
+                <h2>{{ user.fullname }}</h2>
             </ion-item>
        </ion-card>
         <ion-card *ngIf="plan">
             <ion-list>
                 <ion-item text-wrap *ngIf="plan.plan.description">
-                    <core-format-text [text]="plan.plan.description"></core-format-text>
+                    <core-format-text [text]="plan.plan.description" contextLevel="user" [contextInstanceId]="plan.plan.userid"></core-format-text>
                 </ion-item>
                 <ion-item text-wrap>
                     <strong>{{ 'addon.competency.status' | translate }}</strong>:
diff --git a/src/addon/competency/providers/competency.ts b/src/addon/competency/providers/competency.ts
index b678704e7..7d2704da9 100644
--- a/src/addon/competency/providers/competency.ts
+++ b/src/addon/competency/providers/competency.ts
@@ -299,7 +299,7 @@ export class AddonCompetencyProvider {
      * @return Promise to be resolved when the competency summary is retrieved.
      */
     getCompetencySummary(competencyId: number, userId?: number, siteId?: string, ignoreCache?: boolean)
-            : Promise<AddonCompetencySummary> {
+            : Promise<AddonCompetencyUserCompetencySummary> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
             userId = userId || site.getUserId();
@@ -324,7 +324,7 @@ export class AddonCompetencyProvider {
                     .then((response: AddonCompetencyUserCompetencySummary): any => {
 
                 if (response.competency) {
-                    return response.competency;
+                    return response;
                 }
 
                 return Promise.reject(null);
diff --git a/src/addon/coursecompletion/components/report/addon-course-completion-report.html b/src/addon/coursecompletion/components/report/addon-course-completion-report.html
index 54683082d..954447487 100644
--- a/src/addon/coursecompletion/components/report/addon-course-completion-report.html
+++ b/src/addon/coursecompletion/components/report/addon-course-completion-report.html
@@ -17,8 +17,8 @@
         <ion-card *ngIf="completion && tracked">
             <ion-item-divider>{{ 'addon.coursecompletion.requiredcriteria' | translate }}</ion-item-divider>
             <ion-item class="hidden-tablet" text-wrap *ngFor="let criteria of completion.completions">
-                <h2><core-format-text clean="true" [text]="criteria.details.criteria"></core-format-text></h2>
-                <p><core-format-text clean="true" [text]="criteria.details.requirement"></core-format-text></p>
+                <h2><core-format-text clean="true" [text]="criteria.details.criteria" [filter]="false"></core-format-text></h2>
+                <p><core-format-text clean="true" [text]="criteria.details.requirement" [filter]="false"></core-format-text></p>
                 <strong item-end>{{ criteria.status }}</strong>
             </ion-item>
             <ion-item class="hidden-phone" text-wrap>
@@ -31,10 +31,10 @@
                     <ion-col><strong>{{ 'addon.coursecompletion.completiondate' | translate }}</strong></ion-col>
                 </ion-row>
                 <ion-row *ngFor="let criteria of completion.completions">
-                    <ion-col><core-format-text clean="true" [text]="criteria.title"></core-format-text></ion-col>
-                    <ion-col><core-format-text clean="true" [text]="criteria.details.criteria"></core-format-text></ion-col>
-                    <ion-col><core-format-text clean="true" [text]="criteria.details.requirement"></core-format-text></ion-col>
-                    <ion-col><core-format-text [text]="criteria.details.status"></core-format-text></ion-col>
+                    <ion-col><core-format-text clean="true" [text]="criteria.title" [filter]="false"></core-format-text></ion-col>
+                    <ion-col><core-format-text clean="true" [text]="criteria.details.criteria" [filter]="false"></core-format-text></ion-col>
+                    <ion-col><core-format-text clean="true" [text]="criteria.details.requirement" [filter]="false"></core-format-text></ion-col>
+                    <ion-col><core-format-text [text]="criteria.details.status" [filter]="false"></core-format-text></ion-col>
                     <ion-col>{{ criteria.status }}</ion-col>
                     <ion-col *ngIf="criteria.timecompleted">{{ criteria.timecompleted * 1000 | coreFormatDate :'strftimedatetimeshort' }}</ion-col>
                     <ion-col *ngIf="!criteria.timecompleted"></ion-col>
diff --git a/src/addon/files/pages/list/list.html b/src/addon/files/pages/list/list.html
index 4d467d824..b119855ca 100644
--- a/src/addon/files/pages/list/list.html
+++ b/src/addon/files/pages/list/list.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title>{{ title }}</ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>
diff --git a/src/addon/messages/components/confirmed-contacts/addon-messages-confirmed-contacts.html b/src/addon/messages/components/confirmed-contacts/addon-messages-confirmed-contacts.html
index ccd7bd268..37e628570 100644
--- a/src/addon/messages/components/confirmed-contacts/addon-messages-confirmed-contacts.html
+++ b/src/addon/messages/components/confirmed-contacts/addon-messages-confirmed-contacts.html
@@ -7,7 +7,7 @@
             <a ion-item text-wrap *ngFor="let contact of contacts" [title]="contact.fullname" (click)="selectUser(contact.id)" [class.core-split-item-selected]="contact.id == selectedUserId" class="addon-messages-conversation-item">
                 <ion-avatar item-start core-user-avatar [user]="contact" [checkOnline]="contact.showonlinestatus" [linkProfile]="false"></ion-avatar>
                 <h2>
-                    <core-format-text [text]="contact.fullname"></core-format-text>
+                    {{ contact.fullname }}
                     <core-icon *ngIf="contact.isblocked" name="fa-ban" item-end></core-icon>
                 </h2>
             </a>
diff --git a/src/addon/messages/components/contact-requests/addon-messages-contact-requests.html b/src/addon/messages/components/contact-requests/addon-messages-contact-requests.html
index b3bffbf68..c37ccea7e 100644
--- a/src/addon/messages/components/contact-requests/addon-messages-contact-requests.html
+++ b/src/addon/messages/components/contact-requests/addon-messages-contact-requests.html
@@ -6,7 +6,7 @@
         <ion-list no-margin>
             <a ion-item text-wrap *ngFor="let request of requests" [title]="request.fullname" (click)="selectUser(request.id)" [class.core-split-item-selected]="request.id == selectedUserId" class="addon-messages-conversation-item">
                 <ion-avatar item-start core-user-avatar [user]="request" [linkProfile]="false"></ion-avatar>
-                <h2><core-format-text [text]="request.fullname"></core-format-text></h2>
+                <h2>{{ request.fullname }}</h2>
                 <p *ngIf="!request.iscontact && !request.confirmedOrDeclined">{{ 'addon.messages.wouldliketocontactyou' | translate }}</p>
             </a>
         </ion-list>
diff --git a/src/addon/messages/components/contacts/addon-messages-contacts.html b/src/addon/messages/components/contacts/addon-messages-contacts.html
index 4722b4d74..8d0f1f543 100644
--- a/src/addon/messages/components/contacts/addon-messages-contacts.html
+++ b/src/addon/messages/components/contacts/addon-messages-contacts.html
@@ -20,7 +20,7 @@
                     <!-- Don't show deleted users -->
                     <a ion-item text-wrap *ngIf="contact.profileimageurl || contact.profileimageurlsmall"  [title]="contact.fullname" (click)="gotoDiscussion(contact.id)" [class.core-split-item-selected]="contact.id == discussionUserId" class="addon-messages-conversation-item">
                         <ion-avatar core-user-avatar [user]="contact" item-start [checkOnline]="contact.showonlinestatus"></ion-avatar>
-                        <h2><core-format-text [text]="contact.fullname"></core-format-text></h2>
+                        <h2>{{ contact.fullname }}</h2>
                     </a>
                 </ng-container>
             </ng-container>
diff --git a/src/addon/messages/components/discussions/addon-messages-discussions.html b/src/addon/messages/components/discussions/addon-messages-discussions.html
index 23c9c6f34..8d21aaba8 100644
--- a/src/addon/messages/components/discussions/addon-messages-discussions.html
+++ b/src/addon/messages/components/discussions/addon-messages-discussions.html
@@ -14,22 +14,20 @@
             </ion-item-divider>
             <a ion-item text-wrap *ngFor="let result of search.results" [title]="result.fullname" (click)="gotoDiscussion(result.userid, result.messageid)" [class.core-split-item-selected]="result.userid == discussionUserId" class="addon-message-discussion">
                 <ion-avatar core-user-avatar [user]="result" item-start [checkOnline]="result.showonlinestatus"></ion-avatar>
-                <h2><core-format-text [text]="result.fullname"></core-format-text></h2>
-                <p><core-format-text clean="true" singleLine="true" [text]="result.lastmessage"></core-format-text></p>
+                <h2>{{ result.fullname }}</h2>
+                <p><core-format-text clean="true" singleLine="true" [text]="result.lastmessage" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></p>
             </a>
         </ion-list>
 
         <ion-list *ngIf="!search.showResults" no-margin>
             <a ion-item text-wrap *ngFor="let discussion of discussions" [title]="discussion.fullname" (click)="gotoDiscussion(discussion.message.user)" [class.core-split-item-selected]="discussion.message.user == discussionUserId" class="addon-message-discussion">
                 <ion-avatar core-user-avatar [user]="discussion" item-start [checkOnline]="discussion.showonlinestatus"></ion-avatar>
-                <h2>
-                    <core-format-text [text]="discussion.fullname"></core-format-text>
-                </h2>
+                <h2>{{ discussion.fullname }}</h2>
                 <ion-note *ngIf="discussion.message.timecreated > 0 || discussion.unread">
                     <span *ngIf="discussion.unread" class="core-primary-circle"></span>
                     <span *ngIf="discussion.message.timecreated > 0">{{discussion.message.timecreated / 1000 | coreDateDayOrTime}}</span>
                 </ion-note>
-                <p><core-format-text clean="true" singleLine="true" [text]="discussion.message.message"></core-format-text></p>
+                <p><core-format-text clean="true" singleLine="true" [text]="discussion.message.message" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></p>
             </a>
         </ion-list>
 
diff --git a/src/addon/messages/components/discussions/discussions.ts b/src/addon/messages/components/discussions/discussions.ts
index 629446b1a..0a37c5ec3 100644
--- a/src/addon/messages/components/discussions/discussions.ts
+++ b/src/addon/messages/components/discussions/discussions.ts
@@ -50,6 +50,7 @@ export class AddonMessagesDiscussionsComponent implements OnDestroy {
         loading: '',
         text: ''
     };
+    siteHomeId: number;
 
     constructor(private eventsProvider: CoreEventsProvider, sitesProvider: CoreSitesProvider, translate: TranslateService,
             private messagesProvider: AddonMessagesProvider, private domUtils: CoreDomUtilsProvider, navParams: NavParams,
@@ -59,6 +60,7 @@ export class AddonMessagesDiscussionsComponent implements OnDestroy {
         this.search.loading =  translate.instant('core.searching');
         this.loadingMessages = translate.instant('core.loading');
         this.siteId = sitesProvider.getCurrentSiteId();
+        this.siteHomeId = sitesProvider.getCurrentSiteHomeId();
 
         // Update discussions when new message is received.
         this.newMessagesObserver = eventsProvider.on(AddonMessagesProvider.NEW_MESSAGE_EVENT, (data) => {
diff --git a/src/addon/messages/pages/conversation-info/conversation-info.html b/src/addon/messages/pages/conversation-info/conversation-info.html
index 393b078b6..66dd220f2 100644
--- a/src/addon/messages/pages/conversation-info/conversation-info.html
+++ b/src/addon/messages/pages/conversation-info/conversation-info.html
@@ -18,15 +18,15 @@
             <div class="item-avatar-center">
                 <img class="avatar" [src]="conversation.imageurl" core-external-content [alt]="conversation.name" role="presentation" onError="this.src='assets/img/group-avatar.png'">
             </div>
-            <h2><core-format-text [text]="conversation.name"></core-format-text></h2>
-            <p><core-format-text *ngIf="conversation.subname" [text]="conversation.subname"></core-format-text></p>
+            <h2><core-format-text [text]="conversation.name" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></h2>
+            <p><core-format-text *ngIf="conversation.subname" [text]="conversation.subname" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></p>
             <p>{{ 'addon.messages.numparticipants' | translate:{$a: conversation.membercount} }}</p>
         </ion-item>
 
         <a ion-item text-wrap *ngFor="let member of members" (click)="closeModal(member.id)" class="addon-messages-conversation-item">
             <ion-avatar core-user-avatar [user]="member" [linkProfile]="false" [checkOnline]="member.showonlinestatus" item-start></ion-avatar>
             <h2>
-                <core-format-text [text]="member.fullname"></core-format-text>
+                {{ member.fullname }}
                 <core-icon name="fa-ban" *ngIf="member.isblocked" [label]="'addon.messages.contactblocked' | translate"></core-icon>
             </h2>
         </a>
diff --git a/src/addon/messages/pages/conversation-info/conversation-info.ts b/src/addon/messages/pages/conversation-info/conversation-info.ts
index e0149077a..dcd2597dd 100644
--- a/src/addon/messages/pages/conversation-info/conversation-info.ts
+++ b/src/addon/messages/pages/conversation-info/conversation-info.ts
@@ -18,6 +18,7 @@ import {
     AddonMessagesProvider, AddonMessagesConversationFormatted, AddonMessagesConversationMember
 } from '../../providers/messages';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
+import { CoreSitesProvider } from '@providers/sites';
 
 /**
  * Page that displays the list of conversations, including group conversations.
@@ -34,12 +35,14 @@ export class AddonMessagesConversationInfoPage implements OnInit {
     members: AddonMessagesConversationMember[] = [];
     canLoadMore = false;
     loadMoreError = false;
+    siteHomeId: number;
 
     protected conversationId: number;
 
     constructor(private messagesProvider: AddonMessagesProvider, private domUtils: CoreDomUtilsProvider, navParams: NavParams,
-            protected viewCtrl: ViewController) {
+            protected viewCtrl: ViewController, sitesProvider: CoreSitesProvider) {
         this.conversationId = navParams.get('conversationId');
+        this.siteHomeId = sitesProvider.getCurrentSiteHomeId();
     }
 
     /**
diff --git a/src/addon/messages/pages/discussion/discussion.html b/src/addon/messages/pages/discussion/discussion.html
index f29618655..5c7ea16ad 100644
--- a/src/addon/messages/pages/discussion/discussion.html
+++ b/src/addon/messages/pages/discussion/discussion.html
@@ -3,7 +3,7 @@
         <ion-title>
             <img *ngIf="loaded && !otherMember && conversationImage" class="core-bar-button-image" [src]="conversationImage" [alt]="title" onError="this.src='assets/img/group-avatar.png'" core-external-content role="presentation" [siteId]="siteId || null">
             <ion-avatar *ngIf="loaded && otherMember" class="core-bar-button-image" core-user-avatar [user]="otherMember" [linkProfile]="false" [checkOnline]="otherMember.showonlinestatus" item-start (click)="showInfo && viewInfo()"></ion-avatar>
-            <core-format-text [text]="title" (click)="showInfo && !isGroup && viewInfo()"></core-format-text>
+            <core-format-text [text]="title" contextLevel="system" [contextInstanceId]="siteHomeId" (click)="showInfo && !isGroup && viewInfo()"></core-format-text>
             <core-icon *ngIf="conversation && conversation.isfavourite" name="fa-star" [label]="'core.favourites' | translate"></core-icon>
             <core-icon *ngIf="conversation && conversation.ismuted" name="volume-off" [label]="'addon.messages.mutedconversation' | translate"></core-icon>
         </ion-title>
@@ -58,7 +58,7 @@
 
                     <!-- Some messages have <p> and some others don't. Add a <p> so they all have same styles. -->
                     <p class="addon-message-text">
-                        <core-format-text (afterRender)="last && scrollToBottom()" [text]="message.text"></core-format-text>
+                        <core-format-text (afterRender)="last && scrollToBottom()" [text]="message.text" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text>
                     </p>
 
                     <button ion-button icon-only clear="true" *ngIf="!message.sending && showDelete" (click)="deleteMessage(message, index)" class="addon-messages-delete-button" [@coreSlideInOut]="'fromRight'" [attr.aria-label]=" 'addon.messages.deletemessage' | translate">
diff --git a/src/addon/messages/pages/discussion/discussion.ts b/src/addon/messages/pages/discussion/discussion.ts
index 41013c2ac..6edc0b4ea 100644
--- a/src/addon/messages/pages/discussion/discussion.ts
+++ b/src/addon/messages/pages/discussion/discussion.ts
@@ -95,6 +95,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     isSelf = false;
     muteEnabled = false;
     muteIcon = 'volume-off';
+    siteHomeId: number;
 
     constructor(private eventsProvider: CoreEventsProvider, sitesProvider: CoreSitesProvider, navParams: NavParams,
             private userProvider: CoreUserProvider, private navCtrl: NavController, private messagesSync: AddonMessagesSyncProvider,
@@ -107,6 +108,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
         this.currentUserId = sitesProvider.getCurrentSiteUserId();
         this.groupMessagingEnabled = this.messagesProvider.isGroupMessagingEnabled();
         this.muteEnabled = this.messagesProvider.isMuteConversationEnabled();
+        this.siteHomeId = sitesProvider.getCurrentSiteHomeId();
 
         this.logger = logger.getInstance('AddonMessagesDiscussionPage');
 
diff --git a/src/addon/messages/pages/group-conversations/group-conversations.html b/src/addon/messages/pages/group-conversations/group-conversations.html
index c32cdec85..f786c52ec 100644
--- a/src/addon/messages/pages/group-conversations/group-conversations.html
+++ b/src/addon/messages/pages/group-conversations/group-conversations.html
@@ -99,7 +99,7 @@
         <ion-avatar *ngIf="conversation.type != typeGroup" core-user-avatar [user]="conversation.otherUser" [linkProfile]="false" [checkOnline]="conversation.showonlinestatus" item-start></ion-avatar>
 
         <h2>
-            <core-format-text [text]="conversation.name"></core-format-text>
+            <core-format-text [text]="conversation.name" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text>
             <core-icon name="fa-ban" *ngIf="conversation.isblocked" [label]="'addon.messages.contactblocked' | translate"></core-icon>
             <core-icon *ngIf="conversation.ismuted" name="volume-off" [label]="'addon.messages.mutedconversation' | translate"></core-icon>
         </h2>
@@ -107,11 +107,11 @@
             <ion-badge *ngIf="conversation.unreadcount > 0">{{ conversation.unreadcount }}</ion-badge>
             <span *ngIf="conversation.lastmessagedate > 0">{{conversation.lastmessagedate | coreDateDayOrTime}}</span>
         </ion-note>
-        <p *ngIf="conversation.subname"><core-format-text [text]="conversation.subname"></core-format-text></p>
+        <p *ngIf="conversation.subname"><core-format-text [text]="conversation.subname" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></p>
         <p class="addon-message-last-message">
             <span *ngIf="conversation.sentfromcurrentuser" class="addon-message-last-message-user">{{ 'addon.messages.you' | translate }}</span>
-            <core-format-text *ngIf="!conversation.sentfromcurrentuser && conversation.type == typeGroup && conversation.members[0]" [text]="conversation.members[0].fullname + ':'" class="addon-message-last-message-user"></core-format-text>
-            <core-format-text clean="true" singleLine="true" [text]="conversation.lastmessage" class="addon-message-last-message-text"></core-format-text>
+            <span *ngIf="!conversation.sentfromcurrentuser && conversation.type == typeGroup && conversation.members[0]" class="addon-message-last-message-user">{{ conversation.members[0].fullname + ':' }}</span>
+            <core-format-text clean="true" singleLine="true" [text]="conversation.lastmessage" class="addon-message-last-message-text" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text>
         </p>
     </a>
 </ng-template>
diff --git a/src/addon/messages/pages/group-conversations/group-conversations.ts b/src/addon/messages/pages/group-conversations/group-conversations.ts
index ececc1ac2..02490e2d0 100644
--- a/src/addon/messages/pages/group-conversations/group-conversations.ts
+++ b/src/addon/messages/pages/group-conversations/group-conversations.ts
@@ -67,6 +67,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     };
     typeGroup = AddonMessagesProvider.MESSAGE_CONVERSATION_TYPE_GROUP;
     currentListEl: HTMLElement;
+    siteHomeId: number;
 
     protected loadingString: string;
     protected siteId: string;
@@ -95,6 +96,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
         // Conversation to load.
         this.conversationId = navParams.get('conversationId') || false;
         this.discussionUserId = !this.conversationId && (navParams.get('discussionUserId') || false);
+        this.siteHomeId = sitesProvider.getCurrentSiteHomeId();
 
         // Update conversations when new message is received.
         this.newMessagesObserver = eventsProvider.on(AddonMessagesProvider.NEW_MESSAGE_EVENT, (data) => {
diff --git a/src/addon/messages/pages/search/search.html b/src/addon/messages/pages/search/search.html
index 86e701fe4..c41e42c77 100644
--- a/src/addon/messages/pages/search/search.html
+++ b/src/addon/messages/pages/search/search.html
@@ -33,7 +33,7 @@
         <a ion-item text-wrap *ngFor="let result of item.results" [title]="result.fullname" (click)="openConversation(result)" [class.core-split-item-selected]="result == selectedResult" class="addon-message-discussion">
             <ion-avatar item-start core-user-avatar [user]="result" [checkOnline]="true" [linkProfile]="false"></ion-avatar>
             <h2>
-                <core-format-text [text]="result.fullname" [highlight]="result.highlightName"></core-format-text>
+                <core-format-text [text]="result.fullname" [highlight]="result.highlightName" [filter]="false"></core-format-text>
                 <core-icon name="fa-ban" *ngIf="result.isblocked" [label]="'addon.messages.contactblocked' | translate"></core-icon>
             </h2>
             <ion-note *ngIf="result.lastmessagedate > 0">
@@ -41,7 +41,7 @@
             </ion-note>
             <p class="addon-message-last-message">
                 <span *ngIf="result.sentfromcurrentuser" class="addon-message-last-message-user">{{ 'addon.messages.you' | translate }}</span>
-                <core-format-text clean="true" singleLine="true" [text]="result.lastmessage" [highlight]="result.highlightMessage" class="addon-message-last-message-text"></core-format-text>
+                <core-format-text clean="true" singleLine="true" [text]="result.lastmessage" [highlight]="result.highlightMessage" contextLevel="system" [contextInstanceId]="siteHomeId" class="addon-message-last-message-text"></core-format-text>
             </p>
         </a>
 
diff --git a/src/addon/messages/pages/search/search.ts b/src/addon/messages/pages/search/search.ts
index a02203faf..33ccb7f0d 100644
--- a/src/addon/messages/pages/search/search.ts
+++ b/src/addon/messages/pages/search/search.ts
@@ -58,6 +58,7 @@ export class AddonMessagesSearchPage implements OnDestroy {
         loadMoreError: false
     };
     selectedResult = null;
+    siteHomeId: number;
 
     protected memberInfoObserver;
 
@@ -66,6 +67,8 @@ export class AddonMessagesSearchPage implements OnDestroy {
     constructor(private appProvider: CoreAppProvider, private domUtils: CoreDomUtilsProvider, eventsProvider: CoreEventsProvider,
             sitesProvider: CoreSitesProvider, private messagesProvider: AddonMessagesProvider) {
 
+        this.siteHomeId = sitesProvider.getCurrentSiteHomeId();
+
         // Update block status of a user.
         this.memberInfoObserver = eventsProvider.on(AddonMessagesProvider.MEMBER_INFO_CHANGED_EVENT, (data) => {
             if (!data.userBlocked && !data.userUnblocked) {
diff --git a/src/addon/messages/providers/mainmenu-handler.ts b/src/addon/messages/providers/mainmenu-handler.ts
index acd560404..84cec9984 100644
--- a/src/addon/messages/providers/mainmenu-handler.ts
+++ b/src/addon/messages/providers/mainmenu-handler.ts
@@ -19,12 +19,12 @@ import { CoreCronHandler } from '@providers/cron';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreAppProvider } from '@providers/app';
-import { CoreTextUtilsProvider } from '@providers/utils/text';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreLocalNotificationsProvider } from '@providers/local-notifications';
 import { CorePushNotificationsProvider } from '@core/pushnotifications/providers/pushnotifications';
 import { CorePushNotificationsDelegate } from '@core/pushnotifications/providers/delegate';
 import { CoreEmulatorHelperProvider } from '@core/emulator/providers/helper';
+import { CoreFilterProvider } from '@core/filter/providers/filter';
 
 /**
  * Handler to inject an option into main menu.
@@ -49,7 +49,7 @@ export class AddonMessagesMainMenuHandler implements CoreMainMenuHandler, CoreCr
 
     constructor(private messagesProvider: AddonMessagesProvider, private sitesProvider: CoreSitesProvider,
             eventsProvider: CoreEventsProvider, private appProvider: CoreAppProvider,
-            private localNotificationsProvider: CoreLocalNotificationsProvider, private textUtils: CoreTextUtilsProvider,
+            private localNotificationsProvider: CoreLocalNotificationsProvider, private filterProvider: CoreFilterProvider,
             private pushNotificationsProvider: CorePushNotificationsProvider, utils: CoreUtilsProvider,
             pushNotificationsDelegate: CorePushNotificationsDelegate, private emulatorHelper: CoreEmulatorHelperProvider) {
 
@@ -297,7 +297,8 @@ export class AddonMessagesMainMenuHandler implements CoreMainMenuHandler, CoreCr
             title: message.name || message.userfromfullname,
         };
 
-        return this.textUtils.formatText(message.text, true, true).catch(() => {
+        return this.filterProvider.getFiltersAndFormatText(message.text, 'system', this.sitesProvider.getCurrentSiteHomeId(),
+                {clean: true, singleLine: true}).catch(() => {
             return message.text;
         }).then((formattedText) => {
             data['text'] = formattedText;
diff --git a/src/addon/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html b/src/addon/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html
index fd814742c..131ee1bd6 100644
--- a/src/addon/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html
+++ b/src/addon/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html
@@ -8,7 +8,7 @@
                 {{ 'addon.mod_assign.feedbacknotsupported' | translate }}
             </ion-badge>
             <p *ngIf="text">
-                <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true" [fullTitle]="plugin.name" [text]="text"></core-format-text>
+                <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true" [fullTitle]="plugin.name" [text]="text" contextLevel="module" [contextInstanceId]="assign.cmid"></core-format-text>
             </p>
             <core-file *ngFor="let file of files" [file]="file" [component]="component" [componentId]="assign.cmid" [alwaysDownload]="true"></core-file>
         </ion-item>
diff --git a/src/addon/mod/assign/components/index/addon-mod-assign-index.html b/src/addon/mod/assign/components/index/addon-mod-assign-index.html
index aac1c7ea8..a13be748d 100644
--- a/src/addon/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addon/mod/assign/components/index/addon-mod-assign-index.html
@@ -17,7 +17,7 @@
     <!-- Description and intro attachments. -->
     <ion-card *ngIf="description" (click)="expandDescription($event)">
         <ion-item text-wrap>
-            <core-format-text [text]="description" [component]="component" [componentId]="componentId" maxHeight="120" (click)="expandDescription($event)"></core-format-text>
+            <core-format-text [text]="description" [component]="component" [componentId]="componentId" maxHeight="120" contextLevel="module" [contextInstanceId]="module.id" (click)="expandDescription($event)"></core-format-text>
         </ion-item>
     </ion-card>
 
diff --git a/src/addon/mod/assign/components/index/index.ts b/src/addon/mod/assign/components/index/index.ts
index 5b6c09ab4..23be9881f 100644
--- a/src/addon/mod/assign/components/index/index.ts
+++ b/src/addon/mod/assign/components/index/index.ts
@@ -134,7 +134,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
 
         if (this.assign && (this.description || this.assign.introattachments)) {
             this.textUtils.expandText(this.translate.instant('core.description'), this.description, this.component,
-                    this.module.id, this.assign.introattachments);
+                    this.module.id, this.assign.introattachments, true, 'module', this.module.id);
         }
     }
 
diff --git a/src/addon/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html b/src/addon/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html
index 0a82623c2..6a6a9dfe8 100644
--- a/src/addon/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html
+++ b/src/addon/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html
@@ -8,7 +8,7 @@
                 {{ 'addon.mod_assign.submissionnotsupported' | translate }}
             </ion-badge>
             <p *ngIf="text">
-                <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true" [fullTitle]="plugin.name" [text]="text"></core-format-text>
+                <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true" [fullTitle]="plugin.name" [text]="text" contextLevel="module" [contextInstanceId]="assign.cmid"></core-format-text>
             </p>
             <core-file *ngFor="let file of files" [file]="file" [component]="component" [componentId]="assign.cmid" [alwaysDownload]="true"></core-file>
         </ion-item>
diff --git a/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html
index 06bebe6cb..3d236da4b 100644
--- a/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -34,7 +34,7 @@
 
                 <ion-item text-wrap *ngIf="timeRemaining" [ngClass]="[timeRemainingClass]">
                     <h2>{{ 'addon.mod_assign.timeremaining' | translate }}</h2>
-                    <p><core-format-text [text]="timeRemaining"></core-format-text></p>
+                    <p [innerHTML]="timeRemaining"></p>
                 </ion-item>
 
                 <ion-item text-wrap *ngIf="fromDate && !isSubmittedForGrading">
@@ -91,7 +91,7 @@
                 <!-- Submit for grading form. -->
                 <div *ngIf="canSubmit">
                     <ion-item text-wrap *ngIf="submissionStatement">
-                        <ion-label><core-format-text [text]="submissionStatement"></core-format-text></ion-label>
+                        <ion-label><core-format-text [text]="submissionStatement" [filter]="false"></core-format-text></ion-label>
                         <ion-checkbox item-end name="submissionstatement" [(ngModel)]="submitModel.submissionStatement">
                         </ion-checkbox>
                     </ion-item>
@@ -115,7 +115,7 @@
                             <h2>{{ user.fullname }}</h2>
                         </a>
                         <ion-item text-wrap *ngIf="!user.fullname">
-                            {{ 'addon.mod_assign.hiddenuser' | translate }} <core-format-text [text]="user"></core-format-text>
+                            {{ 'addon.mod_assign.hiddenuser' | translate }} {{ user }}
                         </ion-item>
                     </div>
                 </ion-item>
@@ -140,7 +140,7 @@
                 <!-- Current grade if method is advanced. -->
                 <ion-item text-wrap *ngIf="feedback.gradefordisplay && (!isGrading || grade.method != 'simple')" class="core-grading-summary">
                     <h2>{{ 'addon.mod_assign.currentgrade' | translate }}</h2>
-                    <p><core-format-text [text]="feedback.gradefordisplay"></core-format-text></p>
+                    <p><core-format-text [text]="feedback.gradefordisplay" [filter]="false"></core-format-text></p>
                     <a ion-button item-end icon-only *ngIf="feedback.advancedgrade" (click)="showAdvancedGrade()">
                         <ion-icon name="search"></ion-icon>
                     </a>
diff --git a/src/addon/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html b/src/addon/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html
index cfb780447..bb23e20a9 100644
--- a/src/addon/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html
+++ b/src/addon/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html
@@ -2,7 +2,7 @@
 <ion-item text-wrap *ngIf="(text || canEdit) && !edit">
     <h2>{{ plugin.name }}</h2>
     <p>
-        <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true" [fullTitle]="plugin.name" [text]="text"></core-format-text>
+        <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true" [fullTitle]="plugin.name" [text]="text" contextLevel="module" [contextInstanceId]="assign.cmid"></core-format-text>
     </p>
     <div item-end>
         <div text-end>
diff --git a/src/addon/mod/assign/feedback/comments/component/comments.ts b/src/addon/mod/assign/feedback/comments/component/comments.ts
index e46456aeb..4da125a41 100644
--- a/src/addon/mod/assign/feedback/comments/component/comments.ts
+++ b/src/addon/mod/assign/feedback/comments/component/comments.ts
@@ -65,7 +65,8 @@ export class AddonModAssignFeedbackCommentsComponent extends AddonModAssignFeedb
 
                     if (this.text) {
                         // Open a new state with the text.
-                        this.textUtils.expandText(this.plugin.name, this.text, this.component, this.assign.cmid);
+                        this.textUtils.expandText(this.plugin.name, this.text, this.component, this.assign.cmid, undefined, true,
+                                'module', this.assign.cmid);
                     }
                 });
             } else if (this.edit) {
diff --git a/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.html b/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.html
index 862f4cf47..a51daa3fd 100644
--- a/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.html
+++ b/src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="plugin.name"></core-format-text></ion-title>
+        <ion-title>{{ plugin.name }}</ion-title>
         <ion-buttons end>
             <button ion-button icon-only (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
                 <ion-icon name="close"></ion-icon>
diff --git a/src/addon/mod/assign/pages/edit/edit.html b/src/addon/mod/assign/pages/edit/edit.html
index d479f6f1b..8549419ff 100644
--- a/src/addon/mod/assign/pages/edit/edit.html
+++ b/src/addon/mod/assign/pages/edit/edit.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <button ion-button clear (click)="save()" [attr.aria-label]="'core.save' | translate">
@@ -16,7 +16,7 @@
             <form name="addon-mod_assign-edit-form" *ngIf="userSubmission && userSubmission.plugins && userSubmission.plugins.length">
                 <!-- Submission statement. -->
                 <ion-item text-wrap *ngIf="submissionStatement">
-                    <ion-label><core-format-text [text]="submissionStatement"></core-format-text></ion-label>
+                    <ion-label><core-format-text [text]="submissionStatement" [filter]="false"></core-format-text></ion-label>
                     <ion-checkbox item-end name="submissionstatement" [(ngModel)]="submissionStatementAccepted"></ion-checkbox>
 
                     <!-- ion-checkbox doesn't use an input. Create a hidden input to hold the value. -->
diff --git a/src/addon/mod/assign/pages/index/index.html b/src/addon/mod/assign/pages/index/index.html
index 7eb10499c..c4627d316 100644
--- a/src/addon/mod/assign/pages/index/index.html
+++ b/src/addon/mod/assign/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/assign/pages/submission-list/submission-list.html b/src/addon/mod/assign/pages/submission-list/submission-list.html
index 7b6301304..243620516 100644
--- a/src/addon/mod/assign/pages/submission-list/submission-list.html
+++ b/src/addon/mod/assign/pages/submission-list/submission-list.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text></ion-title>
 
         <ion-buttons end></ion-buttons>
     </ion-navbar>
diff --git a/src/addon/mod/assign/pages/submission-review/submission-review.html b/src/addon/mod/assign/pages/submission-review/submission-review.html
index fb1760c25..255c320fb 100644
--- a/src/addon/mod/assign/pages/submission-review/submission-review.html
+++ b/src/addon/mod/assign/pages/submission-review/submission-review.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text></ion-title>
 
         <ion-buttons end></ion-buttons>
     </ion-navbar>
diff --git a/src/addon/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html b/src/addon/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
index 5d2565e06..37fe04f41 100644
--- a/src/addon/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
+++ b/src/addon/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
@@ -3,7 +3,7 @@
     <h2>{{ plugin.name }}</h2>
     <p *ngIf="words">{{ 'addon.mod_assign.numwords' | translate: {'$a': words} }}</p>
     <p>
-        <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true" [fullTitle]="plugin.name" [text]="text"></core-format-text>
+        <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true" [fullTitle]="plugin.name" [text]="text" contextLevel="module" [contextInstanceId]="assign.cmid"></core-format-text>
     </p>
 </ion-item>
 
diff --git a/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts b/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts
index 06e064ab2..28ea0dc57 100644
--- a/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts
+++ b/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts
@@ -75,7 +75,8 @@ export class AddonModAssignSubmissionOnlineTextComponent extends AddonModAssignS
 
                     if (text) {
                         // Open a new state with the interpolated contents.
-                        this.textUtils.expandText(this.plugin.name, text, this.component, this.assign.cmid);
+                        this.textUtils.expandText(this.plugin.name, text, this.component, this.assign.cmid, undefined, true,
+                                'module', this.assign.cmid);
                     }
                 });
             } else {
diff --git a/src/addon/mod/book/components/index/addon-mod-book-index.html b/src/addon/mod/book/components/index/addon-mod-book-index.html
index 3b1f0d214..1bfc54e9d 100644
--- a/src/addon/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addon/mod/book/components/index/addon-mod-book-index.html
@@ -16,11 +16,11 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
 
     <div padding class="safe-padding-horizontal">
         <core-navigation-bar [previous]="previousChapter > 0 && previousChapter" [next]="nextChapter > 0 && nextChapter" (action)="changeChapter($event)"></core-navigation-bar>
-        <core-format-text [component]="component" [componentId]="componentId" [text]="chapterContent"></core-format-text>
+        <core-format-text [component]="component" [componentId]="componentId" [text]="chapterContent" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
         <div margin-top *ngIf="tagsEnabled && contentsMap && contentsMap[currentChapter] && contentsMap[currentChapter].tags && contentsMap[currentChapter].tags.length > 0">
             <b>{{ 'core.tag.tags' | translate }}:</b>
             <core-tag-list [tags]="contentsMap[currentChapter].tags"></core-tag-list>
diff --git a/src/addon/mod/book/components/index/index.ts b/src/addon/mod/book/components/index/index.ts
index 6a6129f10..df5d91702 100644
--- a/src/addon/mod/book/components/index/index.ts
+++ b/src/addon/mod/book/components/index/index.ts
@@ -66,6 +66,7 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
     showToc(event: MouseEvent): void {
         // Create the toc modal.
         const modal =  this.modalCtrl.create('AddonModBookTocPage', {
+            moduleId: this.module.id,
             chapters: this.chapters,
             selected: this.currentChapter
         }, { cssClass: 'core-modal-lateral',
diff --git a/src/addon/mod/book/pages/index/index.html b/src/addon/mod/book/pages/index/index.html
index 78c828426..e522f9ec2 100644
--- a/src/addon/mod/book/pages/index/index.html
+++ b/src/addon/mod/book/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/book/pages/toc/toc.html b/src/addon/mod/book/pages/toc/toc.html
index c4132681b..7781cbb0b 100644
--- a/src/addon/mod/book/pages/toc/toc.html
+++ b/src/addon/mod/book/pages/toc/toc.html
@@ -12,7 +12,7 @@
     <nav>
         <ion-list>
             <a ion-item text-wrap *ngFor="let chapter of chapters" (click)="loadChapter(chapter.id)" [class.core-nav-item-selected]="selected == chapter.id" [class.item-dimmed]="chapter.hidden">
-                <p [attr.padding-left]="chapter.level == 1 ? true : null">{{chapter.number}} {{chapter.title}}</p>
+                <p [attr.padding-left]="chapter.level == 1 ? true : null">{{chapter.number}} <core-format-text [text]="chapter.title" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text></p>
             </a>
         </ion-list>
     </nav>
diff --git a/src/addon/mod/book/pages/toc/toc.ts b/src/addon/mod/book/pages/toc/toc.ts
index 3861191e5..10d532072 100644
--- a/src/addon/mod/book/pages/toc/toc.ts
+++ b/src/addon/mod/book/pages/toc/toc.ts
@@ -25,10 +25,12 @@ import { AddonModBookTocChapter } from '../../providers/book';
     templateUrl: 'toc.html'
 })
 export class AddonModBookTocPage {
+    moduleId: number;
     chapters: AddonModBookTocChapter[];
     selected: number;
 
     constructor(navParams: NavParams, private viewCtrl: ViewController) {
+        this.moduleId = navParams.get('moduleId');
         this.chapters = navParams.get('chapters') || [];
         this.selected = navParams.get('selected');
     }
diff --git a/src/addon/mod/chat/components/index/addon-mod-chat-index.html b/src/addon/mod/chat/components/index/addon-mod-chat-index.html
index a9bc1ebdc..26cb9d582 100644
--- a/src/addon/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addon/mod/chat/components/index/addon-mod-chat-index.html
@@ -12,7 +12,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
 
     <ion-card icon-start class="core-info-card" *ngIf="chatInfo">
         <ion-icon name="time"></ion-icon> {{ 'addon.mod_chat.sessionstart' | translate:{$a: chatInfo} }}
diff --git a/src/addon/mod/chat/components/index/index.ts b/src/addon/mod/chat/components/index/index.ts
index a4a3c2601..a61d51f3c 100644
--- a/src/addon/mod/chat/components/index/index.ts
+++ b/src/addon/mod/chat/components/index/index.ts
@@ -95,7 +95,12 @@ export class AddonModChatIndexComponent extends CoreCourseModuleMainActivityComp
      */
     enterChat(): void {
         const title = this.chat.name || this.moduleName;
-        this.navCtrl.push('AddonModChatChatPage', {chatId: this.chat.id, courseId: this.courseId, title: title });
+        this.navCtrl.push('AddonModChatChatPage', {
+            chatId: this.chat.id,
+            courseId: this.courseId,
+            title: title,
+            cmId: this.module.id
+        });
     }
 
     /**
diff --git a/src/addon/mod/chat/pages/chat/chat.html b/src/addon/mod/chat/pages/chat/chat.html
index 220b2bab0..37cae9e6b 100644
--- a/src/addon/mod/chat/pages/chat/chat.html
+++ b/src/addon/mod/chat/pages/chat/chat.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="cmId"></core-format-text></ion-title>
         <ion-buttons end>
             <button *ngIf="loaded" ion-button icon-only (click)="showChatUsers()">
                 <ion-icon name="people"></ion-icon>
@@ -43,7 +43,7 @@
 
                     <ion-badge text-wrap color="info" *ngIf="!message.system && !message.beep">
                         <span><core-icon name="fa-asterisk"></core-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
-                            <strong>{{ message.userfullname }} <core-format-text [text]="message.message" (afterRender)="last && scrollToBottom()"></core-format-text></strong></span>
+                            <strong>{{ message.userfullname }} <core-format-text [text]="message.message" contextLevel="module" [contextInstanceId]="cmId" (afterRender)="last && scrollToBottom()"></core-format-text></strong></span>
                     </ion-badge>
                 </div>
 
@@ -56,7 +56,7 @@
                     </h2>
 
                     <p class="addon-message-text">
-                        <core-format-text [text]="message.message" (afterRender)="last && scrollToBottom()"></core-format-text>
+                        <core-format-text [text]="message.message" contextLevel="module" [contextInstanceId]="cmId" (afterRender)="last && scrollToBottom()"></core-format-text>
                     </p>
                     <div class="tail" *ngIf="message.showTail"></div>
                 </ion-item>
diff --git a/src/addon/mod/chat/pages/chat/chat.ts b/src/addon/mod/chat/pages/chat/chat.ts
index 1923bb5ee..bd34a6644 100644
--- a/src/addon/mod/chat/pages/chat/chat.ts
+++ b/src/addon/mod/chat/pages/chat/chat.ts
@@ -46,6 +46,7 @@ export class AddonModChatChatPage {
     isOnline: boolean;
     currentUserId: number;
     sending: boolean;
+    cmId: number;
 
     protected logger;
     protected courseId: number;
@@ -67,6 +68,8 @@ export class AddonModChatChatPage {
         this.chatId = navParams.get('chatId');
         this.courseId = navParams.get('courseId');
         this.title = navParams.get('title');
+        this.cmId = navParams.get('cmId');
+
         this.logger = logger.getInstance('AddonModChoiceChoicePage');
         this.currentUserId = sitesProvider.getCurrentSiteUserId();
         this.isOnline = this.appProvider.isOnline();
diff --git a/src/addon/mod/chat/pages/index/index.html b/src/addon/mod/chat/pages/index/index.html
index 7a2e458ca..234abae0e 100644
--- a/src/addon/mod/chat/pages/index/index.html
+++ b/src/addon/mod/chat/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/chat/pages/session-messages/session-messages.html b/src/addon/mod/chat/pages/session-messages/session-messages.html
index 1f2a2ce14..f75385d59 100644
--- a/src/addon/mod/chat/pages/session-messages/session-messages.html
+++ b/src/addon/mod/chat/pages/session-messages/session-messages.html
@@ -40,7 +40,7 @@
 
                     <ion-badge text-wrap color="info" *ngIf="!message.issystem && !message.beep">
                         <span><core-icon name="fa-asterisk"></core-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
-                            <strong>{{ message.userfullname }} <core-format-text [text]="message.message"></core-format-text></strong></span>
+                            <strong>{{ message.userfullname }} <core-format-text [text]="message.message" contextLevel="module" [contextInstanceId]="cmId"></core-format-text></strong></span>
                     </ion-badge>
                 </div>
 
@@ -53,7 +53,7 @@
                     </h2>
 
                     <p class="addon-message-text">
-                        <core-format-text [text]="message.message"></core-format-text>
+                        <core-format-text [text]="message.message" contextLevel="module" [contextInstanceId]="cmId"></core-format-text>
                     </p>
                     <div class="tail" *ngIf="message.showTail"></div>
                 </ion-item>
diff --git a/src/addon/mod/chat/pages/session-messages/session-messages.ts b/src/addon/mod/chat/pages/session-messages/session-messages.ts
index 7d80f18de..39e15433e 100644
--- a/src/addon/mod/chat/pages/session-messages/session-messages.ts
+++ b/src/addon/mod/chat/pages/session-messages/session-messages.ts
@@ -31,14 +31,15 @@ import { AddonModChatHelperProvider, AddonModChatSessionMessageForView } from '.
 export class AddonModChatSessionMessagesPage {
 
     currentUserId: number;
+    cmId: number;
+    messages: AddonModChatSessionMessageForView[] = [];
+    loaded = false;
 
     protected courseId: number;
     protected chatId: number;
     protected sessionStart: number;
     protected sessionEnd: number;
     protected groupId: number;
-    protected loaded = false;
-    protected messages: AddonModChatSessionMessageForView[] = [];
 
     constructor(navParams: NavParams, private domUtils: CoreDomUtilsProvider, private chatProvider: AddonModChatProvider,
         sitesProvider: CoreSitesProvider, private chatHelper: AddonModChatHelperProvider, private userProvider: CoreUserProvider) {
@@ -47,6 +48,7 @@ export class AddonModChatSessionMessagesPage {
         this.groupId = navParams.get('groupId');
         this.sessionStart = navParams.get('sessionStart');
         this.sessionEnd = navParams.get('sessionEnd');
+        this.cmId = navParams.get('cmId');
         this.currentUserId = sitesProvider.getCurrentSiteUserId();
 
         this.fetchMessages();
diff --git a/src/addon/mod/chat/pages/sessions/sessions.ts b/src/addon/mod/chat/pages/sessions/sessions.ts
index 683d01c57..997341b4c 100644
--- a/src/addon/mod/chat/pages/sessions/sessions.ts
+++ b/src/addon/mod/chat/pages/sessions/sessions.ts
@@ -140,7 +140,8 @@ export class AddonModChatSessionsPage {
             chatId: this.chatId,
             groupId: this.groupId,
             sessionStart: session.sessionstart,
-            sessionEnd: session.sessionend
+            sessionEnd: session.sessionend,
+            cmId: this.cmId
         };
         this.splitviewCtrl.push('AddonModChatSessionMessagesPage', params);
     }
diff --git a/src/addon/mod/chat/pages/users/users.html b/src/addon/mod/chat/pages/users/users.html
index 815715335..3e5f9dfc6 100644
--- a/src/addon/mod/chat/pages/users/users.html
+++ b/src/addon/mod/chat/pages/users/users.html
@@ -12,7 +12,7 @@
     <core-loading [hideUntil]="usersLoaded">
         <ion-item text-wrap *ngFor="let user of users" [class.addon-mod-chat-user]="currentUserId != user.id && isOnline">
             <ion-avatar core-user-avatar [user]="user" item-start></ion-avatar>
-            <h2><core-format-text [text]="user.fullname"></core-format-text></h2>
+            <h2>{{ user.fullname }}</h2>
             <ng-container *ngIf="currentUserId != user.id && isOnline">
                 <button ion-button clear icon-left (click)="talkTo(user)">
                     <ion-icon name="chatboxes"></ion-icon>
diff --git a/src/addon/mod/choice/components/index/addon-mod-choice-index.html b/src/addon/mod/choice/components/index/addon-mod-choice-index.html
index cfeaddc5f..cf16a7b02 100644
--- a/src/addon/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addon/mod/choice/components/index/addon-mod-choice-index.html
@@ -14,7 +14,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
 
     <!-- Activity availability messages -->
     <ion-card class="core-info-card" icon-start *ngIf="choiceNotOpenYet">
@@ -24,7 +24,7 @@
     </ion-card>
     <ion-card class="core-info-card" icon-start *ngIf="choiceClosed">
         <ion-icon name="information-circle"></ion-icon>
-        <p *ngIf="options && options.length">{{ 'addon.mod_choice.yourselection' | translate }} <core-format-text [text]="options[0].text"></core-format-text></p>
+        <p *ngIf="options && options.length">{{ 'addon.mod_choice.yourselection' | translate }} <core-format-text [text]="options[0].text" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></p>
         <p>{{ 'addon.mod_choice.expired' | translate:{$a: closeTimeReadable} }}</p>
     </ion-card>
 
@@ -43,13 +43,13 @@
     <ion-card *ngIf="options && options.length">
         <ng-container *ngIf="choice.allowmultiple">
             <ion-item text-wrap *ngFor="let option of options">
-                <ion-label><core-format-text [text]="option.text"></core-format-text> <span *ngIf="choice.limitanswers && option.countanswers >= option.maxanswers">{{ 'addon.mod_choice.full' | translate }}</span></ion-label>
+                <ion-label><core-format-text [text]="option.text" contextLevel="module" [contextInstanceId]="module.id"></core-format-text> <span *ngIf="choice.limitanswers && option.countanswers >= option.maxanswers">{{ 'addon.mod_choice.full' | translate }}</span></ion-label>
                 <ion-checkbox item-end [(ngModel)]="option.checked" [disabled]="option.disabled || !canEdit"></ion-checkbox>
             </ion-item>
         </ng-container>
         <ng-container *ngIf="!choice.allowmultiple">
             <ion-item text-wrap *ngFor="let option of options" radio-group [(ngModel)]="selectedOption.id">
-                <ion-label><core-format-text [text]="option.text"></core-format-text> <span *ngIf="choice.limitanswers && option.countanswers >= option.maxanswers">{{ 'addon.mod_choice.full' | translate }}</span></ion-label>
+                <ion-label><core-format-text [text]="option.text" contextLevel="module" [contextInstanceId]="module.id"></core-format-text> <span *ngIf="choice.limitanswers && option.countanswers >= option.maxanswers">{{ 'addon.mod_choice.full' | translate }}</span></ion-label>
                 <ion-radio color="primary" [value]="option.id" [disabled]="option.disabled || !canEdit"></ion-radio>
             </ion-item>
         </ng-container>
@@ -79,7 +79,7 @@
                 <ion-col *ngIf="choice.publish && results" col-12 col-lg-7>
                     <ion-item-group *ngFor="let result of results">
                         <ion-item-divider text-wrap>
-                            <h2><core-format-text [text]="result.text"></core-format-text></h2>
+                            <h2><core-format-text [text]="result.text" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></h2>
                             <p>{{ 'addon.mod_choice.numberofuser' | translate }}: {{ result.numberofuser }} ({{ 'core.percentagenumber' | translate: {$a: result.percentageamountfixed} }})</p>
                         </ion-item-divider>
                         <a ion-item *ngFor="let user of result.userresponses" core-user-link [courseId]="courseid" [userId]="user.userid" [title]="user.fullname" text-wrap>
diff --git a/src/addon/mod/choice/pages/index/index.html b/src/addon/mod/choice/pages/index/index.html
index 9a4274422..a9b19d1e4 100644
--- a/src/addon/mod/choice/pages/index/index.html
+++ b/src/addon/mod/choice/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/data/components/index/addon-mod-data-index.html b/src/addon/mod/data/components/index/addon-mod-data-index.html
index cb7f30534..c06e0cc8e 100644
--- a/src/addon/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addon/mod/data/components/index/addon-mod-data-index.html
@@ -19,7 +19,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
 
     <!-- Data done in offline but not synchronized -->
     <div class="core-warning-card" icon-start *ngIf="hasOffline || hasOfflineRatings">
diff --git a/src/addon/mod/data/fields/checkbox/component/addon-mod-data-field-checkbox.html b/src/addon/mod/data/fields/checkbox/component/addon-mod-data-field-checkbox.html
index 9c7932220..c4459caae 100644
--- a/src/addon/mod/data/fields/checkbox/component/addon-mod-data-field-checkbox.html
+++ b/src/addon/mod/data/fields/checkbox/component/addon-mod-data-field-checkbox.html
@@ -12,4 +12,4 @@
     </ion-item>
 </span>
 
-<core-format-text *ngIf="isShowOrListMode() && value && value.content" [text]="value.content"></core-format-text>
\ No newline at end of file
+<core-format-text *ngIf="isShowOrListMode() && value && value.content" [text]="value.content" [filter]="false"></core-format-text>
\ No newline at end of file
diff --git a/src/addon/mod/data/fields/date/component/addon-mod-data-field-date.html b/src/addon/mod/data/fields/date/component/addon-mod-data-field-date.html
index 2f865e866..d225289e6 100644
--- a/src/addon/mod/data/fields/date/component/addon-mod-data-field-date.html
+++ b/src/addon/mod/data/fields/date/component/addon-mod-data-field-date.html
@@ -10,5 +10,5 @@
     </ion-item>
 </span>
 
-<core-format-text *ngIf="isShowOrListMode() && value && value.content" [text]="value.content * 1000 | coreFormatDate:'strftimedate'"></core-format-text>
+<span *ngIf="isShowOrListMode() && value && value.content">{{ value.content * 1000 | coreFormatDate:'strftimedate' }}</span>
 
diff --git a/src/addon/mod/data/fields/menu/component/addon-mod-data-field-menu.html b/src/addon/mod/data/fields/menu/component/addon-mod-data-field-menu.html
index 53dabd14c..eb8fbe013 100644
--- a/src/addon/mod/data/fields/menu/component/addon-mod-data-field-menu.html
+++ b/src/addon/mod/data/fields/menu/component/addon-mod-data-field-menu.html
@@ -7,4 +7,4 @@
     <core-input-errors *ngIf="error && mode == 'edit'" [control]="form.controls['f_'+field.id]" [errorText]="error"></core-input-errors>
 </span>
 
-<core-format-text *ngIf="isShowOrListMode() && value && value.content" [text]="value.content"></core-format-text>
\ No newline at end of file
+<span *ngIf="isShowOrListMode() && value && value.content">{{ value.content }}</span>
\ No newline at end of file
diff --git a/src/addon/mod/data/fields/multimenu/component/addon-mod-data-field-multimenu.html b/src/addon/mod/data/fields/multimenu/component/addon-mod-data-field-multimenu.html
index 8acf2c8c5..ea3cd13df 100644
--- a/src/addon/mod/data/fields/multimenu/component/addon-mod-data-field-multimenu.html
+++ b/src/addon/mod/data/fields/multimenu/component/addon-mod-data-field-multimenu.html
@@ -13,4 +13,4 @@
     </ion-item>
 </span>
 
-<core-format-text *ngIf="isShowOrListMode() && value && value.content" [text]="value.content"></core-format-text>
\ No newline at end of file
+<core-format-text *ngIf="isShowOrListMode() && value && value.content" [text]="value.content" [filter]="false"></core-format-text>
\ No newline at end of file
diff --git a/src/addon/mod/data/fields/number/component/addon-mod-data-field-number.html b/src/addon/mod/data/fields/number/component/addon-mod-data-field-number.html
index aa71edc43..2e02d9fd5 100644
--- a/src/addon/mod/data/fields/number/component/addon-mod-data-field-number.html
+++ b/src/addon/mod/data/fields/number/component/addon-mod-data-field-number.html
@@ -4,4 +4,4 @@
     <core-input-errors *ngIf="error && mode == 'edit'" [control]="form.controls['f_'+field.id]" [errorText]="error"></core-input-errors>
 </span>
 
-<core-format-text *ngIf="isShowOrListMode() && value && value.content" [text]="value.content"></core-format-text>
+<span *ngIf="isShowOrListMode() && value && value.content">{{ value.content }}</span>
diff --git a/src/addon/mod/data/fields/radiobutton/component/addon-mod-data-field-radiobutton.html b/src/addon/mod/data/fields/radiobutton/component/addon-mod-data-field-radiobutton.html
index 53dabd14c..eb8fbe013 100644
--- a/src/addon/mod/data/fields/radiobutton/component/addon-mod-data-field-radiobutton.html
+++ b/src/addon/mod/data/fields/radiobutton/component/addon-mod-data-field-radiobutton.html
@@ -7,4 +7,4 @@
     <core-input-errors *ngIf="error && mode == 'edit'" [control]="form.controls['f_'+field.id]" [errorText]="error"></core-input-errors>
 </span>
 
-<core-format-text *ngIf="isShowOrListMode() && value && value.content" [text]="value.content"></core-format-text>
\ No newline at end of file
+<span *ngIf="isShowOrListMode() && value && value.content">{{ value.content }}</span>
\ No newline at end of file
diff --git a/src/addon/mod/data/fields/text/component/addon-mod-data-field-text.html b/src/addon/mod/data/fields/text/component/addon-mod-data-field-text.html
index fa8846daf..9af142d7c 100644
--- a/src/addon/mod/data/fields/text/component/addon-mod-data-field-text.html
+++ b/src/addon/mod/data/fields/text/component/addon-mod-data-field-text.html
@@ -4,4 +4,4 @@
     <core-input-errors *ngIf="error && mode == 'edit'" [control]="form.controls['f_'+field.id]" [errorText]="error"></core-input-errors>
 </span>
 
-<core-format-text *ngIf="isShowOrListMode() && value && value.content" [text]="value.content"></core-format-text>
\ No newline at end of file
+<span *ngIf="isShowOrListMode() && value && value.content">{{ value.content }}</span>
\ No newline at end of file
diff --git a/src/addon/mod/data/fields/textarea/component/addon-mod-data-field-textarea.html b/src/addon/mod/data/fields/textarea/component/addon-mod-data-field-textarea.html
index 861d1edc9..709a96669 100644
--- a/src/addon/mod/data/fields/textarea/component/addon-mod-data-field-textarea.html
+++ b/src/addon/mod/data/fields/textarea/component/addon-mod-data-field-textarea.html
@@ -6,4 +6,4 @@
     <core-input-errors *ngIf="error && mode == 'edit'" [control]="form.controls['f_'+field.id]" [errorText]="error"></core-input-errors>
 </span>
 
-<core-format-text *ngIf="isShowOrListMode() && value" [text]="format(value)" [component]="component" [componentId]="componentId"></core-format-text>
\ No newline at end of file
+<core-format-text *ngIf="isShowOrListMode() && value" [text]="format(value)" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="componentId"></core-format-text>
\ No newline at end of file
diff --git a/src/addon/mod/data/pages/edit/edit.html b/src/addon/mod/data/pages/edit/edit.html
index 71673625f..92b0571aa 100644
--- a/src/addon/mod/data/pages/edit/edit.html
+++ b/src/addon/mod/data/pages/edit/edit.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
         <ion-buttons end>
             <button *ngIf="entry" ion-button clear (click)="save($event)" [attr.aria-label]="'core.save' | translate">
                 {{ 'core.save' | translate }}
diff --git a/src/addon/mod/data/pages/entry/entry.html b/src/addon/mod/data/pages/entry/entry.html
index 4bc24c4a6..3299a90b7 100644
--- a/src/addon/mod/data/pages/entry/entry.html
+++ b/src/addon/mod/data/pages/entry/entry.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>
diff --git a/src/addon/mod/data/pages/index/index.html b/src/addon/mod/data/pages/index/index.html
index d7542b518..9cd4018e0 100644
--- a/src/addon/mod/data/pages/index/index.html
+++ b/src/addon/mod/data/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html
index 8a70e2dfc..f57fb1633 100644
--- a/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -14,7 +14,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
 
     <ng-container *ngIf="showTabs">
         <core-tabs [hideUntil]="tabsReady" [selectedIndex]="firstSelectedTab">
@@ -98,7 +98,7 @@
             </ion-item>
             <ion-item text-wrap *ngIf="access.canedititems && feedback.page_after_submit">
                 <h2>{{ 'addon.mod_feedback.page_after_submit' | translate }}</h2>
-                <core-format-text  [component]="component" [componentId]="componentId" [text]=" feedback.page_after_submit"></core-format-text>
+                <core-format-text [component]="component" [componentId]="componentId" [text]="feedback.page_after_submit" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
             </ion-item>
             <ng-container *ngIf="!access.isempty">
                 <ion-item text-wrap>
@@ -145,8 +145,8 @@
 
             <ion-list *ngIf="items && items.length">
                 <ion-item text-wrap *ngFor="let item of items" class="core-analysis">
-                    <h2>{{item.number}}. <core-format-text  [component]="component" [componentId]="componentId" [text]="item.name"></core-format-text></h2>
-                    <p><core-format-text  [component]="component" [componentId]="componentId" [text]="item.label"></core-format-text></p>
+                    <h2>{{item.number}}. <core-format-text [component]="component" [componentId]="componentId" [text]="item.name" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></h2>
+                    <p><core-format-text [component]="component" [componentId]="componentId" [text]="item.label" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></p>
                     <ng-container [ngSwitch]="item.template">
                         <ng-container *ngSwitchCase="'numeric'">
                             <ul>
@@ -157,9 +157,7 @@
                         <ng-container *ngSwitchCase="'list'">
                             <ul>
                                 <ng-container *ngFor="let data of item.data">
-                                    <li *ngIf="data">
-                                        <core-format-text [text]="data"></core-format-text>
-                                    </li>
+                                    <li *ngIf="data">{{ data }}</li>
                                 </ng-container>
                             </ul>
                         </ng-container>
diff --git a/src/addon/mod/feedback/pages/attempt/attempt.html b/src/addon/mod/feedback/pages/attempt/attempt.html
index f897a0d48..c4ad819a7 100644
--- a/src/addon/mod/feedback/pages/attempt/attempt.html
+++ b/src/addon/mod/feedback/pages/attempt/attempt.html
@@ -1,6 +1,9 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text  [text]=" attempt.fullname "></core-format-text></ion-title>
+        <ion-title>
+            <ng-container *ngIf="attempt.fullname">{{ attempt.fullname }}</ng-container>
+            <ng-container *ngIf="!attempt.fullname">{{ 'addon.mod_feedback.response_nr' |translate }}: {{attempt.number}}</ng-container>
+        </ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>
@@ -21,9 +24,9 @@
                     <ion-item-divider *ngIf="item.typ == 'pagebreak'"></ion-item-divider>
                     <ion-item text-wrap *ngIf="item.typ != 'pagebreak'" [color]="item.dependitem > 0 ? 'light' : ''">
                         <h2 *ngIf="item.name" [core-mark-required]="item.required">
-                            <span *ngIf="feedback.autonumbering && item.itemnumber">{{item.itemnumber}}. </span><core-format-text  [component]="component" [componentId]="componentId" [text]="item.name"></core-format-text>
+                            <span *ngIf="feedback.autonumbering && item.itemnumber">{{item.itemnumber}}. </span><core-format-text  [component]="component" [componentId]="componentId" [text]="item.name" contextLevel="module" [contextInstanceId]="feedback.coursemodule"></core-format-text>
                         </h2>
-                        <p *ngIf="item.submittedValue"><core-format-text  [component]="component" [componentId]="componentId" [text]=" item.submittedValue"></core-format-text></p>
+                        <p *ngIf="item.submittedValue"><core-format-text [component]="component" [componentId]="componentId" [text]=" item.submittedValue" contextLevel="module" [contextInstanceId]="feedback.coursemodule"></core-format-text></p>
                     </ion-item>
                 </ng-container>
             </ng-container>
diff --git a/src/addon/mod/feedback/pages/form/form.html b/src/addon/mod/feedback/pages/form/form.html
index 9bf4f4d1a..0339e939a 100644
--- a/src/addon/mod/feedback/pages/form/form.html
+++ b/src/addon/mod/feedback/pages/form/form.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text  [text]=" title "></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>
@@ -17,13 +17,13 @@
                     <ion-item text-wrap *ngIf="item.typ != 'pagebreak'" [color]="item.dependitem > 0 ? 'light' : ''" [class.core-danger-item]="item.isEmpty || item.hasError">
                         <ion-label *ngIf="item.name" [core-mark-required]="item.required" stacked>
                             <span *ngIf="feedback.autonumbering && item.itemnumber">{{item.itemnumber}}. </span>
-                            <core-format-text  [component]="component" [componentId]="componentId" [text]="item.name"></core-format-text>
+                            <core-format-text [component]="component" [componentId]="componentId" [text]="item.name" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
                             <span *ngIf="item.postfix" class="addon-mod_feedback-postfix">{{item.postfix}}</span>
                         </ion-label>
                         <div item-content class="addon-mod_feedback-form-content" *ngIf="item.template">
                             <ng-container [ngSwitch]="item.template">
                                 <ng-container *ngSwitchCase="'label'">
-                                    <p><core-format-text [component]="component" [componentId]="componentId" [text]="item.presentation"></core-format-text></p>
+                                    <p><core-format-text [component]="component" [componentId]="componentId" [text]="item.presentation" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></p>
                                 </ng-container>
                                 <ng-container *ngSwitchCase="'textfield'">
                                     <ion-input type="text" [(ngModel)]="item.value" autocorrect="off" name="{{item.typ}}_{{item.id}}" maxlength="{{item.maxlength}}" [required]="item.required"></ion-input>
@@ -38,20 +38,20 @@
                                 <ng-container *ngSwitchCase="'multichoice-r'">
                                     <ion-list radio-group [(ngModel)]="item.value" [required]="item.required" name="{{item.typ}}_{{item.id}}">
                                         <ion-item *ngFor="let option of item.choices">
-                                            <ion-label><core-format-text  [component]="component" [componentId]="componentId" [text]="option.label"></core-format-text></ion-label>
+                                            <ion-label><core-format-text  [component]="component" [componentId]="componentId" [text]="option.label" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-label>
                                             <ion-radio [value]="option.value"></ion-radio>
                                         </ion-item>
                                     </ion-list>
                                 </ng-container>
                                 <ion-list *ngSwitchCase="'multichoice-c'">
                                     <ion-item *ngFor="let option of item.choices">
-                                        <ion-label><core-format-text  [component]="component" [componentId]="componentId" [text]="option.label"></core-format-text></ion-label>
+                                        <ion-label><core-format-text [component]="component" [componentId]="componentId" [text]="option.label" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-label>
                                         <ion-checkbox [required]="item.required" name="{{item.typ}}_{{item.id}}" [(ngModel)]="option.checked" value="option.value"></ion-checkbox>
                                     </ion-item>
                                 </ion-list>
                                 <ng-container *ngSwitchCase="'multichoice-d'">
                                     <ion-select [required]="item.required" name="{{item.typ}}_{{item.id}}" [(ngModel)]="item.value" interface="action-sheet">
-                                        <ion-option *ngFor="let option of item.choices" [value]="option.value"><core-format-text  [component]="component" [componentId]="componentId" [text]="option.label"></core-format-text></ion-option>
+                                        <ion-option *ngFor="let option of item.choices" [value]="option.value"><core-format-text  [component]="component" [componentId]="componentId" [text]="option.label" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-option>
                                     </ion-select>
                                 </ng-container>
                                 <ng-container *ngSwitchCase="'captcha'">
@@ -93,7 +93,7 @@
             <ion-icon name="checkmark"></ion-icon>
             <p *ngIf="!completionPageContents && !completedOffline">{{ 'addon.mod_feedback.this_feedback_is_already_submitted' | translate }}</p>
             <p *ngIf="!completionPageContents && completedOffline">{{ 'addon.mod_feedback.feedback_submitted_offline' | translate }}</p>
-            <p *ngIf="completionPageContents"><core-format-text  [component]="component" componentId="componentId" [text]="completionPageContents"></core-format-text></p>
+            <p *ngIf="completionPageContents"><core-format-text  [component]="component" componentId="componentId" [text]="completionPageContents" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></p>
         </div>
 
         <ion-grid *ngIf="completed">
diff --git a/src/addon/mod/feedback/pages/index/index.html b/src/addon/mod/feedback/pages/index/index.html
index 6d13f3c5e..c2f044f90 100644
--- a/src/addon/mod/feedback/pages/index/index.html
+++ b/src/addon/mod/feedback/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.html b/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.html
index f614ebf67..86aa3d0da 100644
--- a/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.html
+++ b/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.html
@@ -22,7 +22,7 @@
             <ng-container *ngIf="total > 0">
                 <ion-item *ngFor="let user of users" text-wrap>
                     <ion-avatar core-user-avatar [user]="user" item-start></ion-avatar>
-                    <h2><core-format-text [text]="user.fullname"></core-format-text></h2>
+                    <h2>{{ user.fullname }}</h2>
                     <p>
                         <ion-badge color="success" *ngIf="user.started">
                             {{ 'addon.mod_feedback.started' | translate}}
diff --git a/src/addon/mod/feedback/pages/respondents/respondents.html b/src/addon/mod/feedback/pages/respondents/respondents.html
index 21cf03aa0..dcd466f6a 100644
--- a/src/addon/mod/feedback/pages/respondents/respondents.html
+++ b/src/addon/mod/feedback/pages/respondents/respondents.html
@@ -23,7 +23,7 @@
                     </ion-item-divider>
                     <a *ngFor="let attempt of responses.attempts" ion-item text-wrap (click)="gotoAttempt(attempt)" [class.core-split-item-selected]="attempt.id == attemptId">
                         <ion-avatar core-user-avatar [user]="attempt" item-start></ion-avatar>
-                        <h2><core-format-text [text]="attempt.fullname"></core-format-text></h2>
+                        <h2>{{ attempt.fullname }}</h2>
                         <p *ngIf="attempt.timemodified">{{attempt.timemodified * 1000 | coreFormatDate }}</p>
                     </a>
                     <ion-item padding text-center *ngIf="responses.canLoadMore">
diff --git a/src/addon/mod/folder/components/index/addon-mod-folder-index.html b/src/addon/mod/folder/components/index/addon-mod-folder-index.html
index c59ab5ac7..205c7e3a1 100644
--- a/src/addon/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addon/mod/folder/components/index/addon-mod-folder-index.html
@@ -13,7 +13,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
 
     <ion-list *ngIf="contents && contents.length > 0">
         <ng-container *ngFor="let file of contents">
diff --git a/src/addon/mod/folder/pages/index/index.html b/src/addon/mod/folder/pages/index/index.html
index 4fd6145a3..289d6d47f 100644
--- a/src/addon/mod/folder/pages/index/index.html
+++ b/src/addon/mod/folder/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/forum/components/index/addon-mod-forum-index.html b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
index 42473d20e..cf513aab6 100644
--- a/src/addon/mod/forum/components/index/addon-mod-forum-index.html
+++ b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
@@ -19,7 +19,7 @@
             <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
         </ion-refresher>
         <core-loading [hideUntil]="loaded" class="core-loading-center">
-            <core-course-module-description *ngIf="forum && forum.type != 'single'" [description]="description" [component]="component" [componentId]="componentId" [note]="descriptionNote"></core-course-module-description>
+            <core-course-module-description *ngIf="forum && forum.type != 'single'" [description]="description" [component]="component" [componentId]="componentId" [note]="descriptionNote" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
 
             <!-- Forum discussions found to be synchronized -->
             <ion-card class="core-warning-card" icon-start *ngIf="hasOffline || hasOfflineRatings">
@@ -45,7 +45,7 @@
                 <ng-container *ngFor="let discussion of offlineDiscussions">
                     <ion-item text-wrap (click)="openNewDiscussion(discussion.timecreated)" [attr.no-lines]="discussion.groupname" [class.core-split-item-selected]="discussion.timecreated == -selectedDiscussion">
                         <ion-avatar core-user-avatar [user]="discussion" item-start [courseId]="courseId"></ion-avatar>
-                        <h2><core-format-text [text]="discussion.subject"></core-format-text></h2>
+                        <h2><core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></h2>
                         <h3 *ngIf="discussion.userfullname">
                             <ion-note float-end padding-left><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</ion-note>
                             {{discussion.userfullname}}
@@ -63,7 +63,7 @@
                         <h2>
                             <core-icon name="fa-map-pin" *ngIf="discussion.pinned"></core-icon>
                             <core-icon name="fa-star" class="addon-forum-star" *ngIf="!discussion.pinned && discussion.starred"></core-icon>
-                            <core-format-text [text]="discussion.subject"></core-format-text>
+                            <core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
                         </h2>
                         <h3>
                             <ion-note float-end padding-left text-end>
diff --git a/src/addon/mod/forum/components/post/addon-mod-forum-post.html b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
index 81107408c..eb370b63c 100644
--- a/src/addon/mod/forum/components/post/addon-mod-forum-post.html
+++ b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
@@ -4,7 +4,7 @@
         <h2>
             <core-icon name="fa-map-pin" *ngIf="post.parent == 0 && post.pinned"></core-icon>
             <core-icon name="fa-star" class="addon-forum-star" *ngIf="post.parent == 0 && !post.pinned && post.starred"></core-icon>
-            <span [class.core-bold]="post.parent == 0"><core-format-text [text]="post.subject"></core-format-text></span>
+            <span [class.core-bold]="post.parent == 0"><core-format-text [text]="post.subject" contextLevel="module" [contextInstanceId]="forum && forum.cmid"></core-format-text></span>
         </h2>
         <p>
             <ion-note float-end padding-left *ngIf="!post.modified"><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</ion-note>
@@ -20,7 +20,7 @@
     <div padding-bottom *ngIf="post.isprivatereply">
         <ion-note>{{ 'addon.mod_forum.postisprivatereply' | translate }}</ion-note>
     </div>
-    <core-format-text [component]="component" [componentId]="componentId" [text]="post.message"></core-format-text>
+    <core-format-text [component]="component" [componentId]="componentId" [text]="post.message" contextLevel="module" [contextInstanceId]="forum && forum.cmid"></core-format-text>
     <div no-lines>
         <ng-container *ngFor="let attachment of post.attachments">
             <!-- Files already attached to the submission. -->
diff --git a/src/addon/mod/forum/pages/discussion/discussion.html b/src/addon/mod/forum/pages/discussion/discussion.html
index 9111ecdd5..e9fb50e11 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.html
+++ b/src/addon/mod/forum/pages/discussion/discussion.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title *ngIf="discussion"><core-format-text [text]="discussion.subject"></core-format-text></ion-title>
+        <ion-title *ngIf="discussion"><core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="cmId"></core-format-text></ion-title>
         <ion-buttons end>
             <!-- The context menu will be added in here. -->
         </ion-buttons>
diff --git a/src/addon/mod/forum/pages/index/index.html b/src/addon/mod/forum/pages/index/index.html
index 80f7863eb..2f12c37de 100644
--- a/src/addon/mod/forum/pages/index/index.html
+++ b/src/addon/mod/forum/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/forum/pages/sort-order-selector/sort-order-selector.html b/src/addon/mod/forum/pages/sort-order-selector/sort-order-selector.html
index a3411deea..f5c8520c3 100644
--- a/src/addon/mod/forum/pages/sort-order-selector/sort-order-selector.html
+++ b/src/addon/mod/forum/pages/sort-order-selector/sort-order-selector.html
@@ -12,7 +12,7 @@
     <ion-list id="addon-mod-forum-sort-selector" role="menu" aria-labelledby="addon-mod-forum-sort-order-button">
         <ng-container *ngFor="let sortOrder of sortOrders">
             <a ion-item text-wrap (click)="selectSortOrder(sortOrder)" [class.core-primary-selected-item]="selected == sortOrder.value" detail-none role="menuitem" [attr.aria-label]="sortOrder.label | translate">
-                <h2><core-format-text [text]="sortOrder.label | translate"></core-format-text></h2>
+                <h2>{{ sortOrder.label | translate }}</h2>
             </a>
         </ng-container>
     </ion-list>
diff --git a/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html
index 4695adab9..e0277fbde 100644
--- a/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -22,7 +22,7 @@
             <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
         </ion-refresher>
 
-        <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+        <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
 
         <!-- Glossary entries found to be synchronized -->
         <ion-card class="core-warning-card" icon-start *ngIf="hasOffline || hasOfflineRatings">
diff --git a/src/addon/mod/glossary/components/index/index.ts b/src/addon/mod/glossary/components/index/index.ts
index 43feb2675..cc1550134 100644
--- a/src/addon/mod/glossary/components/index/index.ts
+++ b/src/addon/mod/glossary/components/index/index.ts
@@ -132,6 +132,8 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
             this.description = glossary.intro || this.description;
             this.canAdd = (this.glossaryProvider.isPluginEnabledForEditing() && glossary.canaddentry) || false;
 
+            this.dataRetrieved.emit(this.glossary);
+
             if (!this.fetchMode) {
                 this.switchMode('letter_all');
             }
diff --git a/src/addon/mod/glossary/pages/edit/edit.html b/src/addon/mod/glossary/pages/edit/edit.html
index 5678fcba8..c16fcc1dd 100644
--- a/src/addon/mod/glossary/pages/edit/edit.html
+++ b/src/addon/mod/glossary/pages/edit/edit.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="module.name"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="module.name" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
         <ion-buttons end>
             <button ion-button (click)="save()"> {{ 'core.save' | translate }}</button>
         </ion-buttons>
diff --git a/src/addon/mod/glossary/pages/entry/entry.html b/src/addon/mod/glossary/pages/entry/entry.html
index 5954398ff..2c9fc51e0 100644
--- a/src/addon/mod/glossary/pages/entry/entry.html
+++ b/src/addon/mod/glossary/pages/entry/entry.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title *ngIf="entry"><core-format-text [text]="entry.concept"></core-format-text></ion-title>
+        <ion-title *ngIf="entry"><core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="glossary && glossary.coursemodule"></core-format-text></ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>
@@ -12,16 +12,16 @@
         <ng-container *ngIf="entry">
             <ion-item text-wrap *ngIf="showAuthor">
                 <ion-avatar core-user-avatar [user]="entry" (click)="openUserProfile(post.userid)" item-start></ion-avatar>
-                <h2><core-format-text [text]="entry.concept"></core-format-text></h2>
+                <h2><core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="glossary && glossary.coursemodule"></core-format-text></h2>
                 <ion-note item-end *ngIf="showDate">{{ entry.timemodified | coreDateDayOrTime }}</ion-note>
-                <p><core-format-text [text]="entry.userfullname"></core-format-text></p>
+                <p>{{ entry.userfullname }}</p>
             </ion-item>
             <ion-item text-wrap *ngIf="!showAuthor">
-                <h2><core-format-text [text]="entry.concept"></core-format-text></h2>
+                <h2><core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="glossary && glossary.coursemodule"></core-format-text></h2>
                 <ion-note item-end *ngIf="showDate">{{ entry.timemodified | coreDateDayOrTime }}</ion-note>
             </ion-item>
             <ion-item text-wrap>
-                <core-format-text [component]="component" [componentId]="componentId" [text]="entry.definition"></core-format-text>
+                <core-format-text [component]="component" [componentId]="componentId" [text]="entry.definition" contextLevel="module" [contextInstanceId]="glossary && glossary.coursemodule"></core-format-text>
             </ion-item>
             <ng-container *ngIf="entry.attachment">
                 <div no-lines>
diff --git a/src/addon/mod/glossary/pages/index/index.html b/src/addon/mod/glossary/pages/index/index.html
index f33735512..35ce44b11 100644
--- a/src/addon/mod/glossary/pages/index/index.html
+++ b/src/addon/mod/glossary/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html
index e8c542dfa..435cf919a 100644
--- a/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -16,8 +16,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
     <div class="addon-mod-imscp-container">
-        <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
-        <core-navigation-bar [previous]="previousItem" [next]="nextItem" (action)="loadItem($event)" [info]="description" [title]="'core.description' | translate" [component]="component" [componentId]="componentId"></core-navigation-bar>
+        <core-navigation-bar [previous]="previousItem" [next]="nextItem" (action)="loadItem($event)" [info]="description" [title]="'core.description' | translate" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-navigation-bar>
         <core-iframe [src]="src"></core-iframe>
     </div>
 </core-loading>
diff --git a/src/addon/mod/imscp/pages/index/index.html b/src/addon/mod/imscp/pages/index/index.html
index 8d8662c3d..f31c63425 100644
--- a/src/addon/mod/imscp/pages/index/index.html
+++ b/src/addon/mod/imscp/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addon/mod/lesson/components/index/addon-mod-lesson-index.html
index 655de6301..98c3eaf5d 100644
--- a/src/addon/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addon/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -18,12 +18,12 @@
         <!-- Index/Preview tab. -->
         <core-tab [title]="'addon.mod_lesson.preview' | translate" (ionSelect)="indexSelected()">
             <ng-template>
-                <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+                <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
 
                 <!-- Prevent access messages. Only show the first one. -->
                 <div class="core-info-card" icon-start *ngIf="lesson && preventMessages && preventMessages.length">
                     <ion-icon name="information-circle"></ion-icon>
-                    <core-format-text [component]="component" [componentId]="componentId" [text]="preventMessages[0].message"></core-format-text>
+                    <span [innerHTML]="preventMessages[0].message"></span>
                 </div>
 
                 <!-- Lesson has data to be synchronized -->
diff --git a/src/addon/mod/lesson/pages/index/index.html b/src/addon/mod/lesson/pages/index/index.html
index e09f2c477..d90832113 100644
--- a/src/addon/mod/lesson/pages/index/index.html
+++ b/src/addon/mod/lesson/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/lesson/pages/menu-modal/menu-modal.html b/src/addon/mod/lesson/pages/menu-modal/menu-modal.html
index 5744f07bd..deeeaca2c 100644
--- a/src/addon/mod/lesson/pages/menu-modal/menu-modal.html
+++ b/src/addon/mod/lesson/pages/menu-modal/menu-modal.html
@@ -26,7 +26,7 @@
                 <div *ngIf="!pageInstance.loadingMenu">
                     <ng-container *ngFor="let page of pageInstance.lessonPages">
                         <a ion-item text-wrap *ngIf="page.display && page.displayinmenublock" (click)="loadPage(page.id)" [ngClass]='{"addon-mod_lesson-selected core-white-push-arrow": !pageInstance.eolData && pageInstance.currentPage == page.id}'>
-                            <p><core-format-text [text]="page.title"></core-format-text></p>
+                            <p><core-format-text [text]="page.title" contextLevel="module" [contextInstanceId]="pageInstance && pageInstance.lesson && pageInstance.lesson.coursemodule"></core-format-text></p>
                         </a>
                     </ng-container>
                 </div>
diff --git a/src/addon/mod/lesson/pages/player/player.html b/src/addon/mod/lesson/pages/player/player.html
index 6c83c1f4b..5e351352b 100644
--- a/src/addon/mod/lesson/pages/player/player.html
+++ b/src/addon/mod/lesson/pages/player/player.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="lesson && lesson.coursemodule"></core-format-text></ion-title>
 
         <ion-buttons end>
             <button *ngIf="displayMenu || mediaFile" ion-button icon-only [attr.aria-label]="'addon.mod_lesson.lessonmenu' | translate" (click)="menuModal.present()">
@@ -14,7 +14,7 @@
         <!-- Info messages. Only show the first one. -->
         <div class="core-info-card" icon-start *ngIf="lesson && messages && messages.length">
             <ion-icon name="information-circle"></ion-icon>
-            <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="messages[0].message"></core-format-text>
+            {{ messages[0].message }}
         </div>
 
         <div *ngIf="lesson" [ngClass]='{"addon-mod_lesson-slideshow": lesson.slideshow}' [ngStyle]="{'width': lessonWidth, 'height': lessonHeight}">
@@ -26,21 +26,21 @@
                 <p>{{ 'addon.mod_lesson.attempt' | translate:{$a: retake} }}</p>
             </ion-item>
             <ion-item text-wrap *ngIf="pageData && pageData.ongoingscore && !eolData && !processData" class="addon-mod_lesson-ongoingscore">
-                <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="pageData.ongoingscore"></core-format-text>
+                {{ pageData.ongoingscore }}
             </ion-item>
 
             <!-- Page content. -->
             <ion-card *ngIf="!eolData && !processData">
                 <!-- Content page. -->
                 <ion-item text-wrap *ngIf="!question && pageContent">
-                    <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="pageContent"></core-format-text>
+                    <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="pageContent" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
                 </ion-item>
 
                 <!-- Question page. -->
                 <!-- We need to set ngIf loaded to make formGroup directive restart every time a page changes, see MOBILE-2540. -->
                 <form *ngIf="question && loaded" ion-list [formGroup]="questionForm">
                     <ion-item-divider text-wrap *ngIf="pageContent">
-                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="pageContent"></core-format-text>
+                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="pageContent" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
                     </ion-item-divider>
 
                     <input *ngFor="let input of question.hiddenInputs" type="hidden" [name]="input.name" [value]="input.value" />
@@ -61,7 +61,7 @@
                             </ion-item>
                             <ion-item text-wrap *ngIf="!question.textarea && question.useranswer">
                                 <p class="item-heading">{{ 'addon.mod_lesson.youranswer' | translate }}</p>
-                                <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="question.useranswer"></core-format-text></p>
+                                <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="question.useranswer" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text></p>
                             </ion-item>
                         </ng-container>
 
@@ -71,7 +71,7 @@
                             <div *ngIf="!question.multi" radio-group [formControlName]="question.controlName">
                                 <ion-item text-wrap *ngFor="let option of question.options">
                                     <ion-label>
-                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="option.text"></core-format-text>
+                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="option.text" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
                                     </ion-label>
                                     <ion-radio [id]="option.id" [value]="option.value" [disabled]="option.disabled"></ion-radio>
                                 </ion-item>
@@ -81,7 +81,7 @@
                             <ng-container *ngIf="question.multi">
                                 <ion-item text-wrap *ngFor="let option of question.options">
                                     <ion-label>
-                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="option.text"></core-format-text>
+                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="option.text" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
                                     </ion-label>
                                     <ion-checkbox [id]="option.id" [formControlName]="option.name" item-end></ion-checkbox>
                                 </ion-item>
@@ -94,7 +94,7 @@
                                 <ion-grid item-content>
                                     <ion-row>
                                         <ion-col>
-                                            <p><core-format-text id="addon-mod_lesson-matching-{{row.id}}" [component]="component" [componentId]="lesson.coursemodule" [text]="row.text"></core-format-text></p>
+                                            <p><core-format-text id="addon-mod_lesson-matching-{{row.id}}" [component]="component" [componentId]="lesson.coursemodule" [text]="row.text" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text></p>
                                         </ion-col>
                                         <ion-col>
                                             <ion-select [id]="row.id" [formControlName]="row.name" [attr.aria-labelledby]="'addon-mod_lesson-matching-' + row.id" interface="action-sheet">
@@ -141,57 +141,57 @@
 
                 <h3 padding *ngIf="eolData.gradelesson">{{ 'addon.mod_lesson.congratulations' | translate }}</h3>
                 <ion-item text-wrap *ngIf="eolData.notenoughtimespent">
-                    <core-format-text [text]="eolData.notenoughtimespent.message"></core-format-text>
+                    <{{ eolData.notenoughtimespent.message }}
                 </ion-item>
                 <ion-item text-wrap *ngIf="eolData.numberofpagesviewed">
-                    <core-format-text [text]="eolData.numberofpagesviewed.message"></core-format-text>
+                    {{ eolData.numberofpagesviewed.message }}
                 </ion-item>
                 <ion-item text-wrap *ngIf="eolData.youshouldview">
-                    <core-format-text [text]="eolData.youshouldview.message"></core-format-text>
+                    {{ eolData.youshouldview.message }}
                 </ion-item>
                 <ion-item text-wrap *ngIf="eolData.numberofcorrectanswers">
-                    <core-format-text [text]="eolData.numberofcorrectanswers.message"></core-format-text>
+                    {{ eolData.numberofcorrectanswers.message }}
                 </ion-item>
                 <ion-item text-wrap *ngIf="eolData.displayscorewithessays">
-                    <core-format-text [text]="eolData.displayscorewithessays.message"></core-format-text>
+                    <span [innerHTML]="eolData.displayscorewithessays.message"></span>
                 </ion-item>
                 <ion-item text-wrap *ngIf="!eolData.displayscorewithessays && eolData.displayscorewithoutessays">
-                    <core-format-text [text]="eolData.displayscorewithoutessays.message"></core-format-text>
+                    {{ eolData.displayscorewithoutessays.message }}
                 </ion-item>
                 <ion-item text-wrap *ngIf="eolData.yourcurrentgradeisoutof">
-                    <core-format-text [text]="eolData.yourcurrentgradeisoutof.message"></core-format-text>
+                    {{ eolData.yourcurrentgradeisoutof.message }}
                 </ion-item>
                 <ion-item text-wrap *ngIf="eolData.eolstudentoutoftimenoanswers">
-                    <core-format-text [text]="eolData.eolstudentoutoftimenoanswers.message"></core-format-text>
+                    {{ eolData.eolstudentoutoftimenoanswers.message }}
                 </ion-item>
                 <ion-item text-wrap *ngIf="eolData.welldone">
-                    <core-format-text [text]="eolData.welldone.message"></core-format-text>
+                    {{ eolData.welldone.message }}
                 </ion-item>
                 <ion-item text-wrap *ngIf="lesson.progressbar && eolData.progresscompleted">
                     <p>{{ 'addon.mod_lesson.progresscompleted' | translate:{$a: eolData.progresscompleted.value} }}</p>
                     <core-progress-bar [progress]="eolData.progresscompleted.value"></core-progress-bar>
                 </ion-item>
                 <ion-item text-wrap *ngIf="eolData.displayofgrade">
-                    <core-format-text [text]="eolData.displayofgrade.message"></core-format-text>
+                    {{ eolData.displayofgrade.message }}
                 </ion-item>
                 <ion-item text-wrap *ngIf="eolData.reviewlesson">
                     <a ion-button block text-wrap (click)="reviewLesson(eolData.reviewlesson.pageid)" class="button-no-uppercase">
-                        <core-format-text [text]="'addon.mod_lesson.reviewlesson' | translate"></core-format-text>
+                        {{ 'addon.mod_lesson.reviewlesson' | translate }}
                     </a>
                 </ion-item>
                 <ion-item text-wrap *ngIf="eolData.modattemptsnoteacher">
-                    <core-format-text [text]="eolData.modattemptsnoteacher.message"></core-format-text>
+                    {{ eolData.modattemptsnoteacher.message }}
                 </ion-item>
                 <ion-item text-wrap *ngIf="eolData.activitylink && eolData.activitylink.value">
                     <ng-container *ngIf="eolData.activitylink.value.formatted">
                         <!-- Activity link was successfully formatted, render the button. -->
                         <a ion-button block text-wrap color="light" [href]="eolData.activitylink.value.href" core-link [capture]="true" class="button-no-uppercase">
-                            <core-format-text [text]="eolData.activitylink.value.label"></core-format-text>
+                            <core-format-text [text]="eolData.activitylink.value.label" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
                         </a>
                     </ng-container>
                     <ng-container *ngIf="!eolData.activitylink.value.formatted">
                         <!-- Activity link wasn't formatted, render the original link. -->
-                        <core-format-text [text]="eolData.activitylink.value.label"></core-format-text>
+                        <core-format-text [text]="eolData.activitylink.value.label" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
                     </ng-container>
                 </ion-item>
             </ion-card>
@@ -199,11 +199,11 @@
             <!-- Feedback returned when processing an action. -->
             <ion-list *ngIf="processData">
                 <ion-item text-wrap *ngIf="processData.ongoingscore && !processData.reviewmode" >
-                    <core-format-text class="addon-mod_lesson-ongoingscore" [text]="processData.ongoingscore"></core-format-text>
+                    {{ processData.ongoingscore }}
                 </ion-item>
                 <ion-item text-wrap *ngIf="!processData.reviewmode || review">
                     <p *ngIf="!processData.reviewmode">
-                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="processData.feedback"></core-format-text>
+                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="processData.feedback" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
                     </p>
                     <div *ngIf="review">
                         <p>{{ 'addon.mod_lesson.gotoendoflesson' | translate }}</p>
diff --git a/src/addon/mod/lesson/pages/user-retake/user-retake.html b/src/addon/mod/lesson/pages/user-retake/user-retake.html
index 60c19802b..eb8882daa 100644
--- a/src/addon/mod/lesson/pages/user-retake/user-retake.html
+++ b/src/addon/mod/lesson/pages/user-retake/user-retake.html
@@ -64,7 +64,7 @@
                     </ion-card-header>
                     <ion-item text-wrap>
                         <p class="item-heading">{{ 'addon.mod_lesson.question' | translate }}</p>
-                        <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [maxHeight]="50" [text]="page.contents"></core-format-text></p>
+                        <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [maxHeight]="50" [text]="page.contents" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text></p>
                     </ion-item>
                     <ion-item text-wrap>
                         <p class="item-heading">{{ 'addon.mod_lesson.answer' | translate }}</p>
@@ -92,9 +92,9 @@
                                 <!-- Truefalse or matching. -->
                                 <ion-item text-wrap *ngIf="answer[0].isCheckbox" [ngClass]="{'addon-mod_lesson-highlight': answer[0].highlight}">
                                     <ion-label>
-                                        <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[0].content"></core-format-text></p>
+                                        <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[0].content" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text></p>
                                         <ion-badge *ngIf="answer[1]" color="dark">
-                                            <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]"></core-format-text>
+                                            <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
                                         </ion-badge>
                                     </ion-label>
                                     <ion-checkbox [attr.name]="answer[0].name" [ngModel]="answer[0].checked" [disabled]="true" item-end>
@@ -105,7 +105,7 @@
                                 <ion-item text-wrap *ngIf="answer[0].isText">
                                     <p>{{ answer[0].value }}</p>
                                     <ion-badge *ngIf="answer[1]" color="dark">
-                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]"></core-format-text>
+                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
                                     </ion-badge>
                                 </ion-item>
 
@@ -113,12 +113,12 @@
                                 <ion-item text-wrap *ngIf="answer[0].isSelect">
                                     <ion-row>
                                         <ion-col>
-                                            <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]=" answer[0].content"></core-format-text></p>
+                                            <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]=" answer[0].content" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text></p>
                                         </ion-col>
                                         <ion-col>
                                             <p>{{answer[0].value}}</p>
                                             <ion-badge *ngIf="answer[1]" color="dark">
-                                                <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]"></core-format-text>
+                                                <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
                                             </ion-badge>
                                         </ion-col>
                                     </ion-row>
@@ -126,25 +126,25 @@
 
                                 <!-- Essay or couldn't determine. -->
                                 <ion-item text-wrap *ngIf="!answer[0].isCheckbox && !answer[0].isText && !answer[0].isSelect">
-                                    <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[0]"></core-format-text></p>
+                                    <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[0]" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text></p>
                                     <ion-badge *ngIf="answer[1]" color="dark">
-                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]"></core-format-text>
+                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
                                     </ion-badge>
                                 </ion-item>
                             </div>
 
                             <ion-item text-wrap *ngIf="!page.isContent && !page.isQuestion">
                                 <!-- Another page (end of branch, ...). -->
-                                <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[0]"></core-format-text></p>
+                                <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[0]" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text></p>
                                 <ion-badge *ngIf="answer[1]" color="dark">
-                                    <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]"></core-format-text>
+                                    <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
                                 </ion-badge>
                             </ion-item>
                         </div>
 
                         <ion-item text-wrap *ngIf="page.answerdata.response">
                             <p class="item-heading">{{ 'addon.mod_lesson.response' | translate }}</p>
-                            <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="page.answerdata.response"></core-format-text></p>
+                            <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="page.answerdata.response" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text></p>
                         </ion-item>
                         <ion-item text-wrap *ngIf="page.answerdata.score">
                             <p>{{page.answerdata.score}}</p>
diff --git a/src/addon/mod/lti/components/index/addon-mod-lti-index.html b/src/addon/mod/lti/components/index/addon-mod-lti-index.html
index 6f76ace97..ce173f76c 100644
--- a/src/addon/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addon/mod/lti/components/index/addon-mod-lti-index.html
@@ -11,7 +11,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
 
-    <core-course-module-description *ngIf="lti && lti.showdescriptionlaunch" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <core-course-module-description *ngIf="lti && lti.showdescriptionlaunch" [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
 
     <div padding>
         <button ion-button block icon-left (click)="launch()">
diff --git a/src/addon/mod/lti/pages/index/index.html b/src/addon/mod/lti/pages/index/index.html
index 158499276..7eff01f32 100644
--- a/src/addon/mod/lti/pages/index/index.html
+++ b/src/addon/mod/lti/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/page/components/index/addon-mod-page-index.html b/src/addon/mod/page/components/index/addon-mod-page-index.html
index d231a3874..63bb1c1a8 100644
--- a/src/addon/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addon/mod/page/components/index/addon-mod-page-index.html
@@ -13,10 +13,10 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
 
-    <core-course-module-description *ngIf="displayDescription" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <core-course-module-description *ngIf="displayDescription" [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
 
     <div padding>
-        <core-format-text [component]="component" [componentId]="componentId" [text]="contents"></core-format-text>
+        <core-format-text [component]="component" [componentId]="componentId" [text]="contents" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
         <p padding-bottom class="addon-mod_page-timemodified" *ngIf="displayTimemodified && page && page.timemodified">
             {{ 'core.lastmodified' | translate}}: {{ page.timemodified * 1000 | coreFormatDate }}
         </p>
diff --git a/src/addon/mod/page/pages/index/index.html b/src/addon/mod/page/pages/index/index.html
index 9da72064d..3551feee5 100644
--- a/src/addon/mod/page/pages/index/index.html
+++ b/src/addon/mod/page/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addon/mod/quiz/components/index/addon-mod-quiz-index.html
index b6eba13f7..4597fc53c 100644
--- a/src/addon/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addon/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -14,7 +14,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
 
     <!-- Access rules description messages. -->
     <ion-card *ngIf="(quiz && quiz.gradeMethodReadable) || (accessRules && accessRules.length) || syncTime">
@@ -73,11 +73,11 @@
             <ion-item text-wrap *ngIf="gradeOverridden">{{ 'core.course.overriddennotice' | translate }}</ion-item>
             <ion-item text-wrap *ngIf="gradebookFeedback">
                 <p class="item-heading">{{ 'addon.mod_quiz.comment' | translate }}</p>
-                <p><core-format-text [component]="component" [componentId]="componentId" [text]="gradebookFeedback"></core-format-text></p>
+                <p><core-format-text [component]="component" [componentId]="componentId" [text]="gradebookFeedback" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></p>
             </ion-item>
             <ion-item text-wrap *ngIf="quiz.showFeedbackColumn && overallFeedback">
                 <p class="item-heading">{{ 'addon.mod_quiz.overallfeedback' | translate }}</p>
-                <p><core-format-text [component]="component" [componentId]="componentId" [text]="overallFeedback"></core-format-text></p>
+                <p><core-format-text [component]="component" [componentId]="componentId" [text]="overallFeedback" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></p>
             </ion-item>
         </ion-list>
     </ion-card>
diff --git a/src/addon/mod/quiz/pages/attempt/attempt.html b/src/addon/mod/quiz/pages/attempt/attempt.html
index aa4dc3b5f..f312d9901 100644
--- a/src/addon/mod/quiz/pages/attempt/attempt.html
+++ b/src/addon/mod/quiz/pages/attempt/attempt.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text *ngIf="quiz" [text]="quiz.name"></core-format-text></ion-title>
+        <ion-title><core-format-text *ngIf="quiz" [text]="quiz.name" contextLevel="module" [contextInstanceId]="quiz.coursemodule"></core-format-text></ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>
@@ -28,7 +28,7 @@
             </ion-item>
             <ion-item text-wrap no-lines *ngIf="quiz.showFeedbackColumn && attempt.feedback">
                 <h2>{{ 'addon.mod_quiz.feedback' | translate }}</h2>
-                <p><core-format-text [component]="component" [componentId]="componentId" [text]="attempt.feedback"></core-format-text></p>
+                <p><core-format-text [component]="component" [componentId]="componentId" [text]="attempt.feedback" contextLevel="module" [contextInstanceId]="quiz.coursemodule"></core-format-text></p>
             </ion-item>
             <ion-item *ngIf="quiz.showReviewColumn && attempt.finished">
                 <button ion-button block icon-start [navPush]="'AddonModQuizReviewPage'" [navParams]="{courseId: courseId, quizId: quiz.id, attemptId: attempt.id}">
diff --git a/src/addon/mod/quiz/pages/index/index.html b/src/addon/mod/quiz/pages/index/index.html
index 036b81c41..5dcbb4fc3 100644
--- a/src/addon/mod/quiz/pages/index/index.html
+++ b/src/addon/mod/quiz/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/quiz/pages/player/player.html b/src/addon/mod/quiz/pages/player/player.html
index 9470bec15..3f0f82335 100644
--- a/src/addon/mod/quiz/pages/player/player.html
+++ b/src/addon/mod/quiz/pages/player/player.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text *ngIf="quiz" [text]="quiz.name"></core-format-text></ion-title>
+        <ion-title><core-format-text *ngIf="quiz" [text]="quiz.name" contextLevel="module" [contextInstanceId]="quiz.coursemodule"></core-format-text></ion-title>
 
         <ion-buttons end>
             <button id="addon-mod_quiz-connection-error-button" ion-button icon-only [hidden]="!autoSaveError" (click)="showConnectionError($event)" [attr.aria-label]="'core.error' | translate">
@@ -54,11 +54,11 @@
                         <h2 *ngIf="!question.number" class="inline">{{ 'core.question.information' | translate }}</h2>
                         <ion-note text-wrap item-end *ngIf="question.status || question.readableMark">
                             <p *ngIf="question.status" class="block">{{question.status}}</p>
-                            <p *ngIf="question.readableMark"><core-format-text [text]="question.readableMark"></core-format-text></p>
+                            <p *ngIf="question.readableMark">{{ question.readableMark }}</p>
                         </ion-note>
                     </ion-item-divider>
                     <!-- Body of the question. -->
-                    <core-question text-wrap [question]="question" [component]="component" [componentId]="quiz.coursemodule" [attemptId]="attempt.id" [usageId]="attempt.uniqueid" [offlineEnabled]="offline" (onAbort)="abortQuiz()" (buttonClicked)="behaviourButtonClicked($event)"></core-question>
+                    <core-question text-wrap [question]="question" [component]="component" [componentId]="quiz.coursemodule" [attemptId]="attempt.id" [usageId]="attempt.uniqueid" [offlineEnabled]="offline" contextLevel="module" [contextInstanceId]="quiz.coursemodule" (onAbort)="abortQuiz()" (buttonClicked)="behaviourButtonClicked($event)"></core-question>
                 </ion-card>
             </div>
         </form>
diff --git a/src/addon/mod/quiz/pages/review/review.html b/src/addon/mod/quiz/pages/review/review.html
index 4d398ed27..15bafe825 100644
--- a/src/addon/mod/quiz/pages/review/review.html
+++ b/src/addon/mod/quiz/pages/review/review.html
@@ -46,7 +46,7 @@
                 </ion-item>
                 <ion-item text-wrap no-lines *ngIf="attempt.readableMark">
                     <h2>{{ 'addon.mod_quiz.marks' | translate }}</h2>
-                    <p><core-format-text [text]="attempt.readableMark"></core-format-text></p>
+                    <p><{{ attempt.readableMark }}</p>
                 </ion-item>
                 <ion-item text-wrap no-lines *ngIf="attempt.readableGrade">
                     <h2>{{ 'addon.mod_quiz.grade' | translate }}</h2>
@@ -54,7 +54,7 @@
                 </ion-item>
                 <ion-item text-wrap no-lines *ngFor="let data of additionalData">
                     <h2>{{ data.title }}</h2>
-                    <core-format-text [component]="component" [componentId]="componentId" [text]="data.content"></core-format-text>
+                    <core-format-text [component]="component" [componentId]="componentId" [text]="data.content" contextLevel="module" [contextInstanceId]="quiz.coursemodule"></core-format-text>
                 </ion-item>
             </ion-list>
         </ion-card>
@@ -73,11 +73,11 @@
                         <h2 *ngIf="!question.number" class="inline">{{ 'core.question.information' | translate }}</h2>
                         <ion-note text-wrap item-end *ngIf="question.status || question.readableMark">
                             <p *ngIf="question.status">{{question.status}}</p>
-                            <p *ngIf="question.readableMark"><core-format-text [text]="question.readableMark"></core-format-text></p>
+                            <p *ngIf="question.readableMark">{{question.readableMark}}</p>
                         </ion-note>
                     </ion-item-divider>
                     <!-- Body of the question. -->
-                    <core-question text-wrap [question]="question" [component]="component" [componentId]="componentId" [attemptId]="attempt.id" [usageId]="attempt.uniqueid" [offlineEnabled]="false"></core-question>
+                    <core-question text-wrap [question]="question" [component]="component" [componentId]="componentId" [attemptId]="attempt.id" [usageId]="attempt.uniqueid" [offlineEnabled]="false" contextLevel="module" [contextInstanceId]="quiz.coursemodule"></core-question>
                 </ion-card>
             </div>
 
diff --git a/src/addon/mod/resource/components/index/addon-mod-resource-index.html b/src/addon/mod/resource/components/index/addon-mod-resource-index.html
index 43e4c906f..d8172c08b 100644
--- a/src/addon/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addon/mod/resource/components/index/addon-mod-resource-index.html
@@ -13,14 +13,14 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
 
-    <core-course-module-description *ngIf="mode != 'iframe' && (mode != 'embedded' || displayDescription)" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <core-course-module-description *ngIf="mode != 'iframe' && (mode != 'embedded' || displayDescription)" [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
 
     <ng-container *ngIf="mode == 'iframe'">
         <core-iframe [src]="src"></core-iframe>
     </ng-container>
 
     <div *ngIf="mode == 'embedded'">
-        <core-format-text [text]="contentText"></core-format-text>
+        <core-format-text [text]="contentText" [filter]="false"></core-format-text>
     </div>
 
     <div padding *ngIf="mode == 'external'">
diff --git a/src/addon/mod/resource/pages/index/index.html b/src/addon/mod/resource/pages/index/index.html
index bae9e1278..59b962225 100644
--- a/src/addon/mod/resource/pages/index/index.html
+++ b/src/addon/mod/resource/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
index 959fd819f..8d86b0309 100644
--- a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -14,7 +14,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
 
     <!-- Warning message. -->
     <div *ngIf="scorm && scorm.warningMessage" class="core-info-card" icon-start>
@@ -98,8 +98,8 @@
                     <div *ngFor="let sco of toc" class="core-padding-{{sco.level}}">
                         <p *ngIf="sco.isvisible">
                             <img [src]="sco.image.url" [alt]="sco.image.description" />
-                            <a *ngIf="sco.prereq && sco.launch" (click)="open($event, sco.id)">{{ sco.title }}</a>
-                            <span *ngIf="!sco.prereq || !sco.launch">{{ sco.title }}</span>
+                            <a *ngIf="sco.prereq && sco.launch" (click)="open($event, sco.id)"><core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></a>
+                            <span *ngIf="!sco.prereq || !sco.launch"><core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></span>
                         </p>
                     </div>
                 </ion-item>
diff --git a/src/addon/mod/scorm/pages/index/index.html b/src/addon/mod/scorm/pages/index/index.html
index f8a5f7d42..1bd6f15a8 100644
--- a/src/addon/mod/scorm/pages/index/index.html
+++ b/src/addon/mod/scorm/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/scorm/pages/player/player.html b/src/addon/mod/scorm/pages/player/player.html
index bdf47bd53..848a18bc9 100644
--- a/src/addon/mod/scorm/pages/player/player.html
+++ b/src/addon/mod/scorm/pages/player/player.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="scorm.coursemodule"></core-format-text></ion-title>
 
         <ion-buttons end>
             <button *ngIf="showToc && !loadingToc && toc && toc.length" ion-button icon-only (click)="openToc($event)"[attr.aria-label]="'addon.mod_scorm.toc' | translate" aria-haspopup="true">
diff --git a/src/addon/mod/scorm/pages/player/player.ts b/src/addon/mod/scorm/pages/player/player.ts
index b197328e3..7a598dc36 100644
--- a/src/addon/mod/scorm/pages/player/player.ts
+++ b/src/addon/mod/scorm/pages/player/player.ts
@@ -392,7 +392,8 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
             toc: this.toc,
             attemptToContinue: this.attemptToContinue,
             mode: this.mode,
-            selected: this.currentSco && this.currentSco.id
+            selected: this.currentSco && this.currentSco.id,
+            moduleId: this.scorm.coursemodule
         }, { cssClass: 'core-modal-lateral',
             showBackdrop: true,
             enableBackdropDismiss: true,
diff --git a/src/addon/mod/scorm/pages/toc/toc.html b/src/addon/mod/scorm/pages/toc/toc.html
index c9a0c71c4..457964211 100644
--- a/src/addon/mod/scorm/pages/toc/toc.html
+++ b/src/addon/mod/scorm/pages/toc/toc.html
@@ -25,7 +25,7 @@
             <ng-container *ngFor="let sco of toc">
                 <a *ngIf="sco.isvisible" ion-item text-wrap [ngClass]="'core-padding-' + sco.level" [class.core-nav-item-selected]="selected == sco.id" (click)="loadSco(sco)" [attr.disabled]="!sco.prereq || !sco.launch ? true : null" [attr.detail-none]="!sco.prereq || !sco.launch ? true : null">
                     <img [src]="sco.image.url" [alt]="sco.image.description" />
-                    <span>{{ sco.title }}</span>
+                    <core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text>
                 </a>
             </ng-container>
         </ion-list>
diff --git a/src/addon/mod/scorm/pages/toc/toc.ts b/src/addon/mod/scorm/pages/toc/toc.ts
index c1e9ace50..27c20d4f7 100644
--- a/src/addon/mod/scorm/pages/toc/toc.ts
+++ b/src/addon/mod/scorm/pages/toc/toc.ts
@@ -30,10 +30,12 @@ export class AddonModScormTocPage {
     isReview: boolean;
     attemptToContinue: number;
     selected: number;
+    moduleId: number;
 
     constructor(navParams: NavParams, private viewCtrl: ViewController) {
         this.toc = navParams.get('toc') || [];
         this.attemptToContinue = navParams.get('attemptToContinue');
+        this.moduleId = navParams.get('moduleId');
 
         const mode = navParams.get('mode');
         this.selected = navParams.get('selected');
diff --git a/src/addon/mod/survey/components/index/addon-mod-survey-index.html b/src/addon/mod/survey/components/index/addon-mod-survey-index.html
index 3ed46e9bc..4e3e8c541 100644
--- a/src/addon/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addon/mod/survey/components/index/addon-mod-survey-index.html
@@ -14,10 +14,10 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
 
-    <core-course-module-description *ngIf="survey && !survey.surveydone && !hasOffline" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <core-course-module-description *ngIf="survey && !survey.surveydone && !hasOffline" [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
 
     <!-- Survey already done -->
-    <ion-card padding *ngIf="survey && survey.surveydone">  
+    <ion-card padding *ngIf="survey && survey.surveydone">
         <p padding>{{ 'addon.mod_survey.surveycompletednograph' | translate }}</p>
         <a ion-button block icon-start [href]="externalUrl" core-link>
             <ion-icon name="open" start></ion-icon>
diff --git a/src/addon/mod/survey/pages/index/index.html b/src/addon/mod/survey/pages/index/index.html
index fb777dea0..0c9f1c027 100644
--- a/src/addon/mod/survey/pages/index/index.html
+++ b/src/addon/mod/survey/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/url/components/index/addon-mod-url-index.html b/src/addon/mod/url/components/index/addon-mod-url-index.html
index 2e3ae8b8b..66ff7832a 100644
--- a/src/addon/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addon/mod/url/components/index/addon-mod-url-index.html
@@ -11,7 +11,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description *ngIf="displayDescription" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <core-course-module-description *ngIf="displayDescription" [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
 
     <div *ngIf="shouldIframe || (shouldEmbed && isOther)" class="addon-mod_url-embedded-url">
         <core-iframe [src]="url"></core-iframe>
diff --git a/src/addon/mod/url/pages/index/index.html b/src/addon/mod/url/pages/index/index.html
index 4c98ddb17..013e94e05 100644
--- a/src/addon/mod/url/pages/index/index.html
+++ b/src/addon/mod/url/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
index 78033eeab..6ce4a3712 100644
--- a/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -25,7 +25,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
     <div padding *ngIf="description || pageIsOffline || hasOffline || pageWarning">
-        <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+        <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
 
         <!-- Wiki has something offline. -->
         <div class="core-warning-card" icon-start *ngIf="pageIsOffline || hasOffline">
@@ -42,7 +42,7 @@
     </div>
     <div padding class="addon-mod_wiki-page-content">
         <article [ngClass]="{'addon-mod_wiki-noedit': !canEdit}">
-            <core-format-text *ngIf="pageContent" [component]="component" [componentId]="componentId" [text]="pageContent"></core-format-text>
+            <core-format-text *ngIf="pageContent" [component]="component" [componentId]="componentId" [text]="pageContent" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
             <core-empty-box *ngIf="!pageContent" icon="document" [message]="'addon.mod_wiki.nocontent' | translate" [inline]="true"></core-empty-box>
         </article>
 
diff --git a/src/addon/mod/wiki/components/index/index.ts b/src/addon/mod/wiki/components/index/index.ts
index 0380e962a..095aaad97 100644
--- a/src/addon/mod/wiki/components/index/index.ts
+++ b/src/addon/mod/wiki/components/index/index.ts
@@ -552,7 +552,8 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
         const modal = this.modalCtrl.create('AddonModWikiMapPage', {
             pages: this.subwikiPages,
             selected: this.currentPageObj && this.currentPageObj.id,
-            homeView: this.getWikiHomeView()
+            homeView: this.getWikiHomeView(),
+            moduleId: this.module.id
         }, { cssClass: 'core-modal-lateral',
             showBackdrop: true,
             enableBackdropDismiss: true,
diff --git a/src/addon/mod/wiki/pages/edit/edit.html b/src/addon/mod/wiki/pages/edit/edit.html
index f31cfc9b5..17572bf9c 100644
--- a/src/addon/mod/wiki/pages/edit/edit.html
+++ b/src/addon/mod/wiki/pages/edit/edit.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <button ion-button clear (click)="save()" [attr.aria-label]="'core.save' | translate">
diff --git a/src/addon/mod/wiki/pages/index/index.html b/src/addon/mod/wiki/pages/index/index.html
index f2578a691..aed2d83b2 100644
--- a/src/addon/mod/wiki/pages/index/index.html
+++ b/src/addon/mod/wiki/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/wiki/pages/map/map.html b/src/addon/mod/wiki/pages/map/map.html
index 93429cb91..925b94da0 100644
--- a/src/addon/mod/wiki/pages/map/map.html
+++ b/src/addon/mod/wiki/pages/map/map.html
@@ -20,7 +20,7 @@
                     {{ letter.label }}
                 </ion-item-divider>
                 <a ion-item text-wrap *ngFor="let page of letter.pages" (click)="goToPage(page)" [class.core-nav-item-selected]="selected == page.id">
-                    <ion-icon name="home" item-start *ngIf="page.firstpage"></ion-icon> {{ page.title }}
+                    <ion-icon name="home" item-start *ngIf="page.firstpage"></ion-icon> <core-format-text [text]="page.title" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text>
                     <ion-note *ngIf="!page.id" item-end>
                         <ion-icon name="time"></ion-icon>
                         <span text-wrap>{{ 'core.notsent' | translate }}</span>
diff --git a/src/addon/mod/wiki/pages/map/map.ts b/src/addon/mod/wiki/pages/map/map.ts
index 9de3fe745..cb38f6baf 100644
--- a/src/addon/mod/wiki/pages/map/map.ts
+++ b/src/addon/mod/wiki/pages/map/map.ts
@@ -26,6 +26,7 @@ import { IonicPage, NavParams, ViewController } from 'ionic-angular';
 export class AddonModWikiMapPage {
     map: any[] = []; // Map of pages, categorized by letter.
     selected: number;
+    moduleId: number;
     homeView: ViewController;
 
     constructor(navParams: NavParams, protected viewCtrl: ViewController) {
@@ -33,6 +34,7 @@ export class AddonModWikiMapPage {
 
         this.selected = navParams.get('selected');
         this.homeView = navParams.get('homeView');
+        this.moduleId = navParams.get('moduleId');
     }
 
     /**
diff --git a/src/addon/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html b/src/addon/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html
index 80195fbb5..e978a3cb1 100644
--- a/src/addon/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html
+++ b/src/addon/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html
@@ -2,7 +2,7 @@
     <ion-card *ngIf="n < assessment.form.dimenssionscount">
         <ion-item text-wrap>
             <h2>{{ field.dimtitle }}</h2>
-            <core-format-text [text]="field.description"></core-format-text>
+            <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text>
         </ion-item>
         <ion-item *ngIf="edit && field.grades">
             <ion-label [core-mark-required]="true" stacked>{{ 'addon.mod_workshop_assessment_accumulative.dimensiongradefor' | translate : {'$a': field.dimtitle } }}</ion-label>
@@ -23,7 +23,7 @@
         </ion-item>
         <ion-item *ngIf="!edit" text-wrap>
             <h2>{{ 'addon.mod_workshop_assessment_accumulative.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</h2>
-            <p><core-format-text [text]="selectedValues[n].peercomment"></core-format-text></p>
+            <p><core-format-text [text]="selectedValues[n].peercomment"  contextLevel="module" [contextInstanceId]="moduleId"></core-format-text></p>
         </ion-item>
     </ion-card>
 </ng-container>
diff --git a/src/addon/mod/workshop/assessment/comments/component/addon-mod-workshop-assessment-strategy-comments.html b/src/addon/mod/workshop/assessment/comments/component/addon-mod-workshop-assessment-strategy-comments.html
index 0eb9b23cb..c9f320a5c 100644
--- a/src/addon/mod/workshop/assessment/comments/component/addon-mod-workshop-assessment-strategy-comments.html
+++ b/src/addon/mod/workshop/assessment/comments/component/addon-mod-workshop-assessment-strategy-comments.html
@@ -2,7 +2,7 @@
     <ion-card *ngIf="n < assessment.form.dimenssionscount">
         <ion-item text-wrap>
             <h2>{{ field.dimtitle }}</h2>
-            <core-format-text [text]="field.description"></core-format-text>
+            <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text>
         </ion-item>
         <ion-item *ngIf="edit">
             <ion-label stacked [core-mark-required]="true">{{ 'addon.mod_workshop_assessment_comments.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</ion-label>
@@ -11,7 +11,7 @@
         </ion-item>
         <ion-item *ngIf="!edit" text-wrap>
             <h2>{{ 'addon.mod_workshop_assessment_comments.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</h2>
-            <p><core-format-text [text]="selectedValues[n].peercomment"></core-format-text></p>
+            <p><core-format-text [text]="selectedValues[n].peercomment" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text></p>
         </ion-item>
     </ion-card>
 </ng-container>
diff --git a/src/addon/mod/workshop/assessment/numerrors/component/addon-mod-workshop-assessment-strategy-numerrors.html b/src/addon/mod/workshop/assessment/numerrors/component/addon-mod-workshop-assessment-strategy-numerrors.html
index 925db72d1..0045b6c42 100644
--- a/src/addon/mod/workshop/assessment/numerrors/component/addon-mod-workshop-assessment-strategy-numerrors.html
+++ b/src/addon/mod/workshop/assessment/numerrors/component/addon-mod-workshop-assessment-strategy-numerrors.html
@@ -2,7 +2,7 @@
     <ion-card *ngIf="n < assessment.form.dimenssionscount">
         <ion-item text-wrap>
             <h2>{{ field.dimtitle }}</h2>
-            <core-format-text [text]="field.description"></core-format-text>
+            <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text>
         </ion-item>
         <ion-list radio-group [(ngModel)]="selectedValues[n].grade" [name]="'grade_' + n">
             <ion-item>
@@ -10,11 +10,11 @@
                 <core-input-errors item-content *ngIf="edit && fieldErrors['grade_' + n]" [errorText]="fieldErrors['grade_' + n]"></core-input-errors>
             </ion-item>
             <ion-item>
-                <ion-label><core-format-text [text]="field.grade0"></core-format-text></ion-label>
+                <ion-label><core-format-text [text]="field.grade0" [filter]="false"></core-format-text></ion-label>
                 <ion-radio [value]="-1" [disabled]="!edit"></ion-radio>
             </ion-item>
             <ion-item>
-                <ion-label><core-format-text [text]="field.grade1"></core-format-text></ion-label>
+                <ion-label><core-format-text [text]="field.grade1" [filter]="false"></core-format-text></ion-label>
                 <ion-radio [value]="1" [disabled]="!edit"></ion-radio>
             </ion-item>
         </ion-list>
@@ -24,7 +24,7 @@
         </ion-item>
         <ion-item *ngIf="!edit" text-wrap>
             <h2>{{ 'addon.mod_workshop_assessment_numerrors.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</h2>
-            <p><core-format-text [text]="selectedValues[n].peercomment"></core-format-text></p>
+            <p><core-format-text [text]="selectedValues[n].peercomment" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text></p>
         </ion-item>
     </ion-card>
 </ng-container>
diff --git a/src/addon/mod/workshop/assessment/rubric/component/addon-mod-workshop-assessment-strategy-rubric.html b/src/addon/mod/workshop/assessment/rubric/component/addon-mod-workshop-assessment-strategy-rubric.html
index 2d1f0be61..c141b87b8 100644
--- a/src/addon/mod/workshop/assessment/rubric/component/addon-mod-workshop-assessment-strategy-rubric.html
+++ b/src/addon/mod/workshop/assessment/rubric/component/addon-mod-workshop-assessment-strategy-rubric.html
@@ -2,12 +2,12 @@
     <ion-card *ngIf="n < assessment.form.dimenssionscount">
         <ion-item text-wrap>
             <h2 [core-mark-required]="edit">{{ field.dimtitle }}</h2>
-            <core-format-text [text]="field.description"></core-format-text>
+            <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text>
             <core-input-errors *ngIf="edit && fieldErrors['chosenlevelid_' + n]" [errorText]="fieldErrors['chosenlevelid_' + n]"></core-input-errors>
         </ion-item>
         <ion-list radio-group [(ngModel)]="selectedValues[n].chosenlevelid" [name]="'chosenlevelid_' + n">
             <ion-item *ngFor="let subfield of field.fields">
-                <ion-label><p><core-format-text [text]="subfield.definition"></core-format-text></p></ion-label>
+                <ion-label><p><core-format-text [text]="subfield.definition" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text></p></ion-label>
                 <ion-radio [value]="subfield.levelid" [disabled]="!edit"></ion-radio>
             </ion-item>
         </ion-list>
diff --git a/src/addon/mod/workshop/classes/assessment-strategy-component.ts b/src/addon/mod/workshop/classes/assessment-strategy-component.ts
index 22a6a1ae7..6fd909453 100644
--- a/src/addon/mod/workshop/classes/assessment-strategy-component.ts
+++ b/src/addon/mod/workshop/classes/assessment-strategy-component.ts
@@ -24,6 +24,7 @@ export class AddonModWorkshopAssessmentStrategyComponentBase {
     @Input() selectedValues: any[];
     @Input() fieldErrors: any;
     @Input() strategy: string;
+    @Input() moduleId: number;
 
     constructor() {
         // Nothing to do.
diff --git a/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html b/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
index e74d57ded..ea523e56f 100644
--- a/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
+++ b/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
@@ -28,7 +28,7 @@
                 </ion-select>
             </ion-item>
             <ion-item text-wrap *ngIf="!edit && data.assessment.feedbackauthor">
-                <core-format-text [component]="component" [componentId]="componentId" [text]="data.assessment.feedbackauthor"></core-format-text>
+                <core-format-text [component]="component" [componentId]="componentId" [text]="data.assessment.feedbackauthor" contextLevel="module" [contextInstanceId]="workshop.coursemodule"></core-format-text>
             </ion-item>
             <ion-item *ngIf="!edit && workshop.overallfeedbackfiles && data.assessment.feedbackattachmentfiles && data.assessment.feedbackattachmentfiles.length">
                 <div no-lines>
diff --git a/src/addon/mod/workshop/components/assessment-strategy/assessment-strategy.ts b/src/addon/mod/workshop/components/assessment-strategy/assessment-strategy.ts
index 668a7821c..646dba1f6 100644
--- a/src/addon/mod/workshop/components/assessment-strategy/assessment-strategy.ts
+++ b/src/addon/mod/workshop/components/assessment-strategy/assessment-strategy.ts
@@ -51,7 +51,8 @@ export class AddonModWorkshopAssessmentStrategyComponent implements OnInit {
         edit: false,
         selectedValues: [],
         fieldErrors: {},
-        strategy: ''
+        strategy: '',
+        moduleId: 0
     };
     assessmentStrategyLoaded = false;
     notSupported = false;
@@ -101,6 +102,7 @@ export class AddonModWorkshopAssessmentStrategyComponent implements OnInit {
         this.data.workshopId = this.workshop.id;
         this.data.edit = this.edit;
         this.data.strategy = this.strategy;
+        this.data.moduleId = this.workshop.coursemodule;
 
         this.componentClass = this.strategyDelegate.getComponentForPlugin(this.injector, this.strategy);
         if (this.componentClass) {
diff --git a/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
index 14631e93c..8030f7d36 100644
--- a/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -25,7 +25,7 @@
                 <ion-icon item-start name="checkmark-circle" color="success" *ngIf="task.completed == '1'"></ion-icon>
 
                 <h2>{{task.title}}</h2>
-                <p *ngIf="task.details"><core-format-text [text]="task.details"></core-format-text></p>
+                <p *ngIf="task.details">{{ task.details }}</p>
                 <ion-icon item-end *ngIf="task.link && task.code != 'submit'" name="open"></ion-icon>
             </a>
         </ng-container>
@@ -41,7 +41,7 @@
     <ion-card *ngIf="description && workshop && workshop.phase == workshopPhases.PHASE_SETUP">
         <ion-item text-wrap>
             <h2>{{ 'core.description' | translate }}</h2>
-            <core-format-text [text]="description" [component]="component" [componentId]="componentId"></core-format-text>
+            <core-format-text [text]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
         </ion-item>
     </ion-card>
 
@@ -51,7 +51,7 @@
             <ion-card *ngIf="workshop.conclusion">
                 <ion-item text-wrap>
                     <h2>{{ 'addon.mod_workshop.conclusion' | translate }}</h2>
-                    <core-format-text fullOnClick="true" [component]="component" [componentId]="workshop.cmid" [text]="workshop.conclusion"></core-format-text>
+                    <core-format-text fullOnClick="true" [component]="component" [componentId]="module.id" [text]="workshop.conclusion" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
                 </ion-item>
             </ion-card>
 
@@ -61,11 +61,11 @@
                 </ion-item-divider>
                 <ion-item text-wrap *ngIf="userGrades.submissionlongstrgrade">
                     <h2>{{ 'addon.mod_workshop.submissiongrade' | translate }}</h2>
-                    <core-format-text [text]="userGrades.submissionlongstrgrade"></core-format-text>
+                    {{ userGrades.submissionlongstrgrade }}
                 </ion-item>
                 <ion-item text-wrap *ngIf="userGrades.assessmentlongstrgrade">
                     <h2>{{ 'addon.mod_workshop.gradinggrade' | translate }}</h2>
-                    <core-format-text [text]="userGrades.assessmentlongstrgrade"></core-format-text>
+                    {{ userGrades.assessmentlongstrgrade }}
                 </ion-item>
             </ion-card>
         </ng-container>
@@ -74,7 +74,7 @@
         <ion-card *ngIf="workshop.phase == workshopPhases.PHASE_SUBMISSION && workshop.instructauthors">
             <ion-item text-wrap>
                 <h2>{{ 'addon.mod_workshop.areainstructauthors' | translate }}</h2>
-                <core-format-text fullOnClick="true" [component]="component" [componentId]="workshop.cmid" [text]="workshop.instructauthors"></core-format-text>
+                <core-format-text fullOnClick="true" [component]="component" [componentId]="module.id" [text]="workshop.instructauthors" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
             </ion-item>
         </ion-card>
 
@@ -122,7 +122,7 @@
             <ion-card *ngIf="workshop.phase == workshopPhases.PHASE_ASSESSMENT && workshop.instructreviewers">
                 <ion-item text-wrap>
                     <h2>{{ 'addon.mod_workshop.areainstructreviewers' | translate }}</h2>
-                    <core-format-text fullOnClick="true" [component]="component" [componentId]="workshop.cmid" [text]="workshop.instructreviewers"></core-format-text>
+                    <core-format-text fullOnClick="true" [component]="component" [componentId]="module.id" [text]="workshop.instructreviewers" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
                 </ion-item>
             </ion-card>
 
diff --git a/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html b/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html
index 7a3cf4d86..752d370b6 100644
--- a/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html
+++ b/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html
@@ -2,7 +2,7 @@
     <div *ngIf="!summary">
         <ion-list-header text-wrap>
             <ion-avatar core-user-avatar [user]="profile" [courseId]="courseId" [userId]="profile && profile.id" item-start></ion-avatar>
-            <h2>{{submission.title}}</h2>
+            <h2><core-format-text [text]="submission.title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></h2>
             <p *ngIf="profile && profile.fullname">{{profile.fullname}}</p>
             <p *ngIf="showGrade(submission.submissiongrade)" [class.addon-has-overriden-grade]="showGrade(submission.submissiongradeover)">
                 {{ 'addon.mod_workshop.submissiongradeof' | translate:{$a: workshop.grade } }}: {{submission.submissiongrade}}
@@ -23,7 +23,7 @@
             </ion-note>
         </ion-list-header>
         <ion-item text-wrap *ngIf="submission.content">
-            <core-format-text [component]="component" [componentId]="componentId" [text]="submission.content"></core-format-text>
+            <core-format-text [component]="component" [componentId]="componentId" [text]="submission.content" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
         </ion-item>
         <ion-item *ngFor="let attachment of submission.attachmentfiles">
             <!-- Files already attached to the submission. -->
@@ -35,7 +35,7 @@
             <ion-avatar *ngIf="evaluateByProfile" core-user-avatar [user]="evaluateByProfile" item-start [courseId]="courseId" [userId]="evaluateByProfile.id"></ion-avatar>
 
             <h2 *ngIf="evaluateByProfile && evaluateByProfile.fullname">{{ 'addon.mod_workshop.feedbackby' | translate : {$a: evaluateByProfile.fullname} }}</h2>
-            <core-format-text [text]="submission.feedbackauthor"></core-format-text>
+            <core-format-text [text]="submission.feedbackauthor" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
         </ion-item>
         <ion-item *ngIf="viewDetails">
             <button ion-button block (click)="gotoSubmission()">
@@ -48,7 +48,7 @@
     <a ion-item text-wrap *ngIf="summary" [attr.detail-none]="submission.timemodified ? null : true" (click)="gotoSubmission()">
         <ion-avatar core-user-avatar [user]="profile" item-start [courseId]="courseId" [userId]="profile && profile.id"></ion-avatar>
 
-        <h2>{{submission.title}}</h2>
+        <h2><core-format-text [text]="submission.title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></h2>
         <p *ngIf="profile && profile.fullname">{{profile.fullname}}</p>
         <p *ngIf="submission.reviewedbycount">
             {{ 'addon.mod_workshop.receivedgrades' | translate }}: {{submission.reviewedbycount}} / {{submission.reviewedby.length}}
diff --git a/src/addon/mod/workshop/pages/assessment/assessment.html b/src/addon/mod/workshop/pages/assessment/assessment.html
index ecc8b3fd3..f67a8f3ba 100644
--- a/src/addon/mod/workshop/pages/assessment/assessment.html
+++ b/src/addon/mod/workshop/pages/assessment/assessment.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="workshop && workshop.coursemodule"></core-format-text></ion-title>
         <ion-buttons end [hidden]="!evaluating">
             <button ion-button clear (click)="saveEvaluation()" [attr.aria-label]="'core.save' | translate">
                 {{ 'core.save' | translate }}
@@ -67,7 +67,7 @@
             <ion-item text-wrap>
                 <ion-avatar core-user-avatar *ngIf="evaluateGradingByProfile" [user]="evaluateGradingByProfile" item-start [courseId]="courseId" [userId]="evaluateGradingByProfile.id"></ion-avatar>
                 <h2 *ngIf="evaluateGradingByProfile && evaluateGradingByProfile.fullname">{{ 'addon.mod_workshop.feedbackby' | translate : {$a: evaluateGradingByProfile.fullname} }}</h2>
-                <core-format-text [text]="evaluate.text"></core-format-text>
+                <core-format-text [text]="evaluate.text" contextLevel="module" [contextInstanceId]="workshop.coursemodule"></core-format-text>
             </ion-item>
         </ion-list>
     </core-loading>
diff --git a/src/addon/mod/workshop/pages/edit-submission/edit-submission.html b/src/addon/mod/workshop/pages/edit-submission/edit-submission.html
index cbfb44ba1..c1530b1f2 100644
--- a/src/addon/mod/workshop/pages/edit-submission/edit-submission.html
+++ b/src/addon/mod/workshop/pages/edit-submission/edit-submission.html
@@ -24,7 +24,7 @@
                 <core-rich-text-editor item-content [control]="editForm.controls['content']" formControlName="content" [placeholder]="'addon.mod_workshop.submissioncontent' | translate"  name="content" [component]="component" [componentId]="componentId"></core-rich-text-editor>
             </ion-item>
 
-            <core-attachments *ngIf="fileAvailable" [files]="submission.attachmentfiles" [maxSize]="workshop.maxbytes" [maxSubmissions]="workshop.nattachments" [component]="component" [componentId]="workshop.cmid" allowOffline="true" [acceptedTypes]="workshop.submissionfiletypes" [required]="fileRequired"></core-attachments>
+            <core-attachments *ngIf="fileAvailable" [files]="submission.attachmentfiles" [maxSize]="workshop.maxbytes" [maxSubmissions]="workshop.nattachments" [component]="component" [componentId]="workshop.coursemodule" allowOffline="true" [acceptedTypes]="workshop.submissionfiletypes" [required]="fileRequired"></core-attachments>
         </form>
     </core-loading>
 </ion-content>
diff --git a/src/addon/mod/workshop/pages/index/index.html b/src/addon/mod/workshop/pages/index/index.html
index 83453a699..3498a1f71 100644
--- a/src/addon/mod/workshop/pages/index/index.html
+++ b/src/addon/mod/workshop/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/workshop/pages/phase/phase.html b/src/addon/mod/workshop/pages/phase/phase.html
index e9dbece27..855bc23f9 100644
--- a/src/addon/mod/workshop/pages/phase/phase.html
+++ b/src/addon/mod/workshop/pages/phase/phase.html
@@ -27,7 +27,7 @@
                 <ion-icon item-start name="checkmark-circle" color="success" *ngIf="task.completed == '1'"></ion-icon>
 
                 <h2 text-wrap>{{task.title}}</h2>
-                <p *ngIf="task.details"><core-format-text [text]="task.details"></core-format-text></p>
+                <p *ngIf="task.details" [innerHTML]="task.details"></p>
                 <ion-icon item-end *ngIf="task.link && task.code != 'submit'" name="open"></ion-icon>
             </a>
         </ng-container>
diff --git a/src/addon/mod/workshop/pages/submission/submission.html b/src/addon/mod/workshop/pages/submission/submission.html
index 70fdbb714..26f14be1c 100644
--- a/src/addon/mod/workshop/pages/submission/submission.html
+++ b/src/addon/mod/workshop/pages/submission/submission.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
         <ion-buttons end [hidden]="!loaded">
             <button *ngIf="assessmentId && access.assessingallowed" ion-button clear (click)="saveAssessment()" [attr.aria-label]="'core.save' | translate">
                 {{ 'core.save' | translate }}
@@ -38,7 +38,7 @@
             <ion-item text-wrap>
                 <ion-avatar core-user-avatar *ngIf="evaluateByProfile" [user]="evaluateByProfile" item-start [courseId]="courseId" [userId]="evaluateByProfile.id"></ion-avatar>
                 <h2 *ngIf="evaluateByProfile && evaluateByProfile.fullname">{{ 'addon.mod_workshop.feedbackby' | translate : {$a: evaluateByProfile.fullname} }}</h2>
-                <core-format-text [text]="evaluate.text"></core-format-text>
+                <core-format-text [text]="evaluate.text" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
             </ion-item>
         </ion-list>
 
@@ -97,7 +97,7 @@
             <ion-item text-wrap>
                 <ion-avatar core-user-avatar *ngIf="evaluateGradingByProfile" [user]="evaluateGradingByProfile" item-start [courseId]="courseId" [userId]="evaluateGradingByProfile.id"></ion-avatar>
                 <h2 *ngIf="evaluateGradingByProfile && evaluateGradingByProfile.fullname">{{ 'addon.mod_workshop.feedbackby' | translate : {$a: evaluateGradingByProfile.fullname} }}</h2>
-                <core-format-text [text]="assessment.feedbackreviewer"></core-format-text>
+                <core-format-text [text]="assessment.feedbackreviewer" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
             </ion-item>
         </ion-list>
     </core-loading>
diff --git a/src/addon/notes/components/list/addon-notes-list.html b/src/addon/notes/components/list/addon-notes-list.html
index a959b746f..903727ec3 100644
--- a/src/addon/notes/components/list/addon-notes-list.html
+++ b/src/addon/notes/components/list/addon-notes-list.html
@@ -53,9 +53,7 @@
                         <ion-icon name="trash"></ion-icon>
                     </button>
                 </ion-item>
-                <ion-item text-wrap>
-                    <core-format-text [clean]="true" [text]="note.content"></core-format-text>
-                </ion-item>
+                <ion-item text-wrap>{{ note.content }}</ion-item>
             </ion-card>
         </ion-list>
 
diff --git a/src/addon/notes/components/list/list.ts b/src/addon/notes/components/list/list.ts
index 57a9de314..843ff1c39 100644
--- a/src/addon/notes/components/list/list.ts
+++ b/src/addon/notes/components/list/list.ts
@@ -103,6 +103,10 @@ export class AddonNotesListComponent implements OnInit, OnDestroy {
             return this.notesProvider.getNotes(this.courseId, this.userId).then((notes) => {
                 const notesList: AddonNotesNoteFormatted[] = notes[this.type + 'notes'] || [];
 
+                notesList.forEach((note) => {
+                    note.content = this.textUtils.decodeHTML(note.content);
+                });
+
                 return this.notesProvider.setOfflineDeletedNotes(notesList, this.courseId).then((notesList) => {
 
                     this.hasOffline = notesList.some((note) => note.offline || note.deleted);
diff --git a/src/addon/notifications/pages/list/list.html b/src/addon/notifications/pages/list/list.html
index bd523d6ba..72b4cdce1 100644
--- a/src/addon/notifications/pages/list/list.html
+++ b/src/addon/notifications/pages/list/list.html
@@ -21,16 +21,16 @@
             <ion-item text-wrap>
                 <ion-avatar *ngIf="notification.useridfrom > 0" core-user-avatar [user]="notification" item-start [profileUrl]="notification.profileimageurlfrom" [fullname]="notification.userfromfullname" [userId]="notification.useridfrom" [extraIcon]="notification.iconurl"></ion-avatar>
                 <img *ngIf="notification.useridfrom <= 0 && notification.iconurl" [src]="notification.iconurl" alt="" role="presentation" class="core-notification-icon" item-start>
-                <h2><core-format-text [text]="notification.subject"></core-format-text></h2>
+                <h2>{{ notification.subject }}</h2>
                 <p><ion-note float-end padding-left text-end>
                         {{notification.timecreated | coreDateDayOrTime}}
                         <span *ngIf="!notification.timeread"><core-icon name="fa-circle" color="primary"></core-icon></span>
                     </ion-note>
                 </p>
-                <p *ngIf="notification.userfromfullname"><core-format-text [text]="notification.userfromfullname"></core-format-text></p>
+                <p *ngIf="notification.userfromfullname">{{ notification.userfromfullname }}</p>
             </ion-item>
             <ion-item text-wrap>
-                <p><core-format-text [text]="notification.mobiletext | coreCreateLinks"></core-format-text></p>
+                <p><core-format-text [text]="notification.mobiletext | coreCreateLinks" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></p>
             </ion-item>
             <addon-notifications-actions [contextUrl]="notification.contexturl" [courseId]="notification.courseid" [data]="notification.customdata"></addon-notifications-actions>
         </ion-card>
diff --git a/src/addon/notifications/pages/list/list.ts b/src/addon/notifications/pages/list/list.ts
index 2046b00bc..70342f5e3 100644
--- a/src/addon/notifications/pages/list/list.ts
+++ b/src/addon/notifications/pages/list/list.ts
@@ -40,6 +40,7 @@ export class AddonNotificationsListPage {
     loadMoreError = false;
     canMarkAllNotificationsAsRead = false;
     loadingMarkAllNotificationsAsRead = false;
+    siteHomeId: number;
 
     protected isCurrentView: boolean;
     protected cronObserver: CoreEventObserver;
@@ -51,6 +52,8 @@ export class AddonNotificationsListPage {
             private utils: CoreUtilsProvider, private notificationsProvider: AddonNotificationsProvider,
             private pushNotificationsDelegate: CorePushNotificationsDelegate,
             private notificationsHelper: AddonNotificationsHelperProvider) {
+
+        this.siteHomeId = sitesProvider.getCurrentSite().getSiteHomeId();
     }
 
     /**
diff --git a/src/addon/qbehaviour/deferredcbm/component/addon-qbehaviour-deferredcbm.html b/src/addon/qbehaviour/deferredcbm/component/addon-qbehaviour-deferredcbm.html
index 0975635c1..a141d0e03 100644
--- a/src/addon/qbehaviour/deferredcbm/component/addon-qbehaviour-deferredcbm.html
+++ b/src/addon/qbehaviour/deferredcbm/component/addon-qbehaviour-deferredcbm.html
@@ -4,9 +4,7 @@
     </ion-item>
     <div radio-group [(ngModel)]="question.behaviourCertaintySelected" [name]="question.behaviourCertaintyOptions[0].name">
         <ion-item text-wrap *ngFor="let option of question.behaviourCertaintyOptions">
-            <ion-label>
-                <core-format-text [component]="component" [componentId]="componentId" [text]="option.text"></core-format-text>
-            </ion-label>
+            <ion-label>{{ option.text }}</ion-label>
             <ion-radio id="{{option.id}}" [value]="option.value" [disabled]="option.disabled"></ion-radio>
         </ion-item>
     </div>
diff --git a/src/addon/qbehaviour/deferredcbm/component/deferredcbm.ts b/src/addon/qbehaviour/deferredcbm/component/deferredcbm.ts
index d85eccf09..dcb4c1310 100644
--- a/src/addon/qbehaviour/deferredcbm/component/deferredcbm.ts
+++ b/src/addon/qbehaviour/deferredcbm/component/deferredcbm.ts
@@ -27,6 +27,8 @@ export class AddonQbehaviourDeferredCBMComponent {
     @Input() componentId: number; // ID of the component the question belongs to.
     @Input() attemptId: number; // Attempt ID.
     @Input() offlineEnabled?: boolean | string; // Whether the question can be answered in offline.
+    @Input() contextLevel?: string; // The context level.
+    @Input() contextInstanceId?: number; // The instance ID related to the context.
     @Output() buttonClicked: EventEmitter<any>; // Should emit an event when a behaviour button is clicked.
     @Output() onAbort: EventEmitter<void>; // Should emit an event if the question should be aborted.
 
diff --git a/src/addon/qbehaviour/informationitem/component/informationitem.ts b/src/addon/qbehaviour/informationitem/component/informationitem.ts
index 3842fca29..aaa44569e 100644
--- a/src/addon/qbehaviour/informationitem/component/informationitem.ts
+++ b/src/addon/qbehaviour/informationitem/component/informationitem.ts
@@ -27,6 +27,8 @@ export class AddonQbehaviourInformationItemComponent {
     @Input() componentId: number; // ID of the component the question belongs to.
     @Input() attemptId: number; // Attempt ID.
     @Input() offlineEnabled?: boolean | string; // Whether the question can be answered in offline.
+    @Input() contextLevel?: string; // The context level.
+    @Input() contextInstanceId?: number; // The instance ID related to the context.
     @Output() buttonClicked: EventEmitter<any>; // Should emit an event when a behaviour button is clicked.
     @Output() onAbort: EventEmitter<void>; // Should emit an event if the question should be aborted.
 
diff --git a/src/addon/qtype/calculated/component/addon-qtype-calculated.html b/src/addon/qtype/calculated/component/addon-qtype-calculated.html
index e2ea63c89..beb823202 100644
--- a/src/addon/qtype/calculated/component/addon-qtype-calculated.html
+++ b/src/addon/qtype/calculated/component/addon-qtype-calculated.html
@@ -1,6 +1,6 @@
 <section ion-list class="addon-qtype-calculated-container" *ngIf="question.text || question.text === ''">
     <ion-item text-wrap>
-        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text"></core-format-text></p>
+        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
     </ion-item>
 
     <!-- Display unit options before the answer input. -->
@@ -55,9 +55,7 @@
 <ng-template #radioUnits>
     <div radio-group [(ngModel)]="question.unit" [name]="question.optionsName">
         <ion-item text-wrap *ngFor="let option of question.options">
-            <ion-label>
-                <core-format-text [component]="component" [componentId]="componentId" [text]="option.text"></core-format-text>
-            </ion-label>
+            <ion-label>{{ option.text }}</ion-label>
             <ion-radio [value]="option.value" [disabled]="option.disabled || question.input.readOnly" [color]="question.input.correctIconColor"></ion-radio>
         </ion-item>
 
diff --git a/src/addon/qtype/ddimageortext/component/addon-qtype-ddimageortext.html b/src/addon/qtype/ddimageortext/component/addon-qtype-ddimageortext.html
index 218b25b24..e1e79fdc3 100644
--- a/src/addon/qtype/ddimageortext/component/addon-qtype-ddimageortext.html
+++ b/src/addon/qtype/ddimageortext/component/addon-qtype-ddimageortext.html
@@ -7,7 +7,7 @@
             <ion-icon name="information-circle"></ion-icon>
             {{ 'core.question.howtodraganddrop' | translate }}
         </p>
-        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text"></core-format-text></p>
-        <core-format-text *ngIf="question.ddArea" [adaptImg]="false" [component]="component" [componentId]="componentId" [text]="question.ddArea" (afterRender)="questionRendered()"></core-format-text>
+        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
+        <core-format-text *ngIf="question.ddArea" [adaptImg]="false" [component]="component" [componentId]="componentId" [text]="question.ddArea" [filter]="false" (afterRender)="questionRendered()"></core-format-text>
     </ion-item>
 </section>
diff --git a/src/addon/qtype/ddmarker/component/addon-qtype-ddmarker.html b/src/addon/qtype/ddmarker/component/addon-qtype-ddmarker.html
index 199abc85d..58763a33e 100644
--- a/src/addon/qtype/ddmarker/component/addon-qtype-ddmarker.html
+++ b/src/addon/qtype/ddmarker/component/addon-qtype-ddmarker.html
@@ -7,7 +7,7 @@
             <ion-icon name="information-circle"></ion-icon>
             {{ 'core.question.howtodraganddrop' | translate }}
         </p>
-        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" #questiontext></core-format-text></p>
-        <core-format-text *ngIf="question.ddArea" [adaptImg]="false" [component]="component" [componentId]="componentId" [text]="question.ddArea" (afterRender)="questionRendered()"></core-format-text>
+        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" #questiontext [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
+        <core-format-text *ngIf="question.ddArea" [adaptImg]="false" [component]="component" [componentId]="componentId" [text]="question.ddArea" [filter]="false" (afterRender)="questionRendered()"></core-format-text>
     </ion-item>
 </section>
diff --git a/src/addon/qtype/ddwtos/component/addon-qtype-ddwtos.html b/src/addon/qtype/ddwtos/component/addon-qtype-ddwtos.html
index 67c15fdfd..ae2f63831 100644
--- a/src/addon/qtype/ddwtos/component/addon-qtype-ddwtos.html
+++ b/src/addon/qtype/ddwtos/component/addon-qtype-ddwtos.html
@@ -7,8 +7,8 @@
             <ion-icon name="information-circle"></ion-icon>
             {{ 'core.question.howtodraganddrop' | translate }}
         </p>
-        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" #questiontext></core-format-text></p>
-        <core-format-text *ngIf="question.answers" [component]="component" [componentId]="componentId" [text]="question.answers" (afterRender)="questionRendered()"></core-format-text>
+        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" #questiontext></core-format-text></p>
+        <core-format-text *ngIf="question.answers" [component]="component" [componentId]="componentId" [text]="question.answers" [filter]="false" (afterRender)="questionRendered()"></core-format-text>
         <div class="drags"></div>
     </ion-item>
 </section>
diff --git a/src/addon/qtype/ddwtos/component/ddwtos.ts b/src/addon/qtype/ddwtos/component/ddwtos.ts
index b144a4013..83190e29e 100644
--- a/src/addon/qtype/ddwtos/component/ddwtos.ts
+++ b/src/addon/qtype/ddwtos/component/ddwtos.ts
@@ -95,7 +95,8 @@ export class AddonQtypeDdwtosComponent extends CoreQuestionBaseComponent impleme
                 this.questionInstance = new AddonQtypeDdwtosQuestion(this.loggerProvider, this.domUtils, this.element,
                         this.question, this.question.readOnly, this.inputIds, this.textUtils);
 
-                this.questionHelper.treatCorrectnessIconsClicks(this.element, this.component, this.componentId);
+                this.questionHelper.treatCorrectnessIconsClicks(this.element, this.component, this.componentId, this.contextLevel,
+                        this.contextInstanceId);
 
                 this.question.loaded = true;
             });
diff --git a/src/addon/qtype/description/component/addon-qtype-description.html b/src/addon/qtype/description/component/addon-qtype-description.html
index 74d4f190d..3b54888e9 100644
--- a/src/addon/qtype/description/component/addon-qtype-description.html
+++ b/src/addon/qtype/description/component/addon-qtype-description.html
@@ -2,6 +2,6 @@
     <!-- "Seen" hidden input -->
     <input *ngIf="question.seenInput" type="hidden" [name]="question.seenInput.name" [value]="question.seenInput.value" >
     <ion-item text-wrap class="item item-text-wrap">
-        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text"></core-format-text></p>
+        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
     </ion-item>
 </section>
diff --git a/src/addon/qtype/essay/component/addon-qtype-essay.html b/src/addon/qtype/essay/component/addon-qtype-essay.html
index ec4293251..b8df1320e 100644
--- a/src/addon/qtype/essay/component/addon-qtype-essay.html
+++ b/src/addon/qtype/essay/component/addon-qtype-essay.html
@@ -1,7 +1,7 @@
 <section ion-list *ngIf="question.text || question.text === ''">
     <!-- Question text. -->
     <ion-item text-wrap>
-        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text"></core-format-text></p>
+        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
     </ion-item>
 
     <!-- Textarea. -->
@@ -20,7 +20,7 @@
             <p class="core-question-warning">{{ 'core.question.errorinlinefilesnotsupported' | translate }}</p>
         </ion-item>
         <ion-item text-wrap>
-            <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.textarea.text"></core-format-text></p>
+            <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.textarea.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
         </ion-item>
     </ng-container>
 
@@ -31,7 +31,7 @@
 
     <!-- Answer to the question and attachments (reviewing). -->
     <ion-item text-wrap *ngIf="!question.textarea && (question.answer || (!question.attachments.length && !question.allowsAttachments))">
-        <p><core-format-text [ngClass]='{"core-monospaced": question.isMonospaced}' [component]="component" [componentId]="componentId" [text]="question.answer"></core-format-text></p>
+        <p><core-format-text [ngClass]='{"core-monospaced": question.isMonospaced}' [component]="component" [componentId]="componentId" [text]="question.answer" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
     </ion-item>
 
     <ion-item *ngIf="!question.textarea && question.attachments && question.attachments.length">
diff --git a/src/addon/qtype/gapselect/component/addon-qtype-gapselect.html b/src/addon/qtype/gapselect/component/addon-qtype-gapselect.html
index 70efb95b7..099c6d926 100644
--- a/src/addon/qtype/gapselect/component/addon-qtype-gapselect.html
+++ b/src/addon/qtype/gapselect/component/addon-qtype-gapselect.html
@@ -1,5 +1,5 @@
 <section ion-list class="addon-qtype-gapselect-container" *ngIf="question.text || question.text === ''">
     <ion-item text-wrap>
-        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" (afterRender)="questionRendered()"></core-format-text></p>
+        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" (afterRender)="questionRendered()"></core-format-text></p>
     </ion-item>
 </section>
diff --git a/src/addon/qtype/gapselect/component/gapselect.ts b/src/addon/qtype/gapselect/component/gapselect.ts
index 34de237db..2faa3ada4 100644
--- a/src/addon/qtype/gapselect/component/gapselect.ts
+++ b/src/addon/qtype/gapselect/component/gapselect.ts
@@ -44,6 +44,7 @@ export class AddonQtypeGapSelectComponent extends CoreQuestionBaseComponent impl
      * The question has been rendered.
      */
     questionRendered(): void {
-        this.questionHelper.treatCorrectnessIconsClicks(this.element, this.component, this.componentId);
+        this.questionHelper.treatCorrectnessIconsClicks(this.element, this.component, this.componentId, this.contextLevel,
+                this.contextInstanceId);
     }
 }
diff --git a/src/addon/qtype/match/component/addon-qtype-match.html b/src/addon/qtype/match/component/addon-qtype-match.html
index 95bed5ddc..2f48f297d 100644
--- a/src/addon/qtype/match/component/addon-qtype-match.html
+++ b/src/addon/qtype/match/component/addon-qtype-match.html
@@ -1,12 +1,12 @@
 <section ion-list class="addon-qtype-match-container" *ngIf="question.loaded">
     <ion-item text-wrap>
-        <core-format-text [component]="component" [componentId]="componentId" [text]="question.text"></core-format-text>
+        <core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text>
     </ion-item>
     <ion-item text-wrap *ngFor="let row of question.rows">
         <ion-grid item-content no-margin no-padding>
             <ion-row no-margin>
                 <ion-col>
-                    <p><core-format-text id="addon-qtype-match-question-{{row.id}}" [component]="component" [componentId]="componentId" [text]="row.text"></core-format-text></p>
+                    <p><core-format-text id="addon-qtype-match-question-{{row.id}}" [component]="component" [componentId]="componentId" [text]="row.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
                 </ion-col>
                 <ion-col>
                     <label class="accesshide" for="{{row.id}}" *ngIf="row.accessibilityLabel">{{ row.accessibilityLabel }}</label>
diff --git a/src/addon/qtype/multianswer/component/addon-qtype-multianswer.html b/src/addon/qtype/multianswer/component/addon-qtype-multianswer.html
index 74bc91da4..68b989b11 100644
--- a/src/addon/qtype/multianswer/component/addon-qtype-multianswer.html
+++ b/src/addon/qtype/multianswer/component/addon-qtype-multianswer.html
@@ -1,5 +1,5 @@
 <section ion-list class="addon-qtype-multianswer-container" *ngIf="question.text || question.text === ''">
     <ion-item text-wrap>
-        <core-format-text [component]="component" [componentId]="componentId" [text]="question.text" (afterRender)="questionRendered()"></core-format-text>
+        <core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" (afterRender)="questionRendered()"></core-format-text>
     </ion-item>
 </section>
diff --git a/src/addon/qtype/multianswer/component/multianswer.ts b/src/addon/qtype/multianswer/component/multianswer.ts
index 5fa7ce6ca..d19750434 100644
--- a/src/addon/qtype/multianswer/component/multianswer.ts
+++ b/src/addon/qtype/multianswer/component/multianswer.ts
@@ -44,6 +44,7 @@ export class AddonQtypeMultiAnswerComponent extends CoreQuestionBaseComponent im
      * The question has been rendered.
      */
     questionRendered(): void {
-        this.questionHelper.treatCorrectnessIconsClicks(this.element, this.component, this.componentId);
+        this.questionHelper.treatCorrectnessIconsClicks(this.element, this.component, this.componentId, this.contextLevel,
+                this.contextInstanceId);
     }
 }
diff --git a/src/addon/qtype/multichoice/component/addon-qtype-multichoice.html b/src/addon/qtype/multichoice/component/addon-qtype-multichoice.html
index 56ac05cc3..2914b227a 100644
--- a/src/addon/qtype/multichoice/component/addon-qtype-multichoice.html
+++ b/src/addon/qtype/multichoice/component/addon-qtype-multichoice.html
@@ -1,16 +1,16 @@
 <section ion-list *ngIf="question.text || question.text === ''">
     <!-- Question text first. -->
     <ion-item text-wrap>
-        <core-format-text [component]="component" [componentId]="componentId" [text]="question.text"></core-format-text>
-        <core-format-text [component]="component" [componentId]="componentId" [text]="question.prompt" *ngIf="question.prompt"></core-format-text>
+        <core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text>
+        <span *ngIf="question.prompt">{{ question.prompt }}</span>
     </ion-item>
 
     <!-- Checkbox for multiple choice. -->
     <ng-container *ngIf="question.multi">
         <ion-item text-wrap *ngFor="let option of question.options">
             <ion-label [color]='(option.isCorrect === 1 ? "success": "") +  (option.isCorrect === 0 ? "danger": "")'>
-                <core-format-text [component]="component" [componentId]="componentId" [text]="option.text"></core-format-text>
-                <div *ngIf="option.feedback" class="specificfeedback"><core-format-text [component]="component" [componentId]="componentId" [text]="option.feedback"></core-format-text></div>
+                <core-format-text [component]="component" [componentId]="componentId" [text]="option.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text>
+                <div *ngIf="option.feedback" class="specificfeedback"><core-format-text [component]="component" [componentId]="componentId" [text]="option.feedback" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></div>
             </ion-label>
             <ion-checkbox [attr.name]="option.name" [(ngModel)]="option.checked" [disabled]="option.disabled" item-end [color]='(option.isCorrect === 1 ? "success": "") +  (option.isCorrect === 0 ? "danger": "")'></ion-checkbox>
             <core-icon item-content *ngIf="option.isCorrect === 1" class="core-correct-icon" name="fa-check" color="success"></core-icon>
@@ -25,8 +25,8 @@
     <div *ngIf="!question.multi" radio-group [(ngModel)]="question.singleChoiceModel" [name]="question.optionsName">
         <ion-item text-wrap *ngFor="let option of question.options">
             <ion-label>
-                <core-format-text [component]="component" [componentId]="componentId" [text]="option.text"></core-format-text>
-                <div *ngIf="option.feedback" class="specificfeedback"><core-format-text [component]="component" [componentId]="componentId" [text]="option.feedback"></core-format-text></div>
+                <core-format-text [component]="component" [componentId]="componentId" [text]="option.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text>
+                <div *ngIf="option.feedback" class="specificfeedback"><core-format-text [component]="component" [componentId]="componentId" [text]="option.feedback" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></div>
             </ion-label>
             <ion-radio [value]="option.value" [disabled]="option.disabled" [color]='(option.isCorrect === 1 ? "success": "") +  (option.isCorrect === 0 ? "danger": "")'></ion-radio>
             <core-icon item-content *ngIf="option.isCorrect === 1" class="core-correct-icon" name="fa-check" color="success"></core-icon>
diff --git a/src/addon/qtype/shortanswer/component/addon-qtype-shortanswer.html b/src/addon/qtype/shortanswer/component/addon-qtype-shortanswer.html
index 42febebf0..ee269de08 100644
--- a/src/addon/qtype/shortanswer/component/addon-qtype-shortanswer.html
+++ b/src/addon/qtype/shortanswer/component/addon-qtype-shortanswer.html
@@ -1,6 +1,6 @@
 <section ion-list *ngIf="question.text || question.text === ''">
     <ion-item text-wrap class="addon-qtype-shortanswer-text">
-        <core-format-text [component]="component" [componentId]="componentId" [text]="question.text"></core-format-text>
+        <core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text>
     </ion-item>
     <ion-item *ngIf="!question.input.isInline" text-wrap ngClass="core-{{question.input.correctIconColor}}-item">
         <ion-label stacked>{{ 'addon.mod_quiz.answercolon' | translate }}</ion-label>
diff --git a/src/addon/userprofilefield/checkbox/component/checkbox.ts b/src/addon/userprofilefield/checkbox/component/checkbox.ts
index 0212563d4..80a8143ab 100644
--- a/src/addon/userprofilefield/checkbox/component/checkbox.ts
+++ b/src/addon/userprofilefield/checkbox/component/checkbox.ts
@@ -28,6 +28,8 @@ export class AddonUserProfileFieldCheckboxComponent implements OnInit {
     @Input() edit = false; // True if editing the field. Defaults to false.
     @Input() disabled = false; // True if disabled. Defaults to false.
     @Input() form: FormGroup; // Form where to add the form control.
+    @Input() contextLevel?: string; // The context level.
+    @Input() contextInstanceId?: number; // The instance ID related to the context.
 
     constructor(private fb: FormBuilder, protected utils: CoreUtilsProvider) { }
 
diff --git a/src/addon/userprofilefield/datetime/component/datetime.ts b/src/addon/userprofilefield/datetime/component/datetime.ts
index e1b287627..a9b66bf1f 100644
--- a/src/addon/userprofilefield/datetime/component/datetime.ts
+++ b/src/addon/userprofilefield/datetime/component/datetime.ts
@@ -30,6 +30,8 @@ export class AddonUserProfileFieldDatetimeComponent implements OnInit {
     @Input() edit = false; // True if editing the field. Defaults to false.
     @Input() disabled = false; // True if disabled. Defaults to false.
     @Input() form?: FormGroup; // Form where to add the form control.
+    @Input() contextLevel?: string; // The context level.
+    @Input() contextInstanceId?: number; // The instance ID related to the context.
 
     constructor(private fb: FormBuilder, private timeUtils: CoreTimeUtilsProvider, protected utils: CoreUtilsProvider,
             private translate: TranslateService) { }
diff --git a/src/addon/userprofilefield/menu/component/addon-user-profile-field-menu.html b/src/addon/userprofilefield/menu/component/addon-user-profile-field-menu.html
index dcde5daa8..d46a4dbd6 100644
--- a/src/addon/userprofilefield/menu/component/addon-user-profile-field-menu.html
+++ b/src/addon/userprofilefield/menu/component/addon-user-profile-field-menu.html
@@ -1,7 +1,7 @@
 <!-- Render (no edit). -->
 <ion-item *ngIf="!edit && field && field.name">
     <h2>{{ field.name }}</h2>
-    <p><core-format-text [text]="field.value"></core-format-text></p>
+    <p><core-format-text [text]="field.value" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
 </ion-item>
 <!-- Edit. -->
 <ion-item *ngIf="edit && field && field.shortname" text-wrap [formGroup]="form">
diff --git a/src/addon/userprofilefield/menu/component/menu.ts b/src/addon/userprofilefield/menu/component/menu.ts
index 59642861a..89f82faa0 100644
--- a/src/addon/userprofilefield/menu/component/menu.ts
+++ b/src/addon/userprofilefield/menu/component/menu.ts
@@ -27,6 +27,8 @@ export class AddonUserProfileFieldMenuComponent implements OnInit {
     @Input() edit = false; // True if editing the field. Defaults to false.
     @Input() disabled = false; // True if disabled. Defaults to false.
     @Input() form?: FormGroup; // Form where to add the form control.
+    @Input() contextLevel?: string; // The context level.
+    @Input() contextInstanceId?: number; // The instance ID related to the context.
 
     constructor(private fb: FormBuilder) { }
 
diff --git a/src/addon/userprofilefield/text/component/addon-user-profile-field-text.html b/src/addon/userprofilefield/text/component/addon-user-profile-field-text.html
index 1ca1a727d..5c9a460eb 100644
--- a/src/addon/userprofilefield/text/component/addon-user-profile-field-text.html
+++ b/src/addon/userprofilefield/text/component/addon-user-profile-field-text.html
@@ -1,7 +1,7 @@
 <!-- Render (no edit). -->
 <ion-item *ngIf="!edit && field && field.name">
     <h2>{{ field.name }}</h2>
-    <p><core-format-text [text]="field.value"></core-format-text></p>
+    <p><core-format-text [text]="field.value" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
 </ion-item>
 <!-- Edit. -->
 <ion-item *ngIf="edit && field && field.shortname" text-wrap [formGroup]="form">
diff --git a/src/addon/userprofilefield/text/component/text.ts b/src/addon/userprofilefield/text/component/text.ts
index 089a58bb0..c25ff38d9 100644
--- a/src/addon/userprofilefield/text/component/text.ts
+++ b/src/addon/userprofilefield/text/component/text.ts
@@ -28,6 +28,8 @@ export class AddonUserProfileFieldTextComponent implements OnInit {
     @Input() edit = false; // True if editing the field. Defaults to false.
     @Input() disabled = false; // True if disabled. Defaults to false.
     @Input() form?: FormGroup; // Form where to add the form control.
+    @Input() contextLevel?: string; // The context level.
+    @Input() contextInstanceId?: number; // The instance ID related to the context.
 
     constructor(private fb: FormBuilder, protected utils: CoreUtilsProvider) { }
 
diff --git a/src/addon/userprofilefield/textarea/component/addon-user-profile-field-textarea.html b/src/addon/userprofilefield/textarea/component/addon-user-profile-field-textarea.html
index 4a993015b..a9e60d41d 100644
--- a/src/addon/userprofilefield/textarea/component/addon-user-profile-field-textarea.html
+++ b/src/addon/userprofilefield/textarea/component/addon-user-profile-field-textarea.html
@@ -1,7 +1,7 @@
 <!-- Render (no edit). -->
 <ion-item *ngIf="!edit && field && field.name">
     <h2>{{ field.name }}</h2>
-    <p><core-format-text [text]="field.value"></core-format-text></p>
+    <p><core-format-text [text]="field.value" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
 </ion-item>
 <!-- Edit. -->
 <ion-item *ngIf="edit && field && field.shortname" text-wrap [formGroup]="form">
diff --git a/src/addon/userprofilefield/textarea/component/textarea.ts b/src/addon/userprofilefield/textarea/component/textarea.ts
index 79919bd35..475e1e717 100644
--- a/src/addon/userprofilefield/textarea/component/textarea.ts
+++ b/src/addon/userprofilefield/textarea/component/textarea.ts
@@ -27,6 +27,8 @@ export class AddonUserProfileFieldTextareaComponent implements OnInit {
     @Input() edit = false; // True if editing the field. Defaults to false.
     @Input() disabled = false; // True if disabled. Defaults to false.
     @Input() form?: FormGroup; // Form where to add the form control.
+    @Input() contextLevel?: string; // The context level.
+    @Input() contextInstanceId?: number; // The instance ID related to the context.
 
     control: FormControl;
 
diff --git a/src/components/context-menu/core-context-menu-popover.html b/src/components/context-menu/core-context-menu-popover.html
index 69ffdadf7..76a6b96d1 100644
--- a/src/components/context-menu/core-context-menu-popover.html
+++ b/src/components/context-menu/core-context-menu-popover.html
@@ -2,7 +2,7 @@
     <ion-list-header *ngIf="title">{{title}}</ion-list-header>
     <a ion-item text-wrap *ngFor="let item of items" core-link [capture]="item.captureLink" [autoLogin]="item.autoLogin" [href]="item.href" (click)="itemClicked($event, item)" [attr.aria-label]="item.ariaAction" [hidden]="item.hidden" [attr.detail-none]="!item.href || item.iconAction" role="menuitem">
         <core-icon *ngIf="item.iconDescription" [name]="item.iconDescription" [label]="item.ariaDescription" item-start></core-icon>
-        <core-format-text [clean]="true" [text]="item.content"></core-format-text>
+        <core-format-text [clean]="true" [text]="item.content" [filter]="false"></core-format-text>
         <core-icon *ngIf="(item.href || item.action) && item.iconAction && item.iconAction != 'spinner'" [name]="item.iconAction" [slash]="item.iconSlash" item-end></core-icon>
         <ion-spinner *ngIf="(item.href || item.action) && item.iconAction == 'spinner'" item-end></ion-spinner>
         <ion-badge class="{{item.badgeClass}}" item-end *ngIf="item.badge">{{item.badge}}</ion-badge>
diff --git a/src/components/course-picker-menu/core-course-picker-menu-popover.html b/src/components/course-picker-menu/core-course-picker-menu-popover.html
index 6eea11d5e..ebfa0f52a 100644
--- a/src/components/course-picker-menu/core-course-picker-menu-popover.html
+++ b/src/components/course-picker-menu/core-course-picker-menu-popover.html
@@ -1,6 +1,6 @@
 <ion-list radio-group [(ngModel)]="courseId">
     <ion-item text-wrap *ngFor="let course of courses" >
-        <ion-label><core-format-text [text]="course.fullname"></core-format-text></ion-label>
+        <ion-label><core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="courseId"></core-format-text></ion-label>
         <ion-radio value="{{course.id}}" (ionSelect)="coursePicked($event, course)" ></ion-radio>
     </ion-item>
 </ion-list>
\ No newline at end of file
diff --git a/src/components/navigation-bar/navigation-bar.ts b/src/components/navigation-bar/navigation-bar.ts
index b5c2b0b42..5a38d49a0 100644
--- a/src/components/navigation-bar/navigation-bar.ts
+++ b/src/components/navigation-bar/navigation-bar.ts
@@ -35,6 +35,8 @@ export class CoreNavigationBarComponent {
     @Input() title?: string; // Title to show when seeing the info (new page).
     @Input() component?: string; // Component the bar belongs to.
     @Input() componentId?: number; // Component ID.
+    @Input() contextLevel?: string; // The context level.
+    @Input() contextInstanceId?: number; // The instance ID related to the context.
     @Output() action?: EventEmitter<any>; // Function to call when an arrow is clicked. Will receive as a param the item to load.
 
     constructor(private textUtils: CoreTextUtilsProvider) {
@@ -42,6 +44,7 @@ export class CoreNavigationBarComponent {
     }
 
     showInfo(): void {
-        this.textUtils.expandText(this.title, this.info, this.component, this.componentId);
+        this.textUtils.expandText(this.title, this.info, this.component, this.componentId, [], true, this.contextLevel,
+                this.contextInstanceId);
     }
 }
diff --git a/src/components/site-picker/site-picker.ts b/src/components/site-picker/site-picker.ts
index e58dfda86..c0ca1d6e1 100644
--- a/src/components/site-picker/site-picker.ts
+++ b/src/components/site-picker/site-picker.ts
@@ -15,7 +15,7 @@
 import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { CoreSitesProvider } from '@providers/sites';
-import { CoreTextUtilsProvider } from '@providers/utils/text';
+import { CoreFilterProvider } from '@core/filter/providers/filter';
 
 /**
  * Component to display a site selector. It will display a select with the list of sites. If the selected site changes,
@@ -36,7 +36,7 @@ export class CoreSitePickerComponent implements OnInit {
     sites: any[];
 
     constructor(private translate: TranslateService, private sitesProvider: CoreSitesProvider,
-        private textUtils: CoreTextUtilsProvider) {
+            private filterProvider: CoreFilterProvider) {
         this.siteSelected = new EventEmitter();
     }
 
@@ -49,7 +49,8 @@ export class CoreSitePickerComponent implements OnInit {
 
             sites.forEach((site: any) => {
                 // Format the site name.
-                promises.push(this.textUtils.formatText(site.siteName, true, true).catch(() => {
+                promises.push(this.filterProvider.getFiltersAndFormatText(site.siteName, 'system', site.siteHomeId,
+                        {clean: true, singleLine: true}, site.getId()).catch(() => {
                     return site.siteName;
                 }).then((formatted) => {
                     site.fullNameAndSiteName = this.translate.instant('core.fullnameandsitename',
diff --git a/src/core/block/components/only-title-block/core-block-only-title.html b/src/core/block/components/only-title-block/core-block-only-title.html
index 358fbde44..287592371 100644
--- a/src/core/block/components/only-title-block/core-block-only-title.html
+++ b/src/core/block/components/only-title-block/core-block-only-title.html
@@ -1,3 +1,3 @@
 <ion-item-divider text-wrap detail-push (click)="gotoBlock($event)">
-    <h2><core-format-text [text]="title | translate"></core-format-text></h2>
+    <h2>{{ title | translate }}</h2>
 </ion-item-divider>
\ No newline at end of file
diff --git a/src/core/block/components/pre-rendered-block/core-block-pre-rendered.html b/src/core/block/components/pre-rendered-block/core-block-pre-rendered.html
index 84cf2ac52..4b3f46315 100644
--- a/src/core/block/components/pre-rendered-block/core-block-pre-rendered.html
+++ b/src/core/block/components/pre-rendered-block/core-block-pre-rendered.html
@@ -1,11 +1,11 @@
 <ion-item-divider text-wrap *ngIf="title">
-    <h2><core-format-text [text]="title | translate"></core-format-text></h2>
+    <h2><core-format-text [text]="title | translate" contextLevel="block" [contextInstanceId]="block.instanceid"></core-format-text></h2>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" class="core-loading-center">
     <ion-item *ngIf="block.contents.content" text-wrap class="core-block-content">
-        <core-format-text [text]="block.contents.content"></core-format-text>
+        <core-format-text [text]="block.contents.content" contextLevel="block" [contextInstanceId]="block.instanceid"></core-format-text>
     </ion-item>
     <ion-item *ngIf="block.contents.footer" text-wrap class="core-block-footer">
-        <core-format-text [text]="block.contents.footer"></core-format-text>
+        <core-format-text [text]="block.contents.footer" contextLevel="block" [contextInstanceId]="block.instanceid"></core-format-text>
     </ion-item>
 </core-loading>
diff --git a/src/core/comments/pages/viewer/viewer.html b/src/core/comments/pages/viewer/viewer.html
index 2a023a419..dc24b1acc 100644
--- a/src/core/comments/pages/viewer/viewer.html
+++ b/src/core/comments/pages/viewer/viewer.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" [contextLevel]="contextLevel" [contextInstanceId]="instanceId"></core-format-text></ion-title>
         <ion-buttons end>
             <button *ngIf="canDeleteComments" item-end ion-button icon-only clear (click)="toggleDelete($event)" [attr.aria-label]="'core.delete' | translate">
                 <ion-icon name="create" ios="md-create"></ion-icon>
@@ -36,7 +36,7 @@
                 </button>
             </ion-item>
             <ion-item text-wrap>
-                <core-format-text clean="true" [text]="offlineComment.content"></core-format-text>
+                <core-format-text clean="true" [text]="offlineComment.content" [contextLevel]="contextLevel" [contextInstanceId]="instanceId"></core-format-text>
             </ion-item>
         </ion-card>
 
@@ -56,7 +56,7 @@
                 </button>
             </ion-item>
             <ion-item text-wrap>
-                <core-format-text clean="true" [text]="comment.content"></core-format-text>
+                <core-format-text clean="true" [text]="comment.content" [contextLevel]="contextLevel" [contextInstanceId]="instanceId"></core-format-text>
             </ion-item>
         </ion-card>
 
diff --git a/src/core/contentlinks/pages/choose-site/choose-site.html b/src/core/contentlinks/pages/choose-site/choose-site.html
index c6a401175..198304584 100644
--- a/src/core/contentlinks/pages/choose-site/choose-site.html
+++ b/src/core/contentlinks/pages/choose-site/choose-site.html
@@ -15,7 +15,7 @@
                     <img [src]="site.avatar" core-external-content [siteId]="site.id" alt="{{ 'core.pictureof' | translate:{$a: site.fullname} }}" role="presentation" onError="this.src='assets/img/user-avatar.png'">
                 </ion-avatar>
                 <h2>{{site.fullName}}</h2>
-                <p><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text></p>
+                <p><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id" contextLevel="system" [contextInstanceId]="site.siteHomeId"></core-format-text></p>
                 <p>{{site.siteUrl}}</p>
             </a>
             <ion-item>
diff --git a/src/core/course/classes/main-resource-component.ts b/src/core/course/classes/main-resource-component.ts
index 3ffae46fe..2233f893a 100644
--- a/src/core/course/classes/main-resource-component.ts
+++ b/src/core/course/classes/main-resource-component.ts
@@ -236,7 +236,8 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
      * Expand the description.
      */
     expandDescription(): void {
-        this.textUtils.expandText(this.translate.instant('core.description'), this.description, this.component, this.module.id);
+        this.textUtils.expandText(this.translate.instant('core.description'), this.description, this.component, this.module.id,
+                [], true, 'module', this.module.id);
     }
 
     /**
diff --git a/src/core/course/components/format/core-course-format.html b/src/core/course/components/format/core-course-format.html
index 7013b69f5..07b21f6db 100644
--- a/src/core/course/components/format/core-course-format.html
+++ b/src/core/course/components/format/core-course-format.html
@@ -58,10 +58,10 @@
             <ion-buttons padding end class="core-course-section-nav-buttons safe-padding-horizontal" *ngIf="displaySectionSelector && sections && sections.length">
                 <button *ngIf="previousSection" ion-button color="light" icon-only (click)="sectionChanged(previousSection)" title="{{ 'core.previous' | translate }}">
                     <ion-icon name="arrow-back" md="ios-arrow-back"></ion-icon>
-                    <core-format-text class="accesshide" [text]="previousSection.formattedName || previousSection.name"></core-format-text>
+                    <core-format-text class="accesshide" [text]="previousSection.formattedName || previousSection.name" contextLevel="course" [contextInstanceId]="course.id"></core-format-text>
                 </button>
                 <button *ngIf="nextSection" ion-button icon-only (click)="sectionChanged(nextSection)" title="{{ 'core.next' | translate }}">
-                    <core-format-text class="accesshide" [text]="nextSection.formattedName || nextSection.name"></core-format-text>
+                    <core-format-text class="accesshide" [text]="nextSection.formattedName || nextSection.name" contextLevel="course" [contextInstanceId]="course.id"></core-format-text>
                     <ion-icon name="arrow-forward" md="ios-arrow-forward"></ion-icon>
                 </button>
             </ion-buttons>
@@ -74,13 +74,13 @@
     <section ion-list *ngIf="!section.hiddenbynumsections && section.id != allSectionsId && section.id != stealthModulesSectionId">
         <!-- Title is only displayed when viewing all sections. -->
         <ion-item-divider text-wrap color="light" *ngIf="selectedSection.id == allSectionsId && section.name" [class.core-section-download]="downloadEnabled">
-            <core-format-text [text]="section.name"></core-format-text>
+            <core-format-text [text]="section.name" contextLevel="course" [contextInstanceId]="course.id"></core-format-text>
             <!-- Section download. -->
             <ng-container *ngTemplateOutlet="sectionDownloadTemplate; context: {section: section}"></ng-container>
         </ion-item-divider>
 
         <ion-item text-wrap *ngIf="section.summary">
-            <core-format-text [text]="section.summary"></core-format-text>
+            <core-format-text [text]="section.summary" contextLevel="course" [contextInstanceId]="course.id"></core-format-text>
         </ion-item>
 
         <ng-container *ngFor="let module of section.modules">
diff --git a/src/core/course/components/module-completion/module-completion.ts b/src/core/course/components/module-completion/module-completion.ts
index df4f4ceb2..ff3f265d1 100644
--- a/src/core/course/components/module-completion/module-completion.ts
+++ b/src/core/course/components/module-completion/module-completion.ts
@@ -15,9 +15,9 @@
 import { Component, Input, Output, EventEmitter, OnChanges, SimpleChange } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
-import { CoreTextUtilsProvider } from '@providers/utils/text';
 import { CoreUserProvider } from '@core/user/providers/user';
 import { CoreCourseProvider } from '../../providers/course';
+import { CoreFilterProvider } from '@core/filter/providers/filter';
 
 /**
  * Component to handle activity completion. It shows a checkbox with the current status, and allows manually changing
@@ -34,13 +34,14 @@ import { CoreCourseProvider } from '../../providers/course';
 })
 export class CoreCourseModuleCompletionComponent implements OnChanges {
     @Input() completion: any; // The completion status.
+    @Input() moduleId?: number; // The name of the module this completion affects.
     @Input() moduleName?: string; // The name of the module this completion affects.
     @Output() completionChanged?: EventEmitter<any>; // Will emit an event when the completion changes.
 
     completionImage: string;
     completionDescription: string;
 
-    constructor(private textUtils: CoreTextUtilsProvider, private domUtils: CoreDomUtilsProvider,
+    constructor(private filterProvider: CoreFilterProvider, private domUtils: CoreDomUtilsProvider,
             private translate: TranslateService, private courseProvider: CoreCourseProvider,
             private userProvider: CoreUserProvider) {
         this.completionChanged = new EventEmitter();
@@ -137,7 +138,9 @@ export class CoreCourseModuleCompletionComponent implements OnChanges {
         }
 
         if (moduleName) {
-            this.textUtils.formatText(moduleName, true, true, 50).then((modNameFormatted) => {
+            this.filterProvider.getFiltersAndFormatText(moduleName, 'module', this.moduleId,
+                    {clean: true, singleLine: true, shortenLength: 50}).then((modName) => {
+
                 let promise;
 
                 if (this.completion.overrideby > 0) {
@@ -147,11 +150,11 @@ export class CoreCourseModuleCompletionComponent implements OnChanges {
                         (profile) => {
                             return {
                                 overrideuser: profile.fullname,
-                                modname: modNameFormatted
+                                modname: modName
                             };
                         });
                 } else {
-                    promise = Promise.resolve(modNameFormatted);
+                    promise = Promise.resolve(modName);
                 }
 
                 return promise.then((translateParams) => {
diff --git a/src/core/course/components/module-description/core-course-module-description.html b/src/core/course/components/module-description/core-course-module-description.html
index 412d5bf3b..af4e525b3 100644
--- a/src/core/course/components/module-description/core-course-module-description.html
+++ b/src/core/course/components/module-description/core-course-module-description.html
@@ -1,6 +1,6 @@
 <ion-card *ngIf="description">
     <ion-item text-wrap>
-        <core-format-text [text]="description" [component]="component" [componentId]="componentId" [maxHeight]="showFull && showFull !== 'false' ? 0 : 120" fullOnClick="true"></core-format-text>
+        <core-format-text [text]="description" [component]="component" [componentId]="componentId" [maxHeight]="showFull && showFull !== 'false' ? 0 : 120" fullOnClick="true" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text>
     </ion-item>
     <ion-item text-wrap *ngIf="note">
         <ion-note item-end>{{ note }}</ion-note>
diff --git a/src/core/course/components/module-description/module-description.ts b/src/core/course/components/module-description/module-description.ts
index 0e19d86b1..eaa08a1b0 100644
--- a/src/core/course/components/module-description/module-description.ts
+++ b/src/core/course/components/module-description/module-description.ts
@@ -40,6 +40,8 @@ export class CoreCourseModuleDescriptionComponent {
     @Input() component?: string; // Component for format text directive.
     @Input() componentId?: string | number; // Component ID to use in conjunction with the component.
     @Input() showFull?: string | boolean; // Whether to always display the full description.
+    @Input() contextLevel?: string; // The context level.
+    @Input() contextInstanceId?: number; // The instance ID related to the context.
 
     constructor() {
         // Nothing to do.
diff --git a/src/core/course/components/module/core-course-module.html b/src/core/course/components/module/core-course-module.html
index 0b0239685..4d9a4021d 100644
--- a/src/core/course/components/module/core-course-module.html
+++ b/src/core/course/components/module/core-course-module.html
@@ -2,12 +2,12 @@
 
     <img item-start *ngIf="module.handlerData.icon" [src]="module.handlerData.icon" [alt]="module.modnametranslated" class="core-module-icon">
     <div class="core-module-title">
-        <core-format-text [text]="module.handlerData.title"></core-format-text>
+        <core-format-text [text]="module.handlerData.title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
 
         <!-- Buttons. -->
         <div item-end *ngIf="module.uservisible !== false" class="buttons core-module-buttons" [ngClass]="{'core-button-completion': module.completiondata}">
             <!-- Module completion. -->
-            <core-course-module-completion *ngIf="module.completiondata" [completion]="module.completiondata" [moduleName]="module.name" (completionChanged)="completionChanged.emit($event)"></core-course-module-completion>
+            <core-course-module-completion *ngIf="module.completiondata" [completion]="module.completiondata" [moduleName]="module.name" [moduleId]="module.id" (completionChanged)="completionChanged.emit($event)"></core-course-module-completion>
 
             <div class="core-module-buttons-more">
                 <core-download-refresh [status]="downloadStatus" [enabled]="downloadEnabled" [loading]="spinner || module.handlerData.spinner" [canTrustDownload]="canCheckUpdates" (action)="download($event)"></core-download-refresh>
@@ -21,15 +21,15 @@
     </div>
     <div class="core-module-more-info">
         <ion-badge item-end *ngIf="module.handlerData.extraBadge" [color]="module.handlerData.extraBadgeColor" text-wrap text-start>
-            <core-format-text [text]="module.handlerData.extraBadge"></core-format-text>
+            <span [innerHTML]="module.handlerData.extraBadge"></span>
         </ion-badge>
         <ion-badge item-end *ngIf="module.visible === 0 && (!section || section.visible)" text-wrap>{{ 'core.course.hiddenfromstudents' | translate }}</ion-badge>
         <ion-badge item-end *ngIf="module.visible !== 0 && module.isStealth" text-wrap>{{ 'core.course.hiddenoncoursepage' | translate }}</ion-badge>
         <div class="core-module-availabilityinfo" *ngIf="module.availabilityinfo" item-end>
             <ion-badge text-wrap>{{ 'core.restricted' | translate }}</ion-badge>
-            <core-format-text [text]="module.availabilityinfo" text-wrap></core-format-text>
+            <core-format-text [text]="module.availabilityinfo" contextLevel="module" [contextInstanceId]="module.id" text-wrap></core-format-text>
         </div>
         <ion-badge item-end *ngIf="module.completiondata && module.completiondata.offline" color="warning" text-wrap>{{ 'core.course.manualcompletionnotsynced' | translate }}</ion-badge>
     </div>
-    <core-format-text class="core-module-description" *ngIf="module.description" maxHeight="80" [text]="module.description"></core-format-text>
+    <core-format-text class="core-module-description" *ngIf="module.description" maxHeight="80" [text]="module.description" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
 </ion-item>
\ No newline at end of file
diff --git a/src/core/course/components/unsupported-module/core-course-unsupported-module.html b/src/core/course/components/unsupported-module/core-course-unsupported-module.html
index 3738ade00..f1796de2e 100644
--- a/src/core/course/components/unsupported-module/core-course-unsupported-module.html
+++ b/src/core/course/components/unsupported-module/core-course-unsupported-module.html
@@ -1,5 +1,5 @@
 <div padding>
-    <core-course-module-description [description]="module && module.description"></core-course-module-description>
+    <core-course-module-description [description]="module && module.description" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
     <h2 *ngIf="!isDisabledInSite && isSupportedByTheApp">{{ 'core.whoops' | translate }}</h2>
     <h2 *ngIf="isDisabledInSite || !isSupportedByTheApp">{{ 'core.uhoh' | translate }}</h2>
 
diff --git a/src/core/course/pages/list-mod-type/list-mod-type.html b/src/core/course/pages/list-mod-type/list-mod-type.html
index 7315af183..39678efed 100644
--- a/src/core/course/pages/list-mod-type/list-mod-type.html
+++ b/src/core/course/pages/list-mod-type/list-mod-type.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title>{{ title }}</ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>
diff --git a/src/core/course/pages/section-selector/section-selector.html b/src/core/course/pages/section-selector/section-selector.html
index e160fa1f6..e8af2bc87 100644
--- a/src/core/course/pages/section-selector/section-selector.html
+++ b/src/core/course/pages/section-selector/section-selector.html
@@ -13,10 +13,10 @@
         <ng-container *ngFor="let section of sections">
             <a ion-item *ngIf="!section.hiddenbynumsections && section.id != stealthModulesSectionId" text-wrap (click)="selectSection(section)" [class.core-primary-selected-item]="selected.id == section.id" [class.item-dimmed]="section.visible === 0 || section.uservisible === false" detail-none role="menuitem" [attr.aria-hidden]="section.uservisible === false" [attr.aria-label]="section.formattedName || section.name">
                 <core-icon name="fa-folder" item-start></core-icon>
-                <h2><core-format-text [text]="section.formattedName || section.name"></core-format-text></h2>
+                <h2><core-format-text [text]="section.formattedName || section.name" contextLevel="course" [contextInstanceId]="courseId"></core-format-text></h2>
                 <core-progress-bar *ngIf="section.progress >= 0" [progress]="section.progress"></core-progress-bar>
                 <ion-badge color="secondary" *ngIf="section.visible === 0 && section.uservisible !== false" text-wrap>{{ 'core.course.hiddenfromstudents' | translate }}</ion-badge>
-                <ion-badge color="secondary" *ngIf="section.availabilityinfo" text-wrap><core-format-text  [text]=" section.availabilityinfo"></core-format-text></ion-badge>
+                <ion-badge color="secondary" *ngIf="section.availabilityinfo" text-wrap><core-format-text [text]=" section.availabilityinfo" contextLevel="course" [contextInstanceId]="courseId"></core-format-text></ion-badge>
             </a>
         </ng-container>
     </ion-list>
diff --git a/src/core/course/pages/section-selector/section-selector.ts b/src/core/course/pages/section-selector/section-selector.ts
index c86cf171c..d3ce687c3 100644
--- a/src/core/course/pages/section-selector/section-selector.ts
+++ b/src/core/course/pages/section-selector/section-selector.ts
@@ -30,12 +30,15 @@ export class CoreCourseSectionSelectorPage {
     stealthModulesSectionId = CoreCourseProvider.STEALTH_MODULES_SECTION_ID;
     sections: any;
     selected: number;
+    courseId: number;
 
     constructor(navParams: NavParams, courseHelper: CoreCourseHelperProvider, private viewCtrl: ViewController) {
         this.sections = navParams.get('sections');
         this.selected = navParams.get('selected');
         const course = navParams.get('course');
 
+        this.courseId = course && course.id;
+
         if (course && course.enablecompletion && course.courseformatoptions && course.courseformatoptions.coursedisplay == 1 &&
                 course.completionusertracked !== false) {
             this.sections.forEach((section) => {
diff --git a/src/core/course/pages/section/section.html b/src/core/course/pages/section/section.html
index ea12ab46f..6d2411153 100644
--- a/src/core/course/pages/section/section.html
+++ b/src/core/course/pages/section/section.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="course" [contextInstanceId]="course.id"></core-format-text></ion-title>
 
         <ion-buttons end></ion-buttons>
     </ion-navbar>
diff --git a/src/core/course/pages/section/section.ts b/src/core/course/pages/section/section.ts
index 907e88518..5590b1c27 100644
--- a/src/core/course/pages/section/section.ts
+++ b/src/core/course/pages/section/section.ts
@@ -18,7 +18,6 @@ import { TranslateService } from '@ngx-translate/core';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
-import { CoreTextUtilsProvider } from '@providers/utils/text';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreTabsComponent } from '@components/tabs/tabs';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
@@ -30,6 +29,7 @@ import { CoreCourseOptionsDelegate, CoreCourseOptionsHandlerToDisplay,
     CoreCourseOptionsMenuHandlerToDisplay } from '../../providers/options-delegate';
 import { CoreCourseSyncProvider } from '../../providers/sync';
 import { CoreCourseFormatComponent } from '../../components/format/format';
+import { CoreFilterProvider } from '@core/filter/providers/filter';
 
 /**
  * Page that displays the list of courses the user is enrolled in.
@@ -75,7 +75,7 @@ export class CoreCourseSectionPage implements OnDestroy {
     constructor(navParams: NavParams, private courseProvider: CoreCourseProvider, private domUtils: CoreDomUtilsProvider,
             private courseFormatDelegate: CoreCourseFormatDelegate, private courseOptionsDelegate: CoreCourseOptionsDelegate,
             private translate: TranslateService, private courseHelper: CoreCourseHelperProvider, eventsProvider: CoreEventsProvider,
-            private textUtils: CoreTextUtilsProvider, private coursesProvider: CoreCoursesProvider,
+            private coursesProvider: CoreCoursesProvider, private filterProvider: CoreFilterProvider,
             sitesProvider: CoreSitesProvider, private navCtrl: NavController, private injector: Injector,
             private prefetchDelegate: CoreCourseModulePrefetchDelegate, private syncProvider: CoreCourseSyncProvider,
             private utils: CoreUtilsProvider) {
@@ -263,7 +263,8 @@ export class CoreCourseSectionPage implements OnDestroy {
 
                     // Format the name of each section and check if it has content.
                     this.sections = sections.map((section) => {
-                        this.textUtils.formatText(section.name.trim(), true, true).then((name) => {
+                        this.filterProvider.getFiltersAndFormatText(section.name.trim(), 'course', this.course.id,
+                                {clean: true, singleLine: true}).then((name) => {
                             section.formattedName = name;
                         });
                         section.hasContent = this.courseHelper.sectionHasContent(section);
diff --git a/src/core/course/pages/unsupported-module/unsupported-module.html b/src/core/course/pages/unsupported-module/unsupported-module.html
index 13c933949..c0ae5285a 100644
--- a/src/core/course/pages/unsupported-module/unsupported-module.html
+++ b/src/core/course/pages/unsupported-module/unsupported-module.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="module.name"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="module.name" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
 
         <ion-buttons end>
             <core-context-menu>
diff --git a/src/core/course/pages/unsupported-module/unsupported-module.ts b/src/core/course/pages/unsupported-module/unsupported-module.ts
index 8ecd58f00..6e4c87008 100644
--- a/src/core/course/pages/unsupported-module/unsupported-module.ts
+++ b/src/core/course/pages/unsupported-module/unsupported-module.ts
@@ -36,6 +36,7 @@ export class CoreCourseUnsupportedModulePage {
      * Expand the description.
      */
     expandDescription(): void {
-        this.textUtils.expandText(this.translate.instant('core.description'), this.module.description);
+        this.textUtils.expandText(this.translate.instant('core.description'), this.module.description, undefined, undefined,
+                [], true, 'module', this.module.id);
     }
 }
diff --git a/src/core/courses/components/course-list-item/core-courses-course-list-item.html b/src/core/courses/components/course-list-item/core-courses-course-list-item.html
index a56a02b9b..e594ff06b 100644
--- a/src/core/courses/components/course-list-item/core-courses-course-list-item.html
+++ b/src/core/courses/components/course-list-item/core-courses-course-list-item.html
@@ -1,6 +1,6 @@
 <a ion-item text-wrap (click)="openCourse(course)" [class.item-disabled]="course.visible == 0" [title]="course.displayname || course.fullname">
     <core-icon name="fa-graduation-cap" fixed-width item-start></core-icon>
-    <h2><core-format-text [text]="course.displayname || course.fullname"></core-format-text></h2>
+    <h2><core-format-text [text]="course.displayname || course.fullname" contextLevel="course" [contextInstanceId]="course.id"></core-format-text></h2>
     <div item-end>
         <span *ngIf="!course.isEnrolled">
             <span ion-button icon-only clear color="gray" *ngFor="let instance of course.enrollment" [attr.aria-label]=" instance.name | translate">
diff --git a/src/core/courses/components/course-progress/core-courses-course-progress.html b/src/core/courses/components/course-progress/core-courses-course-progress.html
index 985d92008..ed72a738e 100644
--- a/src/core/courses/components/course-progress/core-courses-course-progress.html
+++ b/src/core/courses/components/course-progress/core-courses-course-progress.html
@@ -4,10 +4,10 @@
     </div>
     <ion-item tappable text-wrap detail-none (click)="openCourse(course)" [title]="course.displayname || course.fullname" class="core-course-link" [class.item-disabled]="course.visible == 0" [class.core-course-more-than-title]="(course.progress != null && course.progress >= 0)">
         <div class="core-course-title" [class.core-course-with-buttons]="courseOptionMenuEnabled || (downloadCourseEnabled && showDownload)">
-            <p *ngIf="course.displayname && course.shortname && course.fullname != course.displayname" class="core-course-shortname"><core-format-text [text]="course.shortname"></core-format-text></p>
+            <p *ngIf="course.displayname && course.shortname && course.fullname != course.displayname" class="core-course-shortname"><core-format-text [text]="course.shortname" contextLevel="course" [contextInstanceId]="course.id"></core-format-text></p>
             <h2>
                 <core-icon name="fa-star" *ngIf="course.isfavourite"></core-icon>
-                <core-format-text [text]="course.fullname"></core-format-text>
+                <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id"></core-format-text>
             </h2>
         </div>
 
diff --git a/src/core/courses/pages/categories/categories.html b/src/core/courses/pages/categories/categories.html
index e24c372bb..0952bb4ef 100644
--- a/src/core/courses/pages/categories/categories.html
+++ b/src/core/courses/pages/categories/categories.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="coursecat" [contextInstanceId]="currentCategory && currentCategory.id"></core-format-text></ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>
@@ -10,10 +10,10 @@
     <core-loading [hideUntil]="categoriesLoaded">
         <ion-item *ngIf="currentCategory" text-wrap>
             <ion-icon name="folder" item-start></ion-icon>
-            <h2><core-format-text [text]="currentCategory.name"></core-format-text></h2>
+            <h2><core-format-text [text]="currentCategory.name" contextLevel="coursecat" [contextInstanceId]="currentCategory.id"></core-format-text></h2>
         </ion-item>
         <ion-item text-wrap *ngIf="currentCategory && currentCategory.description">
-            <core-format-text [text]="currentCategory.description" maxHeight="60"></core-format-text>
+            <core-format-text [text]="currentCategory.description" maxHeight="60" contextLevel="coursecat" [contextInstanceId]="currentCategory.id"></core-format-text>
         </ion-item>
 
         <div *ngIf="categories.length > 0">
@@ -21,7 +21,7 @@
             <section *ngFor="let category of categories">
                 <a ion-item text-wrap (click)="openCategory(category.id)" [title]="category.name">
                     <ion-icon name="folder" item-start></ion-icon>
-                    <h2><core-format-text [text]="category.name"></core-format-text></h2>
+                    <h2><core-format-text [text]="category.name" contextLevel="coursecat" [contextInstanceId]="category.id"></core-format-text></h2>
                     <ion-badge item-end *ngIf="category.coursecount > 0" color="light">{{category.coursecount}}</ion-badge>
                 </a>
             </section>
diff --git a/src/core/courses/pages/course-preview/course-preview.html b/src/core/courses/pages/course-preview/course-preview.html
index e379c0b21..f84814ab6 100644
--- a/src/core/courses/pages/course-preview/course-preview.html
+++ b/src/core/courses/pages/course-preview/course-preview.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="course.fullname"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id"></core-format-text></ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>
@@ -15,13 +15,13 @@
             </div>
             <a ion-item text-wrap (click)="openCourse()" [title]="course.fullname" [attr.detail-none]=" avoidOpenCourse || !canAccessCourse">
                 <core-icon name="fa-graduation-cap" fixed-width item-start></core-icon>
-                <h2><core-format-text [text]="course.fullname"></core-format-text></h2>
-                <p *ngIf="course.categoryname"><core-format-text [text]="course.categoryname"></core-format-text></p>
+                <h2><core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id"></core-format-text></h2>
+                <p *ngIf="course.categoryname"><core-format-text [text]="course.categoryname" contextLevel="coursecat" [contextInstanceId]="course.categoryid"></core-format-text></p>
                 <p *ngIf="course.startdate">{{course.startdate * 1000 | coreFormatDate:"strftimedatefullshort" }} <span *ngIf="course.enddate"> - {{course.enddate * 1000 | coreFormatDate:"strftimedatefullshort" }}</span></p>
             </a>
 
             <ion-item text-wrap *ngIf="course.summary" detail-none>
-                <core-format-text [text]="course.summary" maxHeight="120"></core-format-text>
+                <core-format-text [text]="course.summary" maxHeight="120" contextLevel="course" [contextInstanceId]="course.id"></core-format-text>
             </ion-item>
 
             <ng-container text-wrap *ngIf="course.contacts && course.contacts.length">
@@ -36,8 +36,8 @@
             <ion-item text-wrap *ngIf="course.customfields" detail-none>
                 <ng-container *ngFor="let field of course.customfields">
                     <div *ngIf="field.value" class="core-customfield core-customfield_{{field.type}} core-customfield_{{field.shortname}}">
-                        <span class="core-customfieldname"><core-format-text [text]="field.name"></core-format-text></span><span class="core-customfieldseparator">: </span>
-                        <span class="core-customfieldvalue"><core-format-text [text]="field.value" maxHeight="120"></core-format-text></span>
+                        <span class="core-customfieldname"><core-format-text [text]="field.name" contextLevel="course" [contextInstanceId]="course.id"></core-format-text></span><span class="core-customfieldseparator">: </span>
+                        <span class="core-customfieldvalue"><core-format-text [text]="field.value" maxHeight="120" contextLevel="course" [contextInstanceId]="course.id"></core-format-text></span>
                     </div>
                 </ng-container>
             </ion-item>
diff --git a/src/core/courses/pages/dashboard/dashboard.html b/src/core/courses/pages/dashboard/dashboard.html
index 4f030b26f..0030c0b0f 100644
--- a/src/core/courses/pages/dashboard/dashboard.html
+++ b/src/core/courses/pages/dashboard/dashboard.html
@@ -1,6 +1,6 @@
     <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="siteName"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <button *ngIf="searchEnabled" ion-button icon-only (click)="openSearch()" [attr.aria-label]="'core.courses.searchcourses' | translate">
diff --git a/src/core/courses/pages/dashboard/dashboard.ts b/src/core/courses/pages/dashboard/dashboard.ts
index ac309713c..29906dd8e 100644
--- a/src/core/courses/pages/dashboard/dashboard.ts
+++ b/src/core/courses/pages/dashboard/dashboard.ts
@@ -45,6 +45,7 @@ export class CoreCoursesDashboardPage implements OnDestroy {
     tabsReady = false;
     searchEnabled: boolean;
     tabs = [];
+    siteHomeId: number;
     siteName: string;
     blocks: any[];
     dashboardEnabled = false;
@@ -133,6 +134,7 @@ export class CoreCoursesDashboardPage implements OnDestroy {
      * Load the site name.
      */
     protected loadSiteName(): void {
+        this.siteHomeId = this.sitesProvider.getCurrentSiteHomeId();
         this.siteName = this.sitesProvider.getCurrentSite().getSiteName();
     }
 
diff --git a/src/core/filter/providers/filter.ts b/src/core/filter/providers/filter.ts
index bdb88578e..9e6752d12 100644
--- a/src/core/filter/providers/filter.ts
+++ b/src/core/filter/providers/filter.ts
@@ -17,6 +17,8 @@ import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreSite } from '@classes/site';
 import { CoreWSExternalWarning } from '@providers/ws';
+import { CoreTextUtilsProvider } from '@providers/utils/text';
+import { CoreFilterDelegate } from './delegate';
 
 /**
  * Service to provide filter functionalities.
@@ -27,8 +29,13 @@ export class CoreFilterProvider {
     protected ROOT_CACHE_KEY = 'mmFilter:';
 
     protected logger;
+    protected FILTERS_NOT_TREATED = ['activitynames', 'censor', 'data', 'emailprotect', 'emoticon', 'glossary', 'tex', 'tidy',
+            'urltolink'];
 
-    constructor(logger: CoreLoggerProvider, private sitesProvider: CoreSitesProvider) {
+    constructor(logger: CoreLoggerProvider,
+            private sitesProvider: CoreSitesProvider,
+            private textUtils: CoreTextUtilsProvider,
+            private filterDelegate: CoreFilterDelegate) {
         this.logger = logger.getInstance('CoreFilterProvider');
     }
 
@@ -41,7 +48,78 @@ export class CoreFilterProvider {
      */
     canGetAvailableInContext(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
-            return site.wsAvailable('core_filters_get_available_in_context');
+            return this.canGetAvailableInContextInSite(site);
+        });
+    }
+
+    /**
+     * Returns whether or not WS get available in context is avalaible in a certain site.
+     *
+     * @param site Site. If not defined, current site.
+     * @return Promise resolved with true if ws is avalaible, false otherwise.
+     * @since 3.4
+     */
+    canGetAvailableInContextInSite(site?: CoreSite): boolean {
+        site = site || this.sitesProvider.getCurrentSite();
+
+        return site.wsAvailable('core_filters_get_available_in_context');
+    }
+
+    /**
+     * Given some HTML code, this function returns the text as safe HTML.
+     *
+     * @param text The text to be formatted.
+     * @param options Formatting options.
+     * @param filters The filters to apply. Required if filter is set to true.
+     * @return Promise resolved with the formatted text.
+     */
+    formatText(text: string, options?: CoreFilterFormatTextOptions, filters?: CoreFilterFilter[]): Promise<string> {
+
+        if (!text || typeof text != 'string') {
+            // No need to do any filters and cleaning.
+            return Promise.resolve('');
+        }
+
+        // Clone object if needed so we can modify it.
+        options = options ? Object.assign({}, options) : {};
+
+        if (typeof options.clean == 'undefined') {
+            options.clean = false;
+        }
+
+        if (typeof options.filter == 'undefined') {
+            options.filter = true;
+        }
+
+        if (!options.contextLevel) {
+            options.filter  = false;
+        }
+
+        // @todo: Setup?
+
+        let promise: Promise<string>;
+
+        if (options.filter) {
+            promise = this.filterDelegate.filterText(text, filters, options);
+        } else {
+            promise = Promise.resolve(text);
+        }
+
+        return promise.then((text) => {
+
+            if (options.clean) {
+                text = this.textUtils.cleanTags(text, options.singleLine);
+            }
+
+            if (options.shortenLength > 0) {
+                text = this.textUtils.shortenText(text, options.shortenLength);
+            }
+
+            if (options.highlight) {
+                text = this.textUtils.highlightText(text, options.highlight);
+            }
+
+            return text;
         });
     }
 
@@ -75,12 +153,43 @@ export class CoreFilterProvider {
             : Promise<{[contextlevel: string]: {[instanceid: number]: CoreFilterFilter[]}}> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
+            let hasSystemContext = false,
+                hasSiteHomeContext = false;
+
+            const contextsToSend = contexts.slice(); // Copy the contexts array to be able to modify it.
+
+            // Check if any of the contexts is "system". We cannot use system context, so we'll have to use a wrokaround.
+            for (let i = 0; i < contextsToSend.length; i++) {
+                const context = contextsToSend[i];
+
+                if (context.contextlevel == 'system' && context.instanceid == site.getSiteHomeId()) {
+                    hasSystemContext = true;
+
+                    // Use course site home instead. Check if it's already in the list.
+                    hasSiteHomeContext = contextsToSend.some((context) => {
+                        return context.contextlevel == 'course' && context.instanceid == site.getSiteHomeId();
+                    });
+
+                    if (hasSiteHomeContext) {
+                        // Site home is already in list, remove this context from the list.
+                        contextsToSend.splice(i, 1);
+                    } else {
+                        // Site home not in list, use it instead of system.
+                        contextsToSend[i] = {
+                            contextlevel: 'course',
+                            instanceid: context.instanceid
+                        };
+                    }
+
+                    break;
+                }
+            }
 
             const data = {
-                    contexts: contexts,
+                    contexts: contextsToSend,
                 },
                 preSets = {
-                    cacheKey: this.getAvailableInContextsCacheKey(contexts),
+                    cacheKey: this.getAvailableInContextsCacheKey(contextsToSend),
                     updateFrequency: CoreSite.FREQUENCY_RARELY
                 };
 
@@ -91,11 +200,11 @@ export class CoreFilterProvider {
 
                 // Initialize all contexts.
                 contexts.forEach((context) => {
-                    classified[context.contextlevel] = {};
+                    classified[context.contextlevel] = classified[context.contextlevel] || {};
                     classified[context.contextlevel][context.instanceid] = [];
                 });
 
-                if (contexts.length == 1) {
+                if (contexts.length == 1 && !hasSystemContext) {
                     // Only 1 context, no need to iterate over the filters.
                     classified[contexts[0].contextlevel][contexts[0].instanceid] = result.filters;
 
@@ -103,6 +212,21 @@ export class CoreFilterProvider {
                 }
 
                 result.filters.forEach((filter) => {
+                    if (hasSystemContext && filter.contextlevel == 'course' && filter.instanceid == site.getSiteHomeId()) {
+                        if (hasSiteHomeContext) {
+                            // We need to return both site home and system. Add site home first.
+                            classified[filter.contextlevel][filter.instanceid].push(filter);
+
+                            // Now copy the object so it can be modified.
+                            filter = Object.assign({}, filter);
+                        }
+
+                        // Simulate the system context based on the inherited data.
+                        filter.contextlevel = 'system';
+                        filter.contextid = -1;
+                        filter.localstate = filter.inheritedstate;
+                    }
+
                     classified[filter.contextlevel][filter.instanceid].push(filter);
                 });
 
@@ -114,7 +238,7 @@ export class CoreFilterProvider {
     /**
      * Get the filters available in a certain context.
      *
-     * @param contextLevel The context level to check.
+     * @param contextLevel The context level to check: system, user, coursecat, course, module, block, ...
      * @param instanceId The instance ID.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the filters.
@@ -125,6 +249,48 @@ export class CoreFilterProvider {
         });
     }
 
+    /**
+     * Get filters and format text.
+     *
+     * @param text Text to filter.
+     * @param contextLevel The context level.
+     * @param instanceId Instance ID related to the context.
+     * @param options Options for format text.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the formatted text.
+     */
+    getFiltersAndFormatText(text: string, contextLevel: string, instanceId: number, options?: CoreFilterFormatTextOptions,
+            siteId?: string): Promise<string> {
+
+        options.contextLevel = contextLevel;
+        options.instanceId = instanceId;
+        options.filter = false;
+
+        return this.canGetAvailableInContext(siteId).then((canGet) => {
+            if (!canGet) {
+                options.filter = true;
+
+                // We cannot check which filters are available, apply them all.
+                return this.filterDelegate.getEnabledFilters(contextLevel, instanceId);
+            }
+
+            // Check if site has any filter to treat.
+            return this.siteHasFiltersToTreat(siteId).then((hasFilters) => {
+                if (hasFilters) {
+                    options.filter = true;
+
+                    return this.getAvailableInContext(contextLevel, instanceId, siteId);
+                }
+
+                return [];
+            }).catch(() => {
+                return [];
+            });
+        }).then((filters) => {
+            return this.formatText(text, options, filters);
+        });
+    }
+
     /**
      * Invalidates all available in context WS calls.
      *
@@ -161,6 +327,36 @@ export class CoreFilterProvider {
     invalidateAvailableInContext(contextLevel: string, instanceId: number, siteId?: string): Promise<any> {
         return this.invalidateAvailableInContexts([{contextlevel: contextLevel, instanceid: instanceId}], siteId);
     }
+
+    /**
+     * Check if site has available any filter that should be treated by the app.
+     *
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether it has filters to treat.
+     */
+    siteHasFiltersToTreat(siteId?: string): Promise<boolean> {
+        return this.sitesProvider.getSite(siteId).then((site) => {
+
+            // Get filters at site level.
+            return this.getAvailableInContext('system', site.getSiteHomeId(), site.getId()).then((filters) => {
+
+                for (let i = 0; i < filters.length; i++) {
+                    const filter = filters[i];
+
+                    if (this.FILTERS_NOT_TREATED.indexOf(filter.filter) != -1) {
+                        continue;
+                    }
+
+                    if (this.filterDelegate.hasHandler(filter.filter, true)) {
+                        // There is a filter to treat and is enabled.
+                        return true;
+                    }
+                }
+
+                return false;
+            });
+        });
+    }
 }
 
 /**
@@ -182,3 +378,16 @@ export type CoreFilterGetAvailableInContextResult = {
     filters: CoreFilterFilter[]; // Available filters.
     warning: CoreWSExternalWarning[]; // List of warnings.
 };
+
+/**
+ * Options that can be passed to format text.
+ */
+export type CoreFilterFormatTextOptions = {
+    contextLevel?: string; // The context level where the text is.
+    instanceId?: number; // The instance id related to the context.
+    clean?: boolean; // If true all HTML will be removed. Default false.
+    filter?: boolean; // If true the string will be run through applicable filters as well. Default true.
+    singleLine?: boolean; // If true then new lines will be removed (all the text in a single line).
+    shortenLength?: number; // Number of characters to shorten the text.
+    highlight?: string; // Text to highlight.
+};
diff --git a/src/core/grades/pages/courses/courses.html b/src/core/grades/pages/courses/courses.html
index b4b021aa0..0dacd9e41 100644
--- a/src/core/grades/pages/courses/courses.html
+++ b/src/core/grades/pages/courses/courses.html
@@ -14,7 +14,7 @@
 
             <ion-list *ngIf="grades && grades.length > 0">
                 <a ion-item text-wrap *ngFor="let grade of grades" [title]="grade.courseFullName" (click)="gotoCourseGrades(grade.courseid)" [class.core-split-item-selected]="grade.courseid == courseId">
-                    <h2><core-format-text [text]="grade.courseFullName"></core-format-text></h2>
+                    <h2><core-format-text [text]="grade.courseFullName" contextLevel="course" [contextInstanceId]="grade.courseid"></core-format-text></h2>
                     <ion-badge item-end color="light">{{grade.grade}}</ion-badge>
                 </a>
             </ion-list>
diff --git a/src/core/grades/pages/grade/grade.html b/src/core/grades/pages/grade/grade.html
index 7bb1b117d..675aed8b9 100644
--- a/src/core/grades/pages/grade/grade.html
+++ b/src/core/grades/pages/grade/grade.html
@@ -14,58 +14,58 @@
             <a ion-item *ngIf="grade.itemname && grade.link" text-wrap detail-push [href]="grade.link" core-link capture="true">
                 <ion-icon *ngIf="grade.icon" name="{{grade.icon}}" item-start></ion-icon>
                 <img *ngIf="grade.image" [src]="grade.image" item-start class="core-module-icon"/>
-                <h2><core-format-text [text]="grade.itemname"></core-format-text></h2>
+                <h2><core-format-text [text]="grade.itemname" contextLevel="course" [contextInstanceId]="courseId"></core-format-text></h2>
             </a>
 
             <ion-item *ngIf="grade.itemname && !grade.link" text-wrap >
                 <ion-icon *ngIf="grade.icon" name="{{grade.icon}}" item-start></ion-icon>
                 <img *ngIf="grade.image" [src]="grade.image" item-start class="core-module-icon"/>
-                <h2><core-format-text [text]="grade.itemname"></core-format-text></h2>
+                <h2><core-format-text [text]="grade.itemname" contextLevel="course" [contextInstanceId]="courseId"></core-format-text></h2>
             </ion-item>
 
             <ion-item text-wrap *ngIf="grade.weight">
                 <h2>{{ 'core.grades.weight' | translate}}</h2>
-                <p><core-format-text [text]="grade.weight"></core-format-text></p>
+                <p [innerHTML]="grade.weight"></p>
             </ion-item>
 
             <ion-item text-wrap *ngIf="grade.grade">
                 <h2>{{ 'core.grades.grade' | translate}}</h2>
-                <p><core-format-text [text]="grade.grade"></core-format-text></p>
+                <p [innerHTML]="grade.grade"></p>
             </ion-item>
 
             <ion-item text-wrap *ngIf="grade.range">
                 <h2>{{ 'core.grades.range' | translate}}</h2>
-                <p><core-format-text [text]="grade.range"></core-format-text></p>
+                <p [innerHTML]="grade.range"></p>
             </ion-item>
 
             <ion-item text-wrap *ngIf="grade.percentage">
                 <h2>{{ 'core.grades.percentage' | translate}}</h2>
-                <p><core-format-text [text]="grade.percentage"></core-format-text></p>
+                <p [innerHTML]="grade.percentage"></p>
             </ion-item>
 
             <ion-item text-wrap *ngIf="grade.lettergrade">
                 <h2>{{ 'core.grades.lettergrade' | translate}}</h2>
-                <p><core-format-text [text]="grade.lettergrade"></core-format-text></p>
+                <p [innerHTML]="grade.lettergrade"></p>
             </ion-item>
 
             <ion-item text-wrap *ngIf="grade.rank">
                 <h2>{{ 'core.grades.rank' | translate}}</h2>
-                <p><core-format-text [text]="grade.rank"></core-format-text></p>
+                <p [innerHTML]="grade.rank"></p>
             </ion-item>
 
             <ion-item text-wrap *ngIf="grade.average">
                 <h2>{{ 'core.grades.average' | translate}}</h2>
-                <p><core-format-text [text]="grade.average"></core-format-text></p>
+                <p [innerHTML]="grade.average"></p>
             </ion-item>
 
             <ion-item text-wrap *ngIf="grade.feedback">
                 <h2>{{ 'core.grades.feedback' | translate}}</h2>
-                <p><core-format-text [fullTitle]="'core.grades.feedback' | translate" maxHeight="60" fullOnClick="true" [text]="grade.feedback"></core-format-text></p>
+                <p><core-format-text [fullTitle]="'core.grades.feedback' | translate" maxHeight="60" fullOnClick="true" [text]="grade.feedback" contextLevel="course" [contextInstanceId]="courseId"></core-format-text></p>
             </ion-item>
 
             <ion-item text-wrap *ngIf="grade.contributiontocoursetotal">
                 <h2>{{ 'core.grades.contributiontocoursetotal' | translate}}</h2>
-                <p><core-format-text [text]="grade.contributiontocoursetotal"></core-format-text></p>
+                <p [innerHTML]="grade.contributiontocoursetotal"></p>
             </ion-item>
         </ion-list>
     </core-loading>
diff --git a/src/core/login/pages/credentials/credentials.html b/src/core/login/pages/credentials/credentials.html
index ee0a1c62c..e34139c6c 100644
--- a/src/core/login/pages/credentials/credentials.html
+++ b/src/core/login/pages/credentials/credentials.html
@@ -20,7 +20,7 @@
                 <!-- If no sitename show big siteurl. -->
                 <p *ngIf="!siteName" padding class="item-heading core-siteurl">{{siteUrl}}</p>
                 <!-- If sitename, show big sitename and small siteurl. -->
-                <p *ngIf="siteName" padding class="item-heading core-sitename"><core-format-text [text]="siteName"></core-format-text></p>
+                <p *ngIf="siteName" padding class="item-heading core-sitename"><core-format-text [text]="siteName" [filter]="false"></core-format-text></p>
                 <p *ngIf="siteName" class="core-siteurl">{{siteUrl}}</p>
             </div>
             <form ion-list [formGroup]="credForm" (ngSubmit)="login($event)" class="core-login-form">
@@ -51,7 +51,7 @@
             <ion-list *ngIf="canSignup" padding-top class="core-login-sign-up">
                 <ion-list-header text-wrap>{{ 'core.login.firsttime' | translate }}</ion-list-header>
                 <ion-item no-lines text-wrap *ngIf="authInstructions">
-                    <p><core-format-text [text]="authInstructions"></core-format-text></p>
+                    <p><core-format-text [text]="authInstructions" [filter]="false"></core-format-text></p>
                 </ion-item>
                 <button ion-button block (click)="signup()">{{ 'core.login.startsignup' | translate }}</button>
             </ion-list>
diff --git a/src/core/login/pages/email-signup/email-signup.html b/src/core/login/pages/email-signup/email-signup.html
index 30aa9cd58..2e49ea822 100644
--- a/src/core/login/pages/email-signup/email-signup.html
+++ b/src/core/login/pages/email-signup/email-signup.html
@@ -52,7 +52,7 @@
                 <!-- If no sitename show big siteurl. -->
                 <p *ngIf="!siteName" padding class="item-heading">{{siteUrl}}</p>
                 <!-- If sitename, show big sitename and small siteurl. -->
-                <p *ngIf="siteName" padding class="item-heading"><core-format-text [text]="siteName"></core-format-text></p>
+                <p *ngIf="siteName" padding class="item-heading"><core-format-text [text]="siteName" [filter]="false"></core-format-text></p>
                 <p *ngIf="siteName">{{siteUrl}}</p>
             </ion-item>
 
@@ -145,7 +145,7 @@
 
     <ion-list *ngIf="isMinor">
         <ion-item-divider text-wrap>
-            <p *ngIf="siteName" class="item-heading padding"><core-format-text [text]="siteName"></core-format-text></p>
+            <p *ngIf="siteName" class="item-heading padding"><core-format-text [text]="siteName" [filter]="false"></core-format-text></p>
         </ion-item-divider>
         <ion-item text-wrap>
             <p class="item-heading">{{ 'core.considereddigitalminor' | translate }}</p>
diff --git a/src/core/login/pages/reconnect/reconnect.html b/src/core/login/pages/reconnect/reconnect.html
index 0cff453a1..99e9ab99d 100644
--- a/src/core/login/pages/reconnect/reconnect.html
+++ b/src/core/login/pages/reconnect/reconnect.html
@@ -18,7 +18,7 @@
             <!-- If no sitename show big siteurl. -->
             <p *ngIf="!siteName" class="item-heading core-siteurl">{{siteUrl}}</p>
             <!-- If sitename, show big sitename and small siteurl. -->
-            <p *ngIf="siteName" class="item-heading core-sitename"><core-format-text [text]="siteName"></core-format-text></p>
+            <p *ngIf="siteName" class="item-heading core-sitename"><core-format-text [text]="siteName" [filter]="false"></core-format-text></p>
             <p *ngIf="siteName" class="core-siteurl">{{siteUrl}}</p>
 
             <p *ngIf="!isLoggedOut">
diff --git a/src/core/login/pages/site-error/site-error.html b/src/core/login/pages/site-error/site-error.html
index da3c478fe..8c42122fc 100644
--- a/src/core/login/pages/site-error/site-error.html
+++ b/src/core/login/pages/site-error/site-error.html
@@ -21,7 +21,7 @@
         {{ 'core.login.contactyouradministratorissue' | translate:{$a: ''} }}
     </p>
     <p *ngIf="issue" margin-bottom>
-        <core-format-text [text]="issue"></core-format-text>
+        <core-format-text [text]="issue" [filter]="false"></core-format-text>
     </p>
 </ion-content>
 
diff --git a/src/core/login/pages/site-help/site-help.html b/src/core/login/pages/site-help/site-help.html
index 2dc77ffc6..ae21bace1 100644
--- a/src/core/login/pages/site-help/site-help.html
+++ b/src/core/login/pages/site-help/site-help.html
@@ -10,5 +10,5 @@
     </ion-navbar>
 </ion-header>
 <ion-content padding>
-    <core-format-text [text]="'core.login.helpmelogin' | translate"></core-format-text>
+    <core-format-text [text]="'core.login.helpmelogin' | translate" [filter]="false"></core-format-text>
 </ion-content>
diff --git a/src/core/login/pages/sites/sites.html b/src/core/login/pages/sites/sites.html
index d6e6ad2e4..f42010609 100644
--- a/src/core/login/pages/sites/sites.html
+++ b/src/core/login/pages/sites/sites.html
@@ -19,7 +19,7 @@
                 <img [src]="site.avatar" core-external-content [siteId]="site.id" alt="{{ 'core.pictureof' | translate:{$a: site.fullname} }}" role="presentation" onError="this.src='assets/img/user-avatar.png'">
             </ion-avatar>
             <h2>{{site.fullName}}</h2>
-            <p><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text></p>
+            <p><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id" contextLevel="system" [contextInstanceId]="site.siteHomeId"></core-format-text></p>
             <p>{{site.siteUrl}}</p>
             <ion-badge item-end *ngIf="!showDelete && site.badge">{{site.badge}}</ion-badge>
             <button *ngIf="showDelete" item-end ion-button icon-only clear color="danger" (click)="deleteSite($event, idx)" [attr.aria-label]="'core.delete' | translate">
diff --git a/src/core/login/pages/sites/sites.ts b/src/core/login/pages/sites/sites.ts
index 91deeca18..1ed6b49c2 100644
--- a/src/core/login/pages/sites/sites.ts
+++ b/src/core/login/pages/sites/sites.ts
@@ -18,9 +18,9 @@ import { TranslateService } from '@ngx-translate/core';
 import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider, CoreSiteBasicInfo } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
-import { CoreTextUtilsProvider } from '@providers/utils/text';
 import { CorePushNotificationsProvider } from '@core/pushnotifications/providers/pushnotifications';
 import { CoreLoginHelperProvider } from '../../providers/helper';
+import { CoreFilterProvider } from '@core/filter/providers/filter';
 
 /**
  * Page that displays the list of stored sites.
@@ -35,7 +35,7 @@ export class CoreLoginSitesPage {
     showDelete: boolean;
     protected logger;
 
-    constructor(private domUtils: CoreDomUtilsProvider, private textUtils: CoreTextUtilsProvider,
+    constructor(private domUtils: CoreDomUtilsProvider, private filterProvider: CoreFilterProvider,
             private sitesProvider: CoreSitesProvider, private loginHelper: CoreLoginHelperProvider, logger: CoreLoggerProvider,
             private translate: TranslateService, private pushNotificationsProvider: CorePushNotificationsProvider) {
         this.logger = logger.getInstance('CoreLoginSitesPage');
@@ -86,7 +86,9 @@ export class CoreLoginSitesPage {
         const site = this.sites[index],
             siteName = site.siteName;
 
-        this.textUtils.formatText(siteName).then((siteName) => {
+        this.filterProvider.getFiltersAndFormatText(siteName, 'system', site.siteHomeId, {clean: true, singleLine: true}, site.id)
+                .then((siteName) => {
+
             this.domUtils.showConfirm(this.translate.instant('core.login.confirmdeletesite', { sitename: siteName })).then(() => {
                 this.sitesProvider.deleteSite(site.id).then(() => {
                     this.sites.splice(index, 1);
diff --git a/src/core/mainmenu/pages/more/more.html b/src/core/mainmenu/pages/more/more.html
index 4630fb1e4..1caee57d6 100644
--- a/src/core/mainmenu/pages/more/more.html
+++ b/src/core/mainmenu/pages/more/more.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="siteName"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>
diff --git a/src/core/mainmenu/pages/more/more.ts b/src/core/mainmenu/pages/more/more.ts
index 257fb27c7..82dc72029 100644
--- a/src/core/mainmenu/pages/more/more.ts
+++ b/src/core/mainmenu/pages/more/more.ts
@@ -33,6 +33,7 @@ export class CoreMainMenuMorePage implements OnDestroy {
     handlersLoaded: boolean;
     siteInfo: any;
     siteName: string;
+    siteHomeId: number;
     logoutLabel: string;
     showWeb: boolean;
     showHelp: boolean;
@@ -110,6 +111,7 @@ export class CoreMainMenuMorePage implements OnDestroy {
         this.siteInfo = currentSite.getInfo();
         this.siteName = currentSite.getSiteName();
         this.siteUrl = currentSite.getURL();
+        this.siteHomeId = currentSite.getSiteHomeId();
         this.logoutLabel = 'core.mainmenu.' + (config && config.tool_mobile_forcelogout == '1' ? 'logout' : 'changesite');
         this.showWeb = !currentSite.isFeatureDisabled('CoreMainMenuDelegate_website');
         this.showHelp = !currentSite.isFeatureDisabled('CoreMainMenuDelegate_help');
diff --git a/src/core/pushnotifications/providers/pushnotifications.ts b/src/core/pushnotifications/providers/pushnotifications.ts
index 216936f54..652647f3e 100644
--- a/src/core/pushnotifications/providers/pushnotifications.ts
+++ b/src/core/pushnotifications/providers/pushnotifications.ts
@@ -33,6 +33,7 @@ import { CoreConfigConstants } from '../../../configconstants';
 import { ILocalNotification } from '@ionic-native/local-notifications';
 import { SQLiteDB, SQLiteDBTableSchema } from '@classes/sqlitedb';
 import { CoreSite } from '@classes/site';
+import { CoreFilterProvider } from '@core/filter/providers/filter';
 
 /**
  * Data needed to register a device in a Moodle site.
@@ -176,7 +177,8 @@ export class CorePushNotificationsProvider {
             private badge: Badge, private localNotificationsProvider: CoreLocalNotificationsProvider,
             private utils: CoreUtilsProvider, private textUtils: CoreTextUtilsProvider, private push: Push,
             private configProvider: CoreConfigProvider, private device: Device, private zone: NgZone,
-            private translate: TranslateService, private platform: Platform, private sitesFactory: CoreSitesFactoryProvider) {
+            private translate: TranslateService, private platform: Platform, private sitesFactory: CoreSitesFactoryProvider,
+            private filterProvider: CoreFilterProvider) {
         this.logger = logger.getInstance('CorePushNotificationsProvider');
         this.appDB = appProvider.getDB();
         this.appDB.createTablesFromSchema(this.appTablesSchema);
@@ -430,7 +432,7 @@ export class CorePushNotificationsProvider {
     onMessageReceived(notification: any): void {
         const data = notification ? notification.additionalData : {};
 
-        this.sitesProvider.getSite(data.site).then(() => {
+        this.sitesProvider.getSite(data.site).then((site) => {
 
             if (typeof data.customdata == 'string') {
                 data.customdata = this.textUtils.parseJSON(data.customdata, {});
@@ -451,13 +453,15 @@ export class CorePushNotificationsProvider {
                         extraFeatures = this.utils.isTrueOrOne(data.extrafeatures);
 
                     // Apply formatText to title and message.
-                    promises.push(this.textUtils.formatText(notification.title, true, true).then((formattedTitle) => {
-                        localNotif.title = formattedTitle;
+                    promises.push(this.filterProvider.getFiltersAndFormatText(notification.title, 'system', site.getSiteHomeId(),
+                            {clean: true, singleLine: true}, site.getId()).then((title) => {
+                        localNotif.title = title;
                     }).catch(() => {
                         localNotif.title = notification.title;
                     }));
 
-                    promises.push(this.textUtils.formatText(notification.message, true, true).catch(() => {
+                    promises.push(this.filterProvider.getFiltersAndFormatText(notification.message, 'system', site.getSiteHomeId(),
+                            {clean: true, singleLine: true}, site.getId()).catch(() => {
                         // Error formatting, use the original message.
                         return notification.message;
                     }).then((formattedMessage) => {
diff --git a/src/core/question/classes/base-question-component.ts b/src/core/question/classes/base-question-component.ts
index bff3d7c69..9f6f51be1 100644
--- a/src/core/question/classes/base-question-component.ts
+++ b/src/core/question/classes/base-question-component.ts
@@ -27,6 +27,8 @@ export class CoreQuestionBaseComponent {
     @Input() componentId: number; // ID of the component the question belongs to.
     @Input() attemptId: number; // Attempt ID.
     @Input() offlineEnabled?: boolean | string; // Whether the question can be answered in offline.
+    @Input() contextLevel?: string; // The context level.
+    @Input() contextInstanceId?: number; // The instance ID related to the context.
     @Output() buttonClicked: EventEmitter<any>; // Should emit an event when a behaviour button is clicked.
     @Output() onAbort: EventEmitter<void>; // Should emit an event if the question should be aborted.
 
diff --git a/src/core/question/components/question/core-question.html b/src/core/question/components/question/core-question.html
index 4123240fd..2124c94d4 100644
--- a/src/core/question/components/question/core-question.html
+++ b/src/core/question/components/question/core-question.html
@@ -23,10 +23,10 @@
 
 <!-- Question feedback. -->
 <ion-item text-wrap class="core-question-feedback-container" *ngIf="question.feedbackHtml">
-    <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.feedbackHtml"></core-format-text></p>
+    <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.feedbackHtml" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
 </ion-item>
 
 <!-- Question comment. -->
 <ion-item text-wrap class="core-question-comment" *ngIf="question.commentHtml">
-    <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.commentHtml"></core-format-text></p>
+    <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.commentHtml" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
 </ion-item>
diff --git a/src/core/question/components/question/question.ts b/src/core/question/components/question/question.ts
index 88cb7bafa..5890dc9d5 100644
--- a/src/core/question/components/question/question.ts
+++ b/src/core/question/components/question/question.ts
@@ -36,6 +36,8 @@ export class CoreQuestionComponent implements OnInit {
     @Input() attemptId: number; // Attempt ID.
     @Input() usageId: number; // Usage ID.
     @Input() offlineEnabled?: boolean | string; // Whether the question can be answered in offline.
+    @Input() contextLevel?: string; // The context level.
+    @Input() contextInstanceId?: number; // The instance ID related to the context.
     @Output() buttonClicked: EventEmitter<any>; // Will emit an event when a behaviour button is clicked.
     @Output() onAbort: EventEmitter<void>; // Will emit an event if the question should be aborted.
 
@@ -82,6 +84,8 @@ export class CoreQuestionComponent implements OnInit {
                     componentId: this.componentId,
                     attemptId: this.attemptId,
                     offlineEnabled: this.offlineEnabled,
+                    contextLevel: this.contextLevel,
+                    contextInstanceId: this.contextInstanceId,
                     buttonClicked: this.buttonClicked,
                     onAbort: this.onAbort
                 };
diff --git a/src/core/question/providers/helper.ts b/src/core/question/providers/helper.ts
index 5a9719a0c..6a2a257b4 100644
--- a/src/core/question/providers/helper.ts
+++ b/src/core/question/providers/helper.ts
@@ -691,8 +691,12 @@ export class CoreQuestionHelperProvider {
      * @param element DOM element.
      * @param component The component to use when viewing the feedback.
      * @param componentId An ID to use in conjunction with the component.
+     * @param contextLevel The context level.
+     * @param contextInstanceId Instance ID related to the context.
      */
-    treatCorrectnessIconsClicks(element: HTMLElement, component?: string, componentId?: number): void {
+    treatCorrectnessIconsClicks(element: HTMLElement, component?: string, componentId?: number, contextLevel?: string,
+            contextInstanceId?: number): void {
+
         const icons = <HTMLElement[]> Array.from(element.querySelectorAll('i.icon.questioncorrectnessicon[tappable]')),
             title = this.translate.instant('core.question.feedback');
 
@@ -703,7 +707,8 @@ export class CoreQuestionHelperProvider {
             if (span) {
                 // There's a hidden feedback, show it when the icon is clicked.
                 icon.addEventListener('click', (event) => {
-                    this.textUtils.expandText(title, span.innerHTML, component, componentId);
+                    this.textUtils.expandText(title, span.innerHTML, component, componentId, [], true, contextLevel,
+                            contextInstanceId);
                 });
             }
         });
diff --git a/src/core/rating/pages/ratings/ratings.html b/src/core/rating/pages/ratings/ratings.html
index 6123f3730..4e6aa3b87 100644
--- a/src/core/rating/pages/ratings/ratings.html
+++ b/src/core/rating/pages/ratings/ratings.html
@@ -19,7 +19,7 @@
                 <ion-note item-end padding-left *ngIf="rating.timemodified">
                     {{ rating.timemodified | coreDateDayOrTime }}
                 </ion-note>
-                <h2><core-format-text [text]="rating.userfullname"></core-format-text></h2>
+                <h2>{{ rating.userfullname }}</h2>
                 <p>{{ rating.rating }}</p>
             </ion-item>
         </ion-list>
diff --git a/src/core/settings/pages/space-usage/space-usage.html b/src/core/settings/pages/space-usage/space-usage.html
index 8b93dcf93..83fcfd9ee 100644
--- a/src/core/settings/pages/space-usage/space-usage.html
+++ b/src/core/settings/pages/space-usage/space-usage.html
@@ -9,7 +9,7 @@
     </ion-refresher>
     <core-loading [hideUntil]="usageLoaded">
         <ion-item *ngFor="let site of sites" [class.core-primary-selected-item]="site.id == currentSiteId">
-            <h2 text-wrap><core-format-text [text]="site.siteName"></core-format-text></h2>
+            <h2 text-wrap><core-format-text [text]="site.siteName" contextLevel="system" [contextInstanceId]="site.siteHomeId"></core-format-text></h2>
             <p text-wrap>{{ site.fullName }}</p>
             <div item-end>
                 <p>{{ site.spaceUsage | coreBytesToSize }}</p>
diff --git a/src/core/settings/pages/space-usage/space-usage.ts b/src/core/settings/pages/space-usage/space-usage.ts
index 2464d2a67..61b75b041 100644
--- a/src/core/settings/pages/space-usage/space-usage.ts
+++ b/src/core/settings/pages/space-usage/space-usage.ts
@@ -18,9 +18,9 @@ import { TranslateService } from '@ngx-translate/core';
 import { CoreAppProvider } from '@providers/app';
 import { CoreFilepoolProvider } from '@providers/filepool';
 import { CoreSitesProvider } from '@providers/sites';
-import { CoreTextUtilsProvider } from '@providers/utils/text';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreCourseProvider } from '@core/course/providers/course';
+import { CoreFilterProvider } from '@core/filter/providers/filter';
 
 /**
  * Page that displays the space usage settings.
@@ -39,7 +39,7 @@ export class CoreSettingsSpaceUsagePage {
     totalEntries = 0;
 
     constructor(private filePoolProvider: CoreFilepoolProvider,
-            private sitesProvider: CoreSitesProvider, private textUtils: CoreTextUtilsProvider,
+            private sitesProvider: CoreSitesProvider, private filterProvider: CoreFilterProvider,
             private translate: TranslateService, private domUtils: CoreDomUtilsProvider, appProvider: CoreAppProvider,
             private courseProvider: CoreCourseProvider) {
         this.currentSiteId = this.sitesProvider.getCurrentSiteId();
@@ -162,7 +162,9 @@ export class CoreSettingsSpaceUsagePage {
      * @param siteData Site object with space usage.
      */
     deleteSiteStorage(siteData: any): void {
-        this.textUtils.formatText(siteData.siteName).then((siteName) => {
+        this.filterProvider.getFiltersAndFormatText(siteData.siteName, 'system', siteData.siteHomeId,
+                {clean: true, singleLine: true}, siteData.id).then((siteName) => {
+
             const title = this.translate.instant('core.settings.deletesitefilestitle');
             const message = this.translate.instant('core.settings.deletesitefiles', {sitename: siteName});
 
diff --git a/src/core/settings/pages/synchronization/synchronization.html b/src/core/settings/pages/synchronization/synchronization.html
index a81c59e13..041c048c8 100644
--- a/src/core/settings/pages/synchronization/synchronization.html
+++ b/src/core/settings/pages/synchronization/synchronization.html
@@ -17,7 +17,7 @@
             <p>{{ 'core.settings.sites' | translate }}</p>
         </ion-item-divider>
         <ion-item *ngFor="let site of sites" [class.core-primary-selected-item]="site.id == currentSiteId" text-wrap>
-            <h2><core-format-text [text]="site.siteName"></core-format-text></h2>
+            <h2><core-format-text [text]="site.siteName" contextLevel="system" [contextInstanceId]="site.siteHomeId"></core-format-text></h2>
             <p>{{ site.fullName }}</p>
             <p>{{ site.siteUrl }}</p>
             <button ion-button icon-only clear item-end *ngIf="!isSynchronizing(site.id)" (click)="synchronize(site.id)" [title]="site.siteName" [attr.aria-label]="'core.settings.synchronizenow' | translate">
diff --git a/src/core/sharedfiles/pages/choose-site/choose-site.html b/src/core/sharedfiles/pages/choose-site/choose-site.html
index ca01e2cb3..5c6cf3a80 100644
--- a/src/core/sharedfiles/pages/choose-site/choose-site.html
+++ b/src/core/sharedfiles/pages/choose-site/choose-site.html
@@ -15,7 +15,7 @@
                     <img [src]="site.avatar" core-external-content [siteId]="site.id" alt="{{ 'core.pictureof' | translate:{$a: site.fullname} }}" role="presentation" onError="this.src='assets/img/user-avatar.png'">
                 </ion-avatar>
                 <h2>{{site.fullName}}</h2>
-                <p><core-format-text clean="true" [text]="site.siteName" [siteId]="site.id"></core-format-text></p>
+                <p><core-format-text clean="true" [text]="site.siteName" [siteId]="site.id" contextLevel="system" [contextInstanceId]="site.siteHomeId"></core-format-text></p>
                 <p>{{site.siteUrl}}</p>
             </a>
         </ion-list>
diff --git a/src/core/sharedfiles/pages/list/list.html b/src/core/sharedfiles/pages/list/list.html
index 5470ee0c6..5f210c99a 100644
--- a/src/core/sharedfiles/pages/list/list.html
+++ b/src/core/sharedfiles/pages/list/list.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title>{{ title }}</ion-title>
 
         <ion-buttons end *ngIf="isModal">
             <button ion-button icon-only (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
diff --git a/src/core/sitehome/components/index/core-sitehome-index.html b/src/core/sitehome/components/index/core-sitehome-index.html
index 7bc8292fe..c7fa6c43a 100644
--- a/src/core/sitehome/components/index/core-sitehome-index.html
+++ b/src/core/sitehome/components/index/core-sitehome-index.html
@@ -4,7 +4,7 @@
                 <!-- Site home main contents. -->
                 <ng-container *ngIf="section && section.hasContent">
                     <ion-item text-wrap *ngIf="section.summary">
-                        <core-format-text [text]="section.summary"></core-format-text>
+                        <core-format-text [text]="section.summary" contextLevel="course" [contextInstanceId]="siteHomeId"></core-format-text>
                     </ion-item>
 
                     <core-course-module *ngFor="let module of section.modules" [module]="module" [courseId]="siteHomeId" [downloadEnabled]="downloadEnabled" [section]="section"></core-course-module>
diff --git a/src/core/siteplugins/components/module-index/module-index.ts b/src/core/siteplugins/components/module-index/module-index.ts
index ef0a1b0db..d65486a00 100644
--- a/src/core/siteplugins/components/module-index/module-index.ts
+++ b/src/core/siteplugins/components/module-index/module-index.ts
@@ -145,7 +145,8 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C
      * Expand the description.
      */
     expandDescription(): void {
-        this.textUtils.expandText(this.translate.instant('core.description'), this.description, this.component, this.module.id);
+        this.textUtils.expandText(this.translate.instant('core.description'), this.description, this.component, this.module.id,
+                [], true, 'module', this.module.id);
     }
 
     /**
diff --git a/src/core/user/components/participants/core-user-participants.html b/src/core/user/components/participants/core-user-participants.html
index 61e8944b5..269eee659 100644
--- a/src/core/user/components/participants/core-user-participants.html
+++ b/src/core/user/components/participants/core-user-participants.html
@@ -10,7 +10,7 @@
             <ion-list *ngIf="participants && participants.length > 0" no-margin>
                 <a ion-item text-wrap *ngFor="let participant of participants" [title]="participant.fullname" (click)="gotoParticipant(participant.id)" [class.core-split-item-selected]="participant.id == participantId">
                     <ion-avatar core-user-avatar [user]="participant" item-start [userId]="participant.id" [checkOnline]="true"></ion-avatar>
-                    <h2><core-format-text [text]="participant.fullname"></core-format-text></h2>
+                    <h2>{{ participant.fullname }}</h2>
                     <p *ngIf="participant.lastcourseaccess"><strong>{{ 'core.lastaccess' | translate }}: </strong>{{ participant.lastcourseaccess | coreTimeAgo }}</p>
                     <p *ngIf="participant.lastcourseaccess == null && participant.lastaccess"><strong>{{ 'core.lastaccess' | translate }}: </strong>{{ participant.lastaccess | coreTimeAgo }}</p>
                 </a>
diff --git a/src/core/user/components/user-profile-field/user-profile-field.ts b/src/core/user/components/user-profile-field/user-profile-field.ts
index 774591461..41c4a1e64 100644
--- a/src/core/user/components/user-profile-field/user-profile-field.ts
+++ b/src/core/user/components/user-profile-field/user-profile-field.ts
@@ -29,6 +29,8 @@ export class CoreUserProfileFieldComponent implements OnInit {
     @Input() edit = false; // True if editing the field. Defaults to false.
     @Input() form?: any; // Form where to add the form control. Required if edit=true or signup=true.
     @Input() registerAuth?: string; // Register auth method. E.g. 'email'.
+    @Input() contextLevel?: string; // The context level.
+    @Input() contextInstanceId?: number; // The instance ID related to the context.
 
     componentClass: any; // The class of the component to render.
     data: any = {}; // Data to pass to the component.
@@ -51,6 +53,8 @@ export class CoreUserProfileFieldComponent implements OnInit {
             this.data.disabled = this.utilsProvider.isTrueOrOne(this.field.locked);
             this.data.form = this.form;
             this.data.registerAuth = this.registerAuth;
+            this.data.contextLevel = this.contextLevel;
+            this.data.contextInstanceId = this.contextInstanceId;
         }
     }
 }
diff --git a/src/core/user/pages/about/about.html b/src/core/user/pages/about/about.html
index cfc7db797..fd73bfdc8 100644
--- a/src/core/user/pages/about/about.html
+++ b/src/core/user/pages/about/about.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title>{{ title }}</ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>
@@ -14,35 +14,34 @@
                 <ion-item text-wrap *ngIf="user.email">
                     <h2>{{ 'core.user.email' | translate }}</h2>
                     <p><a href="mailto:{{user.email}}" core-link auto-login="no">
-                        <core-format-text [text]="user.email"></core-format-text>
+                        {{ user.email }}
                     </a></p>
                 </ion-item>
                 <ion-item text-wrap *ngIf="user.phone1">
                     <h2>{{ 'core.user.phone1' | translate}}</h2>
                     <p><a href="tel:{{user.phone1}}" core-link auto-login="no">
-                        <core-format-text [text]="user.phone1"></core-format-text>
+                        {{ user.phone1 }}
                     </a></p>
                 </ion-item>
                 <ion-item text-wrap *ngIf="user.phone2">
                     <h2>{{ 'core.user.phone2' | translate}}</h2>
                     <p><a href="tel:{{user.phone2}}" core-link auto-login="no">
-                        <core-format-text [text]="user.phone2"></core-format-text>
+                        {{ user.phone2 }}
                     </a></p>
                 </ion-item>
                 <ion-item text-wrap *ngIf="user.address">
                     <h2>{{ 'core.user.address' | translate}}</h2>
                     <p><a [href]="user.encodedAddress" core-link auto-login="no">
-                            <core-format-text [text]="user.address"></core-format-text>
-                        </a>
-                    </p>
+                        {{ user.address }}
+                    </a></p>
                 </ion-item>
                 <ion-item text-wrap *ngIf="user.city && !user.address">
                     <h2>{{ 'core.user.city' | translate}}</h2>
-                    <p><core-format-text [text]="user.city"></core-format-text></p>
+                    <p>{{ user.city }}</p>
                 </ion-item>
                 <ion-item text-wrap *ngIf="user.country && !user.address">
                     <h2>{{ 'core.user.country' | translate}}</h2>
-                    <p><core-format-text [text]="user.country"></core-format-text></p>
+                    <p>{{ user.country }}</p>
                 </ion-item>
             </ion-item-group>
             <ion-item-group *ngIf="hasDetails">
@@ -50,19 +49,19 @@
                 <ion-item text-wrap *ngIf="user.url">
                     <h2>{{ 'core.user.webpage' | translate}}</h2>
                     <p><a href="{{user.url}}" core-link>
-                        <core-format-text [text]="user.url"></core-format-text>
+                        {{ user.url }}
                     </a></p>
                 </ion-item>
                 <ion-item text-wrap *ngIf="user.interests">
                     <h2>{{ 'core.user.interests' | translate}}</h2>
-                    <p><core-format-text [text]="user.interests"></core-format-text></p>
+                    <p>{{ user.interests }}</p>
                 </ion-item>
-                <core-user-profile-field *ngFor="let field of user.customfields" [field]="field"></core-user-profile-field>
+                <core-user-profile-field *ngFor="let field of user.customfields" [field]="field" contextLevel="course" [contextInstanceId]="courseId"></core-user-profile-field>
             </ion-item-group>
             <ion-item-group *ngIf="user.description">
                 <ion-item-divider>{{ 'core.user.description' | translate}}</ion-item-divider>
                 <ion-item text-wrap>
-                    <p><core-format-text [text]="user.description"></core-format-text></p>
+                    <p><core-format-text [text]="user.description" contextLevel="user" [contextInstanceId]="user.id"></core-format-text></p>
                 </ion-item>
             </ion-item-group>
         </div>
diff --git a/src/core/user/pages/profile/profile.html b/src/core/user/pages/profile/profile.html
index fae5a9edd..fcda7fd09 100644
--- a/src/core/user/pages/profile/profile.html
+++ b/src/core/user/pages/profile/profile.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title"></core-format-text></ion-title>
+        <ion-title>{{ title }}</ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>
@@ -13,11 +13,11 @@
                 <ion-avatar core-user-avatar class="item-avatar-center" [user]="user" [userId]="user.id" [linkProfile]="false" [checkOnline]="true">
                     <ion-icon name="create" class="core-icon-foreground" *ngIf="canChangeProfilePicture" (click)="changeProfilePicture()"></ion-icon>
                 </ion-avatar>
-                <h2><core-format-text [text]="user.fullname"></core-format-text></h2>
-                <p><core-format-text *ngIf="user.address" [text]="user.address"></core-format-text></p>
+                <h2>{{ user.fullname }}</h2>
+                <p *ngIf="user.address">{{ user.address }}</p>
                 <p *ngIf="user.roles" text-wrap>
                     <strong>{{ 'core.user.roles' | translate}}</strong>{{'core.labelsep' | translate}}
-                    <core-format-text [text]="user.roles"></core-format-text>
+                    {{ user.roles }}
                 </p>
             </ion-item>
 
diff --git a/src/core/viewer/pages/text/text.html b/src/core/viewer/pages/text/text.html
index 56fc902a9..f73c58612 100644
--- a/src/core/viewer/pages/text/text.html
+++ b/src/core/viewer/pages/text/text.html
@@ -10,7 +10,7 @@
     </ion-navbar>
 </ion-header>
 <ion-content padding>
-    <core-format-text [text]="content" [component]="component" [componentId]="componentId"></core-format-text>
+    <core-format-text [text]="content" [component]="component" [componentId]="componentId" [filter]="filter" [contextLevel]="contextLevel" [contextInstanceId]="instanceId"></core-format-text>
 
     <ion-card *ngIf="files && files.length">
         <core-file *ngFor="let file of files" [file]="file" [component]="component" [componentId]="componentId"></core-file>
diff --git a/src/core/viewer/pages/text/text.ts b/src/core/viewer/pages/text/text.ts
index 6ab1e7bf3..912c9ccff 100644
--- a/src/core/viewer/pages/text/text.ts
+++ b/src/core/viewer/pages/text/text.ts
@@ -30,6 +30,9 @@ export class CoreViewerTextPage {
     component: string; // Component to use in format-text.
     componentId: string | number; // Component ID to use in format-text.
     files: any[]; // List of files.
+    filter: boolean; // Whether to filter the text.
+    contextLevel: string; // The context level.
+    instanceId: number; // The instance ID related to the context.
 
     constructor(private viewCtrl: ViewController, params: NavParams, textUtils: CoreTextUtilsProvider) {
         this.title = params.get('title');
@@ -37,6 +40,9 @@ export class CoreViewerTextPage {
         this.component = params.get('component');
         this.componentId = params.get('componentId');
         this.files = params.get('files');
+        this.filter = params.get('filter');
+        this.contextLevel = params.get('contextLevel');
+        this.instanceId = params.get('instanceId');
     }
 
     /**
diff --git a/src/directives/format-text.ts b/src/directives/format-text.ts
index 88fb67c20..e9c78ec04 100644
--- a/src/directives/format-text.ts
+++ b/src/directives/format-text.ts
@@ -30,10 +30,13 @@ import { CoreLinkDirective } from '../directives/link';
 import { CoreExternalContentDirective } from '../directives/external-content';
 import { CoreContentLinksHelperProvider } from '@core/contentlinks/providers/helper';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
+import { CoreFilterProvider } from '@core/filter/providers/filter';
 
 /**
  * Directive to format text rendered. It renders the HTML and treats all links and media, using CoreLinkDirective
- * and CoreExternalContentDirective.
+ * and CoreExternalContentDirective. It also applies filters if needed.
+ *
+ * Please use this directive if your text needs to be filtered or it can contain links or media (images, audio, video).
  *
  * Example usage:
  * <core-format-text [text]="myText" [component]="component" [componentId]="componentId"></core-format-text>
@@ -55,6 +58,9 @@ export class CoreFormatTextDirective implements OnChanges {
     @Input() fullOnClick?: boolean | string; // Whether it should open a new page with the full contents on click.
     @Input() fullTitle?: string; // Title to use in full view. Defaults to "Description".
     @Input() highlight?: string; // Text to highlight.
+    @Input() filter?: boolean | string; // Whether to filter the text. If not defined, true if contextLevel and instanceId are set.
+    @Input() contextLevel?: string; // The context level of the text.
+    @Input() contextInstanceId?: number; // The instance ID related to the context.
     @Output() afterRender?: EventEmitter<any>; // Called when the data is rendered.
 
     protected element: HTMLElement;
@@ -67,7 +73,8 @@ export class CoreFormatTextDirective implements OnChanges {
             private filepoolProvider: CoreFilepoolProvider, private appProvider: CoreAppProvider,
             private contentLinksHelper: CoreContentLinksHelperProvider, @Optional() private navCtrl: NavController,
             @Optional() private content: Content, @Optional() private svComponent: CoreSplitViewComponent,
-            private iframeUtils: CoreIframeUtilsProvider, private eventsProvider: CoreEventsProvider) {
+            private iframeUtils: CoreIframeUtilsProvider, private eventsProvider: CoreEventsProvider,
+            private filterProvider: CoreFilterProvider) {
         this.element = element.nativeElement;
         this.element.classList.add('opacity-hide'); // Hide contents until they're treated.
         this.afterRender = new EventEmitter();
@@ -275,8 +282,10 @@ export class CoreFormatTextDirective implements OnChanges {
             return;
         } else {
             // Open a new state with the contents.
+            const filter = this.utils.isTrueOrOne(this.filter);
+
             this.textUtils.expandText(this.fullTitle || this.translate.instant('core.description'), this.text,
-                this.component, this.componentId);
+                this.component, this.componentId, undefined, filter, this.contextLevel, this.contextInstanceId);
         }
     }
 
@@ -363,9 +372,26 @@ export class CoreFormatTextDirective implements OnChanges {
         }).then((siteInstance: CoreSite) => {
             site = siteInstance;
 
-            // Apply format text function.
-            return this.textUtils.formatText(this.text, this.utils.isTrueOrOne(this.clean),
-                this.utils.isTrueOrOne(this.singleLine), undefined, this.highlight);
+            if (this.contextLevel == 'course' && this.contextInstanceId <= 0) {
+                this.contextInstanceId = site.getSiteHomeId();
+            }
+
+            this.filter = typeof this.filter == 'undefined' ? !!(this.contextLevel && this.contextInstanceId) : !!this.filter;
+
+            const options = {
+                clean: this.utils.isTrueOrOne(this.clean),
+                singleLine: this.utils.isTrueOrOne(this.singleLine),
+                highlight: this.highlight,
+                filter: this.filter
+            };
+
+            if (this.filter) {
+                return this.filterProvider.getFiltersAndFormatText(this.text, this.contextLevel, this.contextInstanceId, options,
+                        site.getId());
+            } else {
+                return this.filterProvider.formatText(this.text, options);
+            }
+
         }).then((formatted) => {
             const div = document.createElement('div'),
                 canTreatVimeo = site && site.isVersionGreaterEqualThan(['3.3.4', '3.4']),
diff --git a/src/providers/sites.ts b/src/providers/sites.ts
index 5616f3dd2..d3e1ecba8 100644
--- a/src/providers/sites.ts
+++ b/src/providers/sites.ts
@@ -113,6 +113,11 @@ export interface CoreSiteBasicInfo {
      * Badge to display in the site.
      */
     badge?: number;
+
+    /**
+     * Site home ID.
+     */
+    siteHomeId?: number;
 }
 
 /**
@@ -1130,7 +1135,8 @@ export class CoreSitesProvider {
                             siteUrl: site.siteUrl,
                             fullName: siteInfo && siteInfo.fullname,
                             siteName: CoreConfigConstants.sitename ? CoreConfigConstants.sitename : siteInfo && siteInfo.sitename,
-                            avatar: siteInfo && siteInfo.userpictureurl
+                            avatar: siteInfo && siteInfo.userpictureurl,
+                            siteHomeId: siteInfo && siteInfo.siteid || 1
                         };
                     formattedSites.push(basicInfo);
                 }
diff --git a/src/providers/utils/text.ts b/src/providers/utils/text.ts
index 262662da6..50593fc93 100644
--- a/src/providers/utils/text.ts
+++ b/src/providers/utils/text.ts
@@ -349,15 +349,22 @@ export class CoreTextUtilsProvider {
      * @param component Component to link the embedded files to.
      * @param componentId An ID to use in conjunction with the component.
      * @param files List of files to display along with the text.
+     * @param filter Whether the text should be filtered.
+     * @param contextLevel The context level.
+     * @param instanceId The instance ID related to the context.
      */
-    expandText(title: string, text: string, component?: string, componentId?: string | number, files?: any[]): void {
+    expandText(title: string, text: string, component?: string, componentId?: string | number, files?: any[],
+            filter?: boolean, contextLevel?: string, instanceId?: number): void {
         if (text.length > 0) {
             const params: any = {
                 title: title,
                 content: text,
                 component: component,
                 componentId: componentId,
-                files: files
+                files: files,
+                filter: filter,
+                contextLevel: contextLevel,
+                instanceId: instanceId
             };
 
             // Open a modal with the contents.
@@ -398,6 +405,7 @@ export class CoreTextUtilsProvider {
      * @param shortenLength Number of characters to shorten the text.
      * @param highlight Text to highlight.
      * @return Promise resolved with the formatted text.
+     * @deprecated since 3.8.0. Please use CoreFilterProvider.formatText instead.
      */
     formatText(text: string, clean?: boolean, singleLine?: boolean, shortenLength?: number, highlight?: string): Promise<string> {
         return this.treatMultilangTags(text).then((formatted) => {

From 31caccc39632491b196d99aac0bdedc7039154a9 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 3 Oct 2019 11:25:58 +0200
Subject: [PATCH 069/257] MOBILE-2491 filter: Support wsNotFiltered option and
 filter in chart

---
 .../filter/activitynames/providers/handler.ts | 13 +++
 src/addon/filter/censor/providers/handler.ts  | 13 +++
 src/addon/filter/data/providers/handler.ts    | 13 +++
 .../filter/emailprotect/providers/handler.ts  | 13 +++
 .../filter/emoticon/providers/handler.ts      | 13 +++
 .../filter/glossary/providers/handler.ts      | 13 +++
 .../filter/mediaplugin/providers/handler.ts   |  6 +-
 .../filter/multilang/providers/handler.ts     | 78 ++++++++++--------
 src/addon/filter/tex/providers/handler.ts     | 13 +++
 src/addon/filter/tidy/providers/handler.ts    | 13 +++
 .../filter/urltolink/providers/handler.ts     | 13 +++
 .../index/addon-mod-choice-index.html         |  2 +-
 .../index/addon-mod-feedback-index.html       |  2 +-
 src/addon/mod/feedback/pages/form/form.html   |  8 +-
 src/components/chart/chart.ts                 | 82 ++++++++++++++-----
 src/core/filter/providers/default-filter.ts   | 21 ++---
 src/core/filter/providers/delegate.ts         | 72 +++++++++++-----
 src/core/filter/providers/filter.ts           | 64 ++++++++-------
 src/directives/format-text.ts                 |  3 +-
 19 files changed, 332 insertions(+), 123 deletions(-)

diff --git a/src/addon/filter/activitynames/providers/handler.ts b/src/addon/filter/activitynames/providers/handler.ts
index 8e55846bb..025121803 100644
--- a/src/addon/filter/activitynames/providers/handler.ts
+++ b/src/addon/filter/activitynames/providers/handler.ts
@@ -15,6 +15,8 @@
 
 import { Injectable } from '@angular/core';
 import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+import { CoreFilterFormatTextOptions } from '@core/filter/providers/filter';
+import { CoreSite } from '@classes/site';
 
 /**
  * Handler to support the Activity names filter.
@@ -29,4 +31,15 @@ export class AddonFilterActivityNamesHandler extends CoreFilterDefaultHandler {
 
         // This filter is handled by Moodle, nothing to do in the app.
     }
+
+    /**
+     * Check if the filter should be applied in a certain site based on some filter options.
+     *
+     * @param options Options.
+     * @param site Site.
+     * @return Whether filter should be applied.
+     */
+    shouldBeApplied(options: CoreFilterFormatTextOptions, site?: CoreSite): boolean {
+        return false;
+    }
 }
diff --git a/src/addon/filter/censor/providers/handler.ts b/src/addon/filter/censor/providers/handler.ts
index 874d86ef9..018eb368b 100644
--- a/src/addon/filter/censor/providers/handler.ts
+++ b/src/addon/filter/censor/providers/handler.ts
@@ -15,6 +15,8 @@
 
 import { Injectable } from '@angular/core';
 import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+import { CoreFilterFormatTextOptions } from '@core/filter/providers/filter';
+import { CoreSite } from '@classes/site';
 
 /**
  * Handler to support the Word censorship filter.
@@ -29,4 +31,15 @@ export class AddonFilterCensorHandler extends CoreFilterDefaultHandler {
 
         // This filter is handled by Moodle, nothing to do in the app.
     }
+
+    /**
+     * Check if the filter should be applied in a certain site based on some filter options.
+     *
+     * @param options Options.
+     * @param site Site.
+     * @return Whether filter should be applied.
+     */
+    shouldBeApplied(options: CoreFilterFormatTextOptions, site?: CoreSite): boolean {
+        return false;
+    }
 }
diff --git a/src/addon/filter/data/providers/handler.ts b/src/addon/filter/data/providers/handler.ts
index f01cadb1d..e07e2ea4b 100644
--- a/src/addon/filter/data/providers/handler.ts
+++ b/src/addon/filter/data/providers/handler.ts
@@ -15,6 +15,8 @@
 
 import { Injectable } from '@angular/core';
 import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+import { CoreFilterFormatTextOptions } from '@core/filter/providers/filter';
+import { CoreSite } from '@classes/site';
 
 /**
  * Handler to support the Database auto-link filter.
@@ -29,4 +31,15 @@ export class AddonFilterDataHandler extends CoreFilterDefaultHandler {
 
         // This filter is handled by Moodle, nothing to do in the app.
     }
+
+    /**
+     * Check if the filter should be applied in a certain site based on some filter options.
+     *
+     * @param options Options.
+     * @param site Site.
+     * @return Whether filter should be applied.
+     */
+    shouldBeApplied(options: CoreFilterFormatTextOptions, site?: CoreSite): boolean {
+        return false;
+    }
 }
diff --git a/src/addon/filter/emailprotect/providers/handler.ts b/src/addon/filter/emailprotect/providers/handler.ts
index e7971386c..d339f6d33 100644
--- a/src/addon/filter/emailprotect/providers/handler.ts
+++ b/src/addon/filter/emailprotect/providers/handler.ts
@@ -15,6 +15,8 @@
 
 import { Injectable } from '@angular/core';
 import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+import { CoreFilterFormatTextOptions } from '@core/filter/providers/filter';
+import { CoreSite } from '@classes/site';
 
 /**
  * Handler to support the Email protection filter.
@@ -29,4 +31,15 @@ export class AddonFilterEmailProtectHandler extends CoreFilterDefaultHandler {
 
         // This filter is handled by Moodle, nothing to do in the app.
     }
+
+    /**
+     * Check if the filter should be applied in a certain site based on some filter options.
+     *
+     * @param options Options.
+     * @param site Site.
+     * @return Whether filter should be applied.
+     */
+    shouldBeApplied(options: CoreFilterFormatTextOptions, site?: CoreSite): boolean {
+        return false;
+    }
 }
diff --git a/src/addon/filter/emoticon/providers/handler.ts b/src/addon/filter/emoticon/providers/handler.ts
index 39c2ffe33..5523b0780 100644
--- a/src/addon/filter/emoticon/providers/handler.ts
+++ b/src/addon/filter/emoticon/providers/handler.ts
@@ -15,6 +15,8 @@
 
 import { Injectable } from '@angular/core';
 import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+import { CoreFilterFormatTextOptions } from '@core/filter/providers/filter';
+import { CoreSite } from '@classes/site';
 
 /**
  * Handler to support the Emoticon filter.
@@ -29,4 +31,15 @@ export class AddonFilterEmoticonHandler extends CoreFilterDefaultHandler {
 
         // This filter is handled by Moodle, nothing to do in the app.
     }
+
+    /**
+     * Check if the filter should be applied in a certain site based on some filter options.
+     *
+     * @param options Options.
+     * @param site Site.
+     * @return Whether filter should be applied.
+     */
+    shouldBeApplied(options: CoreFilterFormatTextOptions, site?: CoreSite): boolean {
+        return false;
+    }
 }
diff --git a/src/addon/filter/glossary/providers/handler.ts b/src/addon/filter/glossary/providers/handler.ts
index f7e38d553..9ffd6fec4 100644
--- a/src/addon/filter/glossary/providers/handler.ts
+++ b/src/addon/filter/glossary/providers/handler.ts
@@ -15,6 +15,8 @@
 
 import { Injectable } from '@angular/core';
 import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+import { CoreFilterFormatTextOptions } from '@core/filter/providers/filter';
+import { CoreSite } from '@classes/site';
 
 /**
  * Handler to support the Glossary auto-link filter.
@@ -29,4 +31,15 @@ export class AddonFilterGlossaryHandler extends CoreFilterDefaultHandler {
 
         // This filter is handled by Moodle, nothing to do in the app.
     }
+
+    /**
+     * Check if the filter should be applied in a certain site based on some filter options.
+     *
+     * @param options Options.
+     * @param site Site.
+     * @return Whether filter should be applied.
+     */
+    shouldBeApplied(options: CoreFilterFormatTextOptions, site?: CoreSite): boolean {
+        return false;
+    }
 }
diff --git a/src/addon/filter/mediaplugin/providers/handler.ts b/src/addon/filter/mediaplugin/providers/handler.ts
index 29da3de94..d7b91f2be 100644
--- a/src/addon/filter/mediaplugin/providers/handler.ts
+++ b/src/addon/filter/mediaplugin/providers/handler.ts
@@ -15,7 +15,7 @@
 
 import { Injectable } from '@angular/core';
 import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
-import { CoreFilterFilter } from '@core/filter/providers/filter';
+import { CoreFilterFilter, CoreFilterFormatTextOptions } from '@core/filter/providers/filter';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
 
 /**
@@ -36,9 +36,11 @@ export class AddonFilterMediaPluginHandler extends CoreFilterDefaultHandler {
      * @param text The text to filter.
      * @param filter The filter.
      * @param options Options passed to the filters.
+     * @param siteId Site ID. If not defined, current site.
      * @return Filtered text (or promise resolved with the filtered text).
      */
-    filter(text: string, filter: CoreFilterFilter, options: any): string | Promise<string> {
+    filter(text: string, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions, siteId?: string)
+            : string | Promise<string> {
 
         const div = document.createElement('div');
         div.innerHTML = text;
diff --git a/src/addon/filter/multilang/providers/handler.ts b/src/addon/filter/multilang/providers/handler.ts
index e689d9769..0b8d25d35 100644
--- a/src/addon/filter/multilang/providers/handler.ts
+++ b/src/addon/filter/multilang/providers/handler.ts
@@ -16,8 +16,9 @@
 import { Injectable } from '@angular/core';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
-import { CoreFilterFilter } from '@core/filter/providers/filter';
+import { CoreFilterFilter, CoreFilterFormatTextOptions } from '@core/filter/providers/filter';
 import { CoreLangProvider } from '@providers/lang';
+import { CoreSite } from '@classes/site';
 
 /**
  * Handler to support the Multilang filter.
@@ -32,50 +33,61 @@ export class AddonFilterMultilangHandler extends CoreFilterDefaultHandler {
         super();
     }
 
-    /**
-     * Whether or not the handler is enabled on a site level.
-     *
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
-     */
-    isEnabled(): boolean | Promise<boolean> {
-        // In Moodle versions older than 3.7, some specific content can be received unfiltered. Filter it in the app.
-        const currentSite = this.sitesProvider.getCurrentSite();
-
-        return !currentSite.isVersionGreaterEqualThan('3.7');
-    }
-
     /**
      * Filter some text.
      *
      * @param text The text to filter.
      * @param filter The filter.
      * @param options Options passed to the filters.
+     * @param siteId Site ID. If not defined, current site.
      * @return Filtered text (or promise resolved with the filtered text).
      */
-    filter(text: string, filter: CoreFilterFilter, options: any): string | Promise<string> {
+    filter(text: string, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions, siteId?: string)
+            : string | Promise<string> {
 
-        return this.langProvider.getCurrentLanguage().then((language) => {
-            // Match the current language.
-            const anyLangRegEx = /<(?:lang|span)[^>]+lang="[a-zA-Z0-9_-]+"[^>]*>(.*?)<\/(?:lang|span)>/g;
-            let currentLangRegEx = new RegExp('<(?:lang|span)[^>]+lang="' + language + '"[^>]*>(.*?)<\/(?:lang|span)>', 'g');
+        return this.sitesProvider.getSite(siteId).then((site) => {
 
-            if (!text.match(currentLangRegEx)) {
-                // Current lang not found. Try to find the first language.
-                const matches = text.match(anyLangRegEx);
-                if (matches && matches[0]) {
-                    language = matches[0].match(/lang="([a-zA-Z0-9_-]+)"/)[1];
-                    currentLangRegEx = new RegExp('<(?:lang|span)[^>]+lang="' + language + '"[^>]*>(.*?)<\/(?:lang|span)>', 'g');
-                } else {
-                    // No multi-lang tag found, stop.
-                    return text;
-                }
+            // Don't apply this filter if Moodle is 3.7 or higher and the WS already filtered the content.
+            if (!this.shouldBeApplied(options, site)) {
+                return text;
             }
-            // Extract contents of current language.
-            text = text.replace(currentLangRegEx, '$1');
-            // Delete the rest of languages
-            text = text.replace(anyLangRegEx, '');
 
-            return text;
+            return this.langProvider.getCurrentLanguage().then((language) => {
+                // Match the current language.
+                const anyLangRegEx = /<(?:lang|span)[^>]+lang="[a-zA-Z0-9_-]+"[^>]*>(.*?)<\/(?:lang|span)>/g;
+                let currentLangRegEx = new RegExp('<(?:lang|span)[^>]+lang="' + language + '"[^>]*>(.*?)<\/(?:lang|span)>', 'g');
+
+                if (!text.match(currentLangRegEx)) {
+                    // Current lang not found. Try to find the first language.
+                    const matches = text.match(anyLangRegEx);
+                    if (matches && matches[0]) {
+                        language = matches[0].match(/lang="([a-zA-Z0-9_-]+)"/)[1];
+                        currentLangRegEx = new RegExp('<(?:lang|span)[^>]+lang="' + language + '"[^>]*>(.*?)<\/(?:lang|span)>',
+                                'g');
+                    } else {
+                        // No multi-lang tag found, stop.
+                        return text;
+                    }
+                }
+                // Extract contents of current language.
+                text = text.replace(currentLangRegEx, '$1');
+                // Delete the rest of languages
+                text = text.replace(anyLangRegEx, '');
+
+                return text;
+            });
         });
     }
+
+    /**
+     * Check if the filter should be applied in a certain site based on some filter options.
+     *
+     * @param options Options.
+     * @param site Site.
+     * @return Whether filter should be applied.
+     */
+    shouldBeApplied(options: CoreFilterFormatTextOptions, site?: CoreSite): boolean {
+        // The filter should be applied if site is older than 3.7 or the WS didn't filter the text.
+        return options.wsNotFiltered || !site.isVersionGreaterEqualThan('3.7');
+    }
 }
diff --git a/src/addon/filter/tex/providers/handler.ts b/src/addon/filter/tex/providers/handler.ts
index a02e8e7c7..d29302a0d 100644
--- a/src/addon/filter/tex/providers/handler.ts
+++ b/src/addon/filter/tex/providers/handler.ts
@@ -15,6 +15,8 @@
 
 import { Injectable } from '@angular/core';
 import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+import { CoreFilterFormatTextOptions } from '@core/filter/providers/filter';
+import { CoreSite } from '@classes/site';
 
 /**
  * Handler to support the TeX notation filter.
@@ -29,4 +31,15 @@ export class AddonFilterTexHandler extends CoreFilterDefaultHandler {
 
         // This filter is handled by Moodle, nothing to do in the app.
     }
+
+    /**
+     * Check if the filter should be applied in a certain site based on some filter options.
+     *
+     * @param options Options.
+     * @param site Site.
+     * @return Whether filter should be applied.
+     */
+    shouldBeApplied(options: CoreFilterFormatTextOptions, site?: CoreSite): boolean {
+        return false;
+    }
 }
diff --git a/src/addon/filter/tidy/providers/handler.ts b/src/addon/filter/tidy/providers/handler.ts
index e0fff232d..6ce6a6287 100644
--- a/src/addon/filter/tidy/providers/handler.ts
+++ b/src/addon/filter/tidy/providers/handler.ts
@@ -15,6 +15,8 @@
 
 import { Injectable } from '@angular/core';
 import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+import { CoreFilterFormatTextOptions } from '@core/filter/providers/filter';
+import { CoreSite } from '@classes/site';
 
 /**
  * Handler to support the HTML tidy filter.
@@ -29,4 +31,15 @@ export class AddonFilterTidyHandler extends CoreFilterDefaultHandler {
 
         // This filter is handled by Moodle, nothing to do in the app.
     }
+
+    /**
+     * Check if the filter should be applied in a certain site based on some filter options.
+     *
+     * @param options Options.
+     * @param site Site.
+     * @return Whether filter should be applied.
+     */
+    shouldBeApplied(options: CoreFilterFormatTextOptions, site?: CoreSite): boolean {
+        return false;
+    }
 }
diff --git a/src/addon/filter/urltolink/providers/handler.ts b/src/addon/filter/urltolink/providers/handler.ts
index d23c392b3..311a0c2c5 100644
--- a/src/addon/filter/urltolink/providers/handler.ts
+++ b/src/addon/filter/urltolink/providers/handler.ts
@@ -15,6 +15,8 @@
 
 import { Injectable } from '@angular/core';
 import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+import { CoreFilterFormatTextOptions } from '@core/filter/providers/filter';
+import { CoreSite } from '@classes/site';
 
 /**
  * Handler to support the URL to link and images filter.
@@ -29,4 +31,15 @@ export class AddonFilterUrlToLinkHandler extends CoreFilterDefaultHandler {
 
         // This filter is handled by Moodle, nothing to do in the app.
     }
+
+    /**
+     * Check if the filter should be applied in a certain site based on some filter options.
+     *
+     * @param options Options.
+     * @param site Site.
+     * @return Whether filter should be applied.
+     */
+    shouldBeApplied(options: CoreFilterFormatTextOptions, site?: CoreSite): boolean {
+        return false;
+    }
 }
diff --git a/src/addon/mod/choice/components/index/addon-mod-choice-index.html b/src/addon/mod/choice/components/index/addon-mod-choice-index.html
index cf16a7b02..f4c0d5ac2 100644
--- a/src/addon/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addon/mod/choice/components/index/addon-mod-choice-index.html
@@ -73,7 +73,7 @@
                         <ion-icon item-start name="warning" color="warning"></ion-icon> {{ 'addon.mod_choice.resultsnotsynced' | translate }}
                     </ion-item>
                     <ion-item>
-                        <core-chart type="pie" [data]="data" [labels]="labels" height="300"></core-chart>
+                        <core-chart type="pie" [data]="data" [labels]="labels" height="300" contextLevel="module" [contextInstanceId]="module.id"></core-chart>
                     </ion-item>
                 </ion-col>
                 <ion-col *ngIf="choice.publish && results" col-12 col-lg-7>
diff --git a/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html
index f57fb1633..f1713c694 100644
--- a/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -162,7 +162,7 @@
                             </ul>
                         </ng-container>
                         <ng-container *ngSwitchCase="'chart'">
-                            <core-chart [type]="item.chartType" [data]="item.chartData" [labels]="item.labels" height="300"></core-chart>
+                            <core-chart [type]="item.chartType" [data]="item.chartData" [labels]="item.labels" height="300" contextLevel="module" [contextInstanceId]="module.id" [wsNotFiltered]="true"></core-chart>
                             <p *ngIf="item.average">{{ 'addon.mod_feedback.average' | translate }}: {{item.average | number : '1.2-2'}}</p>
                         </ng-container>
                     </ng-container>
diff --git a/src/addon/mod/feedback/pages/form/form.html b/src/addon/mod/feedback/pages/form/form.html
index 0339e939a..a1c3a8a63 100644
--- a/src/addon/mod/feedback/pages/form/form.html
+++ b/src/addon/mod/feedback/pages/form/form.html
@@ -23,7 +23,7 @@
                         <div item-content class="addon-mod_feedback-form-content" *ngIf="item.template">
                             <ng-container [ngSwitch]="item.template">
                                 <ng-container *ngSwitchCase="'label'">
-                                    <p><core-format-text [component]="component" [componentId]="componentId" [text]="item.presentation" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></p>
+                                    <p><core-format-text [component]="component" [componentId]="componentId" [text]="item.presentation" contextLevel="module" [contextInstanceId]="module.id" [wsNotFiltered]="true"></core-format-text></p>
                                 </ng-container>
                                 <ng-container *ngSwitchCase="'textfield'">
                                     <ion-input type="text" [(ngModel)]="item.value" autocorrect="off" name="{{item.typ}}_{{item.id}}" maxlength="{{item.maxlength}}" [required]="item.required"></ion-input>
@@ -38,20 +38,20 @@
                                 <ng-container *ngSwitchCase="'multichoice-r'">
                                     <ion-list radio-group [(ngModel)]="item.value" [required]="item.required" name="{{item.typ}}_{{item.id}}">
                                         <ion-item *ngFor="let option of item.choices">
-                                            <ion-label><core-format-text  [component]="component" [componentId]="componentId" [text]="option.label" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-label>
+                                            <ion-label><core-format-text  [component]="component" [componentId]="componentId" [text]="option.label" contextLevel="module" [contextInstanceId]="module.id" [wsNotFiltered]="true"></core-format-text></ion-label>
                                             <ion-radio [value]="option.value"></ion-radio>
                                         </ion-item>
                                     </ion-list>
                                 </ng-container>
                                 <ion-list *ngSwitchCase="'multichoice-c'">
                                     <ion-item *ngFor="let option of item.choices">
-                                        <ion-label><core-format-text [component]="component" [componentId]="componentId" [text]="option.label" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-label>
+                                        <ion-label><core-format-text [component]="component" [componentId]="componentId" [text]="option.label" contextLevel="module" [contextInstanceId]="module.id" [wsNotFiltered]="true"></core-format-text></ion-label>
                                         <ion-checkbox [required]="item.required" name="{{item.typ}}_{{item.id}}" [(ngModel)]="option.checked" value="option.value"></ion-checkbox>
                                     </ion-item>
                                 </ion-list>
                                 <ng-container *ngSwitchCase="'multichoice-d'">
                                     <ion-select [required]="item.required" name="{{item.typ}}_{{item.id}}" [(ngModel)]="item.value" interface="action-sheet">
-                                        <ion-option *ngFor="let option of item.choices" [value]="option.value"><core-format-text  [component]="component" [componentId]="componentId" [text]="option.label" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-option>
+                                        <ion-option *ngFor="let option of item.choices" [value]="option.value"><core-format-text  [component]="component" [componentId]="componentId" [text]="option.label" contextLevel="module" [contextInstanceId]="module.id" [wsNotFiltered]="true"></core-format-text></ion-option>
                                     </ion-select>
                                 </ng-container>
                                 <ng-container *ngSwitchCase="'captcha'">
diff --git a/src/components/chart/chart.ts b/src/components/chart/chart.ts
index 8d67b8853..cd310d47e 100644
--- a/src/components/chart/chart.ts
+++ b/src/components/chart/chart.ts
@@ -14,6 +14,8 @@
 
 import { Component, Input, OnDestroy, OnInit, ElementRef, OnChanges, ViewChild } from '@angular/core';
 import { Chart } from 'chart.js';
+import { CoreFilterProvider } from '@core/filter/providers/filter';
+import { CoreUtilsProvider } from '@providers/utils/utils';
 
 /**
  * This component shows a chart using chart.js.
@@ -44,13 +46,15 @@ export class CoreChartComponent implements OnDestroy, OnInit, OnChanges {
     @Input() type: string; // Type of chart.
     @Input() legend: any; // Legend options.
     @Input() height = 300; // Height of the chart element.
+    @Input() filter?: boolean | string; // Whether to filter labels. If not defined, true if contextLevel and instanceId are set.
+    @Input() contextLevel?: string; // The context level of the text.
+    @Input() contextInstanceId?: number; // The instance ID related to the context.
+    @Input() wsNotFiltered?: boolean | string; // If true it means the WS didn't filter the labels for some reason.
     @ViewChild('canvas') canvas: ElementRef;
 
     chart: any;
 
-    constructor() {
-        // Nothing to do.
-    }
+    constructor(protected filterProvider: CoreFilterProvider, private utils: CoreUtilsProvider) { }
 
     /**
      * Component being initialized.
@@ -86,17 +90,21 @@ export class CoreChartComponent implements OnDestroy, OnInit, OnChanges {
             this.type = 'horizontalBar';
         }
 
-        const context = this.canvas.nativeElement.getContext('2d');
-        this.chart = new Chart(context, {
-            type: this.type,
-            data: {
-                labels: this.labels,
-                datasets: [{
-                    data:  this.data,
-                    backgroundColor: this.getRandomColors(this.data.length)
-                }]
-            },
-            options: {legend: legend}
+        // Format labels if needed.
+        this.formatLabels().then(() => {
+
+            const context = this.canvas.nativeElement.getContext('2d');
+            this.chart = new Chart(context, {
+                type: this.type,
+                data: {
+                    labels: this.labels,
+                    datasets: [{
+                        data:  this.data,
+                        backgroundColor: this.getRandomColors(this.data.length)
+                    }]
+                },
+                options: {legend: legend}
+            });
         });
     }
 
@@ -105,15 +113,49 @@ export class CoreChartComponent implements OnDestroy, OnInit, OnChanges {
      */
     ngOnChanges(): void {
         if (this.chart) {
-            this.chart.data.datasets[0] = {
-                data: this.data,
-                backgroundColor: this.getRandomColors(this.data.length)
-            };
-            this.chart.data.labels = this.labels;
-            this.chart.update();
+            // Format labels if needed.
+            this.formatLabels().then(() => {
+                this.chart.data.datasets[0] = {
+                    data: this.data,
+                    backgroundColor: this.getRandomColors(this.data.length)
+                };
+                this.chart.data.labels = this.labels;
+                this.chart.update();
+            });
         }
     }
 
+    /**
+     * Format labels if needed.
+     *
+     * @return Promise resolved when done.
+     */
+    protected formatLabels(): Promise<any> {
+        this.filter = typeof this.filter == 'undefined' ? !!(this.contextLevel && this.contextInstanceId) : !!this.filter;
+
+        if (!this.filter) {
+            return Promise.resolve();
+        }
+
+        const options = {
+            clean: true,
+            singleLine: true,
+            wsNotFiltered: this.utils.isTrueOrOne(this.wsNotFiltered)
+        };
+
+        return this.filterProvider.getFilters(this.contextLevel, this.contextInstanceId, options).then((filters) => {
+            const promises = [];
+
+            this.labels.forEach((label, i) => {
+                promises.push(this.filterProvider.formatText(label, options, filters).then((text) => {
+                    this.labels[i] = text;
+                }));
+            });
+
+            return Promise.all(promises);
+        });
+    }
+
     /**
      * Generate random colors if needed.
      *
diff --git a/src/core/filter/providers/default-filter.ts b/src/core/filter/providers/default-filter.ts
index d339a4c8d..77abe1443 100644
--- a/src/core/filter/providers/default-filter.ts
+++ b/src/core/filter/providers/default-filter.ts
@@ -14,7 +14,8 @@
 
 import { Injectable } from '@angular/core';
 import { CoreFilterHandler } from './delegate';
-import { CoreFilterFilter } from './filter';
+import { CoreFilterFilter, CoreFilterFormatTextOptions } from './filter';
+import { CoreSite } from '@classes/site';
 
 /**
  * Default handler used when the module doesn't have a specific implementation.
@@ -34,9 +35,11 @@ export class CoreFilterDefaultHandler implements CoreFilterHandler {
      * @param text The text to filter.
      * @param filter The filter.
      * @param options Options passed to the filters.
+     * @param siteId Site ID. If not defined, current site.
      * @return Filtered text (or promise resolved with the filtered text).
      */
-    filter(text: string, filter: CoreFilterFilter, options: any): string | Promise<string> {
+    filter(text: string, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions, siteId?: string)
+            : string | Promise<string> {
         return text;
     }
 
@@ -50,15 +53,13 @@ export class CoreFilterDefaultHandler implements CoreFilterHandler {
     }
 
     /**
-     * Setup the filter to be used.
+     * Check if the filter should be applied in a certain site based on some filter options.
      *
-     * Please notice this method iwill be called for each piece of text being filtered, so it is responsible
-     * for controlling its own execution cardinality.
-     *
-     * @param filter The filter.
-     * @return Promise resolved when done, or nothing if it's synchronous.
+     * @param options Options.
+     * @param site Site.
+     * @return Whether filter should be applied.
      */
-    setup(filter: CoreFilterFilter): void | Promise<any> {
-        // Nothing to do.
+    shouldBeApplied(options: CoreFilterFormatTextOptions, site?: CoreSite): boolean {
+        return true;
     }
 }
diff --git a/src/core/filter/providers/delegate.ts b/src/core/filter/providers/delegate.ts
index 4fd742262..3fa27c298 100644
--- a/src/core/filter/providers/delegate.ts
+++ b/src/core/filter/providers/delegate.ts
@@ -16,9 +16,10 @@ import { Injectable } from '@angular/core';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider } from '@providers/sites';
-import { CoreFilterFilter } from './filter';
+import { CoreFilterFilter, CoreFilterFormatTextOptions } from './filter';
 import { CoreFilterDefaultHandler } from './default-filter';
 import { CoreDelegate, CoreDelegateHandler } from '@classes/delegate';
+import { CoreSite } from '@classes/site';
 
 /**
  * Interface that all filter handlers must implement.
@@ -35,20 +36,19 @@ export interface CoreFilterHandler extends CoreDelegateHandler {
      * @param text The text to filter.
      * @param filter The filter.
      * @param options Options passed to the filters.
+     * @param siteId Site ID. If not defined, current site.
      * @return Filtered text (or promise resolved with the filtered text).
      */
-    filter(text: string, filter: CoreFilterFilter, options: any): string | Promise<string>;
+    filter(text: string, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions, siteId?: string): string | Promise<string>;
 
     /**
-     * Setup the filter to be used.
+     * Check if the filter should be applied in a certain site based on some filter options.
      *
-     * Please notice this method iwill be called for each piece of text being filtered, so it is responsible
-     * for controlling its own execution cardinality.
-     *
-     * @param filter The filter.
-     * @return Promise resolved when done, or nothing if it's synchronous.
+     * @param options Options.
+     * @param site Site.
+     * @return Whether filter should be applied.
      */
-    setup(filter: CoreFilterFilter): void | Promise<any>;
+    shouldBeApplied(options: CoreFilterFormatTextOptions, site?: CoreSite): boolean;
 }
 
 /**
@@ -71,12 +71,10 @@ export class CoreFilterDelegate extends CoreDelegate {
      * @param filters Filters to apply.
      * @param options Options passed to the filters.
      * @param skipFilters Names of filters that shouldn't be applied.
+     * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the filtered text.
      */
-    filterText(text: string, filters: CoreFilterFilter[], options?: any, skipFilters?: string[]): Promise<string> {
-        if (!text || typeof text != 'string') {
-            return Promise.resolve('');
-        }
+    filterText(text: string, filters: CoreFilterFilter[], options?: any, skipFilters?: string[], siteId?: string): Promise<string> {
 
         // Wait for filters to be initialized.
         return this.handlersInitPromise.then(() => {
@@ -98,7 +96,7 @@ export class CoreFilterDelegate extends CoreDelegate {
                 }
 
                 promise = promise.then((text) => {
-                    return this.executeFunctionOnEnabled(filter.filter, 'filter', [text, filter, options]);
+                    return this.executeFunctionOnEnabled(filter.filter, 'filter', [text, filter, options, siteId]);
                 });
             });
 
@@ -138,18 +136,48 @@ export class CoreFilterDelegate extends CoreDelegate {
     }
 
     /**
-     * Setup filters to be applied to some content.
+     * Check if at least 1 filter should be applied in a certain site and with certain options.
      *
-     * @param filters Filters to apply.
-     * @return Promise resolved when done.
+     * @param filter Filter to check.
+     * @param options Options passed to the filters.
+     * @param site Site. If not defined, current site.
+     * @return {Promise<boolean>} Promise resolved with true: whether the filter should be applied.
      */
-    setupFilters(filters: CoreFilterFilter[]): Promise<any> {
-        const promises: Promise<any>[] = [];
+    shouldBeApplied(filters: CoreFilterFilter[], options: CoreFilterFormatTextOptions, site?: CoreSite): Promise<boolean> {
+        // Wait for filters to be initialized.
+        return this.handlersInitPromise.then(() => {
+            const promises = [];
+            let shouldBeApplied = false;
 
-        filters.forEach((filter) => {
-            promises.push(this.executeFunctionOnEnabled(filter.filter, 'setup', [filter]));
+            filters.forEach((filter) => {
+                promises.push(this.shouldFilterBeApplied(filter, options, site).then((applied) => {
+                    if (applied) {
+                        shouldBeApplied = applied;
+                    }
+                }));
+            });
+
+            return Promise.all(promises).then(() => {
+                return shouldBeApplied;
+            });
         });
+    }
 
-        return Promise.all(promises);
+    /**
+     * Check whether a filter should be applied in a certain site and with certain options.
+     *
+     * @param filter Filter to check.
+     * @param options Options passed to the filters.
+     * @param site Site. If not defined, current site.
+     * @return {Promise<boolean>} Promise resolved with true: whether the filter should be applied.
+     */
+    protected shouldFilterBeApplied(filter: CoreFilterFilter, options: CoreFilterFormatTextOptions, site?: CoreSite)
+            : Promise<boolean> {
+
+        if (!this.hasHandler(filter.filter, true)) {
+            return Promise.resolve(false);
+        }
+
+        return Promise.resolve(this.executeFunctionOnEnabled(filter.filter, 'shouldBeApplied', [options, site]));
     }
 }
diff --git a/src/core/filter/providers/filter.ts b/src/core/filter/providers/filter.ts
index 9e6752d12..ca8e77078 100644
--- a/src/core/filter/providers/filter.ts
+++ b/src/core/filter/providers/filter.ts
@@ -29,8 +29,6 @@ export class CoreFilterProvider {
     protected ROOT_CACHE_KEY = 'mmFilter:';
 
     protected logger;
-    protected FILTERS_NOT_TREATED = ['activitynames', 'censor', 'data', 'emailprotect', 'emoticon', 'glossary', 'tex', 'tidy',
-            'urltolink'];
 
     constructor(logger: CoreLoggerProvider,
             private sitesProvider: CoreSitesProvider,
@@ -71,9 +69,11 @@ export class CoreFilterProvider {
      * @param text The text to be formatted.
      * @param options Formatting options.
      * @param filters The filters to apply. Required if filter is set to true.
+     * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the formatted text.
      */
-    formatText(text: string, options?: CoreFilterFormatTextOptions, filters?: CoreFilterFilter[]): Promise<string> {
+    formatText(text: string, options?: CoreFilterFormatTextOptions, filters?: CoreFilterFilter[], siteId?: string)
+            : Promise<string> {
 
         if (!text || typeof text != 'string') {
             // No need to do any filters and cleaning.
@@ -95,12 +95,10 @@ export class CoreFilterProvider {
             options.filter  = false;
         }
 
-        // @todo: Setup?
-
         let promise: Promise<string>;
 
         if (options.filter) {
-            promise = this.filterDelegate.filterText(text, filters, options);
+            promise = this.filterDelegate.filterText(text, filters, options, [], siteId);
         } else {
             promise = Promise.resolve(text);
         }
@@ -250,17 +248,18 @@ export class CoreFilterProvider {
     }
 
     /**
-     * Get filters and format text.
+     * Get the filters in a certain context, performing some checks like the site version.
+     * It's recommended to use this function instead of canGetAvailableInContext because this function will check if
+     * it's really needed to call the WS.
      *
-     * @param text Text to filter.
      * @param contextLevel The context level.
      * @param instanceId Instance ID related to the context.
      * @param options Options for format text.
      * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with the formatted text.
+     * @return Promise resolved with the filters.
      */
-    getFiltersAndFormatText(text: string, contextLevel: string, instanceId: number, options?: CoreFilterFormatTextOptions,
-            siteId?: string): Promise<string> {
+    getFilters(contextLevel: string, instanceId: number, options?: CoreFilterFormatTextOptions, siteId?: string)
+            : Promise<CoreFilterFilter[]> {
 
         options.contextLevel = contextLevel;
         options.instanceId = instanceId;
@@ -275,7 +274,7 @@ export class CoreFilterProvider {
             }
 
             // Check if site has any filter to treat.
-            return this.siteHasFiltersToTreat(siteId).then((hasFilters) => {
+            return this.siteHasFiltersToTreat(options, siteId).then((hasFilters) => {
                 if (hasFilters) {
                     options.filter = true;
 
@@ -286,8 +285,24 @@ export class CoreFilterProvider {
             }).catch(() => {
                 return [];
             });
-        }).then((filters) => {
-            return this.formatText(text, options, filters);
+        });
+    }
+
+    /**
+     * Get filters and format text.
+     *
+     * @param text Text to filter.
+     * @param contextLevel The context level.
+     * @param instanceId Instance ID related to the context.
+     * @param options Options for format text.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the formatted text.
+     */
+    getFiltersAndFormatText(text: string, contextLevel: string, instanceId: number, options?: CoreFilterFormatTextOptions,
+            siteId?: string): Promise<string> {
+
+        return this.getFilters(contextLevel, instanceId, options, siteId).then((filters) => {
+            return this.formatText(text, options, filters, siteId);
         });
     }
 
@@ -331,29 +346,19 @@ export class CoreFilterProvider {
     /**
      * Check if site has available any filter that should be treated by the app.
      *
+     * @param options Options passed to the filters.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with boolean: whether it has filters to treat.
      */
-    siteHasFiltersToTreat(siteId?: string): Promise<boolean> {
+    siteHasFiltersToTreat(options?: CoreFilterFormatTextOptions, siteId?: string): Promise<boolean> {
+        options = options || {};
+
         return this.sitesProvider.getSite(siteId).then((site) => {
 
             // Get filters at site level.
             return this.getAvailableInContext('system', site.getSiteHomeId(), site.getId()).then((filters) => {
 
-                for (let i = 0; i < filters.length; i++) {
-                    const filter = filters[i];
-
-                    if (this.FILTERS_NOT_TREATED.indexOf(filter.filter) != -1) {
-                        continue;
-                    }
-
-                    if (this.filterDelegate.hasHandler(filter.filter, true)) {
-                        // There is a filter to treat and is enabled.
-                        return true;
-                    }
-                }
-
-                return false;
+                return this.filterDelegate.shouldBeApplied(filters, options, site);
             });
         });
     }
@@ -390,4 +395,5 @@ export type CoreFilterFormatTextOptions = {
     singleLine?: boolean; // If true then new lines will be removed (all the text in a single line).
     shortenLength?: number; // Number of characters to shorten the text.
     highlight?: string; // Text to highlight.
+    wsNotFiltered?: boolean; // If true it means the WS didn't filter the text for some reason.
 };
diff --git a/src/directives/format-text.ts b/src/directives/format-text.ts
index e9c78ec04..644812107 100644
--- a/src/directives/format-text.ts
+++ b/src/directives/format-text.ts
@@ -61,6 +61,7 @@ export class CoreFormatTextDirective implements OnChanges {
     @Input() filter?: boolean | string; // Whether to filter the text. If not defined, true if contextLevel and instanceId are set.
     @Input() contextLevel?: string; // The context level of the text.
     @Input() contextInstanceId?: number; // The instance ID related to the context.
+    @Input() wsNotFiltered?: boolean | string; // If true it means the WS didn't filter the text for some reason.
     @Output() afterRender?: EventEmitter<any>; // Called when the data is rendered.
 
     protected element: HTMLElement;
@@ -382,7 +383,7 @@ export class CoreFormatTextDirective implements OnChanges {
                 clean: this.utils.isTrueOrOne(this.clean),
                 singleLine: this.utils.isTrueOrOne(this.singleLine),
                 highlight: this.highlight,
-                filter: this.filter
+                wsNotFiltered: this.utils.isTrueOrOne(this.wsNotFiltered)
             };
 
             if (this.filter) {

From 30a5e83056d6ccca8df6216693a7ea46bfec5a9d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 3 Oct 2019 17:37:51 +0200
Subject: [PATCH 070/257] MOBILE-2491 filter: Minimize WS calls for module
 context

---
 .../addon-block-recentlyaccesseditems.html    |   2 +-
 .../events/addon-block-timeline-events.html   |   2 +-
 .../calendar/pages/edit-event/edit-event.ts   |   6 +-
 .../course/addon-competency-course.html       |   2 +-
 .../pages/competency/competency.html          |   2 +-
 .../messages/providers/mainmenu-handler.ts    |   6 +-
 .../addon-mod-assign-feedback-plugin.html     |   2 +-
 .../index/addon-mod-assign-index.html         |   2 +-
 .../mod/assign/components/index/index.ts      |   2 +-
 .../addon-mod-assign-submission-plugin.html   |   2 +-
 .../addon-mod-assign-feedback-comments.html   |   2 +-
 .../feedback/comments/component/comments.ts   |   2 +-
 src/addon/mod/assign/pages/edit/edit.html     |   2 +-
 src/addon/mod/assign/pages/index/index.html   |   2 +-
 .../submission-list/submission-list.html      |   2 +-
 .../submission-review/submission-review.html  |   2 +-
 .../addon-mod-assign-submission-comments.html |   2 +-
 ...ddon-mod-assign-submission-onlinetext.html |   2 +-
 .../onlinetext/component/onlinetext.ts        |   2 +-
 .../index/addon-mod-book-index.html           |   4 +-
 src/addon/mod/book/components/index/index.ts  |   3 +-
 src/addon/mod/book/pages/index/index.html     |   2 +-
 src/addon/mod/book/pages/toc/toc.html         |   2 +-
 src/addon/mod/book/pages/toc/toc.ts           |   2 +
 .../index/addon-mod-chat-index.html           |   2 +-
 src/addon/mod/chat/pages/chat/chat.html       |   6 +-
 src/addon/mod/chat/pages/index/index.html     |   2 +-
 .../session-messages/session-messages.html    |   4 +-
 .../index/addon-mod-choice-index.html         |  12 +-
 src/addon/mod/choice/pages/index/index.html   |   2 +-
 .../action/addon-mod-data-action.html         |   6 +-
 .../index/addon-mod-data-index.html           |   2 +-
 .../addon-mod-data-field-textarea.html        |   2 +-
 src/addon/mod/data/pages/edit/edit.html       |   2 +-
 src/addon/mod/data/pages/entry/entry.html     |   4 +-
 src/addon/mod/data/pages/index/index.html     |   2 +-
 .../index/addon-mod-feedback-index.html       |  10 +-
 .../mod/feedback/pages/attempt/attempt.html   |   4 +-
 src/addon/mod/feedback/pages/form/form.html   |  14 +-
 src/addon/mod/feedback/pages/index/index.html |   2 +-
 .../index/addon-mod-folder-index.html         |   2 +-
 src/addon/mod/folder/pages/index/index.html   |   2 +-
 .../index/addon-mod-forum-index.html          |   6 +-
 .../components/post/addon-mod-forum-post.html |   4 +-
 .../forum/pages/discussion/discussion.html    |   2 +-
 .../mod/forum/pages/discussion/discussion.ts  |   1 +
 src/addon/mod/forum/pages/index/index.html    |   2 +-
 .../index/addon-mod-glossary-index.html       |   2 +-
 src/addon/mod/glossary/pages/edit/edit.html   |   2 +-
 src/addon/mod/glossary/pages/entry/entry.html |   6 +-
 src/addon/mod/glossary/pages/index/index.html |   2 +-
 .../index/addon-mod-imscp-index.html          |   2 +-
 src/addon/mod/imscp/pages/index/index.html    |   2 +-
 .../index/addon-mod-lesson-index.html         |   2 +-
 src/addon/mod/lesson/pages/index/index.html   |   2 +-
 .../lesson/pages/menu-modal/menu-modal.html   |   2 +-
 src/addon/mod/lesson/pages/player/player.html |  20 +-
 .../lesson/pages/user-retake/user-retake.html |  22 +--
 .../components/index/addon-mod-lti-index.html |   2 +-
 src/addon/mod/lti/pages/index/index.html      |   2 +-
 .../index/addon-mod-page-index.html           |   4 +-
 src/addon/mod/page/pages/index/index.html     |   2 +-
 .../index/addon-mod-quiz-index.html           |   6 +-
 src/addon/mod/quiz/pages/attempt/attempt.html |   4 +-
 src/addon/mod/quiz/pages/index/index.html     |   2 +-
 src/addon/mod/quiz/pages/player/player.html   |   4 +-
 src/addon/mod/quiz/pages/review/review.html   |   4 +-
 .../index/addon-mod-resource-index.html       |   2 +-
 src/addon/mod/resource/pages/index/index.html |   2 +-
 .../index/addon-mod-scorm-index.html          |   6 +-
 src/addon/mod/scorm/pages/index/index.html    |   2 +-
 src/addon/mod/scorm/pages/player/player.html  |   2 +-
 src/addon/mod/scorm/pages/player/player.ts    |   3 +-
 src/addon/mod/scorm/pages/toc/toc.html        |   2 +-
 src/addon/mod/scorm/pages/toc/toc.ts          |   2 +
 .../index/addon-mod-survey-index.html         |   2 +-
 .../components/index/addon-mod-url-index.html |   2 +-
 .../index/addon-mod-wiki-index.html           |   4 +-
 src/addon/mod/wiki/components/index/index.ts  |   3 +-
 src/addon/mod/wiki/pages/edit/edit.html       |   2 +-
 src/addon/mod/wiki/pages/index/index.html     |   2 +-
 src/addon/mod/wiki/pages/map/map.html         |   2 +-
 src/addon/mod/wiki/pages/map/map.ts           |   2 +
 ...shop-assessment-strategy-accumulative.html |   4 +-
 ...workshop-assessment-strategy-comments.html |   4 +-
 ...orkshop-assessment-strategy-numerrors.html |   4 +-
 ...d-workshop-assessment-strategy-rubric.html |   4 +-
 .../classes/assessment-strategy-component.ts  |   1 +
 ...ddon-mod-workshop-assessment-strategy.html |   2 +-
 .../assessment-strategy.ts                    |   4 +-
 .../index/addon-mod-workshop-index.html       |   8 +-
 .../addon-mod-workshop-submission.html        |   8 +-
 .../workshop/pages/assessment/assessment.html |   4 +-
 src/addon/mod/workshop/pages/index/index.html |   2 +-
 .../workshop/pages/submission/submission.html |   6 +-
 .../component/addon-qtype-calculated.html     |   2 +-
 .../component/addon-qtype-ddimageortext.html  |   2 +-
 .../component/addon-qtype-ddmarker.html       |   2 +-
 .../ddwtos/component/addon-qtype-ddwtos.html  |   2 +-
 src/addon/qtype/ddwtos/component/ddwtos.ts    |   2 +-
 .../component/addon-qtype-description.html    |   2 +-
 .../essay/component/addon-qtype-essay.html    |   6 +-
 .../component/addon-qtype-gapselect.html      |   2 +-
 .../qtype/gapselect/component/gapselect.ts    |   2 +-
 .../match/component/addon-qtype-match.html    |   4 +-
 .../component/addon-qtype-multianswer.html    |   2 +-
 .../multianswer/component/multianswer.ts      |   2 +-
 .../component/addon-qtype-multichoice.html    |  10 +-
 .../component/addon-qtype-shortanswer.html    |   2 +-
 .../addon-user-profile-field-menu.html        |   2 +-
 .../userprofilefield/menu/component/menu.ts   |   1 +
 .../addon-user-profile-field-text.html        |   2 +-
 .../userprofilefield/text/component/text.ts   |   1 +
 .../addon-user-profile-field-textarea.html    |   2 +-
 .../textarea/component/textarea.ts            |   1 +
 src/components/chart/chart.ts                 |   8 +-
 .../navigation-bar/navigation-bar.ts          |   3 +-
 src/components/site-picker/site-picker.ts     |   6 +-
 .../comments/components/comments/comments.ts  |   2 +
 src/core/comments/pages/viewer/viewer.html    |   6 +-
 src/core/comments/pages/viewer/viewer.ts      |   2 +
 .../course/classes/main-resource-component.ts |   2 +-
 .../module-completion/module-completion.ts    |   8 +-
 .../core-course-module-description.html       |   2 +-
 .../module-description/module-description.ts  |   1 +
 .../components/module/core-course-module.html |   6 +-
 .../core-course-unsupported-module.html       |   2 +-
 .../unsupported-module/unsupported-module.ts  |   2 +-
 src/core/course/pages/section/section.ts      |   6 +-
 .../unsupported-module.html                   |   4 +-
 .../unsupported-module/unsupported-module.ts  |   4 +-
 src/core/course/providers/default-module.ts   |   2 +-
 src/core/filter/filter.module.ts              |   7 +-
 src/core/filter/providers/filter.ts           |  80 +-------
 src/core/filter/providers/helper.ts           | 171 ++++++++++++++++++
 src/core/login/pages/sites/sites.ts           |   6 +-
 .../providers/pushnotifications.ts            |  92 ++++++----
 .../classes/base-question-component.ts        |   1 +
 .../components/question/core-question.html    |   4 +-
 .../question/components/question/question.ts  |   2 +
 src/core/question/providers/helper.ts         |   5 +-
 .../settings/pages/space-usage/space-usage.ts |   6 +-
 .../components/module-index/module-index.ts   |   2 +-
 .../user-profile-field/user-profile-field.ts  |   2 +
 src/core/user/pages/about/about.html          |   2 +-
 src/core/viewer/pages/text/text.html          |   2 +-
 src/core/viewer/pages/text/text.ts            |   2 +
 src/directives/format-text.ts                 |   9 +-
 src/providers/utils/text.ts                   |   6 +-
 149 files changed, 507 insertions(+), 348 deletions(-)
 create mode 100644 src/core/filter/providers/helper.ts

diff --git a/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html b/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
index dbf92f587..cfa2892d6 100644
--- a/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
+++ b/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
@@ -7,7 +7,7 @@
             <ion-card>
                 <a ion-item text-wrap detail-none class="core-course-module-handler item-media" (click)="action($event, item)" [title]="item.name">
                     <img item-start [src]="item.iconUrl" alt="" role="presentation" *ngIf="item.iconUrl" class="core-module-icon">
-                    <h2><core-format-text [text]="item.name" contextLevel="module" [contextInstanceId]="item.cmid"></core-format-text></h2>
+                    <h2><core-format-text [text]="item.name" contextLevel="module" [contextInstanceId]="item.cmid" [courseId]="item.courseid"></core-format-text></h2>
                     <p><core-format-text [text]="item.coursename" contextLevel="course" [contextInstanceId]="item.courseid"></core-format-text></p>
                 </a>
             </ion-card>
diff --git a/src/addon/block/timeline/components/events/addon-block-timeline-events.html b/src/addon/block/timeline/components/events/addon-block-timeline-events.html
index 22e5445f7..832c4902d 100644
--- a/src/addon/block/timeline/components/events/addon-block-timeline-events.html
+++ b/src/addon/block/timeline/components/events/addon-block-timeline-events.html
@@ -5,7 +5,7 @@
     <ng-container *ngFor="let event of dayEvents.events">
         <a ion-item text-wrap detail-none class="core-course-module-handler item-media" (click)="action($event, event.url)" [title]="event.name">
             <img item-start [src]="event.iconUrl" alt="" role="presentation" *ngIf="event.iconUrl" class="core-module-icon">
-            <h2><core-format-text [text]="event.name" contextLevel="module" [contextInstanceId]="event.id"></core-format-text></h2>
+            <h2><core-format-text [text]="event.name" contextLevel="module" [contextInstanceId]="event.id" [courseId]="event.course.id"></core-format-text></h2>
             <p *ngIf="showCourse">
                 <core-format-text [text]="event.course.fullnamedisplay" contextLevel="course" [contextInstanceId]="event.course.id"></core-format-text>
             </p>
diff --git a/src/addon/calendar/pages/edit-event/edit-event.ts b/src/addon/calendar/pages/edit-event/edit-event.ts
index 18f0e5feb..04027cae0 100644
--- a/src/addon/calendar/pages/edit-event/edit-event.ts
+++ b/src/addon/calendar/pages/edit-event/edit-event.ts
@@ -31,7 +31,7 @@ import { AddonCalendarOfflineProvider } from '../../providers/calendar-offline';
 import { AddonCalendarHelperProvider } from '../../providers/helper';
 import { AddonCalendarSyncProvider } from '../../providers/calendar-sync';
 import { CoreSite } from '@classes/site';
-import { CoreFilterProvider } from '@core/filter/providers/filter';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Page that displays a form to create/edit an event.
@@ -93,7 +93,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
             private calendarSync: AddonCalendarSyncProvider,
             private fb: FormBuilder,
             private syncProvider: CoreSyncProvider,
-            private filterProvider: CoreFilterProvider,
+            private filterHelper: CoreFilterHelperProvider,
             @Optional() private svComponent: CoreSplitViewComponent) {
 
         this.eventId = navParams.get('eventId');
@@ -244,7 +244,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
                     // Format the name of the courses.
                     const subPromises = [];
                     courses.forEach((course) => {
-                        subPromises.push(this.filterProvider.getFiltersAndFormatText(course.fullname, 'course', course.id)
+                        subPromises.push(this.filterHelper.getFiltersAndFormatText(course.fullname, 'course', course.id)
                                 .then((text) => {
                             course.fullname = text;
                         }).catch(() => {
diff --git a/src/addon/competency/components/course/addon-competency-course.html b/src/addon/competency/components/course/addon-competency-course.html
index 4ccccd2bc..74722c707 100644
--- a/src/addon/competency/components/course/addon-competency-course.html
+++ b/src/addon/competency/components/course/addon-competency-course.html
@@ -69,7 +69,7 @@
                         </p>
                         <a ion-item text-wrap *ngFor="let activity of competency.coursemodules" [href]="activity.url" [title]="activity.name" core-link capture="true" class="core-course-module-handler item-media">
                             <img item-start [src]="activity.iconurl" core-external-content alt="" role="presentation" *ngIf="activity.iconurl" class="core-module-icon">
-                            <core-format-text [text]="activity.name" contextLevel="module" [contextInstanceId]="activity.id"></core-format-text>
+                            <core-format-text [text]="activity.name" contextLevel="module" [contextInstanceId]="activity.id" [courseId]="courseId"></core-format-text>
                         </a>
                     </div>
                     <div *ngIf="competency.plans">
diff --git a/src/addon/competency/pages/competency/competency.html b/src/addon/competency/pages/competency/competency.html
index 1835fb1bc..664ca9393 100644
--- a/src/addon/competency/pages/competency/competency.html
+++ b/src/addon/competency/pages/competency/competency.html
@@ -48,7 +48,7 @@
                 </p>
                 <a ion-item text-wrap *ngFor="let activity of coursemodules" [href]="activity.url" [title]="activity.name" core-link capture="true">
                     <img item-start core-external-content [src]="activity.iconurl" alt="" role="presentation" *ngIf="activity.iconurl" class="core-module-icon">
-                    <core-format-text [text]="activity.name" contextLevel="module" [contextInstanceId]="activity.id"></core-format-text>
+                    <core-format-text [text]="activity.name" contextLevel="module" [contextInstanceId]="activity.id" [courseId]="courseId"></core-format-text>
                 </a>
             </ion-item>
             <ion-item text-wrap *ngIf="userCompetency.status">
diff --git a/src/addon/messages/providers/mainmenu-handler.ts b/src/addon/messages/providers/mainmenu-handler.ts
index 84cec9984..1544ce7a1 100644
--- a/src/addon/messages/providers/mainmenu-handler.ts
+++ b/src/addon/messages/providers/mainmenu-handler.ts
@@ -24,7 +24,7 @@ import { CoreLocalNotificationsProvider } from '@providers/local-notifications';
 import { CorePushNotificationsProvider } from '@core/pushnotifications/providers/pushnotifications';
 import { CorePushNotificationsDelegate } from '@core/pushnotifications/providers/delegate';
 import { CoreEmulatorHelperProvider } from '@core/emulator/providers/helper';
-import { CoreFilterProvider } from '@core/filter/providers/filter';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to inject an option into main menu.
@@ -49,7 +49,7 @@ export class AddonMessagesMainMenuHandler implements CoreMainMenuHandler, CoreCr
 
     constructor(private messagesProvider: AddonMessagesProvider, private sitesProvider: CoreSitesProvider,
             eventsProvider: CoreEventsProvider, private appProvider: CoreAppProvider,
-            private localNotificationsProvider: CoreLocalNotificationsProvider, private filterProvider: CoreFilterProvider,
+            private localNotificationsProvider: CoreLocalNotificationsProvider, private filterHelper: CoreFilterHelperProvider,
             private pushNotificationsProvider: CorePushNotificationsProvider, utils: CoreUtilsProvider,
             pushNotificationsDelegate: CorePushNotificationsDelegate, private emulatorHelper: CoreEmulatorHelperProvider) {
 
@@ -297,7 +297,7 @@ export class AddonMessagesMainMenuHandler implements CoreMainMenuHandler, CoreCr
             title: message.name || message.userfromfullname,
         };
 
-        return this.filterProvider.getFiltersAndFormatText(message.text, 'system', this.sitesProvider.getCurrentSiteHomeId(),
+        return this.filterHelper.getFiltersAndFormatText(message.text, 'system', this.sitesProvider.getCurrentSiteHomeId(),
                 {clean: true, singleLine: true}).catch(() => {
             return message.text;
         }).then((formattedText) => {
diff --git a/src/addon/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html b/src/addon/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html
index 131ee1bd6..daa72e7d8 100644
--- a/src/addon/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html
+++ b/src/addon/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html
@@ -8,7 +8,7 @@
                 {{ 'addon.mod_assign.feedbacknotsupported' | translate }}
             </ion-badge>
             <p *ngIf="text">
-                <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true" [fullTitle]="plugin.name" [text]="text" contextLevel="module" [contextInstanceId]="assign.cmid"></core-format-text>
+                <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true" [fullTitle]="plugin.name" [text]="text" contextLevel="module" [contextInstanceId]="assign.cmid" [courseId]="assign.course"></core-format-text>
             </p>
             <core-file *ngFor="let file of files" [file]="file" [component]="component" [componentId]="assign.cmid" [alwaysDownload]="true"></core-file>
         </ion-item>
diff --git a/src/addon/mod/assign/components/index/addon-mod-assign-index.html b/src/addon/mod/assign/components/index/addon-mod-assign-index.html
index a13be748d..eb716eebb 100644
--- a/src/addon/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addon/mod/assign/components/index/addon-mod-assign-index.html
@@ -17,7 +17,7 @@
     <!-- Description and intro attachments. -->
     <ion-card *ngIf="description" (click)="expandDescription($event)">
         <ion-item text-wrap>
-            <core-format-text [text]="description" [component]="component" [componentId]="componentId" maxHeight="120" contextLevel="module" [contextInstanceId]="module.id" (click)="expandDescription($event)"></core-format-text>
+            <core-format-text [text]="description" [component]="component" [componentId]="componentId" maxHeight="120" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId" (click)="expandDescription($event)"></core-format-text>
         </ion-item>
     </ion-card>
 
diff --git a/src/addon/mod/assign/components/index/index.ts b/src/addon/mod/assign/components/index/index.ts
index 23be9881f..1d37fe6ac 100644
--- a/src/addon/mod/assign/components/index/index.ts
+++ b/src/addon/mod/assign/components/index/index.ts
@@ -134,7 +134,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
 
         if (this.assign && (this.description || this.assign.introattachments)) {
             this.textUtils.expandText(this.translate.instant('core.description'), this.description, this.component,
-                    this.module.id, this.assign.introattachments, true, 'module', this.module.id);
+                    this.module.id, this.assign.introattachments, true, 'module', this.module.id, this.courseId);
         }
     }
 
diff --git a/src/addon/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html b/src/addon/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html
index 6a6a9dfe8..d7223bfc7 100644
--- a/src/addon/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html
+++ b/src/addon/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html
@@ -8,7 +8,7 @@
                 {{ 'addon.mod_assign.submissionnotsupported' | translate }}
             </ion-badge>
             <p *ngIf="text">
-                <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true" [fullTitle]="plugin.name" [text]="text" contextLevel="module" [contextInstanceId]="assign.cmid"></core-format-text>
+                <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true" [fullTitle]="plugin.name" [text]="text" contextLevel="module" [contextInstanceId]="assign.cmid" [courseId]="assign.course"></core-format-text>
             </p>
             <core-file *ngFor="let file of files" [file]="file" [component]="component" [componentId]="assign.cmid" [alwaysDownload]="true"></core-file>
         </ion-item>
diff --git a/src/addon/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html b/src/addon/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html
index bb23e20a9..6a2fff370 100644
--- a/src/addon/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html
+++ b/src/addon/mod/assign/feedback/comments/component/addon-mod-assign-feedback-comments.html
@@ -2,7 +2,7 @@
 <ion-item text-wrap *ngIf="(text || canEdit) && !edit">
     <h2>{{ plugin.name }}</h2>
     <p>
-        <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true" [fullTitle]="plugin.name" [text]="text" contextLevel="module" [contextInstanceId]="assign.cmid"></core-format-text>
+        <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true" [fullTitle]="plugin.name" [text]="text" contextLevel="module" [contextInstanceId]="assign.cmid" [courseId]="assign.course"></core-format-text>
     </p>
     <div item-end>
         <div text-end>
diff --git a/src/addon/mod/assign/feedback/comments/component/comments.ts b/src/addon/mod/assign/feedback/comments/component/comments.ts
index 4da125a41..27eb0baa1 100644
--- a/src/addon/mod/assign/feedback/comments/component/comments.ts
+++ b/src/addon/mod/assign/feedback/comments/component/comments.ts
@@ -66,7 +66,7 @@ export class AddonModAssignFeedbackCommentsComponent extends AddonModAssignFeedb
                     if (this.text) {
                         // Open a new state with the text.
                         this.textUtils.expandText(this.plugin.name, this.text, this.component, this.assign.cmid, undefined, true,
-                                'module', this.assign.cmid);
+                                'module', this.assign.cmid, this.assign.course);
                     }
                 });
             } else if (this.edit) {
diff --git a/src/addon/mod/assign/pages/edit/edit.html b/src/addon/mod/assign/pages/edit/edit.html
index 8549419ff..c85acfcf9 100644
--- a/src/addon/mod/assign/pages/edit/edit.html
+++ b/src/addon/mod/assign/pages/edit/edit.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <button ion-button clear (click)="save()" [attr.aria-label]="'core.save' | translate">
diff --git a/src/addon/mod/assign/pages/index/index.html b/src/addon/mod/assign/pages/index/index.html
index c4627d316..3b40f57c1 100644
--- a/src/addon/mod/assign/pages/index/index.html
+++ b/src/addon/mod/assign/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/assign/pages/submission-list/submission-list.html b/src/addon/mod/assign/pages/submission-list/submission-list.html
index 243620516..c11241dbb 100644
--- a/src/addon/mod/assign/pages/submission-list/submission-list.html
+++ b/src/addon/mod/assign/pages/submission-list/submission-list.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId"  [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end></ion-buttons>
     </ion-navbar>
diff --git a/src/addon/mod/assign/pages/submission-review/submission-review.html b/src/addon/mod/assign/pages/submission-review/submission-review.html
index 255c320fb..47e05acad 100644
--- a/src/addon/mod/assign/pages/submission-review/submission-review.html
+++ b/src/addon/mod/assign/pages/submission-review/submission-review.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end></ion-buttons>
     </ion-navbar>
diff --git a/src/addon/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html b/src/addon/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html
index 8040cdfeb..f264d3162 100644
--- a/src/addon/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html
+++ b/src/addon/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html
@@ -1,4 +1,4 @@
 <a *ngIf="commentsEnabled" ion-item text-wrap (click)="showComments($event)" detail-none>
     <h2>{{plugin.name}}</h2>
-    <core-comments contextLevel="module" [instanceId]="assign.cmid" component="assignsubmission_comments" [itemId]="submission.id" area="submission_comments" [title]="plugin.name"></core-comments>
+    <core-comments contextLevel="module" [instanceId]="assign.cmid" component="assignsubmission_comments" [itemId]="submission.id" area="submission_comments" [title]="plugin.name" [courseId]="assign.course"></core-comments>
 </a>
diff --git a/src/addon/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html b/src/addon/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
index 37fe04f41..a629ab325 100644
--- a/src/addon/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
+++ b/src/addon/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html
@@ -3,7 +3,7 @@
     <h2>{{ plugin.name }}</h2>
     <p *ngIf="words">{{ 'addon.mod_assign.numwords' | translate: {'$a': words} }}</p>
     <p>
-        <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true" [fullTitle]="plugin.name" [text]="text" contextLevel="module" [contextInstanceId]="assign.cmid"></core-format-text>
+        <core-format-text [component]="component" [componentId]="assign.cmid" [maxHeight]="80" [fullOnClick]="true" [fullTitle]="plugin.name" [text]="text" contextLevel="module" [contextInstanceId]="assign.cmid" [courseId]="assign.course"></core-format-text>
     </p>
 </ion-item>
 
diff --git a/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts b/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts
index 28ea0dc57..70ee9d183 100644
--- a/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts
+++ b/src/addon/mod/assign/submission/onlinetext/component/onlinetext.ts
@@ -76,7 +76,7 @@ export class AddonModAssignSubmissionOnlineTextComponent extends AddonModAssignS
                     if (text) {
                         // Open a new state with the interpolated contents.
                         this.textUtils.expandText(this.plugin.name, text, this.component, this.assign.cmid, undefined, true,
-                                'module', this.assign.cmid);
+                                'module', this.assign.cmid, this.assign.course);
                     }
                 });
             } else {
diff --git a/src/addon/mod/book/components/index/addon-mod-book-index.html b/src/addon/mod/book/components/index/addon-mod-book-index.html
index 1bfc54e9d..32566b2a0 100644
--- a/src/addon/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addon/mod/book/components/index/addon-mod-book-index.html
@@ -16,11 +16,11 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
+    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-course-module-description>
 
     <div padding class="safe-padding-horizontal">
         <core-navigation-bar [previous]="previousChapter > 0 && previousChapter" [next]="nextChapter > 0 && nextChapter" (action)="changeChapter($event)"></core-navigation-bar>
-        <core-format-text [component]="component" [componentId]="componentId" [text]="chapterContent" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
+        <core-format-text [component]="component" [componentId]="componentId" [text]="chapterContent" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
         <div margin-top *ngIf="tagsEnabled && contentsMap && contentsMap[currentChapter] && contentsMap[currentChapter].tags && contentsMap[currentChapter].tags.length > 0">
             <b>{{ 'core.tag.tags' | translate }}:</b>
             <core-tag-list [tags]="contentsMap[currentChapter].tags"></core-tag-list>
diff --git a/src/addon/mod/book/components/index/index.ts b/src/addon/mod/book/components/index/index.ts
index df5d91702..40717a6fc 100644
--- a/src/addon/mod/book/components/index/index.ts
+++ b/src/addon/mod/book/components/index/index.ts
@@ -68,7 +68,8 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
         const modal =  this.modalCtrl.create('AddonModBookTocPage', {
             moduleId: this.module.id,
             chapters: this.chapters,
-            selected: this.currentChapter
+            selected: this.currentChapter,
+            courseId: this.courseId
         }, { cssClass: 'core-modal-lateral',
             showBackdrop: true,
             enableBackdropDismiss: true,
diff --git a/src/addon/mod/book/pages/index/index.html b/src/addon/mod/book/pages/index/index.html
index e522f9ec2..9e468397a 100644
--- a/src/addon/mod/book/pages/index/index.html
+++ b/src/addon/mod/book/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/book/pages/toc/toc.html b/src/addon/mod/book/pages/toc/toc.html
index 7781cbb0b..01fcaa92b 100644
--- a/src/addon/mod/book/pages/toc/toc.html
+++ b/src/addon/mod/book/pages/toc/toc.html
@@ -12,7 +12,7 @@
     <nav>
         <ion-list>
             <a ion-item text-wrap *ngFor="let chapter of chapters" (click)="loadChapter(chapter.id)" [class.core-nav-item-selected]="selected == chapter.id" [class.item-dimmed]="chapter.hidden">
-                <p [attr.padding-left]="chapter.level == 1 ? true : null">{{chapter.number}} <core-format-text [text]="chapter.title" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text></p>
+                <p [attr.padding-left]="chapter.level == 1 ? true : null">{{chapter.number}} <core-format-text [text]="chapter.title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId"></core-format-text></p>
             </a>
         </ion-list>
     </nav>
diff --git a/src/addon/mod/book/pages/toc/toc.ts b/src/addon/mod/book/pages/toc/toc.ts
index 10d532072..3df7cffc0 100644
--- a/src/addon/mod/book/pages/toc/toc.ts
+++ b/src/addon/mod/book/pages/toc/toc.ts
@@ -28,11 +28,13 @@ export class AddonModBookTocPage {
     moduleId: number;
     chapters: AddonModBookTocChapter[];
     selected: number;
+    courseId: number;
 
     constructor(navParams: NavParams, private viewCtrl: ViewController) {
         this.moduleId = navParams.get('moduleId');
         this.chapters = navParams.get('chapters') || [];
         this.selected = navParams.get('selected');
+        this.courseId = navParams.get('courseId');
     }
 
     /**
diff --git a/src/addon/mod/chat/components/index/addon-mod-chat-index.html b/src/addon/mod/chat/components/index/addon-mod-chat-index.html
index 26cb9d582..486cbd508 100644
--- a/src/addon/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addon/mod/chat/components/index/addon-mod-chat-index.html
@@ -12,7 +12,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
+    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-course-module-description>
 
     <ion-card icon-start class="core-info-card" *ngIf="chatInfo">
         <ion-icon name="time"></ion-icon> {{ 'addon.mod_chat.sessionstart' | translate:{$a: chatInfo} }}
diff --git a/src/addon/mod/chat/pages/chat/chat.html b/src/addon/mod/chat/pages/chat/chat.html
index 37cae9e6b..2784a7732 100644
--- a/src/addon/mod/chat/pages/chat/chat.html
+++ b/src/addon/mod/chat/pages/chat/chat.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="cmId"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId"></core-format-text></ion-title>
         <ion-buttons end>
             <button *ngIf="loaded" ion-button icon-only (click)="showChatUsers()">
                 <ion-icon name="people"></ion-icon>
@@ -43,7 +43,7 @@
 
                     <ion-badge text-wrap color="info" *ngIf="!message.system && !message.beep">
                         <span><core-icon name="fa-asterisk"></core-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
-                            <strong>{{ message.userfullname }} <core-format-text [text]="message.message" contextLevel="module" [contextInstanceId]="cmId" (afterRender)="last && scrollToBottom()"></core-format-text></strong></span>
+                            <strong>{{ message.userfullname }} <core-format-text [text]="message.message" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId" (afterRender)="last && scrollToBottom()"></core-format-text></strong></span>
                     </ion-badge>
                 </div>
 
@@ -56,7 +56,7 @@
                     </h2>
 
                     <p class="addon-message-text">
-                        <core-format-text [text]="message.message" contextLevel="module" [contextInstanceId]="cmId" (afterRender)="last && scrollToBottom()"></core-format-text>
+                        <core-format-text [text]="message.message" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId" (afterRender)="last && scrollToBottom()"></core-format-text>
                     </p>
                     <div class="tail" *ngIf="message.showTail"></div>
                 </ion-item>
diff --git a/src/addon/mod/chat/pages/index/index.html b/src/addon/mod/chat/pages/index/index.html
index 234abae0e..52c0b1f3c 100644
--- a/src/addon/mod/chat/pages/index/index.html
+++ b/src/addon/mod/chat/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/chat/pages/session-messages/session-messages.html b/src/addon/mod/chat/pages/session-messages/session-messages.html
index f75385d59..0b662db80 100644
--- a/src/addon/mod/chat/pages/session-messages/session-messages.html
+++ b/src/addon/mod/chat/pages/session-messages/session-messages.html
@@ -40,7 +40,7 @@
 
                     <ion-badge text-wrap color="info" *ngIf="!message.issystem && !message.beep">
                         <span><core-icon name="fa-asterisk"></core-icon> {{ message.timestamp * 1000 | coreFormatDate:"strftimetime" }}
-                            <strong>{{ message.userfullname }} <core-format-text [text]="message.message" contextLevel="module" [contextInstanceId]="cmId"></core-format-text></strong></span>
+                            <strong>{{ message.userfullname }} <core-format-text [text]="message.message" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId"></core-format-text></strong></span>
                     </ion-badge>
                 </div>
 
@@ -53,7 +53,7 @@
                     </h2>
 
                     <p class="addon-message-text">
-                        <core-format-text [text]="message.message" contextLevel="module" [contextInstanceId]="cmId"></core-format-text>
+                        <core-format-text [text]="message.message" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId"></core-format-text>
                     </p>
                     <div class="tail" *ngIf="message.showTail"></div>
                 </ion-item>
diff --git a/src/addon/mod/choice/components/index/addon-mod-choice-index.html b/src/addon/mod/choice/components/index/addon-mod-choice-index.html
index f4c0d5ac2..5857d522a 100644
--- a/src/addon/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addon/mod/choice/components/index/addon-mod-choice-index.html
@@ -14,7 +14,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
+    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-course-module-description>
 
     <!-- Activity availability messages -->
     <ion-card class="core-info-card" icon-start *ngIf="choiceNotOpenYet">
@@ -24,7 +24,7 @@
     </ion-card>
     <ion-card class="core-info-card" icon-start *ngIf="choiceClosed">
         <ion-icon name="information-circle"></ion-icon>
-        <p *ngIf="options && options.length">{{ 'addon.mod_choice.yourselection' | translate }} <core-format-text [text]="options[0].text" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></p>
+        <p *ngIf="options && options.length">{{ 'addon.mod_choice.yourselection' | translate }} <core-format-text [text]="options[0].text" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></p>
         <p>{{ 'addon.mod_choice.expired' | translate:{$a: closeTimeReadable} }}</p>
     </ion-card>
 
@@ -43,13 +43,13 @@
     <ion-card *ngIf="options && options.length">
         <ng-container *ngIf="choice.allowmultiple">
             <ion-item text-wrap *ngFor="let option of options">
-                <ion-label><core-format-text [text]="option.text" contextLevel="module" [contextInstanceId]="module.id"></core-format-text> <span *ngIf="choice.limitanswers && option.countanswers >= option.maxanswers">{{ 'addon.mod_choice.full' | translate }}</span></ion-label>
+                <ion-label><core-format-text [text]="option.text" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text> <span *ngIf="choice.limitanswers && option.countanswers >= option.maxanswers">{{ 'addon.mod_choice.full' | translate }}</span></ion-label>
                 <ion-checkbox item-end [(ngModel)]="option.checked" [disabled]="option.disabled || !canEdit"></ion-checkbox>
             </ion-item>
         </ng-container>
         <ng-container *ngIf="!choice.allowmultiple">
             <ion-item text-wrap *ngFor="let option of options" radio-group [(ngModel)]="selectedOption.id">
-                <ion-label><core-format-text [text]="option.text" contextLevel="module" [contextInstanceId]="module.id"></core-format-text> <span *ngIf="choice.limitanswers && option.countanswers >= option.maxanswers">{{ 'addon.mod_choice.full' | translate }}</span></ion-label>
+                <ion-label><core-format-text [text]="option.text" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text> <span *ngIf="choice.limitanswers && option.countanswers >= option.maxanswers">{{ 'addon.mod_choice.full' | translate }}</span></ion-label>
                 <ion-radio color="primary" [value]="option.id" [disabled]="option.disabled || !canEdit"></ion-radio>
             </ion-item>
         </ng-container>
@@ -73,13 +73,13 @@
                         <ion-icon item-start name="warning" color="warning"></ion-icon> {{ 'addon.mod_choice.resultsnotsynced' | translate }}
                     </ion-item>
                     <ion-item>
-                        <core-chart type="pie" [data]="data" [labels]="labels" height="300" contextLevel="module" [contextInstanceId]="module.id"></core-chart>
+                        <core-chart type="pie" [data]="data" [labels]="labels" height="300" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-chart>
                     </ion-item>
                 </ion-col>
                 <ion-col *ngIf="choice.publish && results" col-12 col-lg-7>
                     <ion-item-group *ngFor="let result of results">
                         <ion-item-divider text-wrap>
-                            <h2><core-format-text [text]="result.text" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></h2>
+                            <h2><core-format-text [text]="result.text" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></h2>
                             <p>{{ 'addon.mod_choice.numberofuser' | translate }}: {{ result.numberofuser }} ({{ 'core.percentagenumber' | translate: {$a: result.percentageamountfixed} }})</p>
                         </ion-item-divider>
                         <a ion-item *ngFor="let user of result.userresponses" core-user-link [courseId]="courseid" [userId]="user.userid" [title]="user.fullname" text-wrap>
diff --git a/src/addon/mod/choice/pages/index/index.html b/src/addon/mod/choice/pages/index/index.html
index a9b19d1e4..3feab085c 100644
--- a/src/addon/mod/choice/pages/index/index.html
+++ b/src/addon/mod/choice/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/data/components/action/addon-mod-data-action.html b/src/addon/mod/data/components/action/addon-mod-data-action.html
index b6c9e9924..74d2afd56 100644
--- a/src/addon/mod/data/components/action/addon-mod-data-action.html
+++ b/src/addon/mod/data/components/action/addon-mod-data-action.html
@@ -22,15 +22,15 @@
     <ion-icon name="thumbs-down"></ion-icon>
 </a>
 
-<core-comments *ngIf="action == 'comments' && mode == 'list'" contextLevel="module" [instanceId]="database.coursemodule" component="mod_data" [itemId]="entry.id" area="database_entry"></core-comments>
+<core-comments *ngIf="action == 'comments' && mode == 'list'" contextLevel="module" [instanceId]="database.coursemodule" component="mod_data" [itemId]="entry.id" area="database_entry" [courseId]="database.course"></core-comments>
 
 <span *ngIf="action == 'timeadded'">{{ entry.timecreated * 1000 |  coreFormatDate }}</span>
 <span *ngIf="action == 'timemodified'">{{ entry.timemodified * 1000 |  coreFormatDate }}</span>
 
-<a *ngIf="action == 'userpicture'" core-user-link [courseId]="database.courseid" [userId]="entry.userid" [title]="entry.fullname">
+<a *ngIf="action == 'userpicture'" core-user-link [courseId]="database.course" [userId]="entry.userid" [title]="entry.fullname">
     <img class="avatar-round" [src]="userPicture" [alt]="'core.pictureof' | translate:{$a: entry.fullname}" core-external-content onError="this.src='assets/img/user-avatar.png'" role="presentation">
 </a>
 
-<a *ngIf="action == 'user' && entry" core-user-link [courseId]="database.courseid" [userId]="entry.userid" [title]="entry.fullname">{{entry.fullname}}</a>
+<a *ngIf="action == 'user' && entry" core-user-link [courseId]="database.course" [userId]="entry.userid" [title]="entry.fullname">{{entry.fullname}}</a>
 
 <core-tag-list *ngIf="tagsEnabled && action == 'tags' && entry" [tags]="entry.tags"></core-tag-list>
diff --git a/src/addon/mod/data/components/index/addon-mod-data-index.html b/src/addon/mod/data/components/index/addon-mod-data-index.html
index c06e0cc8e..1376b8249 100644
--- a/src/addon/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addon/mod/data/components/index/addon-mod-data-index.html
@@ -19,7 +19,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
+    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-course-module-description>
 
     <!-- Data done in offline but not synchronized -->
     <div class="core-warning-card" icon-start *ngIf="hasOffline || hasOfflineRatings">
diff --git a/src/addon/mod/data/fields/textarea/component/addon-mod-data-field-textarea.html b/src/addon/mod/data/fields/textarea/component/addon-mod-data-field-textarea.html
index 709a96669..02ce6f367 100644
--- a/src/addon/mod/data/fields/textarea/component/addon-mod-data-field-textarea.html
+++ b/src/addon/mod/data/fields/textarea/component/addon-mod-data-field-textarea.html
@@ -6,4 +6,4 @@
     <core-input-errors *ngIf="error && mode == 'edit'" [control]="form.controls['f_'+field.id]" [errorText]="error"></core-input-errors>
 </span>
 
-<core-format-text *ngIf="isShowOrListMode() && value" [text]="format(value)" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="componentId"></core-format-text>
\ No newline at end of file
+<core-format-text *ngIf="isShowOrListMode() && value" [text]="format(value)" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="componentId" [courseId]="database.course"></core-format-text>
\ No newline at end of file
diff --git a/src/addon/mod/data/pages/edit/edit.html b/src/addon/mod/data/pages/edit/edit.html
index 92b0571aa..d5865e7e3 100644
--- a/src/addon/mod/data/pages/edit/edit.html
+++ b/src/addon/mod/data/pages/edit/edit.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
         <ion-buttons end>
             <button *ngIf="entry" ion-button clear (click)="save($event)" [attr.aria-label]="'core.save' | translate">
                 {{ 'core.save' | translate }}
diff --git a/src/addon/mod/data/pages/entry/entry.html b/src/addon/mod/data/pages/entry/entry.html
index 3299a90b7..835f1fa4b 100644
--- a/src/addon/mod/data/pages/entry/entry.html
+++ b/src/addon/mod/data/pages/entry/entry.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>
@@ -32,7 +32,7 @@
         <core-rating-aggregate *ngIf="data && entry && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="data.coursemodule" [itemId]="entry.id" [courseId]="courseId" [aggregateMethod]="data.assessed" [scaleId]="data.scale"></core-rating-aggregate>
 
         <ion-item *ngIf="data && data.comments && entry && entry.id > 0 && commentsEnabled">
-            <core-comments contextLevel="module" [instanceId]="data.coursemodule" component="mod_data" [itemId]="entry.id" area="database_entry" [displaySpinner]="false" (onLoading)="setLoadingComments($event)"></core-comments>
+            <core-comments contextLevel="module" [instanceId]="data.coursemodule" component="mod_data" [itemId]="entry.id" area="database_entry" [displaySpinner]="false" [courseId]="courseId" (onLoading)="setLoadingComments($event)"></core-comments>
         </ion-item>
 
         <ion-grid *ngIf="previousOffset != null || nextOffset != null">
diff --git a/src/addon/mod/data/pages/index/index.html b/src/addon/mod/data/pages/index/index.html
index 9cd4018e0..c870c6fcc 100644
--- a/src/addon/mod/data/pages/index/index.html
+++ b/src/addon/mod/data/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html
index f1713c694..04a263d52 100644
--- a/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -14,7 +14,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
+    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-course-module-description>
 
     <ng-container *ngIf="showTabs">
         <core-tabs [hideUntil]="tabsReady" [selectedIndex]="firstSelectedTab">
@@ -98,7 +98,7 @@
             </ion-item>
             <ion-item text-wrap *ngIf="access.canedititems && feedback.page_after_submit">
                 <h2>{{ 'addon.mod_feedback.page_after_submit' | translate }}</h2>
-                <core-format-text [component]="component" [componentId]="componentId" [text]="feedback.page_after_submit" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
+                <core-format-text [component]="component" [componentId]="componentId" [text]="feedback.page_after_submit" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
             </ion-item>
             <ng-container *ngIf="!access.isempty">
                 <ion-item text-wrap>
@@ -145,8 +145,8 @@
 
             <ion-list *ngIf="items && items.length">
                 <ion-item text-wrap *ngFor="let item of items" class="core-analysis">
-                    <h2>{{item.number}}. <core-format-text [component]="component" [componentId]="componentId" [text]="item.name" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></h2>
-                    <p><core-format-text [component]="component" [componentId]="componentId" [text]="item.label" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></p>
+                    <h2>{{item.number}}. <core-format-text [component]="component" [componentId]="componentId" [text]="item.name" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></h2>
+                    <p><core-format-text [component]="component" [componentId]="componentId" [text]="item.label" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></p>
                     <ng-container [ngSwitch]="item.template">
                         <ng-container *ngSwitchCase="'numeric'">
                             <ul>
@@ -162,7 +162,7 @@
                             </ul>
                         </ng-container>
                         <ng-container *ngSwitchCase="'chart'">
-                            <core-chart [type]="item.chartType" [data]="item.chartData" [labels]="item.labels" height="300" contextLevel="module" [contextInstanceId]="module.id" [wsNotFiltered]="true"></core-chart>
+                            <core-chart [type]="item.chartType" [data]="item.chartData" [labels]="item.labels" height="300" contextLevel="module" [contextInstanceId]="module.id" [wsNotFiltered]="true" [courseId]="courseId"></core-chart>
                             <p *ngIf="item.average">{{ 'addon.mod_feedback.average' | translate }}: {{item.average | number : '1.2-2'}}</p>
                         </ng-container>
                     </ng-container>
diff --git a/src/addon/mod/feedback/pages/attempt/attempt.html b/src/addon/mod/feedback/pages/attempt/attempt.html
index c4ad819a7..a872de399 100644
--- a/src/addon/mod/feedback/pages/attempt/attempt.html
+++ b/src/addon/mod/feedback/pages/attempt/attempt.html
@@ -24,9 +24,9 @@
                     <ion-item-divider *ngIf="item.typ == 'pagebreak'"></ion-item-divider>
                     <ion-item text-wrap *ngIf="item.typ != 'pagebreak'" [color]="item.dependitem > 0 ? 'light' : ''">
                         <h2 *ngIf="item.name" [core-mark-required]="item.required">
-                            <span *ngIf="feedback.autonumbering && item.itemnumber">{{item.itemnumber}}. </span><core-format-text  [component]="component" [componentId]="componentId" [text]="item.name" contextLevel="module" [contextInstanceId]="feedback.coursemodule"></core-format-text>
+                            <span *ngIf="feedback.autonumbering && item.itemnumber">{{item.itemnumber}}. </span><core-format-text  [component]="component" [componentId]="componentId" [text]="item.name" contextLevel="module" [contextInstanceId]="feedback.coursemodule" [courseId]="courseId"></core-format-text>
                         </h2>
-                        <p *ngIf="item.submittedValue"><core-format-text [component]="component" [componentId]="componentId" [text]=" item.submittedValue" contextLevel="module" [contextInstanceId]="feedback.coursemodule"></core-format-text></p>
+                        <p *ngIf="item.submittedValue"><core-format-text [component]="component" [componentId]="componentId" [text]=" item.submittedValue" contextLevel="module" [contextInstanceId]="feedback.coursemodule" [courseId]="courseId"></core-format-text></p>
                     </ion-item>
                 </ng-container>
             </ng-container>
diff --git a/src/addon/mod/feedback/pages/form/form.html b/src/addon/mod/feedback/pages/form/form.html
index a1c3a8a63..189131ab6 100644
--- a/src/addon/mod/feedback/pages/form/form.html
+++ b/src/addon/mod/feedback/pages/form/form.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>
@@ -17,13 +17,13 @@
                     <ion-item text-wrap *ngIf="item.typ != 'pagebreak'" [color]="item.dependitem > 0 ? 'light' : ''" [class.core-danger-item]="item.isEmpty || item.hasError">
                         <ion-label *ngIf="item.name" [core-mark-required]="item.required" stacked>
                             <span *ngIf="feedback.autonumbering && item.itemnumber">{{item.itemnumber}}. </span>
-                            <core-format-text [component]="component" [componentId]="componentId" [text]="item.name" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
+                            <core-format-text [component]="component" [componentId]="componentId" [text]="item.name" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
                             <span *ngIf="item.postfix" class="addon-mod_feedback-postfix">{{item.postfix}}</span>
                         </ion-label>
                         <div item-content class="addon-mod_feedback-form-content" *ngIf="item.template">
                             <ng-container [ngSwitch]="item.template">
                                 <ng-container *ngSwitchCase="'label'">
-                                    <p><core-format-text [component]="component" [componentId]="componentId" [text]="item.presentation" contextLevel="module" [contextInstanceId]="module.id" [wsNotFiltered]="true"></core-format-text></p>
+                                    <p><core-format-text [component]="component" [componentId]="componentId" [text]="item.presentation" contextLevel="module" [contextInstanceId]="module.id" [wsNotFiltered]="true" [courseId]="courseId"></core-format-text></p>
                                 </ng-container>
                                 <ng-container *ngSwitchCase="'textfield'">
                                     <ion-input type="text" [(ngModel)]="item.value" autocorrect="off" name="{{item.typ}}_{{item.id}}" maxlength="{{item.maxlength}}" [required]="item.required"></ion-input>
@@ -38,20 +38,20 @@
                                 <ng-container *ngSwitchCase="'multichoice-r'">
                                     <ion-list radio-group [(ngModel)]="item.value" [required]="item.required" name="{{item.typ}}_{{item.id}}">
                                         <ion-item *ngFor="let option of item.choices">
-                                            <ion-label><core-format-text  [component]="component" [componentId]="componentId" [text]="option.label" contextLevel="module" [contextInstanceId]="module.id" [wsNotFiltered]="true"></core-format-text></ion-label>
+                                            <ion-label><core-format-text  [component]="component" [componentId]="componentId" [text]="option.label" contextLevel="module" [contextInstanceId]="module.id" [wsNotFiltered]="true" [courseId]="courseId"></core-format-text></ion-label>
                                             <ion-radio [value]="option.value"></ion-radio>
                                         </ion-item>
                                     </ion-list>
                                 </ng-container>
                                 <ion-list *ngSwitchCase="'multichoice-c'">
                                     <ion-item *ngFor="let option of item.choices">
-                                        <ion-label><core-format-text [component]="component" [componentId]="componentId" [text]="option.label" contextLevel="module" [contextInstanceId]="module.id" [wsNotFiltered]="true"></core-format-text></ion-label>
+                                        <ion-label><core-format-text [component]="component" [componentId]="componentId" [text]="option.label" contextLevel="module" [contextInstanceId]="module.id" [wsNotFiltered]="true" [courseId]="courseId"></core-format-text></ion-label>
                                         <ion-checkbox [required]="item.required" name="{{item.typ}}_{{item.id}}" [(ngModel)]="option.checked" value="option.value"></ion-checkbox>
                                     </ion-item>
                                 </ion-list>
                                 <ng-container *ngSwitchCase="'multichoice-d'">
                                     <ion-select [required]="item.required" name="{{item.typ}}_{{item.id}}" [(ngModel)]="item.value" interface="action-sheet">
-                                        <ion-option *ngFor="let option of item.choices" [value]="option.value"><core-format-text  [component]="component" [componentId]="componentId" [text]="option.label" contextLevel="module" [contextInstanceId]="module.id" [wsNotFiltered]="true"></core-format-text></ion-option>
+                                        <ion-option *ngFor="let option of item.choices" [value]="option.value"><core-format-text  [component]="component" [componentId]="componentId" [text]="option.label" contextLevel="module" [contextInstanceId]="module.id" [wsNotFiltered]="true" [courseId]="courseId"></core-format-text></ion-option>
                                     </ion-select>
                                 </ng-container>
                                 <ng-container *ngSwitchCase="'captcha'">
@@ -93,7 +93,7 @@
             <ion-icon name="checkmark"></ion-icon>
             <p *ngIf="!completionPageContents && !completedOffline">{{ 'addon.mod_feedback.this_feedback_is_already_submitted' | translate }}</p>
             <p *ngIf="!completionPageContents && completedOffline">{{ 'addon.mod_feedback.feedback_submitted_offline' | translate }}</p>
-            <p *ngIf="completionPageContents"><core-format-text  [component]="component" componentId="componentId" [text]="completionPageContents" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></p>
+            <p *ngIf="completionPageContents"><core-format-text  [component]="component" componentId="componentId" [text]="completionPageContents" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></p>
         </div>
 
         <ion-grid *ngIf="completed">
diff --git a/src/addon/mod/feedback/pages/index/index.html b/src/addon/mod/feedback/pages/index/index.html
index c2f044f90..401746668 100644
--- a/src/addon/mod/feedback/pages/index/index.html
+++ b/src/addon/mod/feedback/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/folder/components/index/addon-mod-folder-index.html b/src/addon/mod/folder/components/index/addon-mod-folder-index.html
index 205c7e3a1..f3fdf049f 100644
--- a/src/addon/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addon/mod/folder/components/index/addon-mod-folder-index.html
@@ -13,7 +13,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
+    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-course-module-description>
 
     <ion-list *ngIf="contents && contents.length > 0">
         <ng-container *ngFor="let file of contents">
diff --git a/src/addon/mod/folder/pages/index/index.html b/src/addon/mod/folder/pages/index/index.html
index 289d6d47f..c435f6866 100644
--- a/src/addon/mod/folder/pages/index/index.html
+++ b/src/addon/mod/folder/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/forum/components/index/addon-mod-forum-index.html b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
index cf513aab6..7a1641f92 100644
--- a/src/addon/mod/forum/components/index/addon-mod-forum-index.html
+++ b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
@@ -19,7 +19,7 @@
             <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
         </ion-refresher>
         <core-loading [hideUntil]="loaded" class="core-loading-center">
-            <core-course-module-description *ngIf="forum && forum.type != 'single'" [description]="description" [component]="component" [componentId]="componentId" [note]="descriptionNote" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
+            <core-course-module-description *ngIf="forum && forum.type != 'single'" [description]="description" [component]="component" [componentId]="componentId" [note]="descriptionNote" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-course-module-description>
 
             <!-- Forum discussions found to be synchronized -->
             <ion-card class="core-warning-card" icon-start *ngIf="hasOffline || hasOfflineRatings">
@@ -45,7 +45,7 @@
                 <ng-container *ngFor="let discussion of offlineDiscussions">
                     <ion-item text-wrap (click)="openNewDiscussion(discussion.timecreated)" [attr.no-lines]="discussion.groupname" [class.core-split-item-selected]="discussion.timecreated == -selectedDiscussion">
                         <ion-avatar core-user-avatar [user]="discussion" item-start [courseId]="courseId"></ion-avatar>
-                        <h2><core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></h2>
+                        <h2><core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></h2>
                         <h3 *ngIf="discussion.userfullname">
                             <ion-note float-end padding-left><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</ion-note>
                             {{discussion.userfullname}}
@@ -63,7 +63,7 @@
                         <h2>
                             <core-icon name="fa-map-pin" *ngIf="discussion.pinned"></core-icon>
                             <core-icon name="fa-star" class="addon-forum-star" *ngIf="!discussion.pinned && discussion.starred"></core-icon>
-                            <core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
+                            <core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
                         </h2>
                         <h3>
                             <ion-note float-end padding-left text-end>
diff --git a/src/addon/mod/forum/components/post/addon-mod-forum-post.html b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
index eb370b63c..64f387bfc 100644
--- a/src/addon/mod/forum/components/post/addon-mod-forum-post.html
+++ b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
@@ -4,7 +4,7 @@
         <h2>
             <core-icon name="fa-map-pin" *ngIf="post.parent == 0 && post.pinned"></core-icon>
             <core-icon name="fa-star" class="addon-forum-star" *ngIf="post.parent == 0 && !post.pinned && post.starred"></core-icon>
-            <span [class.core-bold]="post.parent == 0"><core-format-text [text]="post.subject" contextLevel="module" [contextInstanceId]="forum && forum.cmid"></core-format-text></span>
+            <span [class.core-bold]="post.parent == 0"><core-format-text [text]="post.subject" contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId"></core-format-text></span>
         </h2>
         <p>
             <ion-note float-end padding-left *ngIf="!post.modified"><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</ion-note>
@@ -20,7 +20,7 @@
     <div padding-bottom *ngIf="post.isprivatereply">
         <ion-note>{{ 'addon.mod_forum.postisprivatereply' | translate }}</ion-note>
     </div>
-    <core-format-text [component]="component" [componentId]="componentId" [text]="post.message" contextLevel="module" [contextInstanceId]="forum && forum.cmid"></core-format-text>
+    <core-format-text [component]="component" [componentId]="componentId" [text]="post.message" contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId"></core-format-text>
     <div no-lines>
         <ng-container *ngFor="let attachment of post.attachments">
             <!-- Files already attached to the submission. -->
diff --git a/src/addon/mod/forum/pages/discussion/discussion.html b/src/addon/mod/forum/pages/discussion/discussion.html
index e9fb50e11..571c89738 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.html
+++ b/src/addon/mod/forum/pages/discussion/discussion.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title *ngIf="discussion"><core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="cmId"></core-format-text></ion-title>
+        <ion-title *ngIf="discussion"><core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId"></core-format-text></ion-title>
         <ion-buttons end>
             <!-- The context menu will be added in here. -->
         </ion-buttons>
diff --git a/src/addon/mod/forum/pages/discussion/discussion.ts b/src/addon/mod/forum/pages/discussion/discussion.ts
index 1494b40b8..6cf56461f 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.ts
+++ b/src/addon/mod/forum/pages/discussion/discussion.ts
@@ -309,6 +309,7 @@ export class AddonModForumDiscussionPage implements OnDestroy {
 
                 this.forumId = forum.id;
                 this.cmId = forum.cmid;
+                this.courseId = forum.course;
                 this.forum = forum;
                 this.availabilityMessage = this.forumHelper.getAvailabilityMessage(forum);
 
diff --git a/src/addon/mod/forum/pages/index/index.html b/src/addon/mod/forum/pages/index/index.html
index 2f12c37de..fc621ed20 100644
--- a/src/addon/mod/forum/pages/index/index.html
+++ b/src/addon/mod/forum/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html
index e0277fbde..656adc7b3 100644
--- a/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -22,7 +22,7 @@
             <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
         </ion-refresher>
 
-        <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
+        <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-course-module-description>
 
         <!-- Glossary entries found to be synchronized -->
         <ion-card class="core-warning-card" icon-start *ngIf="hasOffline || hasOfflineRatings">
diff --git a/src/addon/mod/glossary/pages/edit/edit.html b/src/addon/mod/glossary/pages/edit/edit.html
index c16fcc1dd..3c3bfa0d7 100644
--- a/src/addon/mod/glossary/pages/edit/edit.html
+++ b/src/addon/mod/glossary/pages/edit/edit.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="module.name" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="module.name" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
         <ion-buttons end>
             <button ion-button (click)="save()"> {{ 'core.save' | translate }}</button>
         </ion-buttons>
diff --git a/src/addon/mod/glossary/pages/entry/entry.html b/src/addon/mod/glossary/pages/entry/entry.html
index 2c9fc51e0..7a9741482 100644
--- a/src/addon/mod/glossary/pages/entry/entry.html
+++ b/src/addon/mod/glossary/pages/entry/entry.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title *ngIf="entry"><core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="glossary && glossary.coursemodule"></core-format-text></ion-title>
+        <ion-title *ngIf="entry"><core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="glossary && glossary.coursemodule" [courseId]="courseId"></core-format-text></ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>
@@ -12,7 +12,7 @@
         <ng-container *ngIf="entry">
             <ion-item text-wrap *ngIf="showAuthor">
                 <ion-avatar core-user-avatar [user]="entry" (click)="openUserProfile(post.userid)" item-start></ion-avatar>
-                <h2><core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="glossary && glossary.coursemodule"></core-format-text></h2>
+                <h2><core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="glossary && glossary.coursemodule" [courseId]="courseId"></core-format-text></h2>
                 <ion-note item-end *ngIf="showDate">{{ entry.timemodified | coreDateDayOrTime }}</ion-note>
                 <p>{{ entry.userfullname }}</p>
             </ion-item>
@@ -21,7 +21,7 @@
                 <ion-note item-end *ngIf="showDate">{{ entry.timemodified | coreDateDayOrTime }}</ion-note>
             </ion-item>
             <ion-item text-wrap>
-                <core-format-text [component]="component" [componentId]="componentId" [text]="entry.definition" contextLevel="module" [contextInstanceId]="glossary && glossary.coursemodule"></core-format-text>
+                <core-format-text [component]="component" [componentId]="componentId" [text]="entry.definition" contextLevel="module" [contextInstanceId]="glossary && glossary.coursemodule" [courseId]="courseId"></core-format-text>
             </ion-item>
             <ng-container *ngIf="entry.attachment">
                 <div no-lines>
diff --git a/src/addon/mod/glossary/pages/index/index.html b/src/addon/mod/glossary/pages/index/index.html
index 35ce44b11..bd651f76a 100644
--- a/src/addon/mod/glossary/pages/index/index.html
+++ b/src/addon/mod/glossary/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html
index 435cf919a..4e431dbfd 100644
--- a/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -16,7 +16,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
     <div class="addon-mod-imscp-container">
-        <core-navigation-bar [previous]="previousItem" [next]="nextItem" (action)="loadItem($event)" [info]="description" [title]="'core.description' | translate" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-navigation-bar>
+        <core-navigation-bar [previous]="previousItem" [next]="nextItem" (action)="loadItem($event)" [info]="description" [title]="'core.description' | translate" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-navigation-bar>
         <core-iframe [src]="src"></core-iframe>
     </div>
 </core-loading>
diff --git a/src/addon/mod/imscp/pages/index/index.html b/src/addon/mod/imscp/pages/index/index.html
index f31c63425..b99777991 100644
--- a/src/addon/mod/imscp/pages/index/index.html
+++ b/src/addon/mod/imscp/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addon/mod/lesson/components/index/addon-mod-lesson-index.html
index 98c3eaf5d..d7549ccb4 100644
--- a/src/addon/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addon/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -18,7 +18,7 @@
         <!-- Index/Preview tab. -->
         <core-tab [title]="'addon.mod_lesson.preview' | translate" (ionSelect)="indexSelected()">
             <ng-template>
-                <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
+                <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-course-module-description>
 
                 <!-- Prevent access messages. Only show the first one. -->
                 <div class="core-info-card" icon-start *ngIf="lesson && preventMessages && preventMessages.length">
diff --git a/src/addon/mod/lesson/pages/index/index.html b/src/addon/mod/lesson/pages/index/index.html
index d90832113..691bb7d19 100644
--- a/src/addon/mod/lesson/pages/index/index.html
+++ b/src/addon/mod/lesson/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/lesson/pages/menu-modal/menu-modal.html b/src/addon/mod/lesson/pages/menu-modal/menu-modal.html
index deeeaca2c..a3fe189bc 100644
--- a/src/addon/mod/lesson/pages/menu-modal/menu-modal.html
+++ b/src/addon/mod/lesson/pages/menu-modal/menu-modal.html
@@ -26,7 +26,7 @@
                 <div *ngIf="!pageInstance.loadingMenu">
                     <ng-container *ngFor="let page of pageInstance.lessonPages">
                         <a ion-item text-wrap *ngIf="page.display && page.displayinmenublock" (click)="loadPage(page.id)" [ngClass]='{"addon-mod_lesson-selected core-white-push-arrow": !pageInstance.eolData && pageInstance.currentPage == page.id}'>
-                            <p><core-format-text [text]="page.title" contextLevel="module" [contextInstanceId]="pageInstance && pageInstance.lesson && pageInstance.lesson.coursemodule"></core-format-text></p>
+                            <p><core-format-text [text]="page.title" contextLevel="module" [contextInstanceId]="pageInstance && pageInstance.lesson && pageInstance.lesson.coursemodule" [courseId]="pageInstance && pageInstance.courseId"></core-format-text></p>
                         </a>
                     </ng-container>
                 </div>
diff --git a/src/addon/mod/lesson/pages/player/player.html b/src/addon/mod/lesson/pages/player/player.html
index 5e351352b..13c7e7f0b 100644
--- a/src/addon/mod/lesson/pages/player/player.html
+++ b/src/addon/mod/lesson/pages/player/player.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="lesson && lesson.coursemodule"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="lesson && lesson.coursemodule" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <button *ngIf="displayMenu || mediaFile" ion-button icon-only [attr.aria-label]="'addon.mod_lesson.lessonmenu' | translate" (click)="menuModal.present()">
@@ -33,14 +33,14 @@
             <ion-card *ngIf="!eolData && !processData">
                 <!-- Content page. -->
                 <ion-item text-wrap *ngIf="!question && pageContent">
-                    <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="pageContent" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
+                    <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="pageContent" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text>
                 </ion-item>
 
                 <!-- Question page. -->
                 <!-- We need to set ngIf loaded to make formGroup directive restart every time a page changes, see MOBILE-2540. -->
                 <form *ngIf="question && loaded" ion-list [formGroup]="questionForm">
                     <ion-item-divider text-wrap *ngIf="pageContent">
-                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="pageContent" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
+                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="pageContent" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text>
                     </ion-item-divider>
 
                     <input *ngFor="let input of question.hiddenInputs" type="hidden" [name]="input.name" [value]="input.value" />
@@ -61,7 +61,7 @@
                             </ion-item>
                             <ion-item text-wrap *ngIf="!question.textarea && question.useranswer">
                                 <p class="item-heading">{{ 'addon.mod_lesson.youranswer' | translate }}</p>
-                                <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="question.useranswer" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text></p>
+                                <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="question.useranswer" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text></p>
                             </ion-item>
                         </ng-container>
 
@@ -71,7 +71,7 @@
                             <div *ngIf="!question.multi" radio-group [formControlName]="question.controlName">
                                 <ion-item text-wrap *ngFor="let option of question.options">
                                     <ion-label>
-                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="option.text" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
+                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="option.text" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text>
                                     </ion-label>
                                     <ion-radio [id]="option.id" [value]="option.value" [disabled]="option.disabled"></ion-radio>
                                 </ion-item>
@@ -81,7 +81,7 @@
                             <ng-container *ngIf="question.multi">
                                 <ion-item text-wrap *ngFor="let option of question.options">
                                     <ion-label>
-                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="option.text" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
+                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="option.text" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text>
                                     </ion-label>
                                     <ion-checkbox [id]="option.id" [formControlName]="option.name" item-end></ion-checkbox>
                                 </ion-item>
@@ -94,7 +94,7 @@
                                 <ion-grid item-content>
                                     <ion-row>
                                         <ion-col>
-                                            <p><core-format-text id="addon-mod_lesson-matching-{{row.id}}" [component]="component" [componentId]="lesson.coursemodule" [text]="row.text" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text></p>
+                                            <p><core-format-text id="addon-mod_lesson-matching-{{row.id}}" [component]="component" [componentId]="lesson.coursemodule" [text]="row.text" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text></p>
                                         </ion-col>
                                         <ion-col>
                                             <ion-select [id]="row.id" [formControlName]="row.name" [attr.aria-labelledby]="'addon-mod_lesson-matching-' + row.id" interface="action-sheet">
@@ -186,12 +186,12 @@
                     <ng-container *ngIf="eolData.activitylink.value.formatted">
                         <!-- Activity link was successfully formatted, render the button. -->
                         <a ion-button block text-wrap color="light" [href]="eolData.activitylink.value.href" core-link [capture]="true" class="button-no-uppercase">
-                            <core-format-text [text]="eolData.activitylink.value.label" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
+                            <core-format-text [text]="eolData.activitylink.value.label" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text>
                         </a>
                     </ng-container>
                     <ng-container *ngIf="!eolData.activitylink.value.formatted">
                         <!-- Activity link wasn't formatted, render the original link. -->
-                        <core-format-text [text]="eolData.activitylink.value.label" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
+                        <core-format-text [text]="eolData.activitylink.value.label" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text>
                     </ng-container>
                 </ion-item>
             </ion-card>
@@ -203,7 +203,7 @@
                 </ion-item>
                 <ion-item text-wrap *ngIf="!processData.reviewmode || review">
                     <p *ngIf="!processData.reviewmode">
-                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="processData.feedback" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
+                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="processData.feedback" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text>
                     </p>
                     <div *ngIf="review">
                         <p>{{ 'addon.mod_lesson.gotoendoflesson' | translate }}</p>
diff --git a/src/addon/mod/lesson/pages/user-retake/user-retake.html b/src/addon/mod/lesson/pages/user-retake/user-retake.html
index eb8882daa..dea9016d9 100644
--- a/src/addon/mod/lesson/pages/user-retake/user-retake.html
+++ b/src/addon/mod/lesson/pages/user-retake/user-retake.html
@@ -64,7 +64,7 @@
                     </ion-card-header>
                     <ion-item text-wrap>
                         <p class="item-heading">{{ 'addon.mod_lesson.question' | translate }}</p>
-                        <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [maxHeight]="50" [text]="page.contents" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text></p>
+                        <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [maxHeight]="50" [text]="page.contents" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text></p>
                     </ion-item>
                     <ion-item text-wrap>
                         <p class="item-heading">{{ 'addon.mod_lesson.answer' | translate }}</p>
@@ -92,9 +92,9 @@
                                 <!-- Truefalse or matching. -->
                                 <ion-item text-wrap *ngIf="answer[0].isCheckbox" [ngClass]="{'addon-mod_lesson-highlight': answer[0].highlight}">
                                     <ion-label>
-                                        <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[0].content" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text></p>
+                                        <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[0].content" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text></p>
                                         <ion-badge *ngIf="answer[1]" color="dark">
-                                            <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
+                                            <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text>
                                         </ion-badge>
                                     </ion-label>
                                     <ion-checkbox [attr.name]="answer[0].name" [ngModel]="answer[0].checked" [disabled]="true" item-end>
@@ -105,7 +105,7 @@
                                 <ion-item text-wrap *ngIf="answer[0].isText">
                                     <p>{{ answer[0].value }}</p>
                                     <ion-badge *ngIf="answer[1]" color="dark">
-                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
+                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text>
                                     </ion-badge>
                                 </ion-item>
 
@@ -113,12 +113,12 @@
                                 <ion-item text-wrap *ngIf="answer[0].isSelect">
                                     <ion-row>
                                         <ion-col>
-                                            <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]=" answer[0].content" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text></p>
+                                            <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]=" answer[0].content" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text></p>
                                         </ion-col>
                                         <ion-col>
                                             <p>{{answer[0].value}}</p>
                                             <ion-badge *ngIf="answer[1]" color="dark">
-                                                <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
+                                                <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text>
                                             </ion-badge>
                                         </ion-col>
                                     </ion-row>
@@ -126,25 +126,25 @@
 
                                 <!-- Essay or couldn't determine. -->
                                 <ion-item text-wrap *ngIf="!answer[0].isCheckbox && !answer[0].isText && !answer[0].isSelect">
-                                    <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[0]" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text></p>
+                                    <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[0]" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text></p>
                                     <ion-badge *ngIf="answer[1]" color="dark">
-                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
+                                        <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text>
                                     </ion-badge>
                                 </ion-item>
                             </div>
 
                             <ion-item text-wrap *ngIf="!page.isContent && !page.isQuestion">
                                 <!-- Another page (end of branch, ...). -->
-                                <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[0]" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text></p>
+                                <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[0]" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text></p>
                                 <ion-badge *ngIf="answer[1]" color="dark">
-                                    <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text>
+                                    <core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="answer[1]" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text>
                                 </ion-badge>
                             </ion-item>
                         </div>
 
                         <ion-item text-wrap *ngIf="page.answerdata.response">
                             <p class="item-heading">{{ 'addon.mod_lesson.response' | translate }}</p>
-                            <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="page.answerdata.response" contextLevel="module" [contextInstanceId]="lesson.coursemodule"></core-format-text></p>
+                            <p><core-format-text [component]="component" [componentId]="lesson.coursemodule" [text]="page.answerdata.response" contextLevel="module" [contextInstanceId]="lesson.coursemodule" [courseId]="courseId"></core-format-text></p>
                         </ion-item>
                         <ion-item text-wrap *ngIf="page.answerdata.score">
                             <p>{{page.answerdata.score}}</p>
diff --git a/src/addon/mod/lti/components/index/addon-mod-lti-index.html b/src/addon/mod/lti/components/index/addon-mod-lti-index.html
index ce173f76c..334ef2e7a 100644
--- a/src/addon/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addon/mod/lti/components/index/addon-mod-lti-index.html
@@ -11,7 +11,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
 
-    <core-course-module-description *ngIf="lti && lti.showdescriptionlaunch" [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
+    <core-course-module-description *ngIf="lti && lti.showdescriptionlaunch" [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-course-module-description>
 
     <div padding>
         <button ion-button block icon-left (click)="launch()">
diff --git a/src/addon/mod/lti/pages/index/index.html b/src/addon/mod/lti/pages/index/index.html
index 7eff01f32..68e70bb3c 100644
--- a/src/addon/mod/lti/pages/index/index.html
+++ b/src/addon/mod/lti/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/page/components/index/addon-mod-page-index.html b/src/addon/mod/page/components/index/addon-mod-page-index.html
index 63bb1c1a8..f25b0296a 100644
--- a/src/addon/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addon/mod/page/components/index/addon-mod-page-index.html
@@ -13,10 +13,10 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
 
-    <core-course-module-description *ngIf="displayDescription" [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
+    <core-course-module-description *ngIf="displayDescription" [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-course-module-description>
 
     <div padding>
-        <core-format-text [component]="component" [componentId]="componentId" [text]="contents" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
+        <core-format-text [component]="component" [componentId]="componentId" [text]="contents" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
         <p padding-bottom class="addon-mod_page-timemodified" *ngIf="displayTimemodified && page && page.timemodified">
             {{ 'core.lastmodified' | translate}}: {{ page.timemodified * 1000 | coreFormatDate }}
         </p>
diff --git a/src/addon/mod/page/pages/index/index.html b/src/addon/mod/page/pages/index/index.html
index 3551feee5..65f10989b 100644
--- a/src/addon/mod/page/pages/index/index.html
+++ b/src/addon/mod/page/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addon/mod/quiz/components/index/addon-mod-quiz-index.html
index 4597fc53c..d0cefb3cc 100644
--- a/src/addon/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addon/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -14,7 +14,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
+    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-course-module-description>
 
     <!-- Access rules description messages. -->
     <ion-card *ngIf="(quiz && quiz.gradeMethodReadable) || (accessRules && accessRules.length) || syncTime">
@@ -73,11 +73,11 @@
             <ion-item text-wrap *ngIf="gradeOverridden">{{ 'core.course.overriddennotice' | translate }}</ion-item>
             <ion-item text-wrap *ngIf="gradebookFeedback">
                 <p class="item-heading">{{ 'addon.mod_quiz.comment' | translate }}</p>
-                <p><core-format-text [component]="component" [componentId]="componentId" [text]="gradebookFeedback" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></p>
+                <p><core-format-text [component]="component" [componentId]="componentId" [text]="gradebookFeedback" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></p>
             </ion-item>
             <ion-item text-wrap *ngIf="quiz.showFeedbackColumn && overallFeedback">
                 <p class="item-heading">{{ 'addon.mod_quiz.overallfeedback' | translate }}</p>
-                <p><core-format-text [component]="component" [componentId]="componentId" [text]="overallFeedback" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></p>
+                <p><core-format-text [component]="component" [componentId]="componentId" [text]="overallFeedback" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></p>
             </ion-item>
         </ion-list>
     </ion-card>
diff --git a/src/addon/mod/quiz/pages/attempt/attempt.html b/src/addon/mod/quiz/pages/attempt/attempt.html
index f312d9901..2998605d7 100644
--- a/src/addon/mod/quiz/pages/attempt/attempt.html
+++ b/src/addon/mod/quiz/pages/attempt/attempt.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text *ngIf="quiz" [text]="quiz.name" contextLevel="module" [contextInstanceId]="quiz.coursemodule"></core-format-text></ion-title>
+        <ion-title><core-format-text *ngIf="quiz" [text]="quiz.name" contextLevel="module" [contextInstanceId]="quiz.coursemodule" [courseId]="courseId"></core-format-text></ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>
@@ -28,7 +28,7 @@
             </ion-item>
             <ion-item text-wrap no-lines *ngIf="quiz.showFeedbackColumn && attempt.feedback">
                 <h2>{{ 'addon.mod_quiz.feedback' | translate }}</h2>
-                <p><core-format-text [component]="component" [componentId]="componentId" [text]="attempt.feedback" contextLevel="module" [contextInstanceId]="quiz.coursemodule"></core-format-text></p>
+                <p><core-format-text [component]="component" [componentId]="componentId" [text]="attempt.feedback" contextLevel="module" [contextInstanceId]="quiz.coursemodule" [courseId]="courseId"></core-format-text></p>
             </ion-item>
             <ion-item *ngIf="quiz.showReviewColumn && attempt.finished">
                 <button ion-button block icon-start [navPush]="'AddonModQuizReviewPage'" [navParams]="{courseId: courseId, quizId: quiz.id, attemptId: attempt.id}">
diff --git a/src/addon/mod/quiz/pages/index/index.html b/src/addon/mod/quiz/pages/index/index.html
index 5dcbb4fc3..228d3f202 100644
--- a/src/addon/mod/quiz/pages/index/index.html
+++ b/src/addon/mod/quiz/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/quiz/pages/player/player.html b/src/addon/mod/quiz/pages/player/player.html
index 3f0f82335..e632829c1 100644
--- a/src/addon/mod/quiz/pages/player/player.html
+++ b/src/addon/mod/quiz/pages/player/player.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text *ngIf="quiz" [text]="quiz.name" contextLevel="module" [contextInstanceId]="quiz.coursemodule"></core-format-text></ion-title>
+        <ion-title><core-format-text *ngIf="quiz" [text]="quiz.name" contextLevel="module" [contextInstanceId]="quiz.coursemodule" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <button id="addon-mod_quiz-connection-error-button" ion-button icon-only [hidden]="!autoSaveError" (click)="showConnectionError($event)" [attr.aria-label]="'core.error' | translate">
@@ -58,7 +58,7 @@
                         </ion-note>
                     </ion-item-divider>
                     <!-- Body of the question. -->
-                    <core-question text-wrap [question]="question" [component]="component" [componentId]="quiz.coursemodule" [attemptId]="attempt.id" [usageId]="attempt.uniqueid" [offlineEnabled]="offline" contextLevel="module" [contextInstanceId]="quiz.coursemodule" (onAbort)="abortQuiz()" (buttonClicked)="behaviourButtonClicked($event)"></core-question>
+                    <core-question text-wrap [question]="question" [component]="component" [componentId]="quiz.coursemodule" [attemptId]="attempt.id" [usageId]="attempt.uniqueid" [offlineEnabled]="offline" contextLevel="module" [contextInstanceId]="quiz.coursemodule" [courseId]="courseId" (onAbort)="abortQuiz()" (buttonClicked)="behaviourButtonClicked($event)"></core-question>
                 </ion-card>
             </div>
         </form>
diff --git a/src/addon/mod/quiz/pages/review/review.html b/src/addon/mod/quiz/pages/review/review.html
index 15bafe825..21491de5d 100644
--- a/src/addon/mod/quiz/pages/review/review.html
+++ b/src/addon/mod/quiz/pages/review/review.html
@@ -54,7 +54,7 @@
                 </ion-item>
                 <ion-item text-wrap no-lines *ngFor="let data of additionalData">
                     <h2>{{ data.title }}</h2>
-                    <core-format-text [component]="component" [componentId]="componentId" [text]="data.content" contextLevel="module" [contextInstanceId]="quiz.coursemodule"></core-format-text>
+                    <core-format-text [component]="component" [componentId]="componentId" [text]="data.content" contextLevel="module" [contextInstanceId]="quiz.coursemodule" [courseId]="courseId"></core-format-text>
                 </ion-item>
             </ion-list>
         </ion-card>
@@ -77,7 +77,7 @@
                         </ion-note>
                     </ion-item-divider>
                     <!-- Body of the question. -->
-                    <core-question text-wrap [question]="question" [component]="component" [componentId]="componentId" [attemptId]="attempt.id" [usageId]="attempt.uniqueid" [offlineEnabled]="false" contextLevel="module" [contextInstanceId]="quiz.coursemodule"></core-question>
+                    <core-question text-wrap [question]="question" [component]="component" [componentId]="componentId" [attemptId]="attempt.id" [usageId]="attempt.uniqueid" [offlineEnabled]="false" contextLevel="module" [contextInstanceId]="quiz.coursemodule" [courseId]="courseId"></core-question>
                 </ion-card>
             </div>
 
diff --git a/src/addon/mod/resource/components/index/addon-mod-resource-index.html b/src/addon/mod/resource/components/index/addon-mod-resource-index.html
index d8172c08b..57c634f15 100644
--- a/src/addon/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addon/mod/resource/components/index/addon-mod-resource-index.html
@@ -13,7 +13,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
 
-    <core-course-module-description *ngIf="mode != 'iframe' && (mode != 'embedded' || displayDescription)" [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
+    <core-course-module-description *ngIf="mode != 'iframe' && (mode != 'embedded' || displayDescription)" [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-course-module-description>
 
     <ng-container *ngIf="mode == 'iframe'">
         <core-iframe [src]="src"></core-iframe>
diff --git a/src/addon/mod/resource/pages/index/index.html b/src/addon/mod/resource/pages/index/index.html
index 59b962225..d52cc3f30 100644
--- a/src/addon/mod/resource/pages/index/index.html
+++ b/src/addon/mod/resource/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
index 8d86b0309..27e83c61e 100644
--- a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -14,7 +14,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
+    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-course-module-description>
 
     <!-- Warning message. -->
     <div *ngIf="scorm && scorm.warningMessage" class="core-info-card" icon-start>
@@ -98,8 +98,8 @@
                     <div *ngFor="let sco of toc" class="core-padding-{{sco.level}}">
                         <p *ngIf="sco.isvisible">
                             <img [src]="sco.image.url" [alt]="sco.image.description" />
-                            <a *ngIf="sco.prereq && sco.launch" (click)="open($event, sco.id)"><core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></a>
-                            <span *ngIf="!sco.prereq || !sco.launch"><core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></span>
+                            <a *ngIf="sco.prereq && sco.launch" (click)="open($event, sco.id)"><core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></a>
+                            <span *ngIf="!sco.prereq || !sco.launch"><core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></span>
                         </p>
                     </div>
                 </ion-item>
diff --git a/src/addon/mod/scorm/pages/index/index.html b/src/addon/mod/scorm/pages/index/index.html
index 1bd6f15a8..9a0b2d855 100644
--- a/src/addon/mod/scorm/pages/index/index.html
+++ b/src/addon/mod/scorm/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/scorm/pages/player/player.html b/src/addon/mod/scorm/pages/player/player.html
index 848a18bc9..6d7874bad 100644
--- a/src/addon/mod/scorm/pages/player/player.html
+++ b/src/addon/mod/scorm/pages/player/player.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="scorm.coursemodule"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="scorm.coursemodule" [courseId]="scorm.course"></core-format-text></ion-title>
 
         <ion-buttons end>
             <button *ngIf="showToc && !loadingToc && toc && toc.length" ion-button icon-only (click)="openToc($event)"[attr.aria-label]="'addon.mod_scorm.toc' | translate" aria-haspopup="true">
diff --git a/src/addon/mod/scorm/pages/player/player.ts b/src/addon/mod/scorm/pages/player/player.ts
index 7a598dc36..1334a74d4 100644
--- a/src/addon/mod/scorm/pages/player/player.ts
+++ b/src/addon/mod/scorm/pages/player/player.ts
@@ -393,7 +393,8 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
             attemptToContinue: this.attemptToContinue,
             mode: this.mode,
             selected: this.currentSco && this.currentSco.id,
-            moduleId: this.scorm.coursemodule
+            moduleId: this.scorm.coursemodule,
+            courseId: this.scorm.course
         }, { cssClass: 'core-modal-lateral',
             showBackdrop: true,
             enableBackdropDismiss: true,
diff --git a/src/addon/mod/scorm/pages/toc/toc.html b/src/addon/mod/scorm/pages/toc/toc.html
index 457964211..8ed5ab7c5 100644
--- a/src/addon/mod/scorm/pages/toc/toc.html
+++ b/src/addon/mod/scorm/pages/toc/toc.html
@@ -25,7 +25,7 @@
             <ng-container *ngFor="let sco of toc">
                 <a *ngIf="sco.isvisible" ion-item text-wrap [ngClass]="'core-padding-' + sco.level" [class.core-nav-item-selected]="selected == sco.id" (click)="loadSco(sco)" [attr.disabled]="!sco.prereq || !sco.launch ? true : null" [attr.detail-none]="!sco.prereq || !sco.launch ? true : null">
                     <img [src]="sco.image.url" [alt]="sco.image.description" />
-                    <core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text>
+                    <core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId"></core-format-text>
                 </a>
             </ng-container>
         </ion-list>
diff --git a/src/addon/mod/scorm/pages/toc/toc.ts b/src/addon/mod/scorm/pages/toc/toc.ts
index 27c20d4f7..8aee2d236 100644
--- a/src/addon/mod/scorm/pages/toc/toc.ts
+++ b/src/addon/mod/scorm/pages/toc/toc.ts
@@ -31,11 +31,13 @@ export class AddonModScormTocPage {
     attemptToContinue: number;
     selected: number;
     moduleId: number;
+    courseId: number;
 
     constructor(navParams: NavParams, private viewCtrl: ViewController) {
         this.toc = navParams.get('toc') || [];
         this.attemptToContinue = navParams.get('attemptToContinue');
         this.moduleId = navParams.get('moduleId');
+        this.courseId = navParams.get('courseId');
 
         const mode = navParams.get('mode');
         this.selected = navParams.get('selected');
diff --git a/src/addon/mod/survey/components/index/addon-mod-survey-index.html b/src/addon/mod/survey/components/index/addon-mod-survey-index.html
index 4e3e8c541..1f6ffb305 100644
--- a/src/addon/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addon/mod/survey/components/index/addon-mod-survey-index.html
@@ -14,7 +14,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center safe-area-page">
 
-    <core-course-module-description *ngIf="survey && !survey.surveydone && !hasOffline" [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
+    <core-course-module-description *ngIf="survey && !survey.surveydone && !hasOffline" [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-course-module-description>
 
     <!-- Survey already done -->
     <ion-card padding *ngIf="survey && survey.surveydone">
diff --git a/src/addon/mod/url/components/index/addon-mod-url-index.html b/src/addon/mod/url/components/index/addon-mod-url-index.html
index 66ff7832a..20eba29f7 100644
--- a/src/addon/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addon/mod/url/components/index/addon-mod-url-index.html
@@ -11,7 +11,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description *ngIf="displayDescription" [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
+    <core-course-module-description *ngIf="displayDescription" [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-course-module-description>
 
     <div *ngIf="shouldIframe || (shouldEmbed && isOther)" class="addon-mod_url-embedded-url">
         <core-iframe [src]="url"></core-iframe>
diff --git a/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
index 6ce4a3712..08b73a37b 100644
--- a/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -25,7 +25,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
     <div padding *ngIf="description || pageIsOffline || hasOffline || pageWarning">
-        <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
+        <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-course-module-description>
 
         <!-- Wiki has something offline. -->
         <div class="core-warning-card" icon-start *ngIf="pageIsOffline || hasOffline">
@@ -42,7 +42,7 @@
     </div>
     <div padding class="addon-mod_wiki-page-content">
         <article [ngClass]="{'addon-mod_wiki-noedit': !canEdit}">
-            <core-format-text *ngIf="pageContent" [component]="component" [componentId]="componentId" [text]="pageContent" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
+            <core-format-text *ngIf="pageContent" [component]="component" [componentId]="componentId" [text]="pageContent" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
             <core-empty-box *ngIf="!pageContent" icon="document" [message]="'addon.mod_wiki.nocontent' | translate" [inline]="true"></core-empty-box>
         </article>
 
diff --git a/src/addon/mod/wiki/components/index/index.ts b/src/addon/mod/wiki/components/index/index.ts
index 095aaad97..5bb22176e 100644
--- a/src/addon/mod/wiki/components/index/index.ts
+++ b/src/addon/mod/wiki/components/index/index.ts
@@ -553,7 +553,8 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
             pages: this.subwikiPages,
             selected: this.currentPageObj && this.currentPageObj.id,
             homeView: this.getWikiHomeView(),
-            moduleId: this.module.id
+            moduleId: this.module.id,
+            courseId: this.courseId
         }, { cssClass: 'core-modal-lateral',
             showBackdrop: true,
             enableBackdropDismiss: true,
diff --git a/src/addon/mod/wiki/pages/edit/edit.html b/src/addon/mod/wiki/pages/edit/edit.html
index 17572bf9c..c9f61f896 100644
--- a/src/addon/mod/wiki/pages/edit/edit.html
+++ b/src/addon/mod/wiki/pages/edit/edit.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <button ion-button clear (click)="save()" [attr.aria-label]="'core.save' | translate">
diff --git a/src/addon/mod/wiki/pages/index/index.html b/src/addon/mod/wiki/pages/index/index.html
index aed2d83b2..31c0fcf94 100644
--- a/src/addon/mod/wiki/pages/index/index.html
+++ b/src/addon/mod/wiki/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/wiki/pages/map/map.html b/src/addon/mod/wiki/pages/map/map.html
index 925b94da0..2efb52c92 100644
--- a/src/addon/mod/wiki/pages/map/map.html
+++ b/src/addon/mod/wiki/pages/map/map.html
@@ -20,7 +20,7 @@
                     {{ letter.label }}
                 </ion-item-divider>
                 <a ion-item text-wrap *ngFor="let page of letter.pages" (click)="goToPage(page)" [class.core-nav-item-selected]="selected == page.id">
-                    <ion-icon name="home" item-start *ngIf="page.firstpage"></ion-icon> <core-format-text [text]="page.title" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text>
+                    <ion-icon name="home" item-start *ngIf="page.firstpage"></ion-icon> <core-format-text [text]="page.title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId"></core-format-text>
                     <ion-note *ngIf="!page.id" item-end>
                         <ion-icon name="time"></ion-icon>
                         <span text-wrap>{{ 'core.notsent' | translate }}</span>
diff --git a/src/addon/mod/wiki/pages/map/map.ts b/src/addon/mod/wiki/pages/map/map.ts
index cb38f6baf..9d5991e64 100644
--- a/src/addon/mod/wiki/pages/map/map.ts
+++ b/src/addon/mod/wiki/pages/map/map.ts
@@ -27,6 +27,7 @@ export class AddonModWikiMapPage {
     map: any[] = []; // Map of pages, categorized by letter.
     selected: number;
     moduleId: number;
+    courseId: number;
     homeView: ViewController;
 
     constructor(navParams: NavParams, protected viewCtrl: ViewController) {
@@ -35,6 +36,7 @@ export class AddonModWikiMapPage {
         this.selected = navParams.get('selected');
         this.homeView = navParams.get('homeView');
         this.moduleId = navParams.get('moduleId');
+        this.courseId = navParams.get('courseId');
     }
 
     /**
diff --git a/src/addon/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html b/src/addon/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html
index e978a3cb1..229a181d3 100644
--- a/src/addon/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html
+++ b/src/addon/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html
@@ -2,7 +2,7 @@
     <ion-card *ngIf="n < assessment.form.dimenssionscount">
         <ion-item text-wrap>
             <h2>{{ field.dimtitle }}</h2>
-            <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text>
+            <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId"></core-format-text>
         </ion-item>
         <ion-item *ngIf="edit && field.grades">
             <ion-label [core-mark-required]="true" stacked>{{ 'addon.mod_workshop_assessment_accumulative.dimensiongradefor' | translate : {'$a': field.dimtitle } }}</ion-label>
@@ -23,7 +23,7 @@
         </ion-item>
         <ion-item *ngIf="!edit" text-wrap>
             <h2>{{ 'addon.mod_workshop_assessment_accumulative.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</h2>
-            <p><core-format-text [text]="selectedValues[n].peercomment"  contextLevel="module" [contextInstanceId]="moduleId"></core-format-text></p>
+            <p><core-format-text [text]="selectedValues[n].peercomment" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId"></core-format-text></p>
         </ion-item>
     </ion-card>
 </ng-container>
diff --git a/src/addon/mod/workshop/assessment/comments/component/addon-mod-workshop-assessment-strategy-comments.html b/src/addon/mod/workshop/assessment/comments/component/addon-mod-workshop-assessment-strategy-comments.html
index c9f320a5c..7b2a324d4 100644
--- a/src/addon/mod/workshop/assessment/comments/component/addon-mod-workshop-assessment-strategy-comments.html
+++ b/src/addon/mod/workshop/assessment/comments/component/addon-mod-workshop-assessment-strategy-comments.html
@@ -2,7 +2,7 @@
     <ion-card *ngIf="n < assessment.form.dimenssionscount">
         <ion-item text-wrap>
             <h2>{{ field.dimtitle }}</h2>
-            <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text>
+            <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId"></core-format-text>
         </ion-item>
         <ion-item *ngIf="edit">
             <ion-label stacked [core-mark-required]="true">{{ 'addon.mod_workshop_assessment_comments.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</ion-label>
@@ -11,7 +11,7 @@
         </ion-item>
         <ion-item *ngIf="!edit" text-wrap>
             <h2>{{ 'addon.mod_workshop_assessment_comments.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</h2>
-            <p><core-format-text [text]="selectedValues[n].peercomment" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text></p>
+            <p><core-format-text [text]="selectedValues[n].peercomment" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId"></core-format-text></p>
         </ion-item>
     </ion-card>
 </ng-container>
diff --git a/src/addon/mod/workshop/assessment/numerrors/component/addon-mod-workshop-assessment-strategy-numerrors.html b/src/addon/mod/workshop/assessment/numerrors/component/addon-mod-workshop-assessment-strategy-numerrors.html
index 0045b6c42..0b322a738 100644
--- a/src/addon/mod/workshop/assessment/numerrors/component/addon-mod-workshop-assessment-strategy-numerrors.html
+++ b/src/addon/mod/workshop/assessment/numerrors/component/addon-mod-workshop-assessment-strategy-numerrors.html
@@ -2,7 +2,7 @@
     <ion-card *ngIf="n < assessment.form.dimenssionscount">
         <ion-item text-wrap>
             <h2>{{ field.dimtitle }}</h2>
-            <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text>
+            <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId"></core-format-text>
         </ion-item>
         <ion-list radio-group [(ngModel)]="selectedValues[n].grade" [name]="'grade_' + n">
             <ion-item>
@@ -24,7 +24,7 @@
         </ion-item>
         <ion-item *ngIf="!edit" text-wrap>
             <h2>{{ 'addon.mod_workshop_assessment_numerrors.dimensioncommentfor' | translate : {'$a': field.dimtitle } }}</h2>
-            <p><core-format-text [text]="selectedValues[n].peercomment" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text></p>
+            <p><core-format-text [text]="selectedValues[n].peercomment" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId"></core-format-text></p>
         </ion-item>
     </ion-card>
 </ng-container>
diff --git a/src/addon/mod/workshop/assessment/rubric/component/addon-mod-workshop-assessment-strategy-rubric.html b/src/addon/mod/workshop/assessment/rubric/component/addon-mod-workshop-assessment-strategy-rubric.html
index c141b87b8..fad4f86b5 100644
--- a/src/addon/mod/workshop/assessment/rubric/component/addon-mod-workshop-assessment-strategy-rubric.html
+++ b/src/addon/mod/workshop/assessment/rubric/component/addon-mod-workshop-assessment-strategy-rubric.html
@@ -2,12 +2,12 @@
     <ion-card *ngIf="n < assessment.form.dimenssionscount">
         <ion-item text-wrap>
             <h2 [core-mark-required]="edit">{{ field.dimtitle }}</h2>
-            <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text>
+            <core-format-text [text]="field.description" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId"></core-format-text>
             <core-input-errors *ngIf="edit && fieldErrors['chosenlevelid_' + n]" [errorText]="fieldErrors['chosenlevelid_' + n]"></core-input-errors>
         </ion-item>
         <ion-list radio-group [(ngModel)]="selectedValues[n].chosenlevelid" [name]="'chosenlevelid_' + n">
             <ion-item *ngFor="let subfield of field.fields">
-                <ion-label><p><core-format-text [text]="subfield.definition" contextLevel="module" [contextInstanceId]="moduleId"></core-format-text></p></ion-label>
+                <ion-label><p><core-format-text [text]="subfield.definition" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId"></core-format-text></p></ion-label>
                 <ion-radio [value]="subfield.levelid" [disabled]="!edit"></ion-radio>
             </ion-item>
         </ion-list>
diff --git a/src/addon/mod/workshop/classes/assessment-strategy-component.ts b/src/addon/mod/workshop/classes/assessment-strategy-component.ts
index 6fd909453..f45376472 100644
--- a/src/addon/mod/workshop/classes/assessment-strategy-component.ts
+++ b/src/addon/mod/workshop/classes/assessment-strategy-component.ts
@@ -25,6 +25,7 @@ export class AddonModWorkshopAssessmentStrategyComponentBase {
     @Input() fieldErrors: any;
     @Input() strategy: string;
     @Input() moduleId: number;
+    @Input() courseId: number;
 
     constructor() {
         // Nothing to do.
diff --git a/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html b/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
index ea523e56f..7f3b2bba7 100644
--- a/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
+++ b/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
@@ -28,7 +28,7 @@
                 </ion-select>
             </ion-item>
             <ion-item text-wrap *ngIf="!edit && data.assessment.feedbackauthor">
-                <core-format-text [component]="component" [componentId]="componentId" [text]="data.assessment.feedbackauthor" contextLevel="module" [contextInstanceId]="workshop.coursemodule"></core-format-text>
+                <core-format-text [component]="component" [componentId]="componentId" [text]="data.assessment.feedbackauthor" contextLevel="module" [contextInstanceId]="workshop.coursemodule" [courseId]="workshop.course"></core-format-text>
             </ion-item>
             <ion-item *ngIf="!edit && workshop.overallfeedbackfiles && data.assessment.feedbackattachmentfiles && data.assessment.feedbackattachmentfiles.length">
                 <div no-lines>
diff --git a/src/addon/mod/workshop/components/assessment-strategy/assessment-strategy.ts b/src/addon/mod/workshop/components/assessment-strategy/assessment-strategy.ts
index 646dba1f6..e92c1e998 100644
--- a/src/addon/mod/workshop/components/assessment-strategy/assessment-strategy.ts
+++ b/src/addon/mod/workshop/components/assessment-strategy/assessment-strategy.ts
@@ -52,7 +52,8 @@ export class AddonModWorkshopAssessmentStrategyComponent implements OnInit {
         selectedValues: [],
         fieldErrors: {},
         strategy: '',
-        moduleId: 0
+        moduleId: 0,
+        courseId: null
     };
     assessmentStrategyLoaded = false;
     notSupported = false;
@@ -103,6 +104,7 @@ export class AddonModWorkshopAssessmentStrategyComponent implements OnInit {
         this.data.edit = this.edit;
         this.data.strategy = this.strategy;
         this.data.moduleId = this.workshop.coursemodule;
+        this.data.courseId = this.workshop.course;
 
         this.componentClass = this.strategyDelegate.getComponentForPlugin(this.injector, this.strategy);
         if (this.componentClass) {
diff --git a/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
index 8030f7d36..7c9a39402 100644
--- a/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -41,7 +41,7 @@
     <ion-card *ngIf="description && workshop && workshop.phase == workshopPhases.PHASE_SETUP">
         <ion-item text-wrap>
             <h2>{{ 'core.description' | translate }}</h2>
-            <core-format-text [text]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
+            <core-format-text [text]="description" [component]="component" [componentId]="componentId" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
         </ion-item>
     </ion-card>
 
@@ -51,7 +51,7 @@
             <ion-card *ngIf="workshop.conclusion">
                 <ion-item text-wrap>
                     <h2>{{ 'addon.mod_workshop.conclusion' | translate }}</h2>
-                    <core-format-text fullOnClick="true" [component]="component" [componentId]="module.id" [text]="workshop.conclusion" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
+                    <core-format-text fullOnClick="true" [component]="component" [componentId]="module.id" [text]="workshop.conclusion" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
                 </ion-item>
             </ion-card>
 
@@ -74,7 +74,7 @@
         <ion-card *ngIf="workshop.phase == workshopPhases.PHASE_SUBMISSION && workshop.instructauthors">
             <ion-item text-wrap>
                 <h2>{{ 'addon.mod_workshop.areainstructauthors' | translate }}</h2>
-                <core-format-text fullOnClick="true" [component]="component" [componentId]="module.id" [text]="workshop.instructauthors" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
+                <core-format-text fullOnClick="true" [component]="component" [componentId]="module.id" [text]="workshop.instructauthors" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
             </ion-item>
         </ion-card>
 
@@ -122,7 +122,7 @@
             <ion-card *ngIf="workshop.phase == workshopPhases.PHASE_ASSESSMENT && workshop.instructreviewers">
                 <ion-item text-wrap>
                     <h2>{{ 'addon.mod_workshop.areainstructreviewers' | translate }}</h2>
-                    <core-format-text fullOnClick="true" [component]="component" [componentId]="module.id" [text]="workshop.instructreviewers" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
+                    <core-format-text fullOnClick="true" [component]="component" [componentId]="module.id" [text]="workshop.instructreviewers" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
                 </ion-item>
             </ion-card>
 
diff --git a/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html b/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html
index 752d370b6..0db614d75 100644
--- a/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html
+++ b/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html
@@ -2,7 +2,7 @@
     <div *ngIf="!summary">
         <ion-list-header text-wrap>
             <ion-avatar core-user-avatar [user]="profile" [courseId]="courseId" [userId]="profile && profile.id" item-start></ion-avatar>
-            <h2><core-format-text [text]="submission.title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></h2>
+            <h2><core-format-text [text]="submission.title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></h2>
             <p *ngIf="profile && profile.fullname">{{profile.fullname}}</p>
             <p *ngIf="showGrade(submission.submissiongrade)" [class.addon-has-overriden-grade]="showGrade(submission.submissiongradeover)">
                 {{ 'addon.mod_workshop.submissiongradeof' | translate:{$a: workshop.grade } }}: {{submission.submissiongrade}}
@@ -23,7 +23,7 @@
             </ion-note>
         </ion-list-header>
         <ion-item text-wrap *ngIf="submission.content">
-            <core-format-text [component]="component" [componentId]="componentId" [text]="submission.content" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
+            <core-format-text [component]="component" [componentId]="componentId" [text]="submission.content" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
         </ion-item>
         <ion-item *ngFor="let attachment of submission.attachmentfiles">
             <!-- Files already attached to the submission. -->
@@ -35,7 +35,7 @@
             <ion-avatar *ngIf="evaluateByProfile" core-user-avatar [user]="evaluateByProfile" item-start [courseId]="courseId" [userId]="evaluateByProfile.id"></ion-avatar>
 
             <h2 *ngIf="evaluateByProfile && evaluateByProfile.fullname">{{ 'addon.mod_workshop.feedbackby' | translate : {$a: evaluateByProfile.fullname} }}</h2>
-            <core-format-text [text]="submission.feedbackauthor" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
+            <core-format-text [text]="submission.feedbackauthor" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
         </ion-item>
         <ion-item *ngIf="viewDetails">
             <button ion-button block (click)="gotoSubmission()">
@@ -48,7 +48,7 @@
     <a ion-item text-wrap *ngIf="summary" [attr.detail-none]="submission.timemodified ? null : true" (click)="gotoSubmission()">
         <ion-avatar core-user-avatar [user]="profile" item-start [courseId]="courseId" [userId]="profile && profile.id"></ion-avatar>
 
-        <h2><core-format-text [text]="submission.title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></h2>
+        <h2><core-format-text [text]="submission.title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></h2>
         <p *ngIf="profile && profile.fullname">{{profile.fullname}}</p>
         <p *ngIf="submission.reviewedbycount">
             {{ 'addon.mod_workshop.receivedgrades' | translate }}: {{submission.reviewedbycount}} / {{submission.reviewedby.length}}
diff --git a/src/addon/mod/workshop/pages/assessment/assessment.html b/src/addon/mod/workshop/pages/assessment/assessment.html
index f67a8f3ba..96b65ea32 100644
--- a/src/addon/mod/workshop/pages/assessment/assessment.html
+++ b/src/addon/mod/workshop/pages/assessment/assessment.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="workshop && workshop.coursemodule"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="workshop && workshop.coursemodule" [courseId]="courseId"></core-format-text></ion-title>
         <ion-buttons end [hidden]="!evaluating">
             <button ion-button clear (click)="saveEvaluation()" [attr.aria-label]="'core.save' | translate">
                 {{ 'core.save' | translate }}
@@ -67,7 +67,7 @@
             <ion-item text-wrap>
                 <ion-avatar core-user-avatar *ngIf="evaluateGradingByProfile" [user]="evaluateGradingByProfile" item-start [courseId]="courseId" [userId]="evaluateGradingByProfile.id"></ion-avatar>
                 <h2 *ngIf="evaluateGradingByProfile && evaluateGradingByProfile.fullname">{{ 'addon.mod_workshop.feedbackby' | translate : {$a: evaluateGradingByProfile.fullname} }}</h2>
-                <core-format-text [text]="evaluate.text" contextLevel="module" [contextInstanceId]="workshop.coursemodule"></core-format-text>
+                <core-format-text [text]="evaluate.text" contextLevel="module" [contextInstanceId]="workshop.coursemodule" [courseId]="courseId"></core-format-text>
             </ion-item>
         </ion-list>
     </core-loading>
diff --git a/src/addon/mod/workshop/pages/index/index.html b/src/addon/mod/workshop/pages/index/index.html
index 3498a1f71..f15e75129 100644
--- a/src/addon/mod/workshop/pages/index/index.html
+++ b/src/addon/mod/workshop/pages/index/index.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <!-- The buttons defined by the component will be added in here. -->
diff --git a/src/addon/mod/workshop/pages/submission/submission.html b/src/addon/mod/workshop/pages/submission/submission.html
index 26f14be1c..cb56ca01f 100644
--- a/src/addon/mod/workshop/pages/submission/submission.html
+++ b/src/addon/mod/workshop/pages/submission/submission.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
         <ion-buttons end [hidden]="!loaded">
             <button *ngIf="assessmentId && access.assessingallowed" ion-button clear (click)="saveAssessment()" [attr.aria-label]="'core.save' | translate">
                 {{ 'core.save' | translate }}
@@ -38,7 +38,7 @@
             <ion-item text-wrap>
                 <ion-avatar core-user-avatar *ngIf="evaluateByProfile" [user]="evaluateByProfile" item-start [courseId]="courseId" [userId]="evaluateByProfile.id"></ion-avatar>
                 <h2 *ngIf="evaluateByProfile && evaluateByProfile.fullname">{{ 'addon.mod_workshop.feedbackby' | translate : {$a: evaluateByProfile.fullname} }}</h2>
-                <core-format-text [text]="evaluate.text" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
+                <core-format-text [text]="evaluate.text" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
             </ion-item>
         </ion-list>
 
@@ -97,7 +97,7 @@
             <ion-item text-wrap>
                 <ion-avatar core-user-avatar *ngIf="evaluateGradingByProfile" [user]="evaluateGradingByProfile" item-start [courseId]="courseId" [userId]="evaluateGradingByProfile.id"></ion-avatar>
                 <h2 *ngIf="evaluateGradingByProfile && evaluateGradingByProfile.fullname">{{ 'addon.mod_workshop.feedbackby' | translate : {$a: evaluateGradingByProfile.fullname} }}</h2>
-                <core-format-text [text]="assessment.feedbackreviewer" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
+                <core-format-text [text]="assessment.feedbackreviewer" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
             </ion-item>
         </ion-list>
     </core-loading>
diff --git a/src/addon/qtype/calculated/component/addon-qtype-calculated.html b/src/addon/qtype/calculated/component/addon-qtype-calculated.html
index beb823202..e0096a827 100644
--- a/src/addon/qtype/calculated/component/addon-qtype-calculated.html
+++ b/src/addon/qtype/calculated/component/addon-qtype-calculated.html
@@ -1,6 +1,6 @@
 <section ion-list class="addon-qtype-calculated-container" *ngIf="question.text || question.text === ''">
     <ion-item text-wrap>
-        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
+        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text></p>
     </ion-item>
 
     <!-- Display unit options before the answer input. -->
diff --git a/src/addon/qtype/ddimageortext/component/addon-qtype-ddimageortext.html b/src/addon/qtype/ddimageortext/component/addon-qtype-ddimageortext.html
index e1e79fdc3..f07233836 100644
--- a/src/addon/qtype/ddimageortext/component/addon-qtype-ddimageortext.html
+++ b/src/addon/qtype/ddimageortext/component/addon-qtype-ddimageortext.html
@@ -7,7 +7,7 @@
             <ion-icon name="information-circle"></ion-icon>
             {{ 'core.question.howtodraganddrop' | translate }}
         </p>
-        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
+        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text></p>
         <core-format-text *ngIf="question.ddArea" [adaptImg]="false" [component]="component" [componentId]="componentId" [text]="question.ddArea" [filter]="false" (afterRender)="questionRendered()"></core-format-text>
     </ion-item>
 </section>
diff --git a/src/addon/qtype/ddmarker/component/addon-qtype-ddmarker.html b/src/addon/qtype/ddmarker/component/addon-qtype-ddmarker.html
index 58763a33e..2284c4265 100644
--- a/src/addon/qtype/ddmarker/component/addon-qtype-ddmarker.html
+++ b/src/addon/qtype/ddmarker/component/addon-qtype-ddmarker.html
@@ -7,7 +7,7 @@
             <ion-icon name="information-circle"></ion-icon>
             {{ 'core.question.howtodraganddrop' | translate }}
         </p>
-        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" #questiontext [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
+        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" #questiontext [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text></p>
         <core-format-text *ngIf="question.ddArea" [adaptImg]="false" [component]="component" [componentId]="componentId" [text]="question.ddArea" [filter]="false" (afterRender)="questionRendered()"></core-format-text>
     </ion-item>
 </section>
diff --git a/src/addon/qtype/ddwtos/component/addon-qtype-ddwtos.html b/src/addon/qtype/ddwtos/component/addon-qtype-ddwtos.html
index ae2f63831..e70dcfd69 100644
--- a/src/addon/qtype/ddwtos/component/addon-qtype-ddwtos.html
+++ b/src/addon/qtype/ddwtos/component/addon-qtype-ddwtos.html
@@ -7,7 +7,7 @@
             <ion-icon name="information-circle"></ion-icon>
             {{ 'core.question.howtodraganddrop' | translate }}
         </p>
-        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" #questiontext></core-format-text></p>
+        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" #questiontext></core-format-text></p>
         <core-format-text *ngIf="question.answers" [component]="component" [componentId]="componentId" [text]="question.answers" [filter]="false" (afterRender)="questionRendered()"></core-format-text>
         <div class="drags"></div>
     </ion-item>
diff --git a/src/addon/qtype/ddwtos/component/ddwtos.ts b/src/addon/qtype/ddwtos/component/ddwtos.ts
index 83190e29e..2ad23fcc6 100644
--- a/src/addon/qtype/ddwtos/component/ddwtos.ts
+++ b/src/addon/qtype/ddwtos/component/ddwtos.ts
@@ -96,7 +96,7 @@ export class AddonQtypeDdwtosComponent extends CoreQuestionBaseComponent impleme
                         this.question, this.question.readOnly, this.inputIds, this.textUtils);
 
                 this.questionHelper.treatCorrectnessIconsClicks(this.element, this.component, this.componentId, this.contextLevel,
-                        this.contextInstanceId);
+                        this.contextInstanceId, this.courseId);
 
                 this.question.loaded = true;
             });
diff --git a/src/addon/qtype/description/component/addon-qtype-description.html b/src/addon/qtype/description/component/addon-qtype-description.html
index 3b54888e9..1264d7c70 100644
--- a/src/addon/qtype/description/component/addon-qtype-description.html
+++ b/src/addon/qtype/description/component/addon-qtype-description.html
@@ -2,6 +2,6 @@
     <!-- "Seen" hidden input -->
     <input *ngIf="question.seenInput" type="hidden" [name]="question.seenInput.name" [value]="question.seenInput.value" >
     <ion-item text-wrap class="item item-text-wrap">
-        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
+        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text></p>
     </ion-item>
 </section>
diff --git a/src/addon/qtype/essay/component/addon-qtype-essay.html b/src/addon/qtype/essay/component/addon-qtype-essay.html
index b8df1320e..5c171fedc 100644
--- a/src/addon/qtype/essay/component/addon-qtype-essay.html
+++ b/src/addon/qtype/essay/component/addon-qtype-essay.html
@@ -1,7 +1,7 @@
 <section ion-list *ngIf="question.text || question.text === ''">
     <!-- Question text. -->
     <ion-item text-wrap>
-        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
+        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text></p>
     </ion-item>
 
     <!-- Textarea. -->
@@ -20,7 +20,7 @@
             <p class="core-question-warning">{{ 'core.question.errorinlinefilesnotsupported' | translate }}</p>
         </ion-item>
         <ion-item text-wrap>
-            <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.textarea.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
+            <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.textarea.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text></p>
         </ion-item>
     </ng-container>
 
@@ -31,7 +31,7 @@
 
     <!-- Answer to the question and attachments (reviewing). -->
     <ion-item text-wrap *ngIf="!question.textarea && (question.answer || (!question.attachments.length && !question.allowsAttachments))">
-        <p><core-format-text [ngClass]='{"core-monospaced": question.isMonospaced}' [component]="component" [componentId]="componentId" [text]="question.answer" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
+        <p><core-format-text [ngClass]='{"core-monospaced": question.isMonospaced}' [component]="component" [componentId]="componentId" [text]="question.answer" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text></p>
     </ion-item>
 
     <ion-item *ngIf="!question.textarea && question.attachments && question.attachments.length">
diff --git a/src/addon/qtype/gapselect/component/addon-qtype-gapselect.html b/src/addon/qtype/gapselect/component/addon-qtype-gapselect.html
index 099c6d926..88b29f7fc 100644
--- a/src/addon/qtype/gapselect/component/addon-qtype-gapselect.html
+++ b/src/addon/qtype/gapselect/component/addon-qtype-gapselect.html
@@ -1,5 +1,5 @@
 <section ion-list class="addon-qtype-gapselect-container" *ngIf="question.text || question.text === ''">
     <ion-item text-wrap>
-        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" (afterRender)="questionRendered()"></core-format-text></p>
+        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" (afterRender)="questionRendered()"></core-format-text></p>
     </ion-item>
 </section>
diff --git a/src/addon/qtype/gapselect/component/gapselect.ts b/src/addon/qtype/gapselect/component/gapselect.ts
index 2faa3ada4..7dd56017f 100644
--- a/src/addon/qtype/gapselect/component/gapselect.ts
+++ b/src/addon/qtype/gapselect/component/gapselect.ts
@@ -45,6 +45,6 @@ export class AddonQtypeGapSelectComponent extends CoreQuestionBaseComponent impl
      */
     questionRendered(): void {
         this.questionHelper.treatCorrectnessIconsClicks(this.element, this.component, this.componentId, this.contextLevel,
-                this.contextInstanceId);
+                this.contextInstanceId, this.courseId);
     }
 }
diff --git a/src/addon/qtype/match/component/addon-qtype-match.html b/src/addon/qtype/match/component/addon-qtype-match.html
index 2f48f297d..08bbe1274 100644
--- a/src/addon/qtype/match/component/addon-qtype-match.html
+++ b/src/addon/qtype/match/component/addon-qtype-match.html
@@ -1,12 +1,12 @@
 <section ion-list class="addon-qtype-match-container" *ngIf="question.loaded">
     <ion-item text-wrap>
-        <core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text>
+        <core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text>
     </ion-item>
     <ion-item text-wrap *ngFor="let row of question.rows">
         <ion-grid item-content no-margin no-padding>
             <ion-row no-margin>
                 <ion-col>
-                    <p><core-format-text id="addon-qtype-match-question-{{row.id}}" [component]="component" [componentId]="componentId" [text]="row.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
+                    <p><core-format-text id="addon-qtype-match-question-{{row.id}}" [component]="component" [componentId]="componentId" [text]="row.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text></p>
                 </ion-col>
                 <ion-col>
                     <label class="accesshide" for="{{row.id}}" *ngIf="row.accessibilityLabel">{{ row.accessibilityLabel }}</label>
diff --git a/src/addon/qtype/multianswer/component/addon-qtype-multianswer.html b/src/addon/qtype/multianswer/component/addon-qtype-multianswer.html
index 68b989b11..919da0149 100644
--- a/src/addon/qtype/multianswer/component/addon-qtype-multianswer.html
+++ b/src/addon/qtype/multianswer/component/addon-qtype-multianswer.html
@@ -1,5 +1,5 @@
 <section ion-list class="addon-qtype-multianswer-container" *ngIf="question.text || question.text === ''">
     <ion-item text-wrap>
-        <core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" (afterRender)="questionRendered()"></core-format-text>
+        <core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" (afterRender)="questionRendered()"></core-format-text>
     </ion-item>
 </section>
diff --git a/src/addon/qtype/multianswer/component/multianswer.ts b/src/addon/qtype/multianswer/component/multianswer.ts
index d19750434..7c2257113 100644
--- a/src/addon/qtype/multianswer/component/multianswer.ts
+++ b/src/addon/qtype/multianswer/component/multianswer.ts
@@ -45,6 +45,6 @@ export class AddonQtypeMultiAnswerComponent extends CoreQuestionBaseComponent im
      */
     questionRendered(): void {
         this.questionHelper.treatCorrectnessIconsClicks(this.element, this.component, this.componentId, this.contextLevel,
-                this.contextInstanceId);
+                this.contextInstanceId, this.courseId);
     }
 }
diff --git a/src/addon/qtype/multichoice/component/addon-qtype-multichoice.html b/src/addon/qtype/multichoice/component/addon-qtype-multichoice.html
index 2914b227a..32fc617f0 100644
--- a/src/addon/qtype/multichoice/component/addon-qtype-multichoice.html
+++ b/src/addon/qtype/multichoice/component/addon-qtype-multichoice.html
@@ -1,7 +1,7 @@
 <section ion-list *ngIf="question.text || question.text === ''">
     <!-- Question text first. -->
     <ion-item text-wrap>
-        <core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text>
+        <core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text>
         <span *ngIf="question.prompt">{{ question.prompt }}</span>
     </ion-item>
 
@@ -9,8 +9,8 @@
     <ng-container *ngIf="question.multi">
         <ion-item text-wrap *ngFor="let option of question.options">
             <ion-label [color]='(option.isCorrect === 1 ? "success": "") +  (option.isCorrect === 0 ? "danger": "")'>
-                <core-format-text [component]="component" [componentId]="componentId" [text]="option.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text>
-                <div *ngIf="option.feedback" class="specificfeedback"><core-format-text [component]="component" [componentId]="componentId" [text]="option.feedback" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></div>
+                <core-format-text [component]="component" [componentId]="componentId" [text]="option.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text>
+                <div *ngIf="option.feedback" class="specificfeedback"><core-format-text [component]="component" [componentId]="componentId" [text]="option.feedback" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text></div>
             </ion-label>
             <ion-checkbox [attr.name]="option.name" [(ngModel)]="option.checked" [disabled]="option.disabled" item-end [color]='(option.isCorrect === 1 ? "success": "") +  (option.isCorrect === 0 ? "danger": "")'></ion-checkbox>
             <core-icon item-content *ngIf="option.isCorrect === 1" class="core-correct-icon" name="fa-check" color="success"></core-icon>
@@ -25,8 +25,8 @@
     <div *ngIf="!question.multi" radio-group [(ngModel)]="question.singleChoiceModel" [name]="question.optionsName">
         <ion-item text-wrap *ngFor="let option of question.options">
             <ion-label>
-                <core-format-text [component]="component" [componentId]="componentId" [text]="option.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text>
-                <div *ngIf="option.feedback" class="specificfeedback"><core-format-text [component]="component" [componentId]="componentId" [text]="option.feedback" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></div>
+                <core-format-text [component]="component" [componentId]="componentId" [text]="option.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text>
+                <div *ngIf="option.feedback" class="specificfeedback"><core-format-text [component]="component" [componentId]="componentId" [text]="option.feedback" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text></div>
             </ion-label>
             <ion-radio [value]="option.value" [disabled]="option.disabled" [color]='(option.isCorrect === 1 ? "success": "") +  (option.isCorrect === 0 ? "danger": "")'></ion-radio>
             <core-icon item-content *ngIf="option.isCorrect === 1" class="core-correct-icon" name="fa-check" color="success"></core-icon>
diff --git a/src/addon/qtype/shortanswer/component/addon-qtype-shortanswer.html b/src/addon/qtype/shortanswer/component/addon-qtype-shortanswer.html
index ee269de08..5cfaf0139 100644
--- a/src/addon/qtype/shortanswer/component/addon-qtype-shortanswer.html
+++ b/src/addon/qtype/shortanswer/component/addon-qtype-shortanswer.html
@@ -1,6 +1,6 @@
 <section ion-list *ngIf="question.text || question.text === ''">
     <ion-item text-wrap class="addon-qtype-shortanswer-text">
-        <core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text>
+        <core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text>
     </ion-item>
     <ion-item *ngIf="!question.input.isInline" text-wrap ngClass="core-{{question.input.correctIconColor}}-item">
         <ion-label stacked>{{ 'addon.mod_quiz.answercolon' | translate }}</ion-label>
diff --git a/src/addon/userprofilefield/menu/component/addon-user-profile-field-menu.html b/src/addon/userprofilefield/menu/component/addon-user-profile-field-menu.html
index d46a4dbd6..ac8f11b04 100644
--- a/src/addon/userprofilefield/menu/component/addon-user-profile-field-menu.html
+++ b/src/addon/userprofilefield/menu/component/addon-user-profile-field-menu.html
@@ -1,7 +1,7 @@
 <!-- Render (no edit). -->
 <ion-item *ngIf="!edit && field && field.name">
     <h2>{{ field.name }}</h2>
-    <p><core-format-text [text]="field.value" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
+    <p><core-format-text [text]="field.value" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text></p>
 </ion-item>
 <!-- Edit. -->
 <ion-item *ngIf="edit && field && field.shortname" text-wrap [formGroup]="form">
diff --git a/src/addon/userprofilefield/menu/component/menu.ts b/src/addon/userprofilefield/menu/component/menu.ts
index 89f82faa0..c4365a44f 100644
--- a/src/addon/userprofilefield/menu/component/menu.ts
+++ b/src/addon/userprofilefield/menu/component/menu.ts
@@ -29,6 +29,7 @@ export class AddonUserProfileFieldMenuComponent implements OnInit {
     @Input() form?: FormGroup; // Form where to add the form control.
     @Input() contextLevel?: string; // The context level.
     @Input() contextInstanceId?: number; // The instance ID related to the context.
+    @Input() courseId?: number; // The course the field belongs to (if any).
 
     constructor(private fb: FormBuilder) { }
 
diff --git a/src/addon/userprofilefield/text/component/addon-user-profile-field-text.html b/src/addon/userprofilefield/text/component/addon-user-profile-field-text.html
index 5c9a460eb..977c7cd49 100644
--- a/src/addon/userprofilefield/text/component/addon-user-profile-field-text.html
+++ b/src/addon/userprofilefield/text/component/addon-user-profile-field-text.html
@@ -1,7 +1,7 @@
 <!-- Render (no edit). -->
 <ion-item *ngIf="!edit && field && field.name">
     <h2>{{ field.name }}</h2>
-    <p><core-format-text [text]="field.value" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
+    <p><core-format-text [text]="field.value" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text></p>
 </ion-item>
 <!-- Edit. -->
 <ion-item *ngIf="edit && field && field.shortname" text-wrap [formGroup]="form">
diff --git a/src/addon/userprofilefield/text/component/text.ts b/src/addon/userprofilefield/text/component/text.ts
index c25ff38d9..1eda97aca 100644
--- a/src/addon/userprofilefield/text/component/text.ts
+++ b/src/addon/userprofilefield/text/component/text.ts
@@ -30,6 +30,7 @@ export class AddonUserProfileFieldTextComponent implements OnInit {
     @Input() form?: FormGroup; // Form where to add the form control.
     @Input() contextLevel?: string; // The context level.
     @Input() contextInstanceId?: number; // The instance ID related to the context.
+    @Input() courseId?: number; // The course the field belongs to (if any).
 
     constructor(private fb: FormBuilder, protected utils: CoreUtilsProvider) { }
 
diff --git a/src/addon/userprofilefield/textarea/component/addon-user-profile-field-textarea.html b/src/addon/userprofilefield/textarea/component/addon-user-profile-field-textarea.html
index a9e60d41d..1d149a8ed 100644
--- a/src/addon/userprofilefield/textarea/component/addon-user-profile-field-textarea.html
+++ b/src/addon/userprofilefield/textarea/component/addon-user-profile-field-textarea.html
@@ -1,7 +1,7 @@
 <!-- Render (no edit). -->
 <ion-item *ngIf="!edit && field && field.name">
     <h2>{{ field.name }}</h2>
-    <p><core-format-text [text]="field.value" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
+    <p><core-format-text [text]="field.value" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text></p>
 </ion-item>
 <!-- Edit. -->
 <ion-item *ngIf="edit && field && field.shortname" text-wrap [formGroup]="form">
diff --git a/src/addon/userprofilefield/textarea/component/textarea.ts b/src/addon/userprofilefield/textarea/component/textarea.ts
index 475e1e717..43c9701b2 100644
--- a/src/addon/userprofilefield/textarea/component/textarea.ts
+++ b/src/addon/userprofilefield/textarea/component/textarea.ts
@@ -29,6 +29,7 @@ export class AddonUserProfileFieldTextareaComponent implements OnInit {
     @Input() form?: FormGroup; // Form where to add the form control.
     @Input() contextLevel?: string; // The context level.
     @Input() contextInstanceId?: number; // The instance ID related to the context.
+    @Input() courseId?: number; // The course the field belongs to (if any).
 
     control: FormControl;
 
diff --git a/src/components/chart/chart.ts b/src/components/chart/chart.ts
index cd310d47e..b3715ad43 100644
--- a/src/components/chart/chart.ts
+++ b/src/components/chart/chart.ts
@@ -15,6 +15,7 @@
 import { Component, Input, OnDestroy, OnInit, ElementRef, OnChanges, ViewChild } from '@angular/core';
 import { Chart } from 'chart.js';
 import { CoreFilterProvider } from '@core/filter/providers/filter';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 
 /**
@@ -49,12 +50,14 @@ export class CoreChartComponent implements OnDestroy, OnInit, OnChanges {
     @Input() filter?: boolean | string; // Whether to filter labels. If not defined, true if contextLevel and instanceId are set.
     @Input() contextLevel?: string; // The context level of the text.
     @Input() contextInstanceId?: number; // The instance ID related to the context.
+    @Input() courseId?: number; // Course ID the text belongs to. It can be used to improve performance with filters.
     @Input() wsNotFiltered?: boolean | string; // If true it means the WS didn't filter the labels for some reason.
     @ViewChild('canvas') canvas: ElementRef;
 
     chart: any;
 
-    constructor(protected filterProvider: CoreFilterProvider, private utils: CoreUtilsProvider) { }
+    constructor(protected filterProvider: CoreFilterProvider, private utils: CoreUtilsProvider,
+            private filterHelper: CoreFilterHelperProvider) { }
 
     /**
      * Component being initialized.
@@ -140,10 +143,11 @@ export class CoreChartComponent implements OnDestroy, OnInit, OnChanges {
         const options = {
             clean: true,
             singleLine: true,
+            courseId: this.courseId,
             wsNotFiltered: this.utils.isTrueOrOne(this.wsNotFiltered)
         };
 
-        return this.filterProvider.getFilters(this.contextLevel, this.contextInstanceId, options).then((filters) => {
+        return this.filterHelper.getFilters(this.contextLevel, this.contextInstanceId, options).then((filters) => {
             const promises = [];
 
             this.labels.forEach((label, i) => {
diff --git a/src/components/navigation-bar/navigation-bar.ts b/src/components/navigation-bar/navigation-bar.ts
index 5a38d49a0..2942e5c2d 100644
--- a/src/components/navigation-bar/navigation-bar.ts
+++ b/src/components/navigation-bar/navigation-bar.ts
@@ -37,6 +37,7 @@ export class CoreNavigationBarComponent {
     @Input() componentId?: number; // Component ID.
     @Input() contextLevel?: string; // The context level.
     @Input() contextInstanceId?: number; // The instance ID related to the context.
+    @Input() courseId?: number; // Course ID the text belongs to. It can be used to improve performance with filters.
     @Output() action?: EventEmitter<any>; // Function to call when an arrow is clicked. Will receive as a param the item to load.
 
     constructor(private textUtils: CoreTextUtilsProvider) {
@@ -45,6 +46,6 @@ export class CoreNavigationBarComponent {
 
     showInfo(): void {
         this.textUtils.expandText(this.title, this.info, this.component, this.componentId, [], true, this.contextLevel,
-                this.contextInstanceId);
+                this.contextInstanceId, this.courseId);
     }
 }
diff --git a/src/components/site-picker/site-picker.ts b/src/components/site-picker/site-picker.ts
index c0ca1d6e1..e3b9c62ae 100644
--- a/src/components/site-picker/site-picker.ts
+++ b/src/components/site-picker/site-picker.ts
@@ -15,7 +15,7 @@
 import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { CoreSitesProvider } from '@providers/sites';
-import { CoreFilterProvider } from '@core/filter/providers/filter';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Component to display a site selector. It will display a select with the list of sites. If the selected site changes,
@@ -36,7 +36,7 @@ export class CoreSitePickerComponent implements OnInit {
     sites: any[];
 
     constructor(private translate: TranslateService, private sitesProvider: CoreSitesProvider,
-            private filterProvider: CoreFilterProvider) {
+            private filterHelper: CoreFilterHelperProvider) {
         this.siteSelected = new EventEmitter();
     }
 
@@ -49,7 +49,7 @@ export class CoreSitePickerComponent implements OnInit {
 
             sites.forEach((site: any) => {
                 // Format the site name.
-                promises.push(this.filterProvider.getFiltersAndFormatText(site.siteName, 'system', site.siteHomeId,
+                promises.push(this.filterHelper.getFiltersAndFormatText(site.siteName, 'system', site.siteHomeId,
                         {clean: true, singleLine: true}, site.getId()).catch(() => {
                     return site.siteName;
                 }).then((formatted) => {
diff --git a/src/core/comments/components/comments/comments.ts b/src/core/comments/components/comments/comments.ts
index ae310eae8..0f23b3353 100644
--- a/src/core/comments/components/comments/comments.ts
+++ b/src/core/comments/components/comments/comments.ts
@@ -35,6 +35,7 @@ export class CoreCommentsCommentsComponent implements OnChanges, OnDestroy {
     @Input() title?: string;
     @Input() displaySpinner = true; // Whether to display the loading spinner.
     @Output() onLoading: EventEmitter<boolean>; // Eevent that indicates whether the component is loading data.
+    @Input() courseId?: number; // Course ID the comments belong to. It can be used to improve performance with filters.
 
     commentsLoaded = false;
     commentsCount: string;
@@ -155,6 +156,7 @@ export class CoreCommentsCommentsComponent implements OnChanges, OnDestroy {
                 itemId: this.itemId,
                 area: this.area,
                 title: this.title,
+                courseId: this.courseId
             });
         }
     }
diff --git a/src/core/comments/pages/viewer/viewer.html b/src/core/comments/pages/viewer/viewer.html
index dc24b1acc..40eadf01b 100644
--- a/src/core/comments/pages/viewer/viewer.html
+++ b/src/core/comments/pages/viewer/viewer.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="title" [contextLevel]="contextLevel" [contextInstanceId]="instanceId"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="title" [contextLevel]="contextLevel" [contextInstanceId]="instanceId" [courseId]="courseId"></core-format-text></ion-title>
         <ion-buttons end>
             <button *ngIf="canDeleteComments" item-end ion-button icon-only clear (click)="toggleDelete($event)" [attr.aria-label]="'core.delete' | translate">
                 <ion-icon name="create" ios="md-create"></ion-icon>
@@ -36,7 +36,7 @@
                 </button>
             </ion-item>
             <ion-item text-wrap>
-                <core-format-text clean="true" [text]="offlineComment.content" [contextLevel]="contextLevel" [contextInstanceId]="instanceId"></core-format-text>
+                <core-format-text clean="true" [text]="offlineComment.content" [contextLevel]="contextLevel" [contextInstanceId]="instanceId" [courseId]="courseId"></core-format-text>
             </ion-item>
         </ion-card>
 
@@ -56,7 +56,7 @@
                 </button>
             </ion-item>
             <ion-item text-wrap>
-                <core-format-text clean="true" [text]="comment.content" [contextLevel]="contextLevel" [contextInstanceId]="instanceId"></core-format-text>
+                <core-format-text clean="true" [text]="comment.content" [contextLevel]="contextLevel" [contextInstanceId]="instanceId" [courseId]="courseId"></core-format-text>
             </ion-item>
         </ion-card>
 
diff --git a/src/core/comments/pages/viewer/viewer.ts b/src/core/comments/pages/viewer/viewer.ts
index 63f88471b..b17d39f17 100644
--- a/src/core/comments/pages/viewer/viewer.ts
+++ b/src/core/comments/pages/viewer/viewer.ts
@@ -47,6 +47,7 @@ export class CoreCommentsViewerPage implements OnDestroy {
     area: string;
     page: number;
     title: string;
+    courseId: number;
     canLoadMore = false;
     loadMoreError = false;
     canAddComments = false;
@@ -74,6 +75,7 @@ export class CoreCommentsViewerPage implements OnDestroy {
         this.itemId = navParams.get('itemId');
         this.area = navParams.get('area') || '';
         this.title = navParams.get('title') || this.translate.instant('core.comments.comments');
+        this.courseId = navParams.get('courseId');
         this.page = 0;
 
         // Refresh data if comments are synchronized automatically.
diff --git a/src/core/course/classes/main-resource-component.ts b/src/core/course/classes/main-resource-component.ts
index 2233f893a..87691f7d8 100644
--- a/src/core/course/classes/main-resource-component.ts
+++ b/src/core/course/classes/main-resource-component.ts
@@ -237,7 +237,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy,
      */
     expandDescription(): void {
         this.textUtils.expandText(this.translate.instant('core.description'), this.description, this.component, this.module.id,
-                [], true, 'module', this.module.id);
+                [], true, 'module', this.module.id, this.courseId);
     }
 
     /**
diff --git a/src/core/course/components/module-completion/module-completion.ts b/src/core/course/components/module-completion/module-completion.ts
index ff3f265d1..a2db476ad 100644
--- a/src/core/course/components/module-completion/module-completion.ts
+++ b/src/core/course/components/module-completion/module-completion.ts
@@ -17,7 +17,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreUserProvider } from '@core/user/providers/user';
 import { CoreCourseProvider } from '../../providers/course';
-import { CoreFilterProvider } from '@core/filter/providers/filter';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Component to handle activity completion. It shows a checkbox with the current status, and allows manually changing
@@ -41,7 +41,7 @@ export class CoreCourseModuleCompletionComponent implements OnChanges {
     completionImage: string;
     completionDescription: string;
 
-    constructor(private filterProvider: CoreFilterProvider, private domUtils: CoreDomUtilsProvider,
+    constructor(private filterHelper: CoreFilterHelperProvider, private domUtils: CoreDomUtilsProvider,
             private translate: TranslateService, private courseProvider: CoreCourseProvider,
             private userProvider: CoreUserProvider) {
         this.completionChanged = new EventEmitter();
@@ -138,8 +138,8 @@ export class CoreCourseModuleCompletionComponent implements OnChanges {
         }
 
         if (moduleName) {
-            this.filterProvider.getFiltersAndFormatText(moduleName, 'module', this.moduleId,
-                    {clean: true, singleLine: true, shortenLength: 50}).then((modName) => {
+            this.filterHelper.getFiltersAndFormatText(moduleName, 'module', this.moduleId,
+                    {clean: true, singleLine: true, shortenLength: 50, courseId: this.completion.courseId}).then((modName) => {
 
                 let promise;
 
diff --git a/src/core/course/components/module-description/core-course-module-description.html b/src/core/course/components/module-description/core-course-module-description.html
index af4e525b3..7cb12666b 100644
--- a/src/core/course/components/module-description/core-course-module-description.html
+++ b/src/core/course/components/module-description/core-course-module-description.html
@@ -1,6 +1,6 @@
 <ion-card *ngIf="description">
     <ion-item text-wrap>
-        <core-format-text [text]="description" [component]="component" [componentId]="componentId" [maxHeight]="showFull && showFull !== 'false' ? 0 : 120" fullOnClick="true" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text>
+        <core-format-text [text]="description" [component]="component" [componentId]="componentId" [maxHeight]="showFull && showFull !== 'false' ? 0 : 120" fullOnClick="true" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text>
     </ion-item>
     <ion-item text-wrap *ngIf="note">
         <ion-note item-end>{{ note }}</ion-note>
diff --git a/src/core/course/components/module-description/module-description.ts b/src/core/course/components/module-description/module-description.ts
index eaa08a1b0..c17f51609 100644
--- a/src/core/course/components/module-description/module-description.ts
+++ b/src/core/course/components/module-description/module-description.ts
@@ -42,6 +42,7 @@ export class CoreCourseModuleDescriptionComponent {
     @Input() showFull?: string | boolean; // Whether to always display the full description.
     @Input() contextLevel?: string; // The context level.
     @Input() contextInstanceId?: number; // The instance ID related to the context.
+    @Input() courseId?: number; // Course ID the text belongs to. It can be used to improve performance with filters.
 
     constructor() {
         // Nothing to do.
diff --git a/src/core/course/components/module/core-course-module.html b/src/core/course/components/module/core-course-module.html
index 4d9a4021d..3c57e9abb 100644
--- a/src/core/course/components/module/core-course-module.html
+++ b/src/core/course/components/module/core-course-module.html
@@ -2,7 +2,7 @@
 
     <img item-start *ngIf="module.handlerData.icon" [src]="module.handlerData.icon" [alt]="module.modnametranslated" class="core-module-icon">
     <div class="core-module-title">
-        <core-format-text [text]="module.handlerData.title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
+        <core-format-text [text]="module.handlerData.title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
 
         <!-- Buttons. -->
         <div item-end *ngIf="module.uservisible !== false" class="buttons core-module-buttons" [ngClass]="{'core-button-completion': module.completiondata}">
@@ -27,9 +27,9 @@
         <ion-badge item-end *ngIf="module.visible !== 0 && module.isStealth" text-wrap>{{ 'core.course.hiddenoncoursepage' | translate }}</ion-badge>
         <div class="core-module-availabilityinfo" *ngIf="module.availabilityinfo" item-end>
             <ion-badge text-wrap>{{ 'core.restricted' | translate }}</ion-badge>
-            <core-format-text [text]="module.availabilityinfo" contextLevel="module" [contextInstanceId]="module.id" text-wrap></core-format-text>
+            <core-format-text [text]="module.availabilityinfo" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId" text-wrap></core-format-text>
         </div>
         <ion-badge item-end *ngIf="module.completiondata && module.completiondata.offline" color="warning" text-wrap>{{ 'core.course.manualcompletionnotsynced' | translate }}</ion-badge>
     </div>
-    <core-format-text class="core-module-description" *ngIf="module.description" maxHeight="80" [text]="module.description" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
+    <core-format-text class="core-module-description" *ngIf="module.description" maxHeight="80" [text]="module.description" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
 </ion-item>
\ No newline at end of file
diff --git a/src/core/course/components/unsupported-module/core-course-unsupported-module.html b/src/core/course/components/unsupported-module/core-course-unsupported-module.html
index f1796de2e..e28fe05c8 100644
--- a/src/core/course/components/unsupported-module/core-course-unsupported-module.html
+++ b/src/core/course/components/unsupported-module/core-course-unsupported-module.html
@@ -1,5 +1,5 @@
 <div padding>
-    <core-course-module-description [description]="module && module.description" contextLevel="module" [contextInstanceId]="module.id"></core-course-module-description>
+    <core-course-module-description [description]="module && module.description" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-course-module-description>
     <h2 *ngIf="!isDisabledInSite && isSupportedByTheApp">{{ 'core.whoops' | translate }}</h2>
     <h2 *ngIf="isDisabledInSite || !isSupportedByTheApp">{{ 'core.uhoh' | translate }}</h2>
 
diff --git a/src/core/course/components/unsupported-module/unsupported-module.ts b/src/core/course/components/unsupported-module/unsupported-module.ts
index c606d4658..6a0cfdd2c 100644
--- a/src/core/course/components/unsupported-module/unsupported-module.ts
+++ b/src/core/course/components/unsupported-module/unsupported-module.ts
@@ -24,7 +24,7 @@ import { CoreCourseModuleDelegate } from '../../providers/module-delegate';
     templateUrl: 'core-course-unsupported-module.html',
 })
 export class CoreCourseUnsupportedModuleComponent implements OnInit {
-    @Input() course: any; // The course to module belongs to.
+    @Input() courseId: number; // The course to module belongs to.
     @Input() module: any; // The module to render.
 
     isDisabledInSite: boolean;
diff --git a/src/core/course/pages/section/section.ts b/src/core/course/pages/section/section.ts
index 5590b1c27..de9e1cdf2 100644
--- a/src/core/course/pages/section/section.ts
+++ b/src/core/course/pages/section/section.ts
@@ -29,7 +29,7 @@ import { CoreCourseOptionsDelegate, CoreCourseOptionsHandlerToDisplay,
     CoreCourseOptionsMenuHandlerToDisplay } from '../../providers/options-delegate';
 import { CoreCourseSyncProvider } from '../../providers/sync';
 import { CoreCourseFormatComponent } from '../../components/format/format';
-import { CoreFilterProvider } from '@core/filter/providers/filter';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Page that displays the list of courses the user is enrolled in.
@@ -75,7 +75,7 @@ export class CoreCourseSectionPage implements OnDestroy {
     constructor(navParams: NavParams, private courseProvider: CoreCourseProvider, private domUtils: CoreDomUtilsProvider,
             private courseFormatDelegate: CoreCourseFormatDelegate, private courseOptionsDelegate: CoreCourseOptionsDelegate,
             private translate: TranslateService, private courseHelper: CoreCourseHelperProvider, eventsProvider: CoreEventsProvider,
-            private coursesProvider: CoreCoursesProvider, private filterProvider: CoreFilterProvider,
+            private coursesProvider: CoreCoursesProvider, private filterHelper: CoreFilterHelperProvider,
             sitesProvider: CoreSitesProvider, private navCtrl: NavController, private injector: Injector,
             private prefetchDelegate: CoreCourseModulePrefetchDelegate, private syncProvider: CoreCourseSyncProvider,
             private utils: CoreUtilsProvider) {
@@ -263,7 +263,7 @@ export class CoreCourseSectionPage implements OnDestroy {
 
                     // Format the name of each section and check if it has content.
                     this.sections = sections.map((section) => {
-                        this.filterProvider.getFiltersAndFormatText(section.name.trim(), 'course', this.course.id,
+                        this.filterHelper.getFiltersAndFormatText(section.name.trim(), 'course', this.course.id,
                                 {clean: true, singleLine: true}).then((name) => {
                             section.formattedName = name;
                         });
diff --git a/src/core/course/pages/unsupported-module/unsupported-module.html b/src/core/course/pages/unsupported-module/unsupported-module.html
index c0ae5285a..21a839390 100644
--- a/src/core/course/pages/unsupported-module/unsupported-module.html
+++ b/src/core/course/pages/unsupported-module/unsupported-module.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="module.name" contextLevel="module" [contextInstanceId]="module.id"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="module.name" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></ion-title>
 
         <ion-buttons end>
             <core-context-menu>
@@ -11,5 +11,5 @@
     </ion-navbar>
 </ion-header>
 <ion-content>
-    <core-course-unsupported-module [module]="module"></core-course-unsupported-module>
+    <core-course-unsupported-module [module]="module" [courseId]="courseId"></core-course-unsupported-module>
 </ion-content>
diff --git a/src/core/course/pages/unsupported-module/unsupported-module.ts b/src/core/course/pages/unsupported-module/unsupported-module.ts
index 6e4c87008..a28a2dde6 100644
--- a/src/core/course/pages/unsupported-module/unsupported-module.ts
+++ b/src/core/course/pages/unsupported-module/unsupported-module.ts
@@ -27,9 +27,11 @@ import { CoreTextUtilsProvider } from '@providers/utils/text';
 })
 export class CoreCourseUnsupportedModulePage {
     module: any;
+    courseId: number;
 
     constructor(navParams: NavParams, private translate: TranslateService, private textUtils: CoreTextUtilsProvider) {
         this.module = navParams.get('module') || {};
+        this.courseId = navParams.get('courseId');
     }
 
     /**
@@ -37,6 +39,6 @@ export class CoreCourseUnsupportedModulePage {
      */
     expandDescription(): void {
         this.textUtils.expandText(this.translate.instant('core.description'), this.module.description, undefined, undefined,
-                [], true, 'module', this.module.id);
+                [], true, 'module', this.module.id, this.courseId);
     }
 }
diff --git a/src/core/course/providers/default-module.ts b/src/core/course/providers/default-module.ts
index c69e280a6..bfa297f11 100644
--- a/src/core/course/providers/default-module.ts
+++ b/src/core/course/providers/default-module.ts
@@ -55,7 +55,7 @@ export class CoreCourseModuleDefaultHandler implements CoreCourseModuleHandler {
                 event.preventDefault();
                 event.stopPropagation();
 
-                navCtrl.push('CoreCourseUnsupportedModulePage', { module: module }, options);
+                navCtrl.push('CoreCourseUnsupportedModulePage', { module: module, courseId: courseId }, options);
             }
         };
 
diff --git a/src/core/filter/filter.module.ts b/src/core/filter/filter.module.ts
index 20b0073c0..81c898f55 100644
--- a/src/core/filter/filter.module.ts
+++ b/src/core/filter/filter.module.ts
@@ -16,11 +16,13 @@ import { NgModule } from '@angular/core';
 import { CoreFilterProvider } from './providers/filter';
 import { CoreFilterDelegate } from './providers/delegate';
 import { CoreFilterDefaultHandler } from './providers/default-filter';
+import { CoreFilterHelperProvider } from './providers/helper';
 
 // List of providers (without handlers).
 export const CORE_FILTER_PROVIDERS: any[] = [
     CoreFilterProvider,
-    CoreFilterDelegate
+    CoreFilterDelegate,
+    CoreFilterHelperProvider
 ];
 
 @NgModule({
@@ -31,7 +33,8 @@ export const CORE_FILTER_PROVIDERS: any[] = [
     providers: [
         CoreFilterProvider,
         CoreFilterDelegate,
-        CoreFilterDefaultHandler
+        CoreFilterHelperProvider,
+        CoreFilterDefaultHandler,
     ]
 })
 export class CoreFilterModule { }
diff --git a/src/core/filter/providers/filter.ts b/src/core/filter/providers/filter.ts
index ca8e77078..8092d01c4 100644
--- a/src/core/filter/providers/filter.ts
+++ b/src/core/filter/providers/filter.ts
@@ -247,65 +247,6 @@ export class CoreFilterProvider {
         });
     }
 
-    /**
-     * Get the filters in a certain context, performing some checks like the site version.
-     * It's recommended to use this function instead of canGetAvailableInContext because this function will check if
-     * it's really needed to call the WS.
-     *
-     * @param contextLevel The context level.
-     * @param instanceId Instance ID related to the context.
-     * @param options Options for format text.
-     * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with the filters.
-     */
-    getFilters(contextLevel: string, instanceId: number, options?: CoreFilterFormatTextOptions, siteId?: string)
-            : Promise<CoreFilterFilter[]> {
-
-        options.contextLevel = contextLevel;
-        options.instanceId = instanceId;
-        options.filter = false;
-
-        return this.canGetAvailableInContext(siteId).then((canGet) => {
-            if (!canGet) {
-                options.filter = true;
-
-                // We cannot check which filters are available, apply them all.
-                return this.filterDelegate.getEnabledFilters(contextLevel, instanceId);
-            }
-
-            // Check if site has any filter to treat.
-            return this.siteHasFiltersToTreat(options, siteId).then((hasFilters) => {
-                if (hasFilters) {
-                    options.filter = true;
-
-                    return this.getAvailableInContext(contextLevel, instanceId, siteId);
-                }
-
-                return [];
-            }).catch(() => {
-                return [];
-            });
-        });
-    }
-
-    /**
-     * Get filters and format text.
-     *
-     * @param text Text to filter.
-     * @param contextLevel The context level.
-     * @param instanceId Instance ID related to the context.
-     * @param options Options for format text.
-     * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with the formatted text.
-     */
-    getFiltersAndFormatText(text: string, contextLevel: string, instanceId: number, options?: CoreFilterFormatTextOptions,
-            siteId?: string): Promise<string> {
-
-        return this.getFilters(contextLevel, instanceId, options, siteId).then((filters) => {
-            return this.formatText(text, options, filters, siteId);
-        });
-    }
-
     /**
      * Invalidates all available in context WS calls.
      *
@@ -342,26 +283,6 @@ export class CoreFilterProvider {
     invalidateAvailableInContext(contextLevel: string, instanceId: number, siteId?: string): Promise<any> {
         return this.invalidateAvailableInContexts([{contextlevel: contextLevel, instanceid: instanceId}], siteId);
     }
-
-    /**
-     * Check if site has available any filter that should be treated by the app.
-     *
-     * @param options Options passed to the filters.
-     * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with boolean: whether it has filters to treat.
-     */
-    siteHasFiltersToTreat(options?: CoreFilterFormatTextOptions, siteId?: string): Promise<boolean> {
-        options = options || {};
-
-        return this.sitesProvider.getSite(siteId).then((site) => {
-
-            // Get filters at site level.
-            return this.getAvailableInContext('system', site.getSiteHomeId(), site.getId()).then((filters) => {
-
-                return this.filterDelegate.shouldBeApplied(filters, options, site);
-            });
-        });
-    }
 }
 
 /**
@@ -396,4 +317,5 @@ export type CoreFilterFormatTextOptions = {
     shortenLength?: number; // Number of characters to shorten the text.
     highlight?: string; // Text to highlight.
     wsNotFiltered?: boolean; // If true it means the WS didn't filter the text for some reason.
+    courseId?: number; // Course ID the text belongs to. It can be used to improve performance.
 };
diff --git a/src/core/filter/providers/helper.ts b/src/core/filter/providers/helper.ts
new file mode 100644
index 000000000..06c4a7b83
--- /dev/null
+++ b/src/core/filter/providers/helper.ts
@@ -0,0 +1,171 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreLoggerProvider } from '@providers/logger';
+import { CoreSitesProvider } from '@providers/sites';
+import { CoreFilterDelegate } from './delegate';
+import { CoreFilterProvider, CoreFilterFilter, CoreFilterFormatTextOptions } from './filter';
+import { CoreCourseProvider } from '@core/course/providers/course';
+import { CoreSite } from '@classes/site';
+
+/**
+ * Helper service to provide filter functionalities.
+ */
+@Injectable()
+export class CoreFilterHelperProvider {
+
+    protected logger;
+
+    constructor(logger: CoreLoggerProvider,
+            private sitesProvider: CoreSitesProvider,
+            private filterDelegate: CoreFilterDelegate,
+            private courseProvider: CoreCourseProvider,
+            private filterProvider: CoreFilterProvider) {
+        this.logger = logger.getInstance('CoreFilterHelperProvider');
+    }
+
+    /**
+     * Get the contexts of all course modules in a course.
+     *
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the contexts.
+     */
+    getCourseModulesContexts(courseId: number, siteId?: string): Promise<{contextlevel: string, instanceid: number}[]> {
+
+        return this.courseProvider.getSections(courseId, false, true, {omitExpires: true}, siteId).then((sections) => {
+            const contexts: {contextlevel: string, instanceid: number}[] = [];
+
+            sections.forEach((section) => {
+                if (section.modules) {
+                    section.modules.forEach((module) => {
+                        if (module.uservisible) {
+                            contexts.push({
+                                contextlevel: 'module',
+                                instanceid: module.id
+                            });
+                        }
+                    });
+                }
+            });
+
+            return contexts;
+        });
+    }
+
+    /**
+     * Get the filters in a certain context, performing some checks like the site version.
+     * It's recommended to use this function instead of canGetAvailableInContext because this function will check if
+     * it's really needed to call the WS.
+     *
+     * @param contextLevel The context level.
+     * @param instanceId Instance ID related to the context.
+     * @param options Options for format text.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the filters.
+     */
+    getFilters(contextLevel: string, instanceId: number, options?: CoreFilterFormatTextOptions, siteId?: string)
+            : Promise<CoreFilterFilter[]> {
+
+        let site: CoreSite;
+
+        options.contextLevel = contextLevel;
+        options.instanceId = instanceId;
+        options.filter = false;
+
+        return this.sitesProvider.getSite(siteId).then((s) => {
+            site = s;
+
+            return this.filterProvider.canGetAvailableInContext(siteId);
+        }).then((canGet) => {
+            if (!canGet) {
+                options.filter = true;
+
+                // We cannot check which filters are available, apply them all.
+                return this.filterDelegate.getEnabledFilters(contextLevel, instanceId);
+            }
+
+            let promise: Promise<boolean>;
+
+            if (instanceId == site.getSiteHomeId() && (contextLevel == 'system' || contextLevel == 'course')) {
+                // No need to check the site filters because we're requesting the same context, so we'd do the same twice.
+                promise = Promise.resolve(true);
+            } else {
+                // Check if site has any filter to treat.
+                promise = this.siteHasFiltersToTreat(options, siteId);
+            }
+
+            return promise.then((hasFilters) => {
+                if (hasFilters) {
+                    options.filter = true;
+
+                    if (contextLevel == 'module' && options.courseId) {
+                        // Get all the modules filters with a single call to decrease the number of WS calls.
+                        return this.getCourseModulesContexts(options.courseId, site.getId()).then((contexts) => {
+
+                            return this.filterProvider.getAvailableInContexts(contexts, site.getId()).then((filters) => {
+                                return filters[contextLevel][instanceId] || [];
+                            });
+                        });
+                    }
+
+                    return this.filterProvider.getAvailableInContext(contextLevel, instanceId, siteId);
+                }
+
+                return [];
+            }).catch(() => {
+                return [];
+            });
+        });
+    }
+
+    /**
+     * Get filters and format text.
+     *
+     * @param text Text to filter.
+     * @param contextLevel The context level.
+     * @param instanceId Instance ID related to the context.
+     * @param options Options for format text.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the formatted text.
+     */
+    getFiltersAndFormatText(text: string, contextLevel: string, instanceId: number, options?: CoreFilterFormatTextOptions,
+            siteId?: string): Promise<string> {
+
+        return this.getFilters(contextLevel, instanceId, options, siteId).then((filters) => {
+            return this.filterProvider.formatText(text, options, filters, siteId);
+        });
+    }
+
+    /**
+     * Check if site has available any filter that should be treated by the app.
+     *
+     * @param options Options passed to the filters.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether it has filters to treat.
+     */
+    siteHasFiltersToTreat(options?: CoreFilterFormatTextOptions, siteId?: string): Promise<boolean> {
+        options = options || {};
+
+        return this.sitesProvider.getSite(siteId).then((site) => {
+
+            // Get filters at site level.
+            return this.filterProvider.getAvailableInContext('system', site.getSiteHomeId(), site.getId()).then((filters) => {
+
+                return this.filterDelegate.shouldBeApplied(filters, options, site);
+            });
+        });
+    }
+}
diff --git a/src/core/login/pages/sites/sites.ts b/src/core/login/pages/sites/sites.ts
index 1ed6b49c2..8283f15be 100644
--- a/src/core/login/pages/sites/sites.ts
+++ b/src/core/login/pages/sites/sites.ts
@@ -20,7 +20,7 @@ import { CoreSitesProvider, CoreSiteBasicInfo } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CorePushNotificationsProvider } from '@core/pushnotifications/providers/pushnotifications';
 import { CoreLoginHelperProvider } from '../../providers/helper';
-import { CoreFilterProvider } from '@core/filter/providers/filter';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Page that displays the list of stored sites.
@@ -35,7 +35,7 @@ export class CoreLoginSitesPage {
     showDelete: boolean;
     protected logger;
 
-    constructor(private domUtils: CoreDomUtilsProvider, private filterProvider: CoreFilterProvider,
+    constructor(private domUtils: CoreDomUtilsProvider, private filterHelper: CoreFilterHelperProvider,
             private sitesProvider: CoreSitesProvider, private loginHelper: CoreLoginHelperProvider, logger: CoreLoggerProvider,
             private translate: TranslateService, private pushNotificationsProvider: CorePushNotificationsProvider) {
         this.logger = logger.getInstance('CoreLoginSitesPage');
@@ -86,7 +86,7 @@ export class CoreLoginSitesPage {
         const site = this.sites[index],
             siteName = site.siteName;
 
-        this.filterProvider.getFiltersAndFormatText(siteName, 'system', site.siteHomeId, {clean: true, singleLine: true}, site.id)
+        this.filterHelper.getFiltersAndFormatText(siteName, 'system', site.siteHomeId, {clean: true, singleLine: true}, site.id)
                 .then((siteName) => {
 
             this.domUtils.showConfirm(this.translate.instant('core.login.confirmdeletesite', { sitename: siteName })).then(() => {
diff --git a/src/core/pushnotifications/providers/pushnotifications.ts b/src/core/pushnotifications/providers/pushnotifications.ts
index 652647f3e..982041ac2 100644
--- a/src/core/pushnotifications/providers/pushnotifications.ts
+++ b/src/core/pushnotifications/providers/pushnotifications.ts
@@ -34,6 +34,7 @@ import { ILocalNotification } from '@ionic-native/local-notifications';
 import { SQLiteDB, SQLiteDBTableSchema } from '@classes/sqlitedb';
 import { CoreSite } from '@classes/site';
 import { CoreFilterProvider } from '@core/filter/providers/filter';
+import { CoreFilterDelegate } from '@core/filter/providers/delegate';
 
 /**
  * Data needed to register a device in a Moodle site.
@@ -178,7 +179,7 @@ export class CorePushNotificationsProvider {
             private utils: CoreUtilsProvider, private textUtils: CoreTextUtilsProvider, private push: Push,
             private configProvider: CoreConfigProvider, private device: Device, private zone: NgZone,
             private translate: TranslateService, private platform: Platform, private sitesFactory: CoreSitesFactoryProvider,
-            private filterProvider: CoreFilterProvider) {
+            private filterProvider: CoreFilterProvider, private filterDelegate: CoreFilterDelegate) {
         this.logger = logger.getInstance('CorePushNotificationsProvider');
         this.appDB = appProvider.getDB();
         this.appDB.createTablesFromSchema(this.appTablesSchema);
@@ -448,46 +449,67 @@ export class CorePushNotificationsProvider {
                             text: '',
                             channel: 'PushPluginChannel'
                         },
-                        promises = [],
+                        options = {
+                            clean: true,
+                            singleLine: true,
+                            contextLevel: 'system',
+                            instanceId: site.getSiteHomeId(),
+                            filter: true
+                        },
                         isAndroid = this.platform.is('android'),
                         extraFeatures = this.utils.isTrueOrOne(data.extrafeatures);
 
-                    // Apply formatText to title and message.
-                    promises.push(this.filterProvider.getFiltersAndFormatText(notification.title, 'system', site.getSiteHomeId(),
-                            {clean: true, singleLine: true}, site.getId()).then((title) => {
-                        localNotif.title = title;
-                    }).catch(() => {
-                        localNotif.title = notification.title;
-                    }));
-
-                    promises.push(this.filterProvider.getFiltersAndFormatText(notification.message, 'system', site.getSiteHomeId(),
-                            {clean: true, singleLine: true}, site.getId()).catch(() => {
-                        // Error formatting, use the original message.
-                        return notification.message;
-                    }).then((formattedMessage) => {
-                        if (extraFeatures && isAndroid && this.utils.isFalseOrZero(data.notif)) {
-                            // It's a message, use messaging style. Ionic Native doesn't specify this option.
-                            (<any> localNotif).text = [
-                                {
-                                    message: formattedMessage,
-                                    person: data.conversationtype == 2 ? data.userfromfullname : ''
-                                }
-                            ];
-                        } else {
-                            localNotif.text = formattedMessage;
+                    // Get the filters to apply to text and message. Don't use FIlterHelper to prevent circular dependencies.
+                    this.filterProvider.canGetAvailableInContext(site.getId()).then((canGet) => {
+                        if (!canGet) {
+                            // We cannot check which filters are available, apply them all.
+                            return this.filterDelegate.getEnabledFilters(options.contextLevel, options.instanceId);
                         }
-                    }));
 
-                    if (extraFeatures && isAndroid) {
-                        // Use a different icon if needed.
-                        localNotif.icon = notification.image;
-                        // This feature isn't supported by the official plugin, we use a fork.
-                        (<any> localNotif).iconType = data['image-type'];
-                    }
+                        return this.filterProvider.getAvailableInContext(options.contextLevel, options.instanceId, site.getId());
+                    }).catch(() => {
+                        return [];
+                    }).then((filters) => {
+                        const promises = [];
+
+                        // Apply formatText to title and message.
+                        promises.push(this.filterProvider.formatText(notification.title, options, filters, site.getId())
+                                .then((title) => {
+                            localNotif.title = title;
+                        }).catch(() => {
+                            localNotif.title = notification.title;
+                        }));
+
+                        promises.push(this.filterProvider.formatText(notification.message, options, filters, site.getId())
+                                .catch(() => {
+                            // Error formatting, use the original message.
+                            return notification.message;
+                        }).then((formattedMessage) => {
+                            if (extraFeatures && isAndroid && this.utils.isFalseOrZero(data.notif)) {
+                                // It's a message, use messaging style. Ionic Native doesn't specify this option.
+                                (<any> localNotif).text = [
+                                    {
+                                        message: formattedMessage,
+                                        person: data.conversationtype == 2 ? data.userfromfullname : ''
+                                    }
+                                ];
+                            } else {
+                                localNotif.text = formattedMessage;
+                            }
+                        }));
+
+                        if (extraFeatures && isAndroid) {
+                            // Use a different icon if needed.
+                            localNotif.icon = notification.image;
+                            // This feature isn't supported by the official plugin, we use a fork.
+                            (<any> localNotif).iconType = data['image-type'];
+                        }
+
+                        Promise.all(promises).then(() => {
+                            this.localNotificationsProvider.schedule(localNotif, CorePushNotificationsProvider.COMPONENT, data.site,
+                                    true);
+                        });
 
-                    Promise.all(promises).then(() => {
-                        this.localNotificationsProvider.schedule(localNotif, CorePushNotificationsProvider.COMPONENT, data.site,
-                                true);
                     });
                 }
 
diff --git a/src/core/question/classes/base-question-component.ts b/src/core/question/classes/base-question-component.ts
index 9f6f51be1..bb0ca438a 100644
--- a/src/core/question/classes/base-question-component.ts
+++ b/src/core/question/classes/base-question-component.ts
@@ -29,6 +29,7 @@ export class CoreQuestionBaseComponent {
     @Input() offlineEnabled?: boolean | string; // Whether the question can be answered in offline.
     @Input() contextLevel?: string; // The context level.
     @Input() contextInstanceId?: number; // The instance ID related to the context.
+    @Input() courseId?: number; // The course the question belongs to (if any).
     @Output() buttonClicked: EventEmitter<any>; // Should emit an event when a behaviour button is clicked.
     @Output() onAbort: EventEmitter<void>; // Should emit an event if the question should be aborted.
 
diff --git a/src/core/question/components/question/core-question.html b/src/core/question/components/question/core-question.html
index 2124c94d4..005a3ce7d 100644
--- a/src/core/question/components/question/core-question.html
+++ b/src/core/question/components/question/core-question.html
@@ -23,10 +23,10 @@
 
 <!-- Question feedback. -->
 <ion-item text-wrap class="core-question-feedback-container" *ngIf="question.feedbackHtml">
-    <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.feedbackHtml" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
+    <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.feedbackHtml" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text></p>
 </ion-item>
 
 <!-- Question comment. -->
 <ion-item text-wrap class="core-question-comment" *ngIf="question.commentHtml">
-    <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.commentHtml" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"></core-format-text></p>
+    <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.commentHtml" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text></p>
 </ion-item>
diff --git a/src/core/question/components/question/question.ts b/src/core/question/components/question/question.ts
index 5890dc9d5..ce43dbf13 100644
--- a/src/core/question/components/question/question.ts
+++ b/src/core/question/components/question/question.ts
@@ -38,6 +38,7 @@ export class CoreQuestionComponent implements OnInit {
     @Input() offlineEnabled?: boolean | string; // Whether the question can be answered in offline.
     @Input() contextLevel?: string; // The context level.
     @Input() contextInstanceId?: number; // The instance ID related to the context.
+    @Input() courseId?: number; // Course ID the question belongs to (if any). It can be used to improve performance with filters.
     @Output() buttonClicked: EventEmitter<any>; // Will emit an event when a behaviour button is clicked.
     @Output() onAbort: EventEmitter<void>; // Will emit an event if the question should be aborted.
 
@@ -86,6 +87,7 @@ export class CoreQuestionComponent implements OnInit {
                     offlineEnabled: this.offlineEnabled,
                     contextLevel: this.contextLevel,
                     contextInstanceId: this.contextInstanceId,
+                    courseId: this.courseId,
                     buttonClicked: this.buttonClicked,
                     onAbort: this.onAbort
                 };
diff --git a/src/core/question/providers/helper.ts b/src/core/question/providers/helper.ts
index 6a2a257b4..4b7da5ea3 100644
--- a/src/core/question/providers/helper.ts
+++ b/src/core/question/providers/helper.ts
@@ -693,9 +693,10 @@ export class CoreQuestionHelperProvider {
      * @param componentId An ID to use in conjunction with the component.
      * @param contextLevel The context level.
      * @param contextInstanceId Instance ID related to the context.
+     * @param courseId Course ID the text belongs to. It can be used to improve performance with filters.
      */
     treatCorrectnessIconsClicks(element: HTMLElement, component?: string, componentId?: number, contextLevel?: string,
-            contextInstanceId?: number): void {
+            contextInstanceId?: number, courseId?: number): void {
 
         const icons = <HTMLElement[]> Array.from(element.querySelectorAll('i.icon.questioncorrectnessicon[tappable]')),
             title = this.translate.instant('core.question.feedback');
@@ -708,7 +709,7 @@ export class CoreQuestionHelperProvider {
                 // There's a hidden feedback, show it when the icon is clicked.
                 icon.addEventListener('click', (event) => {
                     this.textUtils.expandText(title, span.innerHTML, component, componentId, [], true, contextLevel,
-                            contextInstanceId);
+                            contextInstanceId, courseId);
                 });
             }
         });
diff --git a/src/core/settings/pages/space-usage/space-usage.ts b/src/core/settings/pages/space-usage/space-usage.ts
index 61b75b041..8ce241df8 100644
--- a/src/core/settings/pages/space-usage/space-usage.ts
+++ b/src/core/settings/pages/space-usage/space-usage.ts
@@ -20,7 +20,7 @@ import { CoreFilepoolProvider } from '@providers/filepool';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreCourseProvider } from '@core/course/providers/course';
-import { CoreFilterProvider } from '@core/filter/providers/filter';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Page that displays the space usage settings.
@@ -39,7 +39,7 @@ export class CoreSettingsSpaceUsagePage {
     totalEntries = 0;
 
     constructor(private filePoolProvider: CoreFilepoolProvider,
-            private sitesProvider: CoreSitesProvider, private filterProvider: CoreFilterProvider,
+            private sitesProvider: CoreSitesProvider, private filterHelper: CoreFilterHelperProvider,
             private translate: TranslateService, private domUtils: CoreDomUtilsProvider, appProvider: CoreAppProvider,
             private courseProvider: CoreCourseProvider) {
         this.currentSiteId = this.sitesProvider.getCurrentSiteId();
@@ -162,7 +162,7 @@ export class CoreSettingsSpaceUsagePage {
      * @param siteData Site object with space usage.
      */
     deleteSiteStorage(siteData: any): void {
-        this.filterProvider.getFiltersAndFormatText(siteData.siteName, 'system', siteData.siteHomeId,
+        this.filterHelper.getFiltersAndFormatText(siteData.siteName, 'system', siteData.siteHomeId,
                 {clean: true, singleLine: true}, siteData.id).then((siteName) => {
 
             const title = this.translate.instant('core.settings.deletesitefilestitle');
diff --git a/src/core/siteplugins/components/module-index/module-index.ts b/src/core/siteplugins/components/module-index/module-index.ts
index d65486a00..a9f9dfeed 100644
--- a/src/core/siteplugins/components/module-index/module-index.ts
+++ b/src/core/siteplugins/components/module-index/module-index.ts
@@ -146,7 +146,7 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C
      */
     expandDescription(): void {
         this.textUtils.expandText(this.translate.instant('core.description'), this.description, this.component, this.module.id,
-                [], true, 'module', this.module.id);
+                [], true, 'module', this.module.id, this.courseId);
     }
 
     /**
diff --git a/src/core/user/components/user-profile-field/user-profile-field.ts b/src/core/user/components/user-profile-field/user-profile-field.ts
index 41c4a1e64..b00acfb20 100644
--- a/src/core/user/components/user-profile-field/user-profile-field.ts
+++ b/src/core/user/components/user-profile-field/user-profile-field.ts
@@ -31,6 +31,7 @@ export class CoreUserProfileFieldComponent implements OnInit {
     @Input() registerAuth?: string; // Register auth method. E.g. 'email'.
     @Input() contextLevel?: string; // The context level.
     @Input() contextInstanceId?: number; // The instance ID related to the context.
+    @Input() courseId?: number; // Course ID the field belongs to (if any). It can be used to improve performance with filters.
 
     componentClass: any; // The class of the component to render.
     data: any = {}; // Data to pass to the component.
@@ -55,6 +56,7 @@ export class CoreUserProfileFieldComponent implements OnInit {
             this.data.registerAuth = this.registerAuth;
             this.data.contextLevel = this.contextLevel;
             this.data.contextInstanceId = this.contextInstanceId;
+            this.data.courseId = this.courseId;
         }
     }
 }
diff --git a/src/core/user/pages/about/about.html b/src/core/user/pages/about/about.html
index fd73bfdc8..42fa04ce2 100644
--- a/src/core/user/pages/about/about.html
+++ b/src/core/user/pages/about/about.html
@@ -56,7 +56,7 @@
                     <h2>{{ 'core.user.interests' | translate}}</h2>
                     <p>{{ user.interests }}</p>
                 </ion-item>
-                <core-user-profile-field *ngFor="let field of user.customfields" [field]="field" contextLevel="course" [contextInstanceId]="courseId"></core-user-profile-field>
+                <core-user-profile-field *ngFor="let field of user.customfields" [field]="field" contextLevel="course" [contextInstanceId]="courseId" [courseId]="courseId"></core-user-profile-field>
             </ion-item-group>
             <ion-item-group *ngIf="user.description">
                 <ion-item-divider>{{ 'core.user.description' | translate}}</ion-item-divider>
diff --git a/src/core/viewer/pages/text/text.html b/src/core/viewer/pages/text/text.html
index f73c58612..410063705 100644
--- a/src/core/viewer/pages/text/text.html
+++ b/src/core/viewer/pages/text/text.html
@@ -10,7 +10,7 @@
     </ion-navbar>
 </ion-header>
 <ion-content padding>
-    <core-format-text [text]="content" [component]="component" [componentId]="componentId" [filter]="filter" [contextLevel]="contextLevel" [contextInstanceId]="instanceId"></core-format-text>
+    <core-format-text [text]="content" [component]="component" [componentId]="componentId" [filter]="filter" [contextLevel]="contextLevel" [contextInstanceId]="instanceId" [courseId]="courseId"></core-format-text>
 
     <ion-card *ngIf="files && files.length">
         <core-file *ngFor="let file of files" [file]="file" [component]="component" [componentId]="componentId"></core-file>
diff --git a/src/core/viewer/pages/text/text.ts b/src/core/viewer/pages/text/text.ts
index 912c9ccff..6c8c1b6f8 100644
--- a/src/core/viewer/pages/text/text.ts
+++ b/src/core/viewer/pages/text/text.ts
@@ -33,6 +33,7 @@ export class CoreViewerTextPage {
     filter: boolean; // Whether to filter the text.
     contextLevel: string; // The context level.
     instanceId: number; // The instance ID related to the context.
+    courseId: number; // Course ID the text belongs to. It can be used to improve performance with filters.
 
     constructor(private viewCtrl: ViewController, params: NavParams, textUtils: CoreTextUtilsProvider) {
         this.title = params.get('title');
@@ -43,6 +44,7 @@ export class CoreViewerTextPage {
         this.filter = params.get('filter');
         this.contextLevel = params.get('contextLevel');
         this.instanceId = params.get('instanceId');
+        this.courseId = params.get('courseId');
     }
 
     /**
diff --git a/src/directives/format-text.ts b/src/directives/format-text.ts
index 644812107..cffef5187 100644
--- a/src/directives/format-text.ts
+++ b/src/directives/format-text.ts
@@ -31,6 +31,7 @@ import { CoreExternalContentDirective } from '../directives/external-content';
 import { CoreContentLinksHelperProvider } from '@core/contentlinks/providers/helper';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreFilterProvider } from '@core/filter/providers/filter';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Directive to format text rendered. It renders the HTML and treats all links and media, using CoreLinkDirective
@@ -61,6 +62,7 @@ export class CoreFormatTextDirective implements OnChanges {
     @Input() filter?: boolean | string; // Whether to filter the text. If not defined, true if contextLevel and instanceId are set.
     @Input() contextLevel?: string; // The context level of the text.
     @Input() contextInstanceId?: number; // The instance ID related to the context.
+    @Input() courseId?: number; // Course ID the text belongs to. It can be used to improve performance with filters.
     @Input() wsNotFiltered?: boolean | string; // If true it means the WS didn't filter the text for some reason.
     @Output() afterRender?: EventEmitter<any>; // Called when the data is rendered.
 
@@ -75,7 +77,7 @@ export class CoreFormatTextDirective implements OnChanges {
             private contentLinksHelper: CoreContentLinksHelperProvider, @Optional() private navCtrl: NavController,
             @Optional() private content: Content, @Optional() private svComponent: CoreSplitViewComponent,
             private iframeUtils: CoreIframeUtilsProvider, private eventsProvider: CoreEventsProvider,
-            private filterProvider: CoreFilterProvider) {
+            private filterProvider: CoreFilterProvider, private filterHelper: CoreFilterHelperProvider) {
         this.element = element.nativeElement;
         this.element.classList.add('opacity-hide'); // Hide contents until they're treated.
         this.afterRender = new EventEmitter();
@@ -286,7 +288,7 @@ export class CoreFormatTextDirective implements OnChanges {
             const filter = this.utils.isTrueOrOne(this.filter);
 
             this.textUtils.expandText(this.fullTitle || this.translate.instant('core.description'), this.text,
-                this.component, this.componentId, undefined, filter, this.contextLevel, this.contextInstanceId);
+                this.component, this.componentId, undefined, filter, this.contextLevel, this.contextInstanceId, this.courseId);
         }
     }
 
@@ -383,11 +385,12 @@ export class CoreFormatTextDirective implements OnChanges {
                 clean: this.utils.isTrueOrOne(this.clean),
                 singleLine: this.utils.isTrueOrOne(this.singleLine),
                 highlight: this.highlight,
+                courseId: this.courseId,
                 wsNotFiltered: this.utils.isTrueOrOne(this.wsNotFiltered)
             };
 
             if (this.filter) {
-                return this.filterProvider.getFiltersAndFormatText(this.text, this.contextLevel, this.contextInstanceId, options,
+                return this.filterHelper.getFiltersAndFormatText(this.text, this.contextLevel, this.contextInstanceId, options,
                         site.getId());
             } else {
                 return this.filterProvider.formatText(this.text, options);
diff --git a/src/providers/utils/text.ts b/src/providers/utils/text.ts
index 50593fc93..9a244b6f7 100644
--- a/src/providers/utils/text.ts
+++ b/src/providers/utils/text.ts
@@ -352,9 +352,10 @@ export class CoreTextUtilsProvider {
      * @param filter Whether the text should be filtered.
      * @param contextLevel The context level.
      * @param instanceId The instance ID related to the context.
+     * @param courseId Course ID the text belongs to. It can be used to improve performance with filters.
      */
     expandText(title: string, text: string, component?: string, componentId?: string | number, files?: any[],
-            filter?: boolean, contextLevel?: string, instanceId?: number): void {
+            filter?: boolean, contextLevel?: string, instanceId?: number, courseId?: number): void {
         if (text.length > 0) {
             const params: any = {
                 title: title,
@@ -364,7 +365,8 @@ export class CoreTextUtilsProvider {
                 files: files,
                 filter: filter,
                 contextLevel: contextLevel,
-                instanceId: instanceId
+                instanceId: instanceId,
+                courseId: courseId
             };
 
             // Open a modal with the contents.

From 08c8487646e0c55cc5f4d52aeff2054433eb28ab Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 4 Oct 2019 16:02:03 +0200
Subject: [PATCH 071/257] MOBILE-2491 filter: Add memory caches to speed up
 filter

---
 src/classes/site.ts                           |  31 ++--
 src/core/filter/providers/delegate.ts         |   7 +-
 src/core/filter/providers/filter.ts           | 114 ++++++++++++-
 src/core/filter/providers/helper.ts           | 155 +++++++++++++-----
 .../settings/pages/space-usage/space-usage.ts |  11 +-
 src/providers/events.ts                       |   2 +
 6 files changed, 264 insertions(+), 56 deletions(-)

diff --git a/src/classes/site.ts b/src/classes/site.ts
index 84e7bdaaf..d4988f66a 100644
--- a/src/classes/site.ts
+++ b/src/classes/site.ts
@@ -1036,15 +1036,7 @@ export class CoreSite {
             preSets.omitExpires = preSets.omitExpires || preSets.forceOffline || !this.appProvider.isOnline();
 
             if (!preSets.omitExpires) {
-                let expirationDelay = this.UPDATE_FREQUENCIES[preSets.updateFrequency] ||
-                        this.UPDATE_FREQUENCIES[CoreSite.FREQUENCY_USUALLY];
-
-                if (this.appProvider.isNetworkAccessLimited()) {
-                    // Not WiFi, increase the expiration delay a 50% to decrease the data usage in this case.
-                    expirationDelay *= 1.5;
-                }
-
-                expirationTime = entry.expirationTime + expirationDelay;
+                expirationTime = entry.expirationTime + this.getExpirationDelay(preSets.updateFrequency);
 
                 if (now > expirationTime) {
                     this.logger.debug('Cached element found, but it is expired');
@@ -1165,7 +1157,9 @@ export class CoreSite {
 
         this.logger.debug('Invalidate all the cache for site: ' + this.id);
 
-        return this.db.updateRecords(CoreSite.WS_CACHE_TABLE, { expirationTime: 0 });
+        return this.db.updateRecords(CoreSite.WS_CACHE_TABLE, { expirationTime: 0 }).finally(() => {
+            this.eventsProvider.trigger(CoreEventsProvider.WS_CACHE_INVALIDATED, {}, this.getId());
+        });
     }
 
     /**
@@ -1875,4 +1869,21 @@ export class CoreSite {
     setLocalSiteConfig(name: string, value: number | string): Promise<any> {
         return this.db.insertRecord(CoreSite.CONFIG_TABLE, { name: name, value: value });
     }
+
+    /**
+     * Get a certain cache expiration delay.
+     *
+     * @param updateFrequency The update frequency of the entry.
+     * @return {number} Expiration delay.
+     */
+    getExpirationDelay(updateFrequency?: number): number {
+        let expirationDelay = this.UPDATE_FREQUENCIES[updateFrequency] || this.UPDATE_FREQUENCIES[CoreSite.FREQUENCY_USUALLY];
+
+        if (this.appProvider.isNetworkAccessLimited()) {
+            // Not WiFi, increase the expiration delay a 50% to decrease the data usage in this case.
+            expirationDelay *= 1.5;
+        }
+
+        return expirationDelay;
+    }
 }
diff --git a/src/core/filter/providers/delegate.ts b/src/core/filter/providers/delegate.ts
index 3fa27c298..11e081c0b 100644
--- a/src/core/filter/providers/delegate.ts
+++ b/src/core/filter/providers/delegate.ts
@@ -96,7 +96,12 @@ export class CoreFilterDelegate extends CoreDelegate {
                 }
 
                 promise = promise.then((text) => {
-                    return this.executeFunctionOnEnabled(filter.filter, 'filter', [text, filter, options, siteId]);
+                    return Promise.resolve(this.executeFunctionOnEnabled(filter.filter, 'filter', [text, filter, options, siteId]))
+                            .catch((error) => {
+                        this.logger.error('Error applying filter' + filter.filter, error);
+
+                        return text;
+                    });
                 });
             });
 
diff --git a/src/core/filter/providers/filter.ts b/src/core/filter/providers/filter.ts
index 8092d01c4..24d01f83c 100644
--- a/src/core/filter/providers/filter.ts
+++ b/src/core/filter/providers/filter.ts
@@ -13,6 +13,8 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
+import { CoreAppProvider } from '@providers/app';
+import { CoreEventsProvider } from '@providers/events';
 import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreSite } from '@classes/site';
@@ -30,11 +32,36 @@ export class CoreFilterProvider {
 
     protected logger;
 
+    /**
+     * Store the contexts in memory to speed up the process, it can take a lot of time otherwise.
+     */
+    protected contextsCache: {
+        [siteId: string]: {
+            [contextlevel: string]: {
+                [instanceid: number]: {
+                    filters: CoreFilterFilter[],
+                    time: number
+                }
+            }
+        }
+    } = {};
+
     constructor(logger: CoreLoggerProvider,
+            eventsProvider: CoreEventsProvider,
             private sitesProvider: CoreSitesProvider,
             private textUtils: CoreTextUtilsProvider,
-            private filterDelegate: CoreFilterDelegate) {
+            private filterDelegate: CoreFilterDelegate,
+            private appProvider: CoreAppProvider) {
+
         this.logger = logger.getInstance('CoreFilterProvider');
+
+        eventsProvider.on(CoreEventsProvider.WS_CACHE_INVALIDATED, (data) => {
+            delete this.contextsCache[data.siteId];
+        });
+
+        eventsProvider.on(CoreEventsProvider.SITE_STORAGE_DELETED, (data) => {
+            delete this.contextsCache[data.siteId];
+        });
     }
 
     /**
@@ -148,9 +175,19 @@ export class CoreFilterProvider {
      * @return Promise resolved with the filters classified by context.
      */
     getAvailableInContexts(contexts: {contextlevel: string, instanceid: number}[], siteId?: string)
-            : Promise<{[contextlevel: string]: {[instanceid: number]: CoreFilterFilter[]}}> {
+            : Promise<CoreFilterClassifiedFilters> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
+            siteId = site.getId();
+
+            const result = this.getFromMemoryCache(contexts, site);
+
+            if (result) {
+                return result;
+            }
+
+            this.contextsCache[siteId] = this.contextsCache[siteId] || {};
+
             let hasSystemContext = false,
                 hasSiteHomeContext = false;
 
@@ -194,7 +231,7 @@ export class CoreFilterProvider {
             return site.read('core_filters_get_available_in_context', data, preSets)
                     .then((result: CoreFilterGetAvailableInContextResult) => {
 
-                const classified: {[contextlevel: string]: {[instanceid: number]: CoreFilterFilter[]}} = {};
+                const classified: CoreFilterClassifiedFilters = {};
 
                 // Initialize all contexts.
                 contexts.forEach((context) => {
@@ -205,6 +242,7 @@ export class CoreFilterProvider {
                 if (contexts.length == 1 && !hasSystemContext) {
                     // Only 1 context, no need to iterate over the filters.
                     classified[contexts[0].contextlevel][contexts[0].instanceid] = result.filters;
+                    this.storeInMemoryCache(classified, siteId);
 
                     return classified;
                 }
@@ -228,6 +266,8 @@ export class CoreFilterProvider {
                     classified[filter.contextlevel][filter.instanceid].push(filter);
                 });
 
+                this.storeInMemoryCache(classified, siteId);
+
                 return classified;
             });
         });
@@ -247,6 +287,45 @@ export class CoreFilterProvider {
         });
     }
 
+    /**
+     * Get contexts filters from the memory cache.
+     *
+     * @param contexts Contexts to get.
+     * @param site Site.
+     * @return The filters classified by context and instance.
+     */
+    protected getFromMemoryCache(contexts: {contextlevel: string, instanceid: number}[], site: CoreSite)
+            : CoreFilterClassifiedFilters {
+
+        if (this.contextsCache[site.getId()]) {
+            // Check if we have the contexts in the memory cache.
+            const siteContexts = this.contextsCache[site.getId()],
+                isOnline = this.appProvider.isOnline(),
+                result: CoreFilterClassifiedFilters = {};
+            let allFound = true;
+
+            for (let i = 0; i < contexts.length; i++) {
+                const context = contexts[i],
+                    cachedCtxt = siteContexts[context.contextlevel] && siteContexts[context.contextlevel][context.instanceid];
+
+                // Check the context isn't "expired". The time stored in this cache will not match the one in the site cache.
+                if (cachedCtxt && (!isOnline ||
+                        Date.now() <= cachedCtxt.time + site.getExpirationDelay(CoreSite.FREQUENCY_RARELY))) {
+
+                    result[context.contextlevel] = result[context.contextlevel] || {};
+                    result[context.contextlevel][context.instanceid] = cachedCtxt.filters;
+                } else {
+                    allFound = false;
+                    break;
+                }
+            }
+
+            if (allFound) {
+                return result;
+            }
+        }
+    }
+
     /**
      * Invalidates all available in context WS calls.
      *
@@ -283,6 +362,26 @@ export class CoreFilterProvider {
     invalidateAvailableInContext(contextLevel: string, instanceId: number, siteId?: string): Promise<any> {
         return this.invalidateAvailableInContexts([{contextlevel: contextLevel, instanceid: instanceId}], siteId);
     }
+
+    /**
+     * Store filters in the memory cache.
+     *
+     * @param filters Filters to store, classified by contextlevel and instanceid
+     * @param siteId Site ID.
+     */
+    protected storeInMemoryCache(filters: CoreFilterClassifiedFilters, siteId: string): void {
+
+        for (const contextLevel in filters) {
+            this.contextsCache[siteId][contextLevel] = this.contextsCache[siteId][contextLevel] || {};
+
+            for (const instanceId in filters[contextLevel]) {
+                this.contextsCache[siteId][contextLevel][instanceId] = {
+                    filters: filters[contextLevel][instanceId],
+                    time: Date.now()
+                };
+            }
+        }
+    }
 }
 
 /**
@@ -319,3 +418,12 @@ export type CoreFilterFormatTextOptions = {
     wsNotFiltered?: boolean; // If true it means the WS didn't filter the text for some reason.
     courseId?: number; // Course ID the text belongs to. It can be used to improve performance.
 };
+
+/**
+ * Filters classified by context and instance.
+ */
+export type CoreFilterClassifiedFilters = {
+    [contextlevel: string]: {
+        [instanceid: number]: CoreFilterFilter[]
+    }
+};
diff --git a/src/core/filter/providers/helper.ts b/src/core/filter/providers/helper.ts
index 06c4a7b83..bb01bdbaf 100644
--- a/src/core/filter/providers/helper.ts
+++ b/src/core/filter/providers/helper.ts
@@ -13,10 +13,12 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
+import { CoreAppProvider } from '@providers/app';
+import { CoreEventsProvider } from '@providers/events';
 import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreFilterDelegate } from './delegate';
-import { CoreFilterProvider, CoreFilterFilter, CoreFilterFormatTextOptions } from './filter';
+import { CoreFilterProvider, CoreFilterFilter, CoreFilterFormatTextOptions, CoreFilterClassifiedFilters } from './filter';
 import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreSite } from '@classes/site';
 
@@ -28,12 +30,36 @@ export class CoreFilterHelperProvider {
 
     protected logger;
 
+    /**
+     * When a module context is requested, we request all the modules in a course to decrease WS calls. If there are a lot of
+     * modules, checking the cache of all contexts can be really slow, so we use this memory cache to speed up the process.
+     */
+    protected moduleContextsCache: {
+        [siteId: string]: {
+            [courseId: number]: {
+                contexts: CoreFilterClassifiedFilters,
+                time: number
+            }
+        }
+    } = {};
+
     constructor(logger: CoreLoggerProvider,
+            eventsProvider: CoreEventsProvider,
+            private appProvider: CoreAppProvider,
             private sitesProvider: CoreSitesProvider,
             private filterDelegate: CoreFilterDelegate,
             private courseProvider: CoreCourseProvider,
             private filterProvider: CoreFilterProvider) {
+
         this.logger = logger.getInstance('CoreFilterHelperProvider');
+
+        eventsProvider.on(CoreEventsProvider.WS_CACHE_INVALIDATED, (data) => {
+            delete this.moduleContextsCache[data.siteId];
+        });
+
+        eventsProvider.on(CoreEventsProvider.SITE_STORAGE_DELETED, (data) => {
+            delete this.moduleContextsCache[data.siteId];
+        });
     }
 
     /**
@@ -79,55 +105,64 @@ export class CoreFilterHelperProvider {
     getFilters(contextLevel: string, instanceId: number, options?: CoreFilterFormatTextOptions, siteId?: string)
             : Promise<CoreFilterFilter[]> {
 
-        let site: CoreSite;
-
         options.contextLevel = contextLevel;
         options.instanceId = instanceId;
         options.filter = false;
 
-        return this.sitesProvider.getSite(siteId).then((s) => {
-            site = s;
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            siteId = site.getId();
 
-            return this.filterProvider.canGetAvailableInContext(siteId);
-        }).then((canGet) => {
-            if (!canGet) {
-                options.filter = true;
-
-                // We cannot check which filters are available, apply them all.
-                return this.filterDelegate.getEnabledFilters(contextLevel, instanceId);
-            }
-
-            let promise: Promise<boolean>;
-
-            if (instanceId == site.getSiteHomeId() && (contextLevel == 'system' || contextLevel == 'course')) {
-                // No need to check the site filters because we're requesting the same context, so we'd do the same twice.
-                promise = Promise.resolve(true);
-            } else {
-                // Check if site has any filter to treat.
-                promise = this.siteHasFiltersToTreat(options, siteId);
-            }
-
-            return promise.then((hasFilters) => {
-                if (hasFilters) {
+            return this.filterProvider.canGetAvailableInContext(siteId).then((canGet) => {
+                if (!canGet) {
                     options.filter = true;
 
-                    if (contextLevel == 'module' && options.courseId) {
-                        // Get all the modules filters with a single call to decrease the number of WS calls.
-                        return this.getCourseModulesContexts(options.courseId, site.getId()).then((contexts) => {
-
-                            return this.filterProvider.getAvailableInContexts(contexts, site.getId()).then((filters) => {
-                                return filters[contextLevel][instanceId] || [];
-                            });
-                        });
-                    }
-
-                    return this.filterProvider.getAvailableInContext(contextLevel, instanceId, siteId);
+                    // We cannot check which filters are available, apply them all.
+                    return this.filterDelegate.getEnabledFilters(contextLevel, instanceId);
                 }
 
-                return [];
-            }).catch(() => {
-                return [];
+                let promise: Promise<boolean>;
+
+                if (instanceId == site.getSiteHomeId() && (contextLevel == 'system' || contextLevel == 'course')) {
+                    // No need to check the site filters because we're requesting the same context, so we'd do the same twice.
+                    promise = Promise.resolve(true);
+                } else {
+                    // Check if site has any filter to treat.
+                    promise = this.siteHasFiltersToTreat(options, siteId);
+                }
+
+                return promise.then((hasFilters) => {
+                    if (hasFilters) {
+                        options.filter = true;
+
+                        if (contextLevel == 'module' && options.courseId) {
+                            // Get all the modules filters with a single call to decrease the number of WS calls.
+                            // Check the memory cache first to speed up the process.
+
+                            const result = this.getFromMemoryCache(options.courseId, contextLevel, instanceId, site);
+                            if (result) {
+                                return result;
+                            }
+
+                            return this.getCourseModulesContexts(options.courseId, siteId).then((contexts) => {
+
+                                return this.filterProvider.getAvailableInContexts(contexts, siteId).then((filters) => {
+                                    this.storeInMemoryCache(options.courseId, filters, siteId);
+
+                                    return filters[contextLevel][instanceId] || [];
+                                });
+                            });
+                        }
+
+                        return this.filterProvider.getAvailableInContext(contextLevel, instanceId, siteId);
+                    }
+
+                    return [];
+                });
             });
+        }).catch((error) => {
+            this.logger.error('Error getting filters, return an empty array', error, contextLevel, instanceId);
+
+            return [];
         });
     }
 
@@ -149,6 +184,32 @@ export class CoreFilterHelperProvider {
         });
     }
 
+    /**
+     * Get module context filters from the memory cache.
+     *
+     * @param courseId Course the module belongs to.
+     * @param contextLevel Context level.
+     * @param instanceId Instance ID.
+     * @param site Site.
+     * @return The filters, undefined if not found.
+     */
+    protected getFromMemoryCache(courseId: number, contextLevel: string, instanceId: number, site: CoreSite): CoreFilterFilter[] {
+
+        const siteId = site.getId();
+
+        // Check if we have the context in the memory cache.
+        if (this.moduleContextsCache[siteId] && this.moduleContextsCache[siteId][courseId]) {
+            const cachedCourse = this.moduleContextsCache[siteId][courseId];
+
+            if (!this.appProvider.isOnline() ||
+                    Date.now() <= cachedCourse.time + site.getExpirationDelay(CoreSite.FREQUENCY_RARELY)) {
+
+                // We can use cache, return the filters if found.
+                return cachedCourse.contexts[contextLevel] && cachedCourse.contexts[contextLevel][instanceId];
+            }
+        }
+    }
+
     /**
      * Check if site has available any filter that should be treated by the app.
      *
@@ -168,4 +229,18 @@ export class CoreFilterHelperProvider {
             });
         });
     }
+
+    /**
+     * Store filters in the memory cache.
+     *
+     * @param contexts Filters to store, classified by contextlevel and instanceid
+     * @param siteId Site ID.
+     */
+    protected storeInMemoryCache(courseId: number, contexts: CoreFilterClassifiedFilters, siteId: string): void {
+        this.moduleContextsCache[siteId] = this.moduleContextsCache[siteId] || {};
+        this.moduleContextsCache[siteId][courseId] = {
+            contexts: contexts,
+            time: Date.now()
+        };
+    }
 }
diff --git a/src/core/settings/pages/space-usage/space-usage.ts b/src/core/settings/pages/space-usage/space-usage.ts
index 8ce241df8..44a24784f 100644
--- a/src/core/settings/pages/space-usage/space-usage.ts
+++ b/src/core/settings/pages/space-usage/space-usage.ts
@@ -16,6 +16,7 @@ import { Component, } from '@angular/core';
 import { IonicPage } from 'ionic-angular';
 import { TranslateService } from '@ngx-translate/core';
 import { CoreAppProvider } from '@providers/app';
+import { CoreEventsProvider } from '@providers/events';
 import { CoreFilepoolProvider } from '@providers/filepool';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
@@ -39,8 +40,12 @@ export class CoreSettingsSpaceUsagePage {
     totalEntries = 0;
 
     constructor(private filePoolProvider: CoreFilepoolProvider,
-            private sitesProvider: CoreSitesProvider, private filterHelper: CoreFilterHelperProvider,
-            private translate: TranslateService, private domUtils: CoreDomUtilsProvider, appProvider: CoreAppProvider,
+            private eventsProvider: CoreEventsProvider,
+            private sitesProvider: CoreSitesProvider,
+            private filterHelper: CoreFilterHelperProvider,
+            private translate: TranslateService,
+            private domUtils: CoreDomUtilsProvider,
+            appProvider: CoreAppProvider,
             private courseProvider: CoreCourseProvider) {
         this.currentSiteId = this.sitesProvider.getCurrentSiteId();
     }
@@ -196,6 +201,8 @@ export class CoreSettingsSpaceUsagePage {
                         });
                     }
                 }).finally(() => {
+                    this.eventsProvider.trigger(CoreEventsProvider.SITE_STORAGE_DELETED, {}, site.getId());
+
                     this.calcSiteClearRows(site).then((rows) => {
                         siteData.cacheEntries = rows;
                     });
diff --git a/src/providers/events.ts b/src/providers/events.ts
index 2371b7fc5..5d1557ed8 100644
--- a/src/providers/events.ts
+++ b/src/providers/events.ts
@@ -62,6 +62,8 @@ export class CoreEventsProvider {
     static SEND_ON_ENTER_CHANGED = 'send_on_enter_changed';
     static MAIN_MENU_OPEN = 'main_menu_open';
     static SELECT_COURSE_TAB = 'select_course_tab';
+    static WS_CACHE_INVALIDATED = 'ws_cache_invalidated';
+    static SITE_STORAGE_DELETED = 'site_storage_deleted';
 
     protected logger;
     protected observables: { [s: string]: Subject<any> } = {};

From 6c219b52465417528bca21ca20ed9a81c52c7ec2 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 8 Oct 2019 08:11:10 +0200
Subject: [PATCH 072/257] MOBILE-2491 filter: Change copyright of filter files

---
 src/addon/filter/activitynames/activitynames.module.ts | 2 +-
 src/addon/filter/activitynames/providers/handler.ts    | 2 +-
 src/addon/filter/censor/censor.module.ts               | 2 +-
 src/addon/filter/censor/providers/handler.ts           | 2 +-
 src/addon/filter/data/data.module.ts                   | 2 +-
 src/addon/filter/data/providers/handler.ts             | 2 +-
 src/addon/filter/emailprotect/emailprotect.module.ts   | 2 +-
 src/addon/filter/emailprotect/providers/handler.ts     | 2 +-
 src/addon/filter/emoticon/emoticon.module.ts           | 2 +-
 src/addon/filter/emoticon/providers/handler.ts         | 2 +-
 src/addon/filter/filter.module.ts                      | 2 +-
 src/addon/filter/glossary/glossary.module.ts           | 2 +-
 src/addon/filter/glossary/providers/handler.ts         | 2 +-
 src/addon/filter/mediaplugin/mediaplugin.module.ts     | 2 +-
 src/addon/filter/mediaplugin/providers/handler.ts      | 2 +-
 src/addon/filter/multilang/multilang.module.ts         | 2 +-
 src/addon/filter/multilang/providers/handler.ts        | 2 +-
 src/addon/filter/tex/providers/handler.ts              | 2 +-
 src/addon/filter/tex/tex.module.ts                     | 2 +-
 src/addon/filter/tidy/providers/handler.ts             | 2 +-
 src/addon/filter/tidy/tidy.module.ts                   | 2 +-
 src/addon/filter/urltolink/providers/handler.ts        | 2 +-
 src/addon/filter/urltolink/urltolink.module.ts         | 2 +-
 src/core/filter/filter.module.ts                       | 2 +-
 src/core/filter/providers/default-filter.ts            | 2 +-
 src/core/filter/providers/delegate.ts                  | 2 +-
 src/core/filter/providers/filter.ts                    | 2 +-
 src/core/filter/providers/helper.ts                    | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/addon/filter/activitynames/activitynames.module.ts b/src/addon/filter/activitynames/activitynames.module.ts
index b3e5d5da7..91d9e6f40 100644
--- a/src/addon/filter/activitynames/activitynames.module.ts
+++ b/src/addon/filter/activitynames/activitynames.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/activitynames/providers/handler.ts b/src/addon/filter/activitynames/providers/handler.ts
index 025121803..e82644bc1 100644
--- a/src/addon/filter/activitynames/providers/handler.ts
+++ b/src/addon/filter/activitynames/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/censor/censor.module.ts b/src/addon/filter/censor/censor.module.ts
index 126a7bfb2..6d6fc5521 100644
--- a/src/addon/filter/censor/censor.module.ts
+++ b/src/addon/filter/censor/censor.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/censor/providers/handler.ts b/src/addon/filter/censor/providers/handler.ts
index 018eb368b..b9ce9649f 100644
--- a/src/addon/filter/censor/providers/handler.ts
+++ b/src/addon/filter/censor/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/data/data.module.ts b/src/addon/filter/data/data.module.ts
index 1272618d8..e76812085 100644
--- a/src/addon/filter/data/data.module.ts
+++ b/src/addon/filter/data/data.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/data/providers/handler.ts b/src/addon/filter/data/providers/handler.ts
index e07e2ea4b..b0dfc9c7a 100644
--- a/src/addon/filter/data/providers/handler.ts
+++ b/src/addon/filter/data/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/emailprotect/emailprotect.module.ts b/src/addon/filter/emailprotect/emailprotect.module.ts
index d746dfc37..a722980be 100644
--- a/src/addon/filter/emailprotect/emailprotect.module.ts
+++ b/src/addon/filter/emailprotect/emailprotect.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/emailprotect/providers/handler.ts b/src/addon/filter/emailprotect/providers/handler.ts
index d339f6d33..77b431bde 100644
--- a/src/addon/filter/emailprotect/providers/handler.ts
+++ b/src/addon/filter/emailprotect/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/emoticon/emoticon.module.ts b/src/addon/filter/emoticon/emoticon.module.ts
index 5237286f9..9b975cea4 100644
--- a/src/addon/filter/emoticon/emoticon.module.ts
+++ b/src/addon/filter/emoticon/emoticon.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/emoticon/providers/handler.ts b/src/addon/filter/emoticon/providers/handler.ts
index 5523b0780..7b403231f 100644
--- a/src/addon/filter/emoticon/providers/handler.ts
+++ b/src/addon/filter/emoticon/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/filter.module.ts b/src/addon/filter/filter.module.ts
index b20447e06..617f623c6 100644
--- a/src/addon/filter/filter.module.ts
+++ b/src/addon/filter/filter.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/glossary/glossary.module.ts b/src/addon/filter/glossary/glossary.module.ts
index 337bffbbc..a5bae30c8 100644
--- a/src/addon/filter/glossary/glossary.module.ts
+++ b/src/addon/filter/glossary/glossary.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/glossary/providers/handler.ts b/src/addon/filter/glossary/providers/handler.ts
index 9ffd6fec4..c89489b12 100644
--- a/src/addon/filter/glossary/providers/handler.ts
+++ b/src/addon/filter/glossary/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/mediaplugin/mediaplugin.module.ts b/src/addon/filter/mediaplugin/mediaplugin.module.ts
index 2ef135ddd..c29931c91 100644
--- a/src/addon/filter/mediaplugin/mediaplugin.module.ts
+++ b/src/addon/filter/mediaplugin/mediaplugin.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/mediaplugin/providers/handler.ts b/src/addon/filter/mediaplugin/providers/handler.ts
index d7b91f2be..405ba0672 100644
--- a/src/addon/filter/mediaplugin/providers/handler.ts
+++ b/src/addon/filter/mediaplugin/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/multilang/multilang.module.ts b/src/addon/filter/multilang/multilang.module.ts
index 149cdfd0c..db8328d2b 100644
--- a/src/addon/filter/multilang/multilang.module.ts
+++ b/src/addon/filter/multilang/multilang.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/multilang/providers/handler.ts b/src/addon/filter/multilang/providers/handler.ts
index 0b8d25d35..93db110d0 100644
--- a/src/addon/filter/multilang/providers/handler.ts
+++ b/src/addon/filter/multilang/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/tex/providers/handler.ts b/src/addon/filter/tex/providers/handler.ts
index d29302a0d..313f13a9f 100644
--- a/src/addon/filter/tex/providers/handler.ts
+++ b/src/addon/filter/tex/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/tex/tex.module.ts b/src/addon/filter/tex/tex.module.ts
index 21084238b..2fecf37d7 100644
--- a/src/addon/filter/tex/tex.module.ts
+++ b/src/addon/filter/tex/tex.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/tidy/providers/handler.ts b/src/addon/filter/tidy/providers/handler.ts
index 6ce6a6287..d1a3f608a 100644
--- a/src/addon/filter/tidy/providers/handler.ts
+++ b/src/addon/filter/tidy/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/tidy/tidy.module.ts b/src/addon/filter/tidy/tidy.module.ts
index ab0b43098..54782656c 100644
--- a/src/addon/filter/tidy/tidy.module.ts
+++ b/src/addon/filter/tidy/tidy.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/urltolink/providers/handler.ts b/src/addon/filter/urltolink/providers/handler.ts
index 311a0c2c5..cc1aa05cc 100644
--- a/src/addon/filter/urltolink/providers/handler.ts
+++ b/src/addon/filter/urltolink/providers/handler.ts
@@ -1,5 +1,5 @@
 
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/urltolink/urltolink.module.ts b/src/addon/filter/urltolink/urltolink.module.ts
index afbdbf15c..7316a849a 100644
--- a/src/addon/filter/urltolink/urltolink.module.ts
+++ b/src/addon/filter/urltolink/urltolink.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/filter/filter.module.ts b/src/core/filter/filter.module.ts
index 81c898f55..9211ecd98 100644
--- a/src/core/filter/filter.module.ts
+++ b/src/core/filter/filter.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/filter/providers/default-filter.ts b/src/core/filter/providers/default-filter.ts
index 77abe1443..d381e580f 100644
--- a/src/core/filter/providers/default-filter.ts
+++ b/src/core/filter/providers/default-filter.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/filter/providers/delegate.ts b/src/core/filter/providers/delegate.ts
index 11e081c0b..dcea780cd 100644
--- a/src/core/filter/providers/delegate.ts
+++ b/src/core/filter/providers/delegate.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/filter/providers/filter.ts b/src/core/filter/providers/filter.ts
index 24d01f83c..e521861eb 100644
--- a/src/core/filter/providers/filter.ts
+++ b/src/core/filter/providers/filter.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/core/filter/providers/helper.ts b/src/core/filter/providers/helper.ts
index bb01bdbaf..15982e9a5 100644
--- a/src/core/filter/providers/helper.ts
+++ b/src/core/filter/providers/helper.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

From b99d31ca61f397794251058a415551dac36d23ee Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 8 Oct 2019 08:42:15 +0200
Subject: [PATCH 073/257] MOBILE-2491 filter: Use instanceid 0 for system
 context

---
 src/addon/blog/components/entries/entries.ts                | 2 +-
 .../components/discussions/addon-messages-discussions.html  | 4 ++--
 src/addon/messages/components/discussions/discussions.ts    | 2 --
 .../messages/pages/conversation-info/conversation-info.html | 4 ++--
 .../messages/pages/conversation-info/conversation-info.ts   | 2 --
 src/addon/messages/pages/discussion/discussion.html         | 4 ++--
 src/addon/messages/pages/discussion/discussion.ts           | 2 --
 .../pages/group-conversations/group-conversations.html      | 6 +++---
 .../pages/group-conversations/group-conversations.ts        | 2 --
 src/addon/messages/pages/search/search.html                 | 2 +-
 src/addon/messages/pages/search/search.ts                   | 3 ---
 src/addon/messages/providers/mainmenu-handler.ts            | 3 +--
 src/addon/notifications/pages/list/list.html                | 2 +-
 src/addon/notifications/pages/list/list.ts                  | 3 ---
 src/components/site-picker/site-picker.ts                   | 2 +-
 src/core/contentlinks/pages/choose-site/choose-site.html    | 2 +-
 src/core/courses/pages/dashboard/dashboard.html             | 2 +-
 src/core/courses/pages/dashboard/dashboard.ts               | 2 --
 src/core/filter/providers/filter.ts                         | 5 +++--
 src/core/filter/providers/helper.ts                         | 4 ++--
 src/core/login/pages/sites/sites.html                       | 2 +-
 src/core/login/pages/sites/sites.ts                         | 2 +-
 src/core/mainmenu/pages/more/more.html                      | 2 +-
 src/core/mainmenu/pages/more/more.ts                        | 2 --
 src/core/pushnotifications/providers/pushnotifications.ts   | 2 +-
 src/core/settings/pages/space-usage/space-usage.html        | 2 +-
 src/core/settings/pages/space-usage/space-usage.ts          | 2 +-
 .../settings/pages/synchronization/synchronization.html     | 2 +-
 src/core/sharedfiles/pages/choose-site/choose-site.html     | 2 +-
 29 files changed, 29 insertions(+), 47 deletions(-)

diff --git a/src/addon/blog/components/entries/entries.ts b/src/addon/blog/components/entries/entries.ts
index 29b225c09..8853d8842 100644
--- a/src/addon/blog/components/entries/entries.ts
+++ b/src/addon/blog/components/entries/entries.ts
@@ -104,7 +104,7 @@ export class AddonBlogEntriesComponent implements OnInit {
             this.contextInstanceId = this.courseId;
         } else {
             this.contextLevel = 'system';
-            this.contextInstanceId = this.siteHomeId;
+            this.contextInstanceId = 0;
         }
 
         this.commentsEnabled = !this.commentsProvider.areCommentsDisabledInSite();
diff --git a/src/addon/messages/components/discussions/addon-messages-discussions.html b/src/addon/messages/components/discussions/addon-messages-discussions.html
index 8d21aaba8..0094d0dc5 100644
--- a/src/addon/messages/components/discussions/addon-messages-discussions.html
+++ b/src/addon/messages/components/discussions/addon-messages-discussions.html
@@ -15,7 +15,7 @@
             <a ion-item text-wrap *ngFor="let result of search.results" [title]="result.fullname" (click)="gotoDiscussion(result.userid, result.messageid)" [class.core-split-item-selected]="result.userid == discussionUserId" class="addon-message-discussion">
                 <ion-avatar core-user-avatar [user]="result" item-start [checkOnline]="result.showonlinestatus"></ion-avatar>
                 <h2>{{ result.fullname }}</h2>
-                <p><core-format-text clean="true" singleLine="true" [text]="result.lastmessage" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></p>
+                <p><core-format-text clean="true" singleLine="true" [text]="result.lastmessage" contextLevel="system" [contextInstanceId]="0"></core-format-text></p>
             </a>
         </ion-list>
 
@@ -27,7 +27,7 @@
                     <span *ngIf="discussion.unread" class="core-primary-circle"></span>
                     <span *ngIf="discussion.message.timecreated > 0">{{discussion.message.timecreated / 1000 | coreDateDayOrTime}}</span>
                 </ion-note>
-                <p><core-format-text clean="true" singleLine="true" [text]="discussion.message.message" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></p>
+                <p><core-format-text clean="true" singleLine="true" [text]="discussion.message.message" contextLevel="system" [contextInstanceId]="0"></core-format-text></p>
             </a>
         </ion-list>
 
diff --git a/src/addon/messages/components/discussions/discussions.ts b/src/addon/messages/components/discussions/discussions.ts
index 0a37c5ec3..629446b1a 100644
--- a/src/addon/messages/components/discussions/discussions.ts
+++ b/src/addon/messages/components/discussions/discussions.ts
@@ -50,7 +50,6 @@ export class AddonMessagesDiscussionsComponent implements OnDestroy {
         loading: '',
         text: ''
     };
-    siteHomeId: number;
 
     constructor(private eventsProvider: CoreEventsProvider, sitesProvider: CoreSitesProvider, translate: TranslateService,
             private messagesProvider: AddonMessagesProvider, private domUtils: CoreDomUtilsProvider, navParams: NavParams,
@@ -60,7 +59,6 @@ export class AddonMessagesDiscussionsComponent implements OnDestroy {
         this.search.loading =  translate.instant('core.searching');
         this.loadingMessages = translate.instant('core.loading');
         this.siteId = sitesProvider.getCurrentSiteId();
-        this.siteHomeId = sitesProvider.getCurrentSiteHomeId();
 
         // Update discussions when new message is received.
         this.newMessagesObserver = eventsProvider.on(AddonMessagesProvider.NEW_MESSAGE_EVENT, (data) => {
diff --git a/src/addon/messages/pages/conversation-info/conversation-info.html b/src/addon/messages/pages/conversation-info/conversation-info.html
index 66dd220f2..b5885ddd1 100644
--- a/src/addon/messages/pages/conversation-info/conversation-info.html
+++ b/src/addon/messages/pages/conversation-info/conversation-info.html
@@ -18,8 +18,8 @@
             <div class="item-avatar-center">
                 <img class="avatar" [src]="conversation.imageurl" core-external-content [alt]="conversation.name" role="presentation" onError="this.src='assets/img/group-avatar.png'">
             </div>
-            <h2><core-format-text [text]="conversation.name" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></h2>
-            <p><core-format-text *ngIf="conversation.subname" [text]="conversation.subname" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></p>
+            <h2><core-format-text [text]="conversation.name" contextLevel="system" [contextInstanceId]="0"></core-format-text></h2>
+            <p><core-format-text *ngIf="conversation.subname" [text]="conversation.subname" contextLevel="system" [contextInstanceId]="0"></core-format-text></p>
             <p>{{ 'addon.messages.numparticipants' | translate:{$a: conversation.membercount} }}</p>
         </ion-item>
 
diff --git a/src/addon/messages/pages/conversation-info/conversation-info.ts b/src/addon/messages/pages/conversation-info/conversation-info.ts
index dcd2597dd..5dfeb450d 100644
--- a/src/addon/messages/pages/conversation-info/conversation-info.ts
+++ b/src/addon/messages/pages/conversation-info/conversation-info.ts
@@ -35,14 +35,12 @@ export class AddonMessagesConversationInfoPage implements OnInit {
     members: AddonMessagesConversationMember[] = [];
     canLoadMore = false;
     loadMoreError = false;
-    siteHomeId: number;
 
     protected conversationId: number;
 
     constructor(private messagesProvider: AddonMessagesProvider, private domUtils: CoreDomUtilsProvider, navParams: NavParams,
             protected viewCtrl: ViewController, sitesProvider: CoreSitesProvider) {
         this.conversationId = navParams.get('conversationId');
-        this.siteHomeId = sitesProvider.getCurrentSiteHomeId();
     }
 
     /**
diff --git a/src/addon/messages/pages/discussion/discussion.html b/src/addon/messages/pages/discussion/discussion.html
index 5c7ea16ad..a869dad74 100644
--- a/src/addon/messages/pages/discussion/discussion.html
+++ b/src/addon/messages/pages/discussion/discussion.html
@@ -3,7 +3,7 @@
         <ion-title>
             <img *ngIf="loaded && !otherMember && conversationImage" class="core-bar-button-image" [src]="conversationImage" [alt]="title" onError="this.src='assets/img/group-avatar.png'" core-external-content role="presentation" [siteId]="siteId || null">
             <ion-avatar *ngIf="loaded && otherMember" class="core-bar-button-image" core-user-avatar [user]="otherMember" [linkProfile]="false" [checkOnline]="otherMember.showonlinestatus" item-start (click)="showInfo && viewInfo()"></ion-avatar>
-            <core-format-text [text]="title" contextLevel="system" [contextInstanceId]="siteHomeId" (click)="showInfo && !isGroup && viewInfo()"></core-format-text>
+            <core-format-text [text]="title" contextLevel="system" [contextInstanceId]="0" (click)="showInfo && !isGroup && viewInfo()"></core-format-text>
             <core-icon *ngIf="conversation && conversation.isfavourite" name="fa-star" [label]="'core.favourites' | translate"></core-icon>
             <core-icon *ngIf="conversation && conversation.ismuted" name="volume-off" [label]="'addon.messages.mutedconversation' | translate"></core-icon>
         </ion-title>
@@ -58,7 +58,7 @@
 
                     <!-- Some messages have <p> and some others don't. Add a <p> so they all have same styles. -->
                     <p class="addon-message-text">
-                        <core-format-text (afterRender)="last && scrollToBottom()" [text]="message.text" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text>
+                        <core-format-text (afterRender)="last && scrollToBottom()" [text]="message.text" contextLevel="system" [contextInstanceId]="0"></core-format-text>
                     </p>
 
                     <button ion-button icon-only clear="true" *ngIf="!message.sending && showDelete" (click)="deleteMessage(message, index)" class="addon-messages-delete-button" [@coreSlideInOut]="'fromRight'" [attr.aria-label]=" 'addon.messages.deletemessage' | translate">
diff --git a/src/addon/messages/pages/discussion/discussion.ts b/src/addon/messages/pages/discussion/discussion.ts
index 6edc0b4ea..41013c2ac 100644
--- a/src/addon/messages/pages/discussion/discussion.ts
+++ b/src/addon/messages/pages/discussion/discussion.ts
@@ -95,7 +95,6 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     isSelf = false;
     muteEnabled = false;
     muteIcon = 'volume-off';
-    siteHomeId: number;
 
     constructor(private eventsProvider: CoreEventsProvider, sitesProvider: CoreSitesProvider, navParams: NavParams,
             private userProvider: CoreUserProvider, private navCtrl: NavController, private messagesSync: AddonMessagesSyncProvider,
@@ -108,7 +107,6 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
         this.currentUserId = sitesProvider.getCurrentSiteUserId();
         this.groupMessagingEnabled = this.messagesProvider.isGroupMessagingEnabled();
         this.muteEnabled = this.messagesProvider.isMuteConversationEnabled();
-        this.siteHomeId = sitesProvider.getCurrentSiteHomeId();
 
         this.logger = logger.getInstance('AddonMessagesDiscussionPage');
 
diff --git a/src/addon/messages/pages/group-conversations/group-conversations.html b/src/addon/messages/pages/group-conversations/group-conversations.html
index f786c52ec..4f2405bb4 100644
--- a/src/addon/messages/pages/group-conversations/group-conversations.html
+++ b/src/addon/messages/pages/group-conversations/group-conversations.html
@@ -99,7 +99,7 @@
         <ion-avatar *ngIf="conversation.type != typeGroup" core-user-avatar [user]="conversation.otherUser" [linkProfile]="false" [checkOnline]="conversation.showonlinestatus" item-start></ion-avatar>
 
         <h2>
-            <core-format-text [text]="conversation.name" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text>
+            <core-format-text [text]="conversation.name" contextLevel="system" [contextInstanceId]="0"></core-format-text>
             <core-icon name="fa-ban" *ngIf="conversation.isblocked" [label]="'addon.messages.contactblocked' | translate"></core-icon>
             <core-icon *ngIf="conversation.ismuted" name="volume-off" [label]="'addon.messages.mutedconversation' | translate"></core-icon>
         </h2>
@@ -107,11 +107,11 @@
             <ion-badge *ngIf="conversation.unreadcount > 0">{{ conversation.unreadcount }}</ion-badge>
             <span *ngIf="conversation.lastmessagedate > 0">{{conversation.lastmessagedate | coreDateDayOrTime}}</span>
         </ion-note>
-        <p *ngIf="conversation.subname"><core-format-text [text]="conversation.subname" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></p>
+        <p *ngIf="conversation.subname"><core-format-text [text]="conversation.subname" contextLevel="system" [contextInstanceId]="0"></core-format-text></p>
         <p class="addon-message-last-message">
             <span *ngIf="conversation.sentfromcurrentuser" class="addon-message-last-message-user">{{ 'addon.messages.you' | translate }}</span>
             <span *ngIf="!conversation.sentfromcurrentuser && conversation.type == typeGroup && conversation.members[0]" class="addon-message-last-message-user">{{ conversation.members[0].fullname + ':' }}</span>
-            <core-format-text clean="true" singleLine="true" [text]="conversation.lastmessage" class="addon-message-last-message-text" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text>
+            <core-format-text clean="true" singleLine="true" [text]="conversation.lastmessage" class="addon-message-last-message-text" contextLevel="system" [contextInstanceId]="0"></core-format-text>
         </p>
     </a>
 </ng-template>
diff --git a/src/addon/messages/pages/group-conversations/group-conversations.ts b/src/addon/messages/pages/group-conversations/group-conversations.ts
index 02490e2d0..ececc1ac2 100644
--- a/src/addon/messages/pages/group-conversations/group-conversations.ts
+++ b/src/addon/messages/pages/group-conversations/group-conversations.ts
@@ -67,7 +67,6 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     };
     typeGroup = AddonMessagesProvider.MESSAGE_CONVERSATION_TYPE_GROUP;
     currentListEl: HTMLElement;
-    siteHomeId: number;
 
     protected loadingString: string;
     protected siteId: string;
@@ -96,7 +95,6 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
         // Conversation to load.
         this.conversationId = navParams.get('conversationId') || false;
         this.discussionUserId = !this.conversationId && (navParams.get('discussionUserId') || false);
-        this.siteHomeId = sitesProvider.getCurrentSiteHomeId();
 
         // Update conversations when new message is received.
         this.newMessagesObserver = eventsProvider.on(AddonMessagesProvider.NEW_MESSAGE_EVENT, (data) => {
diff --git a/src/addon/messages/pages/search/search.html b/src/addon/messages/pages/search/search.html
index c41e42c77..99a5675b0 100644
--- a/src/addon/messages/pages/search/search.html
+++ b/src/addon/messages/pages/search/search.html
@@ -41,7 +41,7 @@
             </ion-note>
             <p class="addon-message-last-message">
                 <span *ngIf="result.sentfromcurrentuser" class="addon-message-last-message-user">{{ 'addon.messages.you' | translate }}</span>
-                <core-format-text clean="true" singleLine="true" [text]="result.lastmessage" [highlight]="result.highlightMessage" contextLevel="system" [contextInstanceId]="siteHomeId" class="addon-message-last-message-text"></core-format-text>
+                <core-format-text clean="true" singleLine="true" [text]="result.lastmessage" [highlight]="result.highlightMessage" contextLevel="system" [contextInstanceId]="0" class="addon-message-last-message-text"></core-format-text>
             </p>
         </a>
 
diff --git a/src/addon/messages/pages/search/search.ts b/src/addon/messages/pages/search/search.ts
index 33ccb7f0d..a02203faf 100644
--- a/src/addon/messages/pages/search/search.ts
+++ b/src/addon/messages/pages/search/search.ts
@@ -58,7 +58,6 @@ export class AddonMessagesSearchPage implements OnDestroy {
         loadMoreError: false
     };
     selectedResult = null;
-    siteHomeId: number;
 
     protected memberInfoObserver;
 
@@ -67,8 +66,6 @@ export class AddonMessagesSearchPage implements OnDestroy {
     constructor(private appProvider: CoreAppProvider, private domUtils: CoreDomUtilsProvider, eventsProvider: CoreEventsProvider,
             sitesProvider: CoreSitesProvider, private messagesProvider: AddonMessagesProvider) {
 
-        this.siteHomeId = sitesProvider.getCurrentSiteHomeId();
-
         // Update block status of a user.
         this.memberInfoObserver = eventsProvider.on(AddonMessagesProvider.MEMBER_INFO_CHANGED_EVENT, (data) => {
             if (!data.userBlocked && !data.userUnblocked) {
diff --git a/src/addon/messages/providers/mainmenu-handler.ts b/src/addon/messages/providers/mainmenu-handler.ts
index 1544ce7a1..51d75825c 100644
--- a/src/addon/messages/providers/mainmenu-handler.ts
+++ b/src/addon/messages/providers/mainmenu-handler.ts
@@ -297,8 +297,7 @@ export class AddonMessagesMainMenuHandler implements CoreMainMenuHandler, CoreCr
             title: message.name || message.userfromfullname,
         };
 
-        return this.filterHelper.getFiltersAndFormatText(message.text, 'system', this.sitesProvider.getCurrentSiteHomeId(),
-                {clean: true, singleLine: true}).catch(() => {
+        return this.filterHelper.getFiltersAndFormatText(message.text, 'system', 0, {clean: true, singleLine: true}).catch(() => {
             return message.text;
         }).then((formattedText) => {
             data['text'] = formattedText;
diff --git a/src/addon/notifications/pages/list/list.html b/src/addon/notifications/pages/list/list.html
index 72b4cdce1..951c63659 100644
--- a/src/addon/notifications/pages/list/list.html
+++ b/src/addon/notifications/pages/list/list.html
@@ -30,7 +30,7 @@
                 <p *ngIf="notification.userfromfullname">{{ notification.userfromfullname }}</p>
             </ion-item>
             <ion-item text-wrap>
-                <p><core-format-text [text]="notification.mobiletext | coreCreateLinks" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></p>
+                <p><core-format-text [text]="notification.mobiletext | coreCreateLinks" contextLevel="system" [contextInstanceId]="0"></core-format-text></p>
             </ion-item>
             <addon-notifications-actions [contextUrl]="notification.contexturl" [courseId]="notification.courseid" [data]="notification.customdata"></addon-notifications-actions>
         </ion-card>
diff --git a/src/addon/notifications/pages/list/list.ts b/src/addon/notifications/pages/list/list.ts
index 70342f5e3..2046b00bc 100644
--- a/src/addon/notifications/pages/list/list.ts
+++ b/src/addon/notifications/pages/list/list.ts
@@ -40,7 +40,6 @@ export class AddonNotificationsListPage {
     loadMoreError = false;
     canMarkAllNotificationsAsRead = false;
     loadingMarkAllNotificationsAsRead = false;
-    siteHomeId: number;
 
     protected isCurrentView: boolean;
     protected cronObserver: CoreEventObserver;
@@ -52,8 +51,6 @@ export class AddonNotificationsListPage {
             private utils: CoreUtilsProvider, private notificationsProvider: AddonNotificationsProvider,
             private pushNotificationsDelegate: CorePushNotificationsDelegate,
             private notificationsHelper: AddonNotificationsHelperProvider) {
-
-        this.siteHomeId = sitesProvider.getCurrentSite().getSiteHomeId();
     }
 
     /**
diff --git a/src/components/site-picker/site-picker.ts b/src/components/site-picker/site-picker.ts
index e3b9c62ae..aa934bf57 100644
--- a/src/components/site-picker/site-picker.ts
+++ b/src/components/site-picker/site-picker.ts
@@ -49,7 +49,7 @@ export class CoreSitePickerComponent implements OnInit {
 
             sites.forEach((site: any) => {
                 // Format the site name.
-                promises.push(this.filterHelper.getFiltersAndFormatText(site.siteName, 'system', site.siteHomeId,
+                promises.push(this.filterHelper.getFiltersAndFormatText(site.siteName, 'system', 0,
                         {clean: true, singleLine: true}, site.getId()).catch(() => {
                     return site.siteName;
                 }).then((formatted) => {
diff --git a/src/core/contentlinks/pages/choose-site/choose-site.html b/src/core/contentlinks/pages/choose-site/choose-site.html
index 198304584..5ade9add5 100644
--- a/src/core/contentlinks/pages/choose-site/choose-site.html
+++ b/src/core/contentlinks/pages/choose-site/choose-site.html
@@ -15,7 +15,7 @@
                     <img [src]="site.avatar" core-external-content [siteId]="site.id" alt="{{ 'core.pictureof' | translate:{$a: site.fullname} }}" role="presentation" onError="this.src='assets/img/user-avatar.png'">
                 </ion-avatar>
                 <h2>{{site.fullName}}</h2>
-                <p><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id" contextLevel="system" [contextInstanceId]="site.siteHomeId"></core-format-text></p>
+                <p><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id" contextLevel="system" [contextInstanceId]="0"></core-format-text></p>
                 <p>{{site.siteUrl}}</p>
             </a>
             <ion-item>
diff --git a/src/core/courses/pages/dashboard/dashboard.html b/src/core/courses/pages/dashboard/dashboard.html
index 0030c0b0f..401379077 100644
--- a/src/core/courses/pages/dashboard/dashboard.html
+++ b/src/core/courses/pages/dashboard/dashboard.html
@@ -1,6 +1,6 @@
     <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text></ion-title>
 
         <ion-buttons end>
             <button *ngIf="searchEnabled" ion-button icon-only (click)="openSearch()" [attr.aria-label]="'core.courses.searchcourses' | translate">
diff --git a/src/core/courses/pages/dashboard/dashboard.ts b/src/core/courses/pages/dashboard/dashboard.ts
index 29906dd8e..ac309713c 100644
--- a/src/core/courses/pages/dashboard/dashboard.ts
+++ b/src/core/courses/pages/dashboard/dashboard.ts
@@ -45,7 +45,6 @@ export class CoreCoursesDashboardPage implements OnDestroy {
     tabsReady = false;
     searchEnabled: boolean;
     tabs = [];
-    siteHomeId: number;
     siteName: string;
     blocks: any[];
     dashboardEnabled = false;
@@ -134,7 +133,6 @@ export class CoreCoursesDashboardPage implements OnDestroy {
      * Load the site name.
      */
     protected loadSiteName(): void {
-        this.siteHomeId = this.sitesProvider.getCurrentSiteHomeId();
         this.siteName = this.sitesProvider.getCurrentSite().getSiteName();
     }
 
diff --git a/src/core/filter/providers/filter.ts b/src/core/filter/providers/filter.ts
index e521861eb..42802335f 100644
--- a/src/core/filter/providers/filter.ts
+++ b/src/core/filter/providers/filter.ts
@@ -197,7 +197,7 @@ export class CoreFilterProvider {
             for (let i = 0; i < contextsToSend.length; i++) {
                 const context = contextsToSend[i];
 
-                if (context.contextlevel == 'system' && context.instanceid == site.getSiteHomeId()) {
+                if (context.contextlevel == 'system') {
                     hasSystemContext = true;
 
                     // Use course site home instead. Check if it's already in the list.
@@ -212,7 +212,7 @@ export class CoreFilterProvider {
                         // Site home not in list, use it instead of system.
                         contextsToSend[i] = {
                             contextlevel: 'course',
-                            instanceid: context.instanceid
+                            instanceid: site.getSiteHomeId()
                         };
                     }
 
@@ -259,6 +259,7 @@ export class CoreFilterProvider {
 
                         // Simulate the system context based on the inherited data.
                         filter.contextlevel = 'system';
+                        filter.instanceid = 0;
                         filter.contextid = -1;
                         filter.localstate = filter.inheritedstate;
                     }
diff --git a/src/core/filter/providers/helper.ts b/src/core/filter/providers/helper.ts
index 15982e9a5..af7fbac1d 100644
--- a/src/core/filter/providers/helper.ts
+++ b/src/core/filter/providers/helper.ts
@@ -122,7 +122,7 @@ export class CoreFilterHelperProvider {
 
                 let promise: Promise<boolean>;
 
-                if (instanceId == site.getSiteHomeId() && (contextLevel == 'system' || contextLevel == 'course')) {
+                if (contextLevel == 'system' || (contextLevel == 'course' && instanceId == site.getSiteHomeId())) {
                     // No need to check the site filters because we're requesting the same context, so we'd do the same twice.
                     promise = Promise.resolve(true);
                 } else {
@@ -223,7 +223,7 @@ export class CoreFilterHelperProvider {
         return this.sitesProvider.getSite(siteId).then((site) => {
 
             // Get filters at site level.
-            return this.filterProvider.getAvailableInContext('system', site.getSiteHomeId(), site.getId()).then((filters) => {
+            return this.filterProvider.getAvailableInContext('system', 0, site.getId()).then((filters) => {
 
                 return this.filterDelegate.shouldBeApplied(filters, options, site);
             });
diff --git a/src/core/login/pages/sites/sites.html b/src/core/login/pages/sites/sites.html
index f42010609..6b33ab936 100644
--- a/src/core/login/pages/sites/sites.html
+++ b/src/core/login/pages/sites/sites.html
@@ -19,7 +19,7 @@
                 <img [src]="site.avatar" core-external-content [siteId]="site.id" alt="{{ 'core.pictureof' | translate:{$a: site.fullname} }}" role="presentation" onError="this.src='assets/img/user-avatar.png'">
             </ion-avatar>
             <h2>{{site.fullName}}</h2>
-            <p><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id" contextLevel="system" [contextInstanceId]="site.siteHomeId"></core-format-text></p>
+            <p><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id" contextLevel="system" [contextInstanceId]="0"></core-format-text></p>
             <p>{{site.siteUrl}}</p>
             <ion-badge item-end *ngIf="!showDelete && site.badge">{{site.badge}}</ion-badge>
             <button *ngIf="showDelete" item-end ion-button icon-only clear color="danger" (click)="deleteSite($event, idx)" [attr.aria-label]="'core.delete' | translate">
diff --git a/src/core/login/pages/sites/sites.ts b/src/core/login/pages/sites/sites.ts
index 8283f15be..c420339af 100644
--- a/src/core/login/pages/sites/sites.ts
+++ b/src/core/login/pages/sites/sites.ts
@@ -86,7 +86,7 @@ export class CoreLoginSitesPage {
         const site = this.sites[index],
             siteName = site.siteName;
 
-        this.filterHelper.getFiltersAndFormatText(siteName, 'system', site.siteHomeId, {clean: true, singleLine: true}, site.id)
+        this.filterHelper.getFiltersAndFormatText(siteName, 'system', 0, {clean: true, singleLine: true}, site.id)
                 .then((siteName) => {
 
             this.domUtils.showConfirm(this.translate.instant('core.login.confirmdeletesite', { sitename: siteName })).then(() => {
diff --git a/src/core/mainmenu/pages/more/more.html b/src/core/mainmenu/pages/more/more.html
index 1caee57d6..d82dce05d 100644
--- a/src/core/mainmenu/pages/more/more.html
+++ b/src/core/mainmenu/pages/more/more.html
@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="siteHomeId"></core-format-text></ion-title>
+        <ion-title><core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text></ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>
diff --git a/src/core/mainmenu/pages/more/more.ts b/src/core/mainmenu/pages/more/more.ts
index 82dc72029..257fb27c7 100644
--- a/src/core/mainmenu/pages/more/more.ts
+++ b/src/core/mainmenu/pages/more/more.ts
@@ -33,7 +33,6 @@ export class CoreMainMenuMorePage implements OnDestroy {
     handlersLoaded: boolean;
     siteInfo: any;
     siteName: string;
-    siteHomeId: number;
     logoutLabel: string;
     showWeb: boolean;
     showHelp: boolean;
@@ -111,7 +110,6 @@ export class CoreMainMenuMorePage implements OnDestroy {
         this.siteInfo = currentSite.getInfo();
         this.siteName = currentSite.getSiteName();
         this.siteUrl = currentSite.getURL();
-        this.siteHomeId = currentSite.getSiteHomeId();
         this.logoutLabel = 'core.mainmenu.' + (config && config.tool_mobile_forcelogout == '1' ? 'logout' : 'changesite');
         this.showWeb = !currentSite.isFeatureDisabled('CoreMainMenuDelegate_website');
         this.showHelp = !currentSite.isFeatureDisabled('CoreMainMenuDelegate_help');
diff --git a/src/core/pushnotifications/providers/pushnotifications.ts b/src/core/pushnotifications/providers/pushnotifications.ts
index 982041ac2..755300520 100644
--- a/src/core/pushnotifications/providers/pushnotifications.ts
+++ b/src/core/pushnotifications/providers/pushnotifications.ts
@@ -453,7 +453,7 @@ export class CorePushNotificationsProvider {
                             clean: true,
                             singleLine: true,
                             contextLevel: 'system',
-                            instanceId: site.getSiteHomeId(),
+                            instanceId: 0,
                             filter: true
                         },
                         isAndroid = this.platform.is('android'),
diff --git a/src/core/settings/pages/space-usage/space-usage.html b/src/core/settings/pages/space-usage/space-usage.html
index 83fcfd9ee..bc5c89b2e 100644
--- a/src/core/settings/pages/space-usage/space-usage.html
+++ b/src/core/settings/pages/space-usage/space-usage.html
@@ -9,7 +9,7 @@
     </ion-refresher>
     <core-loading [hideUntil]="usageLoaded">
         <ion-item *ngFor="let site of sites" [class.core-primary-selected-item]="site.id == currentSiteId">
-            <h2 text-wrap><core-format-text [text]="site.siteName" contextLevel="system" [contextInstanceId]="site.siteHomeId"></core-format-text></h2>
+            <h2 text-wrap><core-format-text [text]="site.siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text></h2>
             <p text-wrap>{{ site.fullName }}</p>
             <div item-end>
                 <p>{{ site.spaceUsage | coreBytesToSize }}</p>
diff --git a/src/core/settings/pages/space-usage/space-usage.ts b/src/core/settings/pages/space-usage/space-usage.ts
index 44a24784f..4031e5157 100644
--- a/src/core/settings/pages/space-usage/space-usage.ts
+++ b/src/core/settings/pages/space-usage/space-usage.ts
@@ -167,7 +167,7 @@ export class CoreSettingsSpaceUsagePage {
      * @param siteData Site object with space usage.
      */
     deleteSiteStorage(siteData: any): void {
-        this.filterHelper.getFiltersAndFormatText(siteData.siteName, 'system', siteData.siteHomeId,
+        this.filterHelper.getFiltersAndFormatText(siteData.siteName, 'system', 0,
                 {clean: true, singleLine: true}, siteData.id).then((siteName) => {
 
             const title = this.translate.instant('core.settings.deletesitefilestitle');
diff --git a/src/core/settings/pages/synchronization/synchronization.html b/src/core/settings/pages/synchronization/synchronization.html
index 041c048c8..d34b69979 100644
--- a/src/core/settings/pages/synchronization/synchronization.html
+++ b/src/core/settings/pages/synchronization/synchronization.html
@@ -17,7 +17,7 @@
             <p>{{ 'core.settings.sites' | translate }}</p>
         </ion-item-divider>
         <ion-item *ngFor="let site of sites" [class.core-primary-selected-item]="site.id == currentSiteId" text-wrap>
-            <h2><core-format-text [text]="site.siteName" contextLevel="system" [contextInstanceId]="site.siteHomeId"></core-format-text></h2>
+            <h2><core-format-text [text]="site.siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text></h2>
             <p>{{ site.fullName }}</p>
             <p>{{ site.siteUrl }}</p>
             <button ion-button icon-only clear item-end *ngIf="!isSynchronizing(site.id)" (click)="synchronize(site.id)" [title]="site.siteName" [attr.aria-label]="'core.settings.synchronizenow' | translate">
diff --git a/src/core/sharedfiles/pages/choose-site/choose-site.html b/src/core/sharedfiles/pages/choose-site/choose-site.html
index 5c6cf3a80..c1428765e 100644
--- a/src/core/sharedfiles/pages/choose-site/choose-site.html
+++ b/src/core/sharedfiles/pages/choose-site/choose-site.html
@@ -15,7 +15,7 @@
                     <img [src]="site.avatar" core-external-content [siteId]="site.id" alt="{{ 'core.pictureof' | translate:{$a: site.fullname} }}" role="presentation" onError="this.src='assets/img/user-avatar.png'">
                 </ion-avatar>
                 <h2>{{site.fullName}}</h2>
-                <p><core-format-text clean="true" [text]="site.siteName" [siteId]="site.id" contextLevel="system" [contextInstanceId]="site.siteHomeId"></core-format-text></p>
+                <p><core-format-text clean="true" [text]="site.siteName" [siteId]="site.id" contextLevel="system" [contextInstanceId]="0"></core-format-text></p>
                 <p>{{site.siteUrl}}</p>
             </a>
         </ion-list>

From 0d41e7206cdda2630f022b62ce883003738db57b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 8 Oct 2019 11:30:20 +0200
Subject: [PATCH 074/257] MOBILE-2491 filter: Prefetch filters

---
 .../providers/course-option-handler.ts        | 15 +++++-
 .../mod/assign/providers/prefetch-handler.ts  | 27 +++++++---
 .../mod/book/providers/prefetch-handler.ts    | 15 ++++--
 .../mod/chat/providers/prefetch-handler.ts    |  4 +-
 .../mod/choice/providers/prefetch-handler.ts  | 18 +++++--
 .../mod/data/providers/prefetch-handler.ts    | 21 +++++---
 .../feedback/providers/prefetch-handler.ts    | 18 +++++--
 .../mod/folder/providers/prefetch-handler.ts  | 15 ++++--
 .../mod/forum/providers/prefetch-handler.ts   |  4 +-
 .../glossary/providers/prefetch-handler.ts    |  4 +-
 .../mod/imscp/providers/prefetch-handler.ts   | 15 ++++--
 .../mod/label/providers/prefetch-handler.ts   | 15 ++++--
 .../mod/lesson/providers/prefetch-handler.ts  | 19 +++++--
 .../mod/page/providers/prefetch-handler.ts    | 15 ++++--
 .../mod/quiz/providers/prefetch-handler.ts    | 22 ++++++---
 .../resource/providers/prefetch-handler.ts    | 15 ++++--
 .../mod/scorm/providers/prefetch-handler.ts   | 19 +++++--
 .../mod/survey/providers/prefetch-handler.ts  | 18 +++++--
 .../mod/wiki/providers/prefetch-handler.ts    | 22 ++++++---
 .../workshop/providers/prefetch-handler.ts    |  4 +-
 .../classes/activity-prefetch-handler.ts      |  3 +-
 .../course/classes/module-prefetch-handler.ts | 12 +++--
 .../classes/resource-prefetch-handler.ts      |  2 +
 src/core/course/providers/helper.ts           | 35 +++++++++----
 src/core/filter/providers/helper.ts           |  1 +
 .../handlers/module-prefetch-handler.ts       | 20 ++++++--
 src/core/siteplugins/providers/helper.ts      | 49 +++++++++++++------
 27 files changed, 313 insertions(+), 114 deletions(-)

diff --git a/src/addon/competency/providers/course-option-handler.ts b/src/addon/competency/providers/course-option-handler.ts
index 32a6fd51d..c38c2fd2a 100644
--- a/src/addon/competency/providers/course-option-handler.ts
+++ b/src/addon/competency/providers/course-option-handler.ts
@@ -17,6 +17,7 @@ import { CoreCourseOptionsHandler, CoreCourseOptionsHandlerData } from '@core/co
 import { CoreCourseProvider } from '@core/course/providers/course';
 import { AddonCompetencyCourseComponent } from '../components/course/course';
 import { AddonCompetencyProvider } from '../providers/competency';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Course nav handler.
@@ -26,7 +27,7 @@ export class AddonCompetencyCourseOptionHandler implements CoreCourseOptionsHand
     name = 'AddonCompetency';
     priority = 300;
 
-    constructor(private competencyProvider: AddonCompetencyProvider) {}
+    constructor(private competencyProvider: AddonCompetencyProvider, protected filterHelper: CoreFilterHelperProvider) {}
 
     /**
      * Whether or not the handler is enabled ona site level.
@@ -110,6 +111,18 @@ export class AddonCompetencyCourseOptionHandler implements CoreCourseOptionsHand
 
                     promises.push(this.competencyProvider.getCompetencySummary(competency.competency.id, undefined, undefined,
                             true));
+
+                    if (competency.coursemodules) {
+                        competency.coursemodules.forEach((module) => {
+                            promises.push(this.filterHelper.getFilters('module', module.id, {courseId: course.id}));
+                        });
+                    }
+
+                    if (competency.plans) {
+                        competency.plans.forEach((plan) => {
+                            promises.push(this.filterHelper.getFilters('user', plan.userid));
+                        });
+                    }
                 });
             }
 
diff --git a/src/addon/mod/assign/providers/prefetch-handler.ts b/src/addon/mod/assign/providers/prefetch-handler.ts
index 67d1fdfbf..9552032af 100644
--- a/src/addon/mod/assign/providers/prefetch-handler.ts
+++ b/src/addon/mod/assign/providers/prefetch-handler.ts
@@ -31,6 +31,7 @@ import { AddonModAssignHelperProvider, AddonModAssignSubmissionFormatted } from
 import { AddonModAssignSyncProvider } from './assign-sync';
 import { AddonModAssignFeedbackDelegate } from './feedback-delegate';
 import { AddonModAssignSubmissionDelegate } from './submission-delegate';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to prefetch assigns.
@@ -42,16 +43,26 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
     component = AddonModAssignProvider.COMPONENT;
     updatesNames = /^configuration$|^.*files$|^submissions$|^grades$|^gradeitems$|^outcomes$|^comments$/;
 
-    constructor(translate: TranslateService, appProvider: CoreAppProvider, utils: CoreUtilsProvider,
-            courseProvider: CoreCourseProvider, filepoolProvider: CoreFilepoolProvider, sitesProvider: CoreSitesProvider,
-            domUtils: CoreDomUtilsProvider, protected assignProvider: AddonModAssignProvider,
-            protected textUtils: CoreTextUtilsProvider, protected feedbackDelegate: AddonModAssignFeedbackDelegate,
-            protected submissionDelegate: AddonModAssignSubmissionDelegate, protected courseHelper: CoreCourseHelperProvider,
-            protected groupsProvider: CoreGroupsProvider, protected gradesHelper: CoreGradesHelperProvider,
-            protected userProvider: CoreUserProvider, protected assignHelper: AddonModAssignHelperProvider,
+    constructor(translate: TranslateService,
+            appProvider: CoreAppProvider,
+            utils: CoreUtilsProvider,
+            courseProvider: CoreCourseProvider,
+            filepoolProvider: CoreFilepoolProvider,
+            sitesProvider: CoreSitesProvider,
+            domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
+            protected assignProvider: AddonModAssignProvider,
+            protected textUtils: CoreTextUtilsProvider,
+            protected feedbackDelegate: AddonModAssignFeedbackDelegate,
+            protected submissionDelegate: AddonModAssignSubmissionDelegate,
+            protected courseHelper: CoreCourseHelperProvider,
+            protected groupsProvider: CoreGroupsProvider,
+            protected gradesHelper: CoreGradesHelperProvider,
+            protected userProvider: CoreUserProvider,
+            protected assignHelper: AddonModAssignHelperProvider,
             protected syncProvider: AddonModAssignSyncProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
 
     /**
diff --git a/src/addon/mod/book/providers/prefetch-handler.ts b/src/addon/mod/book/providers/prefetch-handler.ts
index 8a852e4f3..22c6bf8bb 100644
--- a/src/addon/mod/book/providers/prefetch-handler.ts
+++ b/src/addon/mod/book/providers/prefetch-handler.ts
@@ -22,6 +22,7 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseResourcePrefetchHandlerBase } from '@core/course/classes/resource-prefetch-handler';
 import { AddonModBookProvider } from './book';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to prefetch books.
@@ -33,11 +34,17 @@ export class AddonModBookPrefetchHandler extends CoreCourseResourcePrefetchHandl
     component = AddonModBookProvider.COMPONENT;
     updatesNames = /^configuration$|^.*files$|^entries$/;
 
-    constructor(translate: TranslateService, appProvider: CoreAppProvider, utils: CoreUtilsProvider,
-            courseProvider: CoreCourseProvider, filepoolProvider: CoreFilepoolProvider, sitesProvider: CoreSitesProvider,
-            domUtils: CoreDomUtilsProvider, protected bookProvider: AddonModBookProvider) {
+    constructor(translate: TranslateService,
+            appProvider: CoreAppProvider,
+            utils: CoreUtilsProvider,
+            courseProvider: CoreCourseProvider,
+            filepoolProvider: CoreFilepoolProvider,
+            sitesProvider: CoreSitesProvider,
+            domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
+            protected bookProvider: AddonModBookProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
 
     /**
diff --git a/src/addon/mod/chat/providers/prefetch-handler.ts b/src/addon/mod/chat/providers/prefetch-handler.ts
index 1e7d12ff1..556d34982 100644
--- a/src/addon/mod/chat/providers/prefetch-handler.ts
+++ b/src/addon/mod/chat/providers/prefetch-handler.ts
@@ -24,6 +24,7 @@ import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/activity-prefetch-handler';
 import { CoreUserProvider } from '@core/user/providers/user';
 import { AddonModChatProvider, AddonModChatChat } from './chat';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to prefetch chats.
@@ -41,11 +42,12 @@ export class AddonModChatPrefetchHandler extends CoreCourseActivityPrefetchHandl
             filepoolProvider: CoreFilepoolProvider,
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
             private groupsProvider: CoreGroupsProvider,
             private userProvider: CoreUserProvider,
             private chatProvider: AddonModChatProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
 
     /**
diff --git a/src/addon/mod/choice/providers/prefetch-handler.ts b/src/addon/mod/choice/providers/prefetch-handler.ts
index b5757d410..cbe113b6a 100644
--- a/src/addon/mod/choice/providers/prefetch-handler.ts
+++ b/src/addon/mod/choice/providers/prefetch-handler.ts
@@ -24,6 +24,7 @@ import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/acti
 import { CoreUserProvider } from '@core/user/providers/user';
 import { AddonModChoiceSyncProvider } from './sync';
 import { AddonModChoiceProvider } from './choice';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to prefetch choices.
@@ -37,12 +38,19 @@ export class AddonModChoicePrefetchHandler extends CoreCourseActivityPrefetchHan
 
     protected syncProvider: AddonModChoiceSyncProvider; // It will be injected later to prevent circular dependencies.
 
-    constructor(translate: TranslateService, appProvider: CoreAppProvider, utils: CoreUtilsProvider,
-            courseProvider: CoreCourseProvider, filepoolProvider: CoreFilepoolProvider, sitesProvider: CoreSitesProvider,
-            domUtils: CoreDomUtilsProvider, protected choiceProvider: AddonModChoiceProvider,
-            protected userProvider: CoreUserProvider, protected injector: Injector) {
+    constructor(translate: TranslateService,
+            appProvider: CoreAppProvider,
+            utils: CoreUtilsProvider,
+            courseProvider: CoreCourseProvider,
+            filepoolProvider: CoreFilepoolProvider,
+            sitesProvider: CoreSitesProvider,
+            domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
+            protected choiceProvider: AddonModChoiceProvider,
+            protected userProvider: CoreUserProvider,
+            protected injector: Injector) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
 
     /**
diff --git a/src/addon/mod/data/providers/prefetch-handler.ts b/src/addon/mod/data/providers/prefetch-handler.ts
index f44165df2..631599d5b 100644
--- a/src/addon/mod/data/providers/prefetch-handler.ts
+++ b/src/addon/mod/data/providers/prefetch-handler.ts
@@ -27,6 +27,7 @@ import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/acti
 import { AddonModDataProvider, AddonModDataEntry } from './data';
 import { AddonModDataSyncProvider } from './sync';
 import { AddonModDataHelperProvider } from './helper';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to prefetch databases.
@@ -38,14 +39,22 @@ export class AddonModDataPrefetchHandler extends CoreCourseActivityPrefetchHandl
     component = AddonModDataProvider.COMPONENT;
     updatesNames = /^configuration$|^.*files$|^entries$|^gradeitems$|^outcomes$|^comments$|^ratings/;
 
-    constructor(translate: TranslateService, appProvider: CoreAppProvider, utils: CoreUtilsProvider,
-            courseProvider: CoreCourseProvider, filepoolProvider: CoreFilepoolProvider, sitesProvider: CoreSitesProvider,
-            domUtils: CoreDomUtilsProvider, protected dataProvider: AddonModDataProvider,
-            protected timeUtils: CoreTimeUtilsProvider, protected dataHelper: AddonModDataHelperProvider,
-            protected groupsProvider: CoreGroupsProvider, protected commentsProvider: CoreCommentsProvider,
+    constructor(translate: TranslateService,
+            appProvider: CoreAppProvider,
+            utils: CoreUtilsProvider,
+            courseProvider: CoreCourseProvider,
+            filepoolProvider: CoreFilepoolProvider,
+            sitesProvider: CoreSitesProvider,
+            domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
+            protected dataProvider: AddonModDataProvider,
+            protected timeUtils: CoreTimeUtilsProvider,
+            protected dataHelper: AddonModDataHelperProvider,
+            protected groupsProvider: CoreGroupsProvider,
+            protected commentsProvider: CoreCommentsProvider,
             protected syncProvider: AddonModDataSyncProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
 
     /**
diff --git a/src/addon/mod/feedback/providers/prefetch-handler.ts b/src/addon/mod/feedback/providers/prefetch-handler.ts
index d4c7edfcf..2aed13f52 100644
--- a/src/addon/mod/feedback/providers/prefetch-handler.ts
+++ b/src/addon/mod/feedback/providers/prefetch-handler.ts
@@ -26,6 +26,7 @@ import { AddonModFeedbackHelperProvider } from './helper';
 import { CoreTimeUtilsProvider } from '@providers/utils/time';
 import { CoreGroupsProvider } from '@providers/groups';
 import { AddonModFeedbackSyncProvider } from './sync';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to prefetch feedbacks.
@@ -39,14 +40,21 @@ export class AddonModFeedbackPrefetchHandler extends CoreCourseActivityPrefetchH
 
     protected syncProvider: AddonModFeedbackSyncProvider; // It will be injected later to prevent circular dependencies.
 
-    constructor(translate: TranslateService, appProvider: CoreAppProvider, utils: CoreUtilsProvider,
-            courseProvider: CoreCourseProvider, filepoolProvider: CoreFilepoolProvider, sitesProvider: CoreSitesProvider,
-            domUtils: CoreDomUtilsProvider, protected feedbackProvider: AddonModFeedbackProvider,
+    constructor(translate: TranslateService,
+            appProvider: CoreAppProvider,
+            utils: CoreUtilsProvider,
+            courseProvider: CoreCourseProvider,
+            filepoolProvider: CoreFilepoolProvider,
+            sitesProvider: CoreSitesProvider,
+            domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
+            protected feedbackProvider: AddonModFeedbackProvider,
             protected feedbackHelper: AddonModFeedbackHelperProvider,
-            protected timeUtils: CoreTimeUtilsProvider, protected groupsProvider: CoreGroupsProvider,
+            protected timeUtils: CoreTimeUtilsProvider,
+            protected groupsProvider: CoreGroupsProvider,
             protected injector: Injector) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
 
     /**
diff --git a/src/addon/mod/folder/providers/prefetch-handler.ts b/src/addon/mod/folder/providers/prefetch-handler.ts
index 9e0f226d0..3ad1f329e 100644
--- a/src/addon/mod/folder/providers/prefetch-handler.ts
+++ b/src/addon/mod/folder/providers/prefetch-handler.ts
@@ -22,6 +22,7 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseResourcePrefetchHandlerBase } from '@core/course/classes/resource-prefetch-handler';
 import { AddonModFolderProvider } from './folder';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to prefetch folders.
@@ -32,11 +33,17 @@ export class AddonModFolderPrefetchHandler extends CoreCourseResourcePrefetchHan
     modName = 'folder';
     component = AddonModFolderProvider.COMPONENT;
 
-    constructor(translate: TranslateService, appProvider: CoreAppProvider, utils: CoreUtilsProvider,
-            courseProvider: CoreCourseProvider, filepoolProvider: CoreFilepoolProvider, sitesProvider: CoreSitesProvider,
-            domUtils: CoreDomUtilsProvider, protected folderProvider: AddonModFolderProvider) {
+    constructor(translate: TranslateService,
+            appProvider: CoreAppProvider,
+            utils: CoreUtilsProvider,
+            courseProvider: CoreCourseProvider,
+            filepoolProvider: CoreFilepoolProvider,
+            sitesProvider: CoreSitesProvider,
+            domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
+            protected folderProvider: AddonModFolderProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
 
     /**
diff --git a/src/addon/mod/forum/providers/prefetch-handler.ts b/src/addon/mod/forum/providers/prefetch-handler.ts
index a8cf9d540..f9ab412c2 100644
--- a/src/addon/mod/forum/providers/prefetch-handler.ts
+++ b/src/addon/mod/forum/providers/prefetch-handler.ts
@@ -25,6 +25,7 @@ import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/acti
 import { CoreGroupsProvider } from '@providers/groups';
 import { AddonModForumProvider } from './forum';
 import { AddonModForumSyncProvider } from './sync';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to prefetch forums.
@@ -43,12 +44,13 @@ export class AddonModForumPrefetchHandler extends CoreCourseActivityPrefetchHand
             filepoolProvider: CoreFilepoolProvider,
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
             private userProvider: CoreUserProvider,
             private groupsProvider: CoreGroupsProvider,
             private forumProvider: AddonModForumProvider,
             private syncProvider: AddonModForumSyncProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
 
     /**
diff --git a/src/addon/mod/glossary/providers/prefetch-handler.ts b/src/addon/mod/glossary/providers/prefetch-handler.ts
index 2ce18b053..b087762ac 100644
--- a/src/addon/mod/glossary/providers/prefetch-handler.ts
+++ b/src/addon/mod/glossary/providers/prefetch-handler.ts
@@ -23,6 +23,7 @@ import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/activity-prefetch-handler';
 import { AddonModGlossaryProvider } from './glossary';
 import { AddonModGlossarySyncProvider } from './sync';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to prefetch forums.
@@ -41,10 +42,11 @@ export class AddonModGlossaryPrefetchHandler extends CoreCourseActivityPrefetchH
             filepoolProvider: CoreFilepoolProvider,
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
             private glossaryProvider: AddonModGlossaryProvider,
             private syncProvider: AddonModGlossarySyncProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
 
     /**
diff --git a/src/addon/mod/imscp/providers/prefetch-handler.ts b/src/addon/mod/imscp/providers/prefetch-handler.ts
index 22b793f0c..0b9c5b57e 100644
--- a/src/addon/mod/imscp/providers/prefetch-handler.ts
+++ b/src/addon/mod/imscp/providers/prefetch-handler.ts
@@ -22,6 +22,7 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseResourcePrefetchHandlerBase } from '@core/course/classes/resource-prefetch-handler';
 import { AddonModImscpProvider } from './imscp';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to prefetch IMSCPs.
@@ -32,11 +33,17 @@ export class AddonModImscpPrefetchHandler extends CoreCourseResourcePrefetchHand
     modName = 'imscp';
     component = AddonModImscpProvider.COMPONENT;
 
-    constructor(translate: TranslateService, appProvider: CoreAppProvider, utils: CoreUtilsProvider,
-            courseProvider: CoreCourseProvider, filepoolProvider: CoreFilepoolProvider, sitesProvider: CoreSitesProvider,
-            domUtils: CoreDomUtilsProvider, protected imscpProvider: AddonModImscpProvider) {
+    constructor(translate: TranslateService,
+            appProvider: CoreAppProvider,
+            utils: CoreUtilsProvider,
+            courseProvider: CoreCourseProvider,
+            filepoolProvider: CoreFilepoolProvider,
+            sitesProvider: CoreSitesProvider,
+            domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
+            protected imscpProvider: AddonModImscpProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
 
     /**
diff --git a/src/addon/mod/label/providers/prefetch-handler.ts b/src/addon/mod/label/providers/prefetch-handler.ts
index d9679a430..140c23538 100644
--- a/src/addon/mod/label/providers/prefetch-handler.ts
+++ b/src/addon/mod/label/providers/prefetch-handler.ts
@@ -22,6 +22,7 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseResourcePrefetchHandlerBase } from '@core/course/classes/resource-prefetch-handler';
 import { AddonModLabelProvider } from './label';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to prefetch labels.
@@ -34,11 +35,17 @@ export class AddonModLabelPrefetchHandler extends CoreCourseResourcePrefetchHand
     updatesNames = /^.*files$/;
     skipListStatus = true;
 
-    constructor(translate: TranslateService, appProvider: CoreAppProvider, utils: CoreUtilsProvider,
-            courseProvider: CoreCourseProvider, filepoolProvider: CoreFilepoolProvider, sitesProvider: CoreSitesProvider,
-            domUtils: CoreDomUtilsProvider, protected labelProvider: AddonModLabelProvider) {
+    constructor(translate: TranslateService,
+            appProvider: CoreAppProvider,
+            utils: CoreUtilsProvider,
+            courseProvider: CoreCourseProvider,
+            filepoolProvider: CoreFilepoolProvider,
+            sitesProvider: CoreSitesProvider,
+            domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
+            protected labelProvider: AddonModLabelProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
 
     /**
diff --git a/src/addon/mod/lesson/providers/prefetch-handler.ts b/src/addon/mod/lesson/providers/prefetch-handler.ts
index b424edf92..834845d47 100644
--- a/src/addon/mod/lesson/providers/prefetch-handler.ts
+++ b/src/addon/mod/lesson/providers/prefetch-handler.ts
@@ -25,6 +25,7 @@ import { CoreGroupsProvider } from '@providers/groups';
 import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/activity-prefetch-handler';
 import { AddonModLessonProvider } from './lesson';
 import { AddonModLessonSyncProvider } from './lesson-sync';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to prefetch lessons.
@@ -39,12 +40,20 @@ export class AddonModLessonPrefetchHandler extends CoreCourseActivityPrefetchHan
 
     protected syncProvider: AddonModLessonSyncProvider; // It will be injected later to prevent circular dependencies.
 
-    constructor(translate: TranslateService, appProvider: CoreAppProvider, utils: CoreUtilsProvider,
-            courseProvider: CoreCourseProvider, filepoolProvider: CoreFilepoolProvider, sitesProvider: CoreSitesProvider,
-            domUtils: CoreDomUtilsProvider, protected modalCtrl: ModalController, protected groupsProvider: CoreGroupsProvider,
-            protected lessonProvider: AddonModLessonProvider, protected injector: Injector) {
+    constructor(translate: TranslateService,
+            appProvider: CoreAppProvider,
+            utils: CoreUtilsProvider,
+            courseProvider: CoreCourseProvider,
+            filepoolProvider: CoreFilepoolProvider,
+            sitesProvider: CoreSitesProvider,
+            domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
+            protected modalCtrl: ModalController,
+            protected groupsProvider: CoreGroupsProvider,
+            protected lessonProvider: AddonModLessonProvider,
+            protected injector: Injector) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
 
     /**
diff --git a/src/addon/mod/page/providers/prefetch-handler.ts b/src/addon/mod/page/providers/prefetch-handler.ts
index 5c37eebef..982b1d45b 100644
--- a/src/addon/mod/page/providers/prefetch-handler.ts
+++ b/src/addon/mod/page/providers/prefetch-handler.ts
@@ -23,6 +23,7 @@ import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseResourcePrefetchHandlerBase } from '@core/course/classes/resource-prefetch-handler';
 import { AddonModPageProvider } from './page';
 import { AddonModPageHelperProvider } from './helper';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to prefetch pages.
@@ -34,12 +35,18 @@ export class AddonModPagePrefetchHandler extends CoreCourseResourcePrefetchHandl
     component = AddonModPageProvider.COMPONENT;
     updatesNames = /^configuration$|^.*files$/;
 
-    constructor(translate: TranslateService, appProvider: CoreAppProvider, utils: CoreUtilsProvider,
-            courseProvider: CoreCourseProvider, filepoolProvider: CoreFilepoolProvider, sitesProvider: CoreSitesProvider,
-            domUtils: CoreDomUtilsProvider, protected pageProvider: AddonModPageProvider,
+    constructor(translate: TranslateService,
+            appProvider: CoreAppProvider,
+            utils: CoreUtilsProvider,
+            courseProvider: CoreCourseProvider,
+            filepoolProvider: CoreFilepoolProvider,
+            sitesProvider: CoreSitesProvider,
+            domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
+            protected pageProvider: AddonModPageProvider,
             protected pageHelper: AddonModPageHelperProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
 
     /**
diff --git a/src/addon/mod/quiz/providers/prefetch-handler.ts b/src/addon/mod/quiz/providers/prefetch-handler.ts
index 4801db409..1874ce516 100644
--- a/src/addon/mod/quiz/providers/prefetch-handler.ts
+++ b/src/addon/mod/quiz/providers/prefetch-handler.ts
@@ -28,6 +28,7 @@ import { AddonModQuizHelperProvider } from './helper';
 import { AddonModQuizAccessRuleDelegate } from './access-rules-delegate';
 import { AddonModQuizSyncProvider } from './quiz-sync';
 import { CoreConstants } from '@core/constants';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to prefetch quizzes.
@@ -41,13 +42,22 @@ export class AddonModQuizPrefetchHandler extends CoreCourseActivityPrefetchHandl
 
     protected syncProvider: AddonModQuizSyncProvider; // It will be injected later to prevent circular dependencies.
 
-    constructor(translate: TranslateService, appProvider: CoreAppProvider, utils: CoreUtilsProvider,
-            courseProvider: CoreCourseProvider, filepoolProvider: CoreFilepoolProvider, sitesProvider: CoreSitesProvider,
-            domUtils: CoreDomUtilsProvider, protected injector: Injector, protected quizProvider: AddonModQuizProvider,
-            protected textUtils: CoreTextUtilsProvider, protected quizHelper: AddonModQuizHelperProvider,
-            protected accessRuleDelegate: AddonModQuizAccessRuleDelegate, protected questionHelper: CoreQuestionHelperProvider) {
+    constructor(translate: TranslateService,
+            appProvider: CoreAppProvider,
+            utils: CoreUtilsProvider,
+            courseProvider: CoreCourseProvider,
+            filepoolProvider: CoreFilepoolProvider,
+            sitesProvider: CoreSitesProvider,
+            domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
+            protected injector: Injector,
+            protected quizProvider: AddonModQuizProvider,
+            protected textUtils: CoreTextUtilsProvider,
+            protected quizHelper: AddonModQuizHelperProvider,
+            protected accessRuleDelegate: AddonModQuizAccessRuleDelegate,
+            protected questionHelper: CoreQuestionHelperProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
 
     /**
diff --git a/src/addon/mod/resource/providers/prefetch-handler.ts b/src/addon/mod/resource/providers/prefetch-handler.ts
index 94a946ae4..2f9bb6215 100644
--- a/src/addon/mod/resource/providers/prefetch-handler.ts
+++ b/src/addon/mod/resource/providers/prefetch-handler.ts
@@ -24,6 +24,7 @@ import { CoreCourseResourcePrefetchHandlerBase } from '@core/course/classes/reso
 import { AddonModResourceProvider } from './resource';
 import { AddonModResourceHelperProvider } from './helper';
 import { CoreConstants } from '@core/constants';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to prefetch resources.
@@ -34,12 +35,18 @@ export class AddonModResourcePrefetchHandler extends CoreCourseResourcePrefetchH
     modName = 'resource';
     component = AddonModResourceProvider.COMPONENT;
 
-    constructor(translate: TranslateService, appProvider: CoreAppProvider, utils: CoreUtilsProvider,
-            courseProvider: CoreCourseProvider, filepoolProvider: CoreFilepoolProvider, sitesProvider: CoreSitesProvider,
-            domUtils: CoreDomUtilsProvider, protected resourceProvider: AddonModResourceProvider,
+    constructor(translate: TranslateService,
+            appProvider: CoreAppProvider,
+            utils: CoreUtilsProvider,
+            courseProvider: CoreCourseProvider,
+            filepoolProvider: CoreFilepoolProvider,
+            sitesProvider: CoreSitesProvider,
+            domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
+            protected resourceProvider: AddonModResourceProvider,
             protected resourceHelper: AddonModResourceHelperProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
 
     /**
diff --git a/src/addon/mod/scorm/providers/prefetch-handler.ts b/src/addon/mod/scorm/providers/prefetch-handler.ts
index 8195d4789..fd2d34b6e 100644
--- a/src/addon/mod/scorm/providers/prefetch-handler.ts
+++ b/src/addon/mod/scorm/providers/prefetch-handler.ts
@@ -25,6 +25,7 @@ import { CoreTextUtilsProvider } from '@providers/utils/text';
 import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/activity-prefetch-handler';
 import { AddonModScormProvider } from './scorm';
 import { AddonModScormSyncProvider } from './scorm-sync';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Progress event used when downloading a SCORM.
@@ -58,12 +59,20 @@ export class AddonModScormPrefetchHandler extends CoreCourseActivityPrefetchHand
 
     protected syncProvider: AddonModScormSyncProvider; // It will be injected later to prevent circular dependencies.
 
-    constructor(translate: TranslateService, appProvider: CoreAppProvider, utils: CoreUtilsProvider,
-            courseProvider: CoreCourseProvider, filepoolProvider: CoreFilepoolProvider, sitesProvider: CoreSitesProvider,
-            domUtils: CoreDomUtilsProvider, protected fileProvider: CoreFileProvider, protected textUtils: CoreTextUtilsProvider,
-             protected scormProvider: AddonModScormProvider, protected injector: Injector) {
+    constructor(translate: TranslateService,
+            appProvider: CoreAppProvider,
+            utils: CoreUtilsProvider,
+            courseProvider: CoreCourseProvider,
+            filepoolProvider: CoreFilepoolProvider,
+            sitesProvider: CoreSitesProvider,
+            domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
+            protected fileProvider: CoreFileProvider,
+            protected textUtils: CoreTextUtilsProvider,
+            protected scormProvider: AddonModScormProvider,
+            protected injector: Injector) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
 
     /**
diff --git a/src/addon/mod/survey/providers/prefetch-handler.ts b/src/addon/mod/survey/providers/prefetch-handler.ts
index 175825ab5..faa894364 100644
--- a/src/addon/mod/survey/providers/prefetch-handler.ts
+++ b/src/addon/mod/survey/providers/prefetch-handler.ts
@@ -24,6 +24,7 @@ import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/acti
 import { AddonModSurveyProvider } from './survey';
 import { AddonModSurveySyncProvider } from './sync';
 import { AddonModSurveyHelperProvider } from './helper';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to prefetch surveys.
@@ -37,12 +38,19 @@ export class AddonModSurveyPrefetchHandler extends CoreCourseActivityPrefetchHan
 
     protected syncProvider: AddonModSurveySyncProvider; // It will be injected later to prevent circular dependencies.
 
-    constructor(translate: TranslateService, appProvider: CoreAppProvider, utils: CoreUtilsProvider,
-            courseProvider: CoreCourseProvider, filepoolProvider: CoreFilepoolProvider, sitesProvider: CoreSitesProvider,
-            domUtils: CoreDomUtilsProvider, protected surveyProvider: AddonModSurveyProvider,
-            protected surveyHelper: AddonModSurveyHelperProvider, protected injector: Injector) {
+    constructor(translate: TranslateService,
+            appProvider: CoreAppProvider,
+            utils: CoreUtilsProvider,
+            courseProvider: CoreCourseProvider,
+            filepoolProvider: CoreFilepoolProvider,
+            sitesProvider: CoreSitesProvider,
+            domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
+            protected surveyProvider: AddonModSurveyProvider,
+            protected surveyHelper: AddonModSurveyHelperProvider,
+            protected injector: Injector) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
 
     /**
diff --git a/src/addon/mod/wiki/providers/prefetch-handler.ts b/src/addon/mod/wiki/providers/prefetch-handler.ts
index d09fea4e4..918ad0441 100644
--- a/src/addon/mod/wiki/providers/prefetch-handler.ts
+++ b/src/addon/mod/wiki/providers/prefetch-handler.ts
@@ -28,6 +28,7 @@ import { CoreGradesHelperProvider } from '@core/grades/providers/helper';
 import { CoreUserProvider } from '@core/user/providers/user';
 import { AddonModWikiProvider } from './wiki';
 import { AddonModWikiSyncProvider } from './wiki-sync';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to prefetch wikis.
@@ -39,14 +40,23 @@ export class AddonModWikiPrefetchHandler extends CoreCourseActivityPrefetchHandl
     component = AddonModWikiProvider.COMPONENT;
     updatesNames = /^.*files$|^pages$/;
 
-    constructor(translate: TranslateService, appProvider: CoreAppProvider, utils: CoreUtilsProvider,
-            courseProvider: CoreCourseProvider, filepoolProvider: CoreFilepoolProvider, sitesProvider: CoreSitesProvider,
-            domUtils: CoreDomUtilsProvider, protected wikiProvider: AddonModWikiProvider, protected userProvider: CoreUserProvider,
-            protected textUtils: CoreTextUtilsProvider, protected courseHelper: CoreCourseHelperProvider,
-            protected groupsProvider: CoreGroupsProvider, protected gradesHelper: CoreGradesHelperProvider,
+    constructor(translate: TranslateService,
+            appProvider: CoreAppProvider,
+            utils: CoreUtilsProvider,
+            courseProvider: CoreCourseProvider,
+            filepoolProvider: CoreFilepoolProvider,
+            sitesProvider: CoreSitesProvider,
+            domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
+            protected wikiProvider: AddonModWikiProvider,
+            protected userProvider: CoreUserProvider,
+            protected textUtils: CoreTextUtilsProvider,
+            protected courseHelper: CoreCourseHelperProvider,
+            protected groupsProvider: CoreGroupsProvider,
+            protected gradesHelper: CoreGradesHelperProvider,
             protected syncProvider: AddonModWikiSyncProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
 
     /**
diff --git a/src/addon/mod/workshop/providers/prefetch-handler.ts b/src/addon/mod/workshop/providers/prefetch-handler.ts
index 940febd72..0b7b47eee 100644
--- a/src/addon/mod/workshop/providers/prefetch-handler.ts
+++ b/src/addon/mod/workshop/providers/prefetch-handler.ts
@@ -26,6 +26,7 @@ import { CoreUserProvider } from '@core/user/providers/user';
 import { AddonModWorkshopProvider } from './workshop';
 import { AddonModWorkshopSyncProvider } from './sync';
 import { AddonModWorkshopHelperProvider } from './helper';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to prefetch workshops.
@@ -45,13 +46,14 @@ export class AddonModWorkshopPrefetchHandler extends CoreCourseActivityPrefetchH
             filepoolProvider: CoreFilepoolProvider,
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
             private groupsProvider: CoreGroupsProvider,
             private userProvider: CoreUserProvider,
             private workshopProvider: AddonModWorkshopProvider,
             private workshopHelper: AddonModWorkshopHelperProvider,
             private syncProvider: AddonModWorkshopSyncProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
 
     /**
diff --git a/src/core/course/classes/activity-prefetch-handler.ts b/src/core/course/classes/activity-prefetch-handler.ts
index c98a702fc..b655979f6 100644
--- a/src/core/course/classes/activity-prefetch-handler.ts
+++ b/src/core/course/classes/activity-prefetch-handler.ts
@@ -101,10 +101,11 @@ export class CoreCourseActivityPrefetchHandlerBase extends CoreCourseModulePrefe
         }
 
         const prefetchPromise = this.setDownloading(module.id, siteId).then(() => {
-            // Package marked as downloading, get module info to be able to handle links.
+            // Package marked as downloading, get module info to be able to handle links. Get module filters too.
             return Promise.all([
                 this.courseProvider.getModuleBasicInfo(module.id, siteId),
                 this.courseProvider.getModule(module.id, courseId, undefined, false, true, siteId),
+                this.filterHelper.getFilters('module', module.id, {courseId: courseId})
             ]);
         }).then(() => {
             // Call the download function, send all the params except downloadFn. This includes all params passed after siteId.
diff --git a/src/core/course/classes/module-prefetch-handler.ts b/src/core/course/classes/module-prefetch-handler.ts
index 8173f615b..2e344104a 100644
--- a/src/core/course/classes/module-prefetch-handler.ts
+++ b/src/core/course/classes/module-prefetch-handler.ts
@@ -20,6 +20,7 @@ import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreCourseProvider } from '../providers/course';
 import { CoreCourseModulePrefetchHandler } from '../providers/module-prefetch-delegate';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Base prefetch handler to be registered in CoreCourseModulePrefetchDelegate. Prefetch handlers should inherit either
@@ -59,9 +60,14 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
      */
     protected downloadPromises: { [s: string]: { [s: string]: Promise<any> } } = {};
 
-    constructor(protected translate: TranslateService, protected appProvider: CoreAppProvider, protected utils: CoreUtilsProvider,
-            protected courseProvider: CoreCourseProvider, protected filepoolProvider: CoreFilepoolProvider,
-            protected sitesProvider: CoreSitesProvider, protected domUtils: CoreDomUtilsProvider) { }
+    constructor(protected translate: TranslateService,
+            protected appProvider: CoreAppProvider,
+            protected utils: CoreUtilsProvider,
+            protected courseProvider: CoreCourseProvider,
+            protected filepoolProvider: CoreFilepoolProvider,
+            protected sitesProvider: CoreSitesProvider,
+            protected domUtils: CoreDomUtilsProvider,
+            protected filterHelper: CoreFilterHelperProvider) { }
 
     /**
      * Add an ongoing download to the downloadPromises list. When the promise finishes it will be removed.
diff --git a/src/core/course/classes/resource-prefetch-handler.ts b/src/core/course/classes/resource-prefetch-handler.ts
index 2847d3e69..db7a3a568 100644
--- a/src/core/course/classes/resource-prefetch-handler.ts
+++ b/src/core/course/classes/resource-prefetch-handler.ts
@@ -87,6 +87,8 @@ export class CoreCourseResourcePrefetchHandlerBase extends CoreCourseModulePrefe
                 promises.push(downloadFn(siteId, files, this.component, module.id));
             }
 
+            promises.push(this.filterHelper.getFilters('module', module.id, {courseId: courseId}));
+
             return Promise.all(promises);
         });
 
diff --git a/src/core/course/providers/helper.ts b/src/core/course/providers/helper.ts
index 30b0e0dff..f4b2f8bcb 100644
--- a/src/core/course/providers/helper.ts
+++ b/src/core/course/providers/helper.ts
@@ -38,6 +38,7 @@ import { CoreConstants } from '@core/constants';
 import { CoreSite } from '@classes/site';
 import { CoreLoggerProvider } from '@providers/logger';
 import * as moment from 'moment';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Prefetch info of a module.
@@ -108,16 +109,28 @@ export class CoreCourseHelperProvider {
     protected courseDwnPromises: { [s: string]: { [id: number]: Promise<any> } } = {};
     protected logger;
 
-    constructor(private courseProvider: CoreCourseProvider, private domUtils: CoreDomUtilsProvider,
-            private moduleDelegate: CoreCourseModuleDelegate, private prefetchDelegate: CoreCourseModulePrefetchDelegate,
-            private filepoolProvider: CoreFilepoolProvider, private sitesProvider: CoreSitesProvider,
-            private textUtils: CoreTextUtilsProvider, private timeUtils: CoreTimeUtilsProvider,
-            private utils: CoreUtilsProvider, private translate: TranslateService, private loginHelper: CoreLoginHelperProvider,
-            private courseOptionsDelegate: CoreCourseOptionsDelegate, private siteHomeProvider: CoreSiteHomeProvider,
-            private eventsProvider: CoreEventsProvider, private fileHelper: CoreFileHelperProvider,
-            private appProvider: CoreAppProvider, private fileProvider: CoreFileProvider, private injector: Injector,
-            private coursesProvider: CoreCoursesProvider, private courseOffline: CoreCourseOfflineProvider,
-            loggerProvider: CoreLoggerProvider) {
+    constructor(private courseProvider: CoreCourseProvider,
+            private domUtils: CoreDomUtilsProvider,
+            private moduleDelegate: CoreCourseModuleDelegate,
+            private prefetchDelegate: CoreCourseModulePrefetchDelegate,
+            private filepoolProvider: CoreFilepoolProvider,
+            private sitesProvider: CoreSitesProvider,
+            private textUtils: CoreTextUtilsProvider,
+            private timeUtils: CoreTimeUtilsProvider,
+            private utils: CoreUtilsProvider,
+            private translate: TranslateService,
+            private loginHelper: CoreLoginHelperProvider,
+            private courseOptionsDelegate: CoreCourseOptionsDelegate,
+            private siteHomeProvider: CoreSiteHomeProvider,
+            private eventsProvider: CoreEventsProvider,
+            private fileHelper: CoreFileHelperProvider,
+            private appProvider: CoreAppProvider,
+            private fileProvider: CoreFileProvider,
+            private injector: Injector,
+            private coursesProvider: CoreCoursesProvider,
+            private courseOffline: CoreCourseOfflineProvider,
+            loggerProvider: CoreLoggerProvider,
+            private filterHelper: CoreFilterHelperProvider) {
 
         this.logger = loggerProvider.getInstance('CoreCourseHelperProvider');
     }
@@ -1270,6 +1283,8 @@ export class CoreCourseHelperProvider {
                 promises.push(this.courseProvider.getActivitiesCompletionStatus(course.id));
             }
 
+            promises.push(this.filterHelper.getFilters('course', course.id));
+
             return this.utils.allPromises(promises);
         }).then(() => {
             // Download success, mark the course as downloaded.
diff --git a/src/core/filter/providers/helper.ts b/src/core/filter/providers/helper.ts
index af7fbac1d..2b3a6704a 100644
--- a/src/core/filter/providers/helper.ts
+++ b/src/core/filter/providers/helper.ts
@@ -105,6 +105,7 @@ export class CoreFilterHelperProvider {
     getFilters(contextLevel: string, instanceId: number, options?: CoreFilterFormatTextOptions, siteId?: string)
             : Promise<CoreFilterFilter[]> {
 
+        options = options || {};
         options.contextLevel = contextLevel;
         options.instanceId = instanceId;
         options.filter = false;
diff --git a/src/core/siteplugins/classes/handlers/module-prefetch-handler.ts b/src/core/siteplugins/classes/handlers/module-prefetch-handler.ts
index 96ceb2db0..e2cc1d795 100644
--- a/src/core/siteplugins/classes/handlers/module-prefetch-handler.ts
+++ b/src/core/siteplugins/classes/handlers/module-prefetch-handler.ts
@@ -21,6 +21,7 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreSitePluginsProvider } from '../../providers/siteplugins';
 import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/activity-prefetch-handler';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 /**
  * Handler to prefetch a module site plugin.
@@ -30,12 +31,21 @@ export class CoreSitePluginsModulePrefetchHandler extends CoreCourseActivityPref
 
     protected isResource: boolean;
 
-    constructor(translate: TranslateService, appProvider: CoreAppProvider, utils: CoreUtilsProvider,
-            courseProvider: CoreCourseProvider, filepoolProvider: CoreFilepoolProvider, sitesProvider: CoreSitesProvider,
-            domUtils: CoreDomUtilsProvider, protected sitePluginsProvider: CoreSitePluginsProvider, component: string,
-            name: string, modName: string, protected handlerSchema: any) {
+    constructor(translate: TranslateService,
+            appProvider: CoreAppProvider,
+            utils: CoreUtilsProvider,
+            courseProvider: CoreCourseProvider,
+            filepoolProvider: CoreFilepoolProvider,
+            sitesProvider: CoreSitesProvider,
+            domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
+            protected sitePluginsProvider: CoreSitePluginsProvider,
+            component: string,
+            name: string,
+            modName: string,
+            protected handlerSchema: any) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
 
         this.component = component;
         this.name = name;
diff --git a/src/core/siteplugins/providers/helper.ts b/src/core/siteplugins/providers/helper.ts
index 5c992ff6f..d80bfe84b 100644
--- a/src/core/siteplugins/providers/helper.ts
+++ b/src/core/siteplugins/providers/helper.ts
@@ -31,6 +31,7 @@ import { CoreCompileProvider } from '@core/compile/providers/compile';
 import { CoreQuestionProvider } from '@core/question/providers/question';
 import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
 
 // Delegates
 import { CoreMainMenuDelegate } from '@core/mainmenu/providers/delegate';
@@ -84,21 +85,39 @@ export class CoreSitePluginsHelperProvider {
     protected logger;
     protected courseRestrictHandlers = {};
 
-    constructor(logger: CoreLoggerProvider, private sitesProvider: CoreSitesProvider, private domUtils: CoreDomUtilsProvider,
-            private mainMenuDelegate: CoreMainMenuDelegate, private moduleDelegate: CoreCourseModuleDelegate,
-            private userDelegate: CoreUserDelegate, private langProvider: CoreLangProvider, private http: Http,
-            private sitePluginsProvider: CoreSitePluginsProvider, private prefetchDelegate: CoreCourseModulePrefetchDelegate,
-            private compileProvider: CoreCompileProvider, private utils: CoreUtilsProvider, private urlUtils: CoreUrlUtilsProvider,
-            private courseOptionsDelegate: CoreCourseOptionsDelegate, private eventsProvider: CoreEventsProvider,
-            private courseFormatDelegate: CoreCourseFormatDelegate, private profileFieldDelegate: CoreUserProfileFieldDelegate,
-            private textUtils: CoreTextUtilsProvider, private filepoolProvider: CoreFilepoolProvider,
-            private settingsDelegate: CoreSettingsDelegate, private questionDelegate: CoreQuestionDelegate,
-            private questionBehaviourDelegate: CoreQuestionBehaviourDelegate, private questionProvider: CoreQuestionProvider,
-            private messageOutputDelegate: AddonMessageOutputDelegate, private accessRulesDelegate: AddonModQuizAccessRuleDelegate,
-            private assignSubmissionDelegate: AddonModAssignSubmissionDelegate, private translate: TranslateService,
-            private assignFeedbackDelegate: AddonModAssignFeedbackDelegate, private appProvider: CoreAppProvider,
+    constructor(logger: CoreLoggerProvider,
+            private sitesProvider: CoreSitesProvider,
+            private domUtils: CoreDomUtilsProvider,
+            private mainMenuDelegate: CoreMainMenuDelegate,
+            private moduleDelegate: CoreCourseModuleDelegate,
+            private userDelegate: CoreUserDelegate,
+            private langProvider: CoreLangProvider,
+            private http: Http,
+            private sitePluginsProvider: CoreSitePluginsProvider,
+            private prefetchDelegate: CoreCourseModulePrefetchDelegate,
+            private compileProvider: CoreCompileProvider,
+            private utils: CoreUtilsProvider,
+            private urlUtils: CoreUrlUtilsProvider,
+            private courseOptionsDelegate: CoreCourseOptionsDelegate,
+            private eventsProvider: CoreEventsProvider,
+            private courseFormatDelegate: CoreCourseFormatDelegate,
+            private profileFieldDelegate: CoreUserProfileFieldDelegate,
+            private textUtils: CoreTextUtilsProvider,
+            private filepoolProvider: CoreFilepoolProvider,
+            private settingsDelegate: CoreSettingsDelegate,
+            private questionDelegate: CoreQuestionDelegate,
+            private questionBehaviourDelegate: CoreQuestionBehaviourDelegate,
+            private questionProvider: CoreQuestionProvider,
+            private messageOutputDelegate: AddonMessageOutputDelegate,
+            private accessRulesDelegate: AddonModQuizAccessRuleDelegate,
+            private assignSubmissionDelegate: AddonModAssignSubmissionDelegate,
+            private translate: TranslateService,
+            private assignFeedbackDelegate: AddonModAssignFeedbackDelegate,
+            private appProvider: CoreAppProvider,
             private workshopAssessmentStrategyDelegate: AddonWorkshopAssessmentStrategyDelegate,
-            private courseProvider: CoreCourseProvider, private blockDelegate: CoreBlockDelegate) {
+            private courseProvider: CoreCourseProvider,
+            private blockDelegate: CoreBlockDelegate,
+            private filterHelper: CoreFilterHelperProvider) {
 
         this.logger = logger.getInstance('CoreSitePluginsHelperProvider');
 
@@ -820,7 +839,7 @@ export class CoreSitePluginsHelperProvider {
         if (handlerSchema.offlinefunctions && Object.keys(handlerSchema.offlinefunctions).length) {
             // Register the prefetch handler.
             this.prefetchDelegate.registerHandler(new CoreSitePluginsModulePrefetchHandler(this.translate, this.appProvider,
-                this.utils, this.courseProvider, this.filepoolProvider, this.sitesProvider, this.domUtils,
+                this.utils, this.courseProvider, this.filepoolProvider, this.sitesProvider, this.domUtils, this.filterHelper,
                 this.sitePluginsProvider, plugin.component, uniqueName, modName, handlerSchema));
         }
 

From 926e786688cfd1cea7d13ddb50001a31034a8fed Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 9 Oct 2019 15:02:53 +0200
Subject: [PATCH 075/257] MOBILE-2491 filter: Implement algebra filter

---
 src/addon/filter/algebra/algebra.module.ts    | 34 ++++++++++++++
 src/addon/filter/algebra/providers/handler.ts | 45 +++++++++++++++++++
 src/addon/filter/filter.module.ts             |  2 +
 3 files changed, 81 insertions(+)
 create mode 100644 src/addon/filter/algebra/algebra.module.ts
 create mode 100644 src/addon/filter/algebra/providers/handler.ts

diff --git a/src/addon/filter/algebra/algebra.module.ts b/src/addon/filter/algebra/algebra.module.ts
new file mode 100644
index 000000000..8b34d7afb
--- /dev/null
+++ b/src/addon/filter/algebra/algebra.module.ts
@@ -0,0 +1,34 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { IonicModule } from 'ionic-angular';
+import { CoreFilterDelegate } from '@core/filter/providers/delegate';
+import { AddonFilterAlgebraHandler } from './providers/handler';
+
+@NgModule({
+    declarations: [
+    ],
+    imports: [
+        IonicModule
+    ],
+    providers: [
+        AddonFilterAlgebraHandler
+    ]
+})
+export class AddonFilterAlgebraModule {
+    constructor(filterDelegate: CoreFilterDelegate, handler: AddonFilterAlgebraHandler) {
+        filterDelegate.registerHandler(handler);
+    }
+}
diff --git a/src/addon/filter/algebra/providers/handler.ts b/src/addon/filter/algebra/providers/handler.ts
new file mode 100644
index 000000000..5079ff659
--- /dev/null
+++ b/src/addon/filter/algebra/providers/handler.ts
@@ -0,0 +1,45 @@
+
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+import { CoreFilterFormatTextOptions } from '@core/filter/providers/filter';
+import { CoreSite } from '@classes/site';
+
+/**
+ * Handler to support the Algebra notation filter.
+ */
+@Injectable()
+export class AddonFilterAlgebraHandler extends CoreFilterDefaultHandler {
+    name = 'AddonFilterAlgebraHandler';
+    filterName = 'algebra';
+
+    constructor() {
+        super();
+
+        // This filter is handled by Moodle, nothing to do in the app.
+    }
+
+    /**
+     * Check if the filter should be applied in a certain site based on some filter options.
+     *
+     * @param options Options.
+     * @param site Site.
+     * @return Whether filter should be applied.
+     */
+    shouldBeApplied(options: CoreFilterFormatTextOptions, site?: CoreSite): boolean {
+        return false;
+    }
+}
diff --git a/src/addon/filter/filter.module.ts b/src/addon/filter/filter.module.ts
index 617f623c6..f2646d346 100644
--- a/src/addon/filter/filter.module.ts
+++ b/src/addon/filter/filter.module.ts
@@ -14,6 +14,7 @@
 
 import { NgModule } from '@angular/core';
 import { AddonFilterActivityNamesModule } from './activitynames/activitynames.module';
+import { AddonFilterAlgebraModule } from './algebra/algebra.module';
 import { AddonFilterCensorModule } from './censor/censor.module';
 import { AddonFilterDataModule } from './data/data.module';
 import { AddonFilterEmailProtectModule } from './emailprotect/emailprotect.module';
@@ -29,6 +30,7 @@ import { AddonFilterUrlToLinkModule } from './urltolink/urltolink.module';
     declarations: [],
     imports: [
         AddonFilterActivityNamesModule,
+        AddonFilterAlgebraModule,
         AddonFilterCensorModule,
         AddonFilterDataModule,
         AddonFilterEmailProtectModule,

From 85cd3a748a97cea91d8749e25a355d1687ce8aed Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 9 Oct 2019 15:08:13 +0200
Subject: [PATCH 076/257] MOBILE-2491 filter: Pass filter providers to compile

---
 src/core/compile/providers/compile.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/compile/providers/compile.ts b/src/core/compile/providers/compile.ts
index b394538b4..bbfc35f48 100644
--- a/src/core/compile/providers/compile.ts
+++ b/src/core/compile/providers/compile.ts
@@ -28,6 +28,7 @@ import { CORE_CONTENTLINKS_PROVIDERS } from '@core/contentlinks/contentlinks.mod
 import { CORE_COURSE_PROVIDERS } from '@core/course/course.module';
 import { CORE_COURSES_PROVIDERS } from '@core/courses/courses.module';
 import { CORE_FILEUPLOADER_PROVIDERS } from '@core/fileuploader/fileuploader.module';
+import { CORE_FILTER_PROVIDERS } from '@core/filter/filter.module';
 import { CORE_GRADES_PROVIDERS } from '@core/grades/grades.module';
 import { CORE_LOGIN_PROVIDERS } from '@core/login/login.module';
 import { CORE_MAINMENU_PROVIDERS } from '@core/mainmenu/mainmenu.module';
@@ -234,7 +235,8 @@ export class CoreCompileProvider {
                 .concat(ADDON_MOD_QUIZ_PROVIDERS).concat(ADDON_MOD_RESOURCE_PROVIDERS).concat(ADDON_MOD_SCORM_PROVIDERS)
                 .concat(ADDON_MOD_SURVEY_PROVIDERS).concat(ADDON_MOD_URL_PROVIDERS).concat(ADDON_MOD_WIKI_PROVIDERS)
                 .concat(ADDON_MOD_WORKSHOP_PROVIDERS).concat(ADDON_NOTES_PROVIDERS).concat(ADDON_NOTIFICATIONS_PROVIDERS)
-                .concat(CORE_PUSHNOTIFICATIONS_PROVIDERS).concat(ADDON_REMOTETHEMES_PROVIDERS).concat(CORE_BLOCK_PROVIDERS);
+                .concat(CORE_PUSHNOTIFICATIONS_PROVIDERS).concat(ADDON_REMOTETHEMES_PROVIDERS).concat(CORE_BLOCK_PROVIDERS)
+                .concat(CORE_FILTER_PROVIDERS);
 
         // We cannot inject anything to this constructor. Use the Injector to inject all the providers into the instance.
         for (const i in providers) {

From 601f5d76ad249a9c3bdad1fda6b34424fbaaf589 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 10 Oct 2019 10:11:05 +0200
Subject: [PATCH 077/257] MOBILE-3186 core: Update version to 3.8.0

---
 config.xml                              | 2 +-
 desktop/assets/windows/AppXManifest.xml | 2 +-
 package.json                            | 4 ++--
 src/config.json                         | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config.xml b/config.xml
index 2b57d9d63..63e92d9e3 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.moodle.moodlemobile" version="3.7.1" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.moodle.moodlemobile" version="3.8.0" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Moodle</name>
     <description>Moodle official app</description>
     <author email="mobile@moodle.com" href="http://moodle.com">Moodle Mobile team</author>
diff --git a/desktop/assets/windows/AppXManifest.xml b/desktop/assets/windows/AppXManifest.xml
index be1e56919..4923f504d 100644
--- a/desktop/assets/windows/AppXManifest.xml
+++ b/desktop/assets/windows/AppXManifest.xml
@@ -6,7 +6,7 @@
   <Identity Name="3312ADB7.MoodleDesktop"
     ProcessorArchitecture="x64"
     Publisher="CN=33CDCDF6-1EB5-4827-9897-ED25C91A32F6"
-    Version="3.7.1.0" />
+    Version="3.8.0.0" />
   <Properties>
     <DisplayName>Moodle Desktop</DisplayName>
     <PublisherDisplayName>Moodle Pty Ltd.</PublisherDisplayName>
diff --git a/package.json b/package.json
index b9ef3e13e..28931d637 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moodlemobile",
-  "version": "3.7.1",
+  "version": "3.8.0",
   "description": "The official app for Moodle.",
   "author": {
     "name": "Moodle Pty Ltd.",
@@ -222,7 +222,7 @@
       "category": "public.app-category.education",
       "icon": "resources/desktop/icon.icns",
       "target": "mas",
-      "bundleVersion": "3.7.0",
+      "bundleVersion": "3.8.0",
       "extendInfo": {
         "ElectronTeamID": "2NU57U5PAW"
       }
diff --git a/src/config.json b/src/config.json
index 4fd352e58..296416234 100644
--- a/src/config.json
+++ b/src/config.json
@@ -2,8 +2,8 @@
     "app_id": "com.moodle.moodlemobile",
     "appname": "Moodle Mobile",
     "desktopappname": "Moodle Desktop",
-    "versioncode": 3710,
-    "versionname": "3.7.1",
+    "versioncode": 3800,
+    "versionname": "3.8.0-dev",
     "cache_update_frequency_usually": 420000,
     "cache_update_frequency_often": 1200000,
     "cache_update_frequency_sometimes": 3600000,

From 8a57a0a590fd08dcfdc2d230c7a2795bd9cc6660 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 15 Oct 2019 11:45:21 +0200
Subject: [PATCH 078/257] MOBILE-3167 dashboard: Set fallback blocks visibility
 to true

---
 src/core/courses/pages/dashboard/dashboard.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/courses/pages/dashboard/dashboard.ts b/src/core/courses/pages/dashboard/dashboard.ts
index ac309713c..99ade84ca 100644
--- a/src/core/courses/pages/dashboard/dashboard.ts
+++ b/src/core/courses/pages/dashboard/dashboard.ts
@@ -236,10 +236,12 @@ export class CoreCoursesDashboardPage implements OnDestroy {
     protected loadFallbackBlocks(): void {
         this.blocks = [
             {
-                name: 'myoverview'
+                name: 'myoverview',
+                visible: true
             },
             {
-                name: 'timeline'
+                name: 'timeline',
+                visible: true
             }
         ];
     }

From 7365bc708c5107029b309672dbd296f58b2bd7b3 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 15 Oct 2019 15:22:29 +0200
Subject: [PATCH 079/257] MOBILE-3026 core: Fix plugin_not_installed error in
 iOS

---
 src/app/app.component.ts | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 439ce5867..a1d80d530 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -110,19 +110,21 @@ export class MoodleMobileApp implements OnInit {
             this.loginHelper.sitePolicyNotAgreed(data.siteId);
         });
 
-        // Refresh online status when changes.
-        this.network.onchange().subscribe(() => {
-            // Execute the callback in the Angular zone, so change detection doesn't stop working.
-            this.zone.run(() => {
-                const isOnline = this.appProvider.isOnline();
-                document.body.classList.toggle('core-offline', !isOnline);
-                document.body.classList.toggle('core-online', isOnline);
+        this.platform.ready().then(() => {
+            // Refresh online status when changes.
+            this.network.onchange().subscribe(() => {
+                // Execute the callback in the Angular zone, so change detection doesn't stop working.
+                this.zone.run(() => {
+                    const isOnline = this.appProvider.isOnline();
+                    document.body.classList.toggle('core-offline', !isOnline);
+                    document.body.classList.toggle('core-online', isOnline);
 
-                if (isOnline) {
-                    setTimeout(() => {
-                        document.body.classList.remove('core-online');
-                    }, 3000);
-                }
+                    if (isOnline) {
+                        setTimeout(() => {
+                            document.body.classList.remove('core-online');
+                        }, 3000);
+                    }
+                });
             });
         });
 

From 8bfb7aa2a9d40befef9d26418f4b4b8ab0311410 Mon Sep 17 00:00:00 2001
From: Mark Johnson <mark.johnson@open.ac.uk>
Date: Wed, 16 Oct 2019 11:51:53 +0100
Subject: [PATCH 080/257] MOBILE-3191 UX: Don't fold away tab bar on short
 pages

---
 src/components/tabs/tabs.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/tabs/tabs.ts b/src/components/tabs/tabs.ts
index f01de69d2..83c0ab146 100644
--- a/src/components/tabs/tabs.ts
+++ b/src/components/tabs/tabs.ts
@@ -447,7 +447,7 @@ export class CoreTabsComponent implements OnInit, AfterViewInit, OnChanges, OnDe
             this.calculateSlides();
         }
 
-        if (this.tabsShown) {
+        if (this.tabsShown && scrollElement.scrollHeight > scrollElement.clientHeight + this.tabBarHeight) {
             // Smooth translation.
             this.topTabsElement.style.transform = 'translateY(-' + scroll + 'px)';
             this.originalTabsContainer.style.transform = 'translateY(-' + scroll + 'px)';

From 7471f54f9c187d4091013c7dfc03c92bab791f59 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 17 Sep 2019 12:34:34 +0200
Subject: [PATCH 081/257] MOBILE-3163 core: Check site URL when treating
 pluginfile URLs

---
 src/classes/site.ts         |  4 ++--
 src/providers/utils/text.ts | 18 ++++++++++++++++++
 src/providers/utils/url.ts  |  4 ++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/classes/site.ts b/src/classes/site.ts
index d4988f66a..a038bb3e0 100644
--- a/src/classes/site.ts
+++ b/src/classes/site.ts
@@ -1404,8 +1404,8 @@ export class CoreSite {
             return false;
         }
 
-        const siteUrl = this.textUtils.removeEndingSlash(this.urlUtils.removeProtocolAndWWW(this.siteUrl));
-        url = this.urlUtils.removeProtocolAndWWW(url);
+        const siteUrl = this.textUtils.addEndingSlash(this.urlUtils.removeProtocolAndWWW(this.siteUrl));
+        url = this.textUtils.addEndingSlash(this.urlUtils.removeProtocolAndWWW(url));
 
         return url.indexOf(siteUrl) == 0;
     }
diff --git a/src/providers/utils/text.ts b/src/providers/utils/text.ts
index 9a244b6f7..4ba9574f1 100644
--- a/src/providers/utils/text.ts
+++ b/src/providers/utils/text.ts
@@ -75,6 +75,24 @@ export class CoreTextUtilsProvider {
     constructor(private translate: TranslateService, private langProvider: CoreLangProvider, private modalCtrl: ModalController,
             private sanitizer: DomSanitizer, private platform: Platform) { }
 
+    /**
+     * Add ending slash from a path or URL.
+     *
+     * @param {string} text Text to treat.
+     * @return {string} Treated text.
+     */
+    addEndingSlash(text: string): string {
+        if (!text) {
+            return '';
+        }
+
+        if (text.slice(-1) != '/') {
+            return text + '/';
+        }
+
+        return text;
+    }
+
     /**
      * Given an address as a string, return a URL to open the address in maps.
      *
diff --git a/src/providers/utils/url.ts b/src/providers/utils/url.ts
index ac85237d7..295d54ae7 100644
--- a/src/providers/utils/url.ts
+++ b/src/providers/utils/url.ts
@@ -121,8 +121,8 @@ export class CoreUrlUtilsProvider {
             return url;
         }
 
-        // Check if is a valid URL (contains the pluginfile endpoint).
-        if (!this.isPluginFileUrl(url)) {
+        // Check if is a valid URL (contains the pluginfile endpoint) and belongs to the site.
+        if (!this.isPluginFileUrl(url) || url.indexOf(this.textUtils.addEndingSlash(siteUrl)) !== 0) {
             return url;
         }
 

From 45a05c261c4344d1e8a780b66701b53c3b94c95b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 19 Sep 2019 09:34:00 +0200
Subject: [PATCH 082/257] MOBILE-3163 core: Remove Classic app warning

---
 src/assets/lang/en.json            |  7 ++----
 src/core/login/lang/en.json        |  7 ++----
 src/core/login/providers/helper.ts | 24 --------------------
 src/lang/en.json                   |  2 +-
 src/providers/sites.ts             | 35 +++++-------------------------
 5 files changed, 11 insertions(+), 64 deletions(-)

diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 064ce267d..c5e9e5631 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1568,7 +1568,7 @@
     "core.login.changepasswordhelp": "If you have problems changing your password, please contact your site administrator. \"Site Administrators\" are the people who manages the Moodle at your school/university/company or learning organisation. If you don't know how to contact them, please contact your teachers/trainers.",
     "core.login.changepasswordlogoutinstructions": "If you prefer to change site or log out, please click the following button:",
     "core.login.changepasswordreconnectinstructions": "Click the following button to reconnect to the site. (Take into account that if you didn't change your password successfully, you would return to the previous screen).",
-    "core.login.checksiteversion": "Check that your site uses Moodle 2.4 or later.",
+    "core.login.checksiteversion": "Check that your site uses Moodle 3.1 or later.",
     "core.login.confirmdeletesite": "Are you sure you want to delete the site {{sitename}}?",
     "core.login.connect": "Connect!",
     "core.login.connecttomoodle": "Connect to Moodle",
@@ -1598,15 +1598,12 @@
     "core.login.invalidaccount": "Please check your login details or ask your site administrator to check the site configuration.",
     "core.login.invaliddate": "Invalid date",
     "core.login.invalidemail": "Invalid email address",
-    "core.login.invalidmoodleversion": "Invalid Moodle version. The minimum version required is 2.4.",
+    "core.login.invalidmoodleversion": "Invalid Moodle version. The minimum version required is 3.1.",
     "core.login.invalidsite": "The site URL is invalid.",
     "core.login.invalidtime": "Invalid time",
     "core.login.invalidurl": "Invalid URL specified",
     "core.login.invalidvaluemax": "The maximum value is {{$a}}",
     "core.login.invalidvaluemin": "The minimum value is {{$a}}",
-    "core.login.legacymoodleversion": "You are trying to connect to an unsupported Moodle version. Please download the Moodle Classic app to access this Moodle site.",
-    "core.login.legacymoodleversiondesktop": "You are trying to connect to <b>{{$a}}</b>.<br><br>This site is running an outdated unsupported version of Moodle which will not work with this Moodle Desktop App.<br><br>If this is your site please contact your local moodle partner to get assistance to update it.<br><br>See <a href=\"https://moodle.com/contact\">our contact page</a> to submit a request for assistance.",
-    "core.login.legacymoodleversiondesktopdownloadold": "<br><br>Alternatively, you can still access this site using an unsupported version of the app that can be downloaded from here.",
     "core.login.localmobileunexpectedresponse": "Moodle Mobile Additional Features check returned an unexpected response. You will be authenticated using the standard mobile service.",
     "core.login.loggedoutssodescription": "You have to authenticate again. You need to log in to the site in a browser window.",
     "core.login.login": "Log in",
diff --git a/src/core/login/lang/en.json b/src/core/login/lang/en.json
index a33582b45..a3c443bc9 100644
--- a/src/core/login/lang/en.json
+++ b/src/core/login/lang/en.json
@@ -2,7 +2,7 @@
     "auth_email": "Email-based self-registration",
     "authenticating": "Authenticating",
     "cancel": "Cancel",
-    "checksiteversion": "Check that your site uses Moodle 2.4 or later.",
+    "checksiteversion": "Check that your site uses Moodle 3.1 or later.",
     "changepassword": "Change password",
     "changepasswordbutton": "Open the change password page",
     "changepasswordhelp": "If you have problems changing your password, please contact your site administrator. \"Site Administrators\" are the people who manages the Moodle at your school/university/company or learning organisation. If you don't know how to contact them, please contact your teachers/trainers.",
@@ -38,15 +38,12 @@
     "invalidaccount": "Please check your login details or ask your site administrator to check the site configuration.",
     "invaliddate": "Invalid date",
     "invalidemail": "Invalid email address",
-    "invalidmoodleversion": "Invalid Moodle version. The minimum version required is 2.4.",
+    "invalidmoodleversion": "Invalid Moodle version. The minimum version required is 3.1.",
     "invalidsite": "The site URL is invalid.",
     "invalidtime": "Invalid time",
     "invalidurl": "Invalid URL specified",
     "invalidvaluemax": "The maximum value is {{$a}}",
     "invalidvaluemin": "The minimum value is {{$a}}",
-    "legacymoodleversion": "You are trying to connect to an unsupported Moodle version. Please download the Moodle Classic app to access this Moodle site.",
-    "legacymoodleversiondesktop": "You are trying to connect to <b>{{$a}}</b>.<br><br>This site is running an outdated unsupported version of Moodle which will not work with this Moodle Desktop App.<br><br>If this is your site please contact your local moodle partner to get assistance to update it.<br><br>See <a href=\"https://moodle.com/contact\">our contact page</a> to submit a request for assistance.",
-    "legacymoodleversiondesktopdownloadold": "<br><br>Alternatively, you can still access this site using an unsupported version of the app that can be downloaded from here.",
     "localmobileunexpectedresponse": "Moodle Mobile Additional Features check returned an unexpected response. You will be authenticated using the standard mobile service.",
     "loggedoutssodescription": "You have to authenticate again. You need to log in to the site in a browser window.",
     "login": "Log in",
diff --git a/src/core/login/providers/helper.ts b/src/core/login/providers/helper.ts
index 428acfbb1..86ff47643 100644
--- a/src/core/login/providers/helper.ts
+++ b/src/core/login/providers/helper.ts
@@ -1055,28 +1055,6 @@ export class CoreLoginHelperProvider {
             (!CoreConfigConstants.skipssoconfirmation || String(CoreConfigConstants.skipssoconfirmation) === 'false');
     }
 
-    /**
-     * Show a modal warning the user that he should use the Classic app.
-     *
-     * @param message The warning message.
-     */
-    protected showLegacyNoticeModal(message: string): void {
-        let link;
-
-        if (this.appProvider.isWindows()) {
-            link = 'https://download.moodle.org/desktop/download.php?platform=windows&version=342';
-        } else if (this.appProvider.isLinux()) {
-            link = 'https://download.moodle.org/desktop/download.php?platform=linux&version=342&arch=' +
-                    (this.appProvider.is64Bits() ? '64' : '32');
-        } else if (this.platform.is('android')) {
-            link = 'market://details?id=com.moodle.classic';
-        } else if (this.platform.is('ios')) {
-            link = 'itms-apps://itunes.apple.com/app/id1403448117';
-        }
-
-        this.showDownloadAppNoticeModal(message, link);
-    }
-
     /**
      * Show a modal warning the user that he should use the Workplace app.
      *
@@ -1257,8 +1235,6 @@ export class CoreLoginHelperProvider {
             this.openChangePassword(siteUrl, this.textUtils.getErrorMessageFromError(error));
         } else if (error.errorcode == 'usernotconfirmed') {
             this.showNotConfirmedModal(siteUrl, undefined, username, password);
-        } else if (error.errorcode == 'legacymoodleversion') {
-            this.showLegacyNoticeModal(this.textUtils.getErrorMessageFromError(error));
         } else if (error.errorcode == 'connecttomoodleapp') {
             this.showMoodleAppNoticeModal(this.textUtils.getErrorMessageFromError(error));
         } else if (error.errorcode == 'connecttoworkplaceapp') {
diff --git a/src/lang/en.json b/src/lang/en.json
index 808bf5738..7b7fc192f 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -12,7 +12,7 @@
     "areyousure": "Are you sure?",
     "back": "Back",
     "cancel": "Cancel",
-    "cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle 2.4 or later.",
+    "cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle 3.1 or later.",
     "cannotdownloadfiles": "File downloading is disabled. Please contact your site administrator.",
     "captureaudio": "Record audio",
     "capturedimage": "Taken picture.",
diff --git a/src/providers/sites.ts b/src/providers/sites.ts
index d3e1ecba8..dd3b66992 100644
--- a/src/providers/sites.ts
+++ b/src/providers/sites.ts
@@ -232,7 +232,6 @@ export class CoreSitesProvider {
     protected WORKPLACE_APP = 3;
     protected MOODLE_APP = 2;
     protected VALID_VERSION = 1;
-    protected LEGACY_APP_VERSION = 0;
     protected INVALID_VERSION = -1;
 
     protected isWPApp: boolean;
@@ -675,25 +674,9 @@ export class CoreSitesProvider {
      */
     protected treatInvalidAppVersion(result: number, siteUrl: string, siteId?: string): Promise<any> {
         let errorCode,
-            errorKey,
-            errorExtra = '',
-            errorKeyParams;
+            errorKey;
 
         switch (result) {
-            case this.LEGACY_APP_VERSION:
-                errorKey = 'core.login.legacymoodleversion';
-                errorCode = 'legacymoodleversion';
-
-                if (this.appProvider.isDesktop()) {
-                    errorKey += 'desktop';
-                    errorKeyParams = {$a: siteUrl};
-                }
-
-                if (this.appProvider.isWindows() || this.appProvider.isLinux()) {
-                    errorExtra = this.translate.instant('core.login.legacymoodleversiondesktopdownloadold');
-                }
-
-                break;
             case this.MOODLE_APP:
                 errorKey = 'core.login.connecttomoodleapp';
                 errorCode = 'connecttomoodleapp';
@@ -717,7 +700,7 @@ export class CoreSitesProvider {
 
         return promise.then(() => {
            return Promise.reject({
-                error: this.translate.instant(errorKey, errorKeyParams) + errorExtra,
+                error: this.translate.instant(errorKey),
                 errorcode: errorCode,
                 loggedout: true
             });
@@ -764,16 +747,14 @@ export class CoreSitesProvider {
      * Check for the minimum required version.
      *
      * @param info Site info.
-     * @return Either VALID_VERSION, LEGACY_APP_VERSION, WORKPLACE_APP, MOODLE_APP or INVALID_VERSION.
+     * @return Either VALID_VERSION, WORKPLACE_APP, MOODLE_APP or INVALID_VERSION.
      */
     protected isValidMoodleVersion(info: any): number {
         if (!info) {
             return this.INVALID_VERSION;
         }
 
-        const version24 = 2012120300, // Moodle 2.4 version.
-            release24 = '2.4',
-            version31 = 2016052300,
+        const version31 = 2016052300,
             release31 = '3.1';
 
         // Try to validate by version.
@@ -782,8 +763,6 @@ export class CoreSitesProvider {
             if (!isNaN(version)) {
                 if (version >= version31) {
                     return this.validateWorkplaceVersion(info);
-                } else if (version >= version24) {
-                    return this.LEGACY_APP_VERSION;
                 }
             }
         }
@@ -794,9 +773,6 @@ export class CoreSitesProvider {
             if (release >= release31) {
                 return this.validateWorkplaceVersion(info);
             }
-            if (release >= release24) {
-                return this.LEGACY_APP_VERSION;
-            }
         }
 
         // Couldn't validate it.
@@ -1542,9 +1518,10 @@ export class CoreSitesProvider {
      *
      * @param info The site info.
      * @return Whether it's a legacy Moodle.
+     * @deprecated since 3.7.1
      */
     isLegacyMoodleByInfo(info: any): boolean {
-        return this.isValidMoodleVersion(info) == this.LEGACY_APP_VERSION;
+        return false;
     }
 
     /**

From 06cb21216f6dd62241799f701279813b8f1b47be Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 21 Oct 2019 12:41:50 +0200
Subject: [PATCH 083/257] MOBILE-3199 lti: Launch LTI in browser in desktop

---
 src/addon/mod/lti/providers/lti.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/addon/mod/lti/providers/lti.ts b/src/addon/mod/lti/providers/lti.ts
index c9d160692..0c544b4b6 100644
--- a/src/addon/mod/lti/providers/lti.ts
+++ b/src/addon/mod/lti/providers/lti.ts
@@ -207,7 +207,12 @@ export class AddonModLtiProvider {
 
         // Generate launcher and open it.
         return this.generateLauncher(url, params).then((url) => {
-            this.utils.openInApp(url);
+            if (this.appProvider.isMobile()) {
+                this.utils.openInApp(url);
+            } else {
+                // In desktop open in browser, we found some cases where inapp caused JS issues.
+                this.utils.openInBrowser(url);
+            }
         });
     }
 

From 23da8bf4715f99dae790417a72fc442bd7ce8870 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 22 Oct 2019 10:49:28 +0200
Subject: [PATCH 084/257] MOBILE-3132 course: Fix errors when opening
 activities in offline

---
 .../components/index/addon-mod-chat-index.html |  2 +-
 src/addon/mod/data/components/index/index.ts   |  2 +-
 .../index/addon-mod-feedback-index.html        |  2 +-
 .../mod/feedback/components/index/index.ts     | 18 +++++++++++-------
 src/assets/lang/en.json                        |  2 +-
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/addon/mod/chat/components/index/addon-mod-chat-index.html b/src/addon/mod/chat/components/index/addon-mod-chat-index.html
index 486cbd508..85ae32c07 100644
--- a/src/addon/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addon/mod/chat/components/index/addon-mod-chat-index.html
@@ -18,7 +18,7 @@
         <ion-icon name="time"></ion-icon> {{ 'addon.mod_chat.sessionstart' | translate:{$a: chatInfo} }}
     </ion-card>
 
-    <div padding>
+    <div padding *ngIf="chat">
         <a ion-button block color="primary" (click)="enterChat()">{{ 'addon.mod_chat.enterchat' | translate }}</a>
         <a ion-button block color="light" margin-top *ngIf="sessionsAvailable" (click)="viewSessions()">{{ 'addon.mod_chat.viewreport' | translate }}</a>
     </div>
diff --git a/src/addon/mod/data/components/index/index.ts b/src/addon/mod/data/components/index/index.ts
index 2bfae1f2a..ecdd5064e 100644
--- a/src/addon/mod/data/components/index/index.ts
+++ b/src/addon/mod/data/components/index/index.ts
@@ -47,7 +47,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
     timeAvailableFromReadable: string | boolean;
     timeAvailableTo: number | boolean;
     timeAvailableToReadable: string | boolean;
-    isEmpty = false;
+    isEmpty = true;
     groupInfo: CoreGroupInfo;
     entries = [];
     firstEntry = false;
diff --git a/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html
index 04a263d52..d7652f3fd 100644
--- a/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -37,7 +37,7 @@
         </core-tabs>
     </ng-container>
 
-    <ng-container *ngIf="!showTabs">
+    <ng-container *ngIf="feedback && !showTabs">
         <ng-container *ngTemplateOutlet="tabOverview"></ng-container>
     </ng-container>
 </core-loading>
diff --git a/src/addon/mod/feedback/components/index/index.ts b/src/addon/mod/feedback/components/index/index.ts
index 57fe7a9f9..daa067482 100644
--- a/src/addon/mod/feedback/components/index/index.ts
+++ b/src/addon/mod/feedback/components/index/index.ts
@@ -113,9 +113,11 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
         super.ngOnInit();
 
         this.loadContent(false, true).then(() => {
-            this.feedbackProvider.logView(this.feedback.id, this.feedback.name).catch(() => {
-                // Ignore errors.
-            });
+            if (this.feedback) {
+                this.feedbackProvider.logView(this.feedback.id, this.feedback.name).catch(() => {
+                    // Ignore errors.
+                });
+            }
         }).finally(() => {
             this.tabsReady = true;
         });
@@ -199,10 +201,12 @@ export class AddonModFeedbackIndexComponent extends CoreCourseModuleMainActivity
             // Now fill the context menu.
             this.fillContextMenu(refresh);
 
-            // Check if there are responses stored in offline.
-            return this.feedbackOffline.hasFeedbackOfflineData(this.feedback.id).then((hasOffline) => {
-                this.hasOffline = hasOffline;
-            });
+            if (this.feedback) {
+                // Check if there are responses stored in offline.
+                return this.feedbackOffline.hasFeedbackOfflineData(this.feedback.id).then((hasOffline) => {
+                    this.hasOffline = hasOffline;
+                });
+            }
         });
     }
 
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index c5e9e5631..20432a540 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1316,7 +1316,7 @@
     "core.back": "Back",
     "core.block.blocks": "Blocks",
     "core.cancel": "Cancel",
-    "core.cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle 2.4 or later.",
+    "core.cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle 3.1 or later.",
     "core.cannotdownloadfiles": "File downloading is disabled. Please contact your site administrator.",
     "core.captureaudio": "Record audio",
     "core.capturedimage": "Taken picture.",

From 9a3e3b23e6a69cda7195e69fdc6c9562c9ff25d5 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 22 Oct 2019 11:57:01 +0200
Subject: [PATCH 085/257] MOBILE-3198 filter: Support start time in mediaplugin
 filter

---
 .../filter/mediaplugin/providers/handler.ts   | 17 +++++++++++---
 src/providers/utils/url.ts                    | 23 +++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/addon/filter/mediaplugin/providers/handler.ts b/src/addon/filter/mediaplugin/providers/handler.ts
index 405ba0672..ddbcfc652 100644
--- a/src/addon/filter/mediaplugin/providers/handler.ts
+++ b/src/addon/filter/mediaplugin/providers/handler.ts
@@ -17,6 +17,7 @@ import { Injectable } from '@angular/core';
 import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
 import { CoreFilterFilter, CoreFilterFormatTextOptions } from '@core/filter/providers/filter';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
+import { CoreUrlUtilsProvider } from '@providers/utils/url';
 
 /**
  * Handler to support the Multimedia filter.
@@ -26,7 +27,8 @@ export class AddonFilterMediaPluginHandler extends CoreFilterDefaultHandler {
     name = 'AddonFilterMediaPluginHandler';
     filterName = 'mediaplugin';
 
-    constructor(private textUtils: CoreTextUtilsProvider) {
+    constructor(private textUtils: CoreTextUtilsProvider,
+            private urlUtils: CoreUrlUtilsProvider) {
         super();
     }
 
@@ -74,9 +76,18 @@ export class AddonFilterMediaPluginHandler extends CoreFilterDefaultHandler {
             return;
         }
 
-        const iframe = document.createElement('iframe');
+        const iframe = document.createElement('iframe'),
+            params: any = {};
+
+        if (youtubeData.listId !== null) {
+            params.list = youtubeData.listId;
+        }
+        if (youtubeData.start !== null) {
+            params.start = youtubeData.start;
+        }
+
         iframe.id = video.id;
-        iframe.src = 'https://www.youtube.com/embed/' + youtubeData.videoId; // Don't apply other params to align with Moodle web.
+        iframe.src = this.urlUtils.addParamsToUrl('https://www.youtube.com/embed/' + youtubeData.videoId, params);
         iframe.setAttribute('frameborder', '0');
         iframe.setAttribute('allowfullscreen', '1');
         iframe.width = '100%';
diff --git a/src/providers/utils/url.ts b/src/providers/utils/url.ts
index 295d54ae7..2aa7e8ff5 100644
--- a/src/providers/utils/url.ts
+++ b/src/providers/utils/url.ts
@@ -44,6 +44,29 @@ export class CoreUrlUtilsProvider {
         return url;
     }
 
+    /**
+     * Add params to a URL.
+     *
+     * @param url URL to add the params to.
+     * @param params Object with the params to add.
+     * @return URL with params.
+     */
+    addParamsToUrl(url: string, params: {[key: string]: any}): string {
+        let separator = url.indexOf('?') != -1 ? '&' : '?';
+
+        for (const key in params) {
+            const value = params[key];
+
+            // Ignore objects.
+            if (typeof value != 'object') {
+                url += separator + key + '=' + value;
+                separator = '&';
+            }
+        }
+
+        return url;
+    }
+
     /**
      * Given a URL and a text, return an HTML link.
      *

From 9c4d30c16f2ccd8232ecf1b90874956ae5b5dbc6 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 22 Oct 2019 13:36:14 +0200
Subject: [PATCH 086/257] MOBILE-3187 myoverview: Fix keyboard flicker on
 filter

---
 .../myoverview/addon-block-myoverview.html           |  2 +-
 .../myoverview/components/myoverview/myoverview.ts   |  8 +++++++-
 src/assets/lang/en.json                              |  2 +-
 src/components/context-menu/context-menu-item.ts     |  2 ++
 src/components/context-menu/context-menu-popover.ts  | 12 ++++++------
 src/components/context-menu/context-menu.ts          |  6 +++++-
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html
index 294a499c4..a7043ba4d 100644
--- a/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -9,7 +9,7 @@
         <ion-spinner *ngIf="!prefetchCoursesData[selectedFilter].icon || prefetchCoursesData[selectedFilter].icon == 'spinner'"></ion-spinner>
     </div>
     <core-context-menu item-end>
-        <core-context-menu-item *ngIf="loaded && showFilterSwitchButton()" [priority]="1000" [content]="'core.courses.filtermycourses' | translate" (action)="switchFilter()" iconAction="funnel"></core-context-menu-item>
+        <core-context-menu-item *ngIf="loaded && showFilterSwitchButton()" [priority]="1000" [content]="'core.courses.filtermycourses' | translate" (action)="switchFilter()" iconAction="funnel" (onClosed)="switchFilterClosed()"></core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && showSortFilter" [priority]="900" content="{{('core.sortby' | translate) + ' ' + ('addon.block_myoverview.title' | translate)}}" (action)="switchSort('fullname')" [iconAction]="sort == 'fullname' ? 'radio-button-on' : 'radio-button-off'"></core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && showSortFilter" [priority]="800" content="{{('core.sortby' | translate) + ' ' + ('addon.block_myoverview.lastaccessed' | translate)}}" (action)="switchSort('lastaccess')" [iconAction]="sort == 'lastaccess' ? 'radio-button-on' : 'radio-button-off'"></core-context-menu-item>
     </core-context-menu>
diff --git a/src/addon/block/myoverview/components/myoverview/myoverview.ts b/src/addon/block/myoverview/components/myoverview/myoverview.ts
index 2552c597b..e6c807c13 100644
--- a/src/addon/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addon/block/myoverview/components/myoverview/myoverview.ts
@@ -334,10 +334,16 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         this.showFilter = !this.showFilter;
         this.courses.filter = '';
         this.filteredCourses = this.courses[this.showFilter ? 'all' : this.selectedFilter];
+    }
+
+    /**
+     * Popover closed after clicking switch filter.
+     */
+    switchFilterClosed(): void {
         if (this.showFilter) {
             setTimeout(() => {
                 this.searchbar.setFocus();
-            }, 500);
+            });
         }
     }
 
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index c5e9e5631..20432a540 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1316,7 +1316,7 @@
     "core.back": "Back",
     "core.block.blocks": "Blocks",
     "core.cancel": "Cancel",
-    "core.cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle 2.4 or later.",
+    "core.cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle 3.1 or later.",
     "core.cannotdownloadfiles": "File downloading is disabled. Please contact your site administrator.",
     "core.captureaudio": "Record audio",
     "core.capturedimage": "Taken picture.",
diff --git a/src/components/context-menu/context-menu-item.ts b/src/components/context-menu/context-menu-item.ts
index 9df9e728e..b15a5f82f 100644
--- a/src/components/context-menu/context-menu-item.ts
+++ b/src/components/context-menu/context-menu-item.ts
@@ -51,12 +51,14 @@ export class CoreContextMenuItemComponent implements OnInit, OnDestroy, OnChange
     @Input() badgeClass?: number; // A class to set in the badge.
     @Input() hidden?: boolean; // Whether the item should be hidden.
     @Output() action?: EventEmitter<() => void>; // Will emit an event when the item clicked.
+    @Output() onClosed?: EventEmitter<() => void>; // Will emit an event when the popover is closed because the item was clicked.
 
     protected hasAction = false;
     protected destroyed = false;
 
     constructor(private ctxtMenu: CoreContextMenuComponent) {
         this.action = new EventEmitter();
+        this.onClosed = new EventEmitter();
     }
 
     /**
diff --git a/src/components/context-menu/context-menu-popover.ts b/src/components/context-menu/context-menu-popover.ts
index d96804d6d..6d43c77cf 100644
--- a/src/components/context-menu/context-menu-popover.ts
+++ b/src/components/context-menu/context-menu-popover.ts
@@ -40,8 +40,8 @@ export class CoreContextMenuPopoverComponent {
     /**
      * Close the popover.
      */
-    closeMenu(): void {
-        this.viewCtrl.dismiss();
+    closeMenu(item?: CoreContextMenuItemComponent): void {
+        this.viewCtrl.dismiss(item);
     }
 
     /**
@@ -61,12 +61,12 @@ export class CoreContextMenuPopoverComponent {
             }
 
             if (item.closeOnClick) {
-                this.closeMenu();
+                this.closeMenu(item);
             }
 
-            item.action.emit(this.closeMenu.bind(this));
-        } else if (item.href && item.closeOnClick) {
-            this.closeMenu();
+            item.action.emit(this.closeMenu.bind(this, item));
+        } else if (item.closeOnClick && (item.href || item.onClosed.observers.length > 0)) {
+            this.closeMenu(item);
         }
 
         return true;
diff --git a/src/components/context-menu/context-menu.ts b/src/components/context-menu/context-menu.ts
index ba7fc8a5a..49f7a1e43 100644
--- a/src/components/context-menu/context-menu.ts
+++ b/src/components/context-menu/context-menu.ts
@@ -180,8 +180,12 @@ export class CoreContextMenuComponent implements OnInit, OnDestroy {
             const popover = this.popoverCtrl.create(CoreContextMenuPopoverComponent,
                 { title: this.title, items: this.items, id: this.uniqueId, showBackdrop: true });
 
-            popover.onDidDismiss(() => {
+            popover.onDidDismiss((item: CoreContextMenuItemComponent) => {
                 this.expanded = false;
+
+                if (item) {
+                    item.onClosed.emit();
+                }
             });
             popover.present({
                 ev: event

From 71ab092e021f75b6ab2e3aadd5683bbda15727aa Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 22 Oct 2019 15:34:15 +0200
Subject: [PATCH 087/257] MOBILE-3026 core: Fix back online message displayed
 on resume

---
 src/app/app.component.ts | 13 +++++++++----
 src/assets/lang/en.json  |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index a1d80d530..8316ea5fb 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -115,14 +115,19 @@ export class MoodleMobileApp implements OnInit {
             this.network.onchange().subscribe(() => {
                 // Execute the callback in the Angular zone, so change detection doesn't stop working.
                 this.zone.run(() => {
-                    const isOnline = this.appProvider.isOnline();
-                    document.body.classList.toggle('core-offline', !isOnline);
-                    document.body.classList.toggle('core-online', isOnline);
+                    const isOnline = this.appProvider.isOnline(),
+                        hadOfflineMessage = document.body.classList.contains('core-offline');
+
+                    document.body.classList.toggle('core-offline', !isOnline);
+
+                    if (isOnline && hadOfflineMessage) {
+                        document.body.classList.add('core-online');
 
-                    if (isOnline) {
                         setTimeout(() => {
                             document.body.classList.remove('core-online');
                         }, 3000);
+                    } else if (!isOnline) {
+                        document.body.classList.remove('core-online');
                     }
                 });
             });
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index c5e9e5631..20432a540 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1316,7 +1316,7 @@
     "core.back": "Back",
     "core.block.blocks": "Blocks",
     "core.cancel": "Cancel",
-    "core.cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle 2.4 or later.",
+    "core.cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle 3.1 or later.",
     "core.cannotdownloadfiles": "File downloading is disabled. Please contact your site administrator.",
     "core.captureaudio": "Record audio",
     "core.capturedimage": "Taken picture.",

From ec4bcd708532492e309c5648d2e251b8e10e1303 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 22 Oct 2019 17:07:47 +0200
Subject: [PATCH 088/257] MOBILE-3189 lang: Emit onLangChange when custom
 strings loaded

---
 src/assets/lang/en.json |  2 +-
 src/providers/lang.ts   | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index c5e9e5631..20432a540 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1316,7 +1316,7 @@
     "core.back": "Back",
     "core.block.blocks": "Blocks",
     "core.cancel": "Cancel",
-    "core.cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle 2.4 or later.",
+    "core.cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle 3.1 or later.",
     "core.cannotdownloadfiles": "File downloading is disabled. Please contact your site administrator.",
     "core.captureaudio": "Record audio",
     "core.capturedimage": "Taken picture.",
diff --git a/src/providers/lang.ts b/src/providers/lang.ts
index 58838037f..14c478d9b 100644
--- a/src/providers/lang.ts
+++ b/src/providers/lang.ts
@@ -315,6 +315,8 @@ export class CoreLangProvider {
             return;
         }
 
+        let currentLangChanged = false;
+
         const list: string[] = strings.split(/(?:\r\n|\r|\n)/);
         list.forEach((entry: string) => {
             const values: string[] = entry.split('|');
@@ -327,6 +329,10 @@ export class CoreLangProvider {
 
             lang = values[2].replace(/_/g, '-'); // Use the app format instead of Moodle format.
 
+            if (lang == this.currentLanguage) {
+                currentLangChanged = true;
+            }
+
             if (!this.customStrings[lang]) {
                 this.customStrings[lang] = {};
             }
@@ -340,6 +346,14 @@ export class CoreLangProvider {
         });
 
         this.customStringsRaw = strings;
+
+        if (currentLangChanged) {
+            // Some lang strings have changed, emit an event to update the pipes.
+            this.translate.onLangChange.emit({
+                lang: this.currentLanguage,
+                translations: this.translate.translations[this.currentLanguage]
+            });
+        }
     }
 
     /**

From ca6a50e8e44b37725ccc4d078d0204ce3ca9b40d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 2 Oct 2019 17:44:45 +0200
Subject: [PATCH 089/257] MOBILE-3177 login: Support new minimum version
 setting

---
 scripts/langindex.json                      |   2 +
 src/assets/lang/en.json                     |   2 +
 src/components/loading/loading.scss         |   4 +-
 src/core/login/login.module.ts              |  12 ++-
 src/core/login/pages/init/init.ts           |  17 +++-
 src/core/login/pages/reconnect/reconnect.ts |  18 ++--
 src/core/login/pages/site/site.ts           |  25 ++---
 src/core/login/providers/cron-handler.ts    |  64 +++++++++++++
 src/core/settings/providers/helper.ts       |   4 +-
 src/lang/en.json                            |   2 +
 src/providers/app.ts                        |  18 ++++
 src/providers/sites.ts                      | 101 +++++++++++++++++++-
 12 files changed, 235 insertions(+), 34 deletions(-)
 create mode 100644 src/core/login/providers/cron-handler.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 6e12a847e..aee070da8 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1925,6 +1925,8 @@
   "core.unknown": "local_moodlemobileapp",
   "core.unlimited": "moodle",
   "core.unzipping": "local_moodlemobileapp",
+  "core.updaterequired": "local_moodlemobileapp",
+  "core.updaterequireddesc": "local_moodlemobileapp",
   "core.upgraderunning": "error",
   "core.user": "moodle",
   "core.user.address": "moodle",
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 20432a540..b3aa82ed9 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1920,6 +1920,8 @@
     "core.unknown": "Unknown",
     "core.unlimited": "Unlimited",
     "core.unzipping": "Unzipping",
+    "core.updaterequired": "App update required",
+    "core.updaterequireddesc": "Please update your app to version {{$a}}",
     "core.upgraderunning": "Site is being upgraded, please retry later.",
     "core.user": "User",
     "core.user.address": "Address",
diff --git a/src/components/loading/loading.scss b/src/components/loading/loading.scss
index d4c5916ba..6b5bbaa21 100644
--- a/src/components/loading/loading.scss
+++ b/src/components/loading/loading.scss
@@ -25,8 +25,8 @@ ion-app.app-root {
             padding-left: 0 !important;
             padding-right: 0 !important;
 
-            > .core-loading-content > *,
-            > .core-loading-content-loading > * {
+            > .core-loading-content > *:not[padding],
+            > .core-loading-content-loading > *:not[padding] {
                 @include safe-area-padding-horizontal(0px, 0px);
             }
         }
diff --git a/src/core/login/login.module.ts b/src/core/login/login.module.ts
index 524654955..05be940c0 100644
--- a/src/core/login/login.module.ts
+++ b/src/core/login/login.module.ts
@@ -13,12 +13,15 @@
 // limitations under the License.
 
 import { NgModule } from '@angular/core';
+import { CoreCronDelegate } from '@providers/cron';
 import { CoreLoginHelperProvider } from './providers/helper';
+import { CoreLoginCronHandler } from './providers/cron-handler';
 import { CoreLoginSitesPageModule } from './pages/sites/sites.module';
 
 // List of providers.
 export const CORE_LOGIN_PROVIDERS = [
-    CoreLoginHelperProvider
+    CoreLoginHelperProvider,
+    CoreLoginCronHandler
 ];
 
 @NgModule({
@@ -29,4 +32,9 @@ export const CORE_LOGIN_PROVIDERS = [
     ],
     providers: CORE_LOGIN_PROVIDERS
 })
-export class CoreLoginModule {}
+export class CoreLoginModule {
+    constructor(cronDelegate: CoreCronDelegate, cronHandler: CoreLoginCronHandler) {
+        // Register handlers.
+        cronDelegate.register(cronHandler);
+    }
+}
diff --git a/src/core/login/pages/init/init.ts b/src/core/login/pages/init/init.ts
index 0ca100be9..b7ea64352 100644
--- a/src/core/login/pages/init/init.ts
+++ b/src/core/login/pages/init/init.ts
@@ -85,15 +85,22 @@ export class CoreLoginInitPage {
      */
     protected loadPage(): Promise<any> {
         if (this.sitesProvider.isLoggedIn()) {
-            if (!this.loginHelper.isSiteLoggedOut()) {
-                // User is logged in, go to site initial page.
-                return this.loginHelper.goToSiteInitialPage();
-            } else {
-                // The site is marked as logged out. Logout and try again.
+            if (this.loginHelper.isSiteLoggedOut()) {
                 return this.sitesProvider.logout().then(() => {
                     return this.loadPage();
                 });
             }
+
+            return this.sitesProvider.getCurrentSite().getPublicConfig().catch(() => {
+                return {};
+            }).then((config) => {
+                return this.sitesProvider.checkRequiredMinimumVersion(config).then(() => {
+                     // User is logged in, go to site initial page.
+                    return this.loginHelper.goToSiteInitialPage();
+                }).catch(() => {
+                    return this.loadPage();
+                });
+            });
         }
 
         return this.navCtrl.setRoot('CoreLoginSitesPage');
diff --git a/src/core/login/pages/reconnect/reconnect.ts b/src/core/login/pages/reconnect/reconnect.ts
index 33ad5b0db..3ec8479a3 100644
--- a/src/core/login/pages/reconnect/reconnect.ts
+++ b/src/core/login/pages/reconnect/reconnect.ts
@@ -82,16 +82,20 @@ export class CoreLoginReconnectPage {
             this.siteUrl = site.infos.siteurl;
             this.siteName = site.getSiteName();
 
-            // Check logoURL if user avatar is not set.
-            if (this.site.avatar.startsWith(site.infos.siteurl + '/theme/image.php')) {
-                this.site.avatar = false;
+            return site.getPublicConfig().then((config) => {
+                return this.sitesProvider.checkRequiredMinimumVersion(config).then(() => {
+                    // Check logoURL if user avatar is not set.
+                    if (this.site.avatar.startsWith(site.infos.siteurl + '/theme/image.php')) {
+                        this.site.avatar = false;
 
-                return site.getPublicConfig().then((config) => {
-                    this.logoUrl = config.logourl || config.compactlogourl;
+                        this.logoUrl = config.logourl || config.compactlogourl;
+                    }
                 }).catch(() => {
-                    // Ignore errors.
+                    this.cancel();
                 });
-            }
+            }).catch(() => {
+                // Ignore errors.
+            });
         }).catch(() => {
             // Shouldn't happen. Just leave the view.
             this.cancel();
diff --git a/src/core/login/pages/site/site.ts b/src/core/login/pages/site/site.ts
index f96eb9c3e..f9bc3a139 100644
--- a/src/core/login/pages/site/site.ts
+++ b/src/core/login/pages/site/site.ts
@@ -112,18 +112,21 @@ export class CoreLoginSitePage {
         } else {
             // Not a demo site.
             this.sitesProvider.checkSite(url).then((result) => {
+                return this.sitesProvider.checkRequiredMinimumVersion(result.config).then(() => {
+                    if (result.warning) {
+                        this.domUtils.showErrorModal(result.warning, true, 4000);
+                    }
 
-                if (result.warning) {
-                    this.domUtils.showErrorModal(result.warning, true, 4000);
-                }
-
-                if (this.loginHelper.isSSOLoginNeeded(result.code)) {
-                    // SSO. User needs to authenticate in a browser.
-                    this.loginHelper.confirmAndOpenBrowserForSSOLogin(
-                        result.siteUrl, result.code, result.service, result.config && result.config.launchurl);
-                } else {
-                    this.navCtrl.push('CoreLoginCredentialsPage', { siteUrl: result.siteUrl, siteConfig: result.config });
-                }
+                    if (this.loginHelper.isSSOLoginNeeded(result.code)) {
+                        // SSO. User needs to authenticate in a browser.
+                        this.loginHelper.confirmAndOpenBrowserForSSOLogin(
+                            result.siteUrl, result.code, result.service, result.config && result.config.launchurl);
+                    } else {
+                        this.navCtrl.push('CoreLoginCredentialsPage', { siteUrl: result.siteUrl, siteConfig: result.config });
+                    }
+                }).catch(() => {
+                    // Ignore errors.
+                });
             }, (error) => {
                 this.showLoginIssue(url, error);
             }).finally(() => {
diff --git a/src/core/login/providers/cron-handler.ts b/src/core/login/providers/cron-handler.ts
new file mode 100644
index 000000000..f821b7172
--- /dev/null
+++ b/src/core/login/providers/cron-handler.ts
@@ -0,0 +1,64 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreCronHandler } from '@providers/cron';
+import { CoreSitesProvider } from '@providers/sites';
+
+/**
+ * Cron handler to log out sites when does not meet the app requirements.
+ */
+@Injectable()
+export class CoreLoginCronHandler implements CoreCronHandler {
+    name = 'CoreLoginCronHandler';
+
+    constructor(private sitesProvider: CoreSitesProvider) {}
+
+    /**
+     * Execute the process.
+     * Receives the ID of the site affected, undefined for all sites.
+     *
+     * @param siteId ID of the site affected, undefined for all sites.
+     * @return Promise resolved when done, rejected if failure.
+     */
+    execute(siteId?: string): Promise<any> {
+        siteId = siteId || this.sitesProvider.getCurrentSiteId();
+        if (!siteId) {
+            return Promise.resolve();
+        }
+
+        // Check logged in site minimun required version.
+        // Do not check twice in the same 10 minutes.
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            return site.getPublicConfig().catch(() => {
+                return {};
+            }).then((config) => {
+                this.sitesProvider.checkRequiredMinimumVersion(config).catch(() => {
+                    // Ignore errors.
+
+                });
+            });
+        });
+    }
+
+    /**
+     * Check whether it's a synchronization process or not. True if not defined.
+     *
+     * @return Whether it's a synchronization process or not.
+     */
+    isSync(): boolean {
+        // Defined to true to be checked on sync site.
+        return true;
+    }
+}
diff --git a/src/core/settings/providers/helper.ts b/src/core/settings/providers/helper.ts
index dbbeb4510..b5b48ab05 100644
--- a/src/core/settings/providers/helper.ts
+++ b/src/core/settings/providers/helper.ts
@@ -171,9 +171,9 @@ export class CoreSettingsHelper {
             });
         }));
 
-        const syncPromise = Promise.all(promises);
+        let syncPromise = Promise.all(promises);
         this.syncPromises[siteId] = syncPromise;
-        syncPromise.finally(() => {
+        syncPromise = syncPromise.finally(() => {
             delete this.syncPromises[siteId];
         });
 
diff --git a/src/lang/en.json b/src/lang/en.json
index 7b7fc192f..2d0e8125c 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -273,6 +273,8 @@
     "unlimited": "Unlimited",
     "unzipping": "Unzipping",
     "upgraderunning": "Site is being upgraded, please retry later.",
+    "updaterequired": "App update required",
+    "updaterequireddesc": "Please update your app to version {{$a}}",
     "user": "User",
     "userdeleted": "This user account has been deleted",
     "userdetails": "User details",
diff --git a/src/providers/app.ts b/src/providers/app.ts
index 615b68ecb..4129fe48e 100644
--- a/src/providers/app.ts
+++ b/src/providers/app.ts
@@ -170,6 +170,15 @@ export class CoreAppProvider {
         return this.isDesktop() && process.arch == 'x64';
     }
 
+    /**
+     * Checks if the app is running in an Android mobile or tablet device.
+     *
+     * @return Whether the app is running in an Android mobile or tablet device.
+     */
+    isAndroid(): boolean {
+        return this.platform.is('android');
+    }
+
     /**
      * Checks if the app is running in a desktop environment (not browser).
      *
@@ -181,6 +190,15 @@ export class CoreAppProvider {
         return !!(process && process.versions && typeof process.versions.electron != 'undefined');
     }
 
+    /**
+     * Checks if the app is running in an iOS mobile or tablet device.
+     *
+     * @return Whether the app is running in an iOS mobile or tablet device.
+     */
+    isIOS(): boolean {
+        return this.platform.is('ios');
+    }
+
     /**
      * Check if the keyboard is visible.
      *
diff --git a/src/providers/sites.ts b/src/providers/sites.ts
index dd3b66992..ffde5b3d6 100644
--- a/src/providers/sites.ts
+++ b/src/providers/sites.ts
@@ -19,6 +19,7 @@ import { CoreAppProvider } from './app';
 import { CoreEventsProvider } from './events';
 import { CoreLoggerProvider } from './logger';
 import { CoreSitesFactoryProvider } from './sites-factory';
+import { CoreDomUtilsProvider } from './utils/dom';
 import { CoreTextUtilsProvider } from './utils/text';
 import { CoreUrlUtilsProvider } from './utils/url';
 import { CoreUtilsProvider } from './utils/utils';
@@ -311,7 +312,8 @@ export class CoreSitesProvider {
     constructor(logger: CoreLoggerProvider, private http: HttpClient, private sitesFactory: CoreSitesFactoryProvider,
             private appProvider: CoreAppProvider, private translate: TranslateService, private urlUtils: CoreUrlUtilsProvider,
             private eventsProvider: CoreEventsProvider,  private textUtils: CoreTextUtilsProvider,
-            private utils: CoreUtilsProvider, private injector: Injector, private wsProvider: CoreWSProvider) {
+            private utils: CoreUtilsProvider, private injector: Injector, private wsProvider: CoreWSProvider,
+            protected domUtils: CoreDomUtilsProvider) {
         this.logger = logger.getInstance('CoreSitesProvider');
 
         this.appDB = appProvider.getDB();
@@ -862,6 +864,87 @@ export class CoreSitesProvider {
         return this.appDB.insertRecord(this.SITES_TABLE, entry);
     }
 
+    /**
+     * Check the required minimum version of the app for a site and shows a download dialog.
+     *
+     * @param  config Config object of the site.
+     * @param siteId ID of the site to check. Current site id will be used otherwise.
+     * @return Resolved with  if meets the requirements, rejected otherwise.
+     */
+    checkRequiredMinimumVersion(config: any, siteId?: string): Promise<void> {
+        if (config && config.tool_mobile_minimumversion) {
+            const requiredVersion = this.convertVersionName(config.tool_mobile_minimumversion),
+                appVersion = this.convertVersionName(CoreConfigConstants.versionname);
+
+            if (requiredVersion > appVersion) {
+                let downloadUrl = '';
+
+                if (this.appProvider.isAndroid() && config.tool_mobile_androidappid) {
+                    downloadUrl = 'market://details?id=' + config.tool_mobile_androidappid;
+                } else if (this.appProvider.isIOS() && config.tool_mobile_iosappid) {
+                    downloadUrl = 'itms-apps://itunes.apple.com/app/id' + config.tool_mobile_iosappid;
+                } else if (config.tool_mobile_setuplink) {
+                    downloadUrl = config.tool_mobile_setuplink;
+                } else if (this.appProvider.isMobile()) {
+                    downloadUrl = 'https://download.moodle.org/mobile/';
+                } else {
+                    downloadUrl = 'https://download.moodle.org/desktop/';
+                }
+
+                siteId = siteId || this.getCurrentSiteId();
+
+                // Do not block interface.
+                this.domUtils.showConfirm(
+                    this.translate.instant('core.updaterequireddesc', { $a: config.tool_mobile_minimumversion }),
+                    this.translate.instant('core.updaterequired'),
+                    this.translate.instant('core.download'),
+                    this.translate.instant(siteId ? 'core.mainmenu.logout' : 'core.cancel')).then(() => {
+
+                    this.utils.openInBrowser(downloadUrl);
+                }).catch(() => {
+                    // Do nothing.
+                });
+
+                if (siteId) {
+                    // Logout if it's the currentSite.
+                    const promise = siteId == this.getCurrentSiteId() ? this.logout() : Promise.resolve();
+
+                    return promise.then(() => {
+                        // Always expire the token.
+                        return this.setSiteLoggedOut(siteId, true);
+                    }).then(() => {
+                        return Promise.reject(null);
+                    });
+                }
+
+                return Promise.reject(null);
+            }
+        }
+
+        return Promise.resolve();
+    }
+
+    /**
+     * Convert version name to numbers.
+     *
+     * @param  name Version name (dot separated).
+     * @return Version translated to a comparable number.
+     */
+    protected convertVersionName(name: string): number {
+        let version = 0;
+
+        const parts = name.split('.', 3);
+        parts.forEach((num) => {
+            version = (version * 100) + Number(num);
+        });
+
+        if (parts.length < 3) {
+            version = version * Math.pow(100, 3 - parts.length);
+        }
+
+        return version;
+    }
+
     /**
      * Login a user to a site from the list of sites.
      *
@@ -896,12 +979,20 @@ export class CoreSitesProvider {
 
                 return false;
             }, () => {
-                this.login(siteId);
+                return site.getPublicConfig().catch(() => {
+                    return {};
+                }).then((config) => {
+                    return this.checkRequiredMinimumVersion(config).then(() => {
+                        this.login(siteId);
 
-                // Update site info. We don't block the UI.
-                this.updateSiteInfo(siteId);
+                        // Update site info. We don't block the UI.
+                        this.updateSiteInfo(siteId);
 
-                return true;
+                        return true;
+                    }).catch(() => {
+                        return false;
+                    });
+                });
             });
         });
     }

From 74e3a4c55cfd757276415523231f69ee2ae01691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 24 Oct 2019 08:28:40 +0200
Subject: [PATCH 090/257] MOBILE-3093 login: Fix string typo

---
 scripts/functions.sh                               | 14 +++++---------
 scripts/langindex.json                             |  2 +-
 src/assets/lang/en.json                            |  2 +-
 src/core/login/lang/en.json                        |  2 +-
 .../pages/change-password/change-password.html     |  2 +-
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/scripts/functions.sh b/scripts/functions.sh
index 87e5e5c43..55af8536b 100644
--- a/scripts/functions.sh
+++ b/scripts/functions.sh
@@ -20,26 +20,22 @@ function print_success {
 }
 
 function print_error {
-    tput setaf 1; echo "  ERROR:  $1"
-    tput setaf 0
+    tput setaf 1; echo "  ERROR:  $1"; tput sgr0
 }
 
 function print_ok {
-    tput setaf 2; echo "     OK:  $1"
+    tput setaf 2; echo "     OK:  $1"; tput sgr0
     echo
-    tput setaf 0
 }
 
 function print_message {
-    tput setaf 3; echo "--------  $1"
+    tput setaf 3; echo "--------  $1"; tput sgr0
     echo
-    tput setaf 0
 }
 
 function print_title {
     stepnumber=$(($stepnumber + 1))
     echo
-    tput setaf 5; echo "$stepnumber $1"
-    tput setaf 5; echo '=================='
-    tput setaf 0
+    tput setaf 5; echo "$stepnumber $1"; tput sgr0
+    tput setaf 5; echo '=================='; tput sgr0
 }
\ No newline at end of file
diff --git a/scripts/langindex.json b/scripts/langindex.json
index aee070da8..87413dde6 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1567,7 +1567,7 @@
   "core.login.changepassword": "moodle",
   "core.login.changepasswordbutton": "local_moodlemobileapp",
   "core.login.changepasswordhelp": "local_moodlemobileapp",
-  "core.login.changepassowrdinstructions": "local_moodlemobileapp",
+  "core.login.changepasswordinstructions": "local_moodlemobileapp",
   "core.login.changepasswordlogoutinstructions": "local_moodlemobileapp",
   "core.login.changepasswordreconnectinstructions": "local_moodlemobileapp",
   "core.login.checksiteversion": "local_moodlemobileapp",
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index b3aa82ed9..2b50cbff9 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1562,10 +1562,10 @@
     "core.login.auth_email": "Email-based self-registration",
     "core.login.authenticating": "Authenticating",
     "core.login.cancel": "Cancel",
-    "core.login.changepassowrdinstructions": "You cannot change your password in the app. Please click the following button to open the site in a web browser to change your password. Take into account you need to close the browser after changing the password as you will not be redirected to the app.",
     "core.login.changepassword": "Change password",
     "core.login.changepasswordbutton": "Open the change password page",
     "core.login.changepasswordhelp": "If you have problems changing your password, please contact your site administrator. \"Site Administrators\" are the people who manages the Moodle at your school/university/company or learning organisation. If you don't know how to contact them, please contact your teachers/trainers.",
+    "core.login.changepasswordinstructions": "You cannot change your password in the app. Please click the following button to open the site in a web browser to change your password. Take into account you need to close the browser after changing the password as you will not be redirected to the app.",
     "core.login.changepasswordlogoutinstructions": "If you prefer to change site or log out, please click the following button:",
     "core.login.changepasswordreconnectinstructions": "Click the following button to reconnect to the site. (Take into account that if you didn't change your password successfully, you would return to the previous screen).",
     "core.login.checksiteversion": "Check that your site uses Moodle 3.1 or later.",
diff --git a/src/core/login/lang/en.json b/src/core/login/lang/en.json
index a3c443bc9..e4780131c 100644
--- a/src/core/login/lang/en.json
+++ b/src/core/login/lang/en.json
@@ -6,7 +6,7 @@
     "changepassword": "Change password",
     "changepasswordbutton": "Open the change password page",
     "changepasswordhelp": "If you have problems changing your password, please contact your site administrator. \"Site Administrators\" are the people who manages the Moodle at your school/university/company or learning organisation. If you don't know how to contact them, please contact your teachers/trainers.",
-    "changepassowrdinstructions": "You cannot change your password in the app. Please click the following button to open the site in a web browser to change your password. Take into account you need to close the browser after changing the password as you will not be redirected to the app.",
+    "changepasswordinstructions": "You cannot change your password in the app. Please click the following button to open the site in a web browser to change your password. Take into account you need to close the browser after changing the password as you will not be redirected to the app.",
     "changepasswordlogoutinstructions": "If you prefer to change site or log out, please click the following button:",
     "changepasswordreconnectinstructions": "Click the following button to reconnect to the site. (Take into account that if you didn't change your password successfully, you would return to the previous screen).",
     "confirmdeletesite": "Are you sure you want to delete the site {{sitename}}?",
diff --git a/src/core/login/pages/change-password/change-password.html b/src/core/login/pages/change-password/change-password.html
index 9bbd96064..7c965a3a0 100644
--- a/src/core/login/pages/change-password/change-password.html
+++ b/src/core/login/pages/change-password/change-password.html
@@ -12,7 +12,7 @@
     <ion-list>
         <ion-item text-wrap *ngIf="!changingPassword">
             <h2>{{ 'core.login.forcepasswordchangenotice' | translate }}</h2>
-            <p padding-vertical>{{ 'core.login.changepassowrdinstructions' | translate }}</p>
+            <p padding-vertical>{{ 'core.login.changepasswordinstructions' | translate }}</p>
             <button text-wrap ion-button block (click)="openChangePasswordPage()">{{ 'core.login.changepasswordbutton' | translate }}</button>
         </ion-item>
         <ion-item text-wrap *ngIf="changingPassword">

From 31a7716a6baa2d00577d57608f6858f16cce9589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 24 Oct 2019 14:09:08 +0200
Subject: [PATCH 091/257] MOBILE-3144 settings: Avoid auto color scheme on iOS

---
 src/core/settings/pages/general/general.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/core/settings/pages/general/general.ts b/src/core/settings/pages/general/general.ts
index c211798a6..2c5f94582 100644
--- a/src/core/settings/pages/general/general.ts
+++ b/src/core/settings/pages/general/general.ts
@@ -48,7 +48,7 @@ export class CoreSettingsGeneralPage {
     colorSchemes = [];
     selectedScheme: string;
 
-    constructor(appProvider: CoreAppProvider, private configProvider: CoreConfigProvider, fileProvider: CoreFileProvider,
+    constructor(private appProvider: CoreAppProvider, private configProvider: CoreConfigProvider, fileProvider: CoreFileProvider,
             private eventsProvider: CoreEventsProvider, private langProvider: CoreLangProvider,
             private domUtils: CoreDomUtilsProvider, private pushNotificationsProvider: CorePushNotificationsProvider,
             localNotificationsProvider: CoreLocalNotificationsProvider, private settingsHelper: CoreSettingsHelper) {
@@ -65,8 +65,9 @@ export class CoreSettingsGeneralPage {
         if (!CoreConfigConstants.forceColorScheme) {
             let defaultColorScheme = 'light';
 
-            if (window.matchMedia('(prefers-color-scheme: dark)').matches ||
-                    window.matchMedia('(prefers-color-scheme: light)').matches) {
+            // Auto is not working on iOS right now until we update Webkit.
+            if (!this.appProvider.isIOS() && (window.matchMedia('(prefers-color-scheme: dark)').matches ||
+                                window.matchMedia('(prefers-color-scheme: light)').matches)) {
                 this.colorSchemes.push('auto');
                 defaultColorScheme = 'auto';
             }

From a2e37d26c8242ee711cc3b7463add0c003973e08 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 21 Oct 2019 10:20:26 +0200
Subject: [PATCH 092/257] MOBILE-3182 core: Fix message when module is disabled

---
 src/addon/mod/quiz/pages/review/review.html  | 2 +-
 src/assets/lang/en.json                      | 2 +-
 src/core/course/providers/module-delegate.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/addon/mod/quiz/pages/review/review.html b/src/addon/mod/quiz/pages/review/review.html
index 21491de5d..e61d8388b 100644
--- a/src/addon/mod/quiz/pages/review/review.html
+++ b/src/addon/mod/quiz/pages/review/review.html
@@ -46,7 +46,7 @@
                 </ion-item>
                 <ion-item text-wrap no-lines *ngIf="attempt.readableMark">
                     <h2>{{ 'addon.mod_quiz.marks' | translate }}</h2>
-                    <p><{{ attempt.readableMark }}</p>
+                    <p>{{ attempt.readableMark }}</p>
                 </ion-item>
                 <ion-item text-wrap no-lines *ngIf="attempt.readableGrade">
                     <h2>{{ 'addon.mod_quiz.grade' | translate }}</h2>
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index c5e9e5631..20432a540 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1316,7 +1316,7 @@
     "core.back": "Back",
     "core.block.blocks": "Blocks",
     "core.cancel": "Cancel",
-    "core.cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle 2.4 or later.",
+    "core.cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle 3.1 or later.",
     "core.cannotdownloadfiles": "File downloading is disabled. Please contact your site administrator.",
     "core.captureaudio": "Record audio",
     "core.capturedimage": "Taken picture.",
diff --git a/src/core/course/providers/module-delegate.ts b/src/core/course/providers/module-delegate.ts
index 6edf4bdd9..aedcbdfbb 100644
--- a/src/core/course/providers/module-delegate.ts
+++ b/src/core/course/providers/module-delegate.ts
@@ -278,7 +278,7 @@ export class CoreCourseModuleDelegate extends CoreDelegate {
      * @return Whether module is disabled.
      */
     isModuleDisabledInSite(modname: string, site?: CoreSite): boolean {
-        const handler = this.getHandler(modname, true);
+        const handler = this.getHandler(modname, false);
 
         if (handler) {
             site = site || this.sitesProvider.getCurrentSite();

From c823efe5e4796e00d0edfdeb5336e265c768fd26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 24 Oct 2019 13:16:53 +0200
Subject: [PATCH 093/257] MOBILE-3205 forum: Discussion and post new
 architecture

---
 .../index/addon-mod-forum-index.html          | 73 ++++++++++---------
 .../mod/forum/components/index/index.scss     | 49 +++++++++++++
 .../components/post/addon-mod-forum-post.html | 64 +++++++++-------
 src/addon/mod/forum/components/post/post.scss | 47 ++++++++++++
 4 files changed, 171 insertions(+), 62 deletions(-)

diff --git a/src/addon/mod/forum/components/index/addon-mod-forum-index.html b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
index 7a1641f92..9e9f3badf 100644
--- a/src/addon/mod/forum/components/index/addon-mod-forum-index.html
+++ b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
@@ -43,51 +43,52 @@
                 </div>
 
                 <ng-container *ngFor="let discussion of offlineDiscussions">
-                    <ion-item text-wrap (click)="openNewDiscussion(discussion.timecreated)" [attr.no-lines]="discussion.groupname" [class.core-split-item-selected]="discussion.timecreated == -selectedDiscussion">
-                        <ion-avatar core-user-avatar [user]="discussion" item-start [courseId]="courseId"></ion-avatar>
-                        <h2><core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></h2>
-                        <h3 *ngIf="discussion.userfullname">
-                            <ion-note float-end padding-left><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</ion-note>
-                            {{discussion.userfullname}}
-                        </h3>
-                    </ion-item>
-                    <ion-item *ngIf="discussion.groupname" (click)="openNewDiscussion(discussion.timecreated)" [class.core-split-item-selected]="discussion.timecreated == -selectedDiscussion">
-                        <ion-note text-end>
-                            <ion-icon name="people"></ion-icon> {{ discussion.groupname }}
-                        </ion-note>
+                    <ion-item text-wrap (click)="openNewDiscussion(discussion.timecreated)" [attr.no-lines]="discussion.groupname" [class.core-split-item-selected]="discussion.timecreated == -selectedDiscussion" class="addon-mod-forum-discussion">
+                        <div class="addon-mod-forum-discussion-title">
+                            <h2>
+                                <core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
+                            </h2>
+                        </div>
+                        <div class="addon-mod-forum-discussion-info">
+                            <ion-avatar core-user-avatar [user]="discussion" item-start [courseId]="courseId" *ngIf="discussion.userfullname"></ion-avatar>
+                            <h3 *ngIf="discussion.userfullname">{{discussion.userfullname}}</h3>
+                            <p *ngIf="discussion.groupname"><ion-icon name="people"></ion-icon> {{ discussion.groupname }}</p>
+                            <p><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</p>
+                        </div>
                     </ion-item>
                 </ng-container>
                 <ng-container *ngFor="let discussion of discussions">
-                    <ion-item text-wrap (click)="openDiscussion(discussion)" no-lines [class.core-split-item-selected]="discussion.discussion == selectedDiscussion">
-                        <ion-avatar core-user-avatar [user]="discussion" item-start [courseId]="courseId"></ion-avatar>
-                        <h2>
-                            <core-icon name="fa-map-pin" *ngIf="discussion.pinned"></core-icon>
-                            <core-icon name="fa-star" class="addon-forum-star" *ngIf="!discussion.pinned && discussion.starred"></core-icon>
-                            <core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
-                        </h2>
-                        <h3>
-                            <ion-note float-end padding-left text-end>
-                                <div *ngIf="discussion.numunread"><core-icon name="fa-circle" color="primary"></core-icon> {{ 'addon.mod_forum.unreadpostsnumber' | translate:{ '$a' : discussion.numunread} }}</div>
-                            </ion-note>
-                            {{discussion.userfullname}}
-                        </h3>
-                        <p>{{discussion.created | coreDateDayOrTime}}</p>
-                    </ion-item>
-                    <ion-item (click)="openDiscussion(discussion)" [class.core-split-item-selected]="discussion.discussion == selectedDiscussion">
-                        <ion-row text-center>
-                            <ion-col *ngIf="discussion.groupname">
+                    <ion-item (click)="openDiscussion(discussion)" [class.core-split-item-selected]="discussion.discussion == selectedDiscussion" class="addon-mod-forum-discussion">
+                        <div class="addon-mod-forum-discussion-title">
+                            <h2 text-wrap>
+                                <core-icon name="fa-map-pin" *ngIf="discussion.pinned"></core-icon>
+                                <core-icon name="fa-star" class="addon-forum-star" *ngIf="!discussion.pinned && discussion.starred"></core-icon>
+                                <core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
+                            </h2>
+                            <button ion-button icon-only clear color="dark" (click)="showOptionsMenu($event, discussion)">
+                                <core-icon name="more"></core-icon>
+                            </button>
+                        </div>
+                        <div class="addon-mod-forum-discussion-info">
+                            <ion-avatar core-user-avatar [user]="discussion" item-start [courseId]="courseId"></ion-avatar>
+                            <div class="addon-mod-forum-discussion-author">
+                                <h3>{{discussion.userfullname}}</h3>
+                                <p *ngIf="discussion.groupname"><ion-icon name="people"></ion-icon> {{ discussion.groupname }}</p>
+                                <p>{{discussion.created | coreFormatDate: "strftimedatetimeshort"}}</p>
+                            </div>
+                        </div>
+                        <ion-row text-center class="addon-mod-forum-discussion-more-info">
+                            <ion-col>
                                 <ion-note>
-                                    <ion-icon name="people"></ion-icon> {{ discussion.groupname }}
+                                    <ion-icon name="time"></ion-icon> {{ 'addon.mod_forum.lastpost' | translate }}
+                                    <ng-container *ngIf="discussion.timemodified > discussion.created">{{discussion.timemodified | coreTimeAgo}}</ng-container>
+                                    <ng-container *ngIf="discussion.timemodified <= discussion.created">{{discussion.created | coreTimeAgo}}</ng-container>
                                 </ion-note>
                             </ion-col>
                             <ion-col>
                                 <ion-note>
                                     <ion-icon name="chatboxes"></ion-icon> {{ 'addon.mod_forum.numreplies' | translate:{numreplies: discussion.numreplies} }}
-                                </ion-note>
-                            </ion-col>
-                            <ion-col *ngIf="discussion.timemodified > discussion.created">
-                                <ion-note>
-                                    <ion-icon name="time"></ion-icon> {{ 'addon.mod_forum.lastpost' | translate }} {{discussion.timemodified | coreTimeAgo}}
+                                    <ion-badge text-center *ngIf="discussion.numunread" [attr.aria-label]="'addon.mod_forum.unreadpostsnumber' | translate:{ '$a' : discussion.numunread}">{{ discussion.numunread }}</ion-badge>
                                 </ion-note>
                             </ion-col>
                         </ion-row>
diff --git a/src/addon/mod/forum/components/index/index.scss b/src/addon/mod/forum/components/index/index.scss
index 5b0fd16cc..911c5d809 100644
--- a/src/addon/mod/forum/components/index/index.scss
+++ b/src/addon/mod/forum/components/index/index.scss
@@ -1,5 +1,54 @@
+$addon-forum-avatar-size: 28px;
+
 ion-app.app-root addon-mod-forum-index {
     .addon-forum-star {
         color: $core-star-color;
     }
+
+    .addon-mod-forum-discussion.item {
+        .label {
+            margin-top: 4px;
+
+            h2 {
+                margin-top: 8px;
+                margin-bottom: 8px;
+                font-weight: bold;
+                ion-icon {
+                    @include margin(0, 6px, 0, 0);
+                }
+            }
+            h3 {
+                font-size: 1.6rem;
+            }
+        }
+
+        ion-avatar {
+            width: $addon-forum-avatar-size;
+            height: $addon-forum-avatar-size;
+            min-width: $addon-forum-avatar-size;
+            min-height: $addon-forum-avatar-size;
+            &[item-start] {
+                @include margin(0, 8px, 0, 0);
+            }
+            img {
+                width: $addon-forum-avatar-size;
+                height: $addon-forum-avatar-size;
+            }
+        }
+
+        .addon-mod-forum-discussion-title,
+        .addon-mod-forum-discussion-info {
+            display: flex;
+            align-items: center;
+        }
+        .addon-mod-forum-discussion-title h2,
+        .addon-mod-forum-discussion-info .addon-mod-forum-discussion-author {
+            flex-grow: 1;
+        }
+
+        .addon-mod-forum-discussion-more-info {
+            font-size: 1.4rem;
+            clear: both;
+        }
+    }
 }
diff --git a/src/addon/mod/forum/components/post/addon-mod-forum-post.html b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
index 64f387bfc..f6cca3c17 100644
--- a/src/addon/mod/forum/components/post/addon-mod-forum-post.html
+++ b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
@@ -1,22 +1,30 @@
 <ion-card-header text-wrap no-padding id="addon-mod_forum-post-{{post.id}}">
     <ion-item text-wrap>
-        <ion-avatar core-user-avatar [user]="post" item-start></ion-avatar>
-        <h2>
-            <core-icon name="fa-map-pin" *ngIf="post.parent == 0 && post.pinned"></core-icon>
-            <core-icon name="fa-star" class="addon-forum-star" *ngIf="post.parent == 0 && !post.pinned && post.starred"></core-icon>
-            <span [class.core-bold]="post.parent == 0"><core-format-text [text]="post.subject" contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId"></core-format-text></span>
-        </h2>
-        <p>
-            <ion-note float-end padding-left *ngIf="!post.modified"><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</ion-note>
-            <ion-note float-end padding-left text-end *ngIf="post.modified">
-                {{post.modified | coreDateDayOrTime}}
-                <div *ngIf="trackPosts && !post.postread"><core-icon name="fa-circle" color="primary"></core-icon> {{ 'addon.mod_forum.unread' | translate }}</div>
-            </ion-note>
-            {{post.userfullname}}
-        </p>
+        <div class="addon-mod-forum-post-title">
+            <h2 text-wrap>
+                <core-icon name="fa-map-pin" *ngIf="post.parent == 0 && post.pinned"></core-icon>
+                <core-icon name="fa-star" class="addon-forum-star" *ngIf="post.parent == 0 && !post.pinned && post.starred"></core-icon>
+                <core-format-text [text]="post.subject" contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId"></core-format-text>
+            </h2>
+            <ion-badge float-end padding-left text-end *ngIf="trackPosts && !post.postread" [attr.aria-label]="'addon.mod_forum.unread' | translate">
+                <core-icon name="fa-circle" color="primary"></core-icon>
+            </ion-badge>
+            <button ion-button icon-only clear color="dark" (click)="showCourseOptionsMenu($event)">
+                <core-icon name="more"></core-icon>
+            </button>
+        </div>
+        <div class="addon-mod-forum-post-info">
+            <ion-avatar core-user-avatar [user]="post" item-start [courseId]="courseId"></ion-avatar>
+            <div class="addon-mod-forum-post-author">
+                <h3>{{post.userfullname}}</h3>
+                <p *ngIf="post.groupname"><ion-icon name="people"></ion-icon> {{ post.groupname }}</p>
+                <p *ngIf="post.modified">{{post.modified | coreFormatDate: "strftimedatetimeshort"}}</p>
+                <p *ngIf="!post.modified"><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</p>
+            </div>
+        </div>
     </ion-item>
 </ion-card-header>
-<ion-card-content padding-top>
+<ion-card-content [attr.padding-top]="post.parent == 0 || null">
     <div padding-bottom *ngIf="post.isprivatereply">
         <ion-note>{{ 'addon.mod_forum.postisprivatereply' | translate }}</ion-note>
     </div>
@@ -30,22 +38,26 @@
         </ng-container>
     </div>
 </ion-card-content>
-<ion-item text-wrap *ngIf="tagsEnabled && post.tags && post.tags.length > 0">
-    <div item-start>{{ 'core.tag.tags' | translate }}:</div>
-    <core-tag-list [tags]="post.tags"></core-tag-list>
-</ion-item>
-<core-rating-rate *ngIf="forum && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="componentId" [itemId]="post.id" [itemSetId]="discussionId" [courseId]="courseId" [aggregateMethod]="forum.assessed" [scaleId]="forum.scale" [userId]="post.userid" (onUpdate)="ratingUpdated()"></core-rating-rate>
-<core-rating-aggregate *ngIf="forum && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="componentId" [itemId]="post.id" [courseId]="courseId" [aggregateMethod]="forum.assessed" [scaleId]="forum.scale"></core-rating-aggregate>
-<ion-item no-padding text-end *ngIf="post.id && post.canreply && !post.isprivatereply" class="addon-forum-reply-button">
-    <button ion-button icon-left clear small (click)="showReply()" [attr.aria-controls]="'addon-forum-reply-edit-form-' + uniqueId" [attr.aria-expanded]="replyData.replyingTo === post.id">
-        <ion-icon name="undo"></ion-icon> {{ 'addon.mod_forum.reply' | translate }}
-    </button>
-</ion-item>
+<div class="addon-mod-forum-post-more-info">
+    <ion-item text-wrap *ngIf="tagsEnabled && post.tags && post.tags.length > 0">
+        <div item-start>{{ 'core.tag.tags' | translate }}:</div>
+        <core-tag-list [tags]="post.tags"></core-tag-list>
+    </ion-item>
+    <core-rating-rate *ngIf="forum && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="componentId" [itemId]="post.id" [itemSetId]="discussionId" [courseId]="courseId" [aggregateMethod]="forum.assessed" [scaleId]="forum.scale" [userId]="post.userid" (onUpdate)="ratingUpdated()"></core-rating-rate>
+    <core-rating-aggregate *ngIf="forum && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="componentId" [itemId]="post.id" [courseId]="courseId" [aggregateMethod]="forum.assessed" [scaleId]="forum.scale"></core-rating-aggregate>
+
+    <ion-item no-padding text-end *ngIf="post.id && post.canreply && !post.isprivatereply" class="addon-forum-reply-button">
+        <button ion-button icon-left clear small (click)="showReply()" [attr.aria-controls]="'addon-forum-reply-edit-form-' + uniqueId" [attr.aria-expanded]="replyData.replyingTo === post.id">
+            <ion-icon name="undo"></ion-icon> {{ 'addon.mod_forum.reply' | translate }}
+        </button>
+    </ion-item>
+</div>
 <ion-item text-end *ngIf="!post.id && (!replyData.isEditing || replyData.replyingTo != post.parent)">
     <button ion-button icon-left clear small (click)="editReply()" [attr.aria-controls]="'addon-forum-reply-edit-form-' + uniqueId" [attr.aria-expanded]="replyData.replyingTo === post.parent">
         <ion-icon name="create"></ion-icon> {{ 'addon.mod_forum.edit' | translate }}
     </button>
 </ion-item>
+
 <ion-list [id]="'addon-forum-reply-edit-form-' + uniqueId" *ngIf="(post.id && !replyData.isEditing && replyData.replyingTo == post.id) || (!post.id && replyData.isEditing && replyData.replyingTo == post.parent)">
     <ion-item>
         <ion-label stacked>{{ 'addon.mod_forum.subject' | translate }}</ion-label>
diff --git a/src/addon/mod/forum/components/post/post.scss b/src/addon/mod/forum/components/post/post.scss
index 43358381e..429be2b80 100644
--- a/src/addon/mod/forum/components/post/post.scss
+++ b/src/addon/mod/forum/components/post/post.scss
@@ -2,4 +2,51 @@ ion-app.app-root addon-mod-forum-post {
     .addon-forum-star {
         color: $core-star-color;
     }
+
+    .card-header .item {
+        .label {
+            margin-top: 4px;
+
+            h2 {
+                margin-top: 8px;
+                margin-bottom: 8px;
+                font-weight: bold;
+                ion-icon {
+                    @include margin(0, 6px, 0, 0);
+                }
+            }
+            h3 {
+                font-size: 1.6rem;
+            }
+        }
+
+        ion-avatar {
+            width: $addon-forum-avatar-size;
+            height: $addon-forum-avatar-size;
+            min-width: $addon-forum-avatar-size;
+            min-height: $addon-forum-avatar-size;
+            &[item-start] {
+                @include margin(0, 8px, 0, 0);
+            }
+            img {
+                width: $addon-forum-avatar-size;
+                height: $addon-forum-avatar-size;
+            }
+        }
+
+        .addon-mod-forum-post-title,
+        .addon-mod-forum-post-info {
+            display: flex;
+            align-items: center;
+        }
+        .addon-mod-forum-post-title h2,
+        .addon-mod-forum-post-info .addon-mod-forum-post-author {
+            flex-grow: 1;
+        }
+    }
+
+    .addon-mod-forum-post-more-info div {
+        font-size: 1.4rem;
+    }
 }
+

From 4b3c18d03df3ed589b7b9ff5e9042698017612be Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 24 Oct 2019 10:54:06 +0200
Subject: [PATCH 094/257] MOBILE-1501 participants: Allow searching
 participants

---
 .../search-box/core-search-box.html           |   4 +-
 .../participants/core-user-participants.html  |  28 ++++-
 .../components/participants/participants.ts   | 103 +++++++++++++++++-
 src/core/user/providers/user.ts               |  63 +++++++++++
 4 files changed, 184 insertions(+), 14 deletions(-)

diff --git a/src/components/search-box/core-search-box.html b/src/components/search-box/core-search-box.html
index 260d45215..84a8e4b74 100644
--- a/src/components/search-box/core-search-box.html
+++ b/src/components/search-box/core-search-box.html
@@ -2,10 +2,10 @@
     <form #f="ngForm" (ngSubmit)="submitForm($event)" role="search">
         <ion-item>
             <ion-input type="search" name="search" [(ngModel)]="searchText" [placeholder]="placeholder" [autocorrect]="autocorrect" [spellcheck]="spellcheck" [core-auto-focus]="autoFocus" [disabled]="disabled" role="searchbox"></ion-input>
-            <button item-end ion-button clear icon-only type="submit" class="button-small" [attr.aria-label]="searchLabel" [disabled]="!searchText || (searchText.length < lengthCheck)" [disabled]="disabled">
+            <button item-end ion-button clear icon-only type="submit" class="button-small" [attr.aria-label]="searchLabel" [disabled]="disabled || !searchText || (searchText.length < lengthCheck)">
                 <ion-icon name="search"></ion-icon>
             </button>
-            <button *ngIf="showClear" item-end ion-button clear icon-only class="button-small" [attr.aria-label]="'core.clearsearch' | translate" [disabled]="!searched" (click)="clearForm()" [disabled]="disabled">
+            <button *ngIf="showClear" item-end ion-button clear icon-only class="button-small" [attr.aria-label]="'core.clearsearch' | translate" [disabled]="!searched || disabled" (click)="clearForm()">
                 <ion-icon name="close"></ion-icon>
             </button>
         </ion-item>
diff --git a/src/core/user/components/participants/core-user-participants.html b/src/core/user/components/participants/core-user-participants.html
index 269eee659..78b894138 100644
--- a/src/core/user/components/participants/core-user-participants.html
+++ b/src/core/user/components/participants/core-user-participants.html
@@ -1,21 +1,37 @@
+<core-navbar-buttons>
+    <button [hidden]="!canSearch" ion-button icon-only (click)="toggleSearch()" [attr.aria-label]="'core.search' | translate">
+        <ion-icon name="search"></ion-icon>
+    </button>
+</core-navbar-buttons>
+
 <core-split-view>
     <ion-content>
-        <ion-refresher [enabled]="participantsLoaded" (ionRefresh)="refreshParticipants($event)">
+        <ion-refresher [enabled]="participantsLoaded && !displaySearchResult" (ionRefresh)="refreshParticipants($event)">
             <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
         </ion-refresher>
+
+        <core-search-box *ngIf="showSearchBox" (onSubmit)="search($event)" (onClear)="clearSearch($event)" [disabled]="disableSearch" autocorrect="off" [spellcheck]="false" [autoFocus]="true" [lengthCheck]="1"></core-search-box>
+
         <core-loading [hideUntil]="participantsLoaded">
-            <core-empty-box *ngIf="participants && participants.length == 0" icon="person" [message]="'core.user.noparticipants' | translate">
+            <core-empty-box *ngIf="!displaySearchResults && !participants.length" icon="person" [message]="'core.user.noparticipants' | translate">
             </core-empty-box>
 
+            <core-empty-box *ngIf="displaySearchResults && !participants.length" icon="search" [message]="'core.noresults' | translate"></core-empty-box>
+
             <ion-list *ngIf="participants && participants.length > 0" no-margin>
                 <a ion-item text-wrap *ngFor="let participant of participants" [title]="participant.fullname" (click)="gotoParticipant(participant.id)" [class.core-split-item-selected]="participant.id == participantId">
                     <ion-avatar core-user-avatar [user]="participant" item-start [userId]="participant.id" [checkOnline]="true"></ion-avatar>
-                    <h2>{{ participant.fullname }}</h2>
-                    <p *ngIf="participant.lastcourseaccess"><strong>{{ 'core.lastaccess' | translate }}: </strong>{{ participant.lastcourseaccess | coreTimeAgo }}</p>
-                    <p *ngIf="participant.lastcourseaccess == null && participant.lastaccess"><strong>{{ 'core.lastaccess' | translate }}: </strong>{{ participant.lastaccess | coreTimeAgo }}</p>
+                    <ng-container *ngIf="!displaySearchResults">
+                        <h2>{{ participant.fullname }}</h2>
+                        <p *ngIf="participant.lastcourseaccess"><strong>{{ 'core.lastaccess' | translate }}: </strong>{{ participant.lastcourseaccess | coreTimeAgo }}</p>
+                        <p *ngIf="participant.lastcourseaccess == null && participant.lastaccess"><strong>{{ 'core.lastaccess' | translate }}: </strong>{{ participant.lastaccess | coreTimeAgo }}</p>
+                    </ng-container>
+                    <ng-container *ngIf="displaySearchResults">
+                        <h2><core-format-text [text]="participant.fullname" [highlight]="searchQuery" [filter]="false"></core-format-text></h2>
+                    </ng-container>
                 </a>
             </ion-list>
-            <core-infinite-loading [enabled]="canLoadMore" (action)="loadMoreData($event)" [error]="loadMoreError"></core-infinite-loading>
+            <core-infinite-loading [enabled]="canLoadMore && participantsLoaded" (action)="loadMoreData($event)" [error]="loadMoreError"></core-infinite-loading>
         </core-loading>
     </ion-content>
 </core-split-view>
\ No newline at end of file
diff --git a/src/core/user/components/participants/participants.ts b/src/core/user/components/participants/participants.ts
index ccc1b0b83..330daf791 100644
--- a/src/core/user/components/participants/participants.ts
+++ b/src/core/user/components/participants/participants.ts
@@ -17,6 +17,7 @@ import { Content } from 'ionic-angular';
 import { CoreUserProvider } from '../../providers/user';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
+import { CoreAppProvider } from '@providers/app';
 
 /**
  * Component that displays the list of course participants.
@@ -36,13 +37,24 @@ export class CoreUserParticipantsComponent implements OnInit {
     canLoadMore = false;
     loadMoreError = false;
     participantsLoaded = false;
+    canSearch = false;
+    showSearchBox = false;
+    disableSearch = false;
+    displaySearchResults = false;
+    searchQuery = '';
 
-    constructor(private userProvider: CoreUserProvider, private domUtils: CoreDomUtilsProvider) { }
+    protected searchPage = 0;
+
+    constructor(private userProvider: CoreUserProvider,
+            private domUtils: CoreDomUtilsProvider,
+            private appProvider: CoreAppProvider) { }
 
     /**
      * View loaded.
      */
     ngOnInit(): void {
+        this.canSearch = this.userProvider.canSearchParticipantsInSite();
+
         // Get first participants.
         this.fetchData(true).then(() => {
             if (!this.participantId && this.splitviewCtrl.isOn() && this.participants.length > 0) {
@@ -54,8 +66,6 @@ export class CoreUserParticipantsComponent implements OnInit {
                 // Ignore errors.
             });
         }).finally(() => {
-            this.participantsLoaded = true;
-
             // Call resize to make infinite loading work, in some cases the content dimensions aren't read.
             this.content && this.content.resize();
         });
@@ -81,6 +91,8 @@ export class CoreUserParticipantsComponent implements OnInit {
         }).catch((error) => {
             this.domUtils.showErrorModalDefault(error, 'Error loading participants');
             this.loadMoreError = true; // Set to prevent infinite calls with infinite-loading.
+        }).finally(() => {
+            this.participantsLoaded = true;
         });
     }
 
@@ -91,9 +103,15 @@ export class CoreUserParticipantsComponent implements OnInit {
      * @return Resolved when done.
      */
     loadMoreData(infiniteComplete?: any): Promise<any> {
-        return this.fetchData().finally(() => {
-            infiniteComplete && infiniteComplete();
-        });
+        if (this.displaySearchResults) {
+            return this.search(this.searchQuery, true).finally(() => {
+                infiniteComplete && infiniteComplete();
+            });
+        } else {
+            return this.fetchData().finally(() => {
+                infiniteComplete && infiniteComplete();
+            });
+        }
     }
 
     /**
@@ -111,10 +129,83 @@ export class CoreUserParticipantsComponent implements OnInit {
 
     /**
      * Navigate to a particular user profile.
+     *
      * @param userId User Id where to navigate.
      */
     gotoParticipant(userId: number): void {
         this.participantId = userId;
         this.splitviewCtrl.push('CoreUserProfilePage', {userId: userId, courseId: this.courseId});
     }
+
+    /**
+     * Show or hide search box.
+     */
+    toggleSearch(): void {
+        this.showSearchBox = !this.showSearchBox;
+
+        if (!this.showSearchBox && this.displaySearchResults) {
+            this.clearSearch();
+        }
+    }
+
+    /**
+     * Clear search.
+     */
+    clearSearch(): void {
+        if (!this.displaySearchResults) {
+            // Nothing to clear.
+            return;
+        }
+
+        this.searchQuery = '';
+        this.displaySearchResults = false;
+        this.participants = [];
+        this.searchPage = 0;
+        this.splitviewCtrl.emptyDetails();
+
+        // Remove search results and display all participants.
+        this.participantsLoaded = false;
+        this.fetchData(true);
+    }
+
+    /**
+     * Start a new search or load more results.
+     *
+     * @param query Text to search for.
+     * @param loadMore Whether it's loading more or doing a new search.
+     * @return Resolved when done.
+     */
+    search(query: string, loadMore?: boolean): Promise<any> {
+        this.appProvider.closeKeyboard();
+
+        this.disableSearch = true;
+        this.participantsLoaded = loadMore;
+        this.loadMoreError = false;
+
+        if (!loadMore) {
+            this.participantsLoaded = false;
+            this.searchQuery = query;
+            this.searchPage = 0;
+            this.participants = [];
+        }
+
+        return this.userProvider.searchParticipants(this.courseId, query, true, this.searchPage).then((result) => {
+
+            this.participants.push(...result.participants);
+            this.canLoadMore = result.canLoadMore;
+            this.searchPage++;
+
+            if (!loadMore && this.participants.length) {
+                this.gotoParticipant(this.participants[0].id);
+            }
+        }).catch((error) => {
+            this.domUtils.showErrorModalDefault(error, 'Error searching users.');
+            this.loadMoreError = true;
+
+        }).finally(() => {
+            this.disableSearch = false;
+            this.participantsLoaded = true;
+            this.displaySearchResults = true;
+        });
+    }
 }
diff --git a/src/core/user/providers/user.ts b/src/core/user/providers/user.ts
index e42a974be..fc685dadb 100644
--- a/src/core/user/providers/user.ts
+++ b/src/core/user/providers/user.ts
@@ -69,6 +69,32 @@ export class CoreUserProvider {
         this.sitesProvider.registerSiteSchema(this.siteSchema);
     }
 
+    /**
+     * Check if WS to search participants is available in site.
+     *
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with boolean: whether it's available.
+     * @since 3.8
+     */
+    canSearchParticipants(siteId?: string): Promise<boolean> {
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            return this.canSearchParticipantsInSite(site);
+        });
+    }
+
+    /**
+     * Check if WS to search participants is available in site.
+     *
+     * @param site Site. If not defined, current site.
+     * @return Whether it's available.
+     * @since 3.8
+     */
+    canSearchParticipantsInSite(site?: CoreSite): boolean {
+        site = site || this.sitesProvider.getCurrentSite();
+
+        return site.wsAvailable('core_enrol_search_users');
+    }
+
     /**
      * Change the given user profile picture.
      *
@@ -505,6 +531,43 @@ export class CoreUserProvider {
         return Promise.all(promises);
     }
 
+    /**
+     * Search participants in a certain course.
+     *
+     * @param courseId ID of the course.
+     * @param search The string to search.
+     * @param searchAnywhere Whether to find a match anywhere or only at the beginning.
+     * @param page Page to get.
+     * @param limitNumber Number of participants to get.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved when the participants are retrieved.
+     * @since 3.8
+     */
+    searchParticipants(courseId: number, search: string, searchAnywhere: boolean = true, page: number = 0,
+            perPage: number = CoreUserProvider.PARTICIPANTS_LIST_LIMIT, siteId?: string)
+            : Promise<{participants: any[], canLoadMore: boolean}> {
+
+        return this.sitesProvider.getSite(siteId).then((site) => {
+
+            const data = {
+                    courseid: courseId,
+                    search: search,
+                    searchanywhere: searchAnywhere ? 1 : 0,
+                    page: page,
+                    perpage: perPage,
+                }, preSets: any = {
+                    getFromCache: false // Always try to get updated data. If it fails, it will get it from cache.
+                };
+
+            return site.read('core_enrol_search_users', data, preSets).then((users) => {
+                const canLoadMore = users.length >= perPage;
+                this.storeUsers(users, siteId);
+
+                return { participants: users, canLoadMore: canLoadMore };
+            });
+        });
+    }
+
     /**
      * Store user basic information in local DB to be retrieved if the WS call fails.
      *

From 012aa2563f769efd04b5e738daa36cd471777ffa Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 9 Oct 2019 11:38:12 +0200
Subject: [PATCH 095/257] MOBILE-1611 mathjax: Install MathJax library

---
 config/copy.config.js |   6 +-
 package-lock.json     | 171 ++++++++++++------------------------------
 package.json          |   1 +
 src/index.html        |   2 +
 4 files changed, 58 insertions(+), 122 deletions(-)

diff --git a/config/copy.config.js b/config/copy.config.js
index 7f0f0686f..ddbcafc88 100644
--- a/config/copy.config.js
+++ b/config/copy.config.js
@@ -12,5 +12,9 @@ module.exports = {
   copyConfig: {
     src: ['{{ROOT}}/src/config.json'],
     dest: '{{WWW}}/'
-  }
+  },
+  copyMathJax: {
+    src: ['{{ROOT}}/node_modules/mathjax/**/*'],
+    dest: '{{WWW}}/lib/mathjax'
+  },
 };
diff --git a/package-lock.json b/package-lock.json
index a5a04e889..acf72dd24 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "moodlemobile",
-  "version": "3.7.1",
+  "version": "3.8.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -503,8 +503,7 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -525,14 +524,12 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -547,20 +544,17 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -677,8 +671,7 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "ini": {
               "version": "1.3.5",
@@ -690,7 +683,6 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -705,7 +697,6 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -713,14 +704,12 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -739,7 +728,6 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -820,8 +808,7 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -833,7 +820,6 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -919,8 +905,7 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -956,7 +941,6 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -976,7 +960,6 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -1020,14 +1003,12 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         },
@@ -5243,8 +5224,7 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5262,13 +5242,11 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5281,18 +5259,15 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5395,8 +5370,7 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5406,7 +5380,6 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5419,20 +5392,17 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5449,7 +5419,6 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5528,8 +5497,7 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5539,7 +5507,6 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5615,8 +5582,7 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5646,7 +5612,6 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5664,7 +5629,6 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5703,13 +5667,11 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         }
       }
     },
@@ -6136,8 +6098,7 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -6158,14 +6119,12 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -6180,20 +6139,17 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -6310,8 +6266,7 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "ini": {
               "version": "1.3.5",
@@ -6323,7 +6278,6 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -6338,7 +6292,6 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -6346,14 +6299,12 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -6372,7 +6323,6 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -6453,8 +6403,7 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -6466,7 +6415,6 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -6552,8 +6500,7 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -6589,7 +6536,6 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -6609,7 +6555,6 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -6653,14 +6598,12 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         },
@@ -8863,6 +8806,11 @@
       "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
       "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="
     },
+    "mathjax": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/mathjax/-/mathjax-2.7.2.tgz",
+      "integrity": "sha512-Z9te7r3lsjZibugO1uKsdyqICKXVNr7M1Ll2GtjJu9cUKvOvwDqEp0YIjBD4H58NNuPg5DP5/AQ2Tu8K52Mqng=="
+    },
     "md5-file": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-4.0.0.tgz",
@@ -12921,8 +12869,7 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -12943,14 +12890,12 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -12965,20 +12910,17 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -13095,8 +13037,7 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "ini": {
               "version": "1.3.5",
@@ -13108,7 +13049,6 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -13123,7 +13063,6 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -13131,14 +13070,12 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -13157,7 +13094,6 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -13238,8 +13174,7 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -13251,7 +13186,6 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -13337,8 +13271,7 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -13374,7 +13307,6 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -13394,7 +13326,6 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -13438,14 +13369,12 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         },
diff --git a/package.json b/package.json
index 28931d637..bede60886 100644
--- a/package.json
+++ b/package.json
@@ -113,6 +113,7 @@
     "ionic-angular": "3.9.3",
     "ionicons": "^3.0.0",
     "jszip": "^3.1.5",
+    "mathjax": "2.7.2",
     "moment": "^2.22.2",
     "nl.kingsquare.cordova.background-audio": "^1.0.1",
     "phonegap-plugin-multidex": "^1.0.0",
diff --git a/src/index.html b/src/index.html
index 066800c23..bd4bf7fb1 100644
--- a/src/index.html
+++ b/src/index.html
@@ -58,6 +58,8 @@
 
   <link href="build/main.css" rel="stylesheet">
 
+  <script src="lib/mathjax/MathJax.js?delayStartupUntil=configured"></script>
+
 </head>
 <body>
 

From c18d8b1d12af1418836bbbc6da23850527874e5c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 9 Oct 2019 12:06:41 +0200
Subject: [PATCH 096/257] MOBILE-1611 mathjax: Support MathJax in the app

---
 .../calendar/pages/edit-event/edit-event.ts   |   4 +-
 src/addon/filter/filter.module.ts             |   2 +
 .../mathjaxloader/mathjaxloader.module.ts     |  34 ++
 .../filter/mathjaxloader/providers/handler.ts | 374 ++++++++++++++++++
 .../filter/multilang/providers/handler.ts     |   5 -
 .../messages/providers/mainmenu-handler.ts    |   6 +-
 src/components/site-picker/site-picker.ts     |   6 +-
 .../module-completion/module-completion.ts    |   6 +-
 src/core/course/pages/section/section.ts      |   4 +-
 src/core/filter/providers/default-filter.ts   |  15 +
 src/core/filter/providers/delegate.ts         | 124 ++++--
 src/core/filter/providers/helper.ts           |   6 +-
 src/core/login/pages/sites/sites.ts           |   5 +-
 src/core/settings/pages/general/general.ts    |   2 +-
 .../settings/pages/space-usage/space-usage.ts |   4 +-
 src/directives/format-text.ts                 |  72 +++-
 src/providers/utils/text.ts                   |  30 ++
 src/providers/utils/url.ts                    |  23 ++
 18 files changed, 652 insertions(+), 70 deletions(-)
 create mode 100644 src/addon/filter/mathjaxloader/mathjaxloader.module.ts
 create mode 100644 src/addon/filter/mathjaxloader/providers/handler.ts

diff --git a/src/addon/calendar/pages/edit-event/edit-event.ts b/src/addon/calendar/pages/edit-event/edit-event.ts
index 04027cae0..293d1fd62 100644
--- a/src/addon/calendar/pages/edit-event/edit-event.ts
+++ b/src/addon/calendar/pages/edit-event/edit-event.ts
@@ -245,8 +245,8 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
                     const subPromises = [];
                     courses.forEach((course) => {
                         subPromises.push(this.filterHelper.getFiltersAndFormatText(course.fullname, 'course', course.id)
-                                .then((text) => {
-                            course.fullname = text;
+                                .then((result) => {
+                            course.fullname = result.text;
                         }).catch(() => {
                             // Ignore errors.
                         }));
diff --git a/src/addon/filter/filter.module.ts b/src/addon/filter/filter.module.ts
index f2646d346..57e177598 100644
--- a/src/addon/filter/filter.module.ts
+++ b/src/addon/filter/filter.module.ts
@@ -20,6 +20,7 @@ import { AddonFilterDataModule } from './data/data.module';
 import { AddonFilterEmailProtectModule } from './emailprotect/emailprotect.module';
 import { AddonFilterEmoticonModule } from './emoticon/emoticon.module';
 import { AddonFilterGlossaryModule } from './glossary/glossary.module';
+import { AddonFilterMathJaxLoaderModule } from './mathjaxloader/mathjaxloader.module';
 import { AddonFilterMediaPluginModule } from './mediaplugin/mediaplugin.module';
 import { AddonFilterMultilangModule } from './multilang/multilang.module';
 import { AddonFilterTexModule } from './tex/tex.module';
@@ -36,6 +37,7 @@ import { AddonFilterUrlToLinkModule } from './urltolink/urltolink.module';
         AddonFilterEmailProtectModule,
         AddonFilterEmoticonModule,
         AddonFilterGlossaryModule,
+        AddonFilterMathJaxLoaderModule,
         AddonFilterMediaPluginModule,
         AddonFilterMultilangModule,
         AddonFilterTexModule,
diff --git a/src/addon/filter/mathjaxloader/mathjaxloader.module.ts b/src/addon/filter/mathjaxloader/mathjaxloader.module.ts
new file mode 100644
index 000000000..0af91a79e
--- /dev/null
+++ b/src/addon/filter/mathjaxloader/mathjaxloader.module.ts
@@ -0,0 +1,34 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { IonicModule } from 'ionic-angular';
+import { CoreFilterDelegate } from '@core/filter/providers/delegate';
+import { AddonFilterMathJaxLoaderHandler } from './providers/handler';
+
+@NgModule({
+    declarations: [
+    ],
+    imports: [
+        IonicModule
+    ],
+    providers: [
+        AddonFilterMathJaxLoaderHandler
+    ]
+})
+export class AddonFilterMathJaxLoaderModule {
+    constructor(filterDelegate: CoreFilterDelegate, handler: AddonFilterMathJaxLoaderHandler) {
+        filterDelegate.registerHandler(handler);
+    }
+}
diff --git a/src/addon/filter/mathjaxloader/providers/handler.ts b/src/addon/filter/mathjaxloader/providers/handler.ts
new file mode 100644
index 000000000..0b8501685
--- /dev/null
+++ b/src/addon/filter/mathjaxloader/providers/handler.ts
@@ -0,0 +1,374 @@
+
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+import { CoreFilterFilter, CoreFilterFormatTextOptions } from '@core/filter/providers/filter';
+import { CoreEventsProvider } from '@providers/events';
+import { CoreLangProvider } from '@providers/lang';
+import { CoreSitesProvider } from '@providers/sites';
+import { CoreTextUtilsProvider } from '@providers/utils/text';
+import { CoreUtilsProvider } from '@providers/utils/utils';
+import { CoreSite } from '@classes/site';
+
+/**
+ * Handler to support the MathJax filter.
+ */
+@Injectable()
+export class AddonFilterMathJaxLoaderHandler extends CoreFilterDefaultHandler {
+    name = 'AddonFilterMathJaxLoaderHandler';
+    filterName = 'mathjaxloader';
+
+    // Default values for MathJax config for sites where we cannot retrieve it.
+    protected DEFAULT_URL = 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/MathJax.js';
+    protected DEFAULT_CONFIG = 'MathJax.Hub.Config({' +
+            'config: ["Accessible.js", "Safe.js"],' +
+            'errorSettings: { message: ["!"] },' +
+            'skipStartupTypeset: true,' +
+            'messageStyle: "none"' +
+        '});';
+
+    // List of language codes found in the MathJax/localization/ directory.
+    protected MATHJAX_LANG_CODES = [
+            'ar', 'ast', 'bcc', 'bg', 'br', 'ca', 'cdo', 'ce', 'cs', 'cy', 'da', 'de', 'diq', 'en', 'eo', 'es', 'fa',
+            'fi', 'fr', 'gl', 'he', 'ia', 'it', 'ja', 'kn', 'ko', 'lb', 'lki', 'lt', 'mk', 'nl', 'oc', 'pl', 'pt',
+            'pt-br', 'qqq', 'ru', 'scn', 'sco', 'sk', 'sl', 'sv', 'th', 'tr', 'uk', 'vi', 'zh-hans', 'zh-hant'
+        ];
+
+    // List of explicit mappings and known exceptions (moodle => mathjax).
+    protected EXPLICIT_MAPPING = {
+            'cz': 'cs',
+            'zh-tw': 'zh-hant',
+            'zh-cn': 'zh-hans',
+        };
+
+    protected window: any = window; // Convert the window to <any> to be able to use non-standard properties like MathJax.
+
+    constructor(eventsProvider: CoreEventsProvider,
+            private langProvider: CoreLangProvider,
+            private sitesProvider: CoreSitesProvider,
+            private textUtils: CoreTextUtilsProvider,
+            private utils: CoreUtilsProvider) {
+        super();
+
+        // Load the JS.
+        this.loadJS();
+
+        // Get the current language.
+        this.langProvider.getCurrentLanguage().then((lang) => {
+            lang = this.mapLanguageCode(lang);
+
+            // Now call the configure function.
+            this.window.M.filter_mathjaxloader.configure({
+                mathjaxconfig: this.DEFAULT_CONFIG,
+                lang: lang
+            });
+        });
+
+        // Update MathJax locale if app language changes.
+        eventsProvider.on(CoreEventsProvider.LANGUAGE_CHANGED, (lang) => {
+            if (typeof this.window.MathJax != 'undefined') {
+                lang = this.mapLanguageCode(lang);
+
+                this.window.MathJax.Hub.Queue(() => {
+                    this.window.MathJax.Localization.setLocale(lang);
+                });
+            }
+        });
+    }
+
+    /**
+     * Filter some text.
+     *
+     * @param text The text to filter.
+     * @param filter The filter.
+     * @param options Options passed to the filters.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Filtered text (or promise resolved with the filtered text).
+     */
+    filter(text: string, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions, siteId?: string)
+            : string | Promise<string> {
+
+        return this.sitesProvider.getSite(siteId).then((site) => {
+
+            // Don't apply this filter if Moodle is 3.7 or higher and the WS already filtered the content.
+            if (!options.wsNotFiltered && site.isVersionGreaterEqualThan('3.7')) {
+                return text;
+            }
+
+            if (text.indexOf('class="filter_mathjaxloader_equation"') != -1) {
+                // The content seems to have treated mathjax already, don't do it.
+                return text;
+            }
+
+            // We cannot get the filter settings, so we cannot know if it can be used as a replacement for the TeX filter.
+            // Assume it cannot (default value).
+
+            let hasDisplayOrInline = false;
+            if (text.match(/\\[\[\(]/) || text.match(/\$\$/)) {
+                // Only parse the text if there are mathjax symbols in it.
+                // The recognized math environments are \[ \] and $$ $$ for display mathematics and \( \) for inline mathematics.
+                // Wrap display and inline math environments in nolink spans.
+                const result = this.wrapMathInNoLink(text);
+                text = result.text;
+                hasDisplayOrInline = result.changed;
+            }
+
+            if (hasDisplayOrInline) {
+                return '<span class="filter_mathjaxloader_equation">' + text + '</span>';
+            }
+
+            return text;
+        });
+    }
+
+    /**
+     * Handle HTML. This function is called after "filter", and it will receive an HTMLElement containing the text that was
+     * filtered.
+     *
+     * @param container The HTML container to handle.
+     * @param filter The filter.
+     * @param options Options passed to the filters.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If async, promise resolved when done.
+     */
+    handleHtml(container: HTMLElement, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions, siteId?: string)
+            : void | Promise<void> {
+
+        return this.waitForReady().then(() => {
+            this.window.M.filter_mathjaxloader.typeset(container);
+        });
+    }
+
+    /**
+     * Wrap a portion of the $text inside a no link span. The whole text is then returned.
+     *
+     * @param text The text to modify.
+     * @param start The start index of the substring in text that should be wrapped in the span.
+     * @param end The end index of the substring in text that should be wrapped in the span.
+     * @return The whole text with the span inserted around the defined substring.
+     */
+    protected insertSpan(text: string, start: number, end: number): string {
+        return this.textUtils.substrReplace(text,
+                '<span class="nolink">' + text.substr(start, end - start + 1) + '</span>',
+                start,
+                end - start + 1);
+    }
+
+    /**
+     * Check if the JS library has been loaded.
+     *
+     * @return {boolean} Whether the library has been loaded.
+     */
+    protected jsLoaded(): boolean {
+        return this.window.M && this.window.M.filter_mathjaxloader;
+    }
+
+    /**
+     * Load the JS to make MathJax work in the app. The JS loaded is extracted from Moodle filter's loader JS file.
+     */
+    protected loadJS(): void {
+        // tslint:disable: no-this-assignment
+        const that = this;
+
+        this.window.M = this.window.M || {};
+        this.window.M.filter_mathjaxloader = this.window.M.filter_mathjaxloader || {
+            _lang: '',
+            _configured: false,
+            // Add the configuration to the head and set the lang.
+            configure: function (params: any): void {
+                // Add a js configuration object to the head.
+                const script = document.createElement('script');
+                script.type = 'text/x-mathjax-config';
+                script.text = params.mathjaxconfig;
+                document.head.appendChild(script);
+
+                // Save the lang config until MathJax is actually loaded.
+                this._lang = params.lang;
+            },
+            // Set the correct language for the MathJax menus.
+            _setLocale: function (): void {
+                if (!this._configured) {
+                    const lang = this._lang;
+
+                    if (typeof that.window.MathJax != 'undefined') {
+                        that.window.MathJax.Hub.Queue(() => {
+                            that.window.MathJax.Localization.setLocale(lang);
+                        });
+                        that.window.MathJax.Hub.Configured();
+                        this._configured = true;
+                    }
+                }
+            },
+            // Called by the filter when an equation is found while rendering the page.
+            typeset: function (container: HTMLElement): void {
+                if (!this._configured) {
+                    this._setLocale();
+                }
+
+                if (typeof that.window.MathJax != 'undefined') {
+                    const processDelay = that.window.MathJax.Hub.processSectionDelay;
+                    // Set the process section delay to 0 when updating the formula.
+                    that.window.MathJax.Hub.processSectionDelay = 0;
+
+                    const equations = Array.from(container.querySelectorAll('.filter_mathjaxloader_equation'));
+                    equations.forEach((node) => {
+                        that.window.MathJax.Hub.Queue(['Typeset', that.window.MathJax.Hub, node]);
+                    });
+
+                    // Set the delay back to normal after processing.
+                    that.window.MathJax.Hub.processSectionDelay = processDelay;
+                }
+            }
+        };
+    }
+
+    /**
+     * Perform a mapping of the app language code to the equivalent for MathJax.
+     *
+     * @param langCode The app language code.
+     * @return The MathJax language code.
+     */
+    protected mapLanguageCode(langCode: string): string {
+
+        // If defined, explicit mapping takes the highest precedence.
+        if (this.EXPLICIT_MAPPING[langCode]) {
+            return this.EXPLICIT_MAPPING[langCode];
+        }
+
+        // If there is exact match, it will be probably right.
+        if (this.MATHJAX_LANG_CODES.indexOf(langCode) != -1) {
+            return langCode;
+        }
+
+        // Finally try to find the best matching mathjax pack.
+        const parts = langCode.split('-');
+        if (this.MATHJAX_LANG_CODES.indexOf(parts[0]) != -1) {
+            return parts[0];
+        }
+
+        // No more guessing, use default language.
+        return this.langProvider.getDefaultLanguage();
+    }
+
+    /**
+     * Check if the filter should be applied in a certain site based on some filter options.
+     *
+     * @param options Options.
+     * @param site Site.
+     * @return Whether filter should be applied.
+     */
+    shouldBeApplied(options: CoreFilterFormatTextOptions, site?: CoreSite): boolean {
+        // Only apply the filter if logged in and we're filtering current site.
+        return site && site.getId() == this.sitesProvider.getCurrentSiteId();
+    }
+
+    /**
+     * Wait for the MathJax library and our JS object to be loaded.
+     *
+     * @param retries Number of times this has been retried.
+     * @return Promise resolved when ready or if it took too long to load.
+     */
+    protected waitForReady(retries: number = 0): Promise<any> {
+        if ((this.window.MathJax && this.jsLoaded()) || retries >= 20) {
+            // Loaded or too many retries, stop.
+            return Promise.resolve();
+        }
+
+        const deferred = this.utils.promiseDefer();
+
+        setTimeout(() => {
+            return this.waitForReady(retries + 1).finally(() => {
+                deferred.resolve();
+            });
+        }, 250);
+
+        return deferred.promise;
+    }
+
+    /**
+     * Find math environments in the $text and wrap them in no link spans
+     * (<span class="nolink"></span>). If math environments are nested, only
+     * the outer environment is wrapped in the span.
+     *
+     * The recognized math environments are \[ \] and $$ $$ for display
+     * mathematics and \( \) for inline mathematics.
+     *
+     * @param text The text to filter.
+     * @return Object containing the potentially modified text and a boolean that is true if any changes were made to the text.
+     */
+    protected wrapMathInNoLink(text: string): {text: string, changed: boolean} {
+        let len = text.length,
+            i = 1,
+            displayStart = -1,
+            displayBracket = false,
+            displayDollar = false,
+            inlineStart = -1,
+            changesDone = false;
+
+        // Loop over the $text once.
+        while (i < len) {
+            if (displayStart === -1) {
+                // No display math has started yet.
+                if (text[i - 1] === '\\') {
+
+                    if (text[i] === '[') {
+                        // Display mode \[ begins.
+                        displayStart = i - 1;
+                        displayBracket = true;
+                    } else if (text[i] === '(') {
+                        // Inline math \( begins, not nested inside display math.
+                        inlineStart = i - 1;
+                    } else if (text[i] === ')' && inlineStart > -1) {
+                        // Inline math ends, not nested inside display math. Wrap the span around it.
+                        text = this.insertSpan(text, inlineStart, i);
+
+                        inlineStart = -1; // Reset.
+                        i += 28; // The text length changed due to the <span>.
+                        len += 28;
+                        changesDone = true;
+                    }
+
+                } else if (text[i - 1] === '$' && text[i] === '$') {
+                    // Display mode $$ begins.
+                    displayStart = i - 1;
+                    displayDollar = true;
+                }
+
+            } else {
+                // Display math open.
+                if ((text[i - 1] === '\\' && text[i] === ']' && displayBracket) ||
+                        (text[i - 1] === '$' && text[i] === '$' && displayDollar)) {
+                    // Display math ends, wrap the span around it.
+                    text = this.insertSpan(text, displayStart, i);
+
+                    displayStart = -1; // Reset.
+                    displayBracket = false;
+                    displayDollar = false;
+                    i += 28; // The text length changed due to the <span>.
+                    len += 28;
+                    changesDone = true;
+                }
+            }
+
+            i++;
+        }
+
+        return {
+            text: text,
+            changed: changesDone
+        };
+    }
+}
diff --git a/src/addon/filter/multilang/providers/handler.ts b/src/addon/filter/multilang/providers/handler.ts
index 93db110d0..8f809624a 100644
--- a/src/addon/filter/multilang/providers/handler.ts
+++ b/src/addon/filter/multilang/providers/handler.ts
@@ -47,11 +47,6 @@ export class AddonFilterMultilangHandler extends CoreFilterDefaultHandler {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
 
-            // Don't apply this filter if Moodle is 3.7 or higher and the WS already filtered the content.
-            if (!this.shouldBeApplied(options, site)) {
-                return text;
-            }
-
             return this.langProvider.getCurrentLanguage().then((language) => {
                 // Match the current language.
                 const anyLangRegEx = /<(?:lang|span)[^>]+lang="[a-zA-Z0-9_-]+"[^>]*>(.*?)<\/(?:lang|span)>/g;
diff --git a/src/addon/messages/providers/mainmenu-handler.ts b/src/addon/messages/providers/mainmenu-handler.ts
index 51d75825c..42b720139 100644
--- a/src/addon/messages/providers/mainmenu-handler.ts
+++ b/src/addon/messages/providers/mainmenu-handler.ts
@@ -298,9 +298,9 @@ export class AddonMessagesMainMenuHandler implements CoreMainMenuHandler, CoreCr
         };
 
         return this.filterHelper.getFiltersAndFormatText(message.text, 'system', 0, {clean: true, singleLine: true}).catch(() => {
-            return message.text;
-        }).then((formattedText) => {
-            data['text'] = formattedText;
+            return {text: message.text};
+        }).then((result) => {
+            data['text'] = result.text;
 
             return data;
         });
diff --git a/src/components/site-picker/site-picker.ts b/src/components/site-picker/site-picker.ts
index aa934bf57..f4e145254 100644
--- a/src/components/site-picker/site-picker.ts
+++ b/src/components/site-picker/site-picker.ts
@@ -51,10 +51,10 @@ export class CoreSitePickerComponent implements OnInit {
                 // Format the site name.
                 promises.push(this.filterHelper.getFiltersAndFormatText(site.siteName, 'system', 0,
                         {clean: true, singleLine: true}, site.getId()).catch(() => {
-                    return site.siteName;
-                }).then((formatted) => {
+                    return {text: site.siteName};
+                }).then((result) => {
                     site.fullNameAndSiteName = this.translate.instant('core.fullnameandsitename',
-                        { fullname: site.fullName, sitename: formatted });
+                        { fullname: site.fullName, sitename: result.text });
                 }));
             });
 
diff --git a/src/core/course/components/module-completion/module-completion.ts b/src/core/course/components/module-completion/module-completion.ts
index a2db476ad..08d979f40 100644
--- a/src/core/course/components/module-completion/module-completion.ts
+++ b/src/core/course/components/module-completion/module-completion.ts
@@ -139,7 +139,7 @@ export class CoreCourseModuleCompletionComponent implements OnChanges {
 
         if (moduleName) {
             this.filterHelper.getFiltersAndFormatText(moduleName, 'module', this.moduleId,
-                    {clean: true, singleLine: true, shortenLength: 50, courseId: this.completion.courseId}).then((modName) => {
+                    {clean: true, singleLine: true, shortenLength: 50, courseId: this.completion.courseId}).then((result) => {
 
                 let promise;
 
@@ -150,11 +150,11 @@ export class CoreCourseModuleCompletionComponent implements OnChanges {
                         (profile) => {
                             return {
                                 overrideuser: profile.fullname,
-                                modname: modName
+                                modname: result.text
                             };
                         });
                 } else {
-                    promise = Promise.resolve(modName);
+                    promise = Promise.resolve(result.text);
                 }
 
                 return promise.then((translateParams) => {
diff --git a/src/core/course/pages/section/section.ts b/src/core/course/pages/section/section.ts
index de9e1cdf2..de531d268 100644
--- a/src/core/course/pages/section/section.ts
+++ b/src/core/course/pages/section/section.ts
@@ -264,8 +264,8 @@ export class CoreCourseSectionPage implements OnDestroy {
                     // Format the name of each section and check if it has content.
                     this.sections = sections.map((section) => {
                         this.filterHelper.getFiltersAndFormatText(section.name.trim(), 'course', this.course.id,
-                                {clean: true, singleLine: true}).then((name) => {
-                            section.formattedName = name;
+                                {clean: true, singleLine: true}).then((result) => {
+                            section.formattedName = result.text;
                         });
                         section.hasContent = this.courseHelper.sectionHasContent(section);
 
diff --git a/src/core/filter/providers/default-filter.ts b/src/core/filter/providers/default-filter.ts
index d381e580f..bb9ff9d32 100644
--- a/src/core/filter/providers/default-filter.ts
+++ b/src/core/filter/providers/default-filter.ts
@@ -43,6 +43,21 @@ export class CoreFilterDefaultHandler implements CoreFilterHandler {
         return text;
     }
 
+    /**
+     * Handle HTML. This function is called after "filter", and it will receive an HTMLElement containing the text that was
+     * filtered.
+     *
+     * @param container The HTML container to handle.
+     * @param filter The filter.
+     * @param options Options passed to the filters.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If async, promise resolved when done.
+     */
+    handleHtml(container: HTMLElement, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions, siteId?: string)
+            : void | Promise<void> {
+        // To be overridden.
+    }
+
     /**
      * Whether or not the handler is enabled on a site level.
      *
diff --git a/src/core/filter/providers/delegate.ts b/src/core/filter/providers/delegate.ts
index dcea780cd..ef1e5852a 100644
--- a/src/core/filter/providers/delegate.ts
+++ b/src/core/filter/providers/delegate.ts
@@ -41,6 +41,19 @@ export interface CoreFilterHandler extends CoreDelegateHandler {
      */
     filter(text: string, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions, siteId?: string): string | Promise<string>;
 
+    /**
+     * Handle HTML. This function is called after "filter", and it will receive an HTMLElement containing the text that was
+     * filtered.
+     *
+     * @param container The HTML container to handle.
+     * @param filter The filter.
+     * @param options Options passed to the filters.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If async, promise resolved when done.
+     */
+    handleHtml?(container: HTMLElement, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions, siteId?: string)
+            : void | Promise<void>;
+
     /**
      * Check if the filter should be applied in a certain site based on some filter options.
      *
@@ -61,6 +74,7 @@ export class CoreFilterDelegate extends CoreDelegate {
 
     constructor(loggerProvider: CoreLoggerProvider, protected sitesProvider: CoreSitesProvider, eventsProvider: CoreEventsProvider,
             protected defaultHandler: CoreFilterDefaultHandler) {
+
         super('CoreFilterDelegate', loggerProvider, sitesProvider, eventsProvider);
     }
 
@@ -79,19 +93,16 @@ export class CoreFilterDelegate extends CoreDelegate {
         // Wait for filters to be initialized.
         return this.handlersInitPromise.then(() => {
 
+            return this.sitesProvider.getSite(siteId);
+        }).then((site) => {
+
             let promise: Promise<string> = Promise.resolve(text);
 
             filters = filters || [];
             options = options || {};
 
             filters.forEach((filter) => {
-                if (skipFilters && skipFilters.indexOf(filter.filter) != -1) {
-                    // Skip this filter.
-                    return;
-                }
-
-                if (filter.localstate == -1 || (filter.localstate == 0 && filter.inheritedstate == -1)) {
-                    // Filter is disabled, ignore it.
+                if (!this.isEnabledAndShouldApply(filter, options, site, skipFilters)) {
                     return;
                 }
 
@@ -140,6 +151,77 @@ export class CoreFilterDelegate extends CoreDelegate {
         return filters;
     }
 
+    /**
+     * Let filters handle an HTML element.
+     *
+     * @param container The HTML container to handle.
+     * @param filters Filters to apply.
+     * @param options Options passed to the filters.
+     * @param skipFilters Names of filters that shouldn't be applied.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    handleHtml(container: HTMLElement, filters: CoreFilterFilter[], options?: any, skipFilters?: string[], siteId?: string)
+            : Promise<any> {
+
+        // Wait for filters to be initialized.
+        return this.handlersInitPromise.then(() => {
+
+            return this.sitesProvider.getSite(siteId);
+        }).then((site) => {
+
+            let promise: Promise<any> = Promise.resolve();
+
+            filters = filters || [];
+            options = options || {};
+
+            filters.forEach((filter) => {
+                if (!this.isEnabledAndShouldApply(filter, options, site, skipFilters)) {
+                    return;
+                }
+
+                promise = promise.then(() => {
+                    return Promise.resolve(this.executeFunctionOnEnabled(filter.filter, 'handleHtml',
+                            [container, filter, options, siteId])).catch((error) => {
+                        this.logger.error('Error handling HTML' + filter.filter, error);
+                    });
+                });
+            });
+
+            return promise;
+        });
+    }
+
+    /**
+     * Check if a filter is enabled and should be applied.
+     *
+     * @param filters Filters to apply.
+     * @param options Options passed to the filters.
+     * @param site Site.
+     * @param skipFilters Names of filters that shouldn't be applied.
+     * @return Whether the filter is enabled and should be applied.
+     */
+    isEnabledAndShouldApply(filter: CoreFilterFilter, options: CoreFilterFormatTextOptions, site: CoreSite,
+            skipFilters?: string[]): boolean {
+
+        if (filter.localstate == -1 || (filter.localstate == 0 && filter.inheritedstate == -1)) {
+            // Filter is disabled, ignore it.
+            return false;
+        }
+
+        if (!this.shouldFilterBeApplied(filter, options, site)) {
+            // Filter shouldn't be applied.
+            return false;
+        }
+
+        if (skipFilters && skipFilters.indexOf(filter.filter) != -1) {
+            // Skip this filter.
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * Check if at least 1 filter should be applied in a certain site and with certain options.
      *
@@ -151,20 +233,11 @@ export class CoreFilterDelegate extends CoreDelegate {
     shouldBeApplied(filters: CoreFilterFilter[], options: CoreFilterFormatTextOptions, site?: CoreSite): Promise<boolean> {
         // Wait for filters to be initialized.
         return this.handlersInitPromise.then(() => {
-            const promises = [];
-            let shouldBeApplied = false;
-
-            filters.forEach((filter) => {
-                promises.push(this.shouldFilterBeApplied(filter, options, site).then((applied) => {
-                    if (applied) {
-                        shouldBeApplied = applied;
-                    }
-                }));
-            });
-
-            return Promise.all(promises).then(() => {
-                return shouldBeApplied;
-            });
+            for (let i = 0; i < filters.length; i++) {
+                if (this.shouldFilterBeApplied(filters[i], options, site)) {
+                    return true;
+                }
+            }
         });
     }
 
@@ -174,15 +247,14 @@ export class CoreFilterDelegate extends CoreDelegate {
      * @param filter Filter to check.
      * @param options Options passed to the filters.
      * @param site Site. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true: whether the filter should be applied.
+     * @return Whether the filter should be applied.
      */
-    protected shouldFilterBeApplied(filter: CoreFilterFilter, options: CoreFilterFormatTextOptions, site?: CoreSite)
-            : Promise<boolean> {
+    protected shouldFilterBeApplied(filter: CoreFilterFilter, options: CoreFilterFormatTextOptions, site?: CoreSite): boolean {
 
         if (!this.hasHandler(filter.filter, true)) {
-            return Promise.resolve(false);
+            return false;
         }
 
-        return Promise.resolve(this.executeFunctionOnEnabled(filter.filter, 'shouldBeApplied', [options, site]));
+        return this.executeFunctionOnEnabled(filter.filter, 'shouldBeApplied', [options, site]);
     }
 }
diff --git a/src/core/filter/providers/helper.ts b/src/core/filter/providers/helper.ts
index 2b3a6704a..bc7d44fee 100644
--- a/src/core/filter/providers/helper.ts
+++ b/src/core/filter/providers/helper.ts
@@ -178,10 +178,12 @@ export class CoreFilterHelperProvider {
      * @return Promise resolved with the formatted text.
      */
     getFiltersAndFormatText(text: string, contextLevel: string, instanceId: number, options?: CoreFilterFormatTextOptions,
-            siteId?: string): Promise<string> {
+            siteId?: string): Promise<{text: string, filters: CoreFilterFilter[]}> {
 
         return this.getFilters(contextLevel, instanceId, options, siteId).then((filters) => {
-            return this.filterProvider.formatText(text, options, filters, siteId);
+            return this.filterProvider.formatText(text, options, filters, siteId).then((text) => {
+                return {text: text, filters: filters};
+            });
         });
     }
 
diff --git a/src/core/login/pages/sites/sites.ts b/src/core/login/pages/sites/sites.ts
index c420339af..7813b3da5 100644
--- a/src/core/login/pages/sites/sites.ts
+++ b/src/core/login/pages/sites/sites.ts
@@ -87,9 +87,10 @@ export class CoreLoginSitesPage {
             siteName = site.siteName;
 
         this.filterHelper.getFiltersAndFormatText(siteName, 'system', 0, {clean: true, singleLine: true}, site.id)
-                .then((siteName) => {
+                .then((result) => {
 
-            this.domUtils.showConfirm(this.translate.instant('core.login.confirmdeletesite', { sitename: siteName })).then(() => {
+            this.domUtils.showConfirm(this.translate.instant('core.login.confirmdeletesite', { sitename: result.text }))
+                    .then(() => {
                 this.sitesProvider.deleteSite(site.id).then(() => {
                     this.sites.splice(index, 1);
                     this.showDelete = false;
diff --git a/src/core/settings/pages/general/general.ts b/src/core/settings/pages/general/general.ts
index 2c5f94582..2880ef3c8 100644
--- a/src/core/settings/pages/general/general.ts
+++ b/src/core/settings/pages/general/general.ts
@@ -133,7 +133,7 @@ export class CoreSettingsGeneralPage {
      */
     languageChanged(): void {
         this.langProvider.changeCurrentLanguage(this.selectedLanguage).finally(() => {
-            this.eventsProvider.trigger(CoreEventsProvider.LANGUAGE_CHANGED);
+            this.eventsProvider.trigger(CoreEventsProvider.LANGUAGE_CHANGED, this.selectedLanguage);
         });
     }
 
diff --git a/src/core/settings/pages/space-usage/space-usage.ts b/src/core/settings/pages/space-usage/space-usage.ts
index 4031e5157..212881097 100644
--- a/src/core/settings/pages/space-usage/space-usage.ts
+++ b/src/core/settings/pages/space-usage/space-usage.ts
@@ -168,10 +168,10 @@ export class CoreSettingsSpaceUsagePage {
      */
     deleteSiteStorage(siteData: any): void {
         this.filterHelper.getFiltersAndFormatText(siteData.siteName, 'system', 0,
-                {clean: true, singleLine: true}, siteData.id).then((siteName) => {
+                {clean: true, singleLine: true}, siteData.id).then((result) => {
 
             const title = this.translate.instant('core.settings.deletesitefilestitle');
-            const message = this.translate.instant('core.settings.deletesitefiles', {sitename: siteName});
+            const message = this.translate.instant('core.settings.deletesitefiles', {sitename: result.text});
 
             this.domUtils.showConfirm(message, title).then(() => {
                 return this.sitesProvider.getSite(siteData.id);
diff --git a/src/directives/format-text.ts b/src/directives/format-text.ts
index cffef5187..9ca9e1fb0 100644
--- a/src/directives/format-text.ts
+++ b/src/directives/format-text.ts
@@ -30,8 +30,9 @@ import { CoreLinkDirective } from '../directives/link';
 import { CoreExternalContentDirective } from '../directives/external-content';
 import { CoreContentLinksHelperProvider } from '@core/contentlinks/providers/helper';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
-import { CoreFilterProvider } from '@core/filter/providers/filter';
+import { CoreFilterProvider, CoreFilterFilter, CoreFilterFormatTextOptions } from '@core/filter/providers/filter';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CoreFilterDelegate } from '@core/filter/providers/delegate';
 
 /**
  * Directive to format text rendered. It renders the HTML and treats all links and media, using CoreLinkDirective
@@ -70,14 +71,27 @@ export class CoreFormatTextDirective implements OnChanges {
     protected showMoreDisplayed: boolean;
     protected loadingChangedListener;
 
-    constructor(element: ElementRef, private sitesProvider: CoreSitesProvider, private domUtils: CoreDomUtilsProvider,
-            private textUtils: CoreTextUtilsProvider, private translate: TranslateService, private platform: Platform,
-            private utils: CoreUtilsProvider, private urlUtils: CoreUrlUtilsProvider, private loggerProvider: CoreLoggerProvider,
-            private filepoolProvider: CoreFilepoolProvider, private appProvider: CoreAppProvider,
-            private contentLinksHelper: CoreContentLinksHelperProvider, @Optional() private navCtrl: NavController,
-            @Optional() private content: Content, @Optional() private svComponent: CoreSplitViewComponent,
-            private iframeUtils: CoreIframeUtilsProvider, private eventsProvider: CoreEventsProvider,
-            private filterProvider: CoreFilterProvider, private filterHelper: CoreFilterHelperProvider) {
+    constructor(element: ElementRef,
+            private sitesProvider: CoreSitesProvider,
+            private domUtils: CoreDomUtilsProvider,
+            private textUtils: CoreTextUtilsProvider,
+            private translate: TranslateService,
+            private platform: Platform,
+            private utils: CoreUtilsProvider,
+            private urlUtils: CoreUrlUtilsProvider,
+            private loggerProvider: CoreLoggerProvider,
+            private filepoolProvider: CoreFilepoolProvider,
+            private appProvider: CoreAppProvider,
+            private contentLinksHelper: CoreContentLinksHelperProvider,
+            @Optional() private navCtrl: NavController,
+            @Optional() private content: Content, @Optional()
+            private svComponent: CoreSplitViewComponent,
+            private iframeUtils: CoreIframeUtilsProvider,
+            private eventsProvider: CoreEventsProvider,
+            private filterProvider: CoreFilterProvider,
+            private filterHelper: CoreFilterHelperProvider,
+            private filterDelegate: CoreFilterDelegate) {
+
         this.element = element.nativeElement;
         this.element.classList.add('opacity-hide'); // Hide contents until they're treated.
         this.afterRender = new EventEmitter();
@@ -323,15 +337,15 @@ export class CoreFormatTextDirective implements OnChanges {
 
         this.text = this.text ? this.text.trim() : '';
 
-        this.formatContents().then((div: HTMLElement) => {
+        this.formatContents().then((result) => {
             // Disable media adapt to correctly calculate the height.
             this.element.classList.add('core-disable-media-adapt');
 
             this.element.innerHTML = ''; // Remove current contents.
-            if (this.maxHeight && div.innerHTML != '') {
+            if (this.maxHeight && result.div.innerHTML != '') {
 
                 // Move the children to the current element to be able to calculate the height.
-                this.domUtils.moveChildren(div, this.element);
+                this.domUtils.moveChildren(result.div, this.element);
 
                 // Calculate the height now.
                 this.calculateHeight();
@@ -349,12 +363,17 @@ export class CoreFormatTextDirective implements OnChanges {
                     });
                 }
             } else {
-                this.domUtils.moveChildren(div, this.element);
+                this.domUtils.moveChildren(result.div, this.element);
 
                 // Add magnifying glasses to images.
                 this.addMagnifyingGlasses();
             }
 
+            if (result.options.filter) {
+                // Let filters hnadle HTML. We do it here because we don't want them to block the render of the text.
+                this.filterDelegate.handleHtml(this.element, result.filters, result.options, [], result.siteId);
+            }
+
             this.element.classList.remove('core-disable-media-adapt');
             this.finishRender();
         });
@@ -365,8 +384,15 @@ export class CoreFormatTextDirective implements OnChanges {
      *
      * @return Promise resolved with a div element containing the code.
      */
-    protected formatContents(): Promise<HTMLElement> {
+    protected formatContents(): Promise<{div: HTMLElement, filters: CoreFilterFilter[], options: CoreFilterFormatTextOptions,
+            siteId: string}> {
 
+        const result = {
+            div: <HTMLElement> null,
+            filters: <CoreFilterFilter[]> [],
+            options: <CoreFilterFormatTextOptions> {},
+            siteId: this.siteId
+        };
         let site: CoreSite;
 
         // Retrieve the site since it might be needed later.
@@ -374,6 +400,7 @@ export class CoreFormatTextDirective implements OnChanges {
             // Error getting the site. This probably means that there is no current site and no siteId was supplied.
         }).then((siteInstance: CoreSite) => {
             site = siteInstance;
+            result.siteId = site.getId();
 
             if (this.contextLevel == 'course' && this.contextInstanceId <= 0) {
                 this.contextInstanceId = site.getSiteHomeId();
@@ -381,7 +408,7 @@ export class CoreFormatTextDirective implements OnChanges {
 
             this.filter = typeof this.filter == 'undefined' ? !!(this.contextLevel && this.contextInstanceId) : !!this.filter;
 
-            const options = {
+            result.options = {
                 clean: this.utils.isTrueOrOne(this.clean),
                 singleLine: this.utils.isTrueOrOne(this.singleLine),
                 highlight: this.highlight,
@@ -390,10 +417,15 @@ export class CoreFormatTextDirective implements OnChanges {
             };
 
             if (this.filter) {
-                return this.filterHelper.getFiltersAndFormatText(this.text, this.contextLevel, this.contextInstanceId, options,
-                        site.getId());
+                return this.filterHelper.getFiltersAndFormatText(this.text, this.contextLevel, this.contextInstanceId,
+                        result.options, site.getId()).then((res) => {
+
+                    result.filters = res.filters;
+
+                    return res.text;
+                });
             } else {
-                return this.filterProvider.formatText(this.text, options);
+                return this.filterProvider.formatText(this.text, result.options);
             }
 
         }).then((formatted) => {
@@ -517,7 +549,9 @@ export class CoreFormatTextDirective implements OnChanges {
             return promise.catch(() => {
                 // Ignore errors. So content gets always shown.
             }).then(() => {
-                return div;
+                result.div = div;
+
+                return result;
             });
         });
     }
diff --git a/src/providers/utils/text.ts b/src/providers/utils/text.ts
index 4ba9574f1..d08b82fe9 100644
--- a/src/providers/utils/text.ts
+++ b/src/providers/utils/text.ts
@@ -735,6 +735,36 @@ export class CoreTextUtilsProvider {
         return stripped;
     }
 
+    /**
+     * Replace text within a portion of a string. Equivalent to PHP's substr_replace.
+     * Credits to http://locutus.io/php/strings/substr_replace/
+     *
+     * @param str The string to treat.
+     * @param replace The value to put inside the string.
+     * @param start The index where to start putting the new string. If negative, it will count from the end of the string.
+     * @param length Length of the portion of string which is to be replaced. If negative, it represents the number of characters
+     *                      from the end of string at which to stop replacing. If not provided, replace until the end of the string.
+     * @return Treated string.
+     */
+    substrReplace(str: string, replace: string, start: number, length?: number): string {
+        length = typeof length != 'undefined' ? length : str.length;
+
+        if (start < 0) {
+            start = start + str.length;
+        }
+
+        if (length < 0) {
+            length = length + str.length - start;
+        }
+
+        return [
+            str.slice(0, start),
+            replace.substr(0, length),
+            replace.slice(length),
+            str.slice(start + length)
+        ].join('');
+    }
+
     /**
      * Treat the list of disabled features, replacing old nomenclature with the new one.
      *
diff --git a/src/providers/utils/url.ts b/src/providers/utils/url.ts
index 295d54ae7..2aa7e8ff5 100644
--- a/src/providers/utils/url.ts
+++ b/src/providers/utils/url.ts
@@ -44,6 +44,29 @@ export class CoreUrlUtilsProvider {
         return url;
     }
 
+    /**
+     * Add params to a URL.
+     *
+     * @param url URL to add the params to.
+     * @param params Object with the params to add.
+     * @return URL with params.
+     */
+    addParamsToUrl(url: string, params: {[key: string]: any}): string {
+        let separator = url.indexOf('?') != -1 ? '&' : '?';
+
+        for (const key in params) {
+            const value = params[key];
+
+            // Ignore objects.
+            if (typeof value != 'object') {
+                url += separator + key + '=' + value;
+                separator = '&';
+            }
+        }
+
+        return url;
+    }
+
     /**
      * Given a URL and a text, return an HTML link.
      *

From 7876d75ac250f1d784834152bc3ae27751285af5 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 22 Oct 2019 10:04:57 +0200
Subject: [PATCH 097/257] MOBILE-1611 filter: Don't filter other sites

---
 src/components/site-picker/site-picker.ts      | 17 +++++++++--------
 .../pages/choose-site/choose-site.html         |  2 +-
 src/core/login/pages/sites/sites.html          |  2 +-
 src/core/login/pages/sites/sites.ts            | 18 ++++++++++--------
 .../pages/space-usage/space-usage.html         |  2 +-
 .../settings/pages/space-usage/space-usage.ts  | 10 +++++-----
 .../pages/synchronization/synchronization.html |  2 +-
 .../pages/choose-site/choose-site.html         |  2 +-
 src/directives/format-text.ts                  |  2 +-
 9 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/components/site-picker/site-picker.ts b/src/components/site-picker/site-picker.ts
index f4e145254..dca537560 100644
--- a/src/components/site-picker/site-picker.ts
+++ b/src/components/site-picker/site-picker.ts
@@ -15,7 +15,7 @@
 import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { CoreSitesProvider } from '@providers/sites';
-import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CoreFilterProvider } from '@core/filter/providers/filter';
 
 /**
  * Component to display a site selector. It will display a select with the list of sites. If the selected site changes,
@@ -35,8 +35,9 @@ export class CoreSitePickerComponent implements OnInit {
     selectedSite: string;
     sites: any[];
 
-    constructor(private translate: TranslateService, private sitesProvider: CoreSitesProvider,
-            private filterHelper: CoreFilterHelperProvider) {
+    constructor(private translate: TranslateService,
+            private sitesProvider: CoreSitesProvider,
+            private filterProvider: CoreFilterProvider) {
         this.siteSelected = new EventEmitter();
     }
 
@@ -49,12 +50,12 @@ export class CoreSitePickerComponent implements OnInit {
 
             sites.forEach((site: any) => {
                 // Format the site name.
-                promises.push(this.filterHelper.getFiltersAndFormatText(site.siteName, 'system', 0,
-                        {clean: true, singleLine: true}, site.getId()).catch(() => {
-                    return {text: site.siteName};
-                }).then((result) => {
+                promises.push(this.filterProvider.formatText(site.siteName, {clean: true, singleLine: true, filter: false}, [],
+                        site.getId()).catch(() => {
+                    return site.siteName;
+                }).then((siteName) => {
                     site.fullNameAndSiteName = this.translate.instant('core.fullnameandsitename',
-                        { fullname: site.fullName, sitename: result.text });
+                        { fullname: site.fullName, sitename: siteName });
                 }));
             });
 
diff --git a/src/core/contentlinks/pages/choose-site/choose-site.html b/src/core/contentlinks/pages/choose-site/choose-site.html
index 5ade9add5..c6a401175 100644
--- a/src/core/contentlinks/pages/choose-site/choose-site.html
+++ b/src/core/contentlinks/pages/choose-site/choose-site.html
@@ -15,7 +15,7 @@
                     <img [src]="site.avatar" core-external-content [siteId]="site.id" alt="{{ 'core.pictureof' | translate:{$a: site.fullname} }}" role="presentation" onError="this.src='assets/img/user-avatar.png'">
                 </ion-avatar>
                 <h2>{{site.fullName}}</h2>
-                <p><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id" contextLevel="system" [contextInstanceId]="0"></core-format-text></p>
+                <p><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text></p>
                 <p>{{site.siteUrl}}</p>
             </a>
             <ion-item>
diff --git a/src/core/login/pages/sites/sites.html b/src/core/login/pages/sites/sites.html
index 6b33ab936..d6e6ad2e4 100644
--- a/src/core/login/pages/sites/sites.html
+++ b/src/core/login/pages/sites/sites.html
@@ -19,7 +19,7 @@
                 <img [src]="site.avatar" core-external-content [siteId]="site.id" alt="{{ 'core.pictureof' | translate:{$a: site.fullname} }}" role="presentation" onError="this.src='assets/img/user-avatar.png'">
             </ion-avatar>
             <h2>{{site.fullName}}</h2>
-            <p><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id" contextLevel="system" [contextInstanceId]="0"></core-format-text></p>
+            <p><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text></p>
             <p>{{site.siteUrl}}</p>
             <ion-badge item-end *ngIf="!showDelete && site.badge">{{site.badge}}</ion-badge>
             <button *ngIf="showDelete" item-end ion-button icon-only clear color="danger" (click)="deleteSite($event, idx)" [attr.aria-label]="'core.delete' | translate">
diff --git a/src/core/login/pages/sites/sites.ts b/src/core/login/pages/sites/sites.ts
index 7813b3da5..fe7cdb6d0 100644
--- a/src/core/login/pages/sites/sites.ts
+++ b/src/core/login/pages/sites/sites.ts
@@ -20,7 +20,7 @@ import { CoreSitesProvider, CoreSiteBasicInfo } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CorePushNotificationsProvider } from '@core/pushnotifications/providers/pushnotifications';
 import { CoreLoginHelperProvider } from '../../providers/helper';
-import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CoreFilterProvider } from '@core/filter/providers/filter';
 
 /**
  * Page that displays the list of stored sites.
@@ -35,9 +35,13 @@ export class CoreLoginSitesPage {
     showDelete: boolean;
     protected logger;
 
-    constructor(private domUtils: CoreDomUtilsProvider, private filterHelper: CoreFilterHelperProvider,
-            private sitesProvider: CoreSitesProvider, private loginHelper: CoreLoginHelperProvider, logger: CoreLoggerProvider,
-            private translate: TranslateService, private pushNotificationsProvider: CorePushNotificationsProvider) {
+    constructor(private domUtils: CoreDomUtilsProvider,
+            private filterProvider: CoreFilterProvider,
+            private sitesProvider: CoreSitesProvider,
+            private loginHelper: CoreLoginHelperProvider,
+            logger: CoreLoggerProvider,
+            private translate: TranslateService,
+            private pushNotificationsProvider: CorePushNotificationsProvider) {
         this.logger = logger.getInstance('CoreLoginSitesPage');
     }
 
@@ -86,11 +90,9 @@ export class CoreLoginSitesPage {
         const site = this.sites[index],
             siteName = site.siteName;
 
-        this.filterHelper.getFiltersAndFormatText(siteName, 'system', 0, {clean: true, singleLine: true}, site.id)
-                .then((result) => {
+        this.filterProvider.formatText(siteName, {clean: true, singleLine: true, filter: false}, [], site.id).then((siteName) => {
 
-            this.domUtils.showConfirm(this.translate.instant('core.login.confirmdeletesite', { sitename: result.text }))
-                    .then(() => {
+            this.domUtils.showConfirm(this.translate.instant('core.login.confirmdeletesite', { sitename: siteName })).then(() => {
                 this.sitesProvider.deleteSite(site.id).then(() => {
                     this.sites.splice(index, 1);
                     this.showDelete = false;
diff --git a/src/core/settings/pages/space-usage/space-usage.html b/src/core/settings/pages/space-usage/space-usage.html
index bc5c89b2e..a21f0208d 100644
--- a/src/core/settings/pages/space-usage/space-usage.html
+++ b/src/core/settings/pages/space-usage/space-usage.html
@@ -9,7 +9,7 @@
     </ion-refresher>
     <core-loading [hideUntil]="usageLoaded">
         <ion-item *ngFor="let site of sites" [class.core-primary-selected-item]="site.id == currentSiteId">
-            <h2 text-wrap><core-format-text [text]="site.siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text></h2>
+            <h2 text-wrap><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text></h2>
             <p text-wrap>{{ site.fullName }}</p>
             <div item-end>
                 <p>{{ site.spaceUsage | coreBytesToSize }}</p>
diff --git a/src/core/settings/pages/space-usage/space-usage.ts b/src/core/settings/pages/space-usage/space-usage.ts
index 212881097..185f5a196 100644
--- a/src/core/settings/pages/space-usage/space-usage.ts
+++ b/src/core/settings/pages/space-usage/space-usage.ts
@@ -21,7 +21,7 @@ import { CoreFilepoolProvider } from '@providers/filepool';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreCourseProvider } from '@core/course/providers/course';
-import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CoreFilterProvider } from '@core/filter/providers/filter';
 
 /**
  * Page that displays the space usage settings.
@@ -42,7 +42,7 @@ export class CoreSettingsSpaceUsagePage {
     constructor(private filePoolProvider: CoreFilepoolProvider,
             private eventsProvider: CoreEventsProvider,
             private sitesProvider: CoreSitesProvider,
-            private filterHelper: CoreFilterHelperProvider,
+            private filterProvider: CoreFilterProvider,
             private translate: TranslateService,
             private domUtils: CoreDomUtilsProvider,
             appProvider: CoreAppProvider,
@@ -167,11 +167,11 @@ export class CoreSettingsSpaceUsagePage {
      * @param siteData Site object with space usage.
      */
     deleteSiteStorage(siteData: any): void {
-        this.filterHelper.getFiltersAndFormatText(siteData.siteName, 'system', 0,
-                {clean: true, singleLine: true}, siteData.id).then((result) => {
+        this.filterProvider.formatText(siteData.siteName, {clean: true, singleLine: true, filter: false}, [], siteData.id)
+                .then((siteName) => {
 
             const title = this.translate.instant('core.settings.deletesitefilestitle');
-            const message = this.translate.instant('core.settings.deletesitefiles', {sitename: result.text});
+            const message = this.translate.instant('core.settings.deletesitefiles', {sitename: siteName});
 
             this.domUtils.showConfirm(message, title).then(() => {
                 return this.sitesProvider.getSite(siteData.id);
diff --git a/src/core/settings/pages/synchronization/synchronization.html b/src/core/settings/pages/synchronization/synchronization.html
index d34b69979..3f7a6a2a1 100644
--- a/src/core/settings/pages/synchronization/synchronization.html
+++ b/src/core/settings/pages/synchronization/synchronization.html
@@ -17,7 +17,7 @@
             <p>{{ 'core.settings.sites' | translate }}</p>
         </ion-item-divider>
         <ion-item *ngFor="let site of sites" [class.core-primary-selected-item]="site.id == currentSiteId" text-wrap>
-            <h2><core-format-text [text]="site.siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text></h2>
+            <h2><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text></h2>
             <p>{{ site.fullName }}</p>
             <p>{{ site.siteUrl }}</p>
             <button ion-button icon-only clear item-end *ngIf="!isSynchronizing(site.id)" (click)="synchronize(site.id)" [title]="site.siteName" [attr.aria-label]="'core.settings.synchronizenow' | translate">
diff --git a/src/core/sharedfiles/pages/choose-site/choose-site.html b/src/core/sharedfiles/pages/choose-site/choose-site.html
index c1428765e..ca01e2cb3 100644
--- a/src/core/sharedfiles/pages/choose-site/choose-site.html
+++ b/src/core/sharedfiles/pages/choose-site/choose-site.html
@@ -15,7 +15,7 @@
                     <img [src]="site.avatar" core-external-content [siteId]="site.id" alt="{{ 'core.pictureof' | translate:{$a: site.fullname} }}" role="presentation" onError="this.src='assets/img/user-avatar.png'">
                 </ion-avatar>
                 <h2>{{site.fullName}}</h2>
-                <p><core-format-text clean="true" [text]="site.siteName" [siteId]="site.id" contextLevel="system" [contextInstanceId]="0"></core-format-text></p>
+                <p><core-format-text clean="true" [text]="site.siteName" [siteId]="site.id"></core-format-text></p>
                 <p>{{site.siteUrl}}</p>
             </a>
         </ion-list>
diff --git a/src/directives/format-text.ts b/src/directives/format-text.ts
index 9ca9e1fb0..68ef57895 100644
--- a/src/directives/format-text.ts
+++ b/src/directives/format-text.ts
@@ -425,7 +425,7 @@ export class CoreFormatTextDirective implements OnChanges {
                     return res.text;
                 });
             } else {
-                return this.filterProvider.formatText(this.text, result.options);
+                return this.filterProvider.formatText(this.text, result.options, [], site.getId());
             }
 
         }).then((formatted) => {

From ccf4aeadea6d7f3330e9b795c726fede401f85e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 24 Oct 2019 15:24:21 +0200
Subject: [PATCH 098/257] MOBILE-3205 forum: Add status actions onto discussion
 list

---
 .../mod/forum/components/components.module.ts |  10 +-
 .../addon-forum-discussion-options-menu.html  |  24 +++
 .../discussion-options-menu.ts                | 145 ++++++++++++++++++
 .../index/addon-mod-forum-index.html          |   8 +-
 src/addon/mod/forum/components/index/index.ts | 105 +++++++++++--
 .../components/post/addon-mod-forum-post.html |   9 +-
 .../mod/forum/pages/discussion/discussion.ts  |  16 ++
 src/addon/mod/forum/providers/forum.ts        |   2 +-
 8 files changed, 289 insertions(+), 30 deletions(-)
 create mode 100644 src/addon/mod/forum/components/discussion-options-menu/addon-forum-discussion-options-menu.html
 create mode 100644 src/addon/mod/forum/components/discussion-options-menu/discussion-options-menu.ts

diff --git a/src/addon/mod/forum/components/components.module.ts b/src/addon/mod/forum/components/components.module.ts
index b26b599fe..8b0c288d8 100644
--- a/src/addon/mod/forum/components/components.module.ts
+++ b/src/addon/mod/forum/components/components.module.ts
@@ -24,11 +24,13 @@ import { CoreRatingComponentsModule } from '@core/rating/components/components.m
 import { CoreTagComponentsModule } from '@core/tag/components/components.module';
 import { AddonModForumIndexComponent } from './index/index';
 import { AddonModForumPostComponent } from './post/post';
+import { AddonForumDiscussionOptionsMenuComponent } from './discussion-options-menu/discussion-options-menu';
 
 @NgModule({
     declarations: [
         AddonModForumIndexComponent,
-        AddonModForumPostComponent
+        AddonModForumPostComponent,
+        AddonForumDiscussionOptionsMenuComponent
     ],
     imports: [
         CommonModule,
@@ -45,10 +47,12 @@ import { AddonModForumPostComponent } from './post/post';
     ],
     exports: [
         AddonModForumIndexComponent,
-        AddonModForumPostComponent
+        AddonModForumPostComponent,
+        AddonForumDiscussionOptionsMenuComponent
     ],
     entryComponents: [
-        AddonModForumIndexComponent
+        AddonModForumIndexComponent,
+        AddonForumDiscussionOptionsMenuComponent
     ]
 })
 export class AddonModForumComponentsModule {}
diff --git a/src/addon/mod/forum/components/discussion-options-menu/addon-forum-discussion-options-menu.html b/src/addon/mod/forum/components/discussion-options-menu/addon-forum-discussion-options-menu.html
new file mode 100644
index 000000000..ba53fa1cc
--- /dev/null
+++ b/src/addon/mod/forum/components/discussion-options-menu/addon-forum-discussion-options-menu.html
@@ -0,0 +1,24 @@
+<ion-item text-wrap (click)="setLockState(true)" *ngIf="discussion.canlock && !discussion.locked">
+    <core-icon name="fa-lock" item-start></core-icon>
+    <h2>{{ 'addon.mod_forum.lockdiscussion' | translate }}</h2>
+</ion-item>
+<ion-item text-wrap (click)="setLockState(false)" *ngIf="discussion.canlock && discussion.locked">
+    <core-icon name="fa-unlock" item-start></core-icon>
+    <h2>{{ 'addon.mod_forum.unlockdiscussion' | translate }}</h2>
+</ion-item>
+<ion-item text-wrap (click)="setPinState(true)" *ngIf="canPin && !discussion.pinned">
+    <core-icon name="fa-map-pin" item-start></core-icon>
+    <h2>{{ 'addon.mod_forum.pindiscussion' | translate }}</h2>
+</ion-item>
+<ion-item text-wrap (click)="setPinState(false)" *ngIf="canPin && discussion.pinned">
+    <core-icon name="fa-map-pin" item-start [slash]="true"></core-icon>
+    <h2>{{ 'addon.mod_forum.unpindiscussion' | translate }}</h2>
+</ion-item>
+<ion-item text-wrap (click)="toggleFavouriteState(true)" *ngIf="discussion.canfavourite && !discussion.starred">
+    <core-icon name="fa-star" item-start></core-icon>
+    <h2>{{ 'addon.mod_forum.addtofavourites' | translate }}</h2>
+</ion-item>
+<ion-item text-wrap (click)="toggleFavouriteState(false)" *ngIf="discussion.canfavourite && discussion.starred">
+    <core-icon name="fa-star" item-start [slash]="true"></core-icon>
+    <h2>{{ 'addon.mod_forum.removefromfavourites' | translate }}</h2>
+</ion-item>
\ No newline at end of file
diff --git a/src/addon/mod/forum/components/discussion-options-menu/discussion-options-menu.ts b/src/addon/mod/forum/components/discussion-options-menu/discussion-options-menu.ts
new file mode 100644
index 000000000..142c25706
--- /dev/null
+++ b/src/addon/mod/forum/components/discussion-options-menu/discussion-options-menu.ts
@@ -0,0 +1,145 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Component, OnInit } from '@angular/core';
+import { NavParams, ViewController } from 'ionic-angular';
+import { CoreDomUtilsProvider } from '@providers/utils/dom';
+import { CoreEventsProvider } from '@providers/events';
+import { CoreSitesProvider } from '@providers/sites';
+import { AddonModForumProvider } from '../../providers/forum';
+
+/**
+ * This component is meant to display a popover with the discussion options.
+ */
+@Component({
+    selector: 'addon-forum-discussion-options-menu',
+    templateUrl: 'addon-forum-discussion-options-menu.html'
+})
+export class AddonForumDiscussionOptionsMenuComponent implements OnInit {
+    discussion: any; // The discussion.
+    forumId: number; // The forum Id.
+    cmId: number; // The component module Id.
+    canPin = false;
+
+    constructor(navParams: NavParams,
+            protected viewCtrl: ViewController,
+            protected forumProvider: AddonModForumProvider,
+            protected domUtils: CoreDomUtilsProvider,
+            protected eventsProvider: CoreEventsProvider,
+            protected sitesProvider: CoreSitesProvider) {
+        this.discussion = navParams.get('discussion');
+        this.forumId = navParams.get('forumId');
+        this.cmId = navParams.get('cmId');
+    }
+
+    /**
+     * Component being initialized.
+     */
+    ngOnInit(): void {
+        if (this.forumProvider.isSetPinStateAvailableForSite()) {
+            // Use the canAddDiscussion WS to check if the user can pin discussions.
+            this.forumProvider.canAddDiscussionToAll(this.forumId).then((response) => {
+                this.canPin = !!response.canpindiscussions;
+            }).catch(() => {
+                this.canPin = false;
+            });
+        } else {
+            this.canPin = false;
+        }
+    }
+
+    /**
+     * Lock or unlock the discussion.
+     *
+     * @param locked True to lock the discussion, false to unlock.
+     */
+    setLockState(locked: boolean): void {
+        const modal = this.domUtils.showModalLoading('core.sending', true);
+
+        this.forumProvider.setLockState(this.forumId, this.discussion.discussion, locked).then((response) => {
+            this.viewCtrl.dismiss({action: 'lock', value: locked});
+
+            const data = {
+                forumId: this.forumId,
+                discussionId: this.discussion.discussion,
+                cmId: this.cmId,
+                locked: response.locked
+            };
+            this.eventsProvider.trigger(AddonModForumProvider.CHANGE_DISCUSSION_EVENT, data, this.sitesProvider.getCurrentSiteId());
+
+            this.domUtils.showToast('addon.mod_forum.lockupdated', true);
+        }).catch((error) => {
+            this.domUtils.showErrorModal(error);
+            this.viewCtrl.dismiss();
+        }).finally(() => {
+            modal.dismiss();
+        });
+    }
+
+    /**
+     * Pin or unpin the discussion.
+     *
+     * @param pinned True to pin the discussion, false to unpin it.
+     */
+    setPinState(pinned: boolean): void {
+        const modal = this.domUtils.showModalLoading('core.sending', true);
+
+        this.forumProvider.setPinState(this.discussion.discussion, pinned).then(() => {
+            this.viewCtrl.dismiss({action: 'pin', value: pinned});
+
+            const data = {
+                forumId: this.forumId,
+                discussionId: this.discussion.discussion,
+                cmId: this.cmId,
+                pinned: pinned
+            };
+            this.eventsProvider.trigger(AddonModForumProvider.CHANGE_DISCUSSION_EVENT, data, this.sitesProvider.getCurrentSiteId());
+
+            this.domUtils.showToast('addon.mod_forum.pinupdated', true);
+        }).catch((error) => {
+            this.domUtils.showErrorModal(error);
+            this.viewCtrl.dismiss();
+        }).finally(() => {
+            modal.dismiss();
+        });
+    }
+
+    /**
+     * Star or unstar the discussion.
+     *
+     * @param starred True to star the discussion, false to unstar it.
+     */
+    toggleFavouriteState(starred: boolean): void {
+        const modal = this.domUtils.showModalLoading('core.sending', true);
+
+        this.forumProvider.toggleFavouriteState(this.discussion.discussion, starred).then(() => {
+            this.viewCtrl.dismiss({action: 'star', value: starred});
+
+            const data = {
+                forumId: this.forumId,
+                discussionId: this.discussion.discussion,
+                cmId: this.cmId,
+                starred: starred
+            };
+            this.eventsProvider.trigger(AddonModForumProvider.CHANGE_DISCUSSION_EVENT, data, this.sitesProvider.getCurrentSiteId());
+
+            this.domUtils.showToast('addon.mod_forum.favouriteupdated', true);
+        }).catch((error) => {
+            this.domUtils.showErrorModal(error);
+            this.viewCtrl.dismiss();
+        }).finally(() => {
+            modal.dismiss();
+        });
+    }
+}
diff --git a/src/addon/mod/forum/components/index/addon-mod-forum-index.html b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
index 9e9f3badf..eda6f5033 100644
--- a/src/addon/mod/forum/components/index/addon-mod-forum-index.html
+++ b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
@@ -65,7 +65,7 @@
                                 <core-icon name="fa-star" class="addon-forum-star" *ngIf="!discussion.pinned && discussion.starred"></core-icon>
                                 <core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
                             </h2>
-                            <button ion-button icon-only clear color="dark" (click)="showOptionsMenu($event, discussion)">
+                            <button ion-button icon-only clear color="dark" (click)="showOptionsMenu($event, discussion)" *ngIf="canPin || discussion.canlock || discussion.canfavourite">
                                 <core-icon name="more"></core-icon>
                             </button>
                         </div>
@@ -74,18 +74,18 @@
                             <div class="addon-mod-forum-discussion-author">
                                 <h3>{{discussion.userfullname}}</h3>
                                 <p *ngIf="discussion.groupname"><ion-icon name="people"></ion-icon> {{ discussion.groupname }}</p>
-                                <p>{{discussion.created | coreFormatDate: "strftimedatetimeshort"}}</p>
+                                <p>{{discussion.created * 1000 | coreFormatDate: "strftimerecentfull"}}</p>
                             </div>
                         </div>
                         <ion-row text-center class="addon-mod-forum-discussion-more-info">
-                            <ion-col>
+                            <ion-col text-start>
                                 <ion-note>
                                     <ion-icon name="time"></ion-icon> {{ 'addon.mod_forum.lastpost' | translate }}
                                     <ng-container *ngIf="discussion.timemodified > discussion.created">{{discussion.timemodified | coreTimeAgo}}</ng-container>
                                     <ng-container *ngIf="discussion.timemodified <= discussion.created">{{discussion.created | coreTimeAgo}}</ng-container>
                                 </ion-note>
                             </ion-col>
-                            <ion-col>
+                            <ion-col text-end>
                                 <ion-note>
                                     <ion-icon name="chatboxes"></ion-icon> {{ 'addon.mod_forum.numreplies' | translate:{numreplies: discussion.numreplies} }}
                                     <ion-badge text-center *ngIf="discussion.numunread" [attr.aria-label]="'addon.mod_forum.unreadpostsnumber' | translate:{ '$a' : discussion.numunread}">{{ discussion.numunread }}</ion-badge>
diff --git a/src/addon/mod/forum/components/index/index.ts b/src/addon/mod/forum/components/index/index.ts
index 8edf898d8..ec64d2e1f 100644
--- a/src/addon/mod/forum/components/index/index.ts
+++ b/src/addon/mod/forum/components/index/index.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Component, Optional, Injector, ViewChild } from '@angular/core';
-import { Content, ModalController, NavController } from 'ionic-angular';
+import { Content, ModalController, NavController, PopoverController } from 'ionic-angular';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreCourseModuleMainActivityComponent } from '@core/course/classes/main-activity-component';
 import { CoreCourseModulePrefetchDelegate } from '@core/course/providers/module-prefetch-delegate';
@@ -27,6 +27,7 @@ import { AddonModForumHelperProvider } from '../../providers/helper';
 import { AddonModForumOfflineProvider } from '../../providers/offline';
 import { AddonModForumSyncProvider } from '../../providers/sync';
 import { AddonModForumPrefetchHandler } from '../../providers/prefetch-handler';
+import { AddonForumDiscussionOptionsMenuComponent } from '../discussion-options-menu/discussion-options-menu';
 
 /**
  * Component that displays a forum entry page.
@@ -61,6 +62,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
     protected page = 0;
     protected trackPosts = false;
     protected usesGroups = false;
+    protected canPin = false;
     protected syncManualObserver: any; // It will observe the sync manual event.
     protected replyObserver: any;
     protected newDiscObserver: any;
@@ -83,7 +85,8 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
             protected forumSync: AddonModForumSyncProvider,
             protected prefetchDelegate: CoreCourseModulePrefetchDelegate,
             protected prefetchHandler: AddonModForumPrefetchHandler,
-            protected ratingOffline: CoreRatingOfflineProvider) {
+            protected ratingOffline: CoreRatingOfflineProvider,
+            protected popoverCtrl: PopoverController) {
         super(injector);
 
         this.sortingAvailable = this.forumProvider.isDiscussionListSortingAvailable();
@@ -106,8 +109,30 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
                 this.eventReceived.bind(this, true));
         this.replyObserver = this.eventsProvider.on(AddonModForumProvider.REPLY_DISCUSSION_EVENT,
                 this.eventReceived.bind(this, false));
-        this.changeDiscObserver = this.eventsProvider.on(AddonModForumProvider.CHANGE_DISCUSSION_EVENT,
-                this.eventReceived.bind(this, false));
+        this.changeDiscObserver = this.eventsProvider.on(AddonModForumProvider.CHANGE_DISCUSSION_EVENT, (data) => {
+            this.forumProvider.invalidateDiscussionsList(this.forum.id).finally(() => {
+                // If it's a new discussion in tablet mode, try to open it.
+                if (data.discussionId) {
+                    // Discussion sent to server, search it in the list of discussions.
+                    const discussion = this.discussions.find((disc) => {
+                        return data.discussionId = disc.discussion;
+                    });
+
+                    if (discussion) {
+                        if (typeof data.locked != 'undefined') {
+                            discussion.locked = data.locked;
+                        }
+                        if (typeof data.pinned != 'undefined') {
+                            discussion.pinned = data.pinned;
+                        }
+                        if (typeof data.starred != 'undefined') {
+                            discussion.starred = data.starred;
+                        }
+                    }
+
+                }
+            });
+        });
 
         // Select the current opened discussion.
         this.viewDiscObserver = this.eventsProvider.on(AddonModForumProvider.VIEW_DISCUSSION_EVENT, (data) => {
@@ -211,18 +236,30 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
                 });
             }
         }).then(() => {
-            return Promise.all([
-                // Check if the activity uses groups.
-                this.groupsProvider.getActivityGroupMode(this.forum.cmid).then((mode) => {
-                    this.usesGroups = (mode === CoreGroupsProvider.SEPARATEGROUPS || mode === CoreGroupsProvider.VISIBLEGROUPS);
-                }),
-                this.forumProvider.getAccessInformation(this.forum.id).then((accessInfo) => {
-                    // Disallow adding discussions if cut-off date is reached and the user has not the capability to override it.
-                    // Just in case the forum was fetched from WS when the cut-off date was not reached but it is now.
-                    const cutoffDateReached = this.forumHelper.isCutoffDateReached(this.forum) && !accessInfo.cancanoverridecutoff;
-                    this.canAddDiscussion = this.forum.cancreatediscussions && !cutoffDateReached;
-                }),
-            ]);
+            const promises = [];
+            // Check if the activity uses groups.
+            promises.push(this.groupsProvider.getActivityGroupMode(this.forum.cmid).then((mode) => {
+                this.usesGroups = (mode === CoreGroupsProvider.SEPARATEGROUPS || mode === CoreGroupsProvider.VISIBLEGROUPS);
+            }));
+            promises.push(this.forumProvider.getAccessInformation(this.forum.id).then((accessInfo) => {
+                // Disallow adding discussions if cut-off date is reached and the user has not the capability to override it.
+                // Just in case the forum was fetched from WS when the cut-off date was not reached but it is now.
+                const cutoffDateReached = this.forumHelper.isCutoffDateReached(this.forum) && !accessInfo.cancanoverridecutoff;
+                this.canAddDiscussion = this.forum.cancreatediscussions && !cutoffDateReached;
+            }));
+
+            if (this.forumProvider.isSetPinStateAvailableForSite()) {
+                // Use the canAddDiscussion WS to check if the user can pin discussions.
+                promises.push(this.forumProvider.canAddDiscussionToAll(this.forum.id).then((response) => {
+                    this.canPin = !!response.canpindiscussions;
+                }).catch(() => {
+                    this.canPin = false;
+                }));
+            } else {
+                this.canPin = false;
+            }
+
+            return Promise.all(promises);
         }));
 
         promises.push(this.fetchSortOrderPreference());
@@ -559,6 +596,42 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
         this.sortOrderSelectorExpanded = true;
     }
 
+    /**
+     * Show the context menu.
+     *
+     * @param e Click Event.
+     */
+    showOptionsMenu(e: Event, discussion: any): void {
+        e.preventDefault();
+        e.stopPropagation();
+
+        const popover = this.popoverCtrl.create(AddonForumDiscussionOptionsMenuComponent, {
+            discussion: discussion,
+            forumId: this.forum.id,
+            cmId: this.module.id
+        });
+        popover.onDidDismiss((data) => {
+            if (data && data.action) {
+                switch (data.action) {
+                    case 'lock':
+                        discussion.locked = data.value;
+                        break;
+                    case 'pin':
+                        discussion.pinned = data.value;
+                        break;
+                    case 'star':
+                        discussion.starred = data.value;
+                        break;
+                    default:
+                        break;
+                }
+            }
+        });
+        popover.present({
+            ev: e
+        });
+    }
+
     /**
      * Component being destroyed.
      */
diff --git a/src/addon/mod/forum/components/post/addon-mod-forum-post.html b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
index f6cca3c17..d0512dd01 100644
--- a/src/addon/mod/forum/components/post/addon-mod-forum-post.html
+++ b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
@@ -6,19 +6,16 @@
                 <core-icon name="fa-star" class="addon-forum-star" *ngIf="post.parent == 0 && !post.pinned && post.starred"></core-icon>
                 <core-format-text [text]="post.subject" contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId"></core-format-text>
             </h2>
-            <ion-badge float-end padding-left text-end *ngIf="trackPosts && !post.postread" [attr.aria-label]="'addon.mod_forum.unread' | translate">
+            <ion-note float-end padding-left text-end *ngIf="trackPosts && !post.postread" [attr.aria-label]="'addon.mod_forum.unread' | translate">
                 <core-icon name="fa-circle" color="primary"></core-icon>
-            </ion-badge>
-            <button ion-button icon-only clear color="dark" (click)="showCourseOptionsMenu($event)">
-                <core-icon name="more"></core-icon>
-            </button>
+            </ion-note>
         </div>
         <div class="addon-mod-forum-post-info">
             <ion-avatar core-user-avatar [user]="post" item-start [courseId]="courseId"></ion-avatar>
             <div class="addon-mod-forum-post-author">
                 <h3>{{post.userfullname}}</h3>
                 <p *ngIf="post.groupname"><ion-icon name="people"></ion-icon> {{ post.groupname }}</p>
-                <p *ngIf="post.modified">{{post.modified | coreFormatDate: "strftimedatetimeshort"}}</p>
+                <p *ngIf="post.modified">{{post.modified * 1000 | coreFormatDate: "strftimerecentfull"}}</p>
                 <p *ngIf="!post.modified"><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</p>
             </div>
         </div>
diff --git a/src/addon/mod/forum/pages/discussion/discussion.ts b/src/addon/mod/forum/pages/discussion/discussion.ts
index 6cf56461f..dec2adf0a 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.ts
+++ b/src/addon/mod/forum/pages/discussion/discussion.ts
@@ -89,6 +89,7 @@ export class AddonModForumDiscussionPage implements OnDestroy {
     hasOfflineRatings: boolean;
     protected ratingOfflineObserver: any;
     protected ratingSyncObserver: any;
+    protected changeDiscObserver: any;
 
     constructor(navParams: NavParams,
             network: Network,
@@ -183,6 +184,20 @@ export class AddonModForumDiscussionPage implements OnDestroy {
                 this.hasOfflineRatings = false;
             }
         });
+
+        this.changeDiscObserver = this.eventsProvider.on(AddonModForumProvider.CHANGE_DISCUSSION_EVENT, (data) => {
+            this.forumProvider.invalidateDiscussionsList(this.forum.id).finally(() => {
+                if (typeof data.locked != 'undefined') {
+                    this.discussion.locked = data.locked;
+                }
+                if (typeof data.pinned != 'undefined') {
+                    this.discussion.pinned = data.pinned;
+                }
+                if (typeof data.starred != 'undefined') {
+                    this.discussion.starred = data.starred;
+                }
+            });
+        });
     }
 
     /**
@@ -610,6 +625,7 @@ export class AddonModForumDiscussionPage implements OnDestroy {
         this.syncManualObserver && this.syncManualObserver.off();
         this.ratingOfflineObserver && this.ratingOfflineObserver.off();
         this.ratingSyncObserver && this.ratingSyncObserver.off();
+        this.changeDiscObserver && this.changeDiscObserver.off();
     }
 
     /**
diff --git a/src/addon/mod/forum/providers/forum.ts b/src/addon/mod/forum/providers/forum.ts
index 55a568574..c59e5cdf7 100644
--- a/src/addon/mod/forum/providers/forum.ts
+++ b/src/addon/mod/forum/providers/forum.ts
@@ -35,7 +35,7 @@ export class AddonModForumProvider {
     static NEW_DISCUSSION_EVENT = 'addon_mod_forum_new_discussion';
     static REPLY_DISCUSSION_EVENT = 'addon_mod_forum_reply_discussion';
     static VIEW_DISCUSSION_EVENT = 'addon_mod_forum_view_discussion';
-    static CHANGE_DISCUSSION_EVENT = 'addon_mod_forum_lock_discussion';
+    static CHANGE_DISCUSSION_EVENT = 'addon_mod_forum_change_discussion_status';
     static MARK_READ_EVENT = 'addon_mod_forum_mark_read';
 
     static PREFERENCE_SORTORDER = 'forum_discussionlistsortorder';

From 34ac2a93d81f1cae9e2d1843866bd9864705afa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 25 Oct 2019 10:37:08 +0200
Subject: [PATCH 099/257] MOBILE-3205 forum: Show attachments as inline files

---
 .../addon-mod-assign-submission-file.html     |  8 +-
 .../component/addon-mod-data-field-file.html  |  8 +-
 .../components/post/addon-mod-forum-post.html |  7 +-
 .../forum/pages/discussion/discussion.html    |  2 +-
 .../mod/resource/components/index/index.ts    |  2 +
 src/addon/mod/resource/providers/helper.ts    | 18 +----
 .../addon-mod-workshop-submission.html        |  7 +-
 src/components/components.module.ts           |  3 +
 src/components/files/core-files.html          |  9 +++
 src/components/files/files.ts                 | 79 +++++++++++++++++++
 src/providers/utils/mimetype.ts               | 34 ++++++++
 11 files changed, 133 insertions(+), 44 deletions(-)
 create mode 100644 src/components/files/core-files.html
 create mode 100644 src/components/files/files.ts

diff --git a/src/addon/mod/assign/submission/file/component/addon-mod-assign-submission-file.html b/src/addon/mod/assign/submission/file/component/addon-mod-assign-submission-file.html
index 69d048e0c..bd4fd9d01 100644
--- a/src/addon/mod/assign/submission/file/component/addon-mod-assign-submission-file.html
+++ b/src/addon/mod/assign/submission/file/component/addon-mod-assign-submission-file.html
@@ -2,13 +2,7 @@
 <ion-item text-wrap *ngIf="files && files.length && !edit">
     <h2>{{plugin.name}}</h2>
     <div no-lines>
-        <ng-container *ngFor="let file of files">
-            <!-- Files already attached to the submission. -->
-            <core-file *ngIf="!file.name" [file]="file" [component]="component" [componentId]="assign.cmid" [alwaysDownload]="true"></core-file>
-
-            <!-- Files stored in offline to be sent later. -->
-            <core-local-file *ngIf="file.name" [file]="file"></core-local-file>
-        </ng-container>
+        <core-files [files]="files" [component]="component" [componentId]="assign.cmid" [alwaysDownload]="true"></core-files>
     </div>
 </ion-item>
 
diff --git a/src/addon/mod/data/fields/file/component/addon-mod-data-field-file.html b/src/addon/mod/data/fields/file/component/addon-mod-data-field-file.html
index a7e8d8f11..bb71fc2cd 100644
--- a/src/addon/mod/data/fields/file/component/addon-mod-data-field-file.html
+++ b/src/addon/mod/data/fields/file/component/addon-mod-data-field-file.html
@@ -10,12 +10,6 @@
 
 <ng-container *ngIf="isShowOrListMode()">
     <div no-lines>
-        <ng-container *ngFor="let file of files">
-            <!-- Files already attached to the submission. -->
-            <core-file *ngIf="!file.name" [file]="file" [component]="component" [componentId]="componentId" [alwaysDownload]="true"></core-file>
-
-            <!-- Files stored in offline to be sent later. -->
-            <core-local-file *ngIf="file.name" [file]="file"></core-local-file>
-        </ng-container>
+        <core-files [files]="files" [component]="component" [componentId]="componentId" [alwaysDownload]="true"></core-files>
     </div>
 </ng-container>
diff --git a/src/addon/mod/forum/components/post/addon-mod-forum-post.html b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
index d0512dd01..0b91ce3d3 100644
--- a/src/addon/mod/forum/components/post/addon-mod-forum-post.html
+++ b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
@@ -27,12 +27,7 @@
     </div>
     <core-format-text [component]="component" [componentId]="componentId" [text]="post.message" contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId"></core-format-text>
     <div no-lines>
-        <ng-container *ngFor="let attachment of post.attachments">
-            <!-- Files already attached to the submission. -->
-            <core-file *ngIf="!attachment.name" [file]="attachment" [component]="component" [componentId]="componentId"></core-file>
-            <!-- Files stored in offline to be sent later. -->
-            <core-local-file *ngIf="attachment.name" [file]="attachment"></core-local-file>
-        </ng-container>
+        <core-files *ngIf="post.attachments && post.attachments.length > 0" [files]="post.attachments" [component]="component" [componentId]="componentId" showInline="true"></core-files>
     </div>
 </ion-card-content>
 <div class="addon-mod-forum-post-more-info">
diff --git a/src/addon/mod/forum/pages/discussion/discussion.html b/src/addon/mod/forum/pages/discussion/discussion.html
index 571c89738..57cbce7c5 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.html
+++ b/src/addon/mod/forum/pages/discussion/discussion.html
@@ -38,7 +38,7 @@
         </ion-card>
 
         <ion-card class="core-info-card" icon-start *ngIf="discussion && discussion.locked">
-            <ion-icon name="information-circle"></ion-icon> {{ 'addon.mod_forum.discussionlocked' | translate }}
+            <core-icon name="fa-lock"></core-icon> {{ 'addon.mod_forum.discussionlocked' | translate }}
         </ion-card>
 
         <ion-card *ngIf="discussion" margin-bottom class="highlight">
diff --git a/src/addon/mod/resource/components/index/index.ts b/src/addon/mod/resource/components/index/index.ts
index 6c33136a3..12913fe40 100644
--- a/src/addon/mod/resource/components/index/index.ts
+++ b/src/addon/mod/resource/components/index/index.ts
@@ -134,6 +134,8 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
 
                 return this.resourceHelper.getEmbeddedHtml(this.module, this.courseId).then((html) => {
                     this.contentText = html;
+
+                    this.mode = this.contentText.length > 0 ? 'embedded' : 'external';
                 });
             } else {
                 this.mode = 'external';
diff --git a/src/addon/mod/resource/providers/helper.ts b/src/addon/mod/resource/providers/helper.ts
index e751bf2c5..df5dfc870 100644
--- a/src/addon/mod/resource/providers/helper.ts
+++ b/src/addon/mod/resource/providers/helper.ts
@@ -53,23 +53,7 @@ export class AddonModResourceHelperProvider {
     getEmbeddedHtml(module: any, courseId: number): Promise<any> {
         return this.courseHelper.downloadModuleWithMainFileIfNeeded(module, courseId, AddonModResourceProvider.COMPONENT,
                 module.id, module.contents).then((result) => {
-            const file = module.contents[0],
-                ext = this.mimetypeUtils.getFileExtension(file.filename),
-                type = this.mimetypeUtils.getExtensionType(ext),
-                mimeType = this.mimetypeUtils.getMimeType(ext);
-
-            if (type == 'image') {
-                return '<img src="' + result.path + '"></img>';
-            }
-
-            if (type == 'audio' || type == 'video') {
-                return '<' + type + ' controls title="' + file.filename + '"" src="' + result.path + '">' +
-                    '<source src="' + result.path + '" type="' + mimeType + '">' +
-                    '</' + type + '>';
-            }
-
-            // Shouldn't reach here, the user should have called CoreMimetypeUtilsProvider#canBeEmbedded.
-            return '';
+            return this.mimetypeUtils.getEmbeddedHtml(module.contents[0], result.path);
         });
     }
 
diff --git a/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html b/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html
index 0db614d75..70b4e7063 100644
--- a/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html
+++ b/src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html
@@ -25,12 +25,7 @@
         <ion-item text-wrap *ngIf="submission.content">
             <core-format-text [component]="component" [componentId]="componentId" [text]="submission.content" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
         </ion-item>
-        <ion-item *ngFor="let attachment of submission.attachmentfiles">
-            <!-- Files already attached to the submission. -->
-            <core-file *ngIf="!attachment.name" [file]="attachment" [component]="component" [componentId]="componentId"></core-file>
-            <!-- Files stored in offline to be sent later. -->
-            <core-local-file *ngIf="attachment.name" [file]="attachment"></core-local-file>
-        </ion-item>
+        <core-files [files]="submission.attachmentfiles" [component]="component" [componentId]="componentId"></core-files>
         <ion-item text-wrap *ngIf="viewDetails && submission.feedbackauthor">
             <ion-avatar *ngIf="evaluateByProfile" core-user-avatar [user]="evaluateByProfile" item-start [courseId]="courseId" [userId]="evaluateByProfile.id"></ion-avatar>
 
diff --git a/src/components/components.module.ts b/src/components/components.module.ts
index 2a57451cf..fe663a255 100644
--- a/src/components/components.module.ts
+++ b/src/components/components.module.ts
@@ -27,6 +27,7 @@ import { CoreProgressBarComponent } from './progress-bar/progress-bar';
 import { CoreEmptyBoxComponent } from './empty-box/empty-box';
 import { CoreSearchBoxComponent } from './search-box/search-box';
 import { CoreFileComponent } from './file/file';
+import { CoreFilesComponent } from './files/files';
 import { CoreIconComponent } from './icon/icon';
 import { CoreContextMenuComponent } from './context-menu/context-menu';
 import { CoreContextMenuItemComponent } from './context-menu/context-menu-item';
@@ -67,6 +68,7 @@ import { CoreBSTooltipComponent } from './bs-tooltip/bs-tooltip';
         CoreEmptyBoxComponent,
         CoreSearchBoxComponent,
         CoreFileComponent,
+        CoreFilesComponent,
         CoreIconComponent,
         CoreContextMenuComponent,
         CoreContextMenuItemComponent,
@@ -118,6 +120,7 @@ import { CoreBSTooltipComponent } from './bs-tooltip/bs-tooltip';
         CoreEmptyBoxComponent,
         CoreSearchBoxComponent,
         CoreFileComponent,
+        CoreFilesComponent,
         CoreIconComponent,
         CoreContextMenuComponent,
         CoreContextMenuItemComponent,
diff --git a/src/components/files/core-files.html b/src/components/files/core-files.html
new file mode 100644
index 000000000..239728e29
--- /dev/null
+++ b/src/components/files/core-files.html
@@ -0,0 +1,9 @@
+<ng-container *ngIf="showInline && contentText">
+    <core-format-text [text]="contentText" [filter]="false"></core-format-text>
+</ng-container>
+<ng-container *ngFor="let file of files">
+    <!-- Files already attached to the filearea. -->
+    <core-file *ngIf="!file.name && !file.embedType" [file]="file" [component]="component" [componentId]="componentId" [alwaysDownload]="alwaysDownload" [canDownload]="canDownload" [showSize]="showSize" [showTime]="showTime"></core-file>
+    <!-- Files stored in offline to be sent later. -->
+    <core-local-file *ngIf="file.name && !file.embedType" [file]="file"></core-local-file>
+</ng-container>
\ No newline at end of file
diff --git a/src/components/files/files.ts b/src/components/files/files.ts
new file mode 100644
index 000000000..9cc9fea6c
--- /dev/null
+++ b/src/components/files/files.ts
@@ -0,0 +1,79 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Component, Input, OnInit, DoCheck, KeyValueDiffers } from '@angular/core';
+import { CoreMimetypeUtilsProvider } from '@providers/utils/mimetype';
+import { CoreUtilsProvider } from '@providers/utils/utils';
+
+/**
+ * Component to render a file list.
+ *
+ * <core-files [files]="files" [component]="component" [componentId]="assign.cmid">
+ * </core-files>
+ */
+@Component({
+    selector: 'core-files',
+    templateUrl: 'core-files.html'
+})
+export class CoreFilesComponent implements OnInit, DoCheck {
+    @Input() files: any[]; // List of files.
+    @Input() component: string; // Component the downloaded files will be linked to.
+    @Input() componentId: string | number; // Component ID.
+    @Input() alwaysDownload?: boolean | string; // Whether it should always display the refresh button when the file is downloaded.
+                                               // Use it for files that you cannot determine if they're outdated or not.
+    @Input() canDownload?: boolean | string = true; // Whether file can be downloaded.
+    @Input() showSize?: boolean | string = true; // Whether show filesize.
+    @Input() showTime?: boolean | string = true; // Whether show file time modified.
+    @Input() showInline = false; // If true, it will reorder and try to show inline files first.
+
+    contentText: string;
+
+    protected differ: any; // To detect changes in the data input.
+
+    constructor(protected mimetypeUtils: CoreMimetypeUtilsProvider,
+            protected utils: CoreUtilsProvider,
+            differs: KeyValueDiffers) {
+        this.differ = differs.find([]).create();
+    }
+
+    /**
+     * Component being initialized.
+     */
+    ngOnInit(): void {
+        if (this.utils.isTrueOrOne(this.showInline)) {
+            this.renderInlineFiles();
+        }
+    }
+
+    /**
+     * Detect and act upon changes that Angular can’t or won’t detect on its own (objects and arrays).
+     */
+    ngDoCheck(): void {
+        if (this.utils.isTrueOrOne(this.showInline)) {
+            // Check if there's any change in the extraData object.
+            const changes = this.differ.diff(this.files);
+            if (changes) {
+                this.renderInlineFiles();
+            }
+        }
+    }
+
+    protected renderInlineFiles(): void {
+        this.contentText = this.files.reduce((previous, file) => {
+            const text = this.mimetypeUtils.getEmbeddedHtml(file);
+
+            return text ? previous + '<br>' + text : previous;
+        }, '');
+    }
+}
diff --git a/src/providers/utils/mimetype.ts b/src/providers/utils/mimetype.ts
index d45d9af87..47dc09037 100644
--- a/src/providers/utils/mimetype.ts
+++ b/src/providers/utils/mimetype.ts
@@ -138,6 +138,40 @@ export class CoreMimetypeUtilsProvider {
         }
     }
 
+    /**
+     * Set the embed type to display an embedded file and mimetype if not found.
+     *
+     * @param file File object.
+     * @paran path Alternative path that will override fileurl from file object.
+     */
+    getEmbeddedHtml(file: any, path?: string): string {
+        let ext;
+
+        if (file.mimetype) {
+            ext = this.getExtension(file.mimetype);
+        } else {
+            ext = this.getFileExtension(file.filename);
+            file.mimetype = this.getMimeType(ext);
+        }
+
+        if (this.canBeEmbedded(ext)) {
+            file.embedType = this.getExtensionType(ext);
+
+            path = path || file.fileurl;
+
+            if (file.embedType == 'image') {
+                return '<img src="' + path + '">';
+            }
+            if (file.embedType == 'audio' || file.embedType == 'video') {
+                return '<' + file.embedType + ' controls title="' + file.filename + '" src="' + path + '">' +
+                    '<source src="' + path + '" type="' + file.mimetype + '">' +
+                    '</' + file.embedType + '>';
+            }
+        }
+
+        return '';
+    }
+
     /**
      * Get the URL of the icon of an extension.
      *

From e1e2b839332bef8b29ceaecf269b1939ada7a87e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 25 Oct 2019 12:32:28 +0200
Subject: [PATCH 100/257] MOBILE-3205 forum: Save forum discussion sorting

---
 .../mod/forum/pages/discussion/discussion.ts  | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/addon/mod/forum/pages/discussion/discussion.ts b/src/addon/mod/forum/pages/discussion/discussion.ts
index dec2adf0a..b4b5d424d 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.ts
+++ b/src/addon/mod/forum/pages/discussion/discussion.ts
@@ -131,13 +131,17 @@ export class AddonModForumDiscussionPage implements OnDestroy {
      * View loaded.
      */
     ionViewDidLoad(): void {
-        this.fetchPosts(true, false, true).then(() => {
-            if (this.postId) {
-                // Scroll to the post.
-                setTimeout(() => {
-                    this.domUtils.scrollToElementBySelector(this.content, '#addon-mod_forum-post-' + this.postId);
-                });
-            }
+        this.sitesProvider.getCurrentSite().getLocalSiteConfig('AddonModForumDiscussionSort', this.sort).then((value) => {
+            this.sort = value;
+        }).finally(() => {
+            this.fetchPosts(true, false, true).then(() => {
+                if (this.postId) {
+                    // Scroll to the post.
+                    setTimeout(() => {
+                        this.domUtils.scrollToElementBySelector(this.content, '#addon-mod_forum-post-' + this.postId);
+                    });
+                }
+            });
         });
     }
 
@@ -513,6 +517,7 @@ export class AddonModForumDiscussionPage implements OnDestroy {
     changeSort(type: SortType): Promise<any> {
         this.discussionLoaded = false;
         this.sort = type;
+        this.sitesProvider.getCurrentSite().setLocalSiteConfig('AddonModForumDiscussionSort', this.sort);
         this.domUtils.scrollToTop(this.content);
 
         return this.fetchPosts();

From 4bc90e892ad3d19739d97e8cf4bb62fca0cbbe36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 25 Oct 2019 13:10:29 +0200
Subject: [PATCH 101/257] MOBILE-3205 forum: Adapt forum discussion view

---
 .../components/post/addon-mod-forum-post.html | 168 +++++++++---------
 src/addon/mod/forum/components/post/post.scss |   9 +-
 .../forum/pages/discussion/discussion.html    |   4 +-
 .../forum/pages/discussion/discussion.scss    |   2 +-
 4 files changed, 96 insertions(+), 87 deletions(-)

diff --git a/src/addon/mod/forum/components/post/addon-mod-forum-post.html b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
index 0b91ce3d3..600f96f30 100644
--- a/src/addon/mod/forum/components/post/addon-mod-forum-post.html
+++ b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
@@ -1,89 +1,91 @@
-<ion-card-header text-wrap no-padding id="addon-mod_forum-post-{{post.id}}">
-    <ion-item text-wrap>
-        <div class="addon-mod-forum-post-title">
-            <h2 text-wrap>
-                <core-icon name="fa-map-pin" *ngIf="post.parent == 0 && post.pinned"></core-icon>
-                <core-icon name="fa-star" class="addon-forum-star" *ngIf="post.parent == 0 && !post.pinned && post.starred"></core-icon>
-                <core-format-text [text]="post.subject" contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId"></core-format-text>
-            </h2>
-            <ion-note float-end padding-left text-end *ngIf="trackPosts && !post.postread" [attr.aria-label]="'addon.mod_forum.unread' | translate">
-                <core-icon name="fa-circle" color="primary"></core-icon>
-            </ion-note>
-        </div>
-        <div class="addon-mod-forum-post-info">
-            <ion-avatar core-user-avatar [user]="post" item-start [courseId]="courseId"></ion-avatar>
-            <div class="addon-mod-forum-post-author">
-                <h3>{{post.userfullname}}</h3>
-                <p *ngIf="post.groupname"><ion-icon name="people"></ion-icon> {{ post.groupname }}</p>
-                <p *ngIf="post.modified">{{post.modified * 1000 | coreFormatDate: "strftimerecentfull"}}</p>
-                <p *ngIf="!post.modified"><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</p>
+<div class="addon-mod_forum-post">
+    <ion-card-header text-wrap no-padding id="addon-mod_forum-post-{{post.id}}">
+        <ion-item text-wrap>
+            <div class="addon-mod-forum-post-title">
+                <h2 text-wrap>
+                    <core-icon name="fa-map-pin" *ngIf="post.parent == 0 && post.pinned"></core-icon>
+                    <core-icon name="fa-star" class="addon-forum-star" *ngIf="post.parent == 0 && !post.pinned && post.starred"></core-icon>
+                    <core-format-text [text]="post.subject" contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId"></core-format-text>
+                </h2>
+                <ion-note float-end padding-left text-end *ngIf="trackPosts && !post.postread" [attr.aria-label]="'addon.mod_forum.unread' | translate">
+                    <core-icon name="fa-circle" color="primary"></core-icon>
+                </ion-note>
             </div>
+            <div class="addon-mod-forum-post-info">
+                <ion-avatar core-user-avatar [user]="post" item-start [courseId]="courseId"></ion-avatar>
+                <div class="addon-mod-forum-post-author">
+                    <h3>{{post.userfullname}}</h3>
+                    <p *ngIf="post.groupname"><ion-icon name="people"></ion-icon> {{ post.groupname }}</p>
+                    <p *ngIf="post.modified">{{post.modified * 1000 | coreFormatDate: "strftimerecentfull"}}</p>
+                    <p *ngIf="!post.modified"><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</p>
+                </div>
+            </div>
+        </ion-item>
+    </ion-card-header>
+    <ion-card-content [attr.padding-top]="post.parent == 0 || null">
+        <div padding-bottom *ngIf="post.isprivatereply">
+            <ion-note>{{ 'addon.mod_forum.postisprivatereply' | translate }}</ion-note>
         </div>
-    </ion-item>
-</ion-card-header>
-<ion-card-content [attr.padding-top]="post.parent == 0 || null">
-    <div padding-bottom *ngIf="post.isprivatereply">
-        <ion-note>{{ 'addon.mod_forum.postisprivatereply' | translate }}</ion-note>
-    </div>
-    <core-format-text [component]="component" [componentId]="componentId" [text]="post.message" contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId"></core-format-text>
-    <div no-lines>
-        <core-files *ngIf="post.attachments && post.attachments.length > 0" [files]="post.attachments" [component]="component" [componentId]="componentId" showInline="true"></core-files>
-    </div>
-</ion-card-content>
-<div class="addon-mod-forum-post-more-info">
-    <ion-item text-wrap *ngIf="tagsEnabled && post.tags && post.tags.length > 0">
-        <div item-start>{{ 'core.tag.tags' | translate }}:</div>
-        <core-tag-list [tags]="post.tags"></core-tag-list>
-    </ion-item>
-    <core-rating-rate *ngIf="forum && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="componentId" [itemId]="post.id" [itemSetId]="discussionId" [courseId]="courseId" [aggregateMethod]="forum.assessed" [scaleId]="forum.scale" [userId]="post.userid" (onUpdate)="ratingUpdated()"></core-rating-rate>
-    <core-rating-aggregate *ngIf="forum && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="componentId" [itemId]="post.id" [courseId]="courseId" [aggregateMethod]="forum.assessed" [scaleId]="forum.scale"></core-rating-aggregate>
+        <core-format-text [component]="component" [componentId]="componentId" [text]="post.message" contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId"></core-format-text>
+        <div no-lines *ngIf="post.attachments && post.attachments.length > 0">
+            <core-files [files]="post.attachments" [component]="component" [componentId]="componentId" showInline="true"></core-files>
+        </div>
+    </ion-card-content>
+    <div class="addon-mod-forum-post-more-info">
+        <ion-item text-wrap *ngIf="tagsEnabled && post.tags && post.tags.length > 0">
+            <div item-start>{{ 'core.tag.tags' | translate }}:</div>
+            <core-tag-list [tags]="post.tags"></core-tag-list>
+        </ion-item>
+        <core-rating-rate *ngIf="forum && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="componentId" [itemId]="post.id" [itemSetId]="discussionId" [courseId]="courseId" [aggregateMethod]="forum.assessed" [scaleId]="forum.scale" [userId]="post.userid" (onUpdate)="ratingUpdated()"></core-rating-rate>
+        <core-rating-aggregate *ngIf="forum && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="componentId" [itemId]="post.id" [courseId]="courseId" [aggregateMethod]="forum.assessed" [scaleId]="forum.scale"></core-rating-aggregate>
 
-    <ion-item no-padding text-end *ngIf="post.id && post.canreply && !post.isprivatereply" class="addon-forum-reply-button">
-        <button ion-button icon-left clear small (click)="showReply()" [attr.aria-controls]="'addon-forum-reply-edit-form-' + uniqueId" [attr.aria-expanded]="replyData.replyingTo === post.id">
-            <ion-icon name="undo"></ion-icon> {{ 'addon.mod_forum.reply' | translate }}
+        <ion-item no-padding text-end *ngIf="post.id && post.canreply && !post.isprivatereply" class="addon-forum-reply-button">
+            <button ion-button icon-left clear small (click)="showReply()" [attr.aria-controls]="'addon-forum-reply-edit-form-' + uniqueId" [attr.aria-expanded]="replyData.replyingTo === post.id">
+                <ion-icon name="undo"></ion-icon> {{ 'addon.mod_forum.reply' | translate }}
+            </button>
+        </ion-item>
+    </div>
+    <ion-item text-end *ngIf="!post.id && (!replyData.isEditing || replyData.replyingTo != post.parent)">
+        <button ion-button icon-left clear small (click)="editReply()" [attr.aria-controls]="'addon-forum-reply-edit-form-' + uniqueId" [attr.aria-expanded]="replyData.replyingTo === post.parent">
+            <ion-icon name="create"></ion-icon> {{ 'addon.mod_forum.edit' | translate }}
         </button>
     </ion-item>
-</div>
-<ion-item text-end *ngIf="!post.id && (!replyData.isEditing || replyData.replyingTo != post.parent)">
-    <button ion-button icon-left clear small (click)="editReply()" [attr.aria-controls]="'addon-forum-reply-edit-form-' + uniqueId" [attr.aria-expanded]="replyData.replyingTo === post.parent">
-        <ion-icon name="create"></ion-icon> {{ 'addon.mod_forum.edit' | translate }}
-    </button>
-</ion-item>
 
-<ion-list [id]="'addon-forum-reply-edit-form-' + uniqueId" *ngIf="(post.id && !replyData.isEditing && replyData.replyingTo == post.id) || (!post.id && replyData.isEditing && replyData.replyingTo == post.parent)">
-    <ion-item>
-        <ion-label stacked>{{ 'addon.mod_forum.subject' | translate }}</ion-label>
-        <ion-input type="text" [placeholder]="'addon.mod_forum.subject' | translate" [(ngModel)]="replyData.subject"></ion-input>
-    </ion-item>
-    <ion-item>
-        <ion-label stacked>{{ 'addon.mod_forum.message' | translate }}</ion-label>
-        <core-rich-text-editor item-content [control]="messageControl" (contentChanged)="onMessageChange($event)" [placeholder]="'addon.mod_forum.replyplaceholder' | translate" [name]="'mod_forum_reply_' + post.id" [component]="component" [componentId]="componentId"></core-rich-text-editor>
-    </ion-item>
-    <ion-item text-wrap *ngIf="accessInfo.canpostprivatereply">
-        <ion-label>{{ 'addon.mod_forum.privatereply' | translate }}</ion-label>
-        <ion-checkbox item-end [(ngModel)]="replyData.isprivatereply"></ion-checkbox>
-    </ion-item>
-    <ion-item-divider text-wrap (click)="toggleAdvanced()" class="core-expandable">
-        <core-icon *ngIf="!advanced" name="fa-caret-right" item-start></core-icon>
-        <core-icon *ngIf="advanced" name="fa-caret-down" item-start></core-icon>
-        {{ 'addon.mod_forum.advanced' | translate }}
-    </ion-item-divider>
-    <ng-container *ngIf="advanced">
-        <core-attachments *ngIf="forum.id && forum.maxattachments > 0" [files]="replyData.files" [maxSize]="forum.maxbytes" [maxSubmissions]="forum.maxattachments" [component]="component" [componentId]="forum.cmid" [allowOffline]="true"></core-attachments>
-    </ng-container>
-    <ion-grid>
-        <ion-row>
-            <ion-col>
-                <button ion-button block (click)="reply()" [disabled]="replyData.subject == '' || replyData.message == null">{{ 'addon.mod_forum.posttoforum' | translate }}</button>
-            </ion-col>
-            <ion-col>
-                <button ion-button block color="light" (click)="cancel()">{{ 'core.cancel' | translate }}</button>
-            </ion-col>
-        </ion-row>
-        <ion-row *ngIf="replyData.isEditing">
-            <ion-col>
-                <button ion-button block color="light" (click)="discard()">{{ 'core.discard' | translate }}</button>
-            </ion-col>
-        </ion-row>
-    </ion-grid>
-</ion-list>
+    <ion-list [id]="'addon-forum-reply-edit-form-' + uniqueId" *ngIf="(post.id && !replyData.isEditing && replyData.replyingTo == post.id) || (!post.id && replyData.isEditing && replyData.replyingTo == post.parent)">
+        <ion-item>
+            <ion-label stacked>{{ 'addon.mod_forum.subject' | translate }}</ion-label>
+            <ion-input type="text" [placeholder]="'addon.mod_forum.subject' | translate" [(ngModel)]="replyData.subject"></ion-input>
+        </ion-item>
+        <ion-item>
+            <ion-label stacked>{{ 'addon.mod_forum.message' | translate }}</ion-label>
+            <core-rich-text-editor item-content [control]="messageControl" (contentChanged)="onMessageChange($event)" [placeholder]="'addon.mod_forum.replyplaceholder' | translate" [name]="'mod_forum_reply_' + post.id" [component]="component" [componentId]="componentId"></core-rich-text-editor>
+        </ion-item>
+        <ion-item text-wrap *ngIf="accessInfo.canpostprivatereply">
+            <ion-label>{{ 'addon.mod_forum.privatereply' | translate }}</ion-label>
+            <ion-checkbox item-end [(ngModel)]="replyData.isprivatereply"></ion-checkbox>
+        </ion-item>
+        <ion-item-divider text-wrap (click)="toggleAdvanced()" class="core-expandable">
+            <core-icon *ngIf="!advanced" name="fa-caret-right" item-start></core-icon>
+            <core-icon *ngIf="advanced" name="fa-caret-down" item-start></core-icon>
+            {{ 'addon.mod_forum.advanced' | translate }}
+        </ion-item-divider>
+        <ng-container *ngIf="advanced">
+            <core-attachments *ngIf="forum.id && forum.maxattachments > 0" [files]="replyData.files" [maxSize]="forum.maxbytes" [maxSubmissions]="forum.maxattachments" [component]="component" [componentId]="forum.cmid" [allowOffline]="true"></core-attachments>
+        </ng-container>
+        <ion-grid>
+            <ion-row>
+                <ion-col>
+                    <button ion-button block (click)="reply()" [disabled]="replyData.subject == '' || replyData.message == null">{{ 'addon.mod_forum.posttoforum' | translate }}</button>
+                </ion-col>
+                <ion-col>
+                    <button ion-button block color="light" (click)="cancel()">{{ 'core.cancel' | translate }}</button>
+                </ion-col>
+            </ion-row>
+            <ion-row *ngIf="replyData.isEditing">
+                <ion-col>
+                    <button ion-button block color="light" (click)="discard()">{{ 'core.discard' | translate }}</button>
+                </ion-col>
+            </ion-row>
+        </ion-grid>
+    </ion-list>
+</div>
diff --git a/src/addon/mod/forum/components/post/post.scss b/src/addon/mod/forum/components/post/post.scss
index 429be2b80..487ec8477 100644
--- a/src/addon/mod/forum/components/post/post.scss
+++ b/src/addon/mod/forum/components/post/post.scss
@@ -1,4 +1,7 @@
-ion-app.app-root addon-mod-forum-post {
+ion-app.app-root addon-mod-forum-post .addon-mod_forum-post {
+    background-color: $white;
+    border-bottom: 1px solid $list-md-border-color;
+
     .addon-forum-star {
         color: $core-star-color;
     }
@@ -45,6 +48,10 @@ ion-app.app-root addon-mod-forum-post {
         }
     }
 
+    .item .item-inner {
+        border-bottom: 0;
+    }
+
     .addon-mod-forum-post-more-info div {
         font-size: 1.4rem;
     }
diff --git a/src/addon/mod/forum/pages/discussion/discussion.html b/src/addon/mod/forum/pages/discussion/discussion.html
index 57cbce7c5..9615fd88a 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.html
+++ b/src/addon/mod/forum/pages/discussion/discussion.html
@@ -41,9 +41,9 @@
             <core-icon name="fa-lock"></core-icon> {{ 'addon.mod_forum.discussionlocked' | translate }}
         </ion-card>
 
-        <ion-card *ngIf="discussion" margin-bottom class="highlight">
+        <div *ngIf="discussion" margin-bottom class="highlight">
             <addon-mod-forum-post [post]="discussion" [courseId]="courseId" [discussionId]="discussionId" [component]="component" [componentId]="cmId" [replyData]="replyData" [originalData]="originalData" [defaultSubject]="defaultSubject" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo" (onPostChange)="postListChanged()"></addon-mod-forum-post>
-        </ion-card>
+        </div>
 
         <ion-card *ngIf="sort != 'nested'">
             <ng-container *ngFor="let post of posts; first as first">
diff --git a/src/addon/mod/forum/pages/discussion/discussion.scss b/src/addon/mod/forum/pages/discussion/discussion.scss
index f9013b8f7..54d9b1f0c 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.scss
+++ b/src/addon/mod/forum/pages/discussion/discussion.scss
@@ -1,5 +1,5 @@
 ion-app.app-root page-addon-mod-forum-discussion {
-    .card.highlight .card-header .item {
+    .highlight .card-header .item {
         background-color: $gray-lighter;
         @include darkmode() {
             background-color: $black;

From 6a262fd1012ff039b32e40d946bd5055fa1a5484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 29 Oct 2019 11:46:38 +0100
Subject: [PATCH 102/257] MOBILE-3205 forum: Hide subject on replies when not
 modified

---
 .../components/index/addon-mod-forum-index.html      |  4 ++--
 .../forum/components/post/addon-mod-forum-post.html  | 12 ++++++------
 src/addon/mod/forum/components/post/post.scss        |  9 +++++++++
 src/addon/mod/forum/components/post/post.ts          |  6 ++++++
 src/components/files/files.ts                        |  5 ++++-
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/addon/mod/forum/components/index/addon-mod-forum-index.html b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
index eda6f5033..cfb16864f 100644
--- a/src/addon/mod/forum/components/index/addon-mod-forum-index.html
+++ b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
@@ -70,9 +70,9 @@
                             </button>
                         </div>
                         <div class="addon-mod-forum-discussion-info">
-                            <ion-avatar core-user-avatar [user]="discussion" item-start [courseId]="courseId"></ion-avatar>
+                            <ion-avatar *ngIf="discussion.userfullname" core-user-avatar [user]="discussion" item-start [courseId]="courseId"></ion-avatar>
                             <div class="addon-mod-forum-discussion-author">
-                                <h3>{{discussion.userfullname}}</h3>
+                                <h3 *ngIf="discussion.userfullname">{{discussion.userfullname}}</h3>
                                 <p *ngIf="discussion.groupname"><ion-icon name="people"></ion-icon> {{ discussion.groupname }}</p>
                                 <p>{{discussion.created * 1000 | coreFormatDate: "strftimerecentfull"}}</p>
                             </div>
diff --git a/src/addon/mod/forum/components/post/addon-mod-forum-post.html b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
index 600f96f30..87f191833 100644
--- a/src/addon/mod/forum/components/post/addon-mod-forum-post.html
+++ b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
@@ -1,24 +1,24 @@
 <div class="addon-mod_forum-post">
     <ion-card-header text-wrap no-padding id="addon-mod_forum-post-{{post.id}}">
         <ion-item text-wrap>
-            <div class="addon-mod-forum-post-title">
+            <div class="addon-mod-forum-post-title" *ngIf="displaySubject">
                 <h2 text-wrap>
                     <core-icon name="fa-map-pin" *ngIf="post.parent == 0 && post.pinned"></core-icon>
                     <core-icon name="fa-star" class="addon-forum-star" *ngIf="post.parent == 0 && !post.pinned && post.starred"></core-icon>
                     <core-format-text [text]="post.subject" contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId"></core-format-text>
                 </h2>
-                <ion-note float-end padding-left text-end *ngIf="trackPosts && !post.postread" [attr.aria-label]="'addon.mod_forum.unread' | translate">
-                    <core-icon name="fa-circle" color="primary"></core-icon>
-                </ion-note>
             </div>
             <div class="addon-mod-forum-post-info">
-                <ion-avatar core-user-avatar [user]="post" item-start [courseId]="courseId"></ion-avatar>
+                <ion-avatar *ngIf="post.userfullname" core-user-avatar [user]="post" item-start [courseId]="courseId"></ion-avatar>
                 <div class="addon-mod-forum-post-author">
-                    <h3>{{post.userfullname}}</h3>
+                    <h3 *ngIf="post.userfullname">{{post.userfullname}}</h3>
                     <p *ngIf="post.groupname"><ion-icon name="people"></ion-icon> {{ post.groupname }}</p>
                     <p *ngIf="post.modified">{{post.modified * 1000 | coreFormatDate: "strftimerecentfull"}}</p>
                     <p *ngIf="!post.modified"><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</p>
                 </div>
+                <ion-note float-end padding-left text-end *ngIf="trackPosts && !post.postread" [attr.aria-label]="'addon.mod_forum.unread' | translate">
+                    <core-icon name="fa-circle" color="primary"></core-icon>
+                </ion-note>
             </div>
         </ion-item>
     </ion-card-header>
diff --git a/src/addon/mod/forum/components/post/post.scss b/src/addon/mod/forum/components/post/post.scss
index 487ec8477..995dc2f13 100644
--- a/src/addon/mod/forum/components/post/post.scss
+++ b/src/addon/mod/forum/components/post/post.scss
@@ -42,6 +42,15 @@ ion-app.app-root addon-mod-forum-post .addon-mod_forum-post {
             display: flex;
             align-items: center;
         }
+
+        .addon-mod-forum-post-info {
+            margin-top: 8px;
+        }
+
+        .addon-mod-forum-post-title + .addon-mod-forum-post-info {
+            margin-top: 0px;
+        }
+
         .addon-mod-forum-post-title h2,
         .addon-mod-forum-post-info .addon-mod-forum-post-author {
             flex-grow: 1;
diff --git a/src/addon/mod/forum/components/post/post.ts b/src/addon/mod/forum/components/post/post.ts
index 36a91e531..74801550b 100644
--- a/src/addon/mod/forum/components/post/post.ts
+++ b/src/addon/mod/forum/components/post/post.ts
@@ -54,6 +54,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
     uniqueId: string;
     advanced = false; // Display all form fields.
     tagsEnabled: boolean;
+    displaySubject = true;
 
     protected syncId: string;
 
@@ -78,6 +79,11 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
      */
     ngOnInit(): void {
         this.uniqueId = this.post.id ? 'reply' + this.post.id : 'edit' + this.post.parent;
+
+        const reTranslated = this.translate.instant('addon.mod_forum.re');
+        this.displaySubject = this.post.parent == 0 ||
+            (this.post.subject != this.defaultSubject && this.post.subject != 'Re: ' + this.defaultSubject &&
+                this.post.subject != reTranslated + this.defaultSubject);
     }
 
     /**
diff --git a/src/components/files/files.ts b/src/components/files/files.ts
index 9cc9fea6c..551c81137 100644
--- a/src/components/files/files.ts
+++ b/src/components/files/files.ts
@@ -61,7 +61,7 @@ export class CoreFilesComponent implements OnInit, DoCheck {
      */
     ngDoCheck(): void {
         if (this.utils.isTrueOrOne(this.showInline)) {
-            // Check if there's any change in the extraData object.
+            // Check if there's any change in the files array.
             const changes = this.differ.diff(this.files);
             if (changes) {
                 this.renderInlineFiles();
@@ -69,6 +69,9 @@ export class CoreFilesComponent implements OnInit, DoCheck {
         }
     }
 
+    /**
+     * Calculate contentText based on fils that can be rendered inline.
+     */
     protected renderInlineFiles(): void {
         this.contentText = this.files.reduce((previous, file) => {
             const text = this.mimetypeUtils.getEmbeddedHtml(file);

From 127e391cf4d227155187768b19db0ee4de7050c3 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 31 Oct 2019 10:35:55 +0100
Subject: [PATCH 103/257] MOBILE-1611 filter: Don't force cache when getting
 modules

---
 src/addon/filter/mathjaxloader/mathjaxloader.module.ts | 2 +-
 src/addon/filter/mathjaxloader/providers/handler.ts    | 7 ++-----
 src/core/filter/providers/helper.ts                    | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/addon/filter/mathjaxloader/mathjaxloader.module.ts b/src/addon/filter/mathjaxloader/mathjaxloader.module.ts
index 0af91a79e..5d78641ca 100644
--- a/src/addon/filter/mathjaxloader/mathjaxloader.module.ts
+++ b/src/addon/filter/mathjaxloader/mathjaxloader.module.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/addon/filter/mathjaxloader/providers/handler.ts b/src/addon/filter/mathjaxloader/providers/handler.ts
index 0b8501685..72f67ba66 100644
--- a/src/addon/filter/mathjaxloader/providers/handler.ts
+++ b/src/addon/filter/mathjaxloader/providers/handler.ts
@@ -1,5 +1,4 @@
-
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -49,7 +48,6 @@ export class AddonFilterMathJaxLoaderHandler extends CoreFilterDefaultHandler {
 
     // List of explicit mappings and known exceptions (moodle => mathjax).
     protected EXPLICIT_MAPPING = {
-            'cz': 'cs',
             'zh-tw': 'zh-hant',
             'zh-cn': 'zh-hans',
         };
@@ -115,7 +113,6 @@ export class AddonFilterMathJaxLoaderHandler extends CoreFilterDefaultHandler {
 
             // We cannot get the filter settings, so we cannot know if it can be used as a replacement for the TeX filter.
             // Assume it cannot (default value).
-
             let hasDisplayOrInline = false;
             if (text.match(/\\[\[\(]/) || text.match(/\$\$/)) {
                 // Only parse the text if there are mathjax symbols in it.
@@ -170,7 +167,7 @@ export class AddonFilterMathJaxLoaderHandler extends CoreFilterDefaultHandler {
     /**
      * Check if the JS library has been loaded.
      *
-     * @return {boolean} Whether the library has been loaded.
+     * @return Whether the library has been loaded.
      */
     protected jsLoaded(): boolean {
         return this.window.M && this.window.M.filter_mathjaxloader;
diff --git a/src/core/filter/providers/helper.ts b/src/core/filter/providers/helper.ts
index bc7d44fee..ee4767346 100644
--- a/src/core/filter/providers/helper.ts
+++ b/src/core/filter/providers/helper.ts
@@ -71,7 +71,7 @@ export class CoreFilterHelperProvider {
      */
     getCourseModulesContexts(courseId: number, siteId?: string): Promise<{contextlevel: string, instanceid: number}[]> {
 
-        return this.courseProvider.getSections(courseId, false, true, {omitExpires: true}, siteId).then((sections) => {
+        return this.courseProvider.getSections(courseId, false, true, undefined, siteId).then((sections) => {
             const contexts: {contextlevel: string, instanceid: number}[] = [];
 
             sections.forEach((section) => {

From f4017797dbb388a20b0ff6223e75d67ee551a780 Mon Sep 17 00:00:00 2001
From: Mark Johnson <mark.johnson@open.ac.uk>
Date: Thu, 15 Aug 2019 12:12:46 +0100
Subject: [PATCH 104/257] MOBILE-3121 UX: Add label to "Remove files" menu item

---
 scripts/langindex.json                                         | 1 +
 .../mod/assign/components/index/addon-mod-assign-index.html    | 2 +-
 src/addon/mod/book/components/index/addon-mod-book-index.html  | 2 +-
 .../mod/choice/components/index/addon-mod-choice-index.html    | 2 +-
 src/addon/mod/data/components/index/addon-mod-data-index.html  | 2 +-
 .../feedback/components/index/addon-mod-feedback-index.html    | 2 +-
 .../mod/folder/components/index/addon-mod-folder-index.html    | 2 +-
 .../mod/forum/components/index/addon-mod-forum-index.html      | 2 +-
 .../glossary/components/index/addon-mod-glossary-index.html    | 2 +-
 .../mod/imscp/components/index/addon-mod-imscp-index.html      | 2 +-
 .../mod/lesson/components/index/addon-mod-lesson-index.html    | 2 +-
 src/addon/mod/page/components/index/addon-mod-page-index.html  | 2 +-
 src/addon/mod/quiz/components/index/addon-mod-quiz-index.html  | 2 +-
 .../resource/components/index/addon-mod-resource-index.html    | 2 +-
 .../mod/scorm/components/index/addon-mod-scorm-index.html      | 2 +-
 .../mod/survey/components/index/addon-mod-survey-index.html    | 2 +-
 src/addon/mod/wiki/components/index/addon-mod-wiki-index.html  | 2 +-
 .../workshop/components/index/addon-mod-workshop-index.html    | 2 +-
 src/assets/lang/en.json                                        | 1 +
 .../components/module-index/core-siteplugins-module-index.html | 2 +-
 src/lang/en.json                                               | 3 ++-
 21 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 87413dde6..16f8cbda6 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1770,6 +1770,7 @@
   "core.redirectingtosite": "local_moodlemobileapp",
   "core.refresh": "moodle",
   "core.remove": "moodle",
+  "core.removefiles": "local_moodlemobileapp",
   "core.required": "moodle",
   "core.requireduserdatamissing": "local_moodlemobileapp",
   "core.resourcedisplayopen": "moodle",
diff --git a/src/addon/mod/assign/components/index/addon-mod-assign-index.html b/src/addon/mod/assign/components/index/addon-mod-assign-index.html
index eb716eebb..3e118e578 100644
--- a/src/addon/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addon/mod/assign/components/index/addon-mod-assign-index.html
@@ -7,7 +7,7 @@
         <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && hasOffline && isOnline"  [priority]="600" [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)" [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="size" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
+        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.removefiles' | translate:{$a: size}" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 
diff --git a/src/addon/mod/book/components/index/addon-mod-book-index.html b/src/addon/mod/book/components/index/addon-mod-book-index.html
index 32566b2a0..6bb6c36d1 100644
--- a/src/addon/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addon/mod/book/components/index/addon-mod-book-index.html
@@ -9,7 +9,7 @@
         <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" [iconAction]="'fa-newspaper-o'" (action)="gotoBlog($event)"></core-context-menu-item>
         <core-context-menu-item [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="600" [content]="prefetchText" (action)="prefetch($event)" [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="500" [content]="size" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
+        <core-context-menu-item *ngIf="size" [priority]="500" [content]="'core.removefiles' | translate:{$a: size}" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 
diff --git a/src/addon/mod/choice/components/index/addon-mod-choice-index.html b/src/addon/mod/choice/components/index/addon-mod-choice-index.html
index 5857d522a..762ad5066 100644
--- a/src/addon/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addon/mod/choice/components/index/addon-mod-choice-index.html
@@ -7,7 +7,7 @@
         <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && hasOffline && isOnline"  [priority]="600" [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)" [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="size" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
+        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.removefiles' | translate:{$a: size}" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 
diff --git a/src/addon/mod/data/components/index/addon-mod-data-index.html b/src/addon/mod/data/components/index/addon-mod-data-index.html
index 1376b8249..200fb4387 100644
--- a/src/addon/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addon/mod/data/components/index/addon-mod-data-index.html
@@ -12,7 +12,7 @@
         <core-context-menu-item [priority]="500" *ngIf="canAdd" [content]="'addon.mod_data.addentries' | translate" [iconAction]="'add'" (action)="gotoAddEntries($event)"></core-context-menu-item>
         <core-context-menu-item [priority]="400" *ngIf="firstEntry" [content]="'addon.mod_data.single' | translate" [iconAction]="'document'" (action)="gotoEntry(firstEntry)"></core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="300" [content]="prefetchText" (action)="prefetch($event)" [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="200" [content]="size" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
+        <core-context-menu-item *ngIf="size" [priority]="200" [content]="'core.removefiles' | translate:{$a: size}" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 
diff --git a/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html
index d7652f3fd..4355c5310 100644
--- a/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -7,7 +7,7 @@
         <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && hasOffline && isOnline"  [priority]="600" [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)" [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="size" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
+        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.removefiles' | translate:{$a: size}" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 
diff --git a/src/addon/mod/folder/components/index/addon-mod-folder-index.html b/src/addon/mod/folder/components/index/addon-mod-folder-index.html
index f3fdf049f..eb68f6b4c 100644
--- a/src/addon/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addon/mod/folder/components/index/addon-mod-folder-index.html
@@ -6,7 +6,7 @@
         <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" [iconAction]="'fa-newspaper-o'" (action)="gotoBlog($event)"></core-context-menu-item>
         <core-context-menu-item [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="600" [content]="prefetchText" (action)="prefetch($event)" [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="500" [content]="size" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
+        <core-context-menu-item *ngIf="size" [priority]="500" [content]="'core.removefiles' | translate:{$a: size}" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 
diff --git a/src/addon/mod/forum/components/index/addon-mod-forum-index.html b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
index cfb16864f..ecce58789 100644
--- a/src/addon/mod/forum/components/index/addon-mod-forum-index.html
+++ b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
@@ -7,7 +7,7 @@
         <core-context-menu-item *ngIf="loaded && !(hasOffline || hasOfflineRatings) && isOnline" [priority]="700" [content]="'addon.mod_forum.refreshdiscussions' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && (hasOffline || hasOfflineRatings) && isOnline"  [priority]="600" [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)" [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="size" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
+        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.removefiles' | translate:{$a: size}" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
         <core-context-menu-item *ngIf="sortingAvailable" [priority]="300" [content]="'core.sort' | translate" (action)="showSortOrderSelector($event)" iconAction="fa-sort"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
diff --git a/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html
index 656adc7b3..fb1fcde3a 100644
--- a/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -11,7 +11,7 @@
         <core-context-menu-item *ngIf="loaded && (hasOffline || hasOfflineRatings) && isOnline"  [priority]="650" [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="canAdd" [priority]="600" [content]="'addon.mod_glossary.addentry' | translate" (action)="openNewEntry()" iconAction="add"></core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)" [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="size" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
+        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.removefiles' | translate:{$a: size}" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 
diff --git a/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html
index 4e431dbfd..35cbae509 100644
--- a/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -9,7 +9,7 @@
         <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" [iconAction]="'fa-newspaper-o'" (action)="gotoBlog($event)"></core-context-menu-item>
         <core-context-menu-item [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="600" [content]="prefetchText" (action)="prefetch($event)" [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="500" [content]="size" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
+        <core-context-menu-item *ngIf="size" [priority]="500" [content]="'core.removefiles' | translate:{$a: size}" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 
diff --git a/src/addon/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addon/mod/lesson/components/index/addon-mod-lesson-index.html
index d7549ccb4..2bf84b83a 100644
--- a/src/addon/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addon/mod/lesson/components/index/addon-mod-lesson-index.html
@@ -7,7 +7,7 @@
         <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && hasOffline && isOnline"  [priority]="600" [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)" [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="size" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
+        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.removefiles' | translate:{$a: size}" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 
diff --git a/src/addon/mod/page/components/index/addon-mod-page-index.html b/src/addon/mod/page/components/index/addon-mod-page-index.html
index f25b0296a..378796f11 100644
--- a/src/addon/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addon/mod/page/components/index/addon-mod-page-index.html
@@ -6,7 +6,7 @@
         <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" [iconAction]="'fa-newspaper-o'" (action)="gotoBlog($event)"></core-context-menu-item>
         <core-context-menu-item [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="600" [content]="prefetchText" (action)="prefetch($event)" [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="500" [content]="size" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
+        <core-context-menu-item *ngIf="size" [priority]="500" [content]="'core.removefiles' | translate:{$a: size}" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 
diff --git a/src/addon/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addon/mod/quiz/components/index/addon-mod-quiz-index.html
index d0cefb3cc..a522eae7b 100644
--- a/src/addon/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addon/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -7,7 +7,7 @@
         <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && hasOffline && isOnline"  [priority]="600" [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)" [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="size" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
+        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.removefiles' | translate:{$a: size}" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 
diff --git a/src/addon/mod/resource/components/index/addon-mod-resource-index.html b/src/addon/mod/resource/components/index/addon-mod-resource-index.html
index 57c634f15..7d2e36a94 100644
--- a/src/addon/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addon/mod/resource/components/index/addon-mod-resource-index.html
@@ -6,7 +6,7 @@
         <core-context-menu-item *ngIf="blog" [priority]="750" content="{{'addon.blog.blog' | translate}}" [iconAction]="'fa-newspaper-o'" (action)="gotoBlog($event)"></core-context-menu-item>
         <core-context-menu-item [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="600" [content]="prefetchText" (action)="prefetch($event)" [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="500" [content]="size" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
+        <core-context-menu-item *ngIf="size" [priority]="500" [content]="'core.removefiles' | translate:{$a: size}" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 
diff --git a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
index 27e83c61e..dffd0c865 100644
--- a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -7,7 +7,7 @@
         <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && hasOffline && isOnline"  [priority]="600" [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)" [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="size" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
+        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.removefiles' | translate:{$a: size}" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 
diff --git a/src/addon/mod/survey/components/index/addon-mod-survey-index.html b/src/addon/mod/survey/components/index/addon-mod-survey-index.html
index 1f6ffb305..ba98f38ae 100644
--- a/src/addon/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addon/mod/survey/components/index/addon-mod-survey-index.html
@@ -7,7 +7,7 @@
         <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && hasOffline && isOnline"  [priority]="600" [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)" [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="size" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
+        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.removefiles' | translate:{$a: size}" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 
diff --git a/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
index 08b73a37b..af57b0dbe 100644
--- a/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -18,7 +18,7 @@
         <core-context-menu-item *ngIf="canEdit && (isOnline || pageIsOffline)" [priority]="590" [content]="'core.edit' | translate" iconAction="create" (action)="goToEditPage()"></core-context-menu-item>
         <core-context-menu-item *ngIf="canEdit" [priority]="580" [content]="'addon.mod_wiki.createpage' | translate" iconAction="add" (action)="goToNewPage()"></core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)" [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="size" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
+        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.removefiles' | translate:{$a: size}" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 
diff --git a/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
index 7c9a39402..7d398d32c 100644
--- a/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -7,7 +7,7 @@
         <core-context-menu-item *ngIf="loaded && !hasOffline && isOnline" [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="loaded && hasOffline && isOnline"  [priority]="600" [content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(null, $event, true)" [iconAction]="syncIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item *ngIf="prefetchStatusIcon" [priority]="500" [content]="prefetchText" (action)="prefetch($event)" [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item *ngIf="size" [priority]="400" [content]="size" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
+        <core-context-menu-item *ngIf="size" [priority]="400" [content]="'core.removefiles' | translate:{$a: size}" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 2b50cbff9..369ad5236 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1765,6 +1765,7 @@
     "core.redirectingtosite": "You will be redirected to the site.",
     "core.refresh": "Refresh",
     "core.remove": "Remove",
+    "core.removefiles": "Remove files {{$a}}",
     "core.required": "Required",
     "core.requireduserdatamissing": "This user lacks some required profile data. Please enter the data in your site and try again.<br>{{$a}}",
     "core.resourcedisplayopen": "Open",
diff --git a/src/core/siteplugins/components/module-index/core-siteplugins-module-index.html b/src/core/siteplugins/components/module-index/core-siteplugins-module-index.html
index 12b83b5e0..bee7dafe8 100644
--- a/src/core/siteplugins/components/module-index/core-siteplugins-module-index.html
+++ b/src/core/siteplugins/components/module-index/core-siteplugins-module-index.html
@@ -5,7 +5,7 @@
         <core-context-menu-item [hidden]="!displayDescription || !description || (content && content.compileComponent && content.compileComponent.componentInstance && content.compileComponent.componentInstance.displayDescription === false)" [priority]="800" [content]="'core.moduleintro' | translate" (action)="expandDescription()" [iconAction]="'arrow-forward'"></core-context-menu-item>
         <core-context-menu-item [hidden]="!displayRefresh || (content && content.compileComponent && content.compileComponent.componentInstance && content.compileComponent.componentInstance.displayRefresh === false)" [priority]="700" [content]="'core.refresh' | translate" (action)="doRefresh(null, $event)" [iconAction]="refreshIcon" [closeOnClick]="false"></core-context-menu-item>
         <core-context-menu-item [hidden]="!displayPrefetch || !prefetchStatusIcon || (content && content.compileComponent && content.compileComponent.componentInstance && content.compileComponent.componentInstance.displayPrefetch === false)" [priority]="600" [content]="prefetchText" (action)="prefetch()" [iconAction]="prefetchStatusIcon" [closeOnClick]="false"></core-context-menu-item>
-        <core-context-menu-item [hidden]="!displaySize || !size || (content && content.compileComponent && content.compileComponent.componentInstance && content.compileComponent.componentInstance.displaySize === false)" [priority]="500" [content]="size" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
+        <core-context-menu-item [hidden]="!displaySize || !size || (content && content.compileComponent && content.compileComponent.componentInstance && content.compileComponent.componentInstance.displaySize === false)" [priority]="500" [content]="'core.removefiles' | translate:{$a: size}" [iconDescription]="'cube'" (action)="removeFiles()" [iconAction]="'trash'"></core-context-menu-item>
     </core-context-menu>
 </core-navbar-buttons>
 
diff --git a/src/lang/en.json b/src/lang/en.json
index 2d0e8125c..0c900b134 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -205,6 +205,7 @@
     "redirectingtosite": "You will be redirected to the site.",
     "refresh": "Refresh",
     "remove": "Remove",
+    "removefiles": "Remove files {{$a}}",
     "required": "Required",
     "requireduserdatamissing": "This user lacks some required profile data. Please enter the data in your site and try again.<br>{{$a}}",
     "resourcedisplayopen": "Open",
@@ -298,4 +299,4 @@
     "yes": "Yes",
     "youreoffline": "You are offline",
     "youreonline": "You are back online"
-}
\ No newline at end of file
+}

From d8a1d2d956c1a6569f8c67c5a44f384ae4d9ad4e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 21 Oct 2019 14:37:56 +0200
Subject: [PATCH 105/257] MOBILE-3195 login: Allow to disable forgotten
 password

---
 .../login/pages/credentials/credentials.html  |  2 +-
 .../login/pages/credentials/credentials.ts    | 18 +++++--
 src/core/login/pages/reconnect/reconnect.html |  2 +-
 src/core/login/pages/reconnect/reconnect.ts   | 15 ++++--
 src/core/login/providers/helper.ts            | 50 ++++++++++++++++---
 5 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/src/core/login/pages/credentials/credentials.html b/src/core/login/pages/credentials/credentials.html
index e34139c6c..467bb49dd 100644
--- a/src/core/login/pages/credentials/credentials.html
+++ b/src/core/login/pages/credentials/credentials.html
@@ -36,7 +36,7 @@
             </form>
 
             <!-- Forgotten password button. -->
-            <div padding-top class="core-login-forgotten-password">
+            <div *ngIf="showForgottenPassword" padding-top class="core-login-forgotten-password">
                 <button ion-button block text-wrap color="light" (click)="forgottenPassword()">{{ 'core.login.forgotten' | translate }}</button>
             </div>
 
diff --git a/src/core/login/pages/credentials/credentials.ts b/src/core/login/pages/credentials/credentials.ts
index de94968cf..ed0b43d0e 100644
--- a/src/core/login/pages/credentials/credentials.ts
+++ b/src/core/login/pages/credentials/credentials.ts
@@ -43,6 +43,7 @@ export class CoreLoginCredentialsPage {
     pageLoaded = false;
     isBrowserSSO = false;
     isFixedUrlSet = false;
+    showForgottenPassword = true;
 
     protected siteConfig;
     protected eventThrown = false;
@@ -50,9 +51,14 @@ export class CoreLoginCredentialsPage {
     protected siteId: string;
     protected urlToOpen: string;
 
-    constructor(private navCtrl: NavController, navParams: NavParams, fb: FormBuilder, private appProvider: CoreAppProvider,
-            private sitesProvider: CoreSitesProvider, private loginHelper: CoreLoginHelperProvider,
-            private domUtils: CoreDomUtilsProvider, private translate: TranslateService,
+    constructor(private navCtrl: NavController,
+            navParams: NavParams,
+            fb: FormBuilder,
+            private appProvider: CoreAppProvider,
+            private sitesProvider: CoreSitesProvider,
+            private loginHelper: CoreLoginHelperProvider,
+            private domUtils: CoreDomUtilsProvider,
+            private translate: TranslateService,
             private eventsProvider: CoreEventsProvider) {
 
         this.siteUrl = navParams.get('siteUrl');
@@ -149,9 +155,13 @@ export class CoreLoginCredentialsPage {
             this.siteName = CoreConfigConstants.sitename ? CoreConfigConstants.sitename : this.siteConfig.sitename;
             this.logoUrl = this.siteConfig.logourl || this.siteConfig.compactlogourl;
             this.authInstructions = this.siteConfig.authinstructions || this.translate.instant('core.login.loginsteps');
-            this.canSignup = this.siteConfig.registerauth == 'email' && !this.loginHelper.isEmailSignupDisabled(this.siteConfig);
             this.identityProviders = this.loginHelper.getValidIdentityProviders(this.siteConfig);
 
+            const disabledFeatures = this.loginHelper.getDisabledFeatures(this.siteConfig);
+            this.canSignup = this.siteConfig.registerauth == 'email' &&
+                    !this.loginHelper.isEmailSignupDisabled(this.siteConfig, disabledFeatures);
+            this.showForgottenPassword = !this.loginHelper.isForgottenPasswordDisabled(this.siteConfig, disabledFeatures);
+
             if (!this.eventThrown && !this.viewLeft) {
                 this.eventThrown = true;
                 this.eventsProvider.trigger(CoreEventsProvider.LOGIN_SITE_CHECKED, { config: this.siteConfig });
diff --git a/src/core/login/pages/reconnect/reconnect.html b/src/core/login/pages/reconnect/reconnect.html
index 99e9ab99d..1aed56c2a 100644
--- a/src/core/login/pages/reconnect/reconnect.html
+++ b/src/core/login/pages/reconnect/reconnect.html
@@ -50,7 +50,7 @@
         </ion-list>
 
         <!-- Forgotten password button. -->
-        <div padding-top class="core-login-forgotten-password">
+        <div *ngIf="showForgottenPassword" padding-top class="core-login-forgotten-password">
             <button ion-button block text-wrap color="light" (click)="forgottenPassword()">{{ 'core.login.forgotten' | translate }}</button>
         </div>
 
diff --git a/src/core/login/pages/reconnect/reconnect.ts b/src/core/login/pages/reconnect/reconnect.ts
index 3ec8479a3..58e24a078 100644
--- a/src/core/login/pages/reconnect/reconnect.ts
+++ b/src/core/login/pages/reconnect/reconnect.ts
@@ -36,6 +36,7 @@ export class CoreLoginReconnectPage {
     logoUrl: string;
     identityProviders: any[];
     site: any;
+    showForgottenPassword = true;
 
     protected infoSiteUrl: string;
     protected pageName: string;
@@ -44,9 +45,13 @@ export class CoreLoginReconnectPage {
     protected isLoggedOut: boolean;
     protected siteId: string;
 
-    constructor(private navCtrl: NavController, navParams: NavParams, fb: FormBuilder, private appProvider: CoreAppProvider,
-        private sitesProvider: CoreSitesProvider, private loginHelper: CoreLoginHelperProvider,
-        private domUtils: CoreDomUtilsProvider) {
+    constructor(private navCtrl: NavController,
+            navParams: NavParams,
+            fb: FormBuilder,
+            private appProvider: CoreAppProvider,
+            private sitesProvider: CoreSitesProvider,
+            private loginHelper: CoreLoginHelperProvider,
+            private domUtils: CoreDomUtilsProvider) {
 
         const currentSite = this.sitesProvider.getCurrentSite();
 
@@ -69,6 +74,7 @@ export class CoreLoginReconnectPage {
     ionViewDidLoad(): void {
         if (this.siteConfig) {
             this.identityProviders = this.loginHelper.getValidIdentityProviders(this.siteConfig);
+            this.showForgottenPassword = !this.loginHelper.isForgottenPasswordDisabled(this.siteConfig);
         }
 
         this.sitesProvider.getSite(this.siteId).then((site) => {
@@ -87,9 +93,10 @@ export class CoreLoginReconnectPage {
                     // Check logoURL if user avatar is not set.
                     if (this.site.avatar.startsWith(site.infos.siteurl + '/theme/image.php')) {
                         this.site.avatar = false;
-
                         this.logoUrl = config.logourl || config.compactlogourl;
                     }
+
+                    this.showForgottenPassword = !this.loginHelper.isForgottenPasswordDisabled(config);
                 }).catch(() => {
                     this.cancel();
                 });
diff --git a/src/core/login/providers/helper.ts b/src/core/login/providers/helper.ts
index 86ff47643..34cadb2f9 100644
--- a/src/core/login/providers/helper.ts
+++ b/src/core/login/providers/helper.ts
@@ -322,6 +322,21 @@ export class CoreLoginHelperProvider {
         });
     }
 
+    /**
+     * Get disabled features from a site public config.
+     *
+     * @param config Site public config.
+     * @return Disabled features.
+     */
+    getDisabledFeatures(config: any): string {
+        const disabledFeatures = config && config.tool_mobile_disabledfeatures;
+        if (!disabledFeatures) {
+            return '';
+        }
+
+        return this.textUtils.treatDisabledFeatures(disabledFeatures);
+    }
+
     /**
      * Builds an object with error messages for some common errors.
      * Please notice that this function doesn't support all possible error types.
@@ -555,17 +570,27 @@ export class CoreLoginHelperProvider {
      * Given a site public config, check if email signup is disabled.
      *
      * @param config Site public config.
+     * @param disabledFeatures List of disabled features already treated. If not provided it will be calculated.
      * @return Whether email signup is disabled.
      */
-    isEmailSignupDisabled(config: any): boolean {
-        let disabledFeatures = config && config.tool_mobile_disabledfeatures;
-        if (!disabledFeatures) {
-            return false;
+    isEmailSignupDisabled(config?: any, disabledFeatures?: string): boolean {
+        return this.isFeatureDisabled('CoreLoginEmailSignup', config, disabledFeatures);
+    }
+
+    /**
+     * Given a site public config, check if a certian feature is disabled.
+     *
+     * @param feature Feature to check.
+     * @param config Site public config.
+     * @param disabledFeatures List of disabled features already treated. If not provided it will be calculated.
+     * @return Whether email signup is disabled.
+     */
+    isFeatureDisabled(feature: string, config?: any, disabledFeatures?: string): boolean {
+        if (typeof disabledFeatures == 'undefined') {
+            disabledFeatures = this.getDisabledFeatures(config);
         }
 
-        disabledFeatures = this.textUtils.treatDisabledFeatures(disabledFeatures);
-
-        const regEx = new RegExp('(,|^)CoreLoginEmailSignup(,|$)', 'g');
+        const regEx = new RegExp('(,|^)' + feature + '(,|$)', 'g');
 
         return !!disabledFeatures.match(regEx);
     }
@@ -583,6 +608,17 @@ export class CoreLoginHelperProvider {
         return !!CoreConfigConstants.siteurl;
     }
 
+    /**
+     * Given a site public config, check if forgotten password is disabled.
+     *
+     * @param config Site public config.
+     * @param disabledFeatures List of disabled features already treated. If not provided it will be calculated.
+     * @return Whether it's disabled.
+     */
+    isForgottenPasswordDisabled(config?: any, disabledFeatures?: string): boolean {
+        return this.isFeatureDisabled('NoDelegate_ForgottenPassword', config, disabledFeatures);
+    }
+
     /**
      * Check if current site is logged out, triggering mmCoreEventSessionExpired if it is.
      *

From 481110e5d22452c2ff7a719424293e5daaaea46b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 8 Nov 2019 08:32:11 +0100
Subject: [PATCH 106/257] MOBILE-3211 siteplugins: Use current page title if
 not defined

---
 .../components/module-index/core-siteplugins-module-index.html  | 2 +-
 src/core/siteplugins/components/module-index/module-index.ts    | 1 +
 .../siteplugins/components/plugin-content/plugin-content.ts     | 1 +
 src/core/siteplugins/directives/call-ws-new-content.ts          | 2 +-
 src/core/siteplugins/directives/new-content.ts                  | 2 +-
 src/core/siteplugins/pages/module-index/module-index.html       | 2 +-
 src/core/siteplugins/pages/plugin-page/plugin-page.html         | 2 +-
 7 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/core/siteplugins/components/module-index/core-siteplugins-module-index.html b/src/core/siteplugins/components/module-index/core-siteplugins-module-index.html
index 12b83b5e0..aa12f7959 100644
--- a/src/core/siteplugins/components/module-index/core-siteplugins-module-index.html
+++ b/src/core/siteplugins/components/module-index/core-siteplugins-module-index.html
@@ -9,4 +9,4 @@
     </core-context-menu>
 </core-navbar-buttons>
 
-<core-site-plugins-plugin-content *ngIf="component && method" [component]="component" [method]="method" [args]="args" [initResult]="initResult" [data]="jsData" (onContentLoaded)="contentLoaded($event)" (onLoadingContent)="contentLoading($event)"></core-site-plugins-plugin-content>
+<core-site-plugins-plugin-content *ngIf="component && method" [component]="component" [method]="method" [args]="args" [initResult]="initResult" [data]="jsData" [pageTitle]="pageTitle" (onContentLoaded)="contentLoaded($event)" (onLoadingContent)="contentLoading($event)"></core-site-plugins-plugin-content>
diff --git a/src/core/siteplugins/components/module-index/module-index.ts b/src/core/siteplugins/components/module-index/module-index.ts
index a9f9dfeed..586bd5203 100644
--- a/src/core/siteplugins/components/module-index/module-index.ts
+++ b/src/core/siteplugins/components/module-index/module-index.ts
@@ -32,6 +32,7 @@ import { CoreSitePluginsPluginContentComponent } from '../plugin-content/plugin-
 export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, CoreCourseModuleMainComponent {
     @Input() module: any; // The module.
     @Input() courseId: number; // Course ID the module belongs to.
+    @Input() pageTitle: string; // Current page title. It can be used by the "new-content" directives.
 
     @ViewChild(CoreSitePluginsPluginContentComponent) content: CoreSitePluginsPluginContentComponent;
 
diff --git a/src/core/siteplugins/components/plugin-content/plugin-content.ts b/src/core/siteplugins/components/plugin-content/plugin-content.ts
index 57598e495..aebf88e59 100644
--- a/src/core/siteplugins/components/plugin-content/plugin-content.ts
+++ b/src/core/siteplugins/components/plugin-content/plugin-content.ts
@@ -37,6 +37,7 @@ export class CoreSitePluginsPluginContentComponent implements OnInit, DoCheck {
     @Input() initResult: any; // Result of the init WS call of the handler.
     @Input() data: any; // Data to pass to the component.
     @Input() preSets: any; // The preSets for the WS call.
+    @Input() pageTitle: string; // Current page title. It can be used by the "new-content" directives.
     @Output() onContentLoaded?: EventEmitter<boolean>; // Emits an event when the content is loaded.
     @Output() onLoadingContent?: EventEmitter<boolean>; // Emits an event when starts to load the content.
 
diff --git a/src/core/siteplugins/directives/call-ws-new-content.ts b/src/core/siteplugins/directives/call-ws-new-content.ts
index 8bc307951..fc65d5573 100644
--- a/src/core/siteplugins/directives/call-ws-new-content.ts
+++ b/src/core/siteplugins/directives/call-ws-new-content.ts
@@ -96,7 +96,7 @@ export class CoreSitePluginsCallWSNewContentDirective extends CoreSitePluginsCal
             }
 
             this.navCtrl.push('CoreSitePluginsPluginPage', {
-                title: this.title,
+                title: this.title || (this.parentContent && this.parentContent.pageTitle),
                 component: this.component || (this.parentContent && this.parentContent.component),
                 method: this.method || (this.parentContent && this.parentContent.method),
                 args: args,
diff --git a/src/core/siteplugins/directives/new-content.ts b/src/core/siteplugins/directives/new-content.ts
index 7981e49a0..d95b34bae 100644
--- a/src/core/siteplugins/directives/new-content.ts
+++ b/src/core/siteplugins/directives/new-content.ts
@@ -93,7 +93,7 @@ export class CoreSitePluginsNewContentDirective implements OnInit {
                 }
 
                 this.navCtrl.push('CoreSitePluginsPluginPage', {
-                    title: this.title,
+                    title: this.title || (this.parentContent && this.parentContent.pageTitle),
                     component: this.component || (this.parentContent && this.parentContent.component),
                     method: this.method || (this.parentContent && this.parentContent.method),
                     args: args,
diff --git a/src/core/siteplugins/pages/module-index/module-index.html b/src/core/siteplugins/pages/module-index/module-index.html
index 99b109494..8d83a46b7 100644
--- a/src/core/siteplugins/pages/module-index/module-index.html
+++ b/src/core/siteplugins/pages/module-index/module-index.html
@@ -11,5 +11,5 @@
     <ion-refresher [enabled]="content && content.content && content.content.dataLoaded" (ionRefresh)="refreshData($event)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-site-plugins-module-index [module]="module" [courseId]="courseId"></core-site-plugins-module-index>
+    <core-site-plugins-module-index [module]="module" [courseId]="courseId" [pageTitle]="title"></core-site-plugins-module-index>
 </ion-content>
diff --git a/src/core/siteplugins/pages/plugin-page/plugin-page.html b/src/core/siteplugins/pages/plugin-page/plugin-page.html
index bb0676458..be1566304 100644
--- a/src/core/siteplugins/pages/plugin-page/plugin-page.html
+++ b/src/core/siteplugins/pages/plugin-page/plugin-page.html
@@ -11,5 +11,5 @@
     <ion-refresher [enabled]="content && content.dataLoaded" (ionRefresh)="refreshData($event)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
-    <core-site-plugins-plugin-content [component]="component" [method]="method" [args]="args" [preSets]="preSets" [initResult]="initResult" [data]="jsData"></core-site-plugins-plugin-content>
+    <core-site-plugins-plugin-content [component]="component" [method]="method" [args]="args" [preSets]="preSets" [initResult]="initResult" [data]="jsData" [pageTitle]="title"></core-site-plugins-plugin-content>
 </ion-content>

From 961c873d80dff0b62e9e069812e1ce99494dbb81 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 15 Oct 2019 13:25:48 +0200
Subject: [PATCH 107/257] MOBILE-3164 files: Use tokenpluginfile if possible

---
 src/addon/mod/book/providers/book.ts       |  2 +-
 src/addon/mod/imscp/providers/imscp.ts     |  2 +-
 src/addon/mod/page/providers/helper.ts     |  2 +-
 src/addon/mod/resource/providers/helper.ts |  2 +-
 src/classes/site.ts                        | 59 +++++++++++++++++++++-
 src/core/course/providers/helper.ts        | 28 +++++-----
 src/providers/file-helper.ts               |  3 +-
 src/providers/filepool.ts                  |  6 ++-
 src/providers/utils/url.ts                 | 14 +++--
 9 files changed, 95 insertions(+), 23 deletions(-)

diff --git a/src/addon/mod/book/providers/book.ts b/src/addon/mod/book/providers/book.ts
index d9cf9cd8c..6944ea73e 100644
--- a/src/addon/mod/book/providers/book.ts
+++ b/src/addon/mod/book/providers/book.ts
@@ -125,7 +125,7 @@ export class AddonModBookProvider {
             promise = this.filepoolProvider.downloadUrl(siteId, indexUrl, false, AddonModBookProvider.COMPONENT, moduleId);
         } else {
             // We return the live URL.
-            return Promise.resolve(this.sitesProvider.getCurrentSite().fixPluginfileURL(indexUrl));
+            return this.sitesProvider.getCurrentSite().checkAndFixPluginfileURL(indexUrl);
         }
 
         return promise.then((url) => {
diff --git a/src/addon/mod/imscp/providers/imscp.ts b/src/addon/mod/imscp/providers/imscp.ts
index 26591f768..58667b135 100644
--- a/src/addon/mod/imscp/providers/imscp.ts
+++ b/src/addon/mod/imscp/providers/imscp.ts
@@ -245,7 +245,7 @@ export class AddonModImscpProvider {
 
                 if (indexUrl) {
                     return this.sitesProvider.getSite(siteId).then((site) => {
-                        return site.fixPluginfileURL(indexUrl);
+                        return site.checkAndFixPluginfileURL(indexUrl);
                     });
                 }
             }
diff --git a/src/addon/mod/page/providers/helper.ts b/src/addon/mod/page/providers/helper.ts
index 7b2f1852e..43887b52a 100644
--- a/src/addon/mod/page/providers/helper.ts
+++ b/src/addon/mod/page/providers/helper.ts
@@ -76,7 +76,7 @@ export class AddonModPageHelperProvider {
                 AddonModPageProvider.COMPONENT, moduleId);
         } else {
             // We return the live URL.
-            promise = Promise.resolve(this.sitesProvider.getCurrentSite().fixPluginfileURL(indexUrl));
+            promise = this.sitesProvider.getCurrentSite().checkAndFixPluginfileURL(indexUrl);
         }
 
         return promise.then((url) => {
diff --git a/src/addon/mod/resource/providers/helper.ts b/src/addon/mod/resource/providers/helper.ts
index df5dfc870..401783103 100644
--- a/src/addon/mod/resource/providers/helper.ts
+++ b/src/addon/mod/resource/providers/helper.ts
@@ -82,7 +82,7 @@ export class AddonModResourceHelperProvider {
             // Error getting directory, there was an error downloading or we're in browser. Return online URL.
             if (this.appProvider.isOnline() && mainFile.fileurl) {
                 // This URL is going to be injected in an iframe, we need this to make it work.
-                return Promise.resolve(this.sitesProvider.getCurrentSite().fixPluginfileURL(mainFile.fileurl));
+                return this.sitesProvider.getCurrentSite().checkAndFixPluginfileURL(mainFile.fileurl);
             }
 
             return Promise.reject(null);
diff --git a/src/classes/site.ts b/src/classes/site.ts
index a038bb3e0..e1f0fb458 100644
--- a/src/classes/site.ts
+++ b/src/classes/site.ts
@@ -230,6 +230,8 @@ export class CoreSite {
     protected ongoingRequests: { [cacheId: string]: Promise<any> } = {};
     protected requestQueue: RequestQueueItem[] = [];
     protected requestQueueTimeout = null;
+    protected tokenPluginFileWorks: boolean;
+    protected tokenPluginFileWorksPromise: Promise<boolean>;
 
     /**
      * Create a site.
@@ -1226,6 +1228,18 @@ export class CoreSite {
         return this.db.execute(sql, [key + '%']);
     }
 
+    /**
+     * Check if tokenpluginfile can be used, and fix the URL afterwards.
+     *
+     * @param url The url to be fixed.
+     * @return Promise resolved with the fixed URL.
+     */
+    checkAndFixPluginfileURL(url: string): Promise<string> {
+        return this.checkTokenPluginFile(url).then(() => {
+            return this.fixPluginfileURL(url);
+        });
+    }
+
     /**
      * Generic function for adding the wstoken to Moodle urls and for pointing to the correct script.
      * Uses CoreUtilsProvider.fixPluginfileURL, passing site's token.
@@ -1234,7 +1248,10 @@ export class CoreSite {
      * @return Fixed URL.
      */
     fixPluginfileURL(url: string): string {
-        return this.urlUtils.fixPluginfileURL(url, this.token, this.siteUrl);
+        const accessKey = this.tokenPluginFileWorks || typeof this.tokenPluginFileWorks == 'undefined' ?
+                this.infos && this.infos.userprivateaccesskey : undefined;
+
+        return this.urlUtils.fixPluginfileURL(url, this.token, this.siteUrl, accessKey);
     }
 
     /**
@@ -1886,4 +1903,44 @@ export class CoreSite {
 
         return expirationDelay;
     }
+
+    /*
+     * Check if tokenpluginfile script works in the site.
+     *
+     * @param url URL to check.
+     * @return Promise resolved with boolean: whether it works or not.
+     */
+    checkTokenPluginFile(url: string): Promise<boolean> {
+        if (!this.infos || !this.infos.userprivateaccesskey) {
+            // No access key, cannot use tokenpluginfile.
+            return Promise.resolve(false);
+        } else if (typeof this.tokenPluginFileWorks != 'undefined') {
+            // Already checked.
+            return Promise.resolve(this.tokenPluginFileWorks);
+        } else if (this.tokenPluginFileWorksPromise) {
+            // Check ongoing, use the same promise.
+            return this.tokenPluginFileWorksPromise;
+        } else if (!this.appProvider.isOnline()) {
+            // Not online, cannot check it. Assume it's working, but don't save the result.
+            return Promise.resolve(true);
+        } else if (!this.urlUtils.isPluginFileUrl(url)) {
+            // Not a pluginfile URL, ignore it.
+            return Promise.resolve(false);
+        }
+
+        url = this.fixPluginfileURL(url);
+
+        this.tokenPluginFileWorksPromise = this.wsProvider.performHead(url).then((result) => {
+            return result.ok;
+        }).catch((error) => {
+            // Error performing head request.
+            return false;
+        }).then((result) => {
+            this.tokenPluginFileWorks = result;
+
+            return result;
+        });
+
+        return this.tokenPluginFileWorksPromise;
+    }
 }
diff --git a/src/core/course/providers/helper.ts b/src/core/course/providers/helper.ts
index f4b2f8bcb..d529e5187 100644
--- a/src/core/course/providers/helper.ts
+++ b/src/core/course/providers/helper.ts
@@ -569,21 +569,22 @@ export class CoreCourseHelperProvider {
             if (this.fileHelper.shouldOpenInBrowser(mainFile)) {
                 if (this.appProvider.isOnline()) {
                     // Open in browser.
-                    let fixedUrl = site.fixPluginfileURL(fileUrl).replace('&offline=1', '');
-                    // Remove forcedownload when followed by another param.
-                    fixedUrl = fixedUrl.replace(/forcedownload=\d+&/, '');
-                    // Remove forcedownload when not followed by any param.
-                    fixedUrl = fixedUrl.replace(/[\?|\&]forcedownload=\d+/, '');
+                    return site.checkAndFixPluginfileURL(fileUrl).then((fixedUrl) => {
+                        fixedUrl = fixedUrl.replace('&offline=1', '');
+                        // Remove forcedownload when followed by another param.
+                        fixedUrl = fixedUrl.replace(/forcedownload=\d+&/, '');
+                        // Remove forcedownload when not followed by any param.
+                        fixedUrl = fixedUrl.replace(/[\?|\&]forcedownload=\d+/, '');
 
-                    this.utils.openInBrowser(fixedUrl);
+                        this.utils.openInBrowser(fixedUrl);
 
-                    if (this.fileProvider.isAvailable()) {
-                        // Download the file if needed (file outdated or not downloaded).
-                        // Download will be in background, don't return the promise.
-                        this.downloadModule(module, courseId, component, componentId, files, siteId);
-                    }
+                        if (this.fileProvider.isAvailable()) {
+                            // Download the file if needed (file outdated or not downloaded).
+                            // Download will be in background, don't return the promise.
+                            this.downloadModule(module, courseId, component, componentId, files, siteId);
+                        }
+                    });
 
-                    return;
                 } else {
                     // Not online, get the offline file. It will fail if not found.
                     return this.filepoolProvider.getInternalUrlByUrl(siteId, fileUrl).then((path) => {
@@ -664,7 +665,8 @@ export class CoreCourseHelperProvider {
             };
 
         return this.sitesProvider.getSite(siteId).then((site) => {
-            const fixedUrl = site.fixPluginfileURL(fileUrl);
+            return site.checkAndFixPluginfileURL(fileUrl);
+        }).then((fixedUrl) => {
             result.fixedUrl = fixedUrl;
 
             if (this.fileProvider.isAvailable()) {
diff --git a/src/providers/file-helper.ts b/src/providers/file-helper.ts
index 1c082111e..a9fc44c1e 100644
--- a/src/providers/file-helper.ts
+++ b/src/providers/file-helper.ts
@@ -119,7 +119,8 @@ export class CoreFileHelperProvider {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
 
         return this.sitesProvider.getSite(siteId).then((site) => {
-            const fixedUrl = site.fixPluginfileURL(fileUrl);
+            return site.checkAndFixPluginfileURL(fileUrl);
+        }).then((fixedUrl) => {
 
             if (this.fileProvider.isAvailable()) {
                 let promise;
diff --git a/src/providers/filepool.ts b/src/providers/filepool.ts
index f2e8afdac..db8b0f9ea 100644
--- a/src/providers/filepool.ts
+++ b/src/providers/filepool.ts
@@ -1321,7 +1321,7 @@ export class CoreFilepoolProvider {
      */
     protected fixPluginfileURL(siteId: string, fileUrl: string): Promise<string> {
         return this.sitesProvider.getSite(siteId).then((site) => {
-            return site.fixPluginfileURL(fileUrl);
+            return site.checkAndFixPluginfileURL(fileUrl);
         });
     }
 
@@ -1417,6 +1417,10 @@ export class CoreFilepoolProvider {
         // Decode URL.
         url = this.textUtils.decodeHTML(this.textUtils.decodeURIComponent(url));
 
+        // If site supports it, since 3.8 we use tokenpluginfile instead of pluginfile.
+        // For compatibility with files already downloaded, we need to use pluginfile to calculate the file ID.
+        url = url.replace(/\/tokenpluginfile\.php\/[^\/]+\//, '/webservice/pluginfile.php/');
+
         if (url.indexOf('/webservice/pluginfile') !== -1) {
             // Remove attributes that do not matter.
             this.urlAttributes.forEach((regex) => {
diff --git a/src/providers/utils/url.ts b/src/providers/utils/url.ts
index 2aa7e8ff5..3988a5ecb 100644
--- a/src/providers/utils/url.ts
+++ b/src/providers/utils/url.ts
@@ -130,9 +130,10 @@ export class CoreUrlUtilsProvider {
      * @param url The url to be fixed.
      * @param token Token to use.
      * @param siteUrl The URL of the site the URL belongs to.
+     * @param accessKey User access key for tokenpluginfile.
      * @return Fixed URL.
      */
-    fixPluginfileURL(url: string, token: string, siteUrl: string): string {
+    fixPluginfileURL(url: string, token: string, siteUrl: string, accessKey?: string): string {
         if (!url) {
             return '';
         }
@@ -140,7 +141,7 @@ export class CoreUrlUtilsProvider {
         url = url.replace(/&amp;/g, '&');
 
         // First check if we need to fix this url or is already fixed.
-        if (url.indexOf('token=') != -1) {
+        if (!accessKey && url.indexOf('token=') != -1) {
             return url;
         }
 
@@ -149,7 +150,14 @@ export class CoreUrlUtilsProvider {
             return url;
         }
 
-        // Check if the URL already has params.
+        if (accessKey) {
+            // We have the user access key, use tokenpluginfile.php.
+            url = url.replace(/(\/webservice)?\/pluginfile\.php/, '/tokenpluginfile.php/' + accessKey);
+
+            return url;
+        }
+
+        // No access key, use pluginfile.php. Check if the URL already has params.
         if (url.match(/\?[^=]+=/)) {
             url += '&';
         } else {

From bc0d22450e7145994717be0340815873f1c7f500 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 8 Nov 2019 13:54:12 +0100
Subject: [PATCH 108/257] MOBILE-3164 files: Use tokenpluginfile only with
 slash params

---
 src/providers/utils/url.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/providers/utils/url.ts b/src/providers/utils/url.ts
index 3988a5ecb..600f84d5e 100644
--- a/src/providers/utils/url.ts
+++ b/src/providers/utils/url.ts
@@ -150,8 +150,11 @@ export class CoreUrlUtilsProvider {
             return url;
         }
 
-        if (accessKey) {
+        const hasSlashParams = !url.match(/[\&?]file=/);
+
+        if (accessKey && hasSlashParams) {
             // We have the user access key, use tokenpluginfile.php.
+            // Do not use it without slash params, the URL doesn't work.
             url = url.replace(/(\/webservice)?\/pluginfile\.php/, '/tokenpluginfile.php/' + accessKey);
 
             return url;

From 1a98e4de662c54d0d51eccdfd2e4bf4f5d099aae Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 23 Oct 2019 11:05:07 +0200
Subject: [PATCH 109/257] MOBILE-1355 scorm: Display score in the TOC

---
 scripts/langindex.json                                    | 2 ++
 .../mod/scorm/components/index/addon-mod-scorm-index.html | 1 +
 src/addon/mod/scorm/lang/en.json                          | 1 +
 src/addon/mod/scorm/pages/player/player.ts                | 8 +++++++-
 src/addon/mod/scorm/pages/toc/toc.html                    | 1 +
 src/addon/mod/scorm/pages/toc/toc.ts                      | 2 ++
 src/addon/mod/scorm/providers/scorm.ts                    | 3 +++
 src/assets/lang/en.json                                   | 1 +
 8 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 16f8cbda6..6377afa61 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -869,6 +869,7 @@
   "addon.mod_scorm.organizations": "scorm",
   "addon.mod_scorm.passed": "scorm",
   "addon.mod_scorm.reviewmode": "scorm",
+  "addon.mod_scorm.score": "scorm",
   "addon.mod_scorm.scormstatusnotdownloaded": "local_moodlemobileapp",
   "addon.mod_scorm.scormstatusoutdated": "local_moodlemobileapp",
   "addon.mod_scorm.suspended": "scorm",
@@ -1564,6 +1565,7 @@
   "core.login.auth_email": "auth_email/pluginname",
   "core.login.authenticating": "local_moodlemobileapp",
   "core.login.cancel": "moodle",
+  "core.login.changepassowrdinstructions": "local_moodlemobileapp",
   "core.login.changepassword": "moodle",
   "core.login.changepasswordbutton": "local_moodlemobileapp",
   "core.login.changepasswordhelp": "local_moodlemobileapp",
diff --git a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
index dffd0c865..265323472 100644
--- a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -100,6 +100,7 @@
                             <img [src]="sco.image.url" [alt]="sco.image.description" />
                             <a *ngIf="sco.prereq && sco.launch" (click)="open($event, sco.id)"><core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></a>
                             <span *ngIf="!sco.prereq || !sco.launch"><core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></span>
+                            <span *ngIf="accessInfo && accessInfo.canviewscores && sco.score_raw">({{ 'addon.mod_scorm.score' | translate }}: {{sco.score_raw}})</span>
                         </p>
                     </div>
                 </ion-item>
diff --git a/src/addon/mod/scorm/lang/en.json b/src/addon/mod/scorm/lang/en.json
index c5b06c51a..e7d6e5cfb 100644
--- a/src/addon/mod/scorm/lang/en.json
+++ b/src/addon/mod/scorm/lang/en.json
@@ -44,6 +44,7 @@
     "organizations": "Organisations",
     "passed": "Passed",
     "reviewmode": "Review mode",
+    "score": "Score",
     "scormstatusnotdownloaded": "This SCORM package is not downloaded. It will be automatically downloaded when you open it.",
     "scormstatusoutdated": "This SCORM package has been modified since the last download. It will be automatically downloaded when you open it.",
     "suspended": "Suspended",
diff --git a/src/addon/mod/scorm/pages/player/player.ts b/src/addon/mod/scorm/pages/player/player.ts
index 1334a74d4..a7b507809 100644
--- a/src/addon/mod/scorm/pages/player/player.ts
+++ b/src/addon/mod/scorm/pages/player/player.ts
@@ -45,6 +45,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
     nextSco: any; // Next SCO.
     src: string; // Iframe src.
     errorMessage: string; // Error message.
+    accessInfo: any; // Access information.
 
     protected siteId: string;
     protected mode: string; // Mode to play the SCORM.
@@ -239,6 +240,10 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
                             .then((data) => {
                         this.userData = data;
                     }));
+                    // Get access information.
+                    promises.push(this.scormProvider.getAccessInformation(this.scorm.id).then((accessInfo) => {
+                        this.accessInfo = accessInfo;
+                    }));
 
                     return Promise.all(promises);
                 });
@@ -394,7 +399,8 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
             mode: this.mode,
             selected: this.currentSco && this.currentSco.id,
             moduleId: this.scorm.coursemodule,
-            courseId: this.scorm.course
+            courseId: this.scorm.course,
+            accessInfo: this.accessInfo
         }, { cssClass: 'core-modal-lateral',
             showBackdrop: true,
             enableBackdropDismiss: true,
diff --git a/src/addon/mod/scorm/pages/toc/toc.html b/src/addon/mod/scorm/pages/toc/toc.html
index 8ed5ab7c5..0cff8c294 100644
--- a/src/addon/mod/scorm/pages/toc/toc.html
+++ b/src/addon/mod/scorm/pages/toc/toc.html
@@ -26,6 +26,7 @@
                 <a *ngIf="sco.isvisible" ion-item text-wrap [ngClass]="'core-padding-' + sco.level" [class.core-nav-item-selected]="selected == sco.id" (click)="loadSco(sco)" [attr.disabled]="!sco.prereq || !sco.launch ? true : null" [attr.detail-none]="!sco.prereq || !sco.launch ? true : null">
                     <img [src]="sco.image.url" [alt]="sco.image.description" />
                     <core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId"></core-format-text>
+                    <span *ngIf="accessInfo && accessInfo.canviewscores && sco.score_raw">({{ 'addon.mod_scorm.score' | translate }}: {{sco.score_raw}})</span>
                 </a>
             </ng-container>
         </ion-list>
diff --git a/src/addon/mod/scorm/pages/toc/toc.ts b/src/addon/mod/scorm/pages/toc/toc.ts
index 8aee2d236..8e25df969 100644
--- a/src/addon/mod/scorm/pages/toc/toc.ts
+++ b/src/addon/mod/scorm/pages/toc/toc.ts
@@ -32,12 +32,14 @@ export class AddonModScormTocPage {
     selected: number;
     moduleId: number;
     courseId: number;
+    accessInfo: any;
 
     constructor(navParams: NavParams, private viewCtrl: ViewController) {
         this.toc = navParams.get('toc') || [];
         this.attemptToContinue = navParams.get('attemptToContinue');
         this.moduleId = navParams.get('moduleId');
         this.courseId = navParams.get('courseId');
+        this.accessInfo = navParams.get('accessInfo');
 
         const mode = navParams.get('mode');
         this.selected = navParams.get('selected');
diff --git a/src/addon/mod/scorm/providers/scorm.ts b/src/addon/mod/scorm/providers/scorm.ts
index f2fadc93a..2592cbb25 100644
--- a/src/addon/mod/scorm/providers/scorm.ts
+++ b/src/addon/mod/scorm/providers/scorm.ts
@@ -949,6 +949,9 @@ export class AddonModScormProvider {
                     // Exit var.
                     sco.exitvar = typeof scoData.exitvar == 'undefined' ? 'cmi.core.exit' : scoData.exitvar;
                     sco.exitvalue = scoData[sco.exitvar];
+
+                    // Copy score.
+                    sco.score_raw = scoData.score_raw;
                 });
 
                 return scos;
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 369ad5236..0258261e8 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -868,6 +868,7 @@
     "addon.mod_scorm.organizations": "Organisations",
     "addon.mod_scorm.passed": "Passed",
     "addon.mod_scorm.reviewmode": "Review mode",
+    "addon.mod_scorm.score": "Score",
     "addon.mod_scorm.scormstatusnotdownloaded": "This SCORM package is not downloaded. It will be automatically downloaded when you open it.",
     "addon.mod_scorm.scormstatusoutdated": "This SCORM package has been modified since the last download. It will be automatically downloaded when you open it.",
     "addon.mod_scorm.suspended": "Suspended",

From 616a4e241314e3a7c8d819fb2ab4b9125c13f3ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Oct 2019 09:58:05 +0200
Subject: [PATCH 110/257] MOBILE-3192 style: Adapt styles to show mathjax on
 headers

---
 src/app/app.scss | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/app/app.scss b/src/app/app.scss
index 8f49c0974..025a695fc 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -122,6 +122,12 @@ ion-app.app-root {
     @include core-items();
   }
 
+  ion-header ion-title .toolbar-title .MathJax_Display {
+    display: inline-block !important;
+    margin: 0;
+    width: auto;
+  }
+
   .core-oauth-icon, .item.core-oauth-icon, .list .item.core-oauth-icon {
     min-height: 32px;
     img, .label {
@@ -716,6 +722,17 @@ ion-app.app-root {
 
   .header .toolbar-ios {
     height: $toolbar-ios-height;
+    max-height: $toolbar-ios-height;
+  }
+
+  .header .toolbar-wp {
+    height: $toolbar-wp-height;
+    max-height: $toolbar-wp-height;
+  }
+
+  .header .toolbar-md {
+    height: $toolbar-md-height;
+    max-height: $toolbar-md-height;
   }
 
   // Footer with auto height.

From 775dfbaee92fbe7b4d9cd710518ff072d97e504e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 21 Oct 2019 16:41:35 +0200
Subject: [PATCH 111/257] MOBILE-3196 assign: Warn about falling into Default
 group

---
 scripts/langindex.json                            |  2 +-
 .../components/index/addon-mod-assign-index.html  |  2 +-
 src/addon/mod/assign/components/index/index.ts    | 15 +++++++++++++++
 src/addon/mod/assign/lang/en.json                 |  1 +
 src/addon/mod/assign/providers/assign.ts          |  6 +++++-
 src/assets/lang/en.json                           |  1 +
 6 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 6377afa61..56a221604 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -405,6 +405,7 @@
   "addon.mod_assign.timemodified": "assign",
   "addon.mod_assign.timeremaining": "assign",
   "addon.mod_assign.ungroupedusers": "assign",
+  "addon.mod_assign.ungroupedusersoptional": "assign",
   "addon.mod_assign.unlimitedattempts": "assign",
   "addon.mod_assign.userswhoneedtosubmit": "assign",
   "addon.mod_assign.userwithid": "local_moodlemobileapp",
@@ -1565,7 +1566,6 @@
   "core.login.auth_email": "auth_email/pluginname",
   "core.login.authenticating": "local_moodlemobileapp",
   "core.login.cancel": "moodle",
-  "core.login.changepassowrdinstructions": "local_moodlemobileapp",
   "core.login.changepassword": "moodle",
   "core.login.changepasswordbutton": "local_moodlemobileapp",
   "core.login.changepasswordhelp": "local_moodlemobileapp",
diff --git a/src/addon/mod/assign/components/index/addon-mod-assign-index.html b/src/addon/mod/assign/components/index/addon-mod-assign-index.html
index 3e118e578..4ccbf69c2 100644
--- a/src/addon/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addon/mod/assign/components/index/addon-mod-assign-index.html
@@ -86,7 +86,7 @@
         <!-- Ungrouped users. -->
         <div *ngIf="assign.teamsubmission && summary && summary.warnofungroupedusers" class="core-info-card" icon-start>
             <ion-icon name="information-circle"></ion-icon>
-            {{ 'addon.mod_assign.ungroupedusers' | translate }}
+            {{ 'addon.mod_assign.'+summary.warnofungroupedusers | translate }}
         </div>
     </ion-list>
 
diff --git a/src/addon/mod/assign/components/index/index.ts b/src/addon/mod/assign/components/index/index.ts
index 1d37fe6ac..b392abef3 100644
--- a/src/addon/mod/assign/components/index/index.ts
+++ b/src/addon/mod/assign/components/index/index.ts
@@ -235,6 +235,21 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
 
         return this.assignProvider.getSubmissionStatus(this.assign.id, undefined, this.group).then((response) => {
             this.summary = response.gradingsummary;
+            if (typeof this.summary.warnofungroupedusers == 'boolean' && this.summary.warnofungroupedusers) {
+                this.summary.warnofungroupedusers = 'ungroupedusers';
+            } else {
+                switch (this.summary.warnofungroupedusers) {
+                    case AddonModAssignProvider.WARN_GROUPS_REQUIRED:
+                        this.summary.warnofungroupedusers = 'ungroupedusers';
+                        break;
+                    case AddonModAssignProvider.WARN_GROUPS_OPTIONAL:
+                        this.summary.warnofungroupedusers = 'ungroupedusersoptional';
+                        break;
+                    default:
+                        this.summary.warnofungroupedusers = '';
+                        break;
+                }
+            }
 
             this.needsGradingAvalaible = response.gradingsummary && response.gradingsummary.submissionsneedgradingcount > 0 &&
                     this.sitesProvider.getCurrentSite().isVersionGreaterEqualThan('3.2');
diff --git a/src/addon/mod/assign/lang/en.json b/src/addon/mod/assign/lang/en.json
index 9436ddd36..fb0908c5d 100644
--- a/src/addon/mod/assign/lang/en.json
+++ b/src/addon/mod/assign/lang/en.json
@@ -93,6 +93,7 @@
     "timemodified": "Last modified",
     "timeremaining": "Time remaining",
     "ungroupedusers": "The setting 'Require group to make submission' is enabled and some users are either not a member of any group, or are a member of more than one group, so are unable to make submissions.",
+    "ungroupedusersoptional": "The setting 'Students submit in groups' is enabled and some users are either not a member of any group, or are a member of more than one group. Please be aware that these students will submit as members of the 'Default group'.",
     "unlimitedattempts": "Unlimited",
     "userwithid": "User with ID {{id}}",
     "userswhoneedtosubmit": "Users who need to submit: {{$a}}",
diff --git a/src/addon/mod/assign/providers/assign.ts b/src/addon/mod/assign/providers/assign.ts
index 44465a59f..34c02701d 100644
--- a/src/addon/mod/assign/providers/assign.ts
+++ b/src/addon/mod/assign/providers/assign.ts
@@ -55,6 +55,10 @@ export class AddonModAssignProvider {
     static NEED_GRADING = 'needgrading';
     static GRADED_FOLLOWUP_SUBMIT = 'gradedfollowupsubmit';
 
+    // Group submissions warnings.
+    static WARN_GROUPS_REQUIRED = 'warnrequired';
+    static WARN_GROUPS_OPTIONAL = 'warnoptional';
+
     // Events.
     static SUBMISSION_SAVED_EVENT = 'addon_mod_assign_submission_saved';
     static SUBMITTED_FOR_GRADING_EVENT = 'addon_mod_assign_submitted_for_grading';
@@ -1396,7 +1400,7 @@ export type AddonModAssignSubmissionGradingSummary = {
     submissionsenabled: boolean; // Whether submissions are enabled or not.
     submissionssubmittedcount: number; // Number of submissions in submitted status.
     submissionsneedgradingcount: number; // Number of submissions that need grading.
-    warnofungroupedusers: string; // Whether we need to warn people about groups.
+    warnofungroupedusers: string | boolean; // Whether we need to warn people about groups.
 };
 
 /**
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 0258261e8..b7ed98d6c 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -404,6 +404,7 @@
     "addon.mod_assign.timemodified": "Last modified",
     "addon.mod_assign.timeremaining": "Time remaining",
     "addon.mod_assign.ungroupedusers": "The setting 'Require group to make submission' is enabled and some users are either not a member of any group, or are a member of more than one group, so are unable to make submissions.",
+    "addon.mod_assign.ungroupedusersoptional": "The setting 'Students submit in groups' is enabled and some users are either not a member of any group, or are a member of more than one group. Please be aware that these students will submit as members of the 'Default group'.",
     "addon.mod_assign.unlimitedattempts": "Unlimited",
     "addon.mod_assign.userswhoneedtosubmit": "Users who need to submit: {{$a}}",
     "addon.mod_assign.userwithid": "User with ID {{id}}",

From 343743ab09483b91e4d95c4d08a630dfd459c2d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 4 Sep 2019 13:33:08 +0200
Subject: [PATCH 112/257] MOBILE-3136 calendar: Add filter events by type

---
 scripts/langindex.json                        |   6 +
 src/addon/calendar/calendar.module.ts         |   2 +
 .../components/calendar/calendar.scss         |  23 +++-
 .../calendar/components/calendar/calendar.ts  |  38 +++---
 .../calendar/components/components.module.ts  |  10 +-
 .../filter/addon-calendar-filter-popover.html |  14 +++
 .../calendar/components/filter/filter.ts      |  69 +++++++++++
 .../upcoming-events/upcoming-events.ts        |  34 +++---
 src/addon/calendar/lang/en.json               |   5 +
 src/addon/calendar/pages/day/day.html         |   6 +-
 src/addon/calendar/pages/day/day.ts           |  66 ++++++-----
 src/addon/calendar/pages/index/index.html     |  10 +-
 src/addon/calendar/pages/index/index.ts       |  56 +++++----
 src/addon/calendar/pages/list/list.html       |   6 +-
 src/addon/calendar/pages/list/list.ts         | 111 ++++++++++--------
 src/addon/calendar/providers/calendar.ts      |   6 +
 src/addon/calendar/providers/helper.ts        |  41 ++++++-
 src/assets/lang/en.json                       |   6 +
 src/lang/en.json                              |   1 +
 19 files changed, 356 insertions(+), 154 deletions(-)
 create mode 100644 src/addon/calendar/components/filter/addon-calendar-filter-popover.html
 create mode 100644 src/addon/calendar/components/filter/filter.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 6377afa61..0cbf1d82e 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -89,8 +89,10 @@
   "addon.calendar.calendarevent": "local_moodlemobileapp",
   "addon.calendar.calendarevents": "local_moodlemobileapp",
   "addon.calendar.calendarreminders": "local_moodlemobileapp",
+  "addon.calendar.categoryevents": "calendar",
   "addon.calendar.confirmeventdelete": "calendar",
   "addon.calendar.confirmeventseriesdelete": "calendar",
+  "addon.calendar.courseevents": "calendar",
   "addon.calendar.currentmonth": "local_moodlemobileapp",
   "addon.calendar.daynext": "calendar",
   "addon.calendar.dayprev": "calendar",
@@ -114,6 +116,7 @@
   "addon.calendar.fri": "calendar",
   "addon.calendar.friday": "calendar",
   "addon.calendar.gotoactivity": "calendar",
+  "addon.calendar.groupevents": "calendar",
   "addon.calendar.invalidtimedurationminutes": "calendar",
   "addon.calendar.invalidtimedurationuntil": "calendar",
   "addon.calendar.mon": "calendar",
@@ -131,6 +134,7 @@
   "addon.calendar.sat": "calendar",
   "addon.calendar.saturday": "calendar",
   "addon.calendar.setnewreminder": "local_moodlemobileapp",
+  "addon.calendar.siteevents": "calendar",
   "addon.calendar.sun": "calendar",
   "addon.calendar.sunday": "calendar",
   "addon.calendar.thu": "calendar",
@@ -149,6 +153,7 @@
   "addon.calendar.typesite": "calendar",
   "addon.calendar.typeuser": "calendar",
   "addon.calendar.upcomingevents": "calendar",
+  "addon.calendar.userevents": "calendar",
   "addon.calendar.wed": "calendar",
   "addon.calendar.wednesday": "calendar",
   "addon.calendar.when": "calendar",
@@ -1519,6 +1524,7 @@
   "core.fileuploader.uploading": "local_moodlemobileapp",
   "core.fileuploader.uploadingperc": "local_moodlemobileapp",
   "core.fileuploader.video": "local_moodlemobileapp",
+  "core.filter": "moodle",
   "core.folder": "moodle",
   "core.forcepasswordchangenotice": "moodle",
   "core.fulllistofcourses": "moodle",
diff --git a/src/addon/calendar/calendar.module.ts b/src/addon/calendar/calendar.module.ts
index 37f7f2017..06a8bbf6c 100644
--- a/src/addon/calendar/calendar.module.ts
+++ b/src/addon/calendar/calendar.module.ts
@@ -27,6 +27,7 @@ import { CoreLocalNotificationsProvider } from '@providers/local-notifications';
 import { CoreLoginHelperProvider } from '@core/login/providers/helper';
 import { CoreUpdateManagerProvider } from '@providers/update-manager';
 import { CoreContentLinksDelegate } from '@core/contentlinks/providers/delegate';
+import { AddonCalendarComponentsModule } from './components/components.module';
 
 // List of providers (without handlers).
 export const ADDON_CALENDAR_PROVIDERS: any[] = [
@@ -40,6 +41,7 @@ export const ADDON_CALENDAR_PROVIDERS: any[] = [
     declarations: [
     ],
     imports: [
+        AddonCalendarComponentsModule,
     ],
     providers: [
         AddonCalendarProvider,
diff --git a/src/addon/calendar/components/calendar/calendar.scss b/src/addon/calendar/components/calendar/calendar.scss
index 17c3fd478..d04e2091b 100644
--- a/src/addon/calendar/components/calendar/calendar.scss
+++ b/src/addon/calendar/components/calendar/calendar.scss
@@ -10,7 +10,8 @@ $calendar-border-color: $gray !default;
 
 ion-app.app-root page-addon-calendar-list,
 ion-app.app-root page-addon-calendar-day,
-ion-app.app-root addon-calendar-upcoming-events {
+ion-app.app-root addon-calendar-upcoming-events,
+ion-app.app-root addon-calendar-filter-popover {
 
     .item.addon-calendar-event {
         > .icon {
@@ -49,6 +50,26 @@ ion-app.app-root addon-calendar-upcoming-events {
     }
 }
 
+ion-app.app-root addon-calendar-filter-popover .item.addon-calendar-event {
+    ion-icon[item-start] + .item-inner {
+        @include margin-horizontal(8px, 0);
+    }
+
+    > .icon {
+        width: 28px;
+        height: 28px;
+        line-height: 28px;
+        font-size: 20px;
+
+        &.fa {
+            font-size: 16px;
+            &::before {
+                width: 1.8em;
+            }
+        }
+    }
+}
+
 ion-app.app-root addon-calendar-calendar {
 
     .addon-calendar-navigation {
diff --git a/src/addon/calendar/components/calendar/calendar.ts b/src/addon/calendar/components/calendar/calendar.ts
index 05ca83e1d..55a871937 100644
--- a/src/addon/calendar/components/calendar/calendar.ts
+++ b/src/addon/calendar/components/calendar/calendar.ts
@@ -12,7 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnDestroy, OnInit, Input, OnChanges, SimpleChange, Output, EventEmitter } from '@angular/core';
+import { Component, OnDestroy, OnInit, Input, OnChanges, DoCheck, SimpleChange, Output, EventEmitter,
+    KeyValueDiffers } from '@angular/core';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreLocalNotificationsProvider } from '@providers/local-notifications';
 import { CoreSitesProvider } from '@providers/sites';
@@ -32,11 +33,10 @@ import { CoreAppProvider } from '@providers/app';
     selector: 'addon-calendar-calendar',
     templateUrl: 'addon-calendar-calendar.html',
 })
-export class AddonCalendarCalendarComponent implements OnInit, OnChanges, OnDestroy {
+export class AddonCalendarCalendarComponent implements OnInit, OnChanges, DoCheck, OnDestroy {
     @Input() initialYear: number | string; // Initial year to load.
     @Input() initialMonth: number | string; // Initial month to load.
-    @Input() courseId: number | string;
-    @Input() categoryId: number | string; // Category ID the course belongs to.
+    @Input() filter: any; // Filter to apply.
     @Input() canNavigate?: string | boolean; // Whether to include arrows to change the month. Defaults to true.
     @Input() displayNavButtons?: string | boolean; // Whether to display nav buttons created by this component. Defaults to true.
     @Output() onEventClicked = new EventEmitter<number>();
@@ -59,6 +59,7 @@ export class AddonCalendarCalendarComponent implements OnInit, OnChanges, OnDest
     protected offlineEditedEventsIds = []; // IDs of events edited in offline.
     protected deletedEvents = []; // Events deleted in offline.
     protected currentTime: number;
+    protected differ: any; // To detect changes in the data input.
 
     // Observers.
     protected undeleteEventObserver: any;
@@ -67,6 +68,7 @@ export class AddonCalendarCalendarComponent implements OnInit, OnChanges, OnDest
     constructor(eventsProvider: CoreEventsProvider,
             sitesProvider: CoreSitesProvider,
             localNotificationsProvider: CoreLocalNotificationsProvider,
+            differs: KeyValueDiffers,
             private calendarProvider: AddonCalendarProvider,
             private calendarHelper: AddonCalendarHelperProvider,
             private calendarOffline: AddonCalendarOfflineProvider,
@@ -102,6 +104,8 @@ export class AddonCalendarCalendarComponent implements OnInit, OnChanges, OnDest
                 }
             }
         }, this.currentSiteId);
+
+        this.differ = differs.find([]).create();
     }
 
     /**
@@ -125,9 +129,18 @@ export class AddonCalendarCalendarComponent implements OnInit, OnChanges, OnDest
         this.canNavigate = typeof this.canNavigate == 'undefined' ? true : this.utils.isTrueOrOne(this.canNavigate);
         this.displayNavButtons = typeof this.displayNavButtons == 'undefined' ? true :
                 this.utils.isTrueOrOne(this.displayNavButtons);
+    }
 
-        if ((changes.courseId || changes.categoryId) && this.weeks) {
-            this.filterEvents();
+    /**
+     * Detect and act upon changes that Angular can’t or won’t detect on its own (objects and arrays).
+     */
+    ngDoCheck(): void {
+        if (this.weeks) {
+            // Check if there's any change in the filter object.
+            const changes = this.differ.diff(this.filter);
+            if (changes) {
+                this.filterEvents();
+            }
         }
     }
 
@@ -260,21 +273,12 @@ export class AddonCalendarCalendarComponent implements OnInit, OnChanges, OnDest
     }
 
     /**
-     * Filter events to only display events belonging to a certain course.
+     * Filter events based on the filter popover.
      */
     filterEvents(): void {
-        const courseId = this.courseId ? Number(this.courseId) : undefined,
-            categoryId = this.categoryId ? Number(this.categoryId) : undefined;
-
         this.weeks.forEach((week) => {
             week.days.forEach((day) => {
-                if (!courseId || courseId < 0) {
-                    day.filteredEvents = day.events;
-                } else {
-                    day.filteredEvents = day.events.filter((event) => {
-                        return this.calendarHelper.shouldDisplayEvent(event, courseId, categoryId, this.categories);
-                    });
-                }
+                day.filteredEvents = this.calendarHelper.getFilteredEvents(day.events, this.filter, this.categories);
 
                 // Re-calculate some properties.
                 this.calendarHelper.calculateDayData(day, day.filteredEvents);
diff --git a/src/addon/calendar/components/components.module.ts b/src/addon/calendar/components/components.module.ts
index 45656098d..dacc846b9 100644
--- a/src/addon/calendar/components/components.module.ts
+++ b/src/addon/calendar/components/components.module.ts
@@ -21,11 +21,13 @@ import { CoreDirectivesModule } from '@directives/directives.module';
 import { CorePipesModule } from '@pipes/pipes.module';
 import { AddonCalendarCalendarComponent } from '../components/calendar/calendar';
 import { AddonCalendarUpcomingEventsComponent } from '../components/upcoming-events/upcoming-events';
+import { AddonCalendarFilterPopoverComponent } from '../components/filter/filter';
 
 @NgModule({
     declarations: [
         AddonCalendarCalendarComponent,
-        AddonCalendarUpcomingEventsComponent
+        AddonCalendarUpcomingEventsComponent,
+        AddonCalendarFilterPopoverComponent
     ],
     imports: [
         CommonModule,
@@ -39,7 +41,11 @@ import { AddonCalendarUpcomingEventsComponent } from '../components/upcoming-eve
     ],
     exports: [
         AddonCalendarCalendarComponent,
-        AddonCalendarUpcomingEventsComponent
+        AddonCalendarUpcomingEventsComponent,
+        AddonCalendarFilterPopoverComponent
+    ],
+    entryComponents: [
+        AddonCalendarFilterPopoverComponent
     ]
 })
 export class AddonCalendarComponentsModule {}
diff --git a/src/addon/calendar/components/filter/addon-calendar-filter-popover.html b/src/addon/calendar/components/filter/addon-calendar-filter-popover.html
new file mode 100644
index 000000000..8de25e0db
--- /dev/null
+++ b/src/addon/calendar/components/filter/addon-calendar-filter-popover.html
@@ -0,0 +1,14 @@
+<ion-list radio-group>
+    <ion-item *ngFor="let type of typeKeys" class="addon-calendar-event" [ngClass]="['addon-calendar-eventtype-'+type]">
+        <core-icon [name]="typeIcons[type]" item-start></core-icon>
+        <ion-label>{{ 'addon.calendar.' + type + 'events' | translate}}</ion-label>
+        <ion-toggle [(ngModel)]="types[type]" (ionChange)="onChange($event)"></ion-toggle>
+    </ion-item>
+    <ion-item-divider></ion-item-divider>
+    <ion-list radio-group [(ngModel)]="courseId" *ngIf="types.course || types.category || types.group">
+        <ion-item text-wrap *ngFor="let course of courses" >
+            <ion-label><core-format-text [text]="course.fullname"></core-format-text></ion-label>
+            <ion-radio value="{{course.id}}" (ionSelect)="onChange($event)" ></ion-radio>
+        </ion-item>
+    </ion-list>
+</ion-list>
diff --git a/src/addon/calendar/components/filter/filter.ts b/src/addon/calendar/components/filter/filter.ts
new file mode 100644
index 000000000..a2f057404
--- /dev/null
+++ b/src/addon/calendar/components/filter/filter.ts
@@ -0,0 +1,69 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Component } from '@angular/core';
+import { NavParams } from 'ionic-angular';
+import { CoreEventsProvider } from '@providers/events';
+import { AddonCalendarProvider } from '../../providers/calendar';
+import { AddonCalendarHelperProvider } from '../../providers/helper';
+
+/**
+ * Component to display a list of courses.
+ */
+@Component({
+    selector: 'addon-calendar-filter-popover',
+    templateUrl: 'addon-calendar-filter-popover.html'
+})
+export class AddonCalendarFilterPopoverComponent {
+    courses: any[];
+    courseId = -1;
+
+    types = {};
+    typeIcons = {};
+    typeKeys = [];
+
+    constructor(navParams: NavParams, protected eventsProvider: CoreEventsProvider) {
+        this.courses = navParams.get('courses') || [];
+        const filter = navParams.get('filter') || {};
+        this.courseId = filter.courseId || -1;
+
+        this.typeKeys = AddonCalendarProvider.ALL_TYPES.map((name) => {
+            this.types[name] = filter[name];
+            this.typeIcons[name] = AddonCalendarHelperProvider.EVENTICONS[name];
+
+            return name;
+        });
+    }
+
+    /**
+     * Function called when an item is clicked.
+     *
+     * @param event Click event.
+     */
+    onChange(event: Event): void {
+        const filter = this.types;
+        if (this.courseId > 0) {
+            const course = this.courses.find((course) => this.courseId == course.id);
+            filter['courseId'] = course && course.id;
+            filter['categoryId'] = course && course.category;
+        } else {
+            filter['courseId'] = false;
+            filter['categoryId'] = false;
+        }
+
+        filter['filtered'] = filter['courseId'] || AddonCalendarProvider.ALL_TYPES.some((name) => !this.types[name]);
+
+        this.eventsProvider.trigger(AddonCalendarProvider.FILTER_CHANGED_EVENT, filter);
+    }
+}
diff --git a/src/addon/calendar/components/upcoming-events/upcoming-events.ts b/src/addon/calendar/components/upcoming-events/upcoming-events.ts
index 4b12725ea..d96c0cf25 100644
--- a/src/addon/calendar/components/upcoming-events/upcoming-events.ts
+++ b/src/addon/calendar/components/upcoming-events/upcoming-events.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, OnDestroy, OnInit, Input, OnChanges, SimpleChange, Output, EventEmitter } from '@angular/core';
+import { Component, OnDestroy, OnInit, Input, DoCheck, Output, EventEmitter, KeyValueDiffers } from '@angular/core';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreLocalNotificationsProvider } from '@providers/local-notifications';
 import { CoreSitesProvider } from '@providers/sites';
@@ -30,9 +30,8 @@ import { CoreConstants } from '@core/constants';
     selector: 'addon-calendar-upcoming-events',
     templateUrl: 'addon-calendar-upcoming-events.html',
 })
-export class AddonCalendarUpcomingEventsComponent implements OnInit, OnChanges, OnDestroy {
-    @Input() courseId: number | string;
-    @Input() categoryId: number | string; // Category ID the course belongs to.
+export class AddonCalendarUpcomingEventsComponent implements OnInit, DoCheck, OnDestroy {
+    @Input() filter: any; // Filter to apply.
     @Output() onEventClicked = new EventEmitter<number>();
 
     filteredEvents = [];
@@ -49,6 +48,7 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, OnChanges,
     protected deletedEvents = []; // Events deleted in offline.
     protected lookAhead: number;
     protected timeFormat: string;
+    protected differ: any; // To detect changes in the data input.
 
     // Observers.
     protected undeleteEventObserver: any;
@@ -57,6 +57,7 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, OnChanges,
     constructor(eventsProvider: CoreEventsProvider,
             sitesProvider: CoreSitesProvider,
             localNotificationsProvider: CoreLocalNotificationsProvider,
+            differs: KeyValueDiffers,
             private calendarProvider: AddonCalendarProvider,
             private calendarHelper: AddonCalendarHelperProvider,
             private calendarOffline: AddonCalendarOfflineProvider,
@@ -85,6 +86,8 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, OnChanges,
                 }
             }
         }, this.currentSiteId);
+
+        this.differ = differs.find([]).create();
     }
 
     /**
@@ -95,10 +98,12 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, OnChanges,
     }
 
     /**
-     * Detect changes on input properties.
+     * Detect and act upon changes that Angular can’t or won’t detect on its own (objects and arrays).
      */
-    ngOnChanges(changes: {[name: string]: SimpleChange}): void {
-        if (changes.courseId || changes.categoryId) {
+    ngDoCheck(): void {
+        // Check if there's any change in the filter object.
+        const changes = this.differ.diff(this.filter);
+        if (changes) {
             this.filterEvents();
         }
     }
@@ -207,19 +212,10 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, OnChanges,
     }
 
     /**
-     * Filter events to only display events belonging to a certain course.
+     * Filter events based on the filter popover.
      */
-    filterEvents(): void {
-        const courseId = this.courseId ? Number(this.courseId) : undefined,
-            categoryId = this.categoryId ? Number(this.categoryId) : undefined;
-
-        if (!courseId || courseId < 0) {
-            this.filteredEvents = this.events;
-        } else {
-            this.filteredEvents = this.events.filter((event) => {
-                return this.calendarHelper.shouldDisplayEvent(event, courseId, categoryId, this.categories);
-            });
-        }
+    protected filterEvents(): void {
+        this.filteredEvents = this.calendarHelper.getFilteredEvents(this.events, this.filter, this.categories);
     }
 
     /**
diff --git a/src/addon/calendar/lang/en.json b/src/addon/calendar/lang/en.json
index 9c65c4488..8b1748f6b 100644
--- a/src/addon/calendar/lang/en.json
+++ b/src/addon/calendar/lang/en.json
@@ -4,8 +4,10 @@
     "calendarevent": "Calendar event",
     "calendarevents": "Calendar events",
     "calendarreminders": "Calendar reminders",
+    "categoryevents": "Category events",
     "confirmeventdelete": "Are you sure you want to delete the \"{{$a}}\" event?",
     "confirmeventseriesdelete": "The \"{{$a.name}}\" event is part of a series. Do you want to delete just this event, or all {{$a.count}} events in the series?",
+    "courseevents": "Course events",
     "currentmonth": "Current Month",
     "daynext": "Next day",
     "dayprev": "Previous day",
@@ -29,6 +31,7 @@
     "fri": "Fri",
     "friday": "Friday",
     "gotoactivity": "Go to activity",
+    "groupevents": "Group events",
     "invalidtimedurationminutes": "The duration in minutes you have entered is invalid. Please enter the duration in minutes greater than 0 or select no duration.",
     "invalidtimedurationuntil": "The date and time you selected for duration until is before the start time of the event. Please correct this before proceeding.",
     "mon": "Mon",
@@ -46,6 +49,7 @@
     "sat": "Sat",
     "saturday": "Saturday",
     "setnewreminder": "Set a new reminder",
+    "siteevents": "Site events",
     "sun": "Sun",
     "sunday": "Sunday",
     "thu": "Thu",
@@ -64,6 +68,7 @@
     "typesite": "Site event",
     "typeuser": "User event",
     "upcomingevents": "Upcoming events",
+    "userevents": "User events",
     "wed": "Wed",
     "wednesday": "Wednesday",
     "when": "When",
diff --git a/src/addon/calendar/pages/day/day.html b/src/addon/calendar/pages/day/day.html
index 913e5ea4e..d81aff79e 100644
--- a/src/addon/calendar/pages/day/day.html
+++ b/src/addon/calendar/pages/day/day.html
@@ -2,9 +2,9 @@
     <ion-navbar core-back-button>
         <ion-title>{{ 'addon.calendar.calendarevents' | translate }}</ion-title>
         <ion-buttons end>
-            <button *ngIf="courses && courses.length" ion-button icon-only (click)="openCourseFilter($event)" [attr.aria-label]="'core.courses.filter' | translate">
-                <ion-icon name="funnel" *ngIf="courseId"></ion-icon>
-                <ion-icon name="ios-funnel-outline" *ngIf="!courseId"></ion-icon>
+            <button ion-button icon-only (click)="openFilter($event)" [attr.aria-label]="'core.filter' | translate">
+                <ion-icon name="funnel" *ngIf="filter.filtered"></ion-icon>
+                <ion-icon name="ios-funnel-outline" *ngIf="!filter.filtered"></ion-icon>
             </button>
             <core-context-menu>
                 <core-context-menu-item *ngIf="!isCurrentDay" [priority]="900" [content]="'addon.calendar.today' | translate" [iconAction]="'fa-calendar-times-o'" (action)="goToCurrentDay()"></core-context-menu-item>
diff --git a/src/addon/calendar/pages/day/day.ts b/src/addon/calendar/pages/day/day.ts
index 3730cd253..bcf71420f 100644
--- a/src/addon/calendar/pages/day/day.ts
+++ b/src/addon/calendar/pages/day/day.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Component, OnInit, OnDestroy, NgZone } from '@angular/core';
-import { IonicPage, NavParams, NavController } from 'ionic-angular';
+import { IonicPage, NavParams, NavController, PopoverController } from 'ionic-angular';
 import { CoreAppProvider } from '@providers/app';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreLocalNotificationsProvider } from '@providers/local-notifications';
@@ -26,6 +26,7 @@ import { AddonCalendarHelperProvider } from '../../providers/helper';
 import { AddonCalendarSyncProvider } from '../../providers/calendar-sync';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
 import { CoreCoursesHelperProvider } from '@core/courses/providers/helper';
+import { AddonCalendarFilterPopoverComponent } from '../../components/filter/filter';
 import { Network } from '@ionic-native/network';
 import * as moment from 'moment';
 
@@ -63,11 +64,10 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     protected manualSyncObserver: any;
     protected onlineObserver: any;
     protected obsDefaultTimeChange: any;
+    protected filterChangedObserver: any;
 
     periodName: string;
     filteredEvents = [];
-    courseId: number;
-    categoryId: number;
     canCreate = false;
     courses: any[];
     loaded = false;
@@ -76,6 +76,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     syncIcon: string;
     isCurrentDay: boolean;
     isPastDay: boolean;
+    filter = {};
 
     constructor(localNotificationsProvider: CoreLocalNotificationsProvider,
             navParams: NavParams,
@@ -92,14 +93,19 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
             private eventsProvider: CoreEventsProvider,
             private coursesProvider: CoreCoursesProvider,
             private coursesHelper: CoreCoursesHelperProvider,
-            private appProvider: CoreAppProvider) {
+            private appProvider: CoreAppProvider,
+            private popoverCtrl: PopoverController) {
 
         const now = new Date();
 
+        AddonCalendarProvider.ALL_TYPES.forEach((name) => {
+            this.filter[name] = true;
+        });
+        this.filter['courseId'] = navParams.get('courseId');
+
         this.year = navParams.get('year') || now.getFullYear();
         this.month = navParams.get('month') || (now.getMonth() + 1);
         this.day = navParams.get('day') || now.getDate();
-        this.courseId = navParams.get('courseId');
         this.currentSiteId = sitesProvider.getCurrentSiteId();
 
         if (localNotificationsProvider.isAvailable()) {
@@ -186,6 +192,17 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
             }
         }, this.currentSiteId);
 
+        this.filterChangedObserver = this.eventsProvider.on(AddonCalendarProvider.FILTER_CHANGED_EVENT, (data) => {
+            this.filter = data;
+
+            // Course viewed has changed, check if the user can create events for this course calendar.
+            this.calendarHelper.canEditEvents(this.filter['courseId']).then((canEdit) => {
+                this.canCreate = canEdit;
+            });
+
+            this.filterEvents();
+        });
+
         // Refresh online status when changes.
         this.onlineObserver = network.onchange().subscribe(() => {
             // Execute the callback in the Angular zone, so change detection doesn't stop working.
@@ -223,9 +240,8 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
             const promises = [];
 
             // Load courses for the popover.
-            promises.push(this.coursesHelper.getCoursesForPopover(this.courseId).then((data) => {
+            promises.push(this.coursesHelper.getCoursesForPopover(this.filter['courseId']).then((data) => {
                 this.courses = data.courses;
-                this.categoryId = data.categoryId;
             }));
 
             // Get categories.
@@ -257,7 +273,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
             }));
 
             // Check if user can create events.
-            promises.push(this.calendarHelper.canEditEvents(this.courseId).then((canEdit) => {
+            promises.push(this.calendarHelper.canEditEvents(this.filter['courseId']).then((canEdit) => {
                 this.canCreate = canEdit;
             }));
 
@@ -374,16 +390,10 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     }
 
     /**
-     * Filter events to only display events belonging to a certain course.
+     * Filter events based on the filter popover.
      */
     protected filterEvents(): void {
-        if (!this.courseId || this.courseId < 0) {
-            this.filteredEvents = this.events;
-        } else {
-            this.filteredEvents = this.events.filter((event) => {
-                return this.calendarHelper.shouldDisplayEvent(event, this.courseId, this.categoryId, this.categories);
-            });
-        }
+        this.filteredEvents = this.calendarHelper.getFilteredEvents(this.events, this.filter, this.categories);
     }
 
     /**
@@ -513,19 +523,14 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
      *
      * @param event Event.
      */
-    openCourseFilter(event: MouseEvent): void {
-        this.coursesHelper.selectCourse(event, this.courses, this.courseId).then((result) => {
-            if (typeof result.courseId != 'undefined') {
-                this.courseId = result.courseId > 0 ? result.courseId : undefined;
-                this.categoryId = result.courseId > 0 ? result.categoryId : undefined;
+    openFilter(event: MouseEvent): void {
+        const popover = this.popoverCtrl.create(AddonCalendarFilterPopoverComponent, {
+            courses: this.courses,
+            filter: this.filter
+        });
 
-                // Course viewed has changed, check if the user can create events for this course calendar.
-                this.calendarHelper.canEditEvents(this.courseId).then((canEdit) => {
-                    this.canCreate = canEdit;
-                });
-
-                this.filterEvents();
-            }
+        popover.present({
+            ev: event
         });
     }
 
@@ -544,8 +549,8 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
             params.timestamp = moment().year(this.year).month(this.month - 1).date(this.day).unix() * 1000;
         }
 
-        if (this.courseId) {
-            params.courseId = this.courseId;
+        if (this.filter['courseId']) {
+            params.courseId = this.filter['courseId'];
         }
 
         this.navCtrl.push('AddonCalendarEditEventPage', params);
@@ -697,6 +702,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
         this.syncObserver && this.syncObserver.off();
         this.manualSyncObserver && this.manualSyncObserver.off();
         this.onlineObserver && this.onlineObserver.unsubscribe();
+        this.filterChangedObserver && this.filterChangedObserver.off();
         this.obsDefaultTimeChange && this.obsDefaultTimeChange.off();
     }
 }
diff --git a/src/addon/calendar/pages/index/index.html b/src/addon/calendar/pages/index/index.html
index d2d6d38b0..005d68f25 100644
--- a/src/addon/calendar/pages/index/index.html
+++ b/src/addon/calendar/pages/index/index.html
@@ -2,9 +2,9 @@
     <ion-navbar core-back-button>
         <ion-title>{{ (showCalendar ? 'addon.calendar.calendarevents' : 'addon.calendar.upcomingevents') | translate }}</ion-title>
         <ion-buttons end>
-            <button *ngIf="courses && courses.length" ion-button icon-only (click)="openCourseFilter($event)" [attr.aria-label]="'core.courses.filter' | translate">
-                <ion-icon name="funnel" *ngIf="courseId"></ion-icon>
-                <ion-icon name="ios-funnel-outline" *ngIf="!courseId"></ion-icon>
+            <button ion-button icon-only (click)="openFilter($event)" [attr.aria-label]="'core.filter' | translate">
+                <ion-icon name="funnel" *ngIf="filter.filtered"></ion-icon>
+                <ion-icon name="ios-funnel-outline" *ngIf="!filter.filtered"></ion-icon>
             </button>
             <core-context-menu>
                 <core-context-menu-item *ngIf="showCalendar" [priority]="800" [content]="'addon.calendar.upcomingevents' | translate" [iconAction]="'list'" (action)="toggleDisplay()"></core-context-menu-item>
@@ -25,9 +25,9 @@
         <ion-icon name="warning"></ion-icon> {{ 'core.hasdatatosync' | translate:{$a: 'addon.calendar.calendar' | translate} }}
     </ion-card>
 
-    <addon-calendar-calendar [hidden]="!showCalendar" [initialYear]="year" [initialMonth]="month" [courseId]="courseId" [categoryId]="categoryId" [displayNavButtons]="showCalendar" (onEventClicked)="gotoEvent($event)" (onDayClicked)="gotoDay($event)"></addon-calendar-calendar>
+    <addon-calendar-calendar [hidden]="!showCalendar" [initialYear]="year" [initialMonth]="month" [filter]="filter" [displayNavButtons]="showCalendar" (onEventClicked)="gotoEvent($event)" (onDayClicked)="gotoDay($event)"></addon-calendar-calendar>
 
-    <addon-calendar-upcoming-events *ngIf="loadUpcoming" [hidden]="showCalendar" [courseId]="courseId" [categoryId]="categoryId" (onEventClicked)="gotoEvent($event)"></addon-calendar-upcoming-events>
+    <addon-calendar-upcoming-events *ngIf="loadUpcoming" [hidden]="showCalendar" [filter]="filter" (onEventClicked)="gotoEvent($event)"></addon-calendar-upcoming-events>
 
     <!-- Create a calendar event. -->
     <ion-fab core-fab bottom end *ngIf="canCreate">
diff --git a/src/addon/calendar/pages/index/index.ts b/src/addon/calendar/pages/index/index.ts
index 6ab4a88ba..4fad22e36 100644
--- a/src/addon/calendar/pages/index/index.ts
+++ b/src/addon/calendar/pages/index/index.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Component, OnInit, OnDestroy, ViewChild, NgZone } from '@angular/core';
-import { IonicPage, NavParams, NavController } from 'ionic-angular';
+import { IonicPage, NavParams, NavController, PopoverController } from 'ionic-angular';
 import { CoreAppProvider } from '@providers/app';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreLocalNotificationsProvider } from '@providers/local-notifications';
@@ -24,6 +24,7 @@ import { AddonCalendarOfflineProvider } from '../../providers/calendar-offline';
 import { AddonCalendarHelperProvider } from '../../providers/helper';
 import { AddonCalendarCalendarComponent } from '../../components/calendar/calendar';
 import { AddonCalendarUpcomingEventsComponent } from '../../components/upcoming-events/upcoming-events';
+import { AddonCalendarFilterPopoverComponent } from '../../components/filter/filter';
 import { AddonCalendarSyncProvider } from '../../providers/calendar-sync';
 import { CoreCoursesHelperProvider } from '@core/courses/providers/helper';
 import { Network } from '@ionic-native/network';
@@ -52,11 +53,10 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
     protected syncObserver: any;
     protected manualSyncObserver: any;
     protected onlineObserver: any;
+    protected filterChangedObserver: any;
 
     year: number;
     month: number;
-    courseId: number;
-    categoryId: number;
     canCreate = false;
     courses: any[];
     notificationsEnabled = false;
@@ -66,6 +66,7 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
     syncIcon: string;
     showCalendar = true;
     loadUpcoming = false;
+    filter = {};
 
     constructor(localNotificationsProvider: CoreLocalNotificationsProvider,
             navParams: NavParams,
@@ -80,9 +81,9 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
             private calendarSync: AddonCalendarSyncProvider,
             private eventsProvider: CoreEventsProvider,
             private coursesHelper: CoreCoursesHelperProvider,
-            private appProvider: CoreAppProvider) {
+            private appProvider: CoreAppProvider,
+            private popoverCtrl: PopoverController) {
 
-        this.courseId = navParams.get('courseId');
         this.eventId = navParams.get('eventId') || false;
         this.year = navParams.get('year');
         this.month = navParams.get('month');
@@ -91,6 +92,11 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
         this.loadUpcoming = !!navParams.get('upcoming');
         this.showCalendar = !this.loadUpcoming;
 
+        AddonCalendarProvider.ALL_TYPES.forEach((name) => {
+            this.filter[name] = true;
+        });
+        this.filter['courseId'] = navParams.get('courseId');
+
         // Listen for events added. When an event is added, reload the data.
         this.newEventObserver = eventsProvider.on(AddonCalendarProvider.NEW_EVENT_EVENT, (data) => {
             if (data && data.event) {
@@ -140,6 +146,15 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
             });
         }, this.currentSiteId);
 
+        this.filterChangedObserver = this.eventsProvider.on(AddonCalendarProvider.FILTER_CHANGED_EVENT, (data) => {
+            this.filter = data;
+
+            // Course viewed has changed, check if the user can create events for this course calendar.
+            this.calendarHelper.canEditEvents(this.filter['courseId']).then((canEdit) => {
+                this.canCreate = canEdit;
+            });
+        });
+
         // Refresh online status when changes.
         this.onlineObserver = network.onchange().subscribe(() => {
             // Execute the callback in the Angular zone, so change detection doesn't stop working.
@@ -203,13 +218,12 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
             this.hasOffline = false;
 
             // Load courses for the popover.
-            promises.push(this.coursesHelper.getCoursesForPopover(this.courseId).then((data) => {
+            promises.push(this.coursesHelper.getCoursesForPopover(this.filter['courseId']).then((data) => {
                 this.courses = data.courses;
-                this.categoryId = data.categoryId;
             }));
 
             // Check if user can create events.
-            promises.push(this.calendarHelper.canEditEvents(this.courseId).then((canEdit) => {
+            promises.push(this.calendarHelper.canEditEvents(this.filter['courseId']).then((canEdit) => {
                 this.canCreate = canEdit;
             }));
 
@@ -301,8 +315,8 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
             year: data.year
         };
 
-        if (this.courseId) {
-            params.courseId = this.courseId;
+        if (this.filter['courseId']) {
+            params.courseId = this.filter['courseId'];
         }
 
         this.navCtrl.push('AddonCalendarDayPage', params);
@@ -313,17 +327,14 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
      *
      * @param event Event.
      */
-    openCourseFilter(event: MouseEvent): void {
-        this.coursesHelper.selectCourse(event, this.courses, this.courseId).then((result) => {
-            if (typeof result.courseId != 'undefined') {
-                this.courseId = result.courseId > 0 ? result.courseId : undefined;
-                this.categoryId = result.courseId > 0 ? result.categoryId : undefined;
+    openFilter(event: MouseEvent): void {
+        const popover = this.popoverCtrl.create(AddonCalendarFilterPopoverComponent, {
+            courses: this.courses,
+            filter: this.filter
+        });
 
-                // Course viewed has changed, check if the user can create events for this course calendar.
-                this.calendarHelper.canEditEvents(this.courseId).then((canEdit) => {
-                    this.canCreate = canEdit;
-                });
-            }
+        popover.present({
+            ev: event
         });
     }
 
@@ -338,8 +349,8 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
         if (eventId) {
             params.eventId = eventId;
         }
-        if (this.courseId) {
-            params.courseId = this.courseId;
+        if (this.filter['courseId']) {
+            params.courseId = this.filter['courseId'];
         }
 
         this.navCtrl.push('AddonCalendarEditEventPage', params);
@@ -374,6 +385,7 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
         this.undeleteEventObserver && this.undeleteEventObserver.off();
         this.syncObserver && this.syncObserver.off();
         this.manualSyncObserver && this.manualSyncObserver.off();
+        this.filterChangedObserver && this.filterChangedObserver.off();
         this.onlineObserver && this.onlineObserver.unsubscribe();
     }
 }
diff --git a/src/addon/calendar/pages/list/list.html b/src/addon/calendar/pages/list/list.html
index 973184953..9f5e4178f 100644
--- a/src/addon/calendar/pages/list/list.html
+++ b/src/addon/calendar/pages/list/list.html
@@ -2,9 +2,9 @@
     <ion-navbar core-back-button>
         <ion-title>{{ 'addon.calendar.calendarevents' | translate }}</ion-title>
         <ion-buttons end>
-            <button *ngIf="courses && courses.length" ion-button icon-only (click)="openCourseFilter($event)" [attr.aria-label]="'core.courses.filter' | translate">
-                <ion-icon name="funnel" *ngIf="courseId"></ion-icon>
-                <ion-icon name="ios-funnel-outline" *ngIf="!courseId"></ion-icon>
+            <button ion-button icon-only (click)="openFilter($event)" [attr.aria-label]="'core.filter' | translate">
+                <ion-icon name="funnel" *ngIf="filter.filtered"></ion-icon>
+                <ion-icon name="ios-funnel-outline" *ngIf="!filter.filtered"></ion-icon>
             </button>
             <core-context-menu>
                 <core-context-menu-item [hidden]="!notificationsEnabled" [priority]="600" [content]="'core.settings.settings' | translate" (action)="openSettings()" [iconAction]="'cog'"></core-context-menu-item>
diff --git a/src/addon/calendar/pages/list/list.ts b/src/addon/calendar/pages/list/list.ts
index 5a0643ae1..68195ddcf 100644
--- a/src/addon/calendar/pages/list/list.ts
+++ b/src/addon/calendar/pages/list/list.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Component, ViewChild, OnDestroy, NgZone } from '@angular/core';
-import { IonicPage, Content, NavParams, NavController } from 'ionic-angular';
+import { IonicPage, Content, NavParams, NavController, PopoverController } from 'ionic-angular';
 import { AddonCalendarProvider, AddonCalendarGetEventsEvent } from '../../providers/calendar';
 import { AddonCalendarOfflineProvider } from '../../providers/calendar-offline';
 import { AddonCalendarHelperProvider } from '../../providers/helper';
@@ -31,6 +31,7 @@ import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import * as moment from 'moment';
 import { Network } from '@ionic-native/network';
 import { CoreConstants } from '@core/constants';
+import { AddonCalendarFilterPopoverComponent } from '../../components/filter/filter';
 
 /**
  * Page that displays the list of calendar events.
@@ -51,8 +52,14 @@ export class AddonCalendarListPage implements OnDestroy {
     protected getCategories = false;
     protected categories = {};
     protected siteHomeId: number;
-    protected obsDefaultTimeChange: any;
     protected eventId: number;
+    protected currentSiteId: string;
+    protected onlineEvents: AddonCalendarGetEventsEvent[] = [];
+    protected offlineEvents = [];
+    protected deletedEvents = [];
+
+    // Observers.
+    protected obsDefaultTimeChange: any;
     protected newEventObserver: any;
     protected discardedObserver: any;
     protected editEventObserver: any;
@@ -61,10 +68,7 @@ export class AddonCalendarListPage implements OnDestroy {
     protected syncObserver: any;
     protected manualSyncObserver: any;
     protected onlineObserver: any;
-    protected currentSiteId: string;
-    protected onlineEvents: AddonCalendarGetEventsEvent[] = [];
-    protected offlineEvents = [];
-    protected deletedEvents = [];
+    protected filterChangedObserver: any;
 
     courses: any[];
     eventsLoaded = false;
@@ -73,20 +77,31 @@ export class AddonCalendarListPage implements OnDestroy {
     filteredEvents: AddonCalendarGetEventsEvent[] = [];
     canLoadMore = false;
     loadMoreError = false;
-    courseId: number;
-    categoryId: number;
     canCreate = false;
     hasOffline = false;
     isOnline = false;
     syncIcon: string; // Sync icon.
+    filter = {};
 
-    constructor(private calendarProvider: AddonCalendarProvider, navParams: NavParams,
-            private domUtils: CoreDomUtilsProvider, private coursesProvider: CoreCoursesProvider, private utils: CoreUtilsProvider,
-            private calendarHelper: AddonCalendarHelperProvider, sitesProvider: CoreSitesProvider, zone: NgZone,
-            localNotificationsProvider: CoreLocalNotificationsProvider, private coursesHelper: CoreCoursesHelperProvider,
-            private eventsProvider: CoreEventsProvider, private navCtrl: NavController, private appProvider: CoreAppProvider,
-            private calendarOffline: AddonCalendarOfflineProvider, private calendarSync: AddonCalendarSyncProvider,
-            network: Network, private timeUtils: CoreTimeUtilsProvider) {
+    constructor(
+            navParams: NavParams,
+            sitesProvider: CoreSitesProvider,
+            network: Network,
+            zone: NgZone,
+            localNotificationsProvider: CoreLocalNotificationsProvider,
+            private calendarProvider: AddonCalendarProvider,
+            private domUtils: CoreDomUtilsProvider,
+            private coursesProvider: CoreCoursesProvider,
+            private utils: CoreUtilsProvider,
+            private calendarHelper: AddonCalendarHelperProvider,
+            private coursesHelper: CoreCoursesHelperProvider,
+            private eventsProvider: CoreEventsProvider,
+            private navCtrl: NavController,
+            private appProvider: CoreAppProvider,
+            private calendarOffline: AddonCalendarOfflineProvider,
+            private calendarSync: AddonCalendarSyncProvider,
+            private timeUtils: CoreTimeUtilsProvider,
+            private popoverCtrl: PopoverController) {
 
         this.siteHomeId = sitesProvider.getCurrentSite().getSiteHomeId();
         this.notificationsEnabled = localNotificationsProvider.isAvailable();
@@ -100,7 +115,11 @@ export class AddonCalendarListPage implements OnDestroy {
         }
 
         this.eventId = navParams.get('eventId') || false;
-        this.courseId = navParams.get('courseId');
+
+        AddonCalendarProvider.ALL_TYPES.forEach((name) => {
+            this.filter[name] = true;
+        });
+        this.filter['courseId'] = navParams.get('courseId');
 
         // Listen for events added. When an event is added, reload the data.
         this.newEventObserver = eventsProvider.on(AddonCalendarProvider.NEW_EVENT_EVENT, (data) => {
@@ -198,6 +217,19 @@ export class AddonCalendarListPage implements OnDestroy {
             }
         }, this.currentSiteId);
 
+        this.filterChangedObserver = this.eventsProvider.on(AddonCalendarProvider.FILTER_CHANGED_EVENT, (data) => {
+            this.filter = data;
+
+            // Course viewed has changed, check if the user can create events for this course calendar.
+            this.calendarHelper.canEditEvents(this.filter['courseId']).then((canEdit) => {
+                this.canCreate = canEdit;
+            });
+
+            this.filterEvents();
+
+            this.domUtils.scrollToTop(this.content);
+        });
+
         // Refresh online status when changes.
         this.onlineObserver = network.onchange().subscribe(() => {
             // Execute the callback in the Angular zone, so change detection doesn't stop working.
@@ -274,14 +306,13 @@ export class AddonCalendarListPage implements OnDestroy {
 
             this.hasOffline = false;
 
-            promises.push(this.calendarHelper.canEditEvents(this.courseId).then((canEdit) => {
+            promises.push(this.calendarHelper.canEditEvents(this.filter['courseId']).then((canEdit) => {
                 this.canCreate = canEdit;
             }));
 
             // Load courses for the popover.
-            promises.push(this.coursesHelper.getCoursesForPopover(this.courseId).then((result) => {
+            promises.push(this.coursesHelper.getCoursesForPopover(this.filter['courseId']).then((result) => {
                 this.courses = result.courses;
-                this.categoryId = result.categoryId;
 
                 return this.fetchEvents(refresh);
             }));
@@ -354,7 +385,7 @@ export class AddonCalendarListPage implements OnDestroy {
                     this.onlineEvents = this.utils.mergeArraysWithoutDuplicates(this.onlineEvents, onlineEvents, 'id');
                     this.events = this.utils.mergeArraysWithoutDuplicates(this.events, events, 'id');
                 }
-                this.filteredEvents = this.getFilteredEvents();
+                this.filterEvents();
 
                 // Calculate which evemts need to display the date.
                 this.filteredEvents.forEach((event, index): any => {
@@ -398,19 +429,9 @@ export class AddonCalendarListPage implements OnDestroy {
     }
 
     /**
-     * Get filtered events.
-     *
-     * @return Filtered events.
      */
-    protected getFilteredEvents(): AddonCalendarGetEventsEvent[] {
-        if (!this.courseId) {
-            // No filter, display everything.
-            return this.events;
-        }
-
-        return this.events.filter((event) => {
-            return this.calendarHelper.shouldDisplayEvent(event, this.courseId, this.categoryId, this.categories);
-        });
+    protected filterEvents(): void {
+        this.filteredEvents = this.calendarHelper.getFilteredEvents(this.events, this.filter, this.categories);
     }
 
     /**
@@ -596,21 +617,14 @@ export class AddonCalendarListPage implements OnDestroy {
      *
      * @param event Event.
      */
-    openCourseFilter(event: MouseEvent): void {
-        this.coursesHelper.selectCourse(event, this.courses, this.courseId).then((result) => {
-            if (typeof result.courseId != 'undefined') {
-                this.courseId = result.courseId > 0 ? result.courseId : undefined;
-                this.categoryId = result.courseId > 0 ? result.categoryId : undefined;
+    openFilter(event: MouseEvent): void {
+        const popover = this.popoverCtrl.create(AddonCalendarFilterPopoverComponent, {
+            courses: this.courses,
+            filter: this.filter
+        });
 
-                // Course viewed has changed, check if the user can create events for this course calendar.
-                this.calendarHelper.canEditEvents(this.courseId).then((canEdit) => {
-                    this.canCreate = canEdit;
-                });
-
-                this.filteredEvents = this.getFilteredEvents();
-
-                this.domUtils.scrollToTop(this.content);
-            }
+        popover.present({
+            ev: event
         });
     }
 
@@ -627,8 +641,8 @@ export class AddonCalendarListPage implements OnDestroy {
         if (eventId) {
             params.eventId = eventId;
         }
-        if (this.courseId) {
-            params.courseId = this.courseId;
+        if (this.filter['courseId']) {
+            params.courseId = this.filter['courseId'];
         }
 
         this.splitviewCtrl.push('AddonCalendarEditEventPage', params);
@@ -687,6 +701,7 @@ export class AddonCalendarListPage implements OnDestroy {
         this.undeleteEventObserver && this.undeleteEventObserver.off();
         this.syncObserver && this.syncObserver.off();
         this.manualSyncObserver && this.manualSyncObserver.off();
+        this.filterChangedObserver && this.filterChangedObserver.off();
         this.onlineObserver && this.onlineObserver.unsubscribe();
     }
 }
diff --git a/src/addon/calendar/providers/calendar.ts b/src/addon/calendar/providers/calendar.ts
index cb8dd8485..ed3891a00 100644
--- a/src/addon/calendar/providers/calendar.ts
+++ b/src/addon/calendar/providers/calendar.ts
@@ -50,11 +50,17 @@ export class AddonCalendarProvider {
     static EDIT_EVENT_EVENT = 'addon_calendar_edit_event';
     static DELETED_EVENT_EVENT = 'addon_calendar_deleted_event';
     static UNDELETED_EVENT_EVENT = 'addon_calendar_undeleted_event';
+    static FILTER_CHANGED_EVENT = 'addon_calendar_filter_changed_event';
     static TYPE_CATEGORY = 'category';
     static TYPE_COURSE = 'course';
     static TYPE_GROUP = 'group';
     static TYPE_SITE = 'site';
     static TYPE_USER = 'user';
+    static ALL_TYPES = [ AddonCalendarProvider.TYPE_SITE,
+        AddonCalendarProvider.TYPE_CATEGORY,
+        AddonCalendarProvider.TYPE_COURSE,
+        AddonCalendarProvider.TYPE_GROUP,
+        AddonCalendarProvider.TYPE_USER ];
 
     static CALENDAR_TF_24 = '%H:%M'; // Calendar time in 24 hours format.
     static CALENDAR_TF_12 = '%I:%M %p'; // Calendar time in 12 hours format.
diff --git a/src/addon/calendar/providers/helper.ts b/src/addon/calendar/providers/helper.ts
index 8ff3e2810..68aa6abe1 100644
--- a/src/addon/calendar/providers/helper.ts
+++ b/src/addon/calendar/providers/helper.ts
@@ -29,8 +29,8 @@ import * as moment from 'moment';
 export class AddonCalendarHelperProvider {
     protected logger;
 
-    protected EVENTICONS = {
-        course: 'fa-university',
+    static EVENTICONS = {
+        course: 'fa-graduation-cap',
         group: 'people',
         site: 'globe',
         user: 'person',
@@ -131,7 +131,7 @@ export class AddonCalendarHelperProvider {
      * @param e Event to format.
      */
     formatEventData(e: any): void {
-        e.eventIcon = this.EVENTICONS[e.eventtype] || '';
+        e.eventIcon = AddonCalendarHelperProvider.EVENTICONS[e.eventtype] || '';
         if (!e.eventIcon) {
             e.eventIcon = this.courseProvider.getModuleIconSrc(e.modulename);
             e.moduleIcon = e.eventIcon;
@@ -309,6 +309,37 @@ export class AddonCalendarHelperProvider {
         return false;
     }
 
+    /**
+     * Filter events to be shown on the events list.
+     *
+     * @param events Events without filtering.
+     * @param filter Filter from popover.
+     * @param categories Categories indexed by ID.
+     * @return Filtered events.
+     */
+    getFilteredEvents(events: any[], filter: any, categories: any): any[] {
+        // Do not filter.
+        if (!filter.filtered) {
+            return events;
+        }
+
+        const courseId = filter.courseId ? Number(filter.courseId) : undefined;
+
+        if (!courseId || courseId < 0) {
+            // Filter only by type.
+            return events.filter((event) => {
+                return filter[event.formattedType];
+            });
+        }
+
+        const categoryId = filter.categoryId ? Number(filter.categoryId) : undefined;
+
+        return  events.filter((event) => {
+            return filter[event.formattedType] &&
+                this.shouldDisplayEvent(event, courseId, categoryId, categories);
+        });
+    }
+
     /**
      * Check if an event should be displayed based on the filter.
      *
@@ -352,8 +383,10 @@ export class AddonCalendarHelperProvider {
             return false;
         }
 
+        const eventCourse = (event.course && event.course.id) || event.courseid;
+
         // Show the event if it is from site home or if it matches the selected course.
-        return event.course && (event.course.id == this.sitesProvider.getCurrentSiteHomeId() || event.course.id == courseId);
+        return eventCourse && (eventCourse == this.sitesProvider.getCurrentSiteHomeId() || eventCourse == courseId);
     }
 
     /**
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 0258261e8..885e7adab 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -88,8 +88,10 @@
     "addon.calendar.calendarevent": "Calendar event",
     "addon.calendar.calendarevents": "Calendar events",
     "addon.calendar.calendarreminders": "Calendar reminders",
+    "addon.calendar.categoryevents": "Category events",
     "addon.calendar.confirmeventdelete": "Are you sure you want to delete the \"{{$a}}\" event?",
     "addon.calendar.confirmeventseriesdelete": "The \"{{$a.name}}\" event is part of a series. Do you want to delete just this event, or all {{$a.count}} events in the series?",
+    "addon.calendar.courseevents": "Course events",
     "addon.calendar.currentmonth": "Current Month",
     "addon.calendar.daynext": "Next day",
     "addon.calendar.dayprev": "Previous day",
@@ -113,6 +115,7 @@
     "addon.calendar.fri": "Fri",
     "addon.calendar.friday": "Friday",
     "addon.calendar.gotoactivity": "Go to activity",
+    "addon.calendar.groupevents": "Group events",
     "addon.calendar.invalidtimedurationminutes": "The duration in minutes you have entered is invalid. Please enter the duration in minutes greater than 0 or select no duration.",
     "addon.calendar.invalidtimedurationuntil": "The date and time you selected for duration until is before the start time of the event. Please correct this before proceeding.",
     "addon.calendar.mon": "Mon",
@@ -130,6 +133,7 @@
     "addon.calendar.sat": "Sat",
     "addon.calendar.saturday": "Saturday",
     "addon.calendar.setnewreminder": "Set a new reminder",
+    "addon.calendar.siteevents": "Site events",
     "addon.calendar.sun": "Sun",
     "addon.calendar.sunday": "Sunday",
     "addon.calendar.thu": "Thu",
@@ -148,6 +152,7 @@
     "addon.calendar.typesite": "Site event",
     "addon.calendar.typeuser": "User event",
     "addon.calendar.upcomingevents": "Upcoming events",
+    "addon.calendar.userevents": "User events",
     "addon.calendar.wed": "Wed",
     "addon.calendar.wednesday": "Wednesday",
     "addon.calendar.when": "When",
@@ -1517,6 +1522,7 @@
     "core.fileuploader.uploading": "Uploading",
     "core.fileuploader.uploadingperc": "Uploading: {{$a}}%",
     "core.fileuploader.video": "Video",
+    "core.filter": "Filter",
     "core.folder": "Folder",
     "core.forcepasswordchangenotice": "You must change your password to proceed.",
     "core.fulllistofcourses": "All courses",
diff --git a/src/lang/en.json b/src/lang/en.json
index 0c900b134..8a1f726e8 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -120,6 +120,7 @@
     "invalidformdata": "Incorrect form data",
     "ios": "iOS",
     "labelsep": ":",
+    "filter": "Filter",
     "lastaccess": "Last access",
     "lastdownloaded": "Last downloaded",
     "lastmodified": "Last modified",

From e4a1060a9ccfbade35168382b6555a30b75a1242 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 21 Oct 2019 17:04:36 +0200
Subject: [PATCH 113/257] MOBILE-3136 calendar: Add Calendar filter type

---
 .../calendar/components/calendar/calendar.ts  |  4 +--
 .../filter/addon-calendar-filter-popover.html |  2 +-
 .../calendar/components/filter/filter.ts      | 17 +++++++++---
 .../upcoming-events/upcoming-events.ts        |  4 +--
 src/addon/calendar/pages/day/day.ts           | 13 +++++++--
 src/addon/calendar/pages/index/index.ts       | 27 ++++++++++++-------
 src/addon/calendar/pages/list/list.ts         | 13 +++++++--
 src/addon/calendar/providers/helper.ts        | 16 ++++++++++-
 src/app/app.scss                              |  2 +-
 9 files changed, 74 insertions(+), 24 deletions(-)

diff --git a/src/addon/calendar/components/calendar/calendar.ts b/src/addon/calendar/components/calendar/calendar.ts
index 55a871937..23ffe640f 100644
--- a/src/addon/calendar/components/calendar/calendar.ts
+++ b/src/addon/calendar/components/calendar/calendar.ts
@@ -21,7 +21,7 @@ import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreTimeUtilsProvider } from '@providers/utils/time';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { AddonCalendarProvider, AddonCalendarWeek } from '../../providers/calendar';
-import { AddonCalendarHelperProvider } from '../../providers/helper';
+import { AddonCalendarHelperProvider, AddonCalendarFilter } from '../../providers/helper';
 import { AddonCalendarOfflineProvider } from '../../providers/calendar-offline';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
 import { CoreAppProvider } from '@providers/app';
@@ -36,7 +36,7 @@ import { CoreAppProvider } from '@providers/app';
 export class AddonCalendarCalendarComponent implements OnInit, OnChanges, DoCheck, OnDestroy {
     @Input() initialYear: number | string; // Initial year to load.
     @Input() initialMonth: number | string; // Initial month to load.
-    @Input() filter: any; // Filter to apply.
+    @Input() filter: AddonCalendarFilter; // Filter to apply.
     @Input() canNavigate?: string | boolean; // Whether to include arrows to change the month. Defaults to true.
     @Input() displayNavButtons?: string | boolean; // Whether to display nav buttons created by this component. Defaults to true.
     @Output() onEventClicked = new EventEmitter<number>();
diff --git a/src/addon/calendar/components/filter/addon-calendar-filter-popover.html b/src/addon/calendar/components/filter/addon-calendar-filter-popover.html
index 8de25e0db..50ad865e1 100644
--- a/src/addon/calendar/components/filter/addon-calendar-filter-popover.html
+++ b/src/addon/calendar/components/filter/addon-calendar-filter-popover.html
@@ -4,7 +4,7 @@
         <ion-label>{{ 'addon.calendar.' + type + 'events' | translate}}</ion-label>
         <ion-toggle [(ngModel)]="types[type]" (ionChange)="onChange($event)"></ion-toggle>
     </ion-item>
-    <ion-item-divider></ion-item-divider>
+    <ion-item-divider *ngIf="types.course || types.category || types.group"></ion-item-divider>
     <ion-list radio-group [(ngModel)]="courseId" *ngIf="types.course || types.category || types.group">
         <ion-item text-wrap *ngFor="let course of courses" >
             <ion-label><core-format-text [text]="course.fullname"></core-format-text></ion-label>
diff --git a/src/addon/calendar/components/filter/filter.ts b/src/addon/calendar/components/filter/filter.ts
index a2f057404..8d0d5ee0e 100644
--- a/src/addon/calendar/components/filter/filter.ts
+++ b/src/addon/calendar/components/filter/filter.ts
@@ -1,4 +1,4 @@
-// (C) Copyright 2015 Martin Dougiamas
+// (C) Copyright 2015 Moodle Pty Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,10 +16,10 @@ import { Component } from '@angular/core';
 import { NavParams } from 'ionic-angular';
 import { CoreEventsProvider } from '@providers/events';
 import { AddonCalendarProvider } from '../../providers/calendar';
-import { AddonCalendarHelperProvider } from '../../providers/helper';
+import { AddonCalendarHelperProvider, AddonCalendarFilter } from '../../providers/helper';
 
 /**
- * Component to display a list of courses.
+ * Component to display the events filter that includes events types and a list of courses.
  */
 @Component({
     selector: 'addon-calendar-filter-popover',
@@ -35,7 +35,16 @@ export class AddonCalendarFilterPopoverComponent {
 
     constructor(navParams: NavParams, protected eventsProvider: CoreEventsProvider) {
         this.courses = navParams.get('courses') || [];
-        const filter = navParams.get('filter') || {};
+        const filter: AddonCalendarFilter = navParams.get('filter') || {
+            filtered: false,
+            courseId: null,
+            categoryId: null,
+            course: true,
+            group: true,
+            site: true,
+            user: true,
+            category: true
+        };
         this.courseId = filter.courseId || -1;
 
         this.typeKeys = AddonCalendarProvider.ALL_TYPES.map((name) => {
diff --git a/src/addon/calendar/components/upcoming-events/upcoming-events.ts b/src/addon/calendar/components/upcoming-events/upcoming-events.ts
index d96c0cf25..cf0b64527 100644
--- a/src/addon/calendar/components/upcoming-events/upcoming-events.ts
+++ b/src/addon/calendar/components/upcoming-events/upcoming-events.ts
@@ -18,7 +18,7 @@ import { CoreLocalNotificationsProvider } from '@providers/local-notifications';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { AddonCalendarProvider, AddonCalendarCalendarEvent } from '../../providers/calendar';
-import { AddonCalendarHelperProvider } from '../../providers/helper';
+import { AddonCalendarHelperProvider, AddonCalendarFilter } from '../../providers/helper';
 import { AddonCalendarOfflineProvider } from '../../providers/calendar-offline';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
 import { CoreConstants } from '@core/constants';
@@ -31,7 +31,7 @@ import { CoreConstants } from '@core/constants';
     templateUrl: 'addon-calendar-upcoming-events.html',
 })
 export class AddonCalendarUpcomingEventsComponent implements OnInit, DoCheck, OnDestroy {
-    @Input() filter: any; // Filter to apply.
+    @Input() filter: AddonCalendarFilter; // Filter to apply.
     @Output() onEventClicked = new EventEmitter<number>();
 
     filteredEvents = [];
diff --git a/src/addon/calendar/pages/day/day.ts b/src/addon/calendar/pages/day/day.ts
index bcf71420f..8b195462c 100644
--- a/src/addon/calendar/pages/day/day.ts
+++ b/src/addon/calendar/pages/day/day.ts
@@ -22,7 +22,7 @@ import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreTimeUtilsProvider } from '@providers/utils/time';
 import { AddonCalendarProvider, AddonCalendarCalendarEvent } from '../../providers/calendar';
 import { AddonCalendarOfflineProvider } from '../../providers/calendar-offline';
-import { AddonCalendarHelperProvider } from '../../providers/helper';
+import { AddonCalendarHelperProvider, AddonCalendarFilter } from '../../providers/helper';
 import { AddonCalendarSyncProvider } from '../../providers/calendar-sync';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
 import { CoreCoursesHelperProvider } from '@core/courses/providers/helper';
@@ -76,7 +76,16 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
     syncIcon: string;
     isCurrentDay: boolean;
     isPastDay: boolean;
-    filter = {};
+    filter: AddonCalendarFilter = {
+        filtered: false,
+        courseId: null,
+        categoryId: null,
+        course: true,
+        group: true,
+        site: true,
+        user: true,
+        category: true
+    };
 
     constructor(localNotificationsProvider: CoreLocalNotificationsProvider,
             navParams: NavParams,
diff --git a/src/addon/calendar/pages/index/index.ts b/src/addon/calendar/pages/index/index.ts
index 4fad22e36..98fbc5316 100644
--- a/src/addon/calendar/pages/index/index.ts
+++ b/src/addon/calendar/pages/index/index.ts
@@ -21,7 +21,7 @@ import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { AddonCalendarProvider } from '../../providers/calendar';
 import { AddonCalendarOfflineProvider } from '../../providers/calendar-offline';
-import { AddonCalendarHelperProvider } from '../../providers/helper';
+import { AddonCalendarHelperProvider, AddonCalendarFilter } from '../../providers/helper';
 import { AddonCalendarCalendarComponent } from '../../components/calendar/calendar';
 import { AddonCalendarUpcomingEventsComponent } from '../../components/upcoming-events/upcoming-events';
 import { AddonCalendarFilterPopoverComponent } from '../../components/filter/filter';
@@ -66,7 +66,16 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
     syncIcon: string;
     showCalendar = true;
     loadUpcoming = false;
-    filter = {};
+    filter: AddonCalendarFilter = {
+        filtered: false,
+        courseId: null,
+        categoryId: null,
+        course: true,
+        group: true,
+        site: true,
+        user: true,
+        category: true
+    };
 
     constructor(localNotificationsProvider: CoreLocalNotificationsProvider,
             navParams: NavParams,
@@ -95,7 +104,7 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
         AddonCalendarProvider.ALL_TYPES.forEach((name) => {
             this.filter[name] = true;
         });
-        this.filter['courseId'] = navParams.get('courseId');
+        this.filter.courseId = navParams.get('courseId');
 
         // Listen for events added. When an event is added, reload the data.
         this.newEventObserver = eventsProvider.on(AddonCalendarProvider.NEW_EVENT_EVENT, (data) => {
@@ -218,12 +227,12 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
             this.hasOffline = false;
 
             // Load courses for the popover.
-            promises.push(this.coursesHelper.getCoursesForPopover(this.filter['courseId']).then((data) => {
+            promises.push(this.coursesHelper.getCoursesForPopover(this.filter.courseId).then((data) => {
                 this.courses = data.courses;
             }));
 
             // Check if user can create events.
-            promises.push(this.calendarHelper.canEditEvents(this.filter['courseId']).then((canEdit) => {
+            promises.push(this.calendarHelper.canEditEvents(this.filter.courseId).then((canEdit) => {
                 this.canCreate = canEdit;
             }));
 
@@ -315,8 +324,8 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
             year: data.year
         };
 
-        if (this.filter['courseId']) {
-            params.courseId = this.filter['courseId'];
+        if (this.filter.courseId) {
+            params.courseId = this.filter.courseId;
         }
 
         this.navCtrl.push('AddonCalendarDayPage', params);
@@ -349,8 +358,8 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
         if (eventId) {
             params.eventId = eventId;
         }
-        if (this.filter['courseId']) {
-            params.courseId = this.filter['courseId'];
+        if (this.filter.courseId) {
+            params.courseId = this.filter.courseId;
         }
 
         this.navCtrl.push('AddonCalendarEditEventPage', params);
diff --git a/src/addon/calendar/pages/list/list.ts b/src/addon/calendar/pages/list/list.ts
index 68195ddcf..a9857a2cf 100644
--- a/src/addon/calendar/pages/list/list.ts
+++ b/src/addon/calendar/pages/list/list.ts
@@ -16,7 +16,7 @@ import { Component, ViewChild, OnDestroy, NgZone } from '@angular/core';
 import { IonicPage, Content, NavParams, NavController, PopoverController } from 'ionic-angular';
 import { AddonCalendarProvider, AddonCalendarGetEventsEvent } from '../../providers/calendar';
 import { AddonCalendarOfflineProvider } from '../../providers/calendar-offline';
-import { AddonCalendarHelperProvider } from '../../providers/helper';
+import { AddonCalendarHelperProvider, AddonCalendarFilter } from '../../providers/helper';
 import { AddonCalendarSyncProvider } from '../../providers/calendar-sync';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
 import { CoreCoursesHelperProvider } from '@core/courses/providers/helper';
@@ -81,7 +81,16 @@ export class AddonCalendarListPage implements OnDestroy {
     hasOffline = false;
     isOnline = false;
     syncIcon: string; // Sync icon.
-    filter = {};
+    filter: AddonCalendarFilter = {
+        filtered: false,
+        courseId: null,
+        categoryId: null,
+        course: false,
+        group: false,
+        site: false,
+        user: false,
+        category: false
+    };
 
     constructor(
             navParams: NavParams,
diff --git a/src/addon/calendar/providers/helper.ts b/src/addon/calendar/providers/helper.ts
index 68aa6abe1..976c21431 100644
--- a/src/addon/calendar/providers/helper.ts
+++ b/src/addon/calendar/providers/helper.ts
@@ -317,7 +317,7 @@ export class AddonCalendarHelperProvider {
      * @param categories Categories indexed by ID.
      * @return Filtered events.
      */
-    getFilteredEvents(events: any[], filter: any, categories: any): any[] {
+    getFilteredEvents(events: any[], filter: AddonCalendarFilter, categories: any): any[] {
         // Do not filter.
         if (!filter.filtered) {
             return events;
@@ -515,3 +515,17 @@ export class AddonCalendarHelperProvider {
         return this.refreshAfterChangeEvents([{event: event, repeated: repeated}], siteId);
     }
 }
+
+/**
+ * Calculated data for Calendar filtering.
+ */
+export type AddonCalendarFilter = {
+    filtered: boolean; // If filter enabled (some filters applied).
+    courseId: number; // Course Id to filter.
+    categoryId: string; // Category Id to filter.
+    course: boolean, // Filter to show course events.
+    group: boolean, // Filter to show group events.
+    site: boolean, // Filter to show show site events.
+    user: boolean, // Filter to show user events.
+    category: boolean // Filter to show category events.
+};
diff --git a/src/app/app.scss b/src/app/app.scss
index 8f49c0974..d1b203b5d 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -293,7 +293,7 @@ ion-app.app-root {
 
             @include darkmode {
               background: -moz-linear-gradient(top, rgba(255, 255, 255, 0) calc(100% - 50px), $core-dark-item-bg-color calc(100% - 15px));
-              background: -webkit-gradient(left top, left bottom, color-stop(calc(100% - 50px), rgba(255, 255, 255, 0)), color-stop(calc(100% - 15px), white));
+              background: -webkit-gradient(left top, left bottom, color-stop(calc(100% - 50px), rgba(255, 255, 255, 0)), color-stop(calc(100% - 15px), $core-dark-item-bg-color));
               background: -webkit-linear-gradient(top, rgba(255, 255, 255, 0) calc(100% - 50px), $core-dark-item-bg-color calc(100% - 15px));
               background: -o-linear-gradient(top, rgba(255, 255, 255, 0) calc(100% - 50px), $core-dark-item-bg-color calc(100% - 15px));
               background: -ms-linear-gradient(top, rgba(255, 255, 255, 0) calc(100% - 50px), $core-dark-item-bg-color calc(100% - 15px));

From 77577a665ea8d840a14cce6cd31d96a62f7bd8b7 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 14 Nov 2019 12:32:19 +0100
Subject: [PATCH 114/257] MOBILE-1501 participants: Empty split view when new
 search

---
 src/core/user/components/participants/participants.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/core/user/components/participants/participants.ts b/src/core/user/components/participants/participants.ts
index 330daf791..0ace51d8d 100644
--- a/src/core/user/components/participants/participants.ts
+++ b/src/core/user/components/participants/participants.ts
@@ -187,6 +187,7 @@ export class CoreUserParticipantsComponent implements OnInit {
             this.searchQuery = query;
             this.searchPage = 0;
             this.participants = [];
+            this.splitviewCtrl.emptyDetails();
         }
 
         return this.userProvider.searchParticipants(this.courseId, query, true, this.searchPage).then((result) => {
@@ -195,9 +196,6 @@ export class CoreUserParticipantsComponent implements OnInit {
             this.canLoadMore = result.canLoadMore;
             this.searchPage++;
 
-            if (!loadMore && this.participants.length) {
-                this.gotoParticipant(this.participants[0].id);
-            }
         }).catch((error) => {
             this.domUtils.showErrorModalDefault(error, 'Error searching users.');
             this.loadMoreError = true;

From f0d38c1107d78ce94b0a78b03ca1c796bb8c3ddf Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 15 Nov 2019 10:22:16 +0100
Subject: [PATCH 115/257] MOBILE-3173 qtype: Fix dd questions broken by filters
 patch

---
 .../component/addon-qtype-ddimageortext.html  |  4 ++--
 .../ddimageortext/component/ddimageortext.ts  | 24 ++++++++++++++++++-
 .../component/addon-qtype-ddmarker.html       |  4 ++--
 .../qtype/ddmarker/component/ddmarker.ts      | 24 ++++++++++++++++++-
 .../ddwtos/component/addon-qtype-ddwtos.html  |  4 ++--
 src/addon/qtype/ddwtos/component/ddwtos.ts    | 24 ++++++++++++++++++-
 6 files changed, 75 insertions(+), 9 deletions(-)

diff --git a/src/addon/qtype/ddimageortext/component/addon-qtype-ddimageortext.html b/src/addon/qtype/ddimageortext/component/addon-qtype-ddimageortext.html
index f07233836..817b1db52 100644
--- a/src/addon/qtype/ddimageortext/component/addon-qtype-ddimageortext.html
+++ b/src/addon/qtype/ddimageortext/component/addon-qtype-ddimageortext.html
@@ -7,7 +7,7 @@
             <ion-icon name="information-circle"></ion-icon>
             {{ 'core.question.howtodraganddrop' | translate }}
         </p>
-        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text></p>
-        <core-format-text *ngIf="question.ddArea" [adaptImg]="false" [component]="component" [componentId]="componentId" [text]="question.ddArea" [filter]="false" (afterRender)="questionRendered()"></core-format-text>
+        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" (afterRender)="textRendered()"></core-format-text></p>
+        <core-format-text *ngIf="question.ddArea" [adaptImg]="false" [component]="component" [componentId]="componentId" [text]="question.ddArea" [filter]="false" (afterRender)="ddAreaRendered()"></core-format-text>
     </ion-item>
 </section>
diff --git a/src/addon/qtype/ddimageortext/component/ddimageortext.ts b/src/addon/qtype/ddimageortext/component/ddimageortext.ts
index 9574648dd..1a752bdae 100644
--- a/src/addon/qtype/ddimageortext/component/ddimageortext.ts
+++ b/src/addon/qtype/ddimageortext/component/ddimageortext.ts
@@ -30,6 +30,8 @@ export class AddonQtypeDdImageOrTextComponent extends CoreQuestionBaseComponent
     protected questionInstance: AddonQtypeDdImageOrTextQuestion;
     protected drops: any[]; // The drop zones received in the init object of the question.
     protected destroyed = false;
+    protected textIsRendered = false;
+    protected ddAreaisRendered = false;
 
     constructor(protected loggerProvider: CoreLoggerProvider, injector: Injector, element: ElementRef) {
         super(loggerProvider, 'AddonQtypeDdImageOrTextComponent', injector);
@@ -84,10 +86,30 @@ export class AddonQtypeDdImageOrTextComponent extends CoreQuestionBaseComponent
         this.question.loaded = false;
     }
 
+    /**
+     * The question ddArea has been rendered.
+     */
+    ddAreaRendered(): void {
+        this.ddAreaisRendered = true;
+        if (this.textIsRendered) {
+            this.questionRendered();
+        }
+    }
+
+    /**
+     * The question text has been rendered.
+     */
+    textRendered(): void {
+        this.textIsRendered = true;
+        if (this.ddAreaisRendered) {
+            this.questionRendered();
+        }
+    }
+
     /**
      * The question has been rendered.
      */
-    questionRendered(): void {
+    protected questionRendered(): void {
         if (!this.destroyed) {
             // Create the instance.
             this.questionInstance = new AddonQtypeDdImageOrTextQuestion(this.loggerProvider, this.domUtils, this.element,
diff --git a/src/addon/qtype/ddmarker/component/addon-qtype-ddmarker.html b/src/addon/qtype/ddmarker/component/addon-qtype-ddmarker.html
index 2284c4265..60ec70218 100644
--- a/src/addon/qtype/ddmarker/component/addon-qtype-ddmarker.html
+++ b/src/addon/qtype/ddmarker/component/addon-qtype-ddmarker.html
@@ -7,7 +7,7 @@
             <ion-icon name="information-circle"></ion-icon>
             {{ 'core.question.howtodraganddrop' | translate }}
         </p>
-        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" #questiontext [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId"></core-format-text></p>
-        <core-format-text *ngIf="question.ddArea" [adaptImg]="false" [component]="component" [componentId]="componentId" [text]="question.ddArea" [filter]="false" (afterRender)="questionRendered()"></core-format-text>
+        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" #questiontext [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" (afterRender)="textRendered()"></core-format-text></p>
+        <core-format-text *ngIf="question.ddArea" [adaptImg]="false" [component]="component" [componentId]="componentId" [text]="question.ddArea" [filter]="false" (afterRender)="ddAreaRendered()"></core-format-text>
     </ion-item>
 </section>
diff --git a/src/addon/qtype/ddmarker/component/ddmarker.ts b/src/addon/qtype/ddmarker/component/ddmarker.ts
index 0e778196c..a7d30837c 100644
--- a/src/addon/qtype/ddmarker/component/ddmarker.ts
+++ b/src/addon/qtype/ddmarker/component/ddmarker.ts
@@ -35,6 +35,8 @@ export class AddonQtypeDdMarkerComponent extends CoreQuestionBaseComponent imple
     protected dropZones: any[]; // The drop zones received in the init object of the question.
     protected imgSrc: string; // Background image URL.
     protected destroyed = false;
+    protected textIsRendered = false;
+    protected ddAreaisRendered = false;
 
     constructor(protected loggerProvider: CoreLoggerProvider, injector: Injector, element: ElementRef,
             protected sitesProvider: CoreSitesProvider, protected urlUtils: CoreUrlUtilsProvider,
@@ -101,10 +103,30 @@ export class AddonQtypeDdMarkerComponent extends CoreQuestionBaseComponent imple
         this.question.loaded = false;
     }
 
+    /**
+     * The question ddArea has been rendered.
+     */
+    ddAreaRendered(): void {
+        this.ddAreaisRendered = true;
+        if (this.textIsRendered) {
+            this.questionRendered();
+        }
+    }
+
+    /**
+     * The question text has been rendered.
+     */
+    textRendered(): void {
+        this.textIsRendered = true;
+        if (this.ddAreaisRendered) {
+            this.questionRendered();
+        }
+    }
+
     /**
      * The question has been rendered.
      */
-    questionRendered(): void {
+    protected questionRendered(): void {
         if (!this.destroyed) {
             // Download background image (3.6+ sites).
             let promise = null;
diff --git a/src/addon/qtype/ddwtos/component/addon-qtype-ddwtos.html b/src/addon/qtype/ddwtos/component/addon-qtype-ddwtos.html
index e70dcfd69..b998f2fe0 100644
--- a/src/addon/qtype/ddwtos/component/addon-qtype-ddwtos.html
+++ b/src/addon/qtype/ddwtos/component/addon-qtype-ddwtos.html
@@ -7,8 +7,8 @@
             <ion-icon name="information-circle"></ion-icon>
             {{ 'core.question.howtodraganddrop' | translate }}
         </p>
-        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" #questiontext></core-format-text></p>
-        <core-format-text *ngIf="question.answers" [component]="component" [componentId]="componentId" [text]="question.answers" [filter]="false" (afterRender)="questionRendered()"></core-format-text>
+        <p><core-format-text [component]="component" [componentId]="componentId" [text]="question.text" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" [courseId]="courseId" #questiontext (afterRender)="textRendered()"></core-format-text></p>
+        <core-format-text *ngIf="question.answers" [component]="component" [componentId]="componentId" [text]="question.answers" [filter]="false" (afterRender)="answersRendered()"></core-format-text>
         <div class="drags"></div>
     </ion-item>
 </section>
diff --git a/src/addon/qtype/ddwtos/component/ddwtos.ts b/src/addon/qtype/ddwtos/component/ddwtos.ts
index 2ad23fcc6..077677e27 100644
--- a/src/addon/qtype/ddwtos/component/ddwtos.ts
+++ b/src/addon/qtype/ddwtos/component/ddwtos.ts
@@ -31,6 +31,8 @@ export class AddonQtypeDdwtosComponent extends CoreQuestionBaseComponent impleme
     protected questionInstance: AddonQtypeDdwtosQuestion;
     protected inputIds: string[] = []; // Ids of the inputs of the question (where the answers will be stored).
     protected destroyed = false;
+    protected textIsRendered = false;
+    protected answerAreRendered = false;
 
     constructor(protected loggerProvider: CoreLoggerProvider, injector: Injector, element: ElementRef) {
         super(loggerProvider, 'AddonQtypeDdwtosComponent', injector);
@@ -85,10 +87,30 @@ export class AddonQtypeDdwtosComponent extends CoreQuestionBaseComponent impleme
         this.question.loaded = false;
     }
 
+    /**
+     * The question answers have been rendered.
+     */
+    answersRendered(): void {
+        this.answerAreRendered = true;
+        if (this.textIsRendered) {
+            this.questionRendered();
+        }
+    }
+
+    /**
+     * The question text has been rendered.
+     */
+    textRendered(): void {
+        this.textIsRendered = true;
+        if (this.answerAreRendered) {
+            this.questionRendered();
+        }
+    }
+
     /**
      * The question has been rendered.
      */
-    questionRendered(): void {
+    protected questionRendered(): void {
         if (!this.destroyed) {
             this.domUtils.waitForImages(this.questionTextEl.nativeElement).then(() => {
                 // Create the instance.

From 1507b0f84682086b9bc4185e03e3b2fbdf53e3f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 25 Oct 2019 15:48:25 +0200
Subject: [PATCH 116/257] MOBILE-3190 block_myoverview: Add 3.8 course filters
 except custom

---
 scripts/langindex.json                        |  1 +
 .../activitymodules/activitymodules.ts        |  3 +-
 .../myoverview/addon-block-myoverview.html    | 13 +--
 .../components/myoverview/myoverview.ts       | 85 ++++++++++++++-----
 src/addon/block/myoverview/lang/en.json       |  1 +
 .../recentlyaccessedcourses.ts                |  3 +-
 .../recentlyaccesseditems.ts                  |  3 +-
 .../starredcourses/starredcourses.ts          |  3 +-
 .../timeline/components/timeline/timeline.ts  |  3 +-
 src/assets/lang/en.json                       |  1 +
 .../block/classes/base-block-component.ts     | 16 ++++
 11 files changed, 97 insertions(+), 35 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index daac220eb..81bcee4e8 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -39,6 +39,7 @@
   "addon.block_glossaryrandom.pluginname": "block_glossary_random",
   "addon.block_learningplans.pluginname": "block_lp",
   "addon.block_myoverview.all": "block_myoverview",
+  "addon.block_myoverview.allincludinghidden": "block_myoverview",
   "addon.block_myoverview.favourites": "block_myoverview",
   "addon.block_myoverview.future": "block_myoverview",
   "addon.block_myoverview.hiddencourses": "block_myoverview",
diff --git a/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts b/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts
index 215ca90b5..566ddc0b8 100644
--- a/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts
+++ b/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit, Injector, Input } from '@angular/core';
-import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseModuleDelegate } from '@core/course/providers/module-delegate';
 import { CoreBlockBaseComponent } from '@core/block/classes/base-block-component';
@@ -36,7 +35,7 @@ export class AddonBlockActivityModulesComponent extends CoreBlockBaseComponent i
 
     protected fetchContentDefaultError = 'Error getting activity modules data.';
 
-    constructor(injector: Injector, protected utils: CoreUtilsProvider, protected courseProvider: CoreCourseProvider,
+    constructor(injector: Injector, protected courseProvider: CoreCourseProvider,
             protected translate: TranslateService, protected moduleDelegate: CoreCourseModuleDelegate) {
 
         super(injector, 'AddonBlockActivityModulesComponent');
diff --git a/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html
index a7043ba4d..589048b3f 100644
--- a/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -18,12 +18,13 @@
     <div padding [hidden]="showFilter || !showSelectorFilter" class="safe-padding-horizontal">
         <!-- "Time" selector. -->
         <ion-select text-start [title]="'core.show' | translate" [(ngModel)]="selectedFilter" (ngModelChange)="selectedChanged()" interface="popover" class="core-button-select">
-            <ion-option value="all">{{ 'addon.block_myoverview.all' | translate }}</ion-option>∫
-            <ion-option value="inprogress" [disabled]="disableInProgress">{{ 'addon.block_myoverview.inprogress' | translate }}</ion-option>
-            <ion-option value="future" [disabled]="disableFuture">{{ 'addon.block_myoverview.future' | translate }}</ion-option>
-            <ion-option value="past" [disabled]="disablePast">{{ 'addon.block_myoverview.past' | translate }}</ion-option>
-            <ion-option value="favourite" *ngIf="showFavourite" [disabled]="disableFavourite">{{ 'addon.block_myoverview.favourites' | translate }}</ion-option>
-            <ion-option value="hidden" *ngIf="showHidden" [disabled]="disableHidden">{{ 'addon.block_myoverview.hiddencourses' | translate }}</ion-option>
+            <ion-option value="allincludinghidden" *ngIf="showFilters.allincludinghidden != 'hidden'">{{ 'addon.block_myoverview.allincludinghidden' | translate }}</ion-option>
+            <ion-option value="all" *ngIf="showFilters.all != 'hidden'">{{ 'addon.block_myoverview.all' | translate }}</ion-option>
+            <ion-option value="inprogress" *ngIf="showFilters.inprogress != 'hidden'" [disabled]="showFilters.inprogress == 'disabled'">{{ 'addon.block_myoverview.inprogress' | translate }}</ion-option>
+            <ion-option value="future" *ngIf="showFilters.future != 'hidden'" [disabled]="showFilters.future == 'disabled'">{{ 'addon.block_myoverview.future' | translate }}</ion-option>
+            <ion-option value="past" *ngIf="showFilters.past != 'hidden'" [disabled]="showFilters.past == 'disabled'">{{ 'addon.block_myoverview.past' | translate }}</ion-option>
+            <ion-option value="favourite" *ngIf="showFilters.favourite != 'hidden'" [disabled]="showFilters.favourite == 'disabled'">{{ 'addon.block_myoverview.favourites' | translate }}</ion-option>
+            <ion-option value="hidden" *ngIf="showFilters.hidden != 'hidden'" [disabled]="showFilters.hidden == 'disabled'">{{ 'addon.block_myoverview.hiddencourses' | translate }}</ion-option>
         </ion-select>
     </div>
     <core-empty-box *ngIf="courses[selectedFilter].length == 0" image="assets/img/icons/courses.svg" [message]="'addon.block_myoverview.nocourses' | translate"></core-empty-box>
diff --git a/src/addon/block/myoverview/components/myoverview/myoverview.ts b/src/addon/block/myoverview/components/myoverview/myoverview.ts
index e6c807c13..064ddc747 100644
--- a/src/addon/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addon/block/myoverview/components/myoverview/myoverview.ts
@@ -15,7 +15,6 @@
 import { Component, OnInit, Input, OnDestroy, ViewChild, Injector, OnChanges, SimpleChange } from '@angular/core';
 import { Searchbar } from 'ionic-angular';
 import { CoreEventsProvider } from '@providers/events';
-import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreTimeUtilsProvider } from '@providers/utils/time';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
@@ -39,6 +38,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     courses = {
         filter: '',
         all: [],
+        allincludinghidden: [],
         past: [],
         inprogress: [],
         future: [],
@@ -51,24 +51,27 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     filteredCourses: any[];
     prefetchCoursesData = {
         all: {},
+        allincludinghidden: {},
         inprogress: {},
         past: {},
         future: {},
         favourite: {},
         hidden: {}
     };
+    showFilters = { // Options are show, disabled, hidden.
+        all: 'show',
+        allincludinghidden: 'show',
+        past: 'show',
+        inprogress: 'show',
+        future: 'show',
+        favourite: 'show',
+        hidden: 'show'
+    };
     showFilter = false;
-    showFavourite = false;
-    showHidden = false;
     showSelectorFilter = false;
     showSortFilter = false;
     downloadCourseEnabled: boolean;
     downloadCoursesEnabled: boolean;
-    disableInProgress = false;
-    disablePast = false;
-    disableFuture = false;
-    disableFavourite = false;
-    disableHidden = false;
 
     protected prefetchIconsInitialized = false;
     protected isDestroyed;
@@ -79,7 +82,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
 
     constructor(injector: Injector, private coursesProvider: CoreCoursesProvider,
             private courseCompletionProvider: AddonCourseCompletionProvider, private eventsProvider: CoreEventsProvider,
-            private courseHelper: CoreCourseHelperProvider, private utils: CoreUtilsProvider,
+            private courseHelper: CoreCourseHelperProvider,
             private courseOptionsDelegate: CoreCourseOptionsDelegate, private coursesHelper: CoreCoursesHelperProvider,
             private sitesProvider: CoreSitesProvider, private timeUtils: CoreTimeUtilsProvider) {
 
@@ -173,18 +176,49 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
 
             this.initCourseFilters(courses);
 
-            this.courses.filter = '';
-            this.showFilter = false;
-            this.disableInProgress = this.courses.inprogress.length === 0;
-            this.disablePast = this.courses.past.length === 0;
-            this.disableFuture = this.courses.future.length === 0;
+            const config = this.block.configs;
+
             this.showSelectorFilter = courses.length > 0 && (this.courses.past.length > 0 || this.courses.future.length > 0 ||
                    typeof courses[0].enddate != 'undefined');
-            this.showHidden = this.showSelectorFilter && typeof courses[0].hidden != 'undefined';
-            this.disableHidden = this.courses.hidden.length === 0;
-            this.showFavourite = this.showSelectorFilter && typeof courses[0].isfavourite != 'undefined';
-            this.disableFavourite = this.courses.favourite.length === 0;
-            if (!this.showSelectorFilter || (this.selectedFilter === 'inprogress' && this.disableInProgress)) {
+
+            this.courses.filter = '';
+            this.showFilter = false;
+
+            this.showFilters.all = this.getShowFilterValue(!config || config.displaygroupingall.value == '1',
+                    this.courses.all.length === 0);
+            // Do not show allincludinghiddenif config it's not present (before 3.8).
+            this.showFilters.allincludinghidden =
+                this.getShowFilterValue(config && config.displaygroupingallincludinghidden.value == '1',
+                    this.courses.allincludinghidden.length === 0);
+
+            this.showFilters.inprogress = this.getShowFilterValue(!config || config.displaygroupinginprogress.value == '1',
+                this.courses.inprogress.length === 0);
+            this.showFilters.past = this.getShowFilterValue(!config || config.displaygroupingpast.value == '1',
+                this.courses.past.length === 0);
+            this.showFilters.future = this.getShowFilterValue(!config || config.displaygroupingfuture.value == '1',
+                this.courses.future.length === 0);
+
+            this.showSelectorFilter = courses.length > 0 && (this.courses.past.length > 0 || this.courses.future.length > 0 ||
+                   typeof courses[0].enddate != 'undefined');
+
+            this.showFilters.hidden = this.getShowFilterValue(
+                this.showSelectorFilter && typeof courses[0].hidden != 'undefined' &&
+                    (!config || config.displaygroupinghidden.value == '1'),
+                this.courses.hidden.length === 0);
+
+            this.showFilters.favourite = this.getShowFilterValue(
+                this.showSelectorFilter && typeof courses[0].isfavourite != 'undefined' &&
+                    (!config || config.displaygroupingstarred.value == '1'),
+                this.courses.favourite.length === 0);
+
+            if (this.showSelectorFilter) {
+                // Check if any selector is shown and not disabled.
+                this.showSelectorFilter = Object.keys(this.showFilters).some((key) => {
+                    return this.showFilters[key] == 'show';
+                });
+            }
+
+            if (!this.showSelectorFilter || (this.selectedFilter === 'inprogress' && this.showFilters.inprogress == 'disabled')) {
                 // No selector, or the default option is disabled, show all.
                 this.selectedFilter = 'all';
             }
@@ -194,6 +228,17 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         });
     }
 
+    /**
+     * Helper function to help with filter values.
+     *
+     * @param  showCondition     If true, filter will be shown.
+     * @param  disabledCondition If true, and showCondition is also met, it will be shown as disabled.
+     * @return                   show / disabled / hidden value.
+     */
+    protected getShowFilterValue(showCondition: boolean, disabledCondition: boolean): string {
+        return showCondition ? (disabledCondition ? 'disabled' : 'show') : 'hidden';
+    }
+
     /**
      * The filter has changed.
      *
@@ -283,6 +328,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         }
 
         this.courses.all = [];
+        this.courses.allincludinghidden = [];
         this.courses.past = [];
         this.courses.inprogress = [];
         this.courses.future = [];
@@ -291,6 +337,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
 
         const today = this.timeUtils.timestamp();
         courses.forEach((course) => {
+            this.courses.allincludinghidden.push(course);
             if (course.hidden) {
                 this.courses.hidden.push(course);
             } else  {
diff --git a/src/addon/block/myoverview/lang/en.json b/src/addon/block/myoverview/lang/en.json
index 386ecd222..7f4c4ec30 100644
--- a/src/addon/block/myoverview/lang/en.json
+++ b/src/addon/block/myoverview/lang/en.json
@@ -1,4 +1,5 @@
 {
+    "allincludinghidden": "All",
     "all": "All (except hidden)",
     "favourites": "Starred",
     "future": "Future",
diff --git a/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts b/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
index 62d429f49..fd94dc7c2 100644
--- a/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
+++ b/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
@@ -14,7 +14,6 @@
 
 import { Component, OnInit, OnDestroy, Injector, Input, OnChanges, SimpleChange } from '@angular/core';
 import { CoreEventsProvider } from '@providers/events';
-import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
 import { CoreCoursesHelperProvider } from '@core/courses/providers/helper';
@@ -47,7 +46,7 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
 
     constructor(injector: Injector, private coursesProvider: CoreCoursesProvider,
             private courseCompletionProvider: AddonCourseCompletionProvider, private eventsProvider: CoreEventsProvider,
-            private courseHelper: CoreCourseHelperProvider, private utils: CoreUtilsProvider,
+            private courseHelper: CoreCourseHelperProvider,
             private courseOptionsDelegate: CoreCourseOptionsDelegate, private coursesHelper: CoreCoursesHelperProvider,
             private sitesProvider: CoreSitesProvider) {
 
diff --git a/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts b/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts
index f36f5ad74..60041df84 100644
--- a/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts
+++ b/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts
@@ -19,7 +19,6 @@ import { CoreBlockBaseComponent } from '@core/block/classes/base-block-component
 import {
     AddonBlockRecentlyAccessedItemsProvider, AddonBlockRecentlyAccessedItemsItem
 } from '../../providers/recentlyaccesseditems';
-import { CoreTextUtilsProvider } from '@providers/utils/text';
 import { CoreContentLinksHelperProvider } from '@core/contentlinks/providers/helper';
 
 /**
@@ -35,7 +34,7 @@ export class AddonBlockRecentlyAccessedItemsComponent extends CoreBlockBaseCompo
     protected fetchContentDefaultError = 'Error getting recently accessed items data.';
 
     constructor(injector: Injector, @Optional() private navCtrl: NavController,
-            private sitesProvider: CoreSitesProvider, private textUtils: CoreTextUtilsProvider,
+            private sitesProvider: CoreSitesProvider,
             private recentItemsProvider: AddonBlockRecentlyAccessedItemsProvider,
             private contentLinksHelper: CoreContentLinksHelperProvider) {
 
diff --git a/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts b/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts
index 3e02be6a5..6be095a75 100644
--- a/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts
+++ b/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts
@@ -14,7 +14,6 @@
 
 import { Component, OnInit, OnDestroy, Injector, Input, OnChanges, SimpleChange } from '@angular/core';
 import { CoreEventsProvider } from '@providers/events';
-import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
 import { CoreCoursesHelperProvider } from '@core/courses/providers/helper';
@@ -47,7 +46,7 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
 
     constructor(injector: Injector, private coursesProvider: CoreCoursesProvider,
             private courseCompletionProvider: AddonCourseCompletionProvider, private eventsProvider: CoreEventsProvider,
-            private courseHelper: CoreCourseHelperProvider, private utils: CoreUtilsProvider,
+            private courseHelper: CoreCourseHelperProvider,
             private courseOptionsDelegate: CoreCourseOptionsDelegate, private coursesHelper: CoreCoursesHelperProvider,
             private sitesProvider: CoreSitesProvider) {
 
diff --git a/src/addon/block/timeline/components/timeline/timeline.ts b/src/addon/block/timeline/components/timeline/timeline.ts
index 1fa7a3f3b..b585ede3e 100644
--- a/src/addon/block/timeline/components/timeline/timeline.ts
+++ b/src/addon/block/timeline/components/timeline/timeline.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit, Injector } from '@angular/core';
-import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreTimeUtilsProvider } from '@providers/utils/time';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
@@ -50,7 +49,7 @@ export class AddonBlockTimelineComponent extends CoreBlockBaseComponent implemen
     protected courseIds = [];
     protected fetchContentDefaultError = 'Error getting timeline data.';
 
-    constructor(injector: Injector, private coursesProvider: CoreCoursesProvider, private utils: CoreUtilsProvider,
+    constructor(injector: Injector, private coursesProvider: CoreCoursesProvider,
             private timelineProvider: AddonBlockTimelineProvider, private courseOptionsDelegate: CoreCourseOptionsDelegate,
             private coursesHelper: CoreCoursesHelperProvider, private sitesProvider: CoreSitesProvider,
             private timeUtils: CoreTimeUtilsProvider) {
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index b7de06e75..2b0523b0f 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -38,6 +38,7 @@
     "addon.block_glossaryrandom.pluginname": "Random glossary entry",
     "addon.block_learningplans.pluginname": "Learning plans",
     "addon.block_myoverview.all": "All (except hidden)",
+    "addon.block_myoverview.allincludinghidden": "All",
     "addon.block_myoverview.favourites": "Starred",
     "addon.block_myoverview.future": "Future",
     "addon.block_myoverview.hiddencourses": "Hidden",
diff --git a/src/core/block/classes/base-block-component.ts b/src/core/block/classes/base-block-component.ts
index bd2a39ff4..4562a95ce 100644
--- a/src/core/block/classes/base-block-component.ts
+++ b/src/core/block/classes/base-block-component.ts
@@ -15,6 +15,8 @@
 import { Injector, OnInit, Input } from '@angular/core';
 import { CoreLoggerProvider } from '@providers/logger';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
+import { CoreUtilsProvider } from '@providers/utils/utils';
+import { CoreTextUtilsProvider } from '@providers/utils/text';
 
 /**
  * Template class to easily create components for blocks.
@@ -31,10 +33,14 @@ export class CoreBlockBaseComponent implements OnInit {
     protected fetchContentDefaultError: string; // Default error to show when loading contents.
 
     protected domUtils: CoreDomUtilsProvider;
+    protected textUtils: CoreTextUtilsProvider;
+    protected utils: CoreUtilsProvider;
     protected logger;
 
     constructor(injector: Injector, loggerName: string = 'AddonBlockComponent') {
         this.domUtils = injector.get(CoreDomUtilsProvider);
+        this.utils = injector.get(CoreUtilsProvider);
+        this.textUtils = injector.get(CoreTextUtilsProvider);
         const loggerProvider = injector.get(CoreLoggerProvider);
         this.logger = loggerProvider.getInstance(loggerName);
     }
@@ -43,6 +49,16 @@ export class CoreBlockBaseComponent implements OnInit {
      */
     ngOnInit(): void {
         this.loaded = false;
+        if (this.block.configs && this.block.configs.length > 0) {
+            this.block.configs.map((config) => {
+                config.value = this.textUtils.parseJSON(config.value);
+
+                return config;
+            });
+
+            this.block.configs = this.utils.arrayToObject(this.block.configs, 'name');
+        }
+
         this.loadContent();
     }
 

From 1fea23253c073708f31d7ef110be43c3cd9fab7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 21 Nov 2019 15:44:36 +0100
Subject: [PATCH 117/257] MOBILE-3177 sites: Support dev versions on minimum
 version check

---
 src/providers/sites.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/providers/sites.ts b/src/providers/sites.ts
index ffde5b3d6..857a52058 100644
--- a/src/providers/sites.ts
+++ b/src/providers/sites.ts
@@ -933,7 +933,7 @@ export class CoreSitesProvider {
     protected convertVersionName(name: string): number {
         let version = 0;
 
-        const parts = name.split('.', 3);
+        const parts = name.split('-')[0].split('.', 3);
         parts.forEach((num) => {
             version = (version * 100) + Number(num);
         });

From 43c484a302e795a3e7a97e45f6ce9705b1e19fae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 21 Nov 2019 16:05:19 +0100
Subject: [PATCH 118/257] MOBILE-3136 calendar: Fix param pass to day view

---
 src/addon/calendar/pages/day/day.ts     | 8 ++++++--
 src/addon/calendar/pages/index/index.ts | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/addon/calendar/pages/day/day.ts b/src/addon/calendar/pages/day/day.ts
index 8b195462c..b48a7d84f 100644
--- a/src/addon/calendar/pages/day/day.ts
+++ b/src/addon/calendar/pages/day/day.ts
@@ -108,9 +108,13 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
         const now = new Date();
 
         AddonCalendarProvider.ALL_TYPES.forEach((name) => {
-            this.filter[name] = true;
+            this.filter[name] = navParams.get(name);
+            this.filter[name] = typeof this.filter[name] == 'undefined' ? true : this.filter[name];
         });
-        this.filter['courseId'] = navParams.get('courseId');
+        this.filter.courseId = navParams.get('courseId');
+        this.filter.categoryId = navParams.get('categoryId');
+
+        this.filter.filtered = this.filter.courseId || AddonCalendarProvider.ALL_TYPES.some((name) => !this.filter[name]);
 
         this.year = navParams.get('year') || now.getFullYear();
         this.month = navParams.get('month') || (now.getMonth() + 1);
diff --git a/src/addon/calendar/pages/index/index.ts b/src/addon/calendar/pages/index/index.ts
index 98fbc5316..6cdf432b2 100644
--- a/src/addon/calendar/pages/index/index.ts
+++ b/src/addon/calendar/pages/index/index.ts
@@ -324,9 +324,9 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy {
             year: data.year
         };
 
-        if (this.filter.courseId) {
-            params.courseId = this.filter.courseId;
-        }
+        Object.keys(this.filter).forEach((key) => {
+            params[key] = this.filter[key];
+        });
 
         this.navCtrl.push('AddonCalendarDayPage', params);
     }

From e3e559da6fd114ba096e356306b720dd2547d7dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 31 Oct 2019 12:54:21 +0100
Subject: [PATCH 119/257] MOBILE-3157 utils: Add shortcut for delete
 confirmations

---
 src/addon/calendar/pages/event/event.ts             |  5 +----
 src/addon/messages/pages/discussion/discussion.ts   |  2 +-
 src/addon/mod/choice/components/index/index.ts      |  2 +-
 src/addon/mod/data/providers/helper.ts              |  2 +-
 .../mod/workshop/pages/submission/submission.ts     |  2 +-
 src/addon/notes/components/list/list.ts             |  6 ++----
 src/components/attachments/attachments.ts           |  2 +-
 src/components/local-file/local-file.ts             |  4 ++--
 src/core/comments/pages/viewer/viewer.ts            |  4 ++--
 src/core/course/providers/helper.ts                 |  2 +-
 src/core/login/pages/sites/sites.ts                 |  4 +---
 src/providers/utils/dom.ts                          | 13 +++++++++++++
 12 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/addon/calendar/pages/event/event.ts b/src/addon/calendar/pages/event/event.ts
index 9d12d644b..4eae82b39 100644
--- a/src/addon/calendar/pages/event/event.ts
+++ b/src/addon/calendar/pages/event/event.ts
@@ -347,10 +347,7 @@ export class AddonCalendarEventPage implements OnDestroy {
         e.preventDefault();
         e.stopPropagation();
 
-        const message = this.translate.instant('core.areyousure');
-        const okText = this.translate.instant('core.delete');
-
-        this.domUtils.showConfirm(message, undefined, okText).then(() => {
+        this.domUtils.showDeleteConfirm().then(() => {
             const modal = this.domUtils.showModalLoading('core.deleting', true);
             this.calendarProvider.deleteEventReminder(id).then(() => {
                 this.calendarProvider.getEventReminders(this.eventId).then((reminders) => {
diff --git a/src/addon/messages/pages/discussion/discussion.ts b/src/addon/messages/pages/discussion/discussion.ts
index 41013c2ac..3a56f49c6 100644
--- a/src/addon/messages/pages/discussion/discussion.ts
+++ b/src/addon/messages/pages/discussion/discussion.ts
@@ -1276,7 +1276,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     deleteConversation(done?: () => void): void {
         const confirmMessage = 'addon.messages.' + (this.isSelf ? 'deleteallselfconfirm' : 'deleteallconfirm');
 
-        this.domUtils.showConfirm(this.translate.instant(confirmMessage)).then(() => {
+        this.domUtils.showDeleteConfirm(confirmMessage).then(() => {
             this.deleteIcon = 'spinner';
 
             return this.messagesProvider.deleteConversation(this.conversation.id).then(() => {
diff --git a/src/addon/mod/choice/components/index/index.ts b/src/addon/mod/choice/components/index/index.ts
index 66ed10c60..6423f5439 100644
--- a/src/addon/mod/choice/components/index/index.ts
+++ b/src/addon/mod/choice/components/index/index.ts
@@ -372,7 +372,7 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
      * Delete options selected.
      */
     delete(): void {
-        this.domUtils.showConfirm(this.translate.instant('core.areyousure')).then(() => {
+        this.domUtils.showDeleteConfirm().then(() => {
             const modal = this.domUtils.showModalLoading('core.sending', true);
             this.choiceProvider.deleteResponses(this.choice.id, this.choice.name, this.courseId).then(() => {
                 this.domUtils.scrollToTop(this.content);
diff --git a/src/addon/mod/data/providers/helper.ts b/src/addon/mod/data/providers/helper.ts
index 9381d2c6b..f59e62e5d 100644
--- a/src/addon/mod/data/providers/helper.ts
+++ b/src/addon/mod/data/providers/helper.ts
@@ -645,7 +645,7 @@ export class AddonModDataHelperProvider {
     showDeleteEntryModal(dataId: number, entryId: number, courseId?: number, siteId?: string): void {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
 
-        this.domUtils.showConfirm(this.translate.instant('addon.mod_data.confirmdeleterecord')).then(() => {
+        this.domUtils.showDeleteConfirm('addon.mod_data.confirmdeleterecord').then(() => {
             const modal = this.domUtils.showModalLoading();
 
             return this.getActivityCourseIdIfNotSet(dataId, courseId, siteId).then((courseId) => {
diff --git a/src/addon/mod/workshop/pages/submission/submission.ts b/src/addon/mod/workshop/pages/submission/submission.ts
index db25df347..464b2e3e3 100644
--- a/src/addon/mod/workshop/pages/submission/submission.ts
+++ b/src/addon/mod/workshop/pages/submission/submission.ts
@@ -461,7 +461,7 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
      * Perform the submission delete action.
      */
     deleteSubmission(): void {
-        this.domUtils.showConfirm(this.translate.instant('addon.mod_workshop.submissiondeleteconfirm')).then(() => {
+        this.domUtils.showDeleteConfirm('addon.mod_workshop.submissiondeleteconfirm').then(() => {
             const modal = this.domUtils.showModalLoading('core.deleting', true);
             let success = false;
             this.workshopProvider.deleteSubmission(this.workshopId, this.submissionId, this.courseId).then(() => {
diff --git a/src/addon/notes/components/list/list.ts b/src/addon/notes/components/list/list.ts
index 843ff1c39..f242bcc31 100644
--- a/src/addon/notes/components/list/list.ts
+++ b/src/addon/notes/components/list/list.ts
@@ -14,7 +14,6 @@
 
 import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { Content, ModalController } from 'ionic-angular';
-import { TranslateService } from '@ngx-translate/core';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
@@ -55,8 +54,7 @@ export class AddonNotesListComponent implements OnInit, OnDestroy {
     constructor(private domUtils: CoreDomUtilsProvider, private textUtils: CoreTextUtilsProvider,
             sitesProvider: CoreSitesProvider, eventsProvider: CoreEventsProvider, private modalCtrl: ModalController,
             private notesProvider: AddonNotesProvider, private notesSync: AddonNotesSyncProvider,
-            private userProvider: CoreUserProvider, private translate: TranslateService,
-            private notesOffline: AddonNotesOfflineProvider) {
+            private userProvider: CoreUserProvider, private notesOffline: AddonNotesOfflineProvider) {
         // Refresh data if notes are synchronized automatically.
         this.syncObserver = eventsProvider.on(AddonNotesSyncProvider.AUTO_SYNCED, (data) => {
             if (data.courseId == this.courseId) {
@@ -211,7 +209,7 @@ export class AddonNotesListComponent implements OnInit, OnDestroy {
         e.preventDefault();
         e.stopPropagation();
 
-        this.domUtils.showConfirm(this.translate.instant('addon.notes.deleteconfirm')).then(() => {
+        this.domUtils.showDeleteConfirm('addon.notes.deleteconfirm').then(() => {
             this.notesProvider.deleteNote(note, this.courseId).then(() => {
                 this.showDelete = false;
 
diff --git a/src/components/attachments/attachments.ts b/src/components/attachments/attachments.ts
index efb6bd21e..810165c39 100644
--- a/src/components/attachments/attachments.ts
+++ b/src/components/attachments/attachments.ts
@@ -113,7 +113,7 @@ export class CoreAttachmentsComponent implements OnInit {
         let promise;
 
         if (askConfirm) {
-            promise = this.domUtils.showConfirm(this.translate.instant('core.confirmdeletefile'));
+            promise = this.domUtils.showDeleteConfirm('core.confirmdeletefile');
         } else {
             promise = Promise.resolve();
         }
diff --git a/src/components/local-file/local-file.ts b/src/components/local-file/local-file.ts
index f6ee67eaa..dc01724f1 100644
--- a/src/components/local-file/local-file.ts
+++ b/src/components/local-file/local-file.ts
@@ -172,8 +172,8 @@ export class CoreLocalFileComponent implements OnInit {
         e.stopPropagation();
 
         // Ask confirmation.
-        this.domUtils.showConfirm(this.translate.instant('core.confirmdeletefile')).then(() => {
-            const modal = this.domUtils.showModalLoading();
+        this.domUtils.showDeleteConfirm('core.confirmdeletefile').then(() => {
+            const modal = this.domUtils.showModalLoading('core.deleting', true);
 
             return this.fileProvider.removeFile(this.relativePath).then(() => {
                 this.onDelete.emit();
diff --git a/src/core/comments/pages/viewer/viewer.ts b/src/core/comments/pages/viewer/viewer.ts
index b17d39f17..07fb57a03 100644
--- a/src/core/comments/pages/viewer/viewer.ts
+++ b/src/core/comments/pages/viewer/viewer.ts
@@ -324,8 +324,8 @@ export class CoreCommentsViewerPage implements OnDestroy {
         comment.itemid = this.itemId;
         comment.area = this.area;
 
-        this.domUtils.showConfirm(this.translate.instant('core.comments.deletecommentbyon', {$a:
-                { user: comment.fullname || '', time: time } })).then(() => {
+        this.domUtils.showDeleteConfirm('core.comments.deletecommentbyon', {$a:
+                { user: comment.fullname || '', time: time } }).then(() => {
             this.commentsProvider.deleteComment(comment).then(() => {
                 this.showDelete = false;
 
diff --git a/src/core/course/providers/helper.ts b/src/core/course/providers/helper.ts
index d529e5187..1ecf7a124 100644
--- a/src/core/course/providers/helper.ts
+++ b/src/core/course/providers/helper.ts
@@ -407,7 +407,7 @@ export class CoreCourseHelperProvider {
      * @return Promise resolved when done.
      */
     confirmAndRemoveFiles(module: any, courseId: number): Promise<any> {
-        return this.domUtils.showConfirm(this.translate.instant('core.course.confirmdeletemodulefiles')).then(() => {
+        return this.domUtils.showDeleteConfirm('core.course.confirmdeletemodulefiles').then(() => {
             return this.prefetchDelegate.removeModuleFiles(module, courseId);
         }).catch((error) => {
             if (error) {
diff --git a/src/core/login/pages/sites/sites.ts b/src/core/login/pages/sites/sites.ts
index fe7cdb6d0..d8cf372fc 100644
--- a/src/core/login/pages/sites/sites.ts
+++ b/src/core/login/pages/sites/sites.ts
@@ -14,7 +14,6 @@
 
 import { Component } from '@angular/core';
 import { IonicPage } from 'ionic-angular';
-import { TranslateService } from '@ngx-translate/core';
 import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider, CoreSiteBasicInfo } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
@@ -40,7 +39,6 @@ export class CoreLoginSitesPage {
             private sitesProvider: CoreSitesProvider,
             private loginHelper: CoreLoginHelperProvider,
             logger: CoreLoggerProvider,
-            private translate: TranslateService,
             private pushNotificationsProvider: CorePushNotificationsProvider) {
         this.logger = logger.getInstance('CoreLoginSitesPage');
     }
@@ -92,7 +90,7 @@ export class CoreLoginSitesPage {
 
         this.filterProvider.formatText(siteName, {clean: true, singleLine: true, filter: false}, [], site.id).then((siteName) => {
 
-            this.domUtils.showConfirm(this.translate.instant('core.login.confirmdeletesite', { sitename: siteName })).then(() => {
+            this.domUtils.showDeleteConfirm('core.login.confirmdeletesite', { sitename: siteName }).then(() => {
                 this.sitesProvider.deleteSite(site.id).then(() => {
                     this.sites.splice(index, 1);
                     this.showDelete = false;
diff --git a/src/providers/utils/dom.ts b/src/providers/utils/dom.ts
index 7e96d421b..c8246dd1d 100644
--- a/src/providers/utils/dom.ts
+++ b/src/providers/utils/dom.ts
@@ -1194,6 +1194,19 @@ export class CoreDomUtilsProvider {
         return this.showAlert(title, message, buttonText, autocloseTime);
     }
 
+    /**
+     * Shortcut for a delete confirmation modal.
+     *
+     * @param translateMessage String key to show in the modal body translated. Default: 'core.areyousure'.
+     * @param translateArgs Arguments to pass to translate if necessary.
+     * @param options More options. See https://ionicframework.com/docs/v3/api/components/alert/AlertController/
+     * @return Promise resolved if the user confirms and rejected with a canceled error if he cancels.
+     */
+    showDeleteConfirm(translateMessage: string = 'core.areyousure', translateArgs: any = {}, options?: any): Promise<any> {
+        return this.showConfirm(this.translate.instant(translateMessage, translateArgs), undefined,
+            this.translate.instant('core.delete'), undefined, options);
+    }
+
     /**
      * Show a confirm modal.
      *

From f96b5e9b1c5f11f9d7e1811af9ba40981814cb7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 29 Oct 2019 10:59:01 +0100
Subject: [PATCH 120/257] MOBILE-3157 forum: Add delete post option

---
 scripts/langindex.json                        |   4 +
 .../mod/forum/components/components.module.ts |  10 +-
 src/addon/mod/forum/components/index/index.ts |  47 ++++---
 .../addon-forum-post-options-menu.html        |  17 +++
 .../post-options-menu/post-options-menu.ts    |  97 ++++++++++++++
 .../components/post/addon-mod-forum-post.html |  22 ++--
 src/addon/mod/forum/components/post/post.ts   | 109 +++++++++++++---
 src/addon/mod/forum/lang/en.json              |   3 +
 .../mod/forum/pages/discussion/discussion.ts  |  50 +++++---
 src/addon/mod/forum/providers/forum.ts        | 121 +++++++++++++++++-
 .../mod/forum/providers/push-click-handler.ts |   2 +-
 src/addon/mod/forum/providers/sync.ts         |   4 +-
 src/assets/lang/en.json                       |   4 +
 src/components/local-file/local-file.ts       |  10 +-
 src/lang/en.json                              |   1 +
 15 files changed, 419 insertions(+), 82 deletions(-)
 create mode 100644 src/addon/mod/forum/components/post-options-menu/addon-forum-post-options-menu.html
 create mode 100644 src/addon/mod/forum/components/post-options-menu/post-options-menu.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index daac220eb..2e3002fd5 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -572,6 +572,9 @@
   "addon.mod_forum.cannotcreatediscussion": "forum",
   "addon.mod_forum.couldnotadd": "forum",
   "addon.mod_forum.cutoffdatereached": "forum",
+  "addon.mod_forum.delete": "forum",
+  "addon.mod_forum.deletedpost": "forum",
+  "addon.mod_forum.deletesure": "forum",
   "addon.mod_forum.discussion": "forum",
   "addon.mod_forum.discussionlistsortbycreatedasc": "forum",
   "addon.mod_forum.discussionlistsortbycreateddesc": "forum",
@@ -1718,6 +1721,7 @@
   "core.nocomments": "moodle",
   "core.nograde": "moodle",
   "core.none": "moodle",
+  "core.nooptionavailable": "local_moodlemobileapp",
   "core.nopasswordchangeforced": "local_moodlemobileapp",
   "core.nopermissionerror": "local_moodlemobileapp",
   "core.nopermissions": "error",
diff --git a/src/addon/mod/forum/components/components.module.ts b/src/addon/mod/forum/components/components.module.ts
index 8b0c288d8..5a3180af3 100644
--- a/src/addon/mod/forum/components/components.module.ts
+++ b/src/addon/mod/forum/components/components.module.ts
@@ -25,12 +25,14 @@ import { CoreTagComponentsModule } from '@core/tag/components/components.module'
 import { AddonModForumIndexComponent } from './index/index';
 import { AddonModForumPostComponent } from './post/post';
 import { AddonForumDiscussionOptionsMenuComponent } from './discussion-options-menu/discussion-options-menu';
+import { AddonForumPostOptionsMenuComponent } from './post-options-menu/post-options-menu';
 
 @NgModule({
     declarations: [
         AddonModForumIndexComponent,
         AddonModForumPostComponent,
-        AddonForumDiscussionOptionsMenuComponent
+        AddonForumDiscussionOptionsMenuComponent,
+        AddonForumPostOptionsMenuComponent
     ],
     imports: [
         CommonModule,
@@ -48,11 +50,13 @@ import { AddonForumDiscussionOptionsMenuComponent } from './discussion-options-m
     exports: [
         AddonModForumIndexComponent,
         AddonModForumPostComponent,
-        AddonForumDiscussionOptionsMenuComponent
+        AddonForumDiscussionOptionsMenuComponent,
+        AddonForumPostOptionsMenuComponent
     ],
     entryComponents: [
         AddonModForumIndexComponent,
-        AddonForumDiscussionOptionsMenuComponent
+        AddonForumDiscussionOptionsMenuComponent,
+        AddonForumPostOptionsMenuComponent
     ]
 })
 export class AddonModForumComponentsModule {}
diff --git a/src/addon/mod/forum/components/index/index.ts b/src/addon/mod/forum/components/index/index.ts
index ec64d2e1f..f3c181186 100644
--- a/src/addon/mod/forum/components/index/index.ts
+++ b/src/addon/mod/forum/components/index/index.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Component, Optional, Injector, ViewChild } from '@angular/core';
-import { Content, ModalController, NavController, PopoverController } from 'ionic-angular';
+import { Content, ModalController, PopoverController } from 'ionic-angular';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreCourseModuleMainActivityComponent } from '@core/course/classes/main-activity-component';
 import { CoreCourseModulePrefetchDelegate } from '@core/course/providers/module-prefetch-delegate';
@@ -75,7 +75,6 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
 
     constructor(injector: Injector,
             @Optional() protected content: Content,
-            protected navCtrl: NavController,
             protected modalCtrl: ModalController,
             protected groupsProvider: CoreGroupsProvider,
             protected userProvider: CoreUserProvider,
@@ -110,28 +109,36 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
         this.replyObserver = this.eventsProvider.on(AddonModForumProvider.REPLY_DISCUSSION_EVENT,
                 this.eventReceived.bind(this, false));
         this.changeDiscObserver = this.eventsProvider.on(AddonModForumProvider.CHANGE_DISCUSSION_EVENT, (data) => {
-            this.forumProvider.invalidateDiscussionsList(this.forum.id).finally(() => {
-                // If it's a new discussion in tablet mode, try to open it.
-                if (data.discussionId) {
-                    // Discussion sent to server, search it in the list of discussions.
-                    const discussion = this.discussions.find((disc) => {
-                        return data.discussionId = disc.discussion;
-                    });
+            if ((this.forum && this.forum.id === data.forumId) || data.cmId === this.module.id) {
+                this.forumProvider.invalidateDiscussionsList(this.forum.id).finally(() => {
+                    if (data.discussionId) {
+                        // Discussion changed, search it in the list of discussions.
+                        const discussion = this.discussions.find((disc) => {
+                            return data.discussionId = disc.discussion;
+                        });
 
-                    if (discussion) {
-                        if (typeof data.locked != 'undefined') {
-                            discussion.locked = data.locked;
-                        }
-                        if (typeof data.pinned != 'undefined') {
-                            discussion.pinned = data.pinned;
-                        }
-                        if (typeof data.starred != 'undefined') {
-                            discussion.starred = data.starred;
+                        if (discussion) {
+                            if (typeof data.locked != 'undefined') {
+                                discussion.locked = data.locked;
+                            }
+                            if (typeof data.pinned != 'undefined') {
+                                discussion.pinned = data.pinned;
+                            }
+                            if (typeof data.starred != 'undefined') {
+                                discussion.starred = data.starred;
+                            }
                         }
                     }
 
-                }
-            });
+                    if (typeof data.deleted != 'undefined' && data.deleted) {
+                        if (data.post.parent == 0 && this.splitviewCtrl && this.splitviewCtrl.isOn()) {
+                            // Discussion deleted, clear details page.
+                            this.splitviewCtrl.emptyDetails();
+                        }
+                        this.showLoadingAndRefresh(false);
+                    }
+                });
+            }
         });
 
         // Select the current opened discussion.
diff --git a/src/addon/mod/forum/components/post-options-menu/addon-forum-post-options-menu.html b/src/addon/mod/forum/components/post-options-menu/addon-forum-post-options-menu.html
new file mode 100644
index 000000000..48d9a9d89
--- /dev/null
+++ b/src/addon/mod/forum/components/post-options-menu/addon-forum-post-options-menu.html
@@ -0,0 +1,17 @@
+<core-loading [hideUntil]="loaded" class="core-loading-center">
+    <ion-item text-wrap (click)="editPost()" *ngIf="canEdit">
+        <ion-icon name="create" item-start></ion-icon>
+        <h2>{{ 'addon.mod_forum.edit' | translate }}</h2>
+    </ion-item>
+    <ion-item text-wrap (click)="deletePost()" *ngIf="canDelete">
+        <ion-icon name="trash" item-start></ion-icon>
+        <h2 *ngIf="post.id">{{ 'addon.mod_forum.delete' | translate }}</h2>
+        <h2 *ngIf="!post.id">{{ 'core.discard' | translate }}</h2>
+    </ion-item>
+    <ion-item text-wrap (click)="dismiss()" *ngIf="wordCount">
+        <h2>{{ 'core.numwords' | translate: {'$a': wordCount} }}</h2>
+    </ion-item>
+    <ion-item text-wrap (click)="dismiss()" *ngIf="!canEdit && !canDelete && !wordCount">
+        <h2>{{ 'core.nooptionavailable' | translate }}</h2>
+    </ion-item>
+</core-loading>
diff --git a/src/addon/mod/forum/components/post-options-menu/post-options-menu.ts b/src/addon/mod/forum/components/post-options-menu/post-options-menu.ts
new file mode 100644
index 000000000..b92b8d6d8
--- /dev/null
+++ b/src/addon/mod/forum/components/post-options-menu/post-options-menu.ts
@@ -0,0 +1,97 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Component, OnInit } from '@angular/core';
+import { NavParams, ViewController } from 'ionic-angular';
+import { CoreDomUtilsProvider } from '@providers/utils/dom';
+import { AddonModForumProvider } from '../../providers/forum';
+
+/**
+ * This component is meant to display a popover with the post options.
+ */
+@Component({
+    selector: 'addon-forum-post-options-menu',
+    templateUrl: 'addon-forum-post-options-menu.html'
+})
+export class AddonForumPostOptionsMenuComponent implements OnInit {
+    post: any; // The post.
+    forumId: number; // The forum Id.
+    wordCount: number; // Number of words when available.
+    canEdit = false;
+    canDelete = false;
+    loaded = false;
+
+    constructor(navParams: NavParams,
+            protected viewCtrl: ViewController,
+            protected domUtils: CoreDomUtilsProvider,
+            protected forumProvider: AddonModForumProvider) {
+        this.post = navParams.get('post');
+        this.forumId = navParams.get('forumId');
+    }
+
+    /**
+     * Component being initialized.
+     */
+    ngOnInit(): void {
+        if (this.forumId) {
+            if (this.post.id) {
+                this.forumProvider.getDiscussionPost(this.forumId, this.post.discussion, this.post.id).then((post) => {
+                    this.canDelete = post.capabilities.delete && this.forumProvider.isDeletePostAvailable();
+                    this.canEdit = false;
+                    this.wordCount = post.wordcount;
+                }).catch((error) => {
+                    this.domUtils.showErrorModalDefault(error, 'Error getting discussion post.');
+                }).finally(() => {
+                    this.loaded = true;
+                });
+            } else {
+                // Offline post, you can edit or discard the post.
+                this.canEdit = true;
+                this.canDelete = true;
+                this.loaded = true;
+            }
+        } else {
+            this.loaded = true;
+        }
+    }
+
+    /**
+     * Close the popover.
+     */
+    dismiss(): void {
+        this.viewCtrl.dismiss();
+    }
+
+    /**
+     * Delete a post.
+     */
+    deletePost(): void {
+        if (this.post.id) {
+            this.viewCtrl.dismiss({action: 'delete'});
+        } else {
+            this.viewCtrl.dismiss({action: 'deleteoffline'});
+        }
+    }
+
+    /**
+     * Edit a post.
+     */
+    editPost(): void {
+        if (this.post.id) {
+            this.viewCtrl.dismiss({action: 'edit'});
+        } else {
+            this.viewCtrl.dismiss({action: 'editoffline'});
+        }
+    }
+}
diff --git a/src/addon/mod/forum/components/post/addon-mod-forum-post.html b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
index 87f191833..48bf2e818 100644
--- a/src/addon/mod/forum/components/post/addon-mod-forum-post.html
+++ b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
@@ -7,6 +7,9 @@
                     <core-icon name="fa-star" class="addon-forum-star" *ngIf="post.parent == 0 && !post.pinned && post.starred"></core-icon>
                     <core-format-text [text]="post.subject" contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId"></core-format-text>
                 </h2>
+                <button ion-button icon-only clear color="dark" (click)="showOptionsMenu($event)" *ngIf="optionsMenuEnabled">
+                    <core-icon name="more"></core-icon>
+                </button>
             </div>
             <div class="addon-mod-forum-post-info">
                 <ion-avatar *ngIf="post.userfullname" core-user-avatar [user]="post" item-start [courseId]="courseId"></ion-avatar>
@@ -19,12 +22,15 @@
                 <ion-note float-end padding-left text-end *ngIf="trackPosts && !post.postread" [attr.aria-label]="'addon.mod_forum.unread' | translate">
                     <core-icon name="fa-circle" color="primary"></core-icon>
                 </ion-note>
+                <button ion-button icon-only clear color="dark" (click)="showOptionsMenu($event)" *ngIf="!displaySubject && optionsMenuEnabled">
+                    <core-icon name="more"></core-icon>
+                </button>
             </div>
         </ion-item>
     </ion-card-header>
     <ion-card-content [attr.padding-top]="post.parent == 0 || null">
         <div padding-bottom *ngIf="post.isprivatereply">
-            <ion-note>{{ 'addon.mod_forum.postisprivatereply' | translate }}</ion-note>
+            <ion-note color="danger">{{ 'addon.mod_forum.postisprivatereply' | translate }}</ion-note>
         </div>
         <core-format-text [component]="component" [componentId]="componentId" [text]="post.message" contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId"></core-format-text>
         <div no-lines *ngIf="post.attachments && post.attachments.length > 0">
@@ -40,16 +46,11 @@
         <core-rating-aggregate *ngIf="forum && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="componentId" [itemId]="post.id" [courseId]="courseId" [aggregateMethod]="forum.assessed" [scaleId]="forum.scale"></core-rating-aggregate>
 
         <ion-item no-padding text-end *ngIf="post.id && post.canreply && !post.isprivatereply" class="addon-forum-reply-button">
-            <button ion-button icon-left clear small (click)="showReply()" [attr.aria-controls]="'addon-forum-reply-edit-form-' + uniqueId" [attr.aria-expanded]="replyData.replyingTo === post.id">
-                <ion-icon name="undo"></ion-icon> {{ 'addon.mod_forum.reply' | translate }}
+            <button ion-button icon-left clear small (click)="showReplyForm()" [attr.aria-controls]="'addon-forum-reply-edit-form-' + uniqueId" [attr.aria-expanded]="replyData.replyingTo === post.id">
+                <core-icon name="fa-reply"></core-icon> {{ 'addon.mod_forum.reply' | translate }}
             </button>
         </ion-item>
     </div>
-    <ion-item text-end *ngIf="!post.id && (!replyData.isEditing || replyData.replyingTo != post.parent)">
-        <button ion-button icon-left clear small (click)="editReply()" [attr.aria-controls]="'addon-forum-reply-edit-form-' + uniqueId" [attr.aria-expanded]="replyData.replyingTo === post.parent">
-            <ion-icon name="create"></ion-icon> {{ 'addon.mod_forum.edit' | translate }}
-        </button>
-    </ion-item>
 
     <ion-list [id]="'addon-forum-reply-edit-form-' + uniqueId" *ngIf="(post.id && !replyData.isEditing && replyData.replyingTo == post.id) || (!post.id && replyData.isEditing && replyData.replyingTo == post.parent)">
         <ion-item>
@@ -81,11 +82,6 @@
                     <button ion-button block color="light" (click)="cancel()">{{ 'core.cancel' | translate }}</button>
                 </ion-col>
             </ion-row>
-            <ion-row *ngIf="replyData.isEditing">
-                <ion-col>
-                    <button ion-button block color="light" (click)="discard()">{{ 'core.discard' | translate }}</button>
-                </ion-col>
-            </ion-row>
         </ion-grid>
     </ion-list>
 </div>
diff --git a/src/addon/mod/forum/components/post/post.ts b/src/addon/mod/forum/components/post/post.ts
index 74801550b..da7e383d7 100644
--- a/src/addon/mod/forum/components/post/post.ts
+++ b/src/addon/mod/forum/components/post/post.ts
@@ -14,18 +14,21 @@
 
 import { Component, Input, Output, Optional, EventEmitter, OnInit, OnDestroy } from '@angular/core';
 import { FormControl } from '@angular/forms';
-import { Content } from 'ionic-angular';
+import { Content, PopoverController } from 'ionic-angular';
 import { TranslateService } from '@ngx-translate/core';
 import { CoreFileUploaderProvider } from '@core/fileuploader/providers/fileuploader';
 import { CoreSyncProvider } from '@providers/sync';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
+import { CoreEventsProvider } from '@providers/events';
+import { CoreSitesProvider } from '@providers/sites';
 import { AddonModForumProvider } from '../../providers/forum';
 import { AddonModForumHelperProvider } from '../../providers/helper';
 import { AddonModForumOfflineProvider } from '../../providers/offline';
 import { AddonModForumSyncProvider } from '../../providers/sync';
 import { CoreRatingInfo } from '@core/rating/providers/rating';
 import { CoreTagProvider } from '@core/tag/providers/tag';
+import { AddonForumPostOptionsMenuComponent } from '../post-options-menu/post-options-menu';
 
 /**
  * Components that shows a discussion post, its attachments and the action buttons allowed (reply, etc.).
@@ -55,6 +58,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
     advanced = false; // Display all form fields.
     tagsEnabled: boolean;
     displaySubject = true;
+    optionsMenuEnabled = false;
 
     protected syncId: string;
 
@@ -69,7 +73,10 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
             private forumOffline: AddonModForumOfflineProvider,
             private forumSync: AddonModForumSyncProvider,
             private tagProvider: CoreTagProvider,
-            @Optional() private content: Content) {
+            @Optional() private content: Content,
+            protected popoverCtrl: PopoverController,
+            protected eventsProvider: CoreEventsProvider,
+            protected sitesProvider: CoreSitesProvider) {
         this.onPostChange = new EventEmitter<void>();
         this.tagsEnabled = this.tagProvider.areTagsAvailableInSite();
     }
@@ -84,10 +91,44 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
         this.displaySubject = this.post.parent == 0 ||
             (this.post.subject != this.defaultSubject && this.post.subject != 'Re: ' + this.defaultSubject &&
                 this.post.subject != reTranslated + this.defaultSubject);
+
+        this.optionsMenuEnabled = !this.post.id || (this.forumProvider.isGetDiscussionPostAvailable() &&
+                    (this.forumProvider.isDeletePostAvailable()));
     }
 
     /**
-     * Set data to new post, clearing temporary files and updating original data.
+     * Deletes an online post.
+     */
+    deletePost(): void {
+        this.domUtils.showDeleteConfirm('addon.mod_forum.deletesure').then(() => {
+            const modal = this.domUtils.showModalLoading('core.deleting', true);
+
+            this.forumProvider.deletePost(this.post.id).then((response) => {
+
+                const data = {
+                    forumId: this.forum.id,
+                    discussionId: this.discussionId,
+                    cmId: this.forum.cmid,
+                    deleted: response.status,
+                    post: this.post
+                };
+
+                this.eventsProvider.trigger(AddonModForumProvider.CHANGE_DISCUSSION_EVENT, data,
+                    this.sitesProvider.getCurrentSiteId());
+
+                this.domUtils.showToast('addon.mod_forum.deletedpost', true);
+            }).catch((error) => {
+                this.domUtils.showErrorModal(error);
+            }).finally(() => {
+                modal.dismiss();
+            });
+        }).catch((error) => {
+            // Do nothing.
+        });
+    }
+
+    /**
+     * Set data to new reply post, clearing temporary files and updating original data.
      *
      * @param replyingTo Id of post beeing replied.
      * @param isEditing True it's an offline reply beeing edited, false otherwise.
@@ -96,7 +137,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
      * @param isPrivate True if it's private reply.
      * @param files Reply attachments.
      */
-    protected setReplyData(replyingTo?: number, isEditing?: boolean, subject?: string, message?: string, files?: any[],
+    protected setReplyFormData(replyingTo?: number, isEditing?: boolean, subject?: string, message?: string, files?: any[],
             isPrivate?: boolean): void {
         // Delete the local files from the tmp folder if any.
         this.uploaderProvider.clearTmpFiles(this.replyData.files);
@@ -121,14 +162,52 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
         this.advanced = this.replyData.files.length > 0;
     }
 
+    /**
+     * Show the context menu.
+     *
+     * @param e Click Event.
+     */
+    showOptionsMenu(e: Event): void {
+        e.preventDefault();
+        e.stopPropagation();
+
+        const popover = this.popoverCtrl.create(AddonForumPostOptionsMenuComponent, {
+            post: this.post,
+            forumId: this.forum.id
+        });
+        popover.onDidDismiss((data) => {
+            if (data && data.action) {
+                switch (data.action) {
+                    case 'edit':
+                        // Not implemented.
+                        break;
+                    case 'editoffline':
+                        this.editOfflineReply();
+                        break;
+                    case 'delete':
+                        this.deletePost();
+                        break;
+                    case 'deleteoffline':
+                        this.discardOfflineReply();
+                        break;
+                    default:
+                        break;
+                }
+            }
+        });
+        popover.present({
+            ev: e
+        });
+    }
+
     /**
      * Set this post as being replied to.
      */
-    showReply(): void {
+    showReplyForm(): void {
         if (this.replyData.isEditing) {
             // User is editing a post, data needs to be resetted. Ask confirm if there is unsaved data.
             this.confirmDiscard().then(() => {
-                this.setReplyData(this.post.id);
+                this.setReplyFormData(this.post.id);
 
                 if (this.content) {
                     setTimeout(() => {
@@ -143,7 +222,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
             return;
         } else if (!this.replyData.replyingTo) {
             // User isn't replying, it's a brand new reply. Initialize the data.
-            this.setReplyData(this.post.id);
+            this.setReplyFormData(this.post.id);
         } else {
             // The post being replied has changed but the data will be kept.
             this.replyData.replyingTo = this.post.id;
@@ -162,13 +241,13 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
     /**
      * Set this post as being edited to.
      */
-    editReply(): void {
+    editOfflineReply(): void {
         // Ask confirm if there is unsaved data.
         this.confirmDiscard().then(() => {
             this.syncId = this.forumSync.getDiscussionSyncId(this.discussionId);
             this.syncProvider.blockOperation(AddonModForumProvider.COMPONENT, this.syncId);
 
-            this.setReplyData(this.post.parent, true, this.post.subject, this.post.message, this.post.attachments,
+            this.setReplyFormData(this.post.parent, true, this.post.subject, this.post.message, this.post.attachments,
                     this.post.isprivatereply);
         }).catch(() => {
             // Cancelled.
@@ -259,7 +338,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
             }
 
             // Reset data.
-            this.setReplyData();
+            this.setReplyFormData();
 
             this.onPostChange.emit();
 
@@ -279,7 +358,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
     cancel(): void {
         this.confirmDiscard().then(() => {
             // Reset data.
-            this.setReplyData();
+            this.setReplyFormData();
 
             if (this.syncId) {
                 this.syncProvider.unblockOperation(AddonModForumProvider.COMPONENT, this.syncId);
@@ -292,8 +371,8 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
     /**
      * Discard offline reply.
      */
-    discard(): void {
-        this.domUtils.showConfirm(this.translate.instant('core.areyousure')).then(() => {
+    discardOfflineReply(): void {
+        this.domUtils.showDeleteConfirm().then(() => {
             const promises = [];
 
             promises.push(this.forumOffline.deleteReply(this.post.parent));
@@ -305,7 +384,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
 
             return Promise.all(promises).finally(() => {
                 // Reset data.
-                this.setReplyData();
+                this.setReplyFormData();
 
                 this.onPostChange.emit();
 
@@ -322,7 +401,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
      * Function called when rating is updated online.
      */
     ratingUpdated(): void {
-        this.forumProvider.invalidateDiscussionPosts(this.discussionId);
+        this.forumProvider.invalidateDiscussionPosts(this.discussionId, this.forum.id);
     }
 
     /**
diff --git a/src/addon/mod/forum/lang/en.json b/src/addon/mod/forum/lang/en.json
index 29215eb9d..14c06e9b8 100644
--- a/src/addon/mod/forum/lang/en.json
+++ b/src/addon/mod/forum/lang/en.json
@@ -9,6 +9,9 @@
     "cannotcreatediscussion": "Could not create new discussion",
     "couldnotadd": "Could not add your post due to an unknown error",
     "cutoffdatereached": "The cut-off date for posting to this forum is reached so you can no longer post to it.",
+    "delete": "Delete",
+    "deletedpost": "The post has been deleted",
+    "deletesure": "Are you sure you want to delete this post?",
     "discussion": "Discussion",
     "discussionlistsortbycreatedasc": "Sort by creation date in ascending order",
     "discussionlistsortbycreateddesc": "Sort by creation date in descending order",
diff --git a/src/addon/mod/forum/pages/discussion/discussion.ts b/src/addon/mod/forum/pages/discussion/discussion.ts
index b4b5d424d..454a0147a 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.ts
+++ b/src/addon/mod/forum/pages/discussion/discussion.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { Component, Optional, OnDestroy, ViewChild, NgZone } from '@angular/core';
-import { IonicPage, NavParams, Content } from 'ionic-angular';
+import { IonicPage, NavParams, Content, NavController } from 'ionic-angular';
 import { Network } from '@ionic-native/network';
 import { TranslateService } from '@ngx-translate/core';
 import { CoreAppProvider } from '@providers/app';
@@ -46,8 +46,8 @@ export class AddonModForumDiscussionPage implements OnDestroy {
 
     courseId: number;
     discussionId: number;
-    forum: any;
-    accessInfo: any;
+    forum: any = {};
+    accessInfo: any = {};
     discussion: any;
     posts: any[];
     discussionLoaded = false;
@@ -106,7 +106,8 @@ export class AddonModForumDiscussionPage implements OnDestroy {
             private forumHelper: AddonModForumHelperProvider,
             private forumSync: AddonModForumSyncProvider,
             private ratingOffline: CoreRatingOfflineProvider,
-            @Optional() private svComponent: CoreSplitViewComponent) {
+            @Optional() private svComponent: CoreSplitViewComponent,
+            protected navCtrl: NavController) {
         this.courseId = navParams.get('courseId');
         this.cmId = navParams.get('cmId');
         this.forumId = navParams.get('forumId');
@@ -190,17 +191,32 @@ export class AddonModForumDiscussionPage implements OnDestroy {
         });
 
         this.changeDiscObserver = this.eventsProvider.on(AddonModForumProvider.CHANGE_DISCUSSION_EVENT, (data) => {
-            this.forumProvider.invalidateDiscussionsList(this.forum.id).finally(() => {
-                if (typeof data.locked != 'undefined') {
-                    this.discussion.locked = data.locked;
-                }
-                if (typeof data.pinned != 'undefined') {
-                    this.discussion.pinned = data.pinned;
-                }
-                if (typeof data.starred != 'undefined') {
-                    this.discussion.starred = data.starred;
-                }
-            });
+            if ((this.forum && this.forum.id === data.forumId) || data.cmId === this.cmId) {
+                this.forumProvider.invalidateDiscussionsList(this.forum.id).finally(() => {
+                    if (typeof data.locked != 'undefined') {
+                        this.discussion.locked = data.locked;
+                    }
+                    if (typeof data.pinned != 'undefined') {
+                        this.discussion.pinned = data.pinned;
+                    }
+                    if (typeof data.starred != 'undefined') {
+                        this.discussion.starred = data.starred;
+                    }
+
+                    if (typeof data.deleted != 'undefined' && data.deleted) {
+                        if (data.post.parent == 0) {
+                            if (this.svComponent && this.svComponent.isOn()) {
+                                this.svComponent.emptyDetails();
+                            } else {
+                                this.navCtrl.pop();
+                            }
+                        } else {
+                            this.discussionLoaded = false;
+                            this.refreshPosts();
+                        }
+                    }
+                });
+            }
         });
     }
 
@@ -358,8 +374,6 @@ export class AddonModForumDiscussionPage implements OnDestroy {
                 return Promise.all(promises);
             }).catch(() => {
                 // Ignore errors.
-                this.forum = {};
-                this.accessInfo = {};
             }).then(() => {
                 this.defaultSubject = this.translate.instant('addon.mod_forum.re') + ' ' +
                     (this.discussion ? this.discussion.subject : '');
@@ -496,7 +510,7 @@ export class AddonModForumDiscussionPage implements OnDestroy {
 
         const promises = [
             this.forumProvider.invalidateForumData(this.courseId),
-            this.forumProvider.invalidateDiscussionPosts(this.discussionId),
+            this.forumProvider.invalidateDiscussionPosts(this.discussionId, this.forumId),
             this.forumProvider.invalidateAccessInformation(this.forumId),
             this.forumProvider.invalidateCanAddDiscussion(this.forumId)
         ];
diff --git a/src/addon/mod/forum/providers/forum.ts b/src/addon/mod/forum/providers/forum.ts
index c59e5cdf7..3afc7b4c2 100644
--- a/src/addon/mod/forum/providers/forum.ts
+++ b/src/addon/mod/forum/providers/forum.ts
@@ -74,6 +74,7 @@ export class AddonModForumProvider {
 
     /**
      * Get common part of cache key for can add discussion WS calls.
+     * TODO: Use getForumDataCacheKey as a prefix.
      *
      * @param forumId Forum ID.
      * @return Cache key.
@@ -82,6 +83,38 @@ export class AddonModForumProvider {
         return this.ROOT_CACHE_KEY + 'canadddiscussion:' + forumId + ':';
     }
 
+    /**
+     * Get prefix cache key for all forum activity data WS calls.
+     *
+     * @param forumId Forum ID.
+     * @return Cache key.
+     */
+    protected getForumDataPrefixCacheKey(forumId: number): string {
+        return this.ROOT_CACHE_KEY + forumId;
+    }
+
+    /**
+     * Get cache key for discussion post data WS calls.
+     *
+     * @param forumId Forum ID.
+     * @param discussionId Discussion ID.
+     * @param postId Course ID.
+     * @return Cache key.
+     */
+    protected getDiscussionPostDataCacheKey(forumId: number, discussionId: number, postId: number): string {
+        return this.getForumDiscussionDataCacheKey(forumId, discussionId) + ':post:' + postId;
+    }
+
+    /**
+     * Get cache key for forum data WS calls.
+     *
+     * @param courseId Course ID.
+     * @return Cache key.
+     */
+    protected getForumDiscussionDataCacheKey(forumId: number, discussionId: number): string {
+         return this.getForumDataPrefixCacheKey(forumId) + ':discussion:' + discussionId;
+    }
+
     /**
      * Get cache key for forum data WS calls.
      *
@@ -94,6 +127,7 @@ export class AddonModForumProvider {
 
     /**
      * Get cache key for forum access information WS calls.
+     * TODO: Use getForumDataCacheKey as a prefix.
      *
      * @param forumId Forum ID.
      * @return Cache key.
@@ -104,6 +138,7 @@ export class AddonModForumProvider {
 
     /**
      * Get cache key for forum discussion posts WS calls.
+     * TODO: Use getForumDiscussionDataCacheKey instead.
      *
      * @param discussionId Discussion ID.
      * @return Cache key.
@@ -218,6 +253,24 @@ export class AddonModForumProvider {
         return this.canAddDiscussion(forumId, AddonModForumProvider.ALL_PARTICIPANTS);
     }
 
+    /**
+     * Delete a post.
+     *
+     * @param postId Post id.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     * @since 3.8
+     */
+    deletePost(postId: number, siteId?: string): Promise<any> {
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            const params = {
+                postid: postId
+            };
+
+            return site.write('mod_forum_delete_post', params);
+        });
+    }
+
     /**
      * Extract the starting post of a discussion from a list of posts. The post is removed from the array passed as a parameter.
      *
@@ -244,6 +297,26 @@ export class AddonModForumProvider {
         return this.sitesProvider.getCurrentSite().isVersionGreaterEqualThan(['3.1.5', '3.2.2']);
     }
 
+    /**
+     * Returns whether or not getDiscussionPost WS available or not.
+     *
+     * @return If WS is avalaible.
+     * @since 3.8
+     */
+    isGetDiscussionPostAvailable(): boolean {
+        return this.sitesProvider.wsAvailableInCurrentSite('mod_forum_get_discussion_post');
+    }
+
+    /**
+     * Returns whether or not deletePost WS available or not.
+     *
+     * @return If WS is avalaible.
+     * @since 3.8
+     */
+    isDeletePostAvailable(): boolean {
+        return this.sitesProvider.wsAvailableInCurrentSite('mod_forum_delete_post');
+    }
+
     /**
      * Format discussions, setting groupname if the discussion group is valid.
      *
@@ -306,6 +379,35 @@ export class AddonModForumProvider {
         });
     }
 
+    /**
+     * Get a particular discussion post.
+     *
+     * @param forumId Forum ID.
+     * @param discussionId Discussion ID.
+     * @param postId Post ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when the post is retrieved.
+     */
+    getDiscussionPost(forumId: number, discussionId: number, postId: number, siteId?: string): Promise<any> {
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            const params = {
+                postid: postId
+            };
+            const preSets = {
+                cacheKey: this.getDiscussionPostDataCacheKey(forumId, discussionId, postId),
+                updateFrequency: CoreSite.FREQUENCY_RARELY
+            };
+
+            return site.read('mod_forum_get_discussion_post', params, preSets).then((response) => {
+                if (response.post) {
+                    return response.post;
+                } else {
+                    return Promise.reject(null);
+                }
+            });
+        });
+    }
+
     /**
      * Get a forum by course module ID.
      *
@@ -641,7 +743,7 @@ export class AddonModForumProvider {
                     const promises = [];
 
                     response.discussions.forEach((discussion) => {
-                        promises.push(this.invalidateDiscussionPosts(discussion.discussion));
+                        promises.push(this.invalidateDiscussionPosts(discussion.discussion, forum.id));
                     });
 
                     return this.utils.allPromises(promises);
@@ -673,12 +775,19 @@ export class AddonModForumProvider {
      * Invalidates forum discussion posts.
      *
      * @param discussionId Discussion ID.
+     * @param forumId Forum ID. If not set, we can't invalidate individual post information.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the data is invalidated.
      */
-    invalidateDiscussionPosts(discussionId: number, siteId?: string): Promise<any> {
+    invalidateDiscussionPosts(discussionId: number, forumId?: number, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
-            return site.invalidateWsCacheForKey(this.getDiscussionPostsCacheKey(discussionId));
+            const promises = [site.invalidateWsCacheForKey(this.getDiscussionPostsCacheKey(discussionId))];
+
+            if (forumId) {
+                promises.push(site.invalidateWsCacheForKeyStartingWith(this.getForumDiscussionDataCacheKey(forumId, discussionId)));
+            }
+
+            return this.utils.allPromises(promises);
         });
     }
 
@@ -844,7 +953,7 @@ export class AddonModForumProvider {
      * @param discussionId DIscussion id.
      * @param locked True to lock, false to unlock.
      * @param siteId Site ID. If not defined, current site.
-     * @return Promise resvoled when done.
+     * @return Promise resolved when done.
      * @since 3.7
      */
     setLockState(forumId: number, discussionId: number, locked: boolean, siteId?: string): Promise<any> {
@@ -878,7 +987,7 @@ export class AddonModForumProvider {
      * @param discussionId Discussion id.
      * @param locked True to pin, false to unpin.
      * @param siteId Site ID. If not defined, current site.
-     * @return Promise resvoled when done.
+     * @return Promise resolved when done.
      * @since 3.7
      */
     setPinState(discussionId: number, pinned: boolean, siteId?: string): Promise<any> {
@@ -898,7 +1007,7 @@ export class AddonModForumProvider {
      * @param discussionId Discussion id.
      * @param starred True to star, false to unstar.
      * @param siteId Site ID. If not defined, current site.
-     * @return Promise resvoled when done.
+     * @return Promise resolved when done.
      * @since 3.7
      */
     toggleFavouriteState(discussionId: number, starred: boolean, siteId?: string): Promise<any> {
diff --git a/src/addon/mod/forum/providers/push-click-handler.ts b/src/addon/mod/forum/providers/push-click-handler.ts
index ce23e4f01..5d3891d81 100644
--- a/src/addon/mod/forum/providers/push-click-handler.ts
+++ b/src/addon/mod/forum/providers/push-click-handler.ts
@@ -62,7 +62,7 @@ export class AddonModForumPushClickHandler implements CorePushNotificationsClick
             pageParams.postId = Number(data.postid || contextUrlParams.urlHash.replace('p', ''));
         }
 
-        return this.forumProvider.invalidateDiscussionPosts(pageParams.discussionId, notification.site).catch(() => {
+        return this.forumProvider.invalidateDiscussionPosts(pageParams.discussionId, undefined, notification.site).catch(() => {
             // Ignore errors.
         }).then(() => {
             return this.linkHelper.goInSite(undefined, 'AddonModForumDiscussionPage', pageParams, notification.site);
diff --git a/src/addon/mod/forum/providers/sync.ts b/src/addon/mod/forum/providers/sync.ts
index a71def029..2b204df72 100644
--- a/src/addon/mod/forum/providers/sync.ts
+++ b/src/addon/mod/forum/providers/sync.ts
@@ -326,7 +326,7 @@ export class AddonModForumSyncProvider extends CoreSyncBaseProvider {
                     updated = true;
 
                     // Invalidate discussions of updated ratings.
-                    promises.push(this.forumProvider.invalidateDiscussionPosts(result.itemSet.itemSetId, siteId));
+                    promises.push(this.forumProvider.invalidateDiscussionPosts(result.itemSet.itemSetId, undefined, siteId));
                 }
                 if (result.warnings.length) {
                     // Fetch forum to construct the warning message.
@@ -502,7 +502,7 @@ export class AddonModForumSyncProvider extends CoreSyncBaseProvider {
             if (forumId) {
                 promises.push(this.forumProvider.invalidateDiscussionsList(forumId, siteId));
             }
-            promises.push(this.forumProvider.invalidateDiscussionPosts(discussionId, siteId));
+            promises.push(this.forumProvider.invalidateDiscussionPosts(discussionId, forumId, siteId));
 
             return this.utils.allPromises(promises).catch(() => {
                 // Ignore errors.
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index b7de06e75..93afb0faf 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -571,6 +571,9 @@
     "addon.mod_forum.cannotcreatediscussion": "Could not create new discussion",
     "addon.mod_forum.couldnotadd": "Could not add your post due to an unknown error",
     "addon.mod_forum.cutoffdatereached": "The cut-off date for posting to this forum is reached so you can no longer post to it.",
+    "addon.mod_forum.delete": "Delete",
+    "addon.mod_forum.deletedpost": "The post has been deleted",
+    "addon.mod_forum.deletesure": "Are you sure you want to delete this post?",
     "addon.mod_forum.discussion": "Discussion",
     "addon.mod_forum.discussionlistsortbycreatedasc": "Sort by creation date in ascending order",
     "addon.mod_forum.discussionlistsortbycreateddesc": "Sort by creation date in descending order",
@@ -1713,6 +1716,7 @@
     "core.nocomments": "No comments",
     "core.nograde": "No grade",
     "core.none": "None",
+    "core.nooptionavailable": "No option available",
     "core.nopasswordchangeforced": "You cannot proceed without changing your password.",
     "core.nopermissionerror": "Sorry, but you do not currently have permissions to do that",
     "core.nopermissions": "Sorry, but you do not currently have permissions to do that ({{$a}}).",
diff --git a/src/components/local-file/local-file.ts b/src/components/local-file/local-file.ts
index dc01724f1..e1c46b1c2 100644
--- a/src/components/local-file/local-file.ts
+++ b/src/components/local-file/local-file.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, Input, Output, OnInit, EventEmitter } from '@angular/core';
-import { TranslateService } from '@ngx-translate/core';
 import { CoreFileProvider } from '@providers/file';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreMimetypeUtilsProvider } from '@providers/utils/mimetype';
@@ -48,9 +47,12 @@ export class CoreLocalFileComponent implements OnInit {
     editMode: boolean;
     relativePath: string;
 
-    constructor(private mimeUtils: CoreMimetypeUtilsProvider, private utils: CoreUtilsProvider, private translate: TranslateService,
-            private textUtils: CoreTextUtilsProvider, private fileProvider: CoreFileProvider,
-            private domUtils: CoreDomUtilsProvider, private timeUtils: CoreTimeUtilsProvider) {
+    constructor(private mimeUtils: CoreMimetypeUtilsProvider,
+            private utils: CoreUtilsProvider,
+            private textUtils: CoreTextUtilsProvider,
+            private fileProvider: CoreFileProvider,
+            private domUtils: CoreDomUtilsProvider,
+            private timeUtils: CoreTimeUtilsProvider) {
         this.onDelete = new EventEmitter();
         this.onRename = new EventEmitter();
         this.onClick = new EventEmitter();
diff --git a/src/lang/en.json b/src/lang/en.json
index 8a1f726e8..328b287a5 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -182,6 +182,7 @@
     "notapplicable": "n/a",
     "notenrolledprofile": "This profile is not available because this user is not enrolled in this course.",
     "notice": "Notice",
+    "nooptionavailable": "No option available",
     "notingroup": "Sorry, but you need to be part of a group to see this page.",
     "notsent": "Not sent",
     "now": "now",

From 69fc9d2d842530bd838f1bdd76eda6792d9f54db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 12 Nov 2019 11:42:17 +0100
Subject: [PATCH 121/257] MOBILE-3215 style: Add styles to improve bma handling

---
 .../courses/pages/dashboard/dashboard.html    |  7 ++++--
 .../courses/pages/dashboard/dashboard.scss    | 24 +++++++++++++++++++
 src/theme/variables.scss                      |  2 +-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/core/courses/pages/dashboard/dashboard.html b/src/core/courses/pages/dashboard/dashboard.html
index 401379077..4ad0dcd61 100644
--- a/src/core/courses/pages/dashboard/dashboard.html
+++ b/src/core/courses/pages/dashboard/dashboard.html
@@ -1,6 +1,9 @@
-    <ion-header>
+<ion-header>
     <ion-navbar core-back-button>
-        <ion-title><core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text></ion-title>
+        <ion-title>
+            <core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0"></core-format-text>
+            <img src="assets/img/login_logo.png" class="core-header-logo" [alt]="siteName">
+        </ion-title>
 
         <ion-buttons end>
             <button *ngIf="searchEnabled" ion-button icon-only (click)="openSearch()" [attr.aria-label]="'core.courses.searchcourses' | translate">
diff --git a/src/core/courses/pages/dashboard/dashboard.scss b/src/core/courses/pages/dashboard/dashboard.scss
index 41e889542..c21def799 100644
--- a/src/core/courses/pages/dashboard/dashboard.scss
+++ b/src/core/courses/pages/dashboard/dashboard.scss
@@ -1,7 +1,31 @@
+$core-dashboard-logo: false !default;
+
 ion-app.app-root page-core-courses-dashboard {
+    @if $core-dashboard-logo {
+        .toolbar-title-md .core-header-logo {
+            max-height: $toolbar-md-height - 24;
+        }
+
+        .toolbar-title-ios .core-header-logo {
+            max-height: $toolbar-ios-height - 24;
+        }
+
+        .toolbar-title-wp .core-header-logo {
+            max-height: $toolbar-wp-height - 24;
+        }
+        .toolbar-title core-format-text {
+            display: none;
+        }
+    } @else {
+        .toolbar-title .core-header-logo {
+             display: none;
+        }
+    }
+
     ion-badge.core-course-download-courses-progress {
         display: block;
         @include float(start);
         @include margin(12px, 12px, null, 12px);
     }
 }
+
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index ec639ba86..ebab93935 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -30,7 +30,6 @@ $red:             #cb3d4d;
 $orange:          #f98012; // Accent (never text).
 $yellow:          #fbad1a; // Accent (never text).
 $purple:          #8e24aa; // Accent (never text).
-$core-color:      $orange;
 
 // Branded apps customization
 // --------------------------------------------------
@@ -53,6 +52,7 @@ $orange-light:    lighten($orange, 10%) !default;
 $yellow-light:    mix($yellow, white, 20%) !default;
 $yellow-dark:     mix($yellow, black, 40%) !default;
 
+$core-color:          $orange !default;
 $core-color-light:    lighten($core-color, 10%) !default;
 $core-color-dark:     darken($core-color, 10%) !default;
 

From 470abc056bb62a28e4f410465df55d25045d85ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 1 Nov 2019 09:44:48 +0100
Subject: [PATCH 122/257] MOBILE-2267 forum: Edit forum post

---
 scripts/langindex.json                        |   4 +-
 src/addon/mod/assign/lang/en.json             |   1 -
 .../index/addon-mod-forum-index.html          |   8 +-
 .../post-options-menu/post-options-menu.scss  |  11 ++
 .../post-options-menu/post-options-menu.ts    |   4 +-
 .../components/post/addon-mod-forum-post.html |  17 ++-
 src/addon/mod/forum/components/post/post.ts   |  62 +++++++-
 src/addon/mod/forum/lang/en.json              |   4 +-
 .../edit-post/addon-mod-forum-edit-post.html  |  40 +++++
 .../forum/pages/edit-post/edit-post.module.ts |  35 +++++
 .../mod/forum/pages/edit-post/edit-post.ts    | 141 ++++++++++++++++++
 src/addon/mod/forum/providers/forum.ts        |  55 ++++++-
 src/assets/lang/en.json                       |   4 +-
 src/lang/en.json                              |   1 +
 src/providers/utils/mimetype.ts               |   7 +-
 15 files changed, 366 insertions(+), 28 deletions(-)
 create mode 100644 src/addon/mod/forum/components/post-options-menu/post-options-menu.scss
 create mode 100644 src/addon/mod/forum/pages/edit-post/addon-mod-forum-edit-post.html
 create mode 100644 src/addon/mod/forum/pages/edit-post/edit-post.module.ts
 create mode 100644 src/addon/mod/forum/pages/edit-post/edit-post.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 11613e9a0..f6be29269 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -389,7 +389,6 @@
   "addon.mod_assign.numwords": "moodle",
   "addon.mod_assign.outof": "assign",
   "addon.mod_assign.overdue": "assign",
-  "addon.mod_assign.savechanges": "assign",
   "addon.mod_assign.submission": "assign",
   "addon.mod_assign.submissioneditable": "assign",
   "addon.mod_assign.submissionnoteditable": "assign",
@@ -572,6 +571,7 @@
   "addon.mod_forum.cannotadddiscussionall": "forum",
   "addon.mod_forum.cannotcreatediscussion": "forum",
   "addon.mod_forum.couldnotadd": "forum",
+  "addon.mod_forum.couldnotupdate": "forum",
   "addon.mod_forum.cutoffdatereached": "forum",
   "addon.mod_forum.delete": "forum",
   "addon.mod_forum.deletedpost": "forum",
@@ -625,6 +625,7 @@
   "addon.mod_forum.unpindiscussion": "forum",
   "addon.mod_forum.unread": "forum",
   "addon.mod_forum.unreadpostsnumber": "forum",
+  "addon.mod_forum.yourreply": "forum",
   "addon.mod_glossary.addentry": "glossary",
   "addon.mod_glossary.aliases": "glossary",
   "addon.mod_glossary.attachment": "glossary",
@@ -1792,6 +1793,7 @@
   "core.restricted": "moodle",
   "core.retry": "local_moodlemobileapp",
   "core.save": "moodle",
+  "core.savechanges": "assign",
   "core.search": "moodle",
   "core.searching": "local_moodlemobileapp",
   "core.searchresults": "moodle",
diff --git a/src/addon/mod/assign/lang/en.json b/src/addon/mod/assign/lang/en.json
index fb0908c5d..fd076f605 100644
--- a/src/addon/mod/assign/lang/en.json
+++ b/src/addon/mod/assign/lang/en.json
@@ -71,7 +71,6 @@
     "numwords": "{{$a}} words",
     "outof": "{{$a.current}} out of {{$a.total}}",
     "overdue": "<font color=\"red\">Assignment is overdue by: {{$a}}</font>",
-    "savechanges": "Save changes",
     "submissioneditable": "Student can edit this submission",
     "submissionnoteditable": "Student cannot edit this submission",
     "submissionnotsupported": "This submission is not supported by the app and may not contain all the information.",
diff --git a/src/addon/mod/forum/components/index/addon-mod-forum-index.html b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
index ecce58789..986c6da0c 100644
--- a/src/addon/mod/forum/components/index/addon-mod-forum-index.html
+++ b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
@@ -51,9 +51,11 @@
                         </div>
                         <div class="addon-mod-forum-discussion-info">
                             <ion-avatar core-user-avatar [user]="discussion" item-start [courseId]="courseId" *ngIf="discussion.userfullname"></ion-avatar>
-                            <h3 *ngIf="discussion.userfullname">{{discussion.userfullname}}</h3>
-                            <p *ngIf="discussion.groupname"><ion-icon name="people"></ion-icon> {{ discussion.groupname }}</p>
-                            <p><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</p>
+                            <div class="addon-mod-forum-discussion-author">
+                                <h3 *ngIf="discussion.userfullname">{{discussion.userfullname}}</h3>
+                                <p *ngIf="discussion.groupname"><ion-icon name="people"></ion-icon> {{ discussion.groupname }}</p>
+                                <p><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</p>
+                            </div>
                         </div>
                     </ion-item>
                 </ng-container>
diff --git a/src/addon/mod/forum/components/post-options-menu/post-options-menu.scss b/src/addon/mod/forum/components/post-options-menu/post-options-menu.scss
new file mode 100644
index 000000000..f790d9f8d
--- /dev/null
+++ b/src/addon/mod/forum/components/post-options-menu/post-options-menu.scss
@@ -0,0 +1,11 @@
+addon-forum-post-options-menu {
+    core-loading:not(.core-loading-loaded) > .core-loading-container {
+        position: relative !important;
+        padding-top: 10px !important;
+        padding-bottom: 10px !important;
+        overflow: hidden;
+    }
+    core-loading > .core-loading-container .core-loading-message {
+        display: none;
+    }
+}
\ No newline at end of file
diff --git a/src/addon/mod/forum/components/post-options-menu/post-options-menu.ts b/src/addon/mod/forum/components/post-options-menu/post-options-menu.ts
index b92b8d6d8..483c01b11 100644
--- a/src/addon/mod/forum/components/post-options-menu/post-options-menu.ts
+++ b/src/addon/mod/forum/components/post-options-menu/post-options-menu.ts
@@ -46,9 +46,9 @@ export class AddonForumPostOptionsMenuComponent implements OnInit {
     ngOnInit(): void {
         if (this.forumId) {
             if (this.post.id) {
-                this.forumProvider.getDiscussionPost(this.forumId, this.post.discussion, this.post.id).then((post) => {
+                this.forumProvider.getDiscussionPost(this.forumId, this.post.discussion, this.post.id, true).then((post) => {
                     this.canDelete = post.capabilities.delete && this.forumProvider.isDeletePostAvailable();
-                    this.canEdit = false;
+                    this.canEdit = post.capabilities.edit && this.forumProvider.isUpdatePostAvailable();
                     this.wordCount = post.wordcount;
                 }).catch((error) => {
                     this.domUtils.showErrorModalDefault(error, 'Error getting discussion post.');
diff --git a/src/addon/mod/forum/components/post/addon-mod-forum-post.html b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
index 48bf2e818..4aec682b6 100644
--- a/src/addon/mod/forum/components/post/addon-mod-forum-post.html
+++ b/src/addon/mod/forum/components/post/addon-mod-forum-post.html
@@ -7,6 +7,9 @@
                     <core-icon name="fa-star" class="addon-forum-star" *ngIf="post.parent == 0 && !post.pinned && post.starred"></core-icon>
                     <core-format-text [text]="post.subject" contextLevel="module" [contextInstanceId]="forum && forum.cmid" [courseId]="courseId"></core-format-text>
                 </h2>
+                <ion-note float-end padding-left text-end *ngIf="trackPosts && !post.postread" [attr.aria-label]="'addon.mod_forum.unread' | translate">
+                    <core-icon name="fa-circle" color="primary"></core-icon>
+                </ion-note>
                 <button ion-button icon-only clear color="dark" (click)="showOptionsMenu($event)" *ngIf="optionsMenuEnabled">
                     <core-icon name="more"></core-icon>
                 </button>
@@ -19,12 +22,14 @@
                     <p *ngIf="post.modified">{{post.modified * 1000 | coreFormatDate: "strftimerecentfull"}}</p>
                     <p *ngIf="!post.modified"><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</p>
                 </div>
-                <ion-note float-end padding-left text-end *ngIf="trackPosts && !post.postread" [attr.aria-label]="'addon.mod_forum.unread' | translate">
-                    <core-icon name="fa-circle" color="primary"></core-icon>
-                </ion-note>
-                <button ion-button icon-only clear color="dark" (click)="showOptionsMenu($event)" *ngIf="!displaySubject && optionsMenuEnabled">
-                    <core-icon name="more"></core-icon>
-                </button>
+                <ng-container *ngIf="!displaySubject">
+                    <ion-note float-end padding-left text-end *ngIf="trackPosts && !post.postread" [attr.aria-label]="'addon.mod_forum.unread' | translate">
+                        <core-icon name="fa-circle" color="primary"></core-icon>
+                    </ion-note>
+                    <button ion-button icon-only clear color="dark" (click)="showOptionsMenu($event)" *ngIf="optionsMenuEnabled">
+                        <core-icon name="more"></core-icon>
+                    </button>
+                </ng-container>
             </div>
         </ion-item>
     </ion-card-header>
diff --git a/src/addon/mod/forum/components/post/post.ts b/src/addon/mod/forum/components/post/post.ts
index da7e383d7..ced5507c8 100644
--- a/src/addon/mod/forum/components/post/post.ts
+++ b/src/addon/mod/forum/components/post/post.ts
@@ -14,7 +14,7 @@
 
 import { Component, Input, Output, Optional, EventEmitter, OnInit, OnDestroy } from '@angular/core';
 import { FormControl } from '@angular/forms';
-import { Content, PopoverController } from 'ionic-angular';
+import { Content, PopoverController, ModalController } from 'ionic-angular';
 import { TranslateService } from '@ngx-translate/core';
 import { CoreFileUploaderProvider } from '@core/fileuploader/providers/fileuploader';
 import { CoreSyncProvider } from '@providers/sync';
@@ -75,6 +75,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
             private tagProvider: CoreTagProvider,
             @Optional() private content: Content,
             protected popoverCtrl: PopoverController,
+            protected modalCtrl: ModalController,
             protected eventsProvider: CoreEventsProvider,
             protected sitesProvider: CoreSitesProvider) {
         this.onPostChange = new EventEmitter<void>();
@@ -93,7 +94,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
                 this.post.subject != reTranslated + this.defaultSubject);
 
         this.optionsMenuEnabled = !this.post.id || (this.forumProvider.isGetDiscussionPostAvailable() &&
-                    (this.forumProvider.isDeletePostAvailable()));
+                    (this.forumProvider.isDeletePostAvailable() || this.forumProvider.isUpdatePostAvailable()));
     }
 
     /**
@@ -179,7 +180,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
             if (data && data.action) {
                 switch (data.action) {
                     case 'edit':
-                        // Not implemented.
+                        this.editPost();
                         break;
                     case 'editoffline':
                         this.editOfflineReply();
@@ -200,6 +201,61 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
         });
     }
 
+    /**
+     * Shows a form modal to edit an online post.
+     */
+    editPost(): void {
+        const modal = this.modalCtrl.create('AddonModForumEditPostPage', {
+            post: this.post,
+            component: this.component,
+            componentId:  this.componentId,
+            forum: this.forum
+        });
+
+        modal.present();
+        modal.onDidDismiss((data) => {
+            if (typeof data != 'undefined') {
+                // Add some HTML to the message if needed.
+                const message = this.textUtils.formatHtmlLines(data.message);
+                const files = data.files || [];
+                const sendingModal = this.domUtils.showModalLoading('core.sending', true);
+                let promise;
+
+                // Upload attachments first if any.
+                if (files.length) {
+                    promise = this.forumHelper.uploadOrStoreReplyFiles(this.forum.id, this.post.id, files, false);
+                } else {
+                    promise = Promise.resolve();
+                }
+
+                promise.then((attach) => {
+                    const options: any = {};
+
+                    if (attach) {
+                        options.attachmentsid = attach;
+                    }
+
+                    // Try to send it to server.
+                    return this.forumProvider.updatePost(this.post.id, data.subject, message, options);
+                }).then((sent) => {
+                    if (sent && this.forum.id) {
+                        // Data sent to server, delete stored files (if any).
+                        this.forumHelper.deleteReplyStoredFiles(this.forum.id, this.post.id);
+
+                        this.onPostChange.emit();
+                        this.post.subject = data.subject;
+                        this.post.message = message;
+                        this.post.attachments = data.files;
+                    }
+                }).catch((message) => {
+                    this.domUtils.showErrorModalDefault(message, 'addon.mod_forum.couldnotupdate', true);
+                }).finally(() => {
+                    sendingModal.dismiss();
+                });
+            }
+        });
+    }
+
     /**
      * Set this post as being replied to.
      */
diff --git a/src/addon/mod/forum/lang/en.json b/src/addon/mod/forum/lang/en.json
index 14c06e9b8..ba17e36b8 100644
--- a/src/addon/mod/forum/lang/en.json
+++ b/src/addon/mod/forum/lang/en.json
@@ -8,6 +8,7 @@
     "cannotadddiscussionall": "You do not have permission to add a new discussion topic for all participants.",
     "cannotcreatediscussion": "Could not create new discussion",
     "couldnotadd": "Could not add your post due to an unknown error",
+    "couldnotupdate": "Could not update your post due to an unknown error",
     "cutoffdatereached": "The cut-off date for posting to this forum is reached so you can no longer post to it.",
     "delete": "Delete",
     "deletedpost": "The post has been deleted",
@@ -60,5 +61,6 @@
     "unlockdiscussion": "Unlock this discussion",
     "unpindiscussion": "Unpin this discussion",
     "unread": "Unread",
-    "unreadpostsnumber": "{{$a}} unread posts"
+    "unreadpostsnumber": "{{$a}} unread posts",
+    "yourreply": "Your reply"
 }
\ No newline at end of file
diff --git a/src/addon/mod/forum/pages/edit-post/addon-mod-forum-edit-post.html b/src/addon/mod/forum/pages/edit-post/addon-mod-forum-edit-post.html
new file mode 100644
index 000000000..0a934fa27
--- /dev/null
+++ b/src/addon/mod/forum/pages/edit-post/addon-mod-forum-edit-post.html
@@ -0,0 +1,40 @@
+<ion-header>
+    <ion-navbar core-back-button>
+        <ion-title>{{ 'addon.mod_forum.yourreply' | translate }}</ion-title>
+        <ion-buttons end>
+            <button ion-button icon-only (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
+                <ion-icon name="close"></ion-icon>
+            </button>
+        </ion-buttons>
+    </ion-navbar>
+</ion-header>
+<ion-content>
+    <ion-list>
+        <ion-item>
+            <ion-label stacked>{{ 'addon.mod_forum.subject' | translate }}</ion-label>
+            <ion-input type="text" [placeholder]="'addon.mod_forum.subject' | translate" [(ngModel)]="replyData.subject"></ion-input>
+        </ion-item>
+        <ion-item>
+            <ion-label stacked>{{ 'addon.mod_forum.message' | translate }}</ion-label>
+            <core-rich-text-editor item-content [control]="messageControl" (contentChanged)="onMessageChange($event)" [placeholder]="'addon.mod_forum.replyplaceholder' | translate" [name]="'mod_forum_reply_' + replyData.id" [component]="component" [componentId]="componentId"></core-rich-text-editor>
+        </ion-item>
+        <ion-item-divider text-wrap (click)="toggleAdvanced()" class="core-expandable">
+            <core-icon *ngIf="!advanced" name="fa-caret-right" item-start></core-icon>
+            <core-icon *ngIf="advanced" name="fa-caret-down" item-start></core-icon>
+            {{ 'addon.mod_forum.advanced' | translate }}
+        </ion-item-divider>
+        <ng-container *ngIf="advanced">
+            <core-attachments *ngIf="forum.id && forum.maxattachments > 0" [files]="replyData.files" [maxSize]="forum.maxbytes" [maxSubmissions]="forum.maxattachments" [component]="component" [componentId]="forum.cmid" [allowOffline]="true"></core-attachments>
+        </ng-container>
+        <ion-grid>
+            <ion-row>
+                <ion-col>
+                    <button ion-button block (click)="reply($event)" [disabled]="replyData.subject == '' || replyData.message == null">{{ 'core.savechanges' | translate }}</button>
+                </ion-col>
+                <ion-col>
+                    <button ion-button block color="light" (click)="closeModal()">{{ 'core.cancel' | translate }}</button>
+                </ion-col>
+            </ion-row>
+        </ion-grid>
+    </ion-list>
+</ion-content>
\ No newline at end of file
diff --git a/src/addon/mod/forum/pages/edit-post/edit-post.module.ts b/src/addon/mod/forum/pages/edit-post/edit-post.module.ts
new file mode 100644
index 000000000..07f409742
--- /dev/null
+++ b/src/addon/mod/forum/pages/edit-post/edit-post.module.ts
@@ -0,0 +1,35 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { TranslateModule } from '@ngx-translate/core';
+import { CoreComponentsModule } from '@components/components.module';
+import { CoreDirectivesModule } from '@directives/directives.module';
+import { AddonModForumComponentsModule } from '../../components/components.module';
+import { AddonModForumEditPostPage } from './edit-post';
+
+@NgModule({
+    declarations: [
+        AddonModForumEditPostPage,
+    ],
+    imports: [
+        CoreComponentsModule,
+        CoreDirectivesModule,
+        AddonModForumComponentsModule,
+        IonicPageModule.forChild(AddonModForumEditPostPage),
+        TranslateModule.forChild()
+    ],
+})
+export class AddonModForumEditPostPageModule {}
diff --git a/src/addon/mod/forum/pages/edit-post/edit-post.ts b/src/addon/mod/forum/pages/edit-post/edit-post.ts
new file mode 100644
index 000000000..6795c92dc
--- /dev/null
+++ b/src/addon/mod/forum/pages/edit-post/edit-post.ts
@@ -0,0 +1,141 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Component } from '@angular/core';
+import { FormControl } from '@angular/forms';
+import { IonicPage, ViewController, NavParams } from 'ionic-angular';
+import { TranslateService } from '@ngx-translate/core';
+import { CoreFileUploaderProvider } from '@core/fileuploader/providers/fileuploader';
+import { CoreDomUtilsProvider } from '@providers/utils/dom';
+import { AddonModForumProvider } from '../../providers/forum';
+import { AddonModForumHelperProvider } from '../../providers/helper';
+
+/**
+ * Page that displays a form to edit discussion post.
+ */
+@IonicPage({ segment: 'addon-mod-edit-post' })
+@Component({
+    selector: 'addon-mod-forum-edit-post',
+    templateUrl: 'addon-mod-forum-edit-post.html',
+})
+export class AddonModForumEditPostPage {
+    component: string; // Component this post belong to.
+    componentId: number; // Component ID.
+    forum: any; // The forum the post belongs to. Required for attachments and offline posts.
+
+    messageControl = new FormControl();
+    advanced = false; // Display all form fields.
+    replyData: any = {};
+    originalData: any = {}; // Object with the original post data. Usually shared between posts.
+
+    protected forceLeave = false; // To allow leaving the page without checking for changes.
+
+    constructor(
+            params: NavParams,
+            protected forumProvider: AddonModForumProvider,
+            protected viewCtrl: ViewController,
+            protected domUtils: CoreDomUtilsProvider,
+            protected uploaderProvider: CoreFileUploaderProvider,
+            protected forumHelper: AddonModForumHelperProvider,
+            protected translate: TranslateService) {
+
+        const post = params.get('post');
+        this.component = params.get('component');
+        this.componentId = params.get('componentId');
+        this.forum = params.get('forum');
+
+        this.replyData.id = post.id;
+        this.replyData.subject = post.subject;
+        this.replyData.message = post.message;
+        this.replyData.files = post.attachments || [];
+
+        // Delete the local files from the tmp folder if any.
+        this.uploaderProvider.clearTmpFiles(this.replyData.files);
+
+        // Update rich text editor.
+        this.messageControl.setValue(this.replyData.message);
+
+        // Update original data.
+        this.originalData.subject = this.replyData.subject;
+        this.originalData.message = this.replyData.message;
+        this.originalData.files = this.replyData.files.slice();
+
+        // Show advanced fields if any of them has not the default value.
+        this.advanced = this.replyData.files.length > 0;
+    }
+
+    /**
+     * Check if we can leave the page or not.
+     *
+     * @return Resolved if we can leave it, rejected if not.
+     */
+    ionViewCanLeave(): boolean | Promise<void> {
+        if (this.forceLeave) {
+            return true;
+        }
+
+        let promise: any;
+
+        if (this.forumHelper.hasPostDataChanged(this.replyData, this.originalData)) {
+            // Show confirmation if some data has been modified.
+            promise = this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
+        } else {
+            promise = Promise.resolve();
+        }
+
+        return promise.then(() => {
+            // Delete the local files from the tmp folder.
+            this.uploaderProvider.clearTmpFiles(this.replyData.files);
+        });
+    }
+
+    /**
+     * Message changed.
+     *
+     * @param text The new text.
+     */
+    onMessageChange(text: string): void {
+        this.replyData.message = text;
+    }
+
+    /**
+     * Close modal.
+     *
+     * @param data Data to return to the page.
+     */
+    closeModal(data: any): void {
+        this.viewCtrl.dismiss(data);
+    }
+
+    /**
+     * Reply to this post.
+     *
+     * @param e Click event.
+     */
+    reply(e: Event): void {
+        e.preventDefault();
+        e.stopPropagation();
+
+        // Close the modal, sending the input data.
+        this.forceLeave = true;
+        this.closeModal(this.replyData);
+    }
+
+    /**
+     * Show or hide advanced form fields.
+     */
+    toggleAdvanced(): void {
+        this.advanced = !this.advanced;
+    }
+}
diff --git a/src/addon/mod/forum/providers/forum.ts b/src/addon/mod/forum/providers/forum.ts
index 3afc7b4c2..cae8c5ac3 100644
--- a/src/addon/mod/forum/providers/forum.ts
+++ b/src/addon/mod/forum/providers/forum.ts
@@ -317,6 +317,16 @@ export class AddonModForumProvider {
         return this.sitesProvider.wsAvailableInCurrentSite('mod_forum_delete_post');
     }
 
+    /**
+     * Returns whether or not updatePost WS available or not.
+     *
+     * @return If WS is avalaible.
+     * @since 3.8
+     */
+    isUpdatePostAvailable(): boolean {
+        return this.sitesProvider.wsAvailableInCurrentSite('mod_forum_update_discussion_post');
+    }
+
     /**
      * Format discussions, setting groupname if the discussion group is valid.
      *
@@ -385,18 +395,24 @@ export class AddonModForumProvider {
      * @param forumId Forum ID.
      * @param discussionId Discussion ID.
      * @param postId Post ID.
+     * @param ignoreCache True if it should ignore cached data (it will always fail in offline or server down).
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when the post is retrieved.
      */
-    getDiscussionPost(forumId: number, discussionId: number, postId: number, siteId?: string): Promise<any> {
+    getDiscussionPost(forumId: number, discussionId: number, postId: number, ignoreCache?: boolean, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const params = {
-                postid: postId
-            };
-            const preSets = {
-                cacheKey: this.getDiscussionPostDataCacheKey(forumId, discussionId, postId),
-                updateFrequency: CoreSite.FREQUENCY_RARELY
-            };
+                    postid: postId
+                },
+                preSets: CoreSiteWSPreSets = {
+                    cacheKey: this.getDiscussionPostDataCacheKey(forumId, discussionId, postId),
+                    updateFrequency: CoreSite.FREQUENCY_USUALLY
+                };
+
+            if (ignoreCache) {
+                preSets.getFromCache = false;
+                preSets.emergencyCache = false;
+            }
 
             return site.read('mod_forum_get_discussion_post', params, preSets).then((response) => {
                 if (response.post) {
@@ -1050,4 +1066,29 @@ export class AddonModForumProvider {
 
         this.userProvider.storeUsers(this.utils.objectToArray(users));
     }
+
+    /**
+     * Update a certain post.
+     *
+     * @param postId ID of the post being edited.
+     * @param subject New post's subject.
+     * @param message New post's message.
+     * @param options Options (subscribe, attachments, ...).
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with success boolean when done.
+     */
+    updatePost(postId: number, subject: string, message: string, options?: any, siteId?: string): Promise<boolean> {
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            const params = {
+                postid: postId,
+                subject: subject,
+                message: message,
+                options: this.utils.objectToArrayOfObjects(options, 'name', 'value')
+            };
+
+            return site.write('mod_forum_update_discussion_post', params).then((response) => {
+                return response && response.status;
+            });
+        });
+    }
 }
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index c6a0d0d41..2a5ba7432 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -388,7 +388,6 @@
     "addon.mod_assign.numwords": "{{$a}} words",
     "addon.mod_assign.outof": "{{$a.current}} out of {{$a.total}}",
     "addon.mod_assign.overdue": "<font color=\"red\">Assignment is overdue by: {{$a}}</font>",
-    "addon.mod_assign.savechanges": "Save changes",
     "addon.mod_assign.submission": "Submission",
     "addon.mod_assign.submissioneditable": "Student can edit this submission",
     "addon.mod_assign.submissionnoteditable": "Student cannot edit this submission",
@@ -571,6 +570,7 @@
     "addon.mod_forum.cannotadddiscussionall": "You do not have permission to add a new discussion topic for all participants.",
     "addon.mod_forum.cannotcreatediscussion": "Could not create new discussion",
     "addon.mod_forum.couldnotadd": "Could not add your post due to an unknown error",
+    "addon.mod_forum.couldnotupdate": "Could not update your post due to an unknown error",
     "addon.mod_forum.cutoffdatereached": "The cut-off date for posting to this forum is reached so you can no longer post to it.",
     "addon.mod_forum.delete": "Delete",
     "addon.mod_forum.deletedpost": "The post has been deleted",
@@ -624,6 +624,7 @@
     "addon.mod_forum.unpindiscussion": "Unpin this discussion",
     "addon.mod_forum.unread": "Unread",
     "addon.mod_forum.unreadpostsnumber": "{{$a}} unread posts",
+    "addon.mod_forum.yourreply": "Your reply",
     "addon.mod_glossary.addentry": "Add a new entry",
     "addon.mod_glossary.aliases": "Keyword(s)",
     "addon.mod_glossary.attachment": "Attachment",
@@ -1787,6 +1788,7 @@
     "core.restricted": "Restricted",
     "core.retry": "Retry",
     "core.save": "Save",
+    "core.savechanges": "Save changes",
     "core.search": "Search",
     "core.searching": "Searching",
     "core.searchresults": "Search results",
diff --git a/src/lang/en.json b/src/lang/en.json
index 328b287a5..bb56a4a34 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -216,6 +216,7 @@
     "restricted": "Restricted",
     "retry": "Retry",
     "save": "Save",
+    "savechanges": "Save changes",
     "search": "Search",
     "searching": "Searching",
     "searchresults": "Search results",
diff --git a/src/providers/utils/mimetype.ts b/src/providers/utils/mimetype.ts
index 47dc09037..19c54139c 100644
--- a/src/providers/utils/mimetype.ts
+++ b/src/providers/utils/mimetype.ts
@@ -146,24 +146,25 @@ export class CoreMimetypeUtilsProvider {
      */
     getEmbeddedHtml(file: any, path?: string): string {
         let ext;
+        const filename = file.filename || file.name;
 
         if (file.mimetype) {
             ext = this.getExtension(file.mimetype);
         } else {
-            ext = this.getFileExtension(file.filename);
+            ext = this.getFileExtension(filename);
             file.mimetype = this.getMimeType(ext);
         }
 
         if (this.canBeEmbedded(ext)) {
             file.embedType = this.getExtensionType(ext);
 
-            path = path || file.fileurl;
+            path = path || file.fileurl || (file.toURL && file.toURL());
 
             if (file.embedType == 'image') {
                 return '<img src="' + path + '">';
             }
             if (file.embedType == 'audio' || file.embedType == 'video') {
-                return '<' + file.embedType + ' controls title="' + file.filename + '" src="' + path + '">' +
+                return '<' + file.embedType + ' controls title="' + filename + '" src="' + path + '">' +
                     '<source src="' + path + '" type="' + file.mimetype + '">' +
                     '</' + file.embedType + '>';
             }

From 6219947374c298cd7d3346bea5cb160932dea487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 22 Nov 2019 11:52:21 +0100
Subject: [PATCH 123/257] MOBILE-2267 forum: Add open in browser link to posts

---
 src/addon/calendar/pages/day/day.ts                  |  2 +-
 .../addon-forum-post-options-menu.html               |  7 ++++---
 .../post-options-menu/post-options-menu.ts           |  9 ++++++++-
 src/addon/mod/forum/providers/forum.ts               |  4 ++--
 src/classes/site.ts                                  | 12 ++++++++++++
 src/providers/utils/url.ts                           |  7 ++++++-
 6 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/addon/calendar/pages/day/day.ts b/src/addon/calendar/pages/day/day.ts
index b48a7d84f..92abebece 100644
--- a/src/addon/calendar/pages/day/day.ts
+++ b/src/addon/calendar/pages/day/day.ts
@@ -114,7 +114,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
         this.filter.courseId = navParams.get('courseId');
         this.filter.categoryId = navParams.get('categoryId');
 
-        this.filter.filtered = this.filter.courseId || AddonCalendarProvider.ALL_TYPES.some((name) => !this.filter[name]);
+        this.filter.filtered = !!this.filter.courseId || AddonCalendarProvider.ALL_TYPES.some((name) => !this.filter[name]);
 
         this.year = navParams.get('year') || now.getFullYear();
         this.month = navParams.get('month') || (now.getMonth() + 1);
diff --git a/src/addon/mod/forum/components/post-options-menu/addon-forum-post-options-menu.html b/src/addon/mod/forum/components/post-options-menu/addon-forum-post-options-menu.html
index 48d9a9d89..9b7e34dd6 100644
--- a/src/addon/mod/forum/components/post-options-menu/addon-forum-post-options-menu.html
+++ b/src/addon/mod/forum/components/post-options-menu/addon-forum-post-options-menu.html
@@ -11,7 +11,8 @@
     <ion-item text-wrap (click)="dismiss()" *ngIf="wordCount">
         <h2>{{ 'core.numwords' | translate: {'$a': wordCount} }}</h2>
     </ion-item>
-    <ion-item text-wrap (click)="dismiss()" *ngIf="!canEdit && !canDelete && !wordCount">
-        <h2>{{ 'core.nooptionavailable' | translate }}</h2>
-    </ion-item>
+    <a ion-item text-wrap [href]="url" *ngIf="url" core-link capture="false">
+        <ion-icon name="open" item-start></ion-icon>
+        <h2>{{ 'core.openinbrowser' | translate }}</h2>
+    </a>
 </core-loading>
diff --git a/src/addon/mod/forum/components/post-options-menu/post-options-menu.ts b/src/addon/mod/forum/components/post-options-menu/post-options-menu.ts
index 483c01b11..cd0fb7fdf 100644
--- a/src/addon/mod/forum/components/post-options-menu/post-options-menu.ts
+++ b/src/addon/mod/forum/components/post-options-menu/post-options-menu.ts
@@ -15,6 +15,8 @@
 import { Component, OnInit } from '@angular/core';
 import { NavParams, ViewController } from 'ionic-angular';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
+import { CoreSitesProvider } from '@providers/sites';
+import { CoreSite } from '@classes/site';
 import { AddonModForumProvider } from '../../providers/forum';
 
 /**
@@ -31,11 +33,13 @@ export class AddonForumPostOptionsMenuComponent implements OnInit {
     canEdit = false;
     canDelete = false;
     loaded = false;
+    url: string;
 
     constructor(navParams: NavParams,
             protected viewCtrl: ViewController,
             protected domUtils: CoreDomUtilsProvider,
-            protected forumProvider: AddonModForumProvider) {
+            protected forumProvider: AddonModForumProvider,
+            protected sitesProvider: CoreSitesProvider) {
         this.post = navParams.get('post');
         this.forumId = navParams.get('forumId');
     }
@@ -46,6 +50,9 @@ export class AddonForumPostOptionsMenuComponent implements OnInit {
     ngOnInit(): void {
         if (this.forumId) {
             if (this.post.id) {
+                const site: CoreSite = this.sitesProvider.getCurrentSite();
+                this.url = site.createSiteUrl('/mod/forum/discuss.php', {d: this.post.discussion}, 'p' + this.post.id);
+
                 this.forumProvider.getDiscussionPost(this.forumId, this.post.discussion, this.post.id, true).then((post) => {
                     this.canDelete = post.capabilities.delete && this.forumProvider.isDeletePostAvailable();
                     this.canEdit = post.capabilities.edit && this.forumProvider.isUpdatePostAvailable();
diff --git a/src/addon/mod/forum/providers/forum.ts b/src/addon/mod/forum/providers/forum.ts
index cae8c5ac3..450593d75 100644
--- a/src/addon/mod/forum/providers/forum.ts
+++ b/src/addon/mod/forum/providers/forum.ts
@@ -417,9 +417,9 @@ export class AddonModForumProvider {
             return site.read('mod_forum_get_discussion_post', params, preSets).then((response) => {
                 if (response.post) {
                     return response.post;
-                } else {
-                    return Promise.reject(null);
                 }
+
+                return Promise.reject(null);
             });
         });
     }
diff --git a/src/classes/site.ts b/src/classes/site.ts
index e1f0fb458..574f6be44 100644
--- a/src/classes/site.ts
+++ b/src/classes/site.ts
@@ -1309,6 +1309,18 @@ export class CoreSite {
         return this.urlUtils.getDocsUrl(release, page);
     }
 
+    /**
+     * Returns a url to link an specific page on the site.
+     *
+     * @param path Path of the url to go to.
+     * @param params Object with the params to add.
+     * @param anchor Anchor text if needed.
+     * @return URL with params.
+     */
+    createSiteUrl(path: string, params?: {[key: string]: any}, anchor?: string): string {
+        return this.urlUtils.addParamsToUrl(this.siteUrl + path, params, anchor);
+    }
+
     /**
      * Check if the local_mobile plugin is installed in the Moodle site.
      *
diff --git a/src/providers/utils/url.ts b/src/providers/utils/url.ts
index 600f84d5e..39604bfd3 100644
--- a/src/providers/utils/url.ts
+++ b/src/providers/utils/url.ts
@@ -49,9 +49,10 @@ export class CoreUrlUtilsProvider {
      *
      * @param url URL to add the params to.
      * @param params Object with the params to add.
+     * @param anchor Anchor text if needed.
      * @return URL with params.
      */
-    addParamsToUrl(url: string, params: {[key: string]: any}): string {
+    addParamsToUrl(url: string, params?: {[key: string]: any}, anchor?: string): string {
         let separator = url.indexOf('?') != -1 ? '&' : '?';
 
         for (const key in params) {
@@ -64,6 +65,10 @@ export class CoreUrlUtilsProvider {
             }
         }
 
+        if (anchor) {
+            url += '#' + anchor;
+        }
+
         return url;
     }
 

From c35cdd04f88806cafb224619753619ad819c5576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 28 Oct 2019 12:18:12 +0100
Subject: [PATCH 124/257] MOBILE-2972 blocks: Show categories when configured
 to be shown

---
 .../components/myoverview/myoverview.ts       |  8 ++--
 .../recentlyaccessedcourses.ts                |  5 +-
 .../starredcourses/starredcourses.ts          |  5 +-
 .../core-courses-course-progress.html         |  6 ++-
 .../course-progress/course-progress.scss      |  4 +-
 src/core/courses/providers/helper.ts          | 46 +++++++++++--------
 6 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/src/addon/block/myoverview/components/myoverview/myoverview.ts b/src/addon/block/myoverview/components/myoverview/myoverview.ts
index 064ddc747..3c75be8bd 100644
--- a/src/addon/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addon/block/myoverview/components/myoverview/myoverview.ts
@@ -167,7 +167,11 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
      * @return Promise resolved when done.
      */
     protected fetchContent(): Promise<any> {
-        return this.coursesHelper.getUserCoursesWithOptions(this.sort).then((courses) => {
+        const config = this.block.configs;
+
+        const showCategories = config && config.displaycategories && config.displaycategories.value == '1';
+
+        return this.coursesHelper.getUserCoursesWithOptions(this.sort, null, null, showCategories).then((courses) => {
             this.courseIds = courses.map((course) => {
                     return course.id;
                 });
@@ -176,8 +180,6 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
 
             this.initCourseFilters(courses);
 
-            const config = this.block.configs;
-
             this.showSelectorFilter = courses.length > 0 && (this.courses.past.length > 0 || this.courses.future.length > 0 ||
                    typeof courses[0].enddate != 'undefined');
 
diff --git a/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts b/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
index fd94dc7c2..aa7dbdd02 100644
--- a/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
+++ b/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
@@ -106,7 +106,10 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
      * @return Promise resolved when done.
      */
     protected fetchContent(): Promise<any> {
-        return this.coursesHelper.getUserCoursesWithOptions('lastaccess', 10).then((courses) => {
+        const showCategories = this.block.configs && this.block.configs.displaycategories &&
+            this.block.configs.displaycategories.value == '1';
+
+        return this.coursesHelper.getUserCoursesWithOptions('lastaccess', 10, null, showCategories).then((courses) => {
             this.courses = courses;
 
             this.initPrefetchCoursesIcons();
diff --git a/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts b/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts
index 6be095a75..e5cabc99c 100644
--- a/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts
+++ b/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts
@@ -106,7 +106,10 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
      * @return Promise resolved when done.
      */
     protected fetchContent(): Promise<any> {
-        return this.coursesHelper.getUserCoursesWithOptions('timemodified', 0, 'isfavourite').then((courses) => {
+        const showCategories = this.block.configs && this.block.configs.displaycategories &&
+            this.block.configs.displaycategories.value == '1';
+
+        return this.coursesHelper.getUserCoursesWithOptions('timemodified', 0, 'isfavourite', showCategories).then((courses) => {
             this.courses = courses;
 
             this.initPrefetchCoursesIcons();
diff --git a/src/core/courses/components/course-progress/core-courses-course-progress.html b/src/core/courses/components/course-progress/core-courses-course-progress.html
index ed72a738e..fb870dbba 100644
--- a/src/core/courses/components/course-progress/core-courses-course-progress.html
+++ b/src/core/courses/components/course-progress/core-courses-course-progress.html
@@ -4,7 +4,11 @@
     </div>
     <ion-item tappable text-wrap detail-none (click)="openCourse(course)" [title]="course.displayname || course.fullname" class="core-course-link" [class.item-disabled]="course.visible == 0" [class.core-course-more-than-title]="(course.progress != null && course.progress >= 0)">
         <div class="core-course-title" [class.core-course-with-buttons]="courseOptionMenuEnabled || (downloadCourseEnabled && showDownload)">
-            <p *ngIf="course.displayname && course.shortname && course.fullname != course.displayname" class="core-course-shortname"><core-format-text [text]="course.shortname" contextLevel="course" [contextInstanceId]="course.id"></core-format-text></p>
+            <p *ngIf="course.categoryname || (course.displayname && course.shortname && course.fullname != course.displayname)" class="core-course-additional-info">
+                <span *ngIf="course.categoryname" class="core-course-category"><core-format-text [text]="course.categoryname"></core-format-text></span>
+                <span *ngIf="course.categoryname && course.displayname && course.shortname && course.fullname != course.displayname" class="core-course-category"> | </span>
+                <span *ngIf="course.displayname && course.shortname && course.fullname != course.displayname" class="core-course-shortname"><core-format-text [text]="course.shortname" contextLevel="course" [contextInstanceId]="course.id"></core-format-text></span>
+            </p>
             <h2>
                 <core-icon name="fa-star" *ngIf="course.isfavourite"></core-icon>
                 <core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="course.id"></core-format-text>
diff --git a/src/core/courses/components/course-progress/course-progress.scss b/src/core/courses/components/course-progress/course-progress.scss
index 230838b1f..ef274566e 100644
--- a/src/core/courses/components/course-progress/course-progress.scss
+++ b/src/core/courses/components/course-progress/course-progress.scss
@@ -34,7 +34,7 @@ ion-app.app-root core-courses-course-progress {
             }
         }
 
-        .core-course-shortname {
+        .core-course-additional-info {
             margin-bottom: 8px;
         }
 
@@ -113,7 +113,7 @@ ion-app.app-root .core-horizontal-scroll core-courses-course-progress {
 
         .core-course-link {
             @include padding(4px, 0px, 4px, 8px);
-            .core-course-shortname {
+            .core-course-additional-info {
                 font-size: 1.2rem;
             }
 
diff --git a/src/core/courses/providers/helper.ts b/src/core/courses/providers/helper.ts
index d278ced6f..33d4ca571 100644
--- a/src/core/courses/providers/helper.ts
+++ b/src/core/courses/providers/helper.ts
@@ -73,10 +73,12 @@ export class CoreCoursesHelperProvider {
      *
      * @param course Course returned by core_enrol_get_users_courses.
      * @param courseByField Course returned by core_course_get_courses_by_field.
+     * @param addCategoryName Whether add category name or not.
      */
-    loadCourseExtraInfo(course: any, courseByField: any): void {
+    loadCourseExtraInfo(course: any, courseByField: any, addCategoryName: boolean = false): void {
         if (courseByField) {
             course.displayname = courseByField.displayname;
+            course.categoryname = addCategoryName ? courseByField.categoryname : null;
 
             if (courseByField.overviewfiles && courseByField.overviewfiles[0]) {
                 course.courseImage = courseByField.overviewfiles[0].fileurl;
@@ -94,33 +96,37 @@ export class CoreCoursesHelperProvider {
      * core_course_get_courses_by_field if available.
      *
      * @param courses List of courses.
+     * @param loadCategoryNames Whether load category names or not.
      * @return Promise resolved when done.
      */
-    loadCoursesExtraInfo(courses: any[]): Promise<any> {
-        if (courses[0] && typeof courses[0].overviewfiles != 'undefined' && typeof courses[0].displayname != 'undefined') {
-            // We already have the extra data. Call loadCourseExtraInfo to load the calculated fields.
-            courses.forEach((course) => {
-                this.loadCourseExtraInfo(course, course);
-            });
-
-            return Promise.resolve();
-        }
-
-        if (!courses.length || !this.coursesProvider.isGetCoursesByFieldAvailable()) {
+    loadCoursesExtraInfo(courses: any[], loadCategoryNames: boolean = false): Promise<any> {
+        if (!courses.length ) {
             // No courses or cannot get the data, stop.
             return Promise.resolve();
         }
 
-        const courseIds = courses.map((course) => {
+        const promises = [];
+        let coursesInfo = [];
+
+        let courseInfoAvalaible = false;
+
+        if (this.coursesProvider.isGetCoursesByFieldAvailable() && (loadCategoryNames ||
+                (typeof courses[0].overviewfiles == 'undefined' && typeof courses[0].displayname == 'undefined'))) {
+            const courseIds = courses.map((course) => {
                 return course.id;
             }).join(',');
 
-        // Get the extra data for the courses.
-        return this.coursesProvider.getCoursesByField('ids', courseIds).then((coursesInfo) => {
-            coursesInfo = this.utils.arrayToObject(coursesInfo, 'id');
+            courseInfoAvalaible = true;
 
+            // Get the extra data for the courses.
+            promises.push(this.coursesProvider.getCoursesByField('ids', courseIds).then((coursesInfos) => {
+                coursesInfo = this.utils.arrayToObject(coursesInfos, 'id');
+            }));
+        }
+
+        return Promise.all(promises).then(() => {
             courses.forEach((course) => {
-                this.loadCourseExtraInfo(course, coursesInfo[course.id]);
+                this.loadCourseExtraInfo(course, courseInfoAvalaible ? coursesInfo[course.id] : course, loadCategoryNames);
             });
         });
     }
@@ -131,9 +137,11 @@ export class CoreCoursesHelperProvider {
      * @param sort Sort courses after get them. If sort is not defined it won't be sorted.
      * @param slice Slice results to get the X first one. If slice > 0 it will be done after sorting.
      * @param filter Filter using some field.
+     * @param loadCategoryNames Whether load category names or not.
      * @return Courses filled with options.
      */
-    getUserCoursesWithOptions(sort: string = 'fullname', slice: number = 0, filter?: string): Promise<any[]> {
+    getUserCoursesWithOptions(sort: string = 'fullname', slice: number = 0, filter?: string, loadCategoryNames: boolean = false):
+            Promise<any[]> {
         return this.coursesProvider.getUserCourses().then((courses) => {
             const promises = [],
                 courseIds = courses.map((course) => {
@@ -150,7 +158,7 @@ export class CoreCoursesHelperProvider {
                 }));
             }
 
-            promises.push(this.loadCoursesExtraInfo(courses));
+            promises.push(this.loadCoursesExtraInfo(courses, loadCategoryNames));
 
             return Promise.all(promises).then(() => {
                 if (courses.length <= 0) {

From 91cd0d837c9352a1c54430a77499f1231a9766aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 21 Nov 2019 13:43:59 +0100
Subject: [PATCH 125/257] MOBILE-3205 forum: Fix discussion actions search

---
 src/addon/mod/forum/components/index/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addon/mod/forum/components/index/index.ts b/src/addon/mod/forum/components/index/index.ts
index f3c181186..8951cfdcd 100644
--- a/src/addon/mod/forum/components/index/index.ts
+++ b/src/addon/mod/forum/components/index/index.ts
@@ -114,7 +114,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
                     if (data.discussionId) {
                         // Discussion changed, search it in the list of discussions.
                         const discussion = this.discussions.find((disc) => {
-                            return data.discussionId = disc.discussion;
+                            return data.discussionId == disc.discussion;
                         });
 
                         if (discussion) {

From f7a05ed6ecaa8ec467155101b0e4a1592624d580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 26 Nov 2019 12:07:04 +0100
Subject: [PATCH 126/257] MOBILE-3229 resources: Regenerate resources
 w/cordova-res last version

---
 config.xml                                    |  30 ++++++++++++++----
 resources/android/icon/drawable-hdpi-icon.png | Bin 2199 -> 2480 bytes
 resources/android/icon/drawable-ldpi-icon.png | Bin 1193 -> 1329 bytes
 resources/android/icon/drawable-mdpi-icon.png | Bin 1447 -> 1687 bytes
 .../android/icon/drawable-xhdpi-icon.png      | Bin 2846 -> 3195 bytes
 .../android/icon/drawable-xxhdpi-icon.png     | Bin 4271 -> 4696 bytes
 .../android/icon/drawable-xxxhdpi-icon.png    | Bin 5590 -> 6272 bytes
 resources/android/icon/hdpi-foreground.png    | Bin 1517 -> 3461 bytes
 resources/android/icon/ldpi-foreground.png    | Bin 3552 -> 1678 bytes
 resources/android/icon/mdpi-foreground.png    | Bin 984 -> 2245 bytes
 resources/android/icon/xhdpi-foreground.png   | Bin 2065 -> 4496 bytes
 resources/android/icon/xxhdpi-foreground.png  | Bin 3251 -> 7003 bytes
 resources/android/icon/xxxhdpi-foreground.png | Bin 4640 -> 9933 bytes
 resources/ios/icon/icon-108@2x.png            | Bin 0 -> 5673 bytes
 resources/ios/icon/icon-20.png                | Bin 0 -> 608 bytes
 resources/ios/icon/icon-20@2x.png             | Bin 0 -> 1193 bytes
 resources/ios/icon/icon-20@3x.png             | Bin 0 -> 1644 bytes
 resources/ios/icon/icon-24@2x.png             | Bin 0 -> 1397 bytes
 resources/ios/icon/icon-27.5@2x.png           | Bin 0 -> 1577 bytes
 resources/ios/icon/icon-29.png                | Bin 0 -> 851 bytes
 resources/ios/icon/icon-29@2x.png             | Bin 0 -> 1612 bytes
 resources/ios/icon/icon-29@3x.png             | Bin 0 -> 2340 bytes
 resources/ios/icon/icon-44@2x.png             | Bin 0 -> 2300 bytes
 resources/ios/icon/icon-86@2x.png             | Bin 0 -> 4378 bytes
 resources/ios/icon/icon-98@2x.png             | Bin 0 -> 5008 bytes
 resources/ios/splash/Default-1792h~iphone.png | Bin 0 -> 27457 bytes
 resources/ios/splash/Default-2436h.png        | Bin 0 -> 40154 bytes
 resources/ios/splash/Default-2688h~iphone.png | Bin 0 -> 46270 bytes
 .../splash/Default-Landscape-1792h~iphone.png | Bin 0 -> 28130 bytes
 .../ios/splash/Default-Landscape-2436h.png    | Bin 0 -> 41974 bytes
 .../splash/Default-Landscape-2688h~iphone.png | Bin 0 -> 48177 bytes
 31 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 resources/ios/icon/icon-108@2x.png
 create mode 100644 resources/ios/icon/icon-20.png
 create mode 100644 resources/ios/icon/icon-20@2x.png
 create mode 100644 resources/ios/icon/icon-20@3x.png
 create mode 100644 resources/ios/icon/icon-24@2x.png
 create mode 100644 resources/ios/icon/icon-27.5@2x.png
 create mode 100644 resources/ios/icon/icon-29.png
 create mode 100644 resources/ios/icon/icon-29@2x.png
 create mode 100644 resources/ios/icon/icon-29@3x.png
 create mode 100644 resources/ios/icon/icon-44@2x.png
 create mode 100644 resources/ios/icon/icon-86@2x.png
 create mode 100644 resources/ios/icon/icon-98@2x.png
 create mode 100644 resources/ios/splash/Default-1792h~iphone.png
 create mode 100644 resources/ios/splash/Default-2436h.png
 create mode 100644 resources/ios/splash/Default-2688h~iphone.png
 create mode 100644 resources/ios/splash/Default-Landscape-1792h~iphone.png
 create mode 100644 resources/ios/splash/Default-Landscape-2436h.png
 create mode 100644 resources/ios/splash/Default-Landscape-2688h~iphone.png

diff --git a/config.xml b/config.xml
index 63e92d9e3..dac0bbd86 100644
--- a/config.xml
+++ b/config.xml
@@ -73,12 +73,12 @@
         <resource-file src="resources/android/splash/drawable-port-xxhdpi-screen.png" target="app/src/main/res/drawable-port-xxhdpi/screen.png" />
         <resource-file src="resources/android/splash/drawable-port-xxxhdpi-screen.png" target="app/src/main/res/drawable-port-xxxhdpi/screen.png" />
         <resource-file src="resources/values/colors.xml" target="/app/src/main/res/values/colors.xml" />
-        <icon background="@color/background" density="ldpi" foreground="resources/android/icon/ldpi-foreground.png" />
-        <icon background="@color/background" density="mdpi" foreground="resources/android/icon/mdpi-foreground.png" />
-        <icon background="@color/background" density="hdpi" foreground="resources/android/icon/hdpi-foreground.png" />
-        <icon background="@color/background" density="xhdpi" foreground="resources/android/icon/xhdpi-foreground.png" />
-        <icon background="@color/background" density="xxhdpi" foreground="resources/android/icon/xxhdpi-foreground.png" />
-        <icon background="@color/background" density="xxxhdpi" foreground="resources/android/icon/xxxhdpi-foreground.png" />
+        <icon background="@color/background" density="ldpi" foreground="resources/android/icon/ldpi-foreground.png" src="resources/android/icon/drawable-ldpi-icon.png" />
+        <icon background="@color/background" density="mdpi" foreground="resources/android/icon/mdpi-foreground.png" src="resources/android/icon/drawable-mdpi-icon.png" />
+        <icon background="@color/background" density="hdpi" foreground="resources/android/icon/hdpi-foreground.png" src="resources/android/icon/drawable-hdpi-icon.png" />
+        <icon background="@color/background" density="xhdpi" foreground="resources/android/icon/xhdpi-foreground.png" src="resources/android/icon/drawable-xhdpi-icon.png" />
+        <icon background="@color/background" density="xxhdpi" foreground="resources/android/icon/xxhdpi-foreground.png" src="resources/android/icon/drawable-xxhdpi-icon.png" />
+        <icon background="@color/background" density="xxxhdpi" foreground="resources/android/icon/xxxhdpi-foreground.png" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
     </platform>
     <platform name="ios">
         <resource-file src="GoogleService-Info.plist" />
@@ -117,6 +117,24 @@
         <edit-config file="*-Info.plist" mode="merge" target="NSLocationWhenInUseUsageDescription">
             <string>We need your location so you can attach it as part of your submissions.</string>
         </edit-config>
+        <icon height="20" src="resources/ios/icon/icon-20.png" width="20" />
+        <icon height="40" src="resources/ios/icon/icon-20@2x.png" width="40" />
+        <icon height="60" src="resources/ios/icon/icon-20@3x.png" width="60" />
+        <icon height="29" src="resources/ios/icon/icon-29.png" width="29" />
+        <icon height="58" src="resources/ios/icon/icon-29@2x.png" width="58" />
+        <icon height="87" src="resources/ios/icon/icon-29@3x.png" width="87" />
+        <icon height="48" src="resources/ios/icon/icon-24@2x.png" width="48" />
+        <icon height="55" src="resources/ios/icon/icon-27.5@2x.png" width="55" />
+        <icon height="88" src="resources/ios/icon/icon-44@2x.png" width="88" />
+        <icon height="172" src="resources/ios/icon/icon-86@2x.png" width="172" />
+        <icon height="196" src="resources/ios/icon/icon-98@2x.png" width="196" />
+        <icon height="216" src="resources/ios/icon/icon-108@2x.png" width="216" />
+        <splash height="2688" src="resources/ios/splash/Default-2688h~iphone.png" width="1242" />
+        <splash height="1242" src="resources/ios/splash/Default-Landscape-2688h~iphone.png" width="2688" />
+        <splash height="1792" src="resources/ios/splash/Default-1792h~iphone.png" width="828" />
+        <splash height="828" src="resources/ios/splash/Default-Landscape-1792h~iphone.png" width="1792" />
+        <splash height="2436" src="resources/ios/splash/Default-2436h.png" width="1125" />
+        <splash height="1125" src="resources/ios/splash/Default-Landscape-2436h.png" width="2436" />
     </platform>
     <plugin name="com-darryncampbell-cordova-plugin-intent" spec="^1.1.8" />
     <plugin name="cordova-android-support-gradle-release" spec="^3.0.1">
diff --git a/resources/android/icon/drawable-hdpi-icon.png b/resources/android/icon/drawable-hdpi-icon.png
index b155f74e0d9a8678baf3afdf509675d2d8566c6c..e96fcfe457155ec9cb5876eda4ae2c119d6dfffc 100644
GIT binary patch
delta 2470
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

delta 2167
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

diff --git a/resources/android/icon/drawable-ldpi-icon.png b/resources/android/icon/drawable-ldpi-icon.png
index 4d607a119e5a9104971f22be2ec16048625b5515..3becf621736f7262b70b0fefc1f1b0ab98c2a853 100644
GIT binary patch
delta 1303
zcmV+y1?c*z39$;083+ad007|tn3$8E0vCS-<4Ht8R9M5!m|aX9RTRfJQDgMMs4XoO
ziFV84LMSY|EX0&hiVvnrB{8BrATPy_#5CHJ*ri1TG)Td(T`@Kg*1jMVV<An18mf}0
z!3W#4JX9LKf*50IvcS&l?9A-W{JnE$X1lWs3zq6~latxKbLXDl{LeXe?u-e*-Nb*~
z!~#&8tl59vqWy5hIu#a^2J?S{tOlmHZj+{r(kUfTp@@G|3}rGEqJX9(!^A;t8c3Gq
z$WgcG{(sv{x9eDvBx>Ps7@<&z+Gb%A0>$2KwDUww8Fxn&iiL>2bG<2ji;Ihxn3%xu
z@G!c%x=>eFhu+@aI~TIm)QE2L^Yecg8X7`lV<W1ot5H%?g52C(WMpK(Y&N5{wG|A*
zXmd!nol~ahi()|(75e)6P+MDzqM{;LtyW}aW+FQ~8~OS9u-R-VFE7XV`1mb_!=mE-
zR@fz?uoR|{v8j+yAwBj=o1L9STU#4SOG_z0R#p}Ta5|k4Q~nnh7h`U2j$VHw3WA|b
z6^OWW(E1WV85EkDnu5#aqM=AnPe)Ep4hjnkDS*S_h%=il4=>l$;LpEqs8GLuhv2!R
z;JlUKx}F2q^8$hcZ$SL*E6BV*4r)~(U74}5G1QRBD=I2bSy_pysw$L~mC>-og4peL
zI137p?{H$TH3L^ZI0$+02v&dUcYtv{4Ccg6Fb%uFoFqrrHrf~X_(_E4#@B^1>77cL
zd_G^Kij?+YM+dB#78DgaQQ)u>b5OMu)f5%8b8<2GYBtcEiWS#(uuZ$cHt!)IsbK22
zQy{k447MeMK<)thUM8d)*VhcG0Z6H$rKKeUkmvK$NHafyTsr~CcVK_7%}(>lLMrR2
zr=P*M$BH2}?Sj9_tU7Lb98BY*2==`KaomgG*GI_zbTIEeMqn&pjz5UtH*ZCN5-PN?
zuz=;|W%@g;0bM%Zjn@zC#`6d4IJhqlhe``jd-yQCJw5O-Jn+XaSZPS3APSJ8O0fSm
zg9HA&i-wG<)bI!b?)`s|1#az-={YnrGee>D(xs2yAKM`{JOp2p1q*elxY>EgxIl7#
z1U}hE^M!5MLxIFg{puWoy59?3yFmK4sppA$?5RA++)`w{iUZQuoq>S?jEsz^3W>aW
zccZ7Ua-1Y2kvn)Y1;Uw^C}>y|=;lQhSOh$!G-s&86DbH?J*R&<3kfRF<fwXHQBVPD
zTL(zb7q{C@9|3d{AxMwH#dfu7S}gF_ry$^c(O4xEXulEY%4$G6Hx8sL)ZgC^kH@0{
z@dhB8ki;3c5unW~r03A&<RrXauNE>Pc|dxm^E{8~>1i#gL&*b*EkFH%m~@2<TLoRA
z?>k7zrht9lN+*Bi&Q!$%eO3nMoiw@%D`P@e2aQ12FKXv4>H^trCqT;^2co6{@fTX)
zfAcO{CH|xLf;;`J5r}8Ob~xZac0YYIC}YISXEh*RTZcx-`TOXNF>gOWm68L##375{
zCa43$Ge1KZZG$l8q2UuR4;Utr!ve%#zobeEV{SS|`ul&H0b05_qn-a0!Ve!o_~{GC
zVsP!1dhI>6wC-kqBQFH&joFw&`h-L&C43Q!*)~LWgwbPUDP~OU9EsmfOxR*=tGu~x
zIUvKU^p^YBz$FoC)z2}V`kPP^6_T{7^P03zdfiF-iWc#wz!1CVAJg({9t-bVTmS$7
N07*qoM6LruV1hmHai#zO

delta 1164
zcmZ{iSx{4V6o>zySj3su2NZ%}fU;A_B~S|)#1gp%q998u2}4<eAc&Nu#HB@&DAEQ&
zgM~smIAsYBlCXrpxPcQQZ4D6w6{N#n39;%R%e^7oBsa}#r_=ND&F?qodpbvEcW1Yd
zz}*1=n3~V+uwdtz$k<2#WH<L1Gi@x{>f1yb6?Ba`|7{7bS<#8H0DR{K0Ivc7%u?~*
z0KkC&c$)zLr4ay!qNWE4;Q(0M#h+ln=Kl<i;~0i*Zf-6uEsczf$Ye5+h%2h7sOawQ
z*6DQ9)6-I^l+Wj<rKQnmGzx_h6ciL59$r^hx4OD&GMN?@7Q|w4Zf-7>N(~MUh9HPc
zCNr7Lp`jt8(P%Ijo<DzHSy@S^(_t7^sZ?ehHygI_ZN!XinQ_zP<Rp*BJ96YmU|?WK
zNJvgj&eHrW*No{5ll^+x`K@M_t|?)wnW^t8GN{G)nntNqayT3|o1L1P8bl6;!${+T
zIIJTVx$1?KJ0s;T2+vj55N-T(U~zF#qtWQ~dK5(w1Q7@X5r?3TEN_H+5aC+Zi0F+_
z)9bO7m6iIR8v;mBQeuLfL*3*O5pIRIURr<+H|o2Jk!!wMtybOhOUZFRCY2Ny0VTm<
z1^H)NT3eSjE5_-2=rtd+5!3fx)HTH5x({=6bIZ%i*rV$8%P!jQ-4@RiwT;Q!=mx&7
zMQbAvE)i3=878_Bz8fk$jIXcA<#L5Wu{}_Q@?6n!XT3NbN4W2G^-+fLPQ%na<jSY0
zFubLurM<m<OPt=<*Vok4G&3_Jkw|7|XSW9gNSPB-M%ZfmTK5wbxqQGdE;UTuMQ>7!
z^S@&XAvSc&@Iq$BjhLd=^yZc6-7Kc8!&J?<e#7!B#&+<l1vaILaY@e2s0q0;cX``V
z*jcfU)1o?E*-DpMHwUg&Sxi(UBUGK0k#U;++nz>8f}^8|wHxFd+qIv1mdRo{+DbCB
zT`t1s-k;Ok%ZiIiiZ|CbWUm>+Bv&7g&)ogI0^J0UDZY6GR@fyQ8~BoE_P+PuBz~3j
zDt@P*up#;7OY4n(PAQ5c?7QRW=tS^;a+D{yBf5XBy}rMu^EUTzulq+d@60o?@Q>~e
z$zNRf<RpniI$20e_khcBD}LnA-nL;X^|5krkYD9KFzDX4x2iSrkwCyHE>4KAzJ78|
zcO&`)JuaqZP1pDG2Y>nwU;48rPe;a7qiPaxsull{!d%w4q@`LXGg5Ym)&72xj(jF7
z|DAH+-2t9;4L5c^b2Oj`?kxE7!JMQ`E)mxEKlFY&^U%R({M84SLqi9<a{uz^aW8zP
zx@aFOqF1!$y%5CPLsxBK>A7Jaw&$sdr>r!&mS;bDTe~lU=+mQ^$)Bf&z}NSaSOcX5
zf64v14bS7JfX%6{l-@GbX@soYn-ImAILdH4cB0t!0vP{T$X7>B-Ljm<vlM2Qp3W@I
zreu|5TL8#VP*?!;c>p<>5fnm!LMddjKLk-AsQPZ6;$K2R;px1bOaCvJ-cFQR1P}wq
KMRid#uKWWvQcg$!

diff --git a/resources/android/icon/drawable-mdpi-icon.png b/resources/android/icon/drawable-mdpi-icon.png
index 33e7a52b1ab743095aca41ae23196fec82a1454d..16bb102e8862c9fdd7bacb689d70cc46e13d2d78 100644
GIT binary patch
delta 1682
zcmV;D25tGL3zrR$8Gi-<00374`G)`i010qNS#tmY4c7nw4c7reD4Tcy00v1(L_t(&
z-tAgjY!p=(-Y4UOCMu%VR_TRpx81gT2Og{h-Uv1!20~*c0tpx|39VpSa7(v^wUj18
zlm^2~g_Kf3iZy~Z`p_69!KAep0ST8BsnE0-+nwF+Zs+oO&VQMm?d<Hf+g2)_gp>R`
zXV08D`+fgy{yDP-18D%Vh_n$IhuoxyER?3k6C!e+NS;9jeq@0HpN<Geq|gx2yuwV<
zfd%L>9O+*%MBGNwh#o8;&<}&^1Qs~>L?lFm&cH*faJ>?UHUo6t=7oSHNlesz?e~XD
zKn+R_OcX^3f`1SrbWDBSL$iPuG!-?_=~^HV!2SF8|9=Zi2U^>xrUwTH(cRsR_V#uh
zIdTM5RaGc0Ek#L52`*l|7@aro1hk+P*HE`mD1_eLUbM8dprWDz8#Zjf%9Sf&Hk)BG
znUI^Ci<FcU6c-nxudi=jz{e5L`n1-EsVj7LcA}=HhJOLGTCFe|jmXK#VZiBkm&*l<
z#e#x@0yH!<MAuW+No3Xk5+4R_fF%Nc{rYtrI&=tY*RDlgULLZuvyq>l4~N5nWy_W^
z&`zh5iOpuinl)?C(a{mTUJ!V~K!8M!5<M#5sYRk=;+)7B)LPKGN>^7GcJAEC08&j;
ztx}K*V1G)$Znv`|6*@+VojrS22F_0q-2BY5TZG&s32F8gpsl~ZA7y1_Oq*2W6d2WX
zBG8H`WAx}E^IA@wiYZ)#n?ED`!vO?Ozl-3BO&CA%CW5VRBXq$7zVB;D{=ZeOEY8>x
zF&4OX?HbC<%aNIxiPY3o=G!zFX;7*GYQd{XIDefE6k4pX<>%mb$LGN4p9nOSfcxkL
za1~F3t9%CB?q_A8{fei+?O6<ey%pikPgNF}83}`WLQ_){>gwvy*4BpR=4Ko_b__?4
z9%W-IR;*wanGQUQ38x*#LKhBiG=cY|!sj(JuzpVl{54td*Di&BpHUXtr(-pl;P$40
z`+x9BW*vzS#gItqLQ2364Gm#rWF&5q&*wu?Q4z~BGT3+mEH20~E8mG-#RUk~q$A)-
zC%|5k0ah<zB)F<n*%DOq?ib0qjOaOkt&xy;0-^Sbn3$N(3I-+5({}6DE!?<qgY|iy
zXF}WX@Gw@bUJaYog5@p(mT1}KuoG>|z<()$ToXy97CXG_%?MPdAwUTDs?!Ou^hxl<
zjr<242%dQ#!L~944!<Igc@z@qQ4#K4j*t+OyO5dy741!DoaF!YudjnKw*cA1J+cd&
z$SHJUsoBcngu2hxEt~Pnr7qx)Z{a6ep9G&S19Yb#@YyPeWA`S5H5|Zr(?&w#d4Fal
z2EI0nSttBcqdbSE+375xcA-0W?qFbGKt({56IpN+19e3>w<QCgl$haOmygQVOxVBa
zRh&H8jH_3#PL>pu@E32$fvJF^E>yV)6Wym}P{hX-KNkir$pokivAJ0+xI^c5#iiDy
z1bTXUSPE4WV0~@`;RYK}n+klq1b>n@1H5|?aC&phU0j%upS45Z?_++>0@O2U0b#I5
z1uC-k=w0}|d2*~MWOpwj>GqvyASWfD+`Jka8`0X@3S}&s$_N3j-i|SM8b+%#Fy_g^
zSS86Ur?#^vYcXPG3XC?I?_&wb!7SYEk0&rT#8N0%l@`fVvbE+!!0mR!>wonoB;Y@2
zkNya!XsLC3%#X~8fR7M3U}0%g?QX#@=Rm;Y@vu8^Vgj~UEzOC*?^6?~dH@8DA3u(5
z+qUVCfI5hG?AW0{0?LG7FvzShS-0zifSN??v#ZW5pq{8(0<rzXX>?u)?A5G2TNg@7
zpus`vnwO&`F}LSA_CS)5z<-bROpB~!rsYJW8l93ry-l<BVsayUZ}tS@cPErmVi^AY
zCb<kIz-a~P``~c|o8L-EfR+-z^2b>DK*6wU2qEFGz65vTdyHt@+9$U@2m(^H_~Ng8
z2fp_ldHib!-`|djp08LTmT3EsmckRiogwqSVULSU$hFe=Kk=5H2!DdVd?9}A+rQ3e
zBP{98T(U<x?fKcvpY7Unw?M=_;zgWd16NEuf2w3LgS8)RuRkI%j|6o8ib?k``E>u9
zH3WUW=oS?hIv*JbCz!NQ!7E$dH|fS!9^^kxuqr?YE+ncHzFhgoN+FRestF6#0t)z>
c3iy8k17Nrmh|`W)01E&B07*qoM6N<$f_;A*KL7v#

literal 1447
zcmZ`&Yc!Mz82%)5n_Z{trm2RdLipwz)0iR0T!e~sE5a6u(4h>?Az@}rE+w3eA{?vS
zsnp0)t(`q8PKTjMvE#Z*))+OL`DVT`^Udtn&;8MR&ig*+dCqyBU(Z|M@8^YEXR!_d
z0Gy9ED-c8Q>#i}zZsf$;#~7?WOZTM%z{BG8x+oKj8>Iw#F@XDG`~pS@(cXc+0B~s!
z0B{8Wu!2e4e*oYjmLiJ;09rW!Y`akPB)|;-R`LCh274O5F(`_v)#|0CrO%%~>vX#D
z@$uf?-sa}!;^N};^z`WH=%l2ifq?;;OxD-eS6yAr;c!AiLYPb@g+hTK$jQkG1i`qt
zxRH?&y<R^*Ki}EenVFdx5D-A6Qi((&i9~XDcP}k1MG$0gaIm1Dz~A4WOeXjA^uRDI
z5{cMsc3oYa0o56_hym3mCMMEoGzNpw(9pP|)#_CW-DtO_`wG&0R(&U2T^p`$jL~#v
zYlm9VPcsHRDv?Oi($ZXAT^$`AK_YaNPMzs2)z9=Rb8M7ZcxBd3CC?HrIk+M!(ZfqE
zEiDxl6>V*84Gj%7H8qu$m3eu2Zf<T6i9~iLm51+J=3B!BpfY=xl1or#?^ZX(>c1>Z
zPfsr_EKE*LvREu<62uR(muFhST!Q9t*2Kib;^N}$?5vl!HxYu|-4B+WB+D`gFpr=r
zWg_jV$U~0mmN#5LMCV?Ak}sYL@pp!ZAVhlkvQHy!Rpr_#xx3ZX!RXSoUNNVxJGIhR
zH8nM*Q+$->dI)1|O2ce(g6y*c><VMO?zJ|Lj*c2uRO;F=?NE!R<FZ&RmP)1ir5SY*
zMa|u%<`Fc_XOWIeaIT$hb^u)%gRc^i2W+8Gh%U{**C|L_l0mQ6bn)SQ2Xsz?$|vDM
zGIF17Fz5vWL0MTDaxW=AKR+iYr@p>EBO_yYcsMsVcX@fay}ezl)xvoWaFL6WXNBB5
zuj$Hx^PSL-SjZH7{Q&YHMXyon#-3_NgxWWc(D!0=enk7OOOIgU6ZFFn*3V3<yEPb?
zr3U&10dx^E{)c+SAlrdSMyHQ>vEF7qbKQiIwHLfkq+o9``gM&M`zq703IjeYda!q2
zbY$e2)3JLuf+QjYf{)Bw@vB3B*dFQ=FeDbg5*@m2dcagNA`})Uc&x%#MNF^~X8!&-
z_kNrC=8an|8OFs;<z0fh(vHHms%LyFOC0|2E4!8i8CwQf$Zm&??G)6}!@WX&I_3AX
z@dj&L+L|=!aDV8ghA<{mDlp!kkPsVNbS&pU&6WD9LQ{Ny=!x<6ap_;KE;Q=Xt|#4h
z<7X5K<(Hex^6yu>_hjk)jCedcoyYsrvNo#8qNDdmtGjoiPrskxJl|`*$ELB4K|dUJ
z$+YDLB=l&L<I7DeCZ6f|&Lt9&M|)=}BV{wr^9A9!PyBXPcSO2p%$6~^?6#C<UVVI;
z>&c7`N;z`mT5)b!^11K~v;GOOBS-aVSIJJ>-}hOpi2P(VV6x<cZBV1{XlxCUw5G`}
zZL9Z~BhbI0>iV51afJD~DV@ps^{cj3@W-wh2L-v_+;2j><zTk5=Yq*q(|^kd?^@mx
zD#+*P@{0uAB86MNgTfO~&ePwuU);gy<;X3L{~9;;@CFO_lw<!(L)6g8?<CIh@ocU$
z?rMa!6fjZ_m+&_x$D1V|!Uy-(j`ZdQ6>-UUU+QHSWGvZy`MFPt!gjxfUkx=wCGTF2
zR9#8&P<e)%FH2%d6k9k)aV&lSuH&@_`-LC-4e!ItwatUOfmM~Dv8h6M3@eCDs%L2G
znW)qlS~NQb0{{YvR0ojk0Fi=;&NR@420`{9NCUyb-{M98GbElr6Ca!YZ38NMeHk+V
MKAwK8`;18bf4>aY$p8QV

diff --git a/resources/android/icon/drawable-xhdpi-icon.png b/resources/android/icon/drawable-xhdpi-icon.png
index 1503f3377bb4e193b2e38dcdf19dff15a30ad968..a43251c56ebfee2d10407be4a8f0cd4637fb55fa 100644
GIT binary patch
delta 3190
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

literal 2846
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

diff --git a/resources/android/icon/drawable-xxhdpi-icon.png b/resources/android/icon/drawable-xxhdpi-icon.png
index 2c5af19f936e16006be04f09a8546c61d51334c2..48ce4f3c994bd7f117b6052439623f36069fab53 100644
GIT binary patch
literal 4696
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
NdUp)9>NOm3{{s%&m}39{

literal 4271
zcmbtXXH-+cvk#D9Xwn2i6Oi7E)JSiENJpAT5rd$i3MfboQbef|3lKo6fP@aA385%W
zI)-kjA|TRxd+~jHAKrQYbKX5?@9)grnc1D4xjQp)W+pH?Y7S}u06=GGpld<G<bMN9
zNqVp7FVvF&=%!_?1prhg(VX1}k!UhM3z#;bY=CQ(MDRW^urLMyo(lm05m5lZ3F%YB
zZvY@b1^`%d1^}QR001^0OryCfX@b(_HcXd<q~}<tDVzjUJ_dGvq@~CI4Ki(!j6eW@
zKHpGR>rUX*Mkdnd8Y~PSK3h$XWu>}JZfDDj@JQZ_bn)e_FixZBbtZmgsh>G^v0CVC
zQLe`?@8(&&?<_|9IsFYWw0hGtc=4_TP1EHXo4nNfjedYq*W<yqOeX{(q36E;ZsLc!
zTjTEi+A83$<|#Y*rlHo7;)TjvyV+U9gFXMlGkYJF8Umj)#g>{gvkzwlfB{nGCeHwB
zL=geyWUy$4xbl-N7CCn;Xy~dcoho4Ld8j_6DLW{P?u_Y36P)9Au_A%0A!yC{&IQe}
zmh&s2ud$)B$)u_HEE>WwtnTovR`Lrba1b{(N5Bx!3UK^xC_q+2NX7=mtHu!ZUzYMG
znX05>Nh&xaY*6~;{PJi}DE=^-0aie0BtMeXzpis3Pp(0@Yhy6y<=iyR$ljZ{fuCiX
zppw{ua_CG}f+s{#!Cw+P&FW^vYY5Dmwc{y}-Z!_kkyx1y=9u;&CjO)xpQt@3xlYgn
zpj>@B7~vDm*gZ$hpWMcx&-+3=UX#)Wf}$;xA!omL|379JTnF@0VHN5;Q{e?KyA~00
z>>L~%6%u{xL#iEMc?#@)4OgXY{PwnQOl&Os_3ICPe3DaA81-Q=b{-x#50Ch_;x;?&
zG}2}cp^Ggn0UcENwL+OD%&)&fI5{7Xcu^=aDaU350jB%z?k`D#xx*scftWjD(Vo*H
z1%<8B1xr7JH(kfe9F%HQ0op4&{`X=h>Wt+%Tmu6?w6v%{4-Q^kUCk*kPikw^`qtHz
zhQSD=_RJ{{ypO&C)PA|Dv0?_V^qJR&LZN|2^ReE6L32<h15rJB4nd|kpZRvsK;|vj
zvu8@7p`o<&^rUSWd>S=csZD!>DCD)#K_(E=-@Ri!_%qp|b~xjwgA0CWQAa*m*FP}<
zaSGW6Wrv-Jx(#4*nwm05c96E7W+W6G>Bq4A*$mDI22Rv@ayC8PaG9)fb<BQlXs$^9
z2pgxLcdy<DW%<d(_w2}*w0ajF4~WwxFF+&hq`G{$*4Ed9{#15NR6e+plWh3&sfwUv
z@}e^B)vHf_eP>rc+tM+?C~J9pOIO<dNe8F$+Xx^DrSm<)+4)#3_IFpkqlgNMtBa2*
zZs^AkJvTRDVbd%DrnqEyL0Ov2O>;OSb@W7opKy};iO6d<>4QcCc={U#17!c!mW+dg
zL-XO!VE=#s#yH(>gdCVJ`AHb`J9k%3adDhO)6>e()2C-)t>b!@JAq<mH&W)lr`_aI
z4NUHcr5~N1zU46b{k{B_D{<gk0_WtHU?oXONk<mLN!d-3&Fm1!+}3<Y^FF~I0}Xg}
z`@K|ule`Mr;*O2Y=<u)>3>LdOoyNZ_l<YYjaxm%EeEcippXRKr>mJkk@KrksE77kd
zR-Y%T-RL=$yyQb~fqeQwaG_K#jWEpl>EY<)WKVZDI6}C#-$<g*<@8`fb-R;U!l7|&
z)V4PbsmQ9RqS7;*2b;us^YDc3F;?2riWaOaEG1ivjE(6!IAo6JpcVAWQ7)B`*sI(N
z`{Pb4N85`6OjM@cmj7a4aAmRO^zVbizq5s`V#&Ew@+5URI<bNKKWtQd7l1v8Dv7CU
za8c`W$9}&-HJH79#%pes-+KZA--fqk{hyF$rUP%0C1#$-*WlT7f$e7I31CUxC@*c`
zXFS_pqX>0-t!5A6&A@<(W6&~7BKIw8#f9&kzFZufoI#}1m~0F{{;Vx9G5ScUp?6N~
zD(V(48m9R@A(QXoE(}Vfm`Xbr<kPwf?xVke>n<C=Todfp!|}f_)t5TvMi?_6^*xx#
zcSgyj(ei|!$p#<(UG7fd?_AujVs;aPi#~q*IPhfkQ_xo1mGYm~qZ|q&34SN7m4nwc
z=`(dc<tF#NlPIh!HxBz;jikusdqyR}lUv0aw5wF%b*V_`?eCtluU4>$lXF9%Eih`q
z@4f^d?i@^e-;|X#f8&YK?jAU7h-(eK5cZg@%k29Uzdpg6Mt{lDv`!pa{4z-+{Td@`
zw_X~reS=l14Y#Hqf((0kZ^xLSKzIZLT-)4SsU3HGKx_%6rKP>6wD4Vu;p<J#NY$Bb
zSoeN-x@R_^<Pfq-q0zN^%p07t!mm?h{ZS!z?O}+g2EO&el;OwiW~to1UUB+=e)VqN
zrj%|ylUo_gh9T8%W7hR<z&cJ&Xf@6Wf+a7=KL=bvc@E}LY6#X|2JLl&yuE}i-y2AI
z@>lFjS9r}T2W0GJm9w~$ZYVaVkQ7qHr}iK!Bxte+m1aNXp|wS$7nR+y=5XV|xr~PO
zK6=Z?8-m!JI_>SzT3Lcb@5jO^Ve8%5-*I7M2Dn2{#%11;H7bvwt4`DOZ98G`({bu+
z3Hqyl{^-JcPB&XkLqpZp$IH8_BqaLUeYr@ETlIfVcn2>a{gc&o7!L{x3NB?I=jQ}x
zQD>^a1y0|Kt-3yIT-Kzr6sRUr^8@~u+ZJ)3KlvwouNGEbQsOdQ=Lrb8I9{o#tE+mt
zao6UG+S5Of&E{Q`9&o;Vh@0Ij?tVj{B|S_9?x_Ig<Kq@S|Es|tNwbCB!1pbi{JI0(
z4r~?~g<2Mm?IGnH^9rZbl8B6-Mm}waJh`I|CR;Te**xPPSb?e133`*_fRrF2wGPz^
z-{X>+wI8`-Yl9x{3+(eL{P-)%9Hk4p($jou`n%`;VEczu%{otJFz_DFSe3+J_6$0P
zh^;>E$&`I(qp~b$diBx#UdYSY{gP*VOQ&r!sn)VtS&?nL?_7f{XjY3i{$|`f3$Tx8
z`7v&G9jm2Mt>my|kF%a|DE}yYQs&zest}|!?}y8DG3o+GYiE5|vW7F)$P*p1epOmg
zt%;Qld)`)YK4zp@W3W=<7b~g4Va5cYicyJl+Cp|1M-M*pj@bz}VjJ<IYuB;RkF^Mb
z%koh+($fPmGc)f#c{6z-+F#|GpgOWpA?cqUA^1u<iNGsaYOgfcv`e4d*Ai`80hy;E
zC*MHu%EmCOB>1gqR1CI&R_jlN)m#@bq0Hga^mr#(Y1j0QRFf!@W-BX}6oaMoy67j|
z88oaC&g%rM>P|QRjP;7}IYGlYd?)*>I^;;_X!F?b?AbY(v2pcP64;4><fhpgTH;1V
zrTV1l37(jj$M}qiDsD|9fn!~ZP~P}(`Pgbn((G?&sY{K$n3z~mNtynmP-D4!%birQ
z9i{fT#MtZ4UmhGBtX_%0KfAb^ncjK)XJcW1*C6ha6a^Klq7^&!YNwG$f6vry!$wXo
zDKq0)f7*!xq3W+Vlr2xlS@JIRscku|G5bg%tAjWL83pFti1U6fXr;vKm>9~b>FI{c
zi_=F)WK-@YJc^BRV((hdMe5}7Eia_jva^DB_W|t+{~&D$@l0xf?efKWTkBkj+7iNy
z;*th?YbLXgtH+*Kba`(m+Mc|9zWCO+Bel>t%SA1dgp&q_T8IgJp$<P>9sI(Lb-nb&
z6e%GJj_nv5A0HhVX>SZzw{3bVnUIjsx*un*_%klx6j!Mc_VrwzsxPU0gHP9WW2RL+
z^l18eyUMxK?;dkDIpm(LX&sqH(u1ddC8!W}o;uGajmJ=Z*N5mIwO6qLh9fwkG=tkW
zd<}{DdQSJ`K2$(%Qwe!$P4&P9fk&V_C-O8DigeFP-Hz36J#uWp6x@DqVQHBfuJod&
z!rH4%{djXyTlyN7frhg(eN!xut*QmofKV84+iXm>`}ja-E??7{HB8+PF`!^3`>os`
znlkHuF#eFLh(?UnM&vHCIugp^L06YvlJX?=0C<%DO*m)akOz+|+!C`V5K%>?TCiB^
z%VlK3y%5gawO{QtoldCc0tIoi9Pm&vWXgp9Oi;wEj1FxiG|ThD@I|_0u8??t=^XG#
zB2=$WGmr6tA-Ax{3UcFKELd6}b|peP{FuY8dS*XA&<^MF81ZE&_F9Uhja%52qTMiH
zrDw*)MHs32n&q)7mi~-Z9eVHSj^`08?U$us1oMd@saqdTej#0S4s3B?>2yDev);&b
z`v%q*%^(gguBD}(RE&CPBRE#F-S95iVR^d&acr7iYJriQoMtB5^y7#tT_;*qP;98d
zZw11^v2b?0OUhY6bUW}Wzc<nAhQD&b%vHMPS<j>P!Xg?NehHXCGYeZ=vxkSx%NM1l
zXxm)=6e_c|oGqbLK_hoZM@K2}M@P!%=jV=HYD9(Fd9fuyQn3*qAI}@b`xfrIy`WdV
zsE7s!(V&rs%88`v*(mkBW<w7`B_<}OIdR(T28kd2gaE7<9v)txeFW*vY6k9{o=0`e
zueJ_;2YT06_T1*p9_-51dmZtIA9*8%H`64TyD10Q-NaK=T>Pl9l^+Lu)0T|W6t^z@
z5GE{fSW@+m>hJF#`|%^E_M0yz*GS?fS|f<&j+4`1?^|&<SE3ALhgF0DOiDmdiN5rA
z-Oe9I#i=$nHpU2qbdGMBehl!jmseqJZ7o6$32AmSAqSC@DSH2mCvHmjHHgP7++4w}
z5z3tgcb5B%B@qB>hN7GtlyQb)8b>$a+Ll){L!_jA-3O36ohGV>g;do4x1nfTN<*E7
z|GYhT_WA9j{bd&~P&f{Je~Gn0(mz};BeQt;u4^@pMQ&8<^Pj^Nc5mPgh%o?nqdnl-
z2X<)2*vQ74ByHZ$oI|f|8oLuq7;~caL{h1ja#<z|=&8@l<I-JsTO#kbt$%CMp8VZe
z-xLz2{qQ}rPa3z8urw;O(>PL?@t(|Eu|bdtW#)&ETb(eDd}({3-TK~KC35yMP9y%Q
z|8LjxfA&rJTQ+=jl#-~TadSxTyCUE~Fn4s0hl(`nusN~atgcxYHIBMp&M%AR?!d1z
zDU&zP2gt`%Ez-@syrwOHav}?Lgds#YPa>SC_}(;xeayoTqN2uA*x^|~JDbGzJFtbZ
zwHMN4t#|`OJ(Q{{u^DY&`NY~$2^+u=$Q5|K{_DCso#0o!IXA?z;qt}ytImkKNU|CV
zQwn-Ots~593vE6(j+aK!M=@0EOO>VDSs=N|6#+yFMKbXSu^B|3Jenf?&u?9&EzUWG
zxgv%I@eIXF`XrBN!F3QHspSU<`s>;HBkudVLLWSFB>_NAMpi{qMnO{U<{episEjgH
rPEK4#1}Y;Hk9&mw9|E4<h(`~D{&#`%wc!ww0KibsM7K=aIr6^%>4xYq

diff --git a/resources/android/icon/drawable-xxxhdpi-icon.png b/resources/android/icon/drawable-xxxhdpi-icon.png
index b19a28d9f4d20e4077c688066619cbb567a4f409..53e0e9d67a8be831f7b46d0e28b3cd87b45009c7 100644
GIT binary patch
literal 6272
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
OWIR=Qp<Jr;I^aJc8o!_b

literal 5590
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

diff --git a/resources/android/icon/hdpi-foreground.png b/resources/android/icon/hdpi-foreground.png
index 9b02860331c058dc2279a7cf1e762bc685f36d63..1616ddedffee687326df08eff41342f36f96855f 100644
GIT binary patch
literal 3461
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
WZO5e~V84IWF)K4WM78PP3I7MK@tLgv

literal 1517
zcmbVM_dgp56i;`PR*g`~g(fwE;?$;A%%~HpsM<59w#JB{*P;m*S}U}KiW;rai)zfM
z5?W_fQDWtAMkDm>(Ugln;qHCj`o7P5pYQwWn__EY!3Pot0RR9#q^0RiUZotx+0(q-
zzJ5^x060~LG&Q~zGrltE7G&=y))u~S21F4QH1u>HV1l&o1{!`*@>3nY?4PMa4|@u-
z#Mr&pE-|vkJSYqybla*Jd6NW$R9Z65fho@3Ew(U<>>~*`ifPGd0pnUK%_p2Vw~?MM
zJUND~r<La&s$grAG3dUpMLV2=gx<VkyeIyv;b9pcx7K2~y4xo~uUcCV{8Rco?Cpo7
zH!|Z6X}uQL@V*C6bObNpPjKY_4)kkwLAc1<(P19V^UI>^p&xwBeK~99A@_b3J1@@B
zw?@K+pQ#Ay!&D=!F#2~L^5Hb#LIIbnd7=B$O&1qE)NB9=>ru92Rauazqp$(MiP$*N
zOKb1ap^DR^LjC`!w>N9oR{vPvirQ9|b=kXkBQAyW3cVQK|7TtIYq*b!kE=mZXnNJH
zYBs~zTc>CdFtTZ0GI$v$K9{*mvW#n%&OSKK(9*;mf6(>|Czy+`vgwg|f-1wdt1>Hc
zA|W`5T*WMrFo*4b0!0HZoJo9d#)&0n?utvNhW;+*xw_eX|2I5&67_v*-8m6r?xyQy
zK(-NoT@Eg+A<i>%sJ%O%NqaW30U;S!WpdT+jPX_Sz!lt<YeEY0q(_sm=j!>MA2Csr
zyH%&&s3B36j2*15*ZESVj;QOvIkX7d$ij>sd{5IoRq?r#Bscz)?ukM+F(_oyFbiks
z*NL<8)~yj?G45&mTzV|%3#_QDY&LT&RK|Y7Tfy4~og1(E9x_A5<$IQBN-XQQne*~(
zJ&X2Fn=9VSP;Up3s*+gUi3zR?gna{?_j>&H>}Ke-``rZ@m$LWD+t7Wv)&u*UqCOdC
z9}C0VsX7WBkvDSrdz9Gwf93QS=I7_X-r9>(qq~3OV?WJCSnMv$88o-er0wj?v0kQw
zq|6#jC3i(f6n)g&tCf9|B*c$L9XgimLf!L<IFRTF)hWJO@z$~p>qm?TR52_l9`0E*
z?%gEf73H^yu}jv2(ke}Ax_~xVC~R_UsUFn~nMv+`A><HkYre+c=Mw22q)=Z(Ud$pD
zuWF2Z9p0SPk=yW62&nTF%F&330QXC$S*Vd3U6M=b^cQHbUxNT8RxPvZad!6#YF@s5
zU^q~0K>AgS(5#9*@eh>S^TMTmn}7-69KbJox7fMyo$~s!dXWZG1w1h2UseKx2@;nc
z<yk%J%bH?Y<K?nx*E_@~Aa&8~6|nH0ubDm=ihe7{PgAOmHfS79aPN<BVj!|Q%crsR
zsD#mTY(9H%upTbl89mRA-0vk+rAjRa;hqn<A|Rdm>h*g+4jR)<>WC6=?q|8Jw~>F<
zT9MLpVB+1k$32iQSRY5Fw49h9#uayTr)b=?dgD;DO-@+T%HU#oq~o0)g1tq!iK|qa
zxgvSGb>LdaNXt*PgW&{7R|Gu^)UmcKYT;2@LR}#`FfEVRzVYEZD#_Ccp5NQCvDCak
z2!8DA%P*-iGtTpv3ACPmnLEKB94Q=a#&z?LE=E|(5akL&T*xzQ$TLMLObhJJbOhq6
z9dk#r$SL%Y%fdHQ$3dZ_3R^gaHC9OhW(c@lk(2M~Ql>JzsS{^;5Gp61QGmMDkShQj
ztTx$rSRgQ$WJw5VG>2U$^HEcH)4pYbK63yP1T{rq)EG{0pf$3*ZsQK+rMm~*xJHHt
za*|?<92pu%hxmqc6E$d)@^{I_(+FwPQJr`e2uhI_fbqzT371U~C!r4ofP%bLp6B%<
zd$cShEBFi2V-2Z8!Ih|)&rDkXnZWIL4ysP*3AT?_Ox^zxKmZ_YYfto;%JSaf&<y8D
OK9OcNrZou9hyMbmth9Up

diff --git a/resources/android/icon/ldpi-foreground.png b/resources/android/icon/ldpi-foreground.png
index 79c9be397ac91a9f153dd2f214e8cb6914de8159..d24c14f7d5323a4d3a2eaee8a9acfb456037cb55 100644
GIT binary patch
delta 1662
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
IM6N<$f^pv;{Qv*}

delta 3551
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
Z<!?wT)XBhhZf5`h002ovPDHLkV1nJU(6#^o

diff --git a/resources/android/icon/mdpi-foreground.png b/resources/android/icon/mdpi-foreground.png
index 8b82b899f68cebfb003793b22263ddc1416ba620..41ba86c3988d2669d43bc7a3cf024eea9bf4c2fc 100644
GIT binary patch
literal 2245
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

delta 963
zcmV;!13di25!eTiBYy**Nkl<Zc-rmSO=uK%9LDir?M1D$S{f|M&TKRlHLLqNVtffI
z6%Uqznp5!&557X{3u24RY#_dnQ?XFYQBi!MB8s+_LJ5j^k)A4wco04LO0v5uzGQqx
z5{WT0o83*K>wZ7*uz}6rh2O(}=D%aAssI2000000000000Dk}g0000000000041xh
zum3EWOiqo*<KOCa1{3)JL?V%qDkG^<Rw}!d6Ur6kf#P=MZ)F_Q8hXQ`(dhI<BC$z1
zq!O+vFMAZzJI|CI-a1A%L{h2LSe3IvIjZ5`4=AU1ZYmZN9HPsdSCR()m-4)TlDc!m
zvaHcea*(N{X@45_?@D_SC3(rjVzE_Ba**l1v_Qi?uXGk!)a$6MB}{V=dB<(-s!OGm
z)GHnO_m=v7-UDai=*PA(Gh>^}vT0*=&Izs2&y5+!oSU(0zM>KTOJ7RE{dWM1>KX6U
zxS{*A+~ZZBWNmXr&NeS*9pi=K`b7oa$U32xcDrUGEq{r=E=|xd50`rB%a^r_A}>|I
z?rgJJ-BpxZSVGTL-hQ{GdSu0x)zHu|T*GY9?mDeB>*qbnuS%=#JqPuAOgX9CEv2kE
zR?NM=y{3Ekj|wmAt^8N<mr4zFd7k$#7F$*_5qJMwSL>Eo(%Z3(%kF{rrxjb6c2i@X
z!Y&k3R)0!m{jv6&fi3GzX`w9@`)H{jJM2uMWzCxzd(yUPQh#?$r(VzI(&jGRr+!vW
zc=xP4>+X1m7YggUu+{>~da50}-+O$eqj_^b3VV@r%<p=CW``4+rT20{Yacfm7MH|6
zoL^Vl+R`}1{bAvBcUCIq_g(8B<tNLss(T*aGk=b8GtcSokl*L({k=hJGihTzhmJmE
zY~$3MA=!p|YiHQ~e_M@vRk^)0-06M!^;@gm^IP!HP2bP%+GYN0?NC$2mE}E<RblC%
z-_dZ+1?-S}fos#Dt$|;R?Qp`k?B>w8JeSjbmH32XvC>w2VaA=n-I+Ew2Ol`hh~L_F
zXMg+{3VZkd^`my!!}nHLQ@D=83fp17cn62Ny1FkYtUPwu#;%jzWC|;f!sfqzgd`MJ
z9!L5S$`fTag_Tcfr=rp5Tna0n!oJs~aSnx*3Ge^KbPEep*hhlGD2&1=3=~FT6h>iq
z*CWUH-22nAzS7~;ei^jZb-o_qx7Lg6G&~IVUt2XSXzg8R>L}U)000000000000000
l000000000000003>lN{kwYHD!L%RR~002ovPDHLkV1lZZ;Zgtq

diff --git a/resources/android/icon/xhdpi-foreground.png b/resources/android/icon/xhdpi-foreground.png
index 85e7aea6cf7588308c6530b65312bd71bbb2da5f..dcb852e005838bb5205402d5ff398d0e41cda3c2 100644
GIT binary patch
literal 4496
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
Y7oRv{EhOurT>b^o(|Y!_Rs$6Ef74%-r~m)}

delta 1933
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
T@jXD|00000NkvXXu0mjfz((DV

diff --git a/resources/android/icon/xxhdpi-foreground.png b/resources/android/icon/xxhdpi-foreground.png
index d7943f82625035e21bbbe25e132ff22c2cd67b8e..fa39ca199fc9266f1f787a693d9410622e0c735d 100644
GIT binary patch
literal 7003
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
N`j1SsYc(CC{~r;-Jjwt7

literal 3251
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
ZRVZ#|ziqm5RsAn!7tcG|)}Hf8{SOU-`B4A>

diff --git a/resources/android/icon/xxxhdpi-foreground.png b/resources/android/icon/xxxhdpi-foreground.png
index c80626392b008abf465019aa67049d992aa3645b..8ba20167863033e4340882099c3a31e3c2da4fc5 100644
GIT binary patch
literal 9933
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

literal 4640
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
O-M9+5Lb&Ym@P7b_okkr1

diff --git a/resources/ios/icon/icon-108@2x.png b/resources/ios/icon/icon-108@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1ee7709a2c162571267c50ae64876d03a47f3b9
GIT binary patch
literal 5673
zcmb_g_g@oTvj+sEH>uJ>C;>r`B1JleDnXj`BB2*Siu5KmAOr&_B_I!7s`L=5^p5lr
zK@gNC9VwxNH_!b8?hp6A`}v$bv$MN1vvYQ4zGo8j^)#s|?o$vD5KwDtferEV!oP!z
z2!AG3YiYqx<gc~Neew6_{~d&Cg2+Gu0;ccUU{&Kl%wBGSDWh{s|H<7Y$$Oy5Ojbu*
z_TYT>1TCv4R$y`X8jR+CGRRGD)Fn#5E=^q}`hKB6p@8Xxcfy8%D4&41sP79Y?}@Bl
zK2fkYArlMp+aKF|9WS`ktF(ZAssTMGIR`UuOFmccU(TL%9GI?{o@R1JEvcmZ6pkbS
z5)*>S0BUq9G5=K(5J`rYO9aEq{a;8}T5`s$TceqXQ#~4uUhJh@p;FmZ+hBbSFJL(u
zBk0}#3jf#%VaM89TU)<)F`J@{3p`xys<K2eGch3^ugMd`I4AB1oU@OzQN^*#c;+aE
zoNY}O%KPt{)jL5fEHIVk^#YJ=Miv$pCZ=M2K_C!FO2zt*Nd^1;`>bOZafHxT6VOXd
z#wP2xhV88Z2cMK9a1;4Y^Foh@LJrz9Qd1>@j(=TTTx4dlqOG_X85tMK-@kufQ}ZZG
zw`5KI%V?f*XHye1BT=vatAqTAsXwP5K73dSJ6}HA`%XzoxjBZ^q>%}|cwLZ4M!DMO
zlBQGqE9md#>J<|ko3=me{rft?`ua}SZ@Yic6xeG|&K(NAY4!Q7<LWBp=(D)EDCsn+
zrKJVPB;!4ni-?G@(BWh7k)^0hl3Pm(*Kgvz6s~%zA?vx+JYD)+a!b|jfCNFZ)I|LL
zr*&K45z?!}ygm3adU>JNJ}+b+y}J5RSy{R6NjJO_j^%i|gQ|6Z#>4ZB(aFI<N?LmA
zdp>->7+?`3*P$k8)ft|<lhEis&k$tapTq+dY)bu3AMx|&&lpa7J+jJSy#yRW`kC3m
zV!fv9Jry%ALIc6a9Le!S`>~WPWU!o^oT4JW;f29sn1TgGoaU%v%j}J46raS5>vV~A
zM`%_q?aK<&$OY+R!&lGLHMF(0O-$xu$nU|ZO!^JuG`DkC{h?i(T0Bhr=|<INwcRdK
z611ddifmxgydekRMhuI)n;Q+clJ4(^a@?x@!G<uZd{4SbEEnA?|H1b>#K9gOyS4TM
z;jOIk!9*~>NOGmF+bz??$h@$#MZ8bSOe%yV3u^{*Qo2fagT;M|MNUrVZ9CumVNR+6
zMPH~~^D~c(jL3K{$@*^S&Z(=B4gdDZZ+qdNv9)JbZEj^X>QBpfrb4$p!QczWhO4Xh
zl|YbAqnTa0FaTipvr_ScB6+ND<ue8b2EE)TeH6U<3)3o$Pi!;Cj7?3wRyx8i|8D<M
zG(Jhat*tA3=hLCNE5Jv=*-GA}pF%WwbR4Z$Dj#_GQb%VP{|}a30B~kfyG|z|E;2k1
z1NJbnEk&ho2Wd(p0mYFc8Dc3ZDWw<Bga9MAR=*?Qv*MHkLqkL9d<)*Q)u6Xqf#l%A
z$<U)dmU^eL0y^CRWOv@k&9_=nyX6>R(`tu1Rdz9ogkTAVfnD722VwWQO18&tjIFy}
zhAJ|u`db3V6|=>~#b@!>$}tMG;DHWS3*2E3?e_MzF}4op%<>ViXP|Ya%eJ$G_VxPF
zM$Ws-1EA1mTKt*+G~VgkCkQrAKem}EDoO2lV>2%ze7XdZq^!TS2zW9FB#pNF_DRvG
zL^uB>3o|o5iq-wMJjp0XB=&wj6Ke+#3CjoRX9qrj!QW=mY~sUcAemhg0j~?616BHY
zi8E`aa6yD(ID04*8NobsGE!3deuWk>3|)tZug`_RTnKfHvks56*AEY`+!~R!EH{)z
z^V!z-26ODG{IOX3J+LMVAMv}yM5w)e8AnOaw(4~wgn65{sHDWL(V{d}Jr2>>9sv>^
z^RJ)uoWf8gONT`-PdLbI?=l-*-9o(<0jMZyfYMe}aC`X3$A{kD-hS5$>UQV4#PT!9
zz0FO{#aD0MG`9Cd+q|NUf;KMPuXvcz>8^zC^E<R&ua=>*w4I7jFgfocTOJl%P9$6Q
zA(`KbXVO_Nce%lsJ@qcIyAm!Do7UAd$%<HVt-3@(EJqMwD_3S*p~a}TT4)7!fEL;Q
zLT&VMd1NF(3T1ES!v|HL`%NomJ(Om6$3B8^qhnQeGfq`ykMb~1*VkT`ot^)T(N2g4
zTcn-EY~&6+c8!=SQZ5?{)j=-i+02LrYashj>XoOZ%B~WZu2XpvMQ4*mO4UPK&mv|Y
zlFxlfk=f7j!kZs_BI2CWjr0+4+p`8xaJDsEpMCcN>E&qsCi}x^d?s6)j(Bi$52SY}
zj=7e{a{m#Zos-I2@>r14wxrYg>OD&TO3nt;r-bPX$0#W8L2dUpt=xX>NpXie+Il+L
zg<;g3BH((MRj6&$l;6v;;vMBG@0`8J#?9!#4VSvSk>O#RaI9kjcrET`s=#)?5EJ|H
z;d(9iFpx9+6M<z9^)w3G@|!*<9`T*tkVtz^Vjkg73*kQ2f)84W_1v~CSe?-#ah@aC
zRXGu*IdbCI#9wQD@4VViKk5qbR<KGqXr)MXH;EWx86^F-(7u}%W(~_3x8Bd{Yq1x>
z)^@VA@iIaA(%<q>iU-xMN*r+Pb*lsQgwx;Ic9~}E;C*B@&IU2lqr$lHc?Iq3yggOy
zrzOZ-?`N~<&iGhXLIrs1(6odbDK)uE=`ip;_^Rz^p?LbJYyDlHP(P;7y+uA+$2kHF
zVR_)_Eye{Uh1y3}fg%Nap@oypuf8`Scr{5$NhRX-&ji%V)4L>QXUt-i0_cie`cqNO
zN-X<YzIGVH@W>Go$xH9wS}Yc;g@Hw#(pTo?F@M={9_>MKj(_(@p#vO8__CNL009yU
zaTsC7s}Zt#5SAhz{gnLoVX0)r$G?!cxzK|WE88*o2q{JoMhb<Fyq*@Np6zDj=o===
z^$H5Nip&1vhzpOl$L$~h6x*w9K_^5+MAtVr+b;zf6ZLI)czC+Hx)}d))$Y^@G#J*3
zrR>rvQ*3>VoB++6aC!HA;a4>ly6NFHg^)Ljow|+MX<}?o#<~Bh-y1CraQ7uekfZ5i
z)gWn-Fg@1waqO8>7$y7@8L;(Z4YZHK*4DPsLeXvJ^VZf@W@hHm`T$5kK<|@6(9TR5
zzWzPe(-WxAd1Tj(FL$n-7QPELcE(+FZeRyiu{fcg453Vx_BDD{IdI8kg+<BG(cJG~
z_kB)RQPBDmBHwna`|ya;?EK0}{dAY<IW*{9$_~t;>a0JRUB>H2ku8g;m6^W&;Y7G~
z{bJ?(A7pm+&d!eKN(bcD=X7T_F){IE^V{v;>F1?-xtF-BgA@)qpVhB#!>-Q4PG?Q|
z`T0Z6_pLj_+pq3As>k>YzWj|v-H2dqAabwZ4f4nH0=lJ2)wb*d)*rl;ndS8>$xKlj
z<GGerRw7B-c5ieyNr`KyKgkEc3()e;X${T}@gYtmix~~1j?X=?xXMu1<VooiVuP*L
zd_i5k{_E$f-!=g56(XIWjWT?EzU=8)O6%SP%2A+aCJKc-?8H^lFasCc73aZ<iq&q+
znT6oP!=F9=;`>2;O|P#nyip|L4-DD(UbIV!F6A5)ztN>uME%CP8eK_oTmCT-@n;1e
z*Wlq$8t8c<8PwIaEF?<HQNlphIX(TNkf>N_;6%t{$OYXp9DLJo#rKYr)Sz^_ufHF6
zeezB52mKJ`o#OKC+B%E~ci6Z5n#R{dp~E#o3Doaj$HVt&q8BD6@W3qM=G2s4RYX|W
zSB4HN`gB&<dn%5@%gE+iK~3X)0tL&-^VVfPl>pY>mX;QJUJa`jKW#AGkS#w$!j<t@
z12_05JNZxJY}S*umJBuNt&!4^Rz8-iRH2>uWGD;B+B1=p^k_U+o_KAx!c?6Yas47+
zzghcBBQUB0v69Q@I({PIM;q%QWeR7JVfaWLJ+@UbwlzS_WuM^&=1@3`6e>}+!~K31
z@TiX_I`HQ56d#>7t^N=&ovZuPcp67klfR=Z+&Ffaw-ES3-j=+MCD64cUt{BFjdZl+
zMmvN1v!&upja{4FAHN=u7&}f}z4NT|%?ML=rE_!b;=51Gd3}9LA6$Ai90InCcKKip
zj3nTuvCGTL=4RP4<DCa|g#`tqni{0BagZRTtx+QGD+y%@HHeJgHiBe>O2Pwar_?@e
z5>n<k_;LNbumWXuld(M^v0R>yNdj3e8T5v&_9tFhc-`(CAESE!sUZnlFtrSQC=`fv
zoxQn7KuXJ{%T{j4cJ%Wyh1&Vta!z4B^T;@ZmjBn%=e!P=w#J<m+ED)MLAURU@1RCB
zNszH(?wZ;-sD(Y3X`K}J?cndp#XbN9GFQ%5p!MoyfZjLz06@ukE*_L;NiO}Pc&T6l
zNzT6zTUy<zwntFJ{_QAfXFJ!Z^4YUnCpmybY;2OgxQR!G0HB#0Q@tP|w%0*^`;TC=
zv$Mp|7cV}T0qT++oF7t<(*Q$uxNt5*pRiB$+Pqejq`P5Bi*6ewJ&RPymv4@iF6OFV
zA|&&b`V}cH;-)RQ_KwiRKxLx&;B}T)s*h}YVFo7C8g+U6&FHKdQOC)?7xguW$|Z%{
zumA8E^ui2hKNw^}yvV4jAv!t_goNy#YoHIpeLZ?_t9+NN(sERRDV02+kx-q^a6eEy
z=b`n(bbX(~aWLhC665|u(-AAAfPWpgLGPw;ZF1%K^LJFVR0d#@xQgyy<uI~p5dV~`
zAjxgokVCJnii(P#-{0<7$`o$p@eQc*H6rZ#NczTC?n4C>36xnMH#ERtbCPbw%DuqP
zxXiKxed-Up6t{<m@kqOusFwdqD5y}P_+VcypKZOzhC=`p7v)$EDANI&4)I!uzL9Mj
zl-}!Lx<FG9bIWmu5RcT@_26^M)pluK9g-7skVk*@el&?WS>{cwp(jncS=dPWeW$;V
zJ+kI5nVa;YUC@3>6&7G`_wby8ZKTKioG?C~3nzQ~`#&j$m{`%Bswa$@KgX<`);>Hc
z|8|Ds>5KR?!m}MggOoDly2qp{LK;)?nM4PzkrX#*%)k~e<eo3VbSDFMACUZ)mg0j>
zPdqKR(ko1Z<H$!&+1HU06a%!!S0SG3Gzs4G?7x@`vY=e1Y_cIQlCw~=1-C8@8tDXM
zJ0Cdf6-1<r44JsO#S{`2f~e53eMPsg9gLiA`>j^`IlOwHUe7u*!V)qXzdq|+xUy(D
zD3iH9A1B8=ddL@1;Lx>jXzpF-T3a{7>lnetQ>sy;7p5vLsVA+>qYzNw7nV9N!!3p@
zZd>yVTfTF(@<VdxyCm01R=d>@P)E9dI7*F;t*YLUu+wWSU9L!xr(3(b`ZO$O)s7S6
zCvuO0VR(4Bmk>dsdSi`8cpdST{BtfBlcJTT=BraStB&hPxjgpt+4t+#d3#UyJez2%
zoQ6-Djw2dbs2XhLhsF=!UGvg*pTEp76DJtez4k`u*{$=@CmJ#53hVR<nY#=yD^^*a
zgjR536z+g6;M~eKm2Yd$>uMeA&RY0b)059-#%@fNEarwzT}OkPwym?wjRxKf%Qc2v
zA3b76hX_2}5$itMa3`9cHwP9$clpX%%dHt6;J;y|HYVw-=S*|W-BL;3hP2ew4&0@C
zt6;!KCsYDD1k!5U{edLqI@b-;FgK3CUB2;N%UQbCphBi$**WDn2~V!e1YDF1MAW>8
zX~6ZWs3#hKLN}%Ft`RI#6hmwev;nD<a4yBmoAVWxd*J<FG|cP2O4?e#xXhCWu1M^g
z11uhVoSYBc5cW<q@)sUXv7K=^yLYG88J`%XA<52>gGAmzK|%WZ6FG9ey9G;QrZ5Q-
zXyjnL^7?qt8e^n_XvqzBEpqTOS&Z`@Irv8v3bIL>Bu5LCzH<b}zkThs-k;pj(IM7$
zs1_F1Zr|q5PItxH8EBakJ*INq`Jv!+^%qs0aW2CqpB(^qPysBW=DG{C-*23^p`@n%
zF!FnCG>?I^cSfndeH$3H5c>CyxQYkX>f;~fM6!aTlg@<KVSV)~4vf-|ANTe32{9&q
z{rdHxWzzz-Y;2zxXiCR=?gXP)iw8ytVtVCB*T#dg|AK;9VBNnM&YBf;?nz2YE`OsZ
zgg(EE;D=qEAArP?5))Ik`0!gK`aLyC6?}(-sP^+`*jvH0p&7SEvQr8?E0>_QrsjQ=
z1p92MVHue9l7Nm73Q{R*d;gY|jg5_iBlOoGy>n|LAy8$P7)Hq=>HtU;)HqnEy#pWu
zvqUz(>>?sUB%?uerd1Xsbc6+zD!LE|lbYns`%j<X9Q1$|g5K-vP&{ayHMJ#y5loT*
zs;yg12*jnN{P1`SK5tEc7c4**aPR|C#&btpL_|bf903_1h7r_S{#(0waSJB~MTXm%
z;`Z6u+5bMQL>K$rzpuA<@VAc-I7^qAo!!#Xk`izA`CGx!oa{$-M6H$#KV>}@YAjKn
zaxcCRfFl=p=twXUl9J}xpY;U`3JY`Fl{x?Q1_`1#Auj?acL$Mtx1zEVuXK_G9*8}5
z{JG(6TqheMBM?bOCr?rE=!=}3oH-Ejh~tYDnh3876(tDXeDi0HJi03<tc~D*+=w6y
z*cfFyqa&~|F*g2J=`w&qJX_rvN)IQav%Uj-H;!LZV|k-&GQ6AIRUG)AIXXJ}`88OH
z2As{+63_$upGZmW8X6jYc2HFYs`#<NM4oUfg=S8H|MC)nO__xoq_TAJJ0lS>vAcLf
z9|JI)o`b)3qmlTf@goI0C89i+%gf4Y?O9n>{Fq>H*(bNLMBvCR5tyfc1l}BBRYq03
z7CZ}Y01$8T|K+0KZ8IMj`KM1YDYqj-4;31*Pkv_Wm`DZW+zpK=^{+hjO`u*2#WTkb
zEXP%rkI5pn05&|5(@u(oV_aI!&YPCisExf_iSR4|0hp$V`w#4$fK=If`>MQ=2glJp
zw(~`}$;Ge{w$Ed`Uxcad!u<a%Kfvcd>wIIBZoZ|!L8xVZ(aHCQP8D6c&J~r~=P0Y~
z8F-_#`>7Z(%H>ibS?^`(IV3+sM)$Uh4B1q|61@;S_^RcJcXrd9(^MkbYb@9k3Eca%
z?8bZ|BJBpope&FbHZjvZ>#8xq?f9l89S^>LNkAX<-zNV*eNlauom)bpa(R?(oZ1Ef
O{?Jy}16QlPjQS6d2!AX9

literal 0
HcmV?d00001

diff --git a/resources/ios/icon/icon-20.png b/resources/ios/icon/icon-20.png
new file mode 100644
index 0000000000000000000000000000000000000000..eab5d3e35dd00d7599ef3513f965bbc6de829acf
GIT binary patch
literal 608
zcmV-m0-ybfP)<h;3K|Lk000e1NJLTq000yK000yS0ssI20_%!e00009a7bBm000fw
z000fw0YWI7cmMzb5=lfsR5;6H_)h^~pq1u-|Ni~``<GbFfByXW1qMKEB-jkm1{eME
z<;&y8j}IO^xOeZKUq8P8|M%zrpWpxg{l%^sV%3{BZ#Hh+SXEgW5)xu&W)>L{cJADH
zxGa!D)6W2rxO(+!b#=9^t*wTJhMJn1j*gC<o!!+NcR-GMefQ7fbAMmm{{Q<2)Cgpo
zPoF+rUS1xb5N~5`WoBY*Wocn*YNDj3F~216|H{NqRpOtExjt8mf1Ba?_sK=D{=W##
zFJ8QWcsM#PNnTAyQ%Bd(%&IfZ^K+Hh=W_n9-6lV`RDYdd{ke$a+f>*8e}2L32Wx)*
z{KwCqK!FQ=;fuq>R<)$we*EhHn`_@&)IL>-{W`S>sOI;@^`EOmzceZReft1zIY{&7
zO`G1mdk^y7ynsJt9RK!rfmFYF@TEilbA{mVYuiCmxAy~G{-se7UGv&CYhJ&81B#*9
zfgg%EzwK-Ty6Nwm`(HcsK$@>^18Kem*4%)h`T6r_KYs#!^7q@kkk6$&KlgM31%Zmb
zb{T%I5`o!#;B&3imnN0J?@%>EL;vreZ`0g9WitHS-T>mgx%;I-;Zq*t@5`G&zPPdb
zQz8533ZcJm?xAS@2MPLre}C?1`ZnA5_qmlI-lrGeS7m&g7yRepDUexDFMeMT{(VXO
uzfUhwLYqpt3g`roEB@i-(jh<7Rx<!?<RVISI-y+v0000<MNUMnLSTZhGdSP?

literal 0
HcmV?d00001

diff --git a/resources/ios/icon/icon-20@2x.png b/resources/ios/icon/icon-20@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..125cfc7259f92b700f55b46494d1007e2b32f7a1
GIT binary patch
literal 1193
zcmV;a1XlZrP)<h;3K|Lk000e1NJLTq001Ze001Zm0ssI21Dr2900009a7bBm000fw
z000fw0YWI7cmMzdTS-JgR9M69mu*a2RT#&c=vSlLWNNLlLf>plvFjT(nV4XV2@!&R
z025-O$)Yi)G+PFgjh2>me9$4j5nZZ=WCUuqQC|F@ONQIbwn(I!@L^JDtq}s+PTG4*
zZ|_@u&b{TXbb!MbX0%UEZcfg<&+|L~=bZc8b4A%ZWTGOt2>zdg8HS;0nxZI@Br}|`
zEc;J^AvDbyP;b3UarSqD1zx@;f*=+b7pJDCMn*>Z`}<p3T6%hVlF20h{9gt0NI@Tt
z<H2Ci=kwX^_J)QAv)QcE=~OC}L?W@-Y|G2be}Y;F27lo3QD7B8nb+&BudlDHtW<GU
zQBh$u8UbvzT1Q7mc^7cXGW5;HGTQ?S$V4JBG&I!M*r?HH<Z`)It2G!5CX>m`8BC(C
zt}YslA{UxsfwWQ5{tzz`wDMUU7#OIntyQblAdZK@)v#tDSFhJsS65F=e4g`y94*dJ
z-<>6|_{b}#sBisr<XV<o&EdBI^T>2M?f3g@YHGw{u~aIBtO5WqhFc5<D|I@VToIi3
zB)bw$eflEawGV6GjkVp2wcQ5|cRrHpJ3wCjm}RIf@HucO6zc2i3j_jVV`Ia^!-Io^
zkZOKK^Qk72@rf$SV|vS>=X98>G}WWQjy{Nc%JCB#uBlUS^~ivYweLy$U&~SipU_Rg
z7=|q@EC~AxIvtL7wMuEVm`z3lG)TF{V%e|Pm&p{bJgts9%Lw;A%=IYlmf~Gf%u#}M
zigBj|bKDOJfDyb~jvcutGug{+A9_=8JRYB&orMm(NKlWU<8ZpgQl-vd(LQd3rq*bc
z3Wd4K`lh!l@m3Y#5+@-#Fx+MMv4_$_2kFRFIyyy+w&I-+BQT72ic`H+Y$ml~!bQSP
zjzl7BiqQmvr(MUMmAv%K{^y_4zwl(mt1mZy_|d7k*&pCm=9|+=M+piIav}OV2iSB%
zh`#D;z>YqE^6x6e-Q~>B-*dN^O~KRC)51nYoq#Rdxr_3aCtQ%yQZ_cvC5?io>0d&y
zib$@f9M+OJ^9H&_Q(2ls)B4g2g9r?|of3Nf@`l+K@hdtvHwU$Xf17#m>KWTg+wO#0
z22`wDPQ@ZL;-b(@ER5uWAdd|8Gcj^Fr-_T6xo~nD;F+13rlzKR#l%?~1Vy1aFnc4)
zD@K=iWIgy$E;J9G+zvP#4mUS9!`sYFoz4d%K)0OP3Ve7yxc9ceLIG)QZH>iZI|ml(
z<@osc($dn7f`xA_7zbu{6rA^MxwGJNcC2GBeq4zd$CZWPZW-=D<5))t5jetmt%1LK
zn{!m~lcwjt-X1tTd@yOh8$w`hyPy&Q>?Zivd8o-~ykl>&<*xK+udh>l{zT5PeGimt
zIy8CvV6@k$>tB!;PLh}V$&2s7l})b*b7EJ2BQJeGUV0zKp<K|{&#!&_kt6-%wVWe7
zaPeK{#!nm9>VMz4y5J;Lc*5TNkX3jDV~f8qMQ{=P9|ivoauJaS-Ub^C00000NkvXX
Hu0mjfcve6z

literal 0
HcmV?d00001

diff --git a/resources/ios/icon/icon-20@3x.png b/resources/ios/icon/icon-20@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfa0ecdba7165538ede6b5de241689e893d167b3
GIT binary patch
literal 1644
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

literal 0
HcmV?d00001

diff --git a/resources/ios/icon/icon-24@2x.png b/resources/ios/icon/icon-24@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3b06bfc612fdbbf2fb35771aa60d68e90574efa
GIT binary patch
literal 1397
zcmV-*1&aEKP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00009a7bBm000fw
z000fw0YWI7cmMzeCrLy>R9M69m}^WNRTO~vX-rHkg_c683(K<XE^OH+;16QzAATUD
zsl=khrfov4#t@{umxbNJ7Ftq68i@SkA<M%`D~3eWA4D6`NT9%Kf}y;OAP*nx%rL{u
z&aCIo47<zH0&P`jvL`pgy}NhL{q8yEo_p9J_W_fj08juZ02Bava^ZN{A0SwmWm%Vx
zz;GWd<XQfqmLLdXb#?Xs0NQQ<hG7;K7Dh)$`}+DC8yn4Lb52f9c6RpA&=7q4G}hV)
zh~-6a5Ijke92*<6+wDa~MOj%{si~<-rBW`J$Hm2khlgimWK2v<cqaeLK)~VA3yv5Z
z9JE+0nVFedtu{6`R-sVD$H!|l8l%yen3$+mtLy9QDT;bZ+dLddh*qILJw4sf(2$;<
zu2QLFG8sVVbUNdv7z_sBOG`@|7#Q%H6Sl#++#G1&P=k&*e0(4X6q=?5rs3h?!otFo
zloT)qSRyGYDLFYAAap*W*XseXv#SeUp-F;eHr$-cZ+E^Mb-U=jkOleL2A&RwBQGxx
zwhmSi%%FRO01!-rr@gaNd>!(@gL@la+Q{yA$hI7^^)0e9m+Ch&<99gX4}J}HS0*pe
z<m6;QL4i~%jfjYVI92chOX?mi2EG1dqDB)RH#hK+`|mlT<t$bnhLs$`N`kS{5Y(Vk
zd<ZKGCF&CCZ*I96O0?EqfLdBwYHMqIdwbj4+nbx4o0^(zHXC?t2PUIl7o#@Zd_%!l
zBc0b0u<|3gB?`Anacc~IRfZaLU}%xzm62HSi{!`WIC_0&rXY{A=I7_<=H`5FfTg7+
zINK0I;1_?}fB;Q`zAz(!v`Pqz1T#nCmT0_6f|$(5k!?zX@rnrX!>TCY!wO%ZJ}VY|
zw<{2wsi~<cA?bl2pylOPPQ3~TJISDj<)Im&!ym3Vxm>B%RG(1+2ci*{<Y_Qd7;#-g
z_FSfJzrX(B%UJnQgy@-Im9mRJ@4(~*nw^~mCSMDY>%{A4PRo=Dv1&uCS}#9okf}6~
z2(?<x#S7=Z`*GC$OF#I+St;SylOSW5juE#`an2=CJx!1(u#Sp$vc^D2(cd=mxsKW0
zWivA~;!yB0xi)t#_3nkJn`c!OrxQwFQ&hj5YVYWP@E1}J>~X#IO}y;Lrn90Ukm+GN
zpG9cY;O~QbnCX~kB&!rFIZWNXvWta;ObFM)`1rUu<bgPBg}R|(tr2dUgsq8oRfKTe
z=Y$mDaxwG<Ix-tySW&D%<O<Pa3TJ;E**xJ$3H#?fZd2lwCy>i5QXr;!-rEHTQX)Lz
zSatDP4h;n$e1*8Kbygf-tBi71Nu4DjMCT=xg9TkIdTZnBI`D!B1g-J}yWsFmIh^x%
zIP(zZ2*@e`UEULr$z-ajso4%B>f$#?c3s*$w44a^RUIUr{{#rG&;0!S0|eC8)|Q)_
zdmw;3K@GRqmZ07*AVHx1YHe-xJ@)$y1RN_XE8c2h-+}z<v;zU;Er$=Tg>LBJwn8@p
zTtj7{P<i<SL1HWo#;?YpG>z_um)J!=pe3SC<Ew=F<lQF)!j=ih`lW|)Qy5+mj$L`4
z>^ScaG*FFw@Ej^L;0A?O8p{4Qz6EG)k*Jm<CFP<Ls`KLG1M%fB$56~q{mlK_%vdio
zc83}5am{@1EtZ9=YQe#bbVHHK&*^3Ef6A@@wK<1ZLX(W+bNF0TGScmu{lUNDes+Is
z;Qg|tZL_oRkB)EKUY`0-U<1Do1%LuT0iXcTGYs?(H9y^3lH>*|00000NkvXXu0mjf
DoCKB3

literal 0
HcmV?d00001

diff --git a/resources/ios/icon/icon-27.5@2x.png b/resources/ios/icon/icon-27.5@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..07b03695d6fc44923e03b798adcfc24e00adc577
GIT binary patch
literal 1577
zcmV+^2G;qBP)<h;3K|Lk000e1NJLTq001`t001`#0ssI2C%Hut00009a7bBm000fw
z000fw0YWI7cmMze+et)0RA}Dqn0ri9R~*O5_SfQ)sqCRJv6Mo2)wZ;ynQ_Bp{-K!(
zGydTi?BPbn{@Vg<l$YftZirLS5oe-~MReg0U<ojE3}vi<4rGh~6J!p7gq5uZ?rrIP
zcE58^X-h$@f~F?-<n-kB_S|zn_xpRC-)(^7NoWBgrAR4Kij*RyNV!bod7k4qmSth|
z7fN7SU7%H?#8NH!lg(xuA0O}Q>#MD;9UL6QkMZ~@v1VSkBuTQrzrUfOp|Y|vJ3Bii
zC1uyHUE8*8i;0QJ$jC68&5w_g7n<wq%*;$%TU$j%MQUp5_U+r%YIS&cxKt{Qh=_=d
zjfDe^MpIv3zgm3vrv%Ho?qso8;NI!!=|C189St;cxm=-80Hsc+i;s`jYPB+%EGa2z
zbad3~+DAeOtJ5@%0|E{@IywvnLqbAAq|j6<6#!u@jYos?Wo2a)MPWo?A<n@u4whcf
z;SA5Mh|<&fAP(y4>XMU_K`@X_sZ{EOrdibBBsgMqbv0bYGK_%8J2)1N_cRmhc#yOZ
zu-LwKyB#7lF)<Mw4#dM8ntL}873{uy_wLTlPV}hkyjl#!nMc^6%S`tL=6V%#<05mj
zh5L8Z!Pwob4*r3)1R)z68~5zlgF`{D*Dtp0y+C7QV^nH&OLG%i$4=6wZ){)hAdQ>J
z+?R-)7l`cVVT5DSD6yS<ow`)QTkgz*`bLQ*92pr&OG^V);FeprZUz0o)o^@hd}#4t
z_buv%4<wF`lhzBVMCKaAR3IS>L&-wvd=EuufII6svNVeBx#)CX-zg_2C(oWe3lR!w
zd3bnuU|^uPw--i;YY6IPj1E%kb()AR+9Ug793>$$S?h_M7s(<43sV+_IXiqsXQX72
zjLZ)vvewe3Q@(%(xZ(!J?(S{~YEMsvv9z=lq6bXBBqE}Zi<2p|hD3!`fFKZ%bRH;_
zJg|u{1QLezM0Ox@fPzprD;yg)b7R-;3mV|*lqQo2C~>&}4HK7_mq$j*U(v_wv`9A8
zwaC6$-AK7STA}=MuiR?fgb<AqCj{om3nGid=gz-pugjdPdYd$ckOzXDc86Xh1An!D
z|Iq_b0v4o3&kY(MpE*|*B#DSp>!X!gg&Or(l~x`Z1sMRmcK`nOuixl%{C=Lu+eo-{
za;o^UwJeUC{KFL`%*YjhMy$@6q3HOKf+x(_pgzSoq!Ley^TN{RpHF?aZ$s9bs&{rM
z6JJxk@v3@ng6iWB-#uP&0;&p}9pPg;_ZA86SU7L%qA)NtM7r>}kk1*^A<Z@BBhwd#
zxu3@v!rty&Ud{!6+1}m`$<iasqszFTN*wv?_(M{nKw{39PUVDH4l4M&cU*fsOQZdU
zy7Cn`-+YLKVmY}xzX{V=x14`o26{IoNS+_W4F0%$R&vKUY&ONk#W1=H1%cAuTzvQQ
zKudva#wa1sqQS&r9Zgs$8a5gR%@kIrJI^ej1XGsCIrB}oNCGSSmx+K3Rp=33c^jF5
zCSNJ1rlz3o8XFs1un~hu&BgB93zXJ!9X~gV)po5;cYRA3)_GG--}0us-9_YXSVY-)
ze@e_WF);yYyr-w<5mR<PBqi2zdU_g4iq_UvS9JR$C6MjhxfALjKc#eG!Di?z!2FXE
zJ0iTn)YR1YFC{iQyiW}c4S8iEKce(3*S)g3Ncpgo3z457%1b3sU!htCRj*-CFItc2
zm!P~>g~|v#4R6y2qn4ojyNiHw4ys^Wy~Bd}!OURON+{7~R739Ur%$7I7on0RK6{ot
z7|GAgcvG5A&wlb0ROx6Ml)YJNfrk6XV;>i$v7^7vW;}ylgU~c#!OS&G{|_sn6texT
zHhaq#RNFD?>QU<IF{-tk>Nw3al$Ye}L@$M=9T%n@g%XMS<pgj2&s{hQBY$_CYCVkB
z!PA5VIrFejmD`j5|0NiLwL4g9L0|kHjiyoFeR25>XO@`8t(a2$$6BNmDMd<=Qlu0q
b{j~iLc+yqb1ELzS00000NkvXXu0mjfM>Fuy

literal 0
HcmV?d00001

diff --git a/resources/ios/icon/icon-29.png b/resources/ios/icon/icon-29.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe94321bb00eaf8346091043a11a2d3e2e430164
GIT binary patch
literal 851
zcmV-Z1FZasP)<h;3K|Lk000e1NJLTq0012T0012b0ssI2+41mL00009a7bBm000fw
z000fw0YWI7cmMzc1xZ9fR7l6|mG4VaQ5eU4)tjKAOiitsKjt>KHJzIz^`<$?AVK>F
zdKLIGrkQTjb;Xhhn@N8_&>+oKti1?vY%0E}hCeD8sHmaA+T4PjbLZ~Qb?%Qg(~12s
zBJgnTx%WKxxu5er&-2`Svyy+OW$kl+p3AZ<!!R^Wqw!C<h(&*Id!RRk+iZjouC1;4
z{r<_xNrE7LjVo+6H4TMAKA&%3V4$U?rKzb&tJT)m*N=^jah?o~4zBOYMMT6Eq>YY_
znoK66(Wq1^<#M?~p-`$+ZLO{0P*7O@2fz*y&q}$*Vljuq(cIjOKr)$3qtWQ~`kI;=
zq|{(AEX>a%9}2m`F!OniS)FDg%Snb0S0>>c7e&+QbRvNgi9{-u>U26pM5C5(=t{0U
z(|E~{SePK(W_YIpVr393fxYthBO^8I+)*z8z~k`*0)fTF#i^;OI>UvkN{wDut<zPb
z1=MO4;tpRcp=<@Q&Rl3M0Jn~U_9M`80$TGy`(bi?aJy=bi{p4O7!>9x8g&hgMKZOb
zQeR%7DlaQFG+cSvW~8w~&?Dt!_DB<M3o$W>+s{E;5pOAHqo1~*Ic_{27q}?Q%m#3`
zU+iv_nl8(`u3sG*9*KgD<mwyHeF`B!$FYRlEIdiidpXHiDeTOlKDhWC(p%%;^?Jo>
z!=vorS*E9uv}Cj6{bJ7HI=ridw$o_)q~9SL*Oy?g0!aquTypwp25vYU#xN|&R|VpN
z{@R%JB<MVz@Y;oqp&H=QC2-$85xJ3N-YDU@Lm9ZJW^Fbbkw^$!{6Q`3;<%*Gp8RdD
zP`oae3xL>Oa)lELF~ffo_L$457UCQKirdd~*|6l1;}6r^J~c``s)uymA}g>@1+ija
z%_nDucjMv_{9YC8$Of$kNzZ-pE(mdTYR&^U4v=pjr|aQ%F*N6Zn}@{3wsX^sCaAz`
zYVJ8T`;7S#5RFuV`uK`^|ALwsVj@f8VgwY8vm;D&MNs!o{zGUxLf`z#r;RC5Y$oIW
dfBwJbegi>!v}SyfMNR+!002ovPDHLkV1k9<ntcEO

literal 0
HcmV?d00001

diff --git a/resources/ios/icon/icon-29@2x.png b/resources/ios/icon/icon-29@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0b6b043824953ec76175e3cf69b11105999a6f0
GIT binary patch
literal 1612
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
KMNUMnLSTY;VFh9U

literal 0
HcmV?d00001

diff --git a/resources/ios/icon/icon-29@3x.png b/resources/ios/icon/icon-29@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0756d9fed2942eb63fb5798f1403bb43fb7f40fa
GIT binary patch
literal 2340
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
KMNUMnLSTY#$zqrQ

literal 0
HcmV?d00001

diff --git a/resources/ios/icon/icon-44@2x.png b/resources/ios/icon/icon-44@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1f2e56bf0ea3390cee3bedffb1053523907b363
GIT binary patch
literal 2300
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
QHtY<*^}r#gN^D@#zk8uc0RR91

literal 0
HcmV?d00001

diff --git a/resources/ios/icon/icon-86@2x.png b/resources/ios/icon/icon-86@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c791d4cab0737d0bd2308874cf4a1a10be794ce2
GIT binary patch
literal 4378
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
F_z(6z)F}V}

literal 0
HcmV?d00001

diff --git a/resources/ios/icon/icon-98@2x.png b/resources/ios/icon/icon-98@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..01f600e0c7faf336f63927cdbe15d1d8e93b880a
GIT binary patch
literal 5008
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
VR~G6OUvaRHhKi1IwW4MCe*hI~bVvXI

literal 0
HcmV?d00001

diff --git a/resources/ios/splash/Default-1792h~iphone.png b/resources/ios/splash/Default-1792h~iphone.png
new file mode 100644
index 0000000000000000000000000000000000000000..e725ae10140c220e69cf6f2d81ac38f1b836e28d
GIT binary patch
literal 27457
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
WvKV}_@iNx7Z6@a}&Xu3Ne)nI}v&UTk

literal 0
HcmV?d00001

diff --git a/resources/ios/splash/Default-2436h.png b/resources/ios/splash/Default-2436h.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e7fb644cf8fd443eac5033410bc9429ae2b8493
GIT binary patch
literal 40154
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
JP}0cv{{RfZER+BM

literal 0
HcmV?d00001

diff --git a/resources/ios/splash/Default-2688h~iphone.png b/resources/ios/splash/Default-2688h~iphone.png
new file mode 100644
index 0000000000000000000000000000000000000000..af1b72ec8d85cc7b6229a074563b01c5538b6d24
GIT binary patch
literal 46270
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

literal 0
HcmV?d00001

diff --git a/resources/ios/splash/Default-Landscape-1792h~iphone.png b/resources/ios/splash/Default-Landscape-1792h~iphone.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed0dcc13c25491963d70f5bc04eff748b3a8f452
GIT binary patch
literal 28130
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

literal 0
HcmV?d00001

diff --git a/resources/ios/splash/Default-Landscape-2436h.png b/resources/ios/splash/Default-Landscape-2436h.png
new file mode 100644
index 0000000000000000000000000000000000000000..8933029aef0d580bc81b34c4a673f4552981105a
GIT binary patch
literal 41974
zcmeFZ_g52N_Xdh$1pymfK&6TFUPDv_l&VxI0TGbiJA|TAq)YEb5Rl$GAxiI|_aeOn
zLN7^3atA-(_x;>|;I8}2J8Llvtd*HL`#gJ}XFq$N1iw*{CnKRFAtE9od;RLA8WGV=
ze<GqQrZ+AF{|S@ocn<u!Y5z*ciHL~w-o?))qU2N>BBF;xuU|gbaG&0uyB@2#`h8>n
zbR2?YeY^SIQF)gtQ9ASebC|m@|5^b*9gN@O?SybU%fxKcOCvgEu6G|I--f;4<)3`R
zd~*3IopIU2%+Faj=r|UnvD+SI8G?eJ?~+!C3kEINr73k7r8*7N_ST(b?9LDh8Gv^I
zj)%mA-rN6N66xG#zV!FfPw8vaKmU8i*7oY3tB3bKu>5oN?I!=-f3CXxX>R^=W%45I
z%0E{EkK`^!3mi%RyWRh6_YV~Q2bBML#s4D8Kfdt4@cF;B;(zPxKfdt)4XLoEThhlC
zP|`}1fC-?Ng)`c)xW&p+gR%4#8xta;4cotz=BM*(wX@sclZ1`Y-IwfmJs}Uo#t+{G
z`$*78hQ}5jE$&90fn<>7<M3u}-tRMCvZcr5hemdL$;Qa7;oY4pj^bQkz#uYH|L<-&
z55$lWd_FUS=jDUb>{Un8_L1}7H;s+XwGSd^lccqMcBm4a+q!05?zQm4WUThFqAQiB
zB*osX8@@Nqc2k-#mJ=ygiHI8hAy-c!9C8EA%t}8MkdT?oL5cURplg9^21YF+yVT5)
zq}kW~YnD#!y3Bab`?y;Z`&-1Xvy=t{5q5CrFLQgdIUW+F=U?;bdo>}@>(-5aJ^!0}
zzJ4@Q;3`VEuZ*-8p{h6n{g=JX#r)-PaVi%CuIJ^&*-wG}g2S0UzBoV2xd))tPvFi4
zW;2H`9`Y>d{~mHN^h~AyGr$Ese8cvaBx*=pFvKVK{_@19X%`QO4gTL_E>^%doB#hB
z4Ql>65Bl~&XT5&OUiqHKVra+p4WB&jzw<?Lah~s$%rf?|L7sp7a?Kg;l=OG<f-cSs
z<KheDf98hDkNO|^=O`u&q=@d8cQU5%8+WiK=nI(k#O7uAG#ur1+}luL7yIuW{gidJ
z{h*P%Hy<^fOk0ssak(!Av!j}^D0<sEqn=ofd+aLbtGvD*ZFl4!K=*!Qw<{4{QOwsV
z81>Iq7K4~<Re9SR?~^+h#{7e$e_qA0ezrifFrHiQ<opnUNEWuj9Br-x>5c!*dl8_M
z$qf8a9{B7x#mSUe#@lSU@CV|KXM2mn!ooAwmHjm{wtAYH!X{ncwzjrfDZtRRzNCPR
z_qr_qIL|-mwhoDA(JBAXzSJI?;klLXg{ohlwkib?&JR_^7X1zJ2MJhI<1VAucKM8L
z<4##C`SI~FaQ`t`%`_6j{NiF8b8~ZRYc41kRQf~P*X2mC&tgl!4wd=UhD{ySzpf?&
zoHMU0j;}H-#30tSOZ0Vg&0Gdj#cSt1k+B@=a*>SQXTbOYlPus*YTagRYQM__i3kae
zj*X3tj^5%ZC@JBA8k{M3dwa{|b!3$wNSR0%)X#2e>pQfA@%xb_6UL21bGyzQ7hb%2
z!9NFEon<>+<`c^Ij&HXhOW}CH)bnl&-V+91JAk1e4e(_j?2f4O#^Chyv~Zp{RV<ry
z{F-F^)-u)-7>ja*)Ik@sS%0!=Hqjh@^#66=xwr=72c2jYE4;;h*<N5)>g*R&#hpI(
zCGxv$jRJ$m%Y!jP>3|V?c^YrgixfGlcD8f^55Ythm6tng41Nbp*NAFBu5`yxbL*NA
zUji*EJ^lB+8C?3kxrDpi&Nox+n#Jwrn=Ym!gtJ6!^GA%&aiJlD>!cBY8&wEoZUT-!
z-l>@>DJZb)r_^d3*TQYER_vA6)SP5~A;*kl;P1aM=j9=`^13vKFZzEy0=6<Sc-&6O
zsnwSOCVUTKYyhyzu9|+1G$dfY$&k~EJDONbjs5;|J%LSHL_~y~bNbEk{+wbZRr<at
z9Nm9URqCx}jsnY|;6-Ts2SU!IIr-nLd{{%W5)3>o0FbSxxf$r`%|!YfWqSk21pZ`{
za^Dk~u@(fdSR$*gsBo!5nm!;y-+g}0Z2{LOh|sSvdF{oY+`N31*m*go=)b=Bto99w
z7pHa!6tkIU2gjX&&lf4=nY@plUuO`q9Q`>Q+g4Ce0H7O#!3@uK0=Ti=tB)ioK_HOD
zDGKScKY$rM#tJld;y+&XoPVwLFCP1}igl~q_m?ifT{WVD?N;@v*adtQxF#bb128xT
zysml!*0_~!OSB|8IoYT+P*_wHks?}p^jZ1q6;H;$et!}9{jB504ZS<Faszy!xZ?=`
zH!f4A3E@m&9|G=_NgC>&f3B&mO)VXN*~ECLgW_9`iw-GCsYxm9Bw55}`e3!UaX!L^
z<mi`E`M<-~8uy^@Y7eCb9}UU?=9@PPVyNk4^t#0$QB_55`FxY{o9V4@R`Fc`w19VG
z!tVv0&U@J{nwB2!5FMooR{Zx)zXDGqY-=4?d)5I|uBF(eOL-gsHxq%L?E#hpKCb4s
zt)+19F)6QICxct6n8Q*_0IBe+%*O-0f7dz2i!;5P1^2jcf-$7takUa5jm-n&@~f+l
z!T4oxAO({FL_^oNy2*)Yq46aOPQYs$c&zH#!NzPMTA42fhW@<`lV&uF!-I9nQfX@G
z46rZ$c)}2D)Z#Bg0dmIf)G|rA+XM4vY`i@9U51ni*_hK}Rajii4LwIAeDPh(k<N2l
z!zWjtE-7*U*I~-=^X2}Vy}WQJFk{NeLYvqH0zN_#^-fO@h<sy%gKsRq&DlRSNoeV%
z7cl7p!mTP8cO)B1Roy7V^2TD_>fhjfJT$gN!URMoblW}ERFAc!ASRzP02~Go2yD)E
zCNB4d>*2MjY9T8do1IVB8PC?i1drpbv7OC;qo%tzHO6)H{tK@6AlBCh!-~9f&Lhg5
z51je{%j*~#f&uIgYjoK*QXw0GxOQI}k06{QVpOGdbYnFGuRPt4{dZh@-(l#rl**6&
z68mlUD8&Bw4LcSA(GXI3s}Zfy#gn6HA|FoY^7|?^7o?$T&i_^B=YQ!+Q-ZKvS|VcI
z&<DLrZ`ZUxX&gD{v7TmSX<1NM2-p?y7O#jB0E6U!e@N~&3Hra6A&&DAp}t^02NzP-
zyISG(8-cgi2GS&fsCF?ulVwJlnwmM+rYZ$Yw1c^t@IWB?o|9ub-{i3~ZhBQD*s0-P
z#OX$}bW_LS_xnW`nh1ETs`zRwF}YY~O-)U1ZtivNHVo>nj&8EcF6=a2!etA1#i5dy
zms5JWA^$btADf(8I$KVP@m%%C<9fb_DGS>T$P$?lPusxl3f##IVcQJc2;5q+S~K{H
z2<2ad{Uv1iP-&)42d{Dj?EIit8{#s?>$4vUgc$F=KfhgETx5dCZLF=ghiEH=xE&K9
zuJvolRwQ<UJQZ`Flmq?_;DWrB<tv6vhk_h`f4)j>2;B!(Ykpv5`#*09+}^zRxY5&O
zaTx%Cm^bF=_Ge`ZYlU^sf00xrKLCVQV2wu4pElRFl1p0G&bb1!M_Kj+DFK)fh}yOz
zxypLw9|C}n3b6nC(f8`L?|*;hP|tl}|LYPEhH|F9Q3_HXWb{WCm6Tk>05%{{ZxxnK
zU-DD_{O|kT+|-S#ei)MFakvJA3J>fq+}GIHSXo(_V^q^V5ZZ}jCe3)@eKdpso$7lz
z1W%VlO}#Om+c)P0%`Zz%9J|9a@F$3cGTuf#RJB#u%Jjj`&Lb8(SW*+-vSKA?Wfk2`
zs>)89(Sz_6Ae`SruQMTd-34^^G!9w>yO+@2(X!nY6Vbj+I%nF`husaLt+{;ZOqTwn
zhF_OXC^@57d!x0f*?D=D3{n%gQd2SrwdaSv%JS}b!;$AcMz$5^1_wQ)-NV|^qVd(G
z`eW(6aAZ)icuO~%L<`d<jNOXi47u;r))n5oxUkLzaSwNB2EE+j)TUBV?oR2A5j9Ya
z=T$~%1Vq|#DbBx3Z#ve(7R2qm<-x6)z|t@Bj7z}GyjLHhoKZLpY}&{QC70U!m7JxP
zG&2ei3}8Ag)>NmpK8poEkYgH{C84VHT@sgJvSHIh@NVh;0%I6cBk1%GS$$(^-<*d7
zs)p35_WY4suSY#C^$M!)NxFvxD!tJ0)Q}0$!0K~=KW}0`-~}Z#)rff<h96ZNOZY%p
zMbcfGv!AE{uV;9qf4%~%$CmWZxqG5Q#y7GIW#Qn*61ZO*E3j4v=9aoGK3C)*rhV`L
z&1c)l*UY9goxdl)DSE%zW~<auyJpo^in)1r`aI^8H8fpOUN~fdkk5JaV{c$icwxTz
zgJy-vTl|##vX1EbN2P9vlRheXL5}*IMFI)VR&QoVEAvVmr0KAwpKhkpm8PC<jwe6x
zH(G21WsRJK4&aS!dk{_u5d#pn52y%>{p?!mlX;U(&K=GLN<Y!4=LYLj4^^hMOH?FB
z3VGKI-6aUK#^^jouI=#sWx?gn-5#)q9X|j10YWO;@JwUTIV$kP_dMI%Wj3AgzO%~<
zM#JyOY;)|A_gi0oGPb*rHwS*1WCqiWbgYGZYsCLJ3Ult>&|j1iSzRAOgTwLmCKxe7
z=g?JfD9^d9?R2SAg2-wKT?Y2ByB@9-%GAt(pTVK2*Qi{>PACg!mMKm~fvm$82nNpr
z6r))TM-8@Z5K@PI0n`TWgU_#zjgQBFl(Ag`{P+R^jl0c~5z8f?bR&&ac$=vi)3iUu
zJW1fvOE%;a1+Ndduf=Yt#$<*1Fsk5O6U)45^ysIr1&x;m#PbHMAp&y|{<*3F{9jrU
zKYibf`EF5o6dEAEsH)d|ce;jb*|Oy<(Ehw+ahB<&w#ce2h}mav3z#s#g_Psr=>v&q
z_R{ZpPhp`0ZP7*K-JGEZzP@5^2-YECo5gLJ;iItz8*}svni1YGG}z*k`8*fdBklnC
z-N9k@Dk?_Y3#)~r!y``EFxX~ZO2~#PSvtzcchQjR9BDHXa8rg9%;(lWc{Z<j=w!B<
zz-4I&YdB0I<z+7M-`DS)*PT|CxK?lf`Bgk`FPLz8zMbMInnnjX8?kRe8Et<X#EcD|
zcQ4s{b1^iu5aoWEEp+;ZrDF0Pr(4NgdKigzr>XR4(5{7YhZWys-=S2Nln`C+J2$Rf
zC6(Msv2zaW9sr4Cl$JT!?kl(3?Y0I~J~#5GmP+$IFF8xMs0U}<R>o?IEjPBi8c=s=
z<*@s=%uhDBV4gfU2=L_!^IeSWpdgDmC80job~bgg?bt*Il^_V-t_KI9-650^aHEqI
z8<TlsXjGEjDb!0_bfA4Rb}0bS5t#?S>NpWW3Masgh6lbEOH}!Qs-XO!#Yi4T!vL9F
zd&@0%>v4zNr=Vftz2(hdTj#|@%*5cqs<Sq&Hj@fk%Xx?wFvDHylaTtz6+@4F@3De`
zxy&l<ww;~vf~!QCjTejJQ=R;hIJR?c-753xDvKaSPjed^8-QcvmOVgTf2*5yG6Q5U
zN1G!uH*%h1`HW{>rfQ$89Psu>nk~ep_*e?9!dvneloVU-YHwtN89S`wMJmVV+cmVT
z#cgmBOgNbtzol&Vq-G@2;w`7Q6aUE%>ReIM&hreukG*_G=0}Zovg#3iIP~b*;wJhk
zf`wBXj*BKK&0|-QR7_DYYYARj$+^1UD!NvZazD-KRkBS415E_(9i5b}mrH~JLFnfX
zWz+ZNHbv--TP#-63Ja;y*X{?^ij@Vt1)VG#9sROD|7t(*yWXm!lfodQNeB!vuUgh@
zr_|^jk1*+tU(IL&yJ4>m$%0AQ30~%COR<_nITA^|PM&GP&U5TT=BDw7)c85I;#sL;
zj!tW;>6&mAtd{LGuT!mR@cMuX`?*U~#E%zQc4`tw2X+}`RNP@^3(<}HRU0i#K_e$B
zc{_|V>~jmlpYg#<>9Zap=8)`NS11?5S$nf&gZ&?0E+KD;2XJ-g6E~*>hLlDpOCQws
z$*P_6QSPwL2CVZ<*zBtrkO~z%aljkC8K!U4NI>ar+I=z>QLXhdQg8OQKh{H@VV*_e
z)39>8N4(eXlaCpbV2ATsZ#McnHEW+MQfjYecnRo~I~G&Ni@pUo{lSG8^i*p?3a)MF
zeGIS<?0%%Ll=Wm85I-)`QxTD#Z&oK4{2NHSA)cE#IgIG%6IMG-E$Kd(o~5%z+M%)H
z#W1_Tn$kS=cgZ1-z84$P)SA*@y9aAb_uoD>Bc6EcFphiT<K#)}`36%O$&LT%5P-n`
zu&B(}mLL=zb1uftWh?qdH6AXVSE{mb&Oe1^MR2Ht9=~QwyLTMTLYR(rKVhi1>Xe0J
z<&ry-ujL%>=z8Vtdd{+kE|;wlmDq`Kgxg4zwZG*)-y1&0wTx6l#U*fhz$ZE?3DHd$
zh0Z|K=ETuNA~>N)KgoA(|Ez{IivxV)p5;he9I7xSpd2>>E99dKc#fi3jMT~l0!JM(
zSN=JCNkwnc1$>W<EHoF-GH0CO^)xM9SIYSK56je$dZ^hKu?*LvAlq)poQ4#=bqwPV
zWxe}|Yu+OcG!x=oz}%0|=1iRR=wA0(<S(mB@OdnBOwpe~8dDR=BgN&0tVh>JvKDGJ
z6KF!BbZk#qsPlHvzf+ths$QD;aL%Fn3CZbMr1Dx8jggS`Qomzq2ePe6&JMCyg|40^
zWViYaZ?L28LmV}r>!tzBg~p|?4&uaH>52RpWdU;e^BIJDr?_^$VKX-+LSpMD#C6IP
zAcg?Z0*Ik7`@tMZtD2r(BeJAXB~8KwAooo6iJ|*NAoy9pEcd$nI+Rywk|zvBpDfMT
zaYAN%-M{>cgjZ`|^LF|Gn3FZ+c{}@4k#u8Giekesm3iT0Oz2rUGI}E3S)&W(Ls~vS
zoBBH1cON}lOznS2PS!aVID{J(54FJ!6OBZ5ik$J4IK8@_yPC<D9-u5<E+KJ>-7j8W
zH*}W{K4kbZ#cb!4=p42Wp6>%mF*h6~+8^+2s{P6ar+*BqdQP?ARl__B7sQb(WR&M<
zH*A|AsarU*vwAz)oKVVICH!fHd1>~NPj|P*&~R{a<J#Fqn0L#WP3wkqyLX+l$Og$<
zV(Bdd-Gb-<e(Rkyo`b0-%|t1IhBLyd*+Np&apXWhtc3qQv*;fGn0Obb)(Qdh9@TKK
zMF$(Op9a4=jd8X<ZOL}|(;?w@tV)n;-{>DU{i!;|-LO)--&)IN*HqpS#rpa((VL5G
z@|md*MK1O~y#OSSX1#V{Kx(@Us7qSv>gw9s>@q&z7%v1AeJLB=*j^aoEPlFmSliJ}
zpDJyi>HBKsCbYB)8JjimtFLiD*U41EtosLLu{Mq1!!WF)^GS0(t*?@S?%=UyW9bhN
ze6N1Ce_b{Y=Vi_vW&*FO2xF*wwA7D*Ofj9Ea8<R0T443h<_zlT2l{xSHMc~wW*#o<
zoh{J!E?>8e;E@tgnv_U;J~muP<Jrje+;;X3D#UV=aYiyN+!N{|biCnyl9qPp={2}P
z739{gx1WjyZ0>)r7C^MZdTS2W-qq}jaA%pXCt`q~xV6nD3yc>aY(O?)#1kH)p;7eE
zWnN#9kGq`h7H{j1ttF{0X@>QZa=nuBiv13dTin`EuKK!Hj{JCAarPla=xzg#PD7h7
z^(CS=au<fo3C`LWl4r89w4@WZ)KGpa6E%C*Op>iZQ^MdjyB|qyP-i&?PGQoqrg+p=
zX-8qk@IV)w!1HTzI&T?eNZ*(WTORT-ERQ!ZQd-osp;Vb?7R42v_mVC&7n-_7w>jWf
zsU3Z#nNzFu%+V(M!lwf)8byRS+@;M9<q6&M2|f=K6lUZgG<{b`{d8DG1R1fh&E)T3
zNT%!^N?RehU1)_W#|=kly4&2VAzdek5jOfxB4p*geu=RcYPCC|B6!Yp62(}AsK4lY
zO8&Y;FL4ZW3!)$7XD!J$Of0iG>NH%<@Tr0=+i4W>2Yy(&HnX+UeUP&cnh2^Szqt%g
zCHGo{<(>LH7zB|QmW*ic2ZV1jbohv;;?vG}6V?)7Yj8lIdO`}Y|IALs5R!~GhjTy%
z#G~BcGfoH)kOo^?S<%zc%`zUe&VdDXqN;<o%Uemc)8_G*=nwAt%eH#$st2X8RP2a_
z(FYgv&5`mm6SsOI*qZ4^OW_u^E+#i>w+iMYSo$g+UbEKtWEnqw$2kE`x8R{8=2AM?
zV2Y6#@fWnuW=o|IPS5#mjnfcw*`3{?W-sO4bmyJpQ*wnB=*MPAN@A9WECQ`Ln(;N4
z=-sAKLDR<AJnXYY7nMmKx7X_Uq)rJ(T{k_w3gmHH{YpK1mSS>?|L=D1Y(pJRJ8enc
zFe8Hfuu8pNp0i3IQun4#*zD~YT(Rf@#T-rA;TJxXV*5R7Z7;?_1_Y!S;w8Jlcj7c8
zP7w9kSUahm-)_$1B_etn3nY_+UtCPPpwfgM&Qg6qI=If@{02~50g?lOq*c^0l4Oe%
zH7_m^&JVWYi?c|5;xh=NlDe-d{v>U*WCX>l<|#6}HYy^J&?ChOq!kY8{9E<VH)G78
z;nZkqONC!%%@IfyA_fSr&CyUgXT?W(@?j>54mv~e2>Er!bOI8#W8|_awyk9rFwF2c
zhBef21aYgAj8_G@JtA{5R`Q(jHrq~OBl;A`6dP1r=T=f@_C@a+_zE{4Qw-gd42r)5
zM6#5fUjdcsy?LZ&1@7}PX`P;(oYc${yG3z$!`NN|4j|+N$uOL!Icmm9Mc;~1$NR<1
zgcCJ^&2W-`sScagOhoka-GyVR#yK0v=+{_Jk%`XQuSCg@PfTcQYTgWCGD;f9Og98B
zK%MrG*|mMu$2W~V<@2C|=}y|why)&+^$ZUw37n)+-x_F(&Urm<BUjb`b*odY!MCRJ
zqB`PLQOl_9qC4GIr7N})l1kREs7-B<4y}{Ii77$*V*o);=kmx;Bpl2wCHtrqkrrxq
zM$X?EkYa&=Dsr?D4;C+dcL^Ol%C|>FF0rF*5R?nr)3rSkUG3E0Rvh<ZPJ<33UfGRI
zR>;;ecJRYmUS~T}%&DasC&ym?PJ@0FnI8e;@j$nmV>a9GO|W}z2Nw!$dyjbOrI#t9
zPC^gtxOUGW4}mEC?V?DMdA)bl5fGp(Ei9%0^{BA0ke;4Ch>U*x3?XcNgR=3NmAAJt
z1m`0;CXGKtbZl0yUE17oRrYQPW?r7ErIeEd6LuHFa3jGEbI!8Or?7WmzAEeVfvv`)
z#B)VNp5&lh<Fz^QMj^uXay<w5rg8>(af(|nr4D!$g24o?6=xliM-rqPvt!~sa5Epg
zb?~03HK!K;K<5`Gdi%LypxWg72EL0#Qno>}4C*nW3$GR+&CszQ8WZ!Loar7qiB-nt
zThgMU-iQFbk!SCi7Q9U*LMQsVjwN#)9q_@}Y$pn3q`QRe7tg(5<j%rXJ^y%Kxdg@(
zE_cstJP#2d7_b5&<B<kX#Sz1wEuR7<kqhDg2w2W`T`la@R(f7*hBC{6Z$3Fa4kfKZ
z2~^>enS4And#9=EQfh9n?>s;x-o-7JeF%Oq7*qP3;_0<?{7`*Rhi``Fw%L^77akRE
zg%@9$&YYaL=8cpxmWq!(@mF!<pNy;tgR|h&DlZhuYFfMWY4cQt{vdB$ItzSn(|p?Q
z#SFEKUIw3QFJn^Q!aj{8U)2dov0(@geGEX^y-U$h@oRNr`EK1=vt##KCyPT*MHxl~
z14X^lU@d3AH)A*AI7xONr@J)Lpg*mQpzFHndz}Px{g;FC*a_vto{n?AoyKn@;FT87
zoI5V<XA6cZ)-(hF`Y-KWfDC&Uz;Qcv7X=pz(9s}sgxJzWxj-6v_Vo_)3HNm4$VGVo
zAj3QJ7I|r|bmJBmnr=<acPsZujyRy~5vTo_o^FdCxurVoJF{whP1Xjd1$Vmp8oo3~
z2A-;9KXeiPQcgTVpPqIeel{d2Xo#tBcacPQrqt{4-dGO0&$~fU<o~K>{QU{}a!t6M
z7)a;Da}$)X==`m!Q&sx*z`3nC<GbzEFHg<<XF|q)c=T?h?yj#(pG0`o+5Y%#V~5~{
ziZtx~96Tu945gL)8HA(sA2%@Co^YzwA7t#@XRghY&!Ry~&otHXoGOxLEBf5ig(s3v
zOg^V{Ued+7{r<7DEXk{?RlF@>Oic9a+C}B~NW<X)uR+t<g~YJmPHl!rhXFMNMwijI
zs?z9{*?K3!^ky)7dZM7&fN|Q#{^a97bSM}g)Jx2{OhDX976BnJWoR>A&$hnY9H{FB
zL;`BD5+L0HGWaUj;Pe~tj~e_>UnT*<gx>1>+Y8xIkB|-mi0VY99_A(cc4~&VSD;It
zJ46zGG`3L?Y_zTY!YUH7c!D!l%@{n%*@!kiEN#~JT&F+P|JFt^N0(M*WscHLZPIjL
zPE~oq@C~2lr`~)Aj7bRhJ?sK1ezNQ5d{wqd0|7h1F`gsvw{Ml!PW36lLfK-1j!ygs
z-YWX4V5$M!bMq+yn7s8&W{70&_`6=wInkO3J1I$>eXWU^>qLHJiU8T(m^x^;Y6c|S
zDPIDPT{&3;^C7ywy=~YD0xT}Afn;8tm&-uzx+c1h>G4h`{f55iB=<Dd3S^c|4&)2t
z?PO8X7`e8{{yviluKr-C>09Ta($G^~q-JoGb-3QEnxmV>*Zjc`lA8ERkvn!*Uf*9u
z0a_W&-DHu{HU^g+P>n^U{p`uUw`kS6V~!h~f1n(J6PCdF@qG+s#EaeyDYsWM7DJZt
zp$cgqL{i>oK181lHD+~t`SZhugUjM7g^*ydx3C=}pprqv%Z)v28E+E(3S_&O^!Kl$
zV=pg`sDfb&KG-y%W}3s>;gCw$i#}Dyq+5*SYAS_U7nPQl6fStZ+({!G2k6iEjd9~R
z&$A92sef6|ODQqNWnf=f1WnsFesqXxZ70np^)=9+uQ8M@vd8)?Pfd#gIng@)A>i}Q
zw-0pYBLz9;|8V=yGEfKI{37F2`hlJP&8FA(uc|ENpNRgZEKrEZo(i_)kxK32=lUVq
z>p87@H^0}4HCC}^<9?`pFp*{gyBjA8J+3;MyAqKv%*IrEa+5nFyd?P>mmwzV8qgIx
zevuw+Oeyd?0(DuyZx?{NtbljPuz#;2PyG*p4<<6+-kJ~`YGwjL$mXRk6@zzHb%l^i
z8H-SuF~)M~mR&lHJ@O4T{0gk^G$UYT=ainSIQ-^S96v0(l3ZmC43YRKAaQ>rGUu-N
zN$=*Z31xHt(8{_FvH{#`#mSR|xo#d%BaiOwG#7K4N}cJwrzS@j%E(Ti4=WAr4$xhf
zA^!$vaunNHV`jCRIo{dXL+>CE4bVI5_ZQ1GLMtSS0?_n;@|_n@c{9c6=g{cT_EzPx
zR@C@(c3|>@pf;wxe#!zeCFODpi9SO)$~$&A<1af;OPiwyg01Pky>{6^Ri0vk_`O@j
zgV=aKRvK7Y;AZqwQ#@p8;E)C>>lr`glH@AuI~@~kZiXq{ZC%4Rc)dUk8@?|N{j7%}
zvT{p|Ow3NF3%5Ho^Src?e#*|wH77Uw0VAiR7U{0SONodk{eXrDzx3k!%w_|r^*|L(
z->F|1=$GM;GjM391cBs4L`JC%a04>P0m8iYf+ZbI^@$-YKgi$b`|4pmTwhn|Mz{Qw
z>@Y=df*dsyeKNQ{Un_NZjtnci&Je}r^W8bo_SYA_xo2n=pZA`LZ(>SxbkWEK{2`-w
zxwOy5cm$=D=*A6pPVKc45Qh+j!o=3>%f`{%`^=&Apmc9N=UH-7?kM7s*7`lUd7oRe
z8@#!Dmofh1yd9#rW>C>d#yh~;PyS<V!H<2DK-!k4nvuTg6!&3eOxq9!)MZX*X{K}@
zBM}$xPZJZEI`-m4vMa{FyK#LTS6r1dVRxNFGj*dOMh3Y)jD2a_Kxy`jM)IK$MGxeB
z#$>9H{^W^LB&Kthggt_5e#CZ=O)9(AozQj9t)FoGdpO^on9N=pX7vX&5xD<Fw45?f
zbc{v^nvaHq?yF#Gok8>A`lln9x(khk59s;u<-c-5UJMHXx|53SJlSYZyN~FHzj!Y<
z)jZ!+k7RnV;N`vFQHz%(1p?Ny|G*!J!V6~|qCi1E>hHjS66J!Ev5B#_w~I|{i3~FD
z!NHhlN?cbpQ@=N$N3-Tk@gawpW1O!C6C8DDu)>siV&DoxbF?)IVOA|a6ezV~=q_@O
zlKfupMk8sizF<6a&40~cv5)wWG=m%UiK$+m%J+p2D%<D)PN`RVS7(#IqN?36m1zKD
z;6Sx4XE<D6tZI&N7hCfUTJQl>ut#BqWSwL{X!Ku}^ADC85jK{$qx8Y@8XduZ)GF9;
z?!*v_%00H(xu-G<6eE5gpSu99I93;0mS>GxSQBQe5GWi91LcmB0h7dlVbx|p3IXaL
zK|m2XU5vdVx5THEVXH*yh?6t<dY}mF0YeNkHZXV$-HCc?yL}!sCr-k&B!23@?DlHC
zFiCa1{EyKBAIfSUq|HumIXz!7k;Ne&u!diK2QP0d`8p%T*RTPPnJ`37Q%qp5B&5GJ
z)Vr&U)-m6T8F<AxbAw{Ty^0LFp6&9?Z4L$ElZ&r88`jPS<D1--Y^ur`5~Z~lrKXxp
z&1ZNdmL=;8Q<i2B;Y@Xp2xoJ^oX2Kh&GDP^BdTk&v<qIQ(BAx^cKM)tZWR57xB9&$
zsm&O_c|=-oF#x=v!u+>9r~>F#xR~WlAjoZv<}=GjTofl~D#N03)*F^1B!NQq{5|89
zZ_}9FZ4EEv9Yg&ofrspI#fJk?%HG+bK2b&bQ}cME5^3sEEc->I1Ng?4sr1xzz{f-T
zCENXxNbkBwkafOJv^hrSJ6e772P^Brj_rh-%VD0=h^if;oyq81Xsu*;44@_XuN8+>
zTfe6z{}u1E`MJ9vHbR@BoRSyGp8~@@IX7NJ27tMtsuJO)88r2H01_E59Z(%kTB5$W
zbz)n7;T6GHp#I=LjsQe4u-h^%x}Jiy6gJ!}acaOTtP)+T#S*&SS!ox+V@J*&L1K)_
zWsmPW{nY&3;=Qwn6}CW=33qgr=oi~XCmay;KkWgnMGFp{3_$0?SURq+3urnqYx{Z!
z#3?sEJ~lBb@&IqASs8)Rx3Cx=n`6OOpOA6GB&TIMv)wRp@zU*aD!ozn*lg*+u5Jzs
zA>co@Q9kd=1sbx%g~)nX1fdsJ$!<a}oP^@{mQALHOBQt_jZ60)`D~Z)l{eSf-FkBB
zGm~~r9OhwS1TPL{LMvL7jT4+PqeadEeJ!dpU83Yl^qQMegS=JV97@)Jz(<wlW`ZiX
zSr1N2ZbZ)l=3KQsg8(BFTlV9#aHqk>4bDz+_1b6s3`>e?H{ObpZ1ry#s1Ky2c&oUu
zbb`@$9*A5D%4IKw%`$fGdcJO#SA#m^mg#)ciwx2X&y-MWhr=vWQa{hIS%!f#RrWQs
zjV`upV`(x4@|TIq(*G015kT$y4zpZeI;atZP5Qe40i6ev%)nwPBeUo`=0es=kDNJ~
zLM0KVo-T~@KE*;%!@*y?Ll2EfB3sz?0?YLR95QY$OQ-lez-|s=@&`x3xREvK%?EYi
zqOS|xDJq9>S-la;T0ti#6z>K?CXRODkHY38s;rwGI8}^Tu2W`|8_NH-;R)ZGj%=ZB
z#MpM~CeXWO=cQTn9<4>8O>njyNj~n!tM(nwH`_+SGcd#Q1ZVB-8y}H$i^C5SP!_fO
z3E#M-mJ_+NDk)wY`0Nw!*6z}+i6+SVp6~MIo_3^6&uHnEREh;IOH->X@HRl9&;=JX
z+E+0iK5rm)&8gnG!7R0^b7!X>>UE!$Q+tJ)H;k#7wE=Us;kH0xLr6a9ZBaGn#2yrb
zp322X<R<`LgEs(bNNajc&I7#G`Q2VCct;B(RcseLEap6G-Dx8IeuNblK6xWy%%XU&
z2gs!Iwv&AEySv~5BBDLSMUw+akK;BTe+pkP=Rb&&XT0cFI*p794-XHZ)&VF=@ttaF
z!umvf<dndI7OGojlXY|6sE_KqX`wyT*m>M7E1!_oxPQ72o9L`WePwE7_c8f+{)c<t
zMm@V%FKfXUoZ4hXgU#V<aBFzH(2?XYDZ=Mn664kn#+o#AgD2I3(9{_edA^d|m*`6m
zDN}5XlmMoh4Zf2Mrk$2%iYO#uC+InM_`Wn_xSi&0?>umtRoR@<To&U-aWBZf-0+67
z9u?f9@`K>a*WX;QQlnBn3+#Ceg>U9t?{y$+tk*|jVn%A~-{$?Ml&{Otrorty>vWAH
z0{0DXvTxs3!G3gJ!w*ee&tZn1xMd5Tgsb4>5=U=$;CxT!iKPpk;s^wIGuTc021m^6
z%WB(K<EU;-mYr50x3uT73VpZ>t@I#nkXN}ugI>Fr)qc3eK2}byA|e^~dU)ht<uM?B
zIzUMGG7B6eUQuFOIrM>a+~`jAu{AgaA)IVk+#uo*hKWFy22hq}f7zi0gxKe!%WMwH
z4vH3XoO`$~XHvjz_MS_8Dc^=!WQEwK-3_y!-EiA<A>x=hsBL(&h_KM*7MjE;{{4lw
z32Ste)@QAOJU8~Ba+k^br+U#zs>hxpOPt;d1CCA1^va_mB__D}STofElEj)`e0Nzn
z|E8yrkvro0--hZxYM+4M1sp$T{Y_WCP)OIg?o9h(go^1!ZJ|KVT$YZUi0CUttI@JW
z+$neu&BUmC@*IQ~8%tR!oh*A~7)_g@9dzswjM(B8!T-n*yHodz_;Bg5%{p7N`DOZ(
zN7eP}9V#9+TQ(VUxBMF4a-DV19gr$89A=!i<vFv-3!oq0OEFCt|81rq5R^7O*M6<3
zjje_{l>MtqX!TsmaqIQt<<6rRwCD3?pYyM-XMU3~*&^&)uJkVU8e^Pct}9u$k%V>z
z2j63p^t;_g#;st%r&L>$0wogSvTeMa`O7eYr~EH!IJ&o!+%2d;q7{r3l~IO!;;rok
z;vae?cK#UPHXea?{SEBZ5RxTK;y>26@1|%4Q&yh25u?i}ej<ri3YcYXg}d#s%9jkJ
zzw5E&5#fQS_U~+5qII|I3wibO(Tr*BD=&=%G9SaD^gL=Rf6=K>?uK9aLg`xW3+1gJ
zhOTTKRwzYp2N(O5jrJtvYFg_8ZZu`AAg{l6J0h<S1Jx~kh7VTM!&0YIem@()SwnOC
zX02p>ICXUP@qLYGRl(kB{NK6Cw7f+7clX?z`kTF7K-1($GqdZXy<H5Ft{086LmbQ_
z!^6OwrH_tkEQgBDyBlv$+C}1o<mpeE7a*#EEOOG|b&k_-uS#BS9o^0Vy#l9t$<?M~
zN&FpeQc;D(IZgS&qZ%V<?Q`oWn@tqp@!@B0z&g2NH02(w)i6=DIV;@<s$BJ!6+DrZ
z`?fZ%0=SpWJUvuaPlT3Jsxy3-Vy4w1%}k*Mk{=E_G)$Xk&LZy}Kg+z;!eMWD`F^TN
zD>$w^c>Zf@?-NL=vfQ+3&cXNHLs{eFRNU_>nCTRAh(gtz<XKbcRAz0rTOO3j_`oZg
z`M%Xgm~pE#*}INYwVJoh@2l#YA6L>(cE>&2*<Gy+>QZG%r9<{AE?TKX6JuA41}x1P
z4-&4>dfcH+^8HLk7*6EQb=IaM$#|s`el}a`0w*k0H>5UJKxJTciT$(+HgrkS!zCY0
z+bb^FZPtsM)^q%|G?Bf?Hy}g;M;yJP961f&pWoM+!otG(y1PA)#kE<=a=AG<)#gJj
z?lz-8hXfH)Bh^+D{VAgKX~v`P9(2cX@CfemK~&VPN@XYf=I0nCxY#VK9^9_;i!)U1
znjpOuzpvVHN|V4rU-iWceWr9U&*J@K`c1ltqjp{dg}G$UxBTj#e&M#<s?A~Ff|a7F
z@*slJ^=UOOUkubf9BY(;S97j<9gpU8!>jO`HSOE>fWLhdsbqJte$As!F8lt&JBp+0
z&EFZG9uj*WdbNe<#JbepDhz+g8q-g#j2z0WZBrF+F#nlOy<xIb<x66xEbrJp+^v??
zxRvPP5W`$C9wzLQa%O?a*|C<VP|E;!Yc$;Hfm-FI``)+mxq-Tt>?-TpnY`HHtEkX+
zuvs)C`0>8W$}%%&OxS&^wQsxR)xkD7_p4|*6A%m^Q5u*eZ#5tIl`c_Uj<rL1^%)Jp
zm`X@@kK@EL_*M*i;y-&o?KhuYG$RrbY1lsIWsYQ!JOMhH<s!qB1o@lIC(9O%BSG;|
zQRU8?!*|uyU(;HE2;4kN3uG({I|6>ZS<=H$#+{1F=S=3~7Dk>NtXee&6g`YzKF16f
zc-m?}#ZsZDZMXS{@yfTf{+xd$3w=^~$76XcC6WdGZB8fVS`(`X*Uc-$$48-(b0cQ<
zZ}xQ;Un-gFRZQ(6y1ilf?mJtu8kg(0_GPn+-`9jrjJu0Rbq3-fxl-X_D3|s(jb7-~
z-<YV@-wHjbyQbu;x9ZEkkqlEXtyE&vW<CmZTAL*Qi7>-0jHy20M#kQ_@}qr!l&zNg
zZpmm`*R}JE8mAbY1}*9Dj*rIJMPbFraN!pNKf2PVbn;D1o=cOt%a3a<!hZ1}f{*5Z
znVpa&zk;ZrdHIP)Id`<3N5y*NdA!W|9LYhGA``h_g>^GH0@U}5<JZ)GEvnGl<$@f)
zs?qZ*bZKdc7k)0_X<`C&&V~0>Sx;4H7HWl3arYn)wGxXO;4Am0;`X{3x?R#}B`JTK
z9Sw+W?Pt}vH45t{FkLpS&dT(QJd7&LRTz0MM<Nk@w&E(G<B+;uQfZ*^OYXc=s*CS3
zyAIp8Q!0@G>RX(*uBfn9!cqsMa>kFEmZ4hUgE?09nu2ti`TLGq#xR0*@0{<a2yV@8
zzjxxjyD$j4+x2<UeT3)v+akjU@0S$3>P91xVf)pjKRXo#Zj9agG-jrdNh#PXLUtJw
zoIQH#Qm+!Xdrib~YVwy`HB9maX9M(f>rbP__0#e@hCQ%>nA^W$B?4Vt?|<$q(S9fy
z2eE&XY@aM74lq@4g&1U)-Yci|Ho0sWsr*Sn6h&HnHv8yC#NXABDB+R`pw|Ma&MI4r
zz_91xt)Oh9Wj19_m1lr-Ey8axTelAgS39na)Vu}{#=p(JBn6X+ZgKt47@^q7!`mf4
z{}|=@Y&RskNKW_UvJTnrk|)ZBb(G?b`3S3(pWpcg`ck;krv4B{4ppv%N>hJ0q_Z61
zV<C;}Xc&8lAcHDs<4g>GvZGnAyiBhYG(~Cgl=?C5VcVB(#*S&M<!MTaM)$>*)qZ8_
zgfs<q^mfNsx8(^Sb5*?~)Xlh%I7>cJyJuZ0%`J5x&KqNNT*i6R^-;%OF{vUW-}1>L
zlrlf<ZnVp4fd&j^rX<QgN>{@aU-M1TCNRf)!g6<~*a}%1Wn-}@>yJIA2ff+#)*2Gx
zR!QZ5T)Vo|tqOjA^Tz40XsN?%!z3ey?l>+)_=O26@VN<sc4_EO0%nDJ;E-;C?K*5I
zW)XKbMtWgIBK@cT#?yMT2V!NWz3~MjRe=jlRzXEoqio7*BXl_;iZ;_+-2F|--HMRM
zTAb8YF>J~}LDmFnRCQWCVSpUU?!+7;NsBjP-aK2W_k5O+&t{rBbvn9c%TfC{iho$H
z<fRCYI=cX;{p#{vXeMvGGV6j3N%pFVT=Ui_&ch~yvc;t&nKV4yN~YxOhRGa@DoDCI
z$iRI#d4E+puYc`Exig7rPER&1pmnS`8}tUAL%<H(kBx1rjuT8{$CSvcrk_sb2=C$w
z${d5@5&9rlQ2*PJ6YFdrU*-hm=ab``36h_tXIZ&8T@5lUMbvLdvwcYo4k<KAI4oHH
zGMyXuog<GE#@Y2Eg29McFX`=QRB&X`0|B*}Duo8Kgq~;bjC(Cp*i^z@u9W*D=ediJ
zl?5+gkk=m;pPX+24Vb{eL)rCrgScN$I4d(yL^>Iip(xhp$nYspMvidg|ECvV#IhOP
z@q50M;5@^wDhkEmN2x3<$Wnd?3$_2C<eHLFHqc&T8&SG6HQRQ!&=F2A3bf-q|8flw
zG#UWe9e>sd_LRC1U{_aG^j{bk=T!yBTDO6pFpJ#%9ffkYoY1!>i0gZL9K&xV(qni`
zN8gN*<TroF-vLdRau%y0O1{+iUUz}MgN0Q^jSR^7P=*C-2-V6+NAuFi%+IXIKuddC
zSDJ3FG;5xpFUwlWDk<%}q}^XpRC^K=7T;j`CMf80x>6cTWiG0ue{|<mKtcz%PIN|N
z=6AmCQrNI6@Af7E+eMr0F2fh!9S+_1?_#JjJ3fih7ugmRq#M&3GyS1?3G}Pel+H=U
zCaA7td4cSfeQ}EqH(zqS^IZ?yw|~Bezl|`35p>4|b^iJKf*b!OR^=uu8$;PlzUTV@
zLa&Zy(B@-tm<c9QpbsD{))4+v@}yrc6%I%CchZ4;eYd{!n`W-eDG$@-<R;yTQP#Us
z`q8v`<y2HvQBhghX0Yrx#BFY@NT>3m2Ohni0Vw#Vf`Wo@V6y}cdm0la+!R)jViW-O
zR<%KC_&&>on)i0rIS=%D5%rm26!X+lBu(n#qO}q`<v#xSs;Q39ymUBQ%_J9Ho4&LX
z@9M~|MwmFRNG)^Efm!yX+y$o$2hX~UGTLk?Kb99hDQ5lyUJw#-u^Uj?!c--Ri|80B
z&+d=rM!l0}zMI~cEDq<&Cg)ZLn`w(Vr3(L4RJ1uA--{Nn3@V;`kK%Kx)6|l?md@6*
zOssf*2PXPX9rMdz>y%m@K2=x~CNy`5pBp`X>-co$+*HYfY@E>ltGt!+RPmEI>MHw`
zsA06=_j5N2W5ns)<MF<BJHx;5{S)o?pJd~mfa6kIuqx<yG!oqNjxzv=u?=Z%VHnt^
zTf3lL*51_RB#{G_9Sp*ym*CL)Q`ENCGasLa5IP@WR!*<0wFu3%xQH3OnXhR@E%eF4
z3oR-;a!TZsR~LkY2-Q*O{*Fi?n`lhiawHs&K?3vXkf)LsHeRe>f3UaMnv>$1?p#D&
z0#AbN{qfm4yeqDm@xa2lmu$M>Dv8{0XhC{qiYLy%h!e^&x<yxRzgNHh?DuQwGvdQ{
z0&$n*P-2!d8s|+?`X#zWn-1Gg$UGzUZ|3s8O{|J>aeslBa`?2hXL|2RcD#7AYXE<8
ziHS&lG3r$QXAJSj$?+DuZl@Rz_a6`=T@6(Rem8e_6NGR$>Es@w%Sc^({B;G}T>8X`
zZK>bP7gJx~{@jSjmn+NELp;pwORrZNUoV=8g<V}O<{j6n`&oH+xFqxB^vUak?GV#!
z-RnHN%+LQCI<w&Ne=-FC&{Y;A7dxr0l2ToH{16b=)glwRD0fd;Fmu7}wqE6uQC>C;
zs@J+H8=@ogCT7n(($Gx$;KiMkYxvcZ8r}&4;?Rw-ycxJFHGXCn`2&Bvm|F^(Jc^4~
zHsm)X9K9KtV6w%GGw1Juhc+tB=*95%+O^ttOlYmcfMxmZ*=k8JI3pp1YgCCxUM9T&
z&iLoEH}YW~B<EFSuRLMSV3d4YOOWIvryNe(^S*5HUd|iL?pYttCD#(7>>c`inR~R*
zTn)QAtNr}BKBbf>J(UB~RyE57eTQqh^d5G%dvjB3+1h2T&%oU|0!Bp>Dg$EUNLicR
z0s9%|FFpd1k!R8RuGPi8U(ICZ$4Em5qVmVo)Fpj$Y$KDzbz@>T=U+NPcoCELJlkg<
z^$|<9XYsGVbkOyQZ#kKZhfWj9-Vz=K?Wc)oI&=)Ui!2#>`lM@G2H<qx&*g_IOtvX`
z<Z+%-2+?>M2Vtw`QdEz*|Jt93npoiPH=blV8h3Y1Rhq%~T1Yzzr(23zFP~cH@I)qP
z3H!Kx2-b)`x$BlC6w8?M%~tK2GKt-XPlB8F$XFbqxEc$d*g4bQDK;EMqce^xz;P1|
zh%FmT6Y9iwY--<h2V@9w%hc>QrWIDy-~YsjxJtf57MD+YPf^Ce!T08}Y#-C>^l5?T
zIr39Up(S+IX9=H{J_u*qR)2_X(K=ImvP>uPJ0~MbVU#Nwflr>D$XBvWVi}1!f$B)s
zu@7_hBpQe9Tg-K(SqGvx`j&b-Fh_?!wQLqdwvMW3`*ZtZXazgnLf?svPs=}^?f-CS
zY3au6VfoWCQz?Q@F^zFh#4IEGQ+$}dbQ-j_dyrq#<rSNmi^v}`T-WbCybgbApK&X}
zhHa-x8{qP?F}ubf#)O6JHV}K%#3ThWbZkLSR%_4hn%0}`z?{(%S@d=JhVWpG6a=H^
zM=<eU6WjYd1jKmYcq$4!2G~9r%G(TVBXO<{&=GLN@{WGLTE8^lBez-0v&m-KW)cOB
z^F_c!7Aq|d6b8L-CO276>-ZW&DGu4tX=9<+n>tn3tUe-nz~l$B%6u6Lb_2O5ZoTsB
z1tvezQoGNwJ_YHo^ol1d(x(@43Mc{gdLAE+QKP_UfTS)RE!`E_W?FfZ&@~#uUf4?=
zPHuk3H`k8UY7QRS0CF1u6hVrk<@}LWOce2YQNTOlP^pPRP{S}S;#za@Is-+dbz8%`
z=G*)EI~=WY%`BSYf;n7pojxW?#&I=lBIE5#(o?d<#{DELPb<}HEqmGY^3F78AuUI0
zdgEm^r{CCBzRySK(pq?X8l!~{=0BYHWvSYo2a<W~fgK(%k#04KBA*#OBCHwr{Cqo)
zACps|r$3J}uorkr_YXCDO8hT1lPh^wzO<TPn9gVPdAj8@n;n_yoPnI`GOy{A;=(pe
z)~I28ohq)-u&3*a$aiHwQekDj>R(YZqsIo0Z9jwWRp?KLf9QAXxz=LcKGZsz6JQ;1
zmo`ahz-nrOY4hq;t*CM97~aO(w-cQv5n8fuwLT7wuB&2(Wb#5H_&oi5MZe7oQ+}+8
z9g-CdIR*z_Kf0fK$N}lnfqV~k?o?mnUdr2TMM_l6S@{$hO_YwJ-#Ti>FqfFnPIEAS
z^2Qp@AykkndyARG1f>Y8u~=KyoiHPB!x1N^0sgkApqtV#&YZ%S(xIo!%BR-nOewLi
zH$_-w_3~sTkiqT7Ppx|;5I9|~B<pm9F0lK6=aisgF?|wFS^4QN-24=7{3jvkh>n_?
znksEN01TQvO7*e3OPMpj|Jd?#hm!A~SBs=_PeM6_zGQ_czRO7Hx>LwihLA(eR23H%
zKOU=koJmck2A}Ar&Fj0NW&C9xsJdiW1{^zkjp<veXUqy~T&+TH$3{J-3NM<J$LJ1_
zZw*GzI`o8PhU*7I6>9hV(&^?uL&uTANv0ZUVb1O9aM7cC@(3Q#-FNpURjt+Z99a?w
zNv@0Hsr!24r&n=rP!|1FC*{Rcqc!!Z9SYH|$tix>R2g%kb<n5p<dRR^IuWD$cLJ0n
z)Mzal*0bd&Giz7UOP84M=ep-IA}qXWH2XeF5OBJPsa{WzOvKiz#D;4<zh~(>X)~y}
z@E`Id2L3OAI0H5TI%(*!8VBrq<>cvuekJshSgNb$gcY%BDQiy{9#9xV+Y(l)@`Jqu
zvrVAk)v3i=QI@)Q263!V6Dvp7rxpRCI)O!G?&{zqYU_Yi2VqFxmSTy-nn#G`mFPkV
z7Xqxt*Q_pwl6W1e<`r-$Q!8uqx$i`1=zw{CjhkR~y<VV7fx=xYr9|EHAUlnIgn%8}
z2V7)q+|$Sojqjadr_P;kW;Bd@NfKymE8a;5%!>Br6j;(}XAhjpD{j2w`|Ze2kIW3a
zBAoA#tt)4#C;BE2yE3na|5WzzNfUFFcS;F$g2rBn%Sq<F@^T(Ww%3vd5#F{!;>;1=
zhdO?}(5<e~i|_IRm^#US;Sv(2-{`sn?Dvg|i)&9*di9gjQ@|WFhVw{LpiO!;(6E#c
z&?C_o8<l#vud`B-BBva1IsZ8%eI#<lUqNFi#BYE$V{qO&KsoOI_Ngdn_hs2j<dEyl
zay$I<%`wfZ+UV_-vO|uY%V8<)S}TIKHY1Kb);|>*br*vn8ADF4ahCb3-MKNR*H~i&
zQy<kV%S``<QPw-@jBvoekrDg^3JSX!ES2(J`g-0q<P&Q0zKTsEl`do#x6FS%ZIMow
za;H<yCySa=`%H*uZt=r07aXgl{+mrRN2vHx`3EXAiY=04$0l86t6Aq<3}5A#y?jbM
zwH^v603D9x2l4BVJIhe28(7yg<GTMt3+aDTm{o?0&6hv}kM}`0dk_T^xrQt4=FdVK
zh*4Z#L9bA_D)KdoMOa{X)E!1BVv;N>qr6l}sqXdDM)sXtp#JCdlwORqA}#!_({TDw
zycoQ;xyIGDY%m0(-$`EHZ1<{tNfX#ITK;u<e8NYE(LjIPdNHOkv9(~MPJttQvesa3
zw{)YwSBUlSTFjw@@SPCXO|cPUG>e^I@SsqQ+5_tSA%Xzw&*bH&t9QIbzoN5c`opf#
zT9ho{B=fO?1(&a6zme1R`bza@;dEcpvVcSMHRJAdPEO6Twod%*-xgG43ExHxtZ_*a
zbBY58%5SYy4*Ddk<0|_Zsm@Gq{l$nr&HtG~A&iyb@bC~0RF#2R*kOKNx-Q(uJ9D_V
z%X6CCG>=<%F4qDoXXwbzIpRL{laPYhXSUS)j)Z<(xY7H{=1_ObowxqO=*pN9Tj%c2
zU8bX1;zhJpl>P5qm&ayV1xm#zv4gS2Q1)x|^gYeJfds{C%1;HN7%$ipr`gNjc+-!T
za~1PKtYey{mM)|3W#)%eA5bV8SH?s>_(*KX-f7pJlEuO`OsU8)+}06SG5BO(Xk7Vw
z7ee0m#U`B9@c(J=E5o7+yLM45Ktu(^VGx9&QwO9whVBLdg@GYOT3ST}VTd86m2RXP
zlpMOdL<VV)q5Et^-|u?A|L4a!m-{ytv!C^>yw|<fmLm;A(ZzcoRo3s=l9Y_cn=B2D
zhSo1iNtrdMbqGnf(y^qpahf01NrIlV>%-_nb8a2wCzYm#W|96cDJblJMFWHHSwQ6p
zj3CEw+r+kGX&{h-5$F8kcJ(2vs%`{f1hhX7Hpf?B>N7pG6`W%u_3&#w_@Qa401dR?
zk=dge=%7eWzoKhn^OPOrf3Mtm<B^bD;)}plK1^l?b4&)qo5|Asl4&tb6QMy7yNJWu
zEEQPQoQ|LLj!-=ekVMP!1A+Ey$B`6;a>#-wLDj-}Ycr&*eXDSr9`5DSx3M^4>M;Hv
znHxEWD2Z7!SmRW~Q}s*2#gH@xv<G@#FfBzJw%i(0Ol^yP^@0?C*aU*O3!du_`MJ~@
z3^HA6RhH~C)mYLIJ~}k9r;Ruh?D0oHL`DdD1b6QJmc{GhzulN7pg>xmtPByv$^hii
zST2kHEOmzN%A#|D*!DW-m0t*?o(kYVLG6FJ-$9{#Xc!<qvQMt7!2-zn5On1=x~!Do
zL~GLO8jST!wePq{=Fd#NE&Hb8=Sf%I(LogXqKgBo1e47?V^p8!FXwK=y$N^i`{LcE
zO(Wbb-wnr(N2K;TjsW$Ag?_Qbz$nFVS5D@dQ1<&Fod=*z>p`+hYZ0f&_Y+dTwwt78
z!j8;bJD*3QP~)ctgC~6UTI%6X$LY7^UCcWVg@_|Z2B3w`N7a#&5Ged%wKF3Rzq9r4
z6W<>Ci&AQ_5?j>V0-zz;aQgG%FaTi#m@zItn($1e#9>;`K^9-12$w$KTg?tObkIx*
z?kepXn{Cr7WKlS6>p?UMYkchCOyOVIiZ|4t3FJHpDsvJtok~@K@y{J>=c{?caLp?6
z_Mcy=Tw&}rF>{}9a}Fvg6}i$nc-MZcm~oE(YTujTDu0GOr{g2B*=w*KA&Ih+j2Hl3
zy?h6p0PTOOuCIkEe{-OF{RtJ*uTl8V<?R{RhUv|q<ad~abz=Qtsn%e^-zQ2Y|Lfoa
z=pY0H1P1KdCx<&5KwE}hF&0P~SSHGCwY6yB@W@D%S+Ak$WAK)d{b(mL7QY4sdG97v
zFuzI|tpgmZF7$i&)ZpP6svteqBXLMK#BZn3Ojx<2)AURx#%bOzj5+rM$A^BK9~n%2
zMS;4ChUFi}xkDFNvsHYiuK;ek&{1vaIcWz>EypS{{^5N``|^M%1j#1kNo5x3vVs_C
zT|(2Z=D>~79JzbLY_LpnWfX}PvVHDM78OsQVyaYG<0zceFP1(^QvD6_r1G$zKYw~{
z_em3ybD8%gO98e@1?)5d_Fyow+=UidcA$wFMnhe?=1vA_%N<8Ye}w?;J1yK4lbEaf
z$JD1t5;|2!LjgW30K+Mn(l^zOiqYo|@+fV4P+;j<`C_o_H1(yKVM|nz%XKGD6=z@V
zH^}X=6OgRO^jGz+q02w~P9qExJlf>=$3PMfHin&F+~Rp;xeiK?(dSGmBG)7ZfgF40
zjzOg)9cX6PgRqml?5z#{>m!;ttrzWu*IR!pV_l#!9?sJ@0!Ge&i{Y}J7Gz^%d-B8y
z7)oppc!$i*hW2X^9L_!k+IO)jBdb`nsPtX%!f?!ui~;1e{q`8IjVZIceYC)F*5dpX
zt>Ch6!8Z4{>Zq03=%D@lqJ?vF<EIbs5kKjaOb)`Ld)!1MKtrTxv?S<sbeUW@#pYrB
zBhC8+8DP^UMik1dgvH4s`vL#$7taPKIkP_@xkQwIH9o6{NXZJiL`I{4Lx<Rs{wmIl
zTl=kK58MADDY<~704A*VCLNUZ{I3y`Z*R;P-FR|6QVgbL2XcMJvGc0MJb?zZ<U+e;
zks!gzMxJQZ!EX-sO3mfEidfY>rH>ltzCD&+e`oU5Eaze9#G;{;iC)m*sjh&B=xk?A
zlLhP9ZN!O@20g?|ZRKn>+~5-aS^#p3DJH@$FBUkCeM_M*$4YC6FZq3;J!CdLq^p~Z
zKWRuJ(Q(BGsbP1`<|g=9i>urD!rD#$$J#-az=%E!z#M_?EV{*J78VvQBa|T-6%{&)
zs8E!qfZ|Hx+Ta=<Q;7yzM)@+I)#ezksa>pp*c1AdB2%_fZ_zh3kM-ArQ#$pVv7jPe
z>Xg9!CT9%Ptug(Xf;xIrfP35L`$yOZBv*RWy=RSQVz;DP;pr-eXLBZJV8-3+1Z>p8
z>=G>;ZklKrFrSSzT4eie%`cLGSa%p{I7(|les40E;)6d@!y(T9GrO|+k;{7qVDakt
zvvB2aanA`5!1|#@fX4!sFc^Ay)rB=YgaGgu2>>v#hqTvg(?EhiPPICMO83Y#q4p#6
z%iA|9O(IIG@^#>4<6)?jfi??u8i*%T#3q;<OHlhs<y_?K+-a(>Lv}(3@^gnqzVyLz
z0^dsAi~iDgrpX8~_yFY3ZmQ2;;Y$%{s>2RHggAvk-gwCN`pr{;mOiBA{v0oJn#H^J
z`$fO<{S7CR3JLsASRsUJ>gwmqiGVRZCZ?Ovq5z<I49?nu0A;Q~lm}1X{D7%l9}T1n
zuO30*<fRbvHi$vn=J6R=H~!(AujiI83BxiR^YLs^itb#oo$XX$O6JP>v~+D2KKQ#y
z)K|g1fdONg9Bp@i+$h*OkBm%rg)3nFo~9aXnU2m{!KyO7CKSaChf|nx_j9ubRE^#G
z{hrA;|GLbsRN3(EP}KRx8KA!%L2?bG+iZ#{OUl}kz&C~ev@xEi(0!`WhCUI<>>y?~
z#W)$Sj}-9&E!v}x6r1gLqYN8cOK(MlHpIB<CUj;vGH3^ggZO?B3!TBgd`+gY@JLt&
z3i=ScrPI4s39!DYWXpCmP`xkDK=B^I;Ri;tn4mrPjoU2gbJ34~zuC*@|3MkT8I;-C
zAaUF_hhK4tfOR2UxA`@S1m7TYm!bB!PHGGgE0s8bre!L)T^}99MJ<{E!Uz#jb9MXi
z#KXhw(>td4nCQMXx7W%WQZLe=*tr2XMkWmfXnG$l1Q41(2O19)lle2sW~=%IhCurI
zZPMSZejN7y)Sc<uF{mhH4M2O(P>z0%ABtMAxC)1tq+0+!yx7!El@7A^B7;37M{(e=
z@ue;Wk158#rwc7(n!ylkl_#wVhoe;$*A?>NkrsL)Lj?GMPLUP&8D%LB@G~25FqI8k
zkW8^<=OT}P8ik_T;qc@c-N2r8vfFNhtIWS;@sRvK+H}71=q4y8DvBFe=z#;rxawa5
zxmH5$7wDI<nc|?OT3yxz`oKVDP^CMdM-h_&z?E07`1_i`?ZmIKVo_&w2vR{#sQi2k
zYUGP*(u%LtHyU}l(NRZx4Q)n9{Q*%oQqZJ68_kv1FC+oWuJmY&plr-2BYebW>3oqj
z-VXX7Pcl*gtmXOH6_*k7&J$k#V(M}zifoY=jqV6TjVIa+?%3IDs*^$%^I7g8!<wZ6
zkr5^tHZ!6RsAye~<X6Gc({W8jS?5X=+(C;-W(F<ovw;tkPvCC=E&5<U5rImnqw!PJ
z%o!+{HL1tHLTdf+`+`SU2sA&EQpy+UI6m4NveOVg%S7^I56R2~kw0G5zs`5}A!G=R
zj*U1K@er>n%uRmL@Ef*zZGQQW?<g{^Y+=(c1J*EkoA;;6^78iYkI!vhc?jX?wF^Z>
z11Lr5C#q2ip~S~}8Im2Y#Ap<a*$#Igv1$<-Zs4V>WV1o7On4RA7=hAt34F3;Y9TJ%
z#iOjO5&mT`HpXYVFN8{ymy^Seyu-kE#rnHd#2pF4>btuAhu-_Nh_6(!8c*jq1=QV~
zo<O0fc)Q$<BmhS6Aw(v-!!#pMmyA8s!1nh!zZstT{wRW<m7n3YdtI0)&P&R_7Qqr_
zHCgX{25d>0`6TAk4}}T|CHRw&;DK~YO);N+29Kodvp*oW$B%<)g-a#O)1{;*6C-%G
z7>f%#GnQ2!LJXc{dO`~A(pbA9P{!Slu!9=B>9s~fx8@lEQ{fGoPkKu;yrA2jnGblG
zj+^hUmf!onb(kH7f)P_Z1`wyUmoGBk^f~lo8bkYIXMy8Xk-G=-RX>D~CbW@jZVvx1
zodx1#(Wg%jA&?ZWlS3fCywQOM-hIZ`*BAdh+K)rA`;WQz+3Yhv+}R#SKS#`@uQcUe
zgSCmz1=jBf*oF?VczYT%APAQ|LVyylI6RG=SVW25*2cb-<-WSfpmEle&-ip6;1*4-
znXWrz9+~vdM%E)s!a3TK62C5N<2@N6>6EYktQ7!+gvWVG4>tOpZ3utoE`WEmyd>=M
zdIp6=%lJa=_odwo4NLwS9rItK0}h}zP-0l?_5|qGIl?g_X9qpU$H$_T2uok!{SmNb
zUteoXG}c;#^fAnSk$ALsPyQm0{DqS=hU(AB3QRVcqUv`bLKm@uDxEKx4o5EOYvyt!
zB|t3$jiQ+WslOY-C|YHDGFKXtR?x(pj%-xLa8QyN@)k8c;bg2$Cl@f~tDKPB{jvD5
z1@Yp$rY!8*tVl2xk;)i_Dr0tQdvQj1bhvT&VXm(z=ePJ@XZ{V9{hT)AC4fr@7Iks4
zv2}%^&Rc9Bi2D~sVTn1UfWlKl@&-nDlQ7{K1xzTEEGAP)C~0_i17&KVN)6d*Fy=la
zXs>`>!^sLofrfMoGPd6~ybLexvLeanFuH3>i=8J<G2JSHV}9UaD!*+P%&!N8!MzNO
zaBX(tzkk$AnjNh`Le(|XrgxgcGj1jE2u^-A|BT-*(;-xlINOt{SSM);g}#Zm)7%ES
zYAa{Yfg(7BO8r&+1=t)(^`A<8p1ioYILZ6;006r5zoCH4@!-1;Q7{GH-PcG#qXIFQ
zVK6d+aCT-d8A(eQvQsNt)O4#0prSQ~=NW59d$di-PZ@@iZe{x;xy;-tz}OeBt%_>3
z_Lu6`1`B;-cTAm&23qJ#318kJJc@R`x<AN{$z=)(4v?MC60^}aug@3MOfLMeHZ4At
zsL7iP)M4Av-z+GET47pJAdBf@ZZ^o?15A+i_eA10o0PJk%pRkx0=rtn`Ft<$6vKid
zyfwhiNvAh{-;U_~^*_$&u1RG}igbwA@n$Qq<Eh-q8V<DHr#<(kaIfD2TvE@7)$beX
zy3bMPNWr%p#v>-{C9f=4X?vRh=F6bp%+A3#!E?IkGMS3`D#P-rJ+hO*<(9eIsNPbm
zeO8YVnzTR;R%NV{RDT7lEZKNUXN27v9r0$6e#?}pp)hxU`S@d*i~CD8T_{$CedP=R
zpzAf3mkl2j=FYGj7DD<ShbynVEHtAueUhsNRG5i*g8(qNJ_bP9ga<MLjw&K{8X{gA
zB6hjVh6k;<Z|Ah3zt8vb(qC8gI9)58NI%a6(g?)@Lpkq}H80O^stU;^?LCKYIim2U
z?Gd0xrTN{h-lWg;cvH-zlCSQsUc!7~k(FmL$^Ox%AIEVY{Pby5JPSKqLPVVo5~NiD
z;0AuB3H9d)N_VD#e%6W)CN~`pYm@1{&;5Nz-LQ8V^H!W2tKPn!kiA-+Pd@m$vdp5C
zFHmxO@)44((1ZS9omSb})ejF=faE%TPk2mVdJJoODL_2>x_o<1x}o_3F~jM;_BY>5
ziRtkG)*WtR!j<)6^w>Z#;o-!9+PSa*VM89Kmy%Q*;wEDHo-n6E`7akBf-YyN%5rc{
z*Yj-smq(5aHn>=9Bb*cVfq|3V<W6a&X6{j;hRJ+I(WXtC=`{nUP1FZWepj?Y?!HGr
zRDvGY@J3~uAOhGdW}DGkw7KMl=bK(=k@4|6XH|Gg`dt?Knch)K+uI_@n@>2&DKsAq
z6nzvyKHVX?!XsUPyh%b#wG~re8W3)@hRGF6*cd1~p&-@2z&ddH{s$uM4+6G#9xtYZ
z05#>aHZ-u%k^qVoH@F6J&4NNnGBU~T70=qLAC_7kKfUWZce1YE+#aI^W^uN&m>5=>
zxR)&$6M@<Ul)|%T_}35omV7pH<>{5kHW`6R<9)Q&o3I}NQ<WGiRXnO4zO<3hVHGKP
zPiJp8nxv644I;m&R2^vIBu|zsuk|%)v!+5+(z35q-=lB|r(UP@V%b}k1_ok&(uK&u
z%N|-p^$=aLN@x34wV#T{o0x%xKPAC;uD`0rqm`~jEtw?j+27v}Y#EJ;jXfOJw_Tg5
z7r_C!p0fKOYgj>9*Wa<HJJBN)pR_WLr$Ov!f8o8TO>MF?^JQaGBrCoi#`&$YFE&#K
zR&;9HF*mGan^ndZ2es9P=6*w?uUL8)l-b5L9O$-m!2#@VR84c(=peBWQ?0IlBvH|%
zE@i7H785kj!^ou9vR~8<@CmsSv>bh>nJ)u?9Qm*8*hXlI8tlDUh0bFi=!P0}5~dIR
zF^2BB>~)W{E$u?*{N?_hM@TDuc)lZAWUG@CAc_E%qjRBb@9AIbaQi@Q!#73c#M_Z#
zA3k@7SXHwIsy|oW-GT58&V!cPNPMN-tTA%m=f>lw6aaeA3YM#KPUD`93FqPB^3R24
zvjUG<^0<6<?QGKwFZtTU{@o3syznlIT&ni8I*#x;Jvux;AAMcLQ%|E}pOmkvx`8}L
z*XuKcUFSNEzM_GkBes^H_+TT_U9Xa;Trj$X+{rxK#=txH{e{=YQTWdxqU<_5I*xud
z5`nqQLxC&Vov@|iefbc$lDgBk$QnVAg)m~I?8PUgJ=x7qwD8`W!JRS~hwGY?V(vxH
z>Rz%|u4D^VJbqK-)EuBYY@Vnk{P;94E`A75F-{5V9_^i!$^}Lt8uzGp89w*S1*%lE
zYBH{(e1xix=N8IP!$XfV@4iv`rrlZk@DMs9)6s;=|GB4Op99f5o*w)fS#<Q>A9I2j
z8QLTRSse$G4w)15bMEg>_L=_QN;@9eA=tQU^+gBnP+U|5|5Md%FIK&{DjiHIbO=oB
zSpiH`AQwxDivyoWB5%OInZZ-DxUksKuRLvc5ad^%+-fuMsS*YNrtHvpTBBf!)M;<}
z=pxCiD5Uj-q`;Sz_;5*9khD@<!_C6=SJ)}Wd%**^q?opM-3X$G2)5!N%iJ=C#L1ne
z)i>WpoB9*1eeu}I<=4TH33!$~M5#4F90~UcUGOTMYz-CH)*;IAvA9Ml0EuKve(M9J
zcU9~YIv<EhX6x4Y^xCY@1<eje<u6*6b4ebyK3X^zscl#Z&|^f7e>Fm+F}S*Dv_t7-
zDAwLImBQ<J&95v2bc`gWX@0jA0|Ngn-&<62GCW2e)(L_ou8<^-Gj=IDaUajP*=<&8
zZ+9nUP2u)~nec<T?!|IO?d;cj@$%G^K!%%(-c<9b`$@y)4C#zJ<Hgr?fDmA<L!MZU
zcwwsVm9DhcaYIAX=~3C+<=mN-LzK^KmZs_=!`2wj8NGCFb_;AH2KB9vtRp>af!@_R
zH6T;PHhBisfY`Ztqqd<{@7r6Uo-{vT`2GB0zjo0G`a1M_X~dCQ((l#-pa>T^Tud=(
z4ZaG*))`$OwlYET_`cYYmgaFx`D6<w_tO>zhnP<c>jnk&isS$MY@nP#NrT93_#y*}
z`^b7Pm~Z3PJ<Pcumrvuz(uP*E$4yHtDBQB54HCDb2CvW~k{f!J=Mp%7jJ~d4WKepy
zum;kPNla?3JAF;Tt@*g_8)4qPB!Se+C2kh)S{4Wyw1r|+G^S#MfHv})9^a8}PwV_%
zrjELnpi8S?^YE(w3tiJnD+0>i?z$$6Xv4$)ZuhHlMrqBz8Im|SWS1`D(|6`?_`y%>
zJPv>{g8j`_s)hOa^8-%dqtPq?#MRzG+?q9$)CMZh8mas-_KRct?ePsZYI&7}P6Xss
ziaoAjfF{i{D8rcz2&(b*&`ZL$H~7LL+GNy6Dvh(|aK~FBhi~0QDRJW}Yj@JlJTQaj
z8GN>M8Y1Czdk@nRDfVXL*`30%AJU4-8nV~08(hLGbVzBK`kwrt&I`|}!e|`olo1Lm
zMRK{Y)h7j6NGWakOVjai2=Eb)WojL^g_Cj)&vPT>3}QPoDXL0v$THYlaGNem{>(Ab
zQ@FUxZlXVTsrh#P0RcX~FtE{}N91gBpXS_=Bm$1a8f0<rL9e55v52cBbLSv42he1}
zY)P+(Glp;#!SN73{AMxLU8`zNV(zk-fai_E1SDjM1>E+Z*A8RGr)<qEH5VYnZKenb
z;a;NoD*|Fp4ElI_)wQ2`&vXSo6kl_)PPZ{6o37|?Dls*d=XR2boLSYhTw3+eu&Vt9
zf46}bMb+<Yoto$!A!|kI{K~Nd-Fp^5r_Q+LoaLwaKs{EpPN1oXN%aoMf@#!Kzm#sS
zDXh?A^M2hc$6tC}0UY<c7l;T9MQ+YIT=&Zt^HA~@t~UC0SjUkx#NxPv8K}lC8N3}S
z32rgRW<A)KOxm}o+P+}P<HY|>kaL2v)HBjEGRTq^SgTloViyX%ttO{GtWup0ZBVvh
zAK+bnnWR%sD|n*u{E6k1`0zUA7^Bmszt)w=6mBEFwacX_Z+wEW@;vk%NUQjBQ)^6i
z7rhI9qG6U&vW_KY|IY4C2Bs({ftwP{M?4D93VaV1Y$A^34LI0m8-=N*-?od6N{+Qn
z#~n1-LP)&y+~hW<8xBu2VTW#-d#-e$sPQ*KgKM&pppQXQyopYpaucTxQfD-`mw$l_
zvNUaCK95*Db&@wIRW=A7&p0XAs&X(2*2Cnw{+yTFMNBr41&ilv{Z@wmAVc}wz{Jc@
zF+!P!`K<gs@*VQ#9LIABk#JYxA@X2Jdpea3?NTBAMotwe+jbEF?xMsq`4@2(G()~p
z?Mq@pM#J`d1|@pq?I28+^7Jd;Z>XOFN1Q8LzA3m*W0;E_pV{3>8a-$A#fmI_nQL?L
z(GgstacBvM(ii;TF~SlUMbO&W+<~l!(@Iz-Ow*yaUocxf<H_=hj6*L*qs*?B;7}!*
z(m&U_*Uwf=H8C2hyglc~g5ASmS#n&zG`vR|lgPvQ!Q+Ez-KuFVR2{AE<K(S1Q?5RL
zdeNfHzxF4D=5yaSk&k9475{cgDHK4h(r#OM15D)r&Qd*LDC)45-Pxv$JU>~W^g;cX
zX>TYlI&4sm$>hC&RUjWOhw*7HZv(_n=ZpuP#l;JC%zthsQD<)b+JV$TbN8j{rMO`U
zrTeAhJ+Y7M2Ir(s_ECWf_jAID)_Cf44=!aw9jqyKJeX34A`fMRK3V*To;Rz$J4k`j
z8H2-LQNA!xwoxCNtZ&f1Tp2d1W5oE_wwZ#2{5E-#kV=cBTV4;vXvdLUm@rfbrMy9_
z9C7nXG7aAaOUqyDKZkQP;9zD}+Zz6TwCtBZ7{R~tK@?g0to$Zg72#QDapPq>TFzbH
zS0bIB{pzdCx6&`p>PhPQC{sONcE5Hx7(j?EtGx(^XODM^$<buN+tv9Dwr_s~(8>CQ
zjj6C6YH={}=XtlMgzwa(c*v1qr&D>`IVa;+_K6@JTw<Nen@hEAHrkX07Ky#GxHCh$
zYd2nG%zLEUnxo}_5etjK1L|fxKbAD)U|`^={~7v~m2aaBkNfF0;bNnQHL)~D@~<i0
zI0a^%oM3ZRq#Q(nIrIen^1-rv5f{IUTu24~4}PO!_7Fl1QI=*+P*{)aY&~37zU0`X
zT8?O5cD=;jknl2Qie<?E;Hq7r+pU%35~QB`S~8LyOQ!~-0YH5Y`G=^|NqZudnKL@+
z9T^=uZ9?pHcZTCY$OE<^)#$0lZ&ZW3Yw(%l=%-GD?p7VR&1!ohmVUdDrHL@Yy^T-7
zY(onaW%6??GH~3Pk-ZK4TXwD%*}X@L48d4XE#uY;d(FUz_qnuC=%Bpu+GXsJc9BhD
zA9xykuuA<VEX={tzbMY}W#8H;?VPc}<Mv&`tqNTPK6qo`#Bp=#LSr>t|6HnQ%p1TM
z1yk;|h5*AoaUoOTLw?m`ZKNGVu~^;OQlBHGE?GtNN^(epQ%tp*;joKkmDe+#xapvA
zuBe@m*Lf%dJs&qghW6M@P7(?}+jlb#;W4*(E;F1php+H+FK!qQ1bmY0D^)*nM)8A%
za^p<y6g6LEXl~!g8aZqC|B4=*`AEAS>#;r(U9##(J&K&RXOj9FDd%f~I60#)Gh2y$
zk)}~ggE9#Uesg<#*vWd7q2)%q9kR(f%Np9BEiX%bbf~^{FDi935a2#N@Gvtvf!96h
z8BDj1ROFsN%va1kTfySqTkgh>thS?Ysxq?Hbq}7s!2Q3o{<jPW3eC6=)}cLVfv+v)
zXp|}V!gP{G_J0(Pe>?f9Yx<c{A}G!n%G#65p`dATtp0Gj;^|@wQGirR=3Wk_L|SfQ
zv`ZsrWNXaFapjw*?s0hOk6Q~xr{0l%<Zcjk<v78#qBS9FIRTrFaZy#-tV4hGgj}l(
z!L*^qwCxZ>oz#<}h>#aj(}z$&7O1hp&mg3U=UFyYSMA_V>e`riLL#klkpI5S)-gI?
zIe;$wveZ?r1M1ISOcTE8*RMD17n=AT)O;S?q~>hldHjRE2-+sI#a{MqoJ%9|WYi?F
zWw|mj$TsDH07-6Szzy-K<(CHCkhyD9E2Q=<*+NG^2i}E^JIzGYJe&N2LZ8q6-?FK_
zi&gfb1Rs#{5w}HCP|w0iFu~zV&)w_Mh&|#sEh|5w<=M%+1s{hKnfx+4x}<@S!x~!e
z$ydZiYP7+RN-lqh-^`sc+MYa_P1D$wVu<Sclv{23N%LKeMbS1_H{8;jh$@<0tE+E!
zeJ~K8Lrqh01YjBpc$3O!0Km7J7BT3yMNJ3~pEy(@O4I0=YtDW+zV{q?Q1}qK85!6N
zs}tD&I6VH-I^pAx&$o(x0)1Jb)rVbIUqM3(VjHj3OC*BP#8!0<7)3Z;IO<KZICr;%
zQrw{dOB+CTmXHv+t6$`kk{+2;J0Ky>&!NnEJgmTLt)4hE7Wvif)NrPplegj`w|V-f
z2ZM9rAbPU>;_t?JCGYOVE`&=d2+)Q1z`8B5v<*so1E1;(+jNbmRSM1O%67<X_PB)*
zA&JG>6SYJ8MumshA0uugMKoVK3F4oY$gjfWvU>}PmlD!hTRTMSJZ7m0ZWr#wDu0vZ
z{xM@#q^_U39Ip@qJ8KGsyeT4AE0`&MoVTAlZM+1x86dZ5EjX;3a_biMoME>)Dj4q(
z`5-knid<if>(SlIK)YP$vkV<^tesB1p*hOP0tpT|Rt9!WW1}LXszcmrEq_u3Ba@V(
z3@|0d>_o+FYo%-}P9g#hi#>I6d6Fma&t-0u;8SIQ%KZX;C!s&`DXd+clt;xc3X`8+
zHxSloZUP4K1J*<UeMlgmWT_*#vf$H;JZOY@nkM>!ay%}Bt7EDYb%1pXw}>w)v-Ur^
zJ`N-2c_2Y(O4L2-u3wSQA4dsgv45yx!pPIQ5ZcqDKXPk7Xs-&anpB>mG!vpU5u)O(
z`_#RsGMs?PmFSMePE0<=N_#Nf!S}yuhzDi0cXazyv1m^@6E{<^wy#S+>(~s_;E-L4
zV^yCcpXU!p>ju{FsJ3z~AKqTsWL!DmT{&fRvXNZ_hws6P{npF~=S+#*A@`FJiX+`2
zixc_JR(f%b$4Ib~a?|@V%^mdee#^n(1|wN~-~&D*F0qL+F%f63uRY$F=hJpJ9sI(!
zSHQ>jN^PE{lPmd~+ZvHVp<k~gnXD!`4KY|f;bAfPWPlgp3I=ahj#j84ay?#Lc^kME
zH(HWEcyP&{t|K_;btpG?|MRoKE#-GE3>WJ5mml{>R14W3Jowy3&7r1EEPXf0VmM{Z
zKI8SjsWgTUrlgSb<)<O7x;V0BFIgOich1J#uN18vNStZ~g3BUbb;FbsXwK$%mY_9k
z;U1^1m2s2%sGxlRBHSf6{(kUshTG`kOT?2c>zXSELeMS?xWE{{?4U!S4i~rMqf9Rl
zfm|KQJ?!H=fJExCE2C(#bwk#+X0`EV3aL|;1i|tNKKR&0SXjOjOdX|gH|HnXs!c<<
zn2KtXV|k0gat1kB%9!#V)EcAHM_zQdUB;?HnZiUuICN@JKA=~$+A0*1IG$E?=WKYG
zqYoe3vziI*)}r37F&VF-8bfOhZhG0Lp&bk%&o$>6i@TMrs=4RLXfE<g**^`g*HBy#
z9?130hs_ns<>OB`kvTZC2qMGjR0ktUci#u83&9z=^v3hnR)hKGodg7_?k{!O86H>h
z^BotU3L^W!-ICl@nx8&>58xjQ5S^<0;N;D1-=^2|a=FF&ahVpP=B9ACuB$p)9{`xb
zq6^q7!%fSSGY*7WT-?@3AtMFBXc>o!=JZJD_t6Jg1}uW@E&FCuVm`uf2fx5PtDSHl
zYhW+wATKo)RC%Q~QLmVLoT#{_RBM#d37+2!#Tr@@<cSRlh+cNJCGAMRcAMx=SM$z)
zr6WD+AXf{1K=l&I7=19Ss&g{T8a-&0hL!#8>8jiF&{e%|rQtc#f&FB^ybqQP2#TGP
zz^Gz|8fk;wWPI2s_Bf?F0SH58cg%=(cl@i$h^ND(V3JU5lJy-y{_W*R)X$gT9Vl+F
z?GrzNw^nk8XkPo_&`QmT)S?$0n}sh5zk^XHwfjz4qh(qXiEL$gcjKb{cO06FHjTSQ
zg^Ng?+)?9G9O`t}y}5_u@0Q6N*n|133fl}E>#6Dqf8%AZ<*#0pz&H^gv<w=(H6mRX
zMFQ|SvHLLP%L=J{F?0L=-Yc%H?RJ>vDyhNUX@9?UDJzC*<IF}+<CCyo*PMJi<mw_w
zit%hPe8Fm4qKAfgP$<{r)vMOI0wusSctzf7t6kCFQ#>=3RVPesxCbHHlbG)=QmE->
zcu@4r%XXNy%(2~NFc#&7dFVxYF;x3^i1Ck+k>!SY@Hu}ZJQ-D>vn*(!X=PXb%sDKR
zRBw4y7QNL=@Qn<a+$kVY3ChVmfrbQh)~FxzKE5BPuf!t1Ztr)i_p8g`s(mO*6#{9j
z9-j5F{&gLrko)QN9A^<#+++XY%^X$Ki}BGe<b)V7gBV+f$Z3cp|E<dv*?*c?IHmxU
z4aFLlhH<!;7kU+hSK}Ya9IOhzsS?Vt(IsAw!jiijs6A~$>_RpOF^ZYl!q7Isy7hY|
z)E%iPx5|8|da8wfQPu<}rYy$v+Y`eyC{%D#fJdz-+Vq{V1}md`^8*L>`~ig^eT5N3
zQ+gy8_Nh_ww=7<F`~fNc+z?blK`AV6EO&wcI{%DRaJ)B8vYR}20Ak#D*FgK%>NFO`
zur>OQ)qaR;fSX>k`J;@s5O*ao<eCYO)ODYVJ&1^;=ln*ayQ0Yok+71pKK#HhLa+a3
zmfe#+hb4+%h<TU|>MkpxbAgal2>w^j!Kyz6!2g>J%ZKqdZ|ACgc83NqCh`kE96r6>
z`5>Dn6pcjzIcp)My%ED4Bqvl@Hf+sl#AL2``?%(%ZKjUNCF-UhcEB8$W72I6?Ly?u
z4ZSgftT~CFeaIVrr7c{+{DO?bokZq8Z_u#*9zwx+%KnGG^{G=7CJr+cC&X>|$efTw
zBb_UFmMbS%U5?^>KR(5x)kAng(MGQEQ;1-Tv;f*7dWkN_|G{QcSk5hQ97xY7;5oAA
zBzCeq6nx1+yY&2ra~6tr_aGF*lU>>BN7tLO`NW7ne7yLE?aQnG?ZB8cBZ^J8$d?c5
zF(ol$k_F3%y%t7ZldOTc@hYkQCduz(weygz;NlMt(3<jQ>NU$w(OhrKe`QT=hnp$D
zMFX4awAC8wsU+(T&4{#}#Uh`*KN$ns9$#{s#;*=8saD44<bH^#)+HR?aV?x}?KS%w
zl=E-=m#g6@46|=o-S<7Lm(7PWiRZUNXiX`{uh@?PBgW$eIi$A^52`A^oYOR>_2(5r
zg{<rGpQQG&y9k;-`7uM(9~jtB%yPMw#pu{e7{O>dO$Sk7u^N9~eemY>3S-VCS1YFd
zmtThf3e9*s>wwUyjM5X$pxvoXvq>$T4G}B-k=b&}-zK4A_}|i5+KJ%sv)|7g#$>ZO
zHEWu6)R+ZmAnsCO3(FAtzHEvu%?+D_>y)7G`BDRe{*e;%;8)ArUvz{yzq-CMl*)GK
z;_LjVBZw-sV&~k{s^hah#3HY7uM!Je@s?V#4unP(Yt{lJAM0=3Mq}TJ;GKm6yUWKU
z&3x<ivi7&9MvCv84H2!k76|@+w@(!RZLaniL5VI%<t1?&a+&BkdFYyqskd_yE%-+;
zWG2trBgzZ&sbQ8~p2vY&t0!fh1D#r72tEiah~i~ia?9FCDj}3tY}TX(L7ZalMmZE>
z-IuYnd~<Dxd{ld%Uz@!!?_Kk+`g+}zC?O+u2^T^%n!xr8cK+8T;bFzZxU>+idq<kN
zv_aFH=_M=xS8aB{{r-eg^SasZSN*>HXVB`8S$E{+A2+_!5%#GPVz-Im_}pI+za?B<
z-tpeiD}sX}Cpv<WVntqTqBb&U|E=JNydQ&SYHfeDVNc$%enwPrYwRv*)ur|yrFmfU
z-fE!n>dt$(@Fn*-1z!QMgQ9PD?GZV3kdqb!jV`)b?!m;0*=kkE@I!+ba@G_p$#H4A
zD8}<imbU_QsvnBx{uue={FeVv_5L_Nd}h`e$&nHp@F<T_=$_d?RGLP^ZCQ7fUll8T
zBUBb~TG!q^iqo3yS>Jh0kMRzsnlHYt+Ukdnyp8`o$6BsGT0t0GxjMKbTlf+QOz~8l
zX_O#uuD_||1BO4^Eos6NV74D^!&YG~tfte=^kqXKnD+18qN2GmL?BnDazO(!aqHs`
zgl^H3BjLab*L6LzV-;V4;3BmkCV=V;Kpyr>Lcb-8Bll+}7N`9toEDCW9OBzY3T(X7
z;f<{lmQ||0%l3I&;Yo<1+0yF1|3@B45og{C_T+`J+BD_+BVGp0?>%AbapDZqn#oFK
z;R1<*<;AK-785*IxP)pBB*pgL_uq=%FV!s8O&SrW4pTMDKpwuDOY2%YeXGN*$-x{J
zIRe<W?FdwYHiYt?!!`8`zb-B`p0-a&#DqAZ{g4^%^gS!@-oQYKYLGF_?-(q40OU!(
zU;XzB!(9iT*5MmW0C?gG%|-&2L^dQ3Dp*(ECcHU}m^qf7D4RAH&qO4zjd^~N1E%_P
z1f!f>qbOi|E!wxl0L|7`Ts~kn;-*v4xo;gz=__P?%HSfBH0@Iq8_uakUxkc%fs8(K
z&~o4|Oek~FuPD;u0UWEaIPt`AVc!y_TA#8&htD~0%fJpJ15Zf$vGsmgnrN;Zd|_aJ
znjU{@t&S|Ln7)?I!(k4%kI2KlAWSZG(nd9L@<x{D+xWHa`}QLyCuhpJF;*G^lVOXT
zs98$xK1a_PXW=}7QX8f2E5&|uDay$@LKG|zQvu-?1QCEKUbWF0yk_D1^W|%qiK5t$
z?uSOWuDQ>ex4$T|$3LTLQ8$AK7e$u2I(^+B>Q+0^aAX2*IQZ4`H&G|J;9tQv1-SVI
zE37obLewkfIup22<K+PSYvo>c<(>1-^othZ>&yQg)JEv9L<0LN&Xxe?C2@OA7m1l&
zzmjWSeC95`d@HlVeR`Qf+O=*QE&w@c?gTd8s7HqEBK8iMJR2&@OmO2yfe6aVfMhY`
z$1CVsolOl`ntjHg?@VhroZT_t;bv=dwyRDKJzSG{bt^i;T!iDf$>d;u7MD;r?-+Xs
z8<*c&JO3k9CDmv?d7&p+D+AVQ(l#BjII3CXiDhs6;Bf23M}63;u+*rIs^Xi_{?4Wq
zS>}=cpgjd@X{S;YD($V~e156rE$}fBc1n~zuF|U64@)hrEC(-6%ER>Ae+EU?1Xqdl
zAh!E<t+|P+g*;O(tV9&_pU`^66l33>jc7+UVe3|bN)M3=PvvQjFr1&lH-c8?n@UV;
zvqN@p&bl?S1N3I|VJBzl3rQ-Y0sVx`yiCKLh(?i&TU~7ifly<#?i7jH2b5crtxyF~
znn_nC`<8E+Rr`BSX04t9rNqqbo)yr5v+W&qca^<`HvJHaO-#kG;Krl3Le{#5S-r+g
zDY2bYajxK<SE`-zd4L#j9^%MKifMqdAB=i3%jAT;2*r$)*?cD!KyRsd@`OQD%lb$m
zA@@u84+19PS<~Tn%deR}l?T~j@+H>vzg*hzmzpcVb$9G$uX!U68Y{cwYK%tkjA*+W
zw0vw)nK;zjrO_QefMW)Ci}XFpp0TuVV(Cy@E?nO=PZs-LnnZ@Y@=7dwaR+?LVL21=
zlnLYi*l$AXb5h!kYRjW6*B=V0+&fu&EFRM`Y%T@tyj}?x3U=oY?E!G@@~{^=a?@22
zcjT4yU5!3q%2ZeQ$Mc=c>;MXAE`XJU38zo$&&nll&lJAdkfedyn|a%hYL?QZknbGi
zjBCYD(;hT@EOWw58Ve!x2pXSK42E-Bci)`bN((LcxitG!`?$t%ycK>>))MDVoJ!3Z
zz=?0;PPTH!oYW_MTm>t)H!!5*yJ^Z&(s+G8BpeuTFJj+ARa5finh)|?WWb3sBGd(q
zvOe<732|Dr@9j0kj!6=?x#RA<LVB+JV5tM((aLe>_Q@0Dv75rfQniVx+%BP<bRQuj
z=5>$5Im0`rznB>mx$079r?D6CaRzx6r+b<OWVLm@mY>T*YHn2fR*9ft9_<T3xAlu8
zK)M`tZvr(P&;zgg=P-gjU!rFsCG&!=4UY^TKkVR7LdJiTH5yY;w2D5^>)3?GZp~N@
z9+{q?Kfg4ATzOo`7uQAc^{^hM>(U-u@uRCyiOY{8P2+whFl$N?&z5md?`~;jkeg6f
zYxy0kd&>-4oB9{PY9`}<?ESGPvdl&Zyo(3MQi2cnu=PM+k<d+9;7b>?vMS5XCTx~9
z`nvVv5q|71YVfhQhu)s(H@s4xJJ!uJLnS|Ox%VG%XQdc^EO^P<o%k$jYv7&NYNk%L
zzp_QgwK}l}8+1KvP_6z=FtD5_+T6037F4$+B(V@b%On9^jhMna@jtfXygTx$5jmsg
z=A<j>_cQk_X+M>FeEce~DDAVy=QlYFLC>?^FE%%i2X}d_-`?$F0Epz44rF}5*fS55
zStHvh$1hxIWp;r7z<N$c?sFUEEvF)$#HS-_hZ|_u2c;G=LW$2)&gkw11F&7catFOz
z>Gn(Ba0Zm~vw9sqKV^%a_jS@!lo@3~ZSFZ-h^3LxxpGV{eF~oGOG|NcEkAaX8>wzc
zRG$}U1bwiS&Ej65E^i|B1&_TDUQ}jVZm2=g?`0}eW}&69dg!aX(VkH@t3I)rWz(@?
z*_u%@J5X(2&HcWEKjl?rQE~l3IOoCku7_T=eI0TyKA!1baBp4^k8u*^jf~|XuC>MI
zg>IB_iz#&lD%BdmD0_zIOR<DHBiH;#FZvBFCFF0h4PCL<<RsIxX}46UHNwork7Jj{
zzs2L2AbJ3j(D_4ychT0wso-+-MtS|HXkRgZ9li`(^ko<-qd9xED9P>{)Eh`rPNVF}
z(ru|JN}Q1#yZzd0JG9KsSLabckZtp|I=QtChJ_tWE}f6pQ#-6!z2FJE7CA@KT10AR
zuEn(^-H@fcccGi<Q(0o`%h**e1eDJ*EQQjk;@lvE&Nz%7=^bOky?Dz9RV`z6V{+EV
zYKQW_M6xpXJHNOq(uLuy`ZBu#j1r=bob3n03@}I@cixtpTLDCToH>5#jKxtNgw91>
z3NUgGzs7wpZ9>i_ZeNO0rs7LGZf}B)RXj%Yb7OPX#<I!C{IZi}qth+44T$0fcvURP
z7ZQ4%ZSIW`G&el<&~xWLgm7;Y4lhV8WAB$*DJ2SEG#m%1r48n=;DW@7ECX^U_qRLV
zzCo}26wTRw-nz?z0FwF@>03)r<I4=?g6K2v%dP3PESgsyHN8(WUVpaRC8868z?hR)
z2Mw@mhi6=Kox|{lfi?0}Ua#u5&*%f6sW5@(J<@eRa7M+Ier_X{2%mr3WsP>Lf2P28
z>Pc1TTo+ZW&EOnqYx?`HK4EeGWH~tg(CuFXTcM7RPaArG&48sgE6v$U9_u*5-&h(Q
z+-oHblG1JwsZZR)*obz6nIKZI#L`2y(nG>DhIVt25k-uZsBYJMxsyAv^rz`seGkJv
zlIKoNy2Zo@*fvK!OJa~!$a%=`_7Z{#|MSYh)x+tv@%L9f`fdo<5>svR?VND#><c-0
z#g9)*#{{)`#tl-!TFZhzYn>%^?#7@byQ_eHW=z)L>80i4cbg}<XJC&(Z4Wb-I*fjy
z-G``RX%0qw^Rz>CX0EkmJbyuDvJU#_sFiz9M*@!zH|GxDc#h{Am9klt8r=(YDsGOA
z8BR0x&NwLok{Q@Ut!9r9<8@z)jJ<H@Y+MefsAX#Jti`IAPMC-}W)9U&0_Mr9Ek^OI
zgL`YY#~co7#H_8at?ZEjOHiK5wWJR&y8x_gDC@+g00^=YfHLbNCPPN-=ujp4KXEc~
zIw0(xY3u#9eI}h(fSQOcye}XuCu9hh5dN+{4kFMxI*=AZ6c}pQTYlCx2{OMZb#MQt
z)Rk{?!(?w)k?Va<A)Ox(RU}x7S0irR@81~N+S+csURpa*vbItZ#8R?D(6k(5+)P_&
z{8oowjupfdr5t)z?G~j|E;>>1bfU~~qTWEnL$s%dXn$#Y*q0#NP0UQIvBy83vkorK
z!8#c7VEEQ5F#gofUC{4!s+ya?rlo{>P;HIWfj(sgvuG)huw(?5ZZ-ADmvmVHn<;jD
zfYrWRXFYXOD>AxQaqiba1oUhetusH6JtX^j_2V<f8-35jtZ55h-(6<IV`IBY`uLid
zqv|7Sf*IBskn`nY_Kv&Mhwlws6BQn}Dg0dM<U@qHE?C>Jl_%A6H<+AAQt6YACA4rL
zuyt+6FR1!wQh3geeEHftu6ryu_LaFfY%Kd2)+f3mGkRK*h_sJ}*5Yy$ms&z5z%y+5
z3A#`DgbWVtt6te3{@hxcMC523>@Wltx28KJDJ_I3lPM|8ct1AaFRk!!v)jp83$jfz
zI(v@LpU_2aCFpMzxVV&kn=h$d@GPh&iI2XD^Zn8Jr{`a%e4jr^tgYWTyB<<0tiLNF
zlDuaKi6?}v+!^B>oTEA=eC9=Y@MI^-dlWeY8k--mIKZ^MIyM&^ry$x0>2jajtKRZS
z`gvU>q|2z~=gDTPZBE>&Ta82c{BZHSv6noW(*0g+)@7WppCRX?Wzt<%)Ci+5W3`<H
z`AFP}kfhZa)6f|i<GD|FrbW7o*)LzW(cJ>CEY?yjewwG>#l?9!dcKAA{1Fwu*ouRL
za~IeP{`(0%|5D!h^ZMQS=Sj~W+VjuApFa=Jzs&vn!2`Z8^81lF|AzGW^Y35%7Q;VT
z{Zod2hI6h1|2)IF6#jY9b1D2&hTl^7rwsp;;a`6BTL=Cnkmq9frwsp;;a}x-t^@x{
z%iospPZ|Cx!#_;sTnGLEDd$r7e-u^Y7%w(CM-g9(oermrYLov)6u<oGSL1vY{|h4$
z{Ou^P{^<kZ{QIN-FGXOT9GZZGgKK@x1;F`t+5bd<^G^i-mqkFc!|KfT)<u8mJdVgp
MDM{vwKYROs0Gc3-X8-^I

literal 0
HcmV?d00001

diff --git a/resources/ios/splash/Default-Landscape-2688h~iphone.png b/resources/ios/splash/Default-Landscape-2688h~iphone.png
new file mode 100644
index 0000000000000000000000000000000000000000..02a152e5e188573780812dbf7237cdf44ccb629b
GIT binary patch
literal 48177
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

literal 0
HcmV?d00001


From 0d64207484c94b559bd75cb2e213d22d8f7c4778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 26 Nov 2019 13:34:43 +0100
Subject: [PATCH 127/257] MOBILE-3232 filters: Remove unnecessary files from
 MathJax

---
 config/copy.config.js | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/config/copy.config.js b/config/copy.config.js
index ddbcafc88..eb780e38e 100644
--- a/config/copy.config.js
+++ b/config/copy.config.js
@@ -13,8 +13,28 @@ module.exports = {
     src: ['{{ROOT}}/src/config.json'],
     dest: '{{WWW}}/'
   },
-  copyMathJax: {
-    src: ['{{ROOT}}/node_modules/mathjax/**/*'],
+  copyMathJaxMain: {
+    src: ['{{ROOT}}/node_modules/mathjax/*.js'],
     dest: '{{WWW}}/lib/mathjax'
   },
+  copyMathJaxConfig: {
+    src: ['{{ROOT}}/node_modules/mathjax/config/**/*'],
+    dest: '{{WWW}}/lib/mathjax/config'
+  },
+  copyMathJaxExtensions: {
+    src: ['{{ROOT}}/node_modules/mathjax/extensions/**/*'],
+    dest: '{{WWW}}/lib/mathjax/extensions'
+  },
+  copyMathJaxFonts: {
+    src: ['{{ROOT}}/node_modules/mathjax/fonts/**/*'],
+    dest: '{{WWW}}/lib/mathjax/fonts'
+  },
+  copyMathJaxJax: {
+    src: ['{{ROOT}}/node_modules/mathjax/jax/**/*'],
+    dest: '{{WWW}}/lib/mathjax/jax'
+  },
+  copyMathJaxLocalization: {
+    src: ['{{ROOT}}/node_modules/mathjax/localization/**/*'],
+    dest: '{{WWW}}/lib/mathjax/localization'
+  },
 };

From 86f0db81087b4d02d4cc11569ace4b49c9ad46db Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 26 Nov 2019 09:40:18 +0100
Subject: [PATCH 128/257] MOBILE-3230 forum: Use parent subject in post replies

---
 src/addon/mod/forum/components/post/post.ts   | 21 ++++++++++++++-----
 .../forum/pages/discussion/discussion.html    |  6 +++---
 .../mod/forum/pages/discussion/discussion.ts  | 14 ++++++-------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/addon/mod/forum/components/post/post.ts b/src/addon/mod/forum/components/post/post.ts
index ced5507c8..97b599cef 100644
--- a/src/addon/mod/forum/components/post/post.ts
+++ b/src/addon/mod/forum/components/post/post.ts
@@ -48,13 +48,14 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
     @Input() trackPosts: boolean; // True if post is being tracked.
     @Input() forum: any; // The forum the post belongs to. Required for attachments and offline posts.
     @Input() accessInfo: any; // Forum access information.
-    @Input() defaultSubject: string; // Default subject to set to new posts.
+    @Input() parentSubject?: string; // Subject of parent post.
     @Input() ratingInfo?: CoreRatingInfo; // Rating info item.
     @Output() onPostChange: EventEmitter<void>; // Event emitted when a reply is posted or modified.
 
     messageControl = new FormControl();
 
     uniqueId: string;
+    defaultReplySubject: string;
     advanced = false; // Display all form fields.
     tagsEnabled: boolean;
     displaySubject = true;
@@ -89,9 +90,17 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
         this.uniqueId = this.post.id ? 'reply' + this.post.id : 'edit' + this.post.parent;
 
         const reTranslated = this.translate.instant('addon.mod_forum.re');
-        this.displaySubject = this.post.parent == 0 ||
-            (this.post.subject != this.defaultSubject && this.post.subject != 'Re: ' + this.defaultSubject &&
-                this.post.subject != reTranslated + this.defaultSubject);
+        this.displaySubject = !this.parentSubject || (
+            this.post.subject != this.parentSubject &&
+            this.post.subject != `Re: ${this.parentSubject}` &&
+            this.post.subject != `${reTranslated} ${this.parentSubject}`
+        );
+        this.defaultReplySubject = (
+                this.post.subject.startsWith('Re: ') ||
+                this.post.subject.startsWith(reTranslated)
+            )
+                ? this.post.subject
+                : `${reTranslated} ${this.post.subject}`;
 
         this.optionsMenuEnabled = !this.post.id || (this.forumProvider.isGetDiscussionPostAvailable() &&
                     (this.forumProvider.isDeletePostAvailable() || this.forumProvider.isUpdatePostAvailable()));
@@ -145,7 +154,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
 
         this.replyData.replyingTo = replyingTo || 0;
         this.replyData.isEditing = !!isEditing;
-        this.replyData.subject = subject || this.defaultSubject || '';
+        this.replyData.subject = subject || this.defaultReplySubject || '';
         this.replyData.message = message || null;
         this.replyData.files = files || [];
         this.replyData.isprivatereply = !!isPrivate;
@@ -282,6 +291,8 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
         } else {
             // The post being replied has changed but the data will be kept.
             this.replyData.replyingTo = this.post.id;
+            this.replyData.subject = this.defaultReplySubject;
+            this.originalData.subject = this.defaultReplySubject;
             this.messageControl.setValue(this.replyData.message);
         }
 
diff --git a/src/addon/mod/forum/pages/discussion/discussion.html b/src/addon/mod/forum/pages/discussion/discussion.html
index 9615fd88a..577fe6c57 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.html
+++ b/src/addon/mod/forum/pages/discussion/discussion.html
@@ -42,13 +42,13 @@
         </ion-card>
 
         <div *ngIf="discussion" margin-bottom class="highlight">
-            <addon-mod-forum-post [post]="discussion" [courseId]="courseId" [discussionId]="discussionId" [component]="component" [componentId]="cmId" [replyData]="replyData" [originalData]="originalData" [defaultSubject]="defaultSubject" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo" (onPostChange)="postListChanged()"></addon-mod-forum-post>
+            <addon-mod-forum-post [post]="discussion" [courseId]="courseId" [discussionId]="discussionId" [component]="component" [componentId]="cmId" [replyData]="replyData" [originalData]="originalData" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo" (onPostChange)="postListChanged()"></addon-mod-forum-post>
         </div>
 
         <ion-card *ngIf="sort != 'nested'">
             <ng-container *ngFor="let post of posts; first as first">
                 <ion-item-divider *ngIf="!first"></ion-item-divider>
-                <addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component" [componentId]="cmId" [replyData]="replyData" [originalData]="originalData" [defaultSubject]="defaultSubject" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo" (onPostChange)="postListChanged()"></addon-mod-forum-post>
+                <addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component" [componentId]="cmId" [replyData]="replyData" [originalData]="originalData" [parentSubject]="postSubjects[post.parent]" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo" (onPostChange)="postListChanged()"></addon-mod-forum-post>
             </ng-container>
         </ion-card>
 
@@ -60,7 +60,7 @@
 
         <ng-template #nestedPosts let-post="post">
             <ion-card>
-                <addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component" [componentId]="cmId" [replyData]="replyData" [originalData]="originalData" [defaultSubject]="defaultSubject" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo" (onPostChange)="postListChanged()"></addon-mod-forum-post>
+                <addon-mod-forum-post [post]="post" [courseId]="courseId" [discussionId]="discussionId" [component]="component" [componentId]="cmId" [replyData]="replyData" [originalData]="originalData" [parentSubject]="postSubjects[post.parent]" [forum]="forum" [accessInfo]="accessInfo" [trackPosts]="trackPosts" [ratingInfo]="ratingInfo" (onPostChange)="postListChanged()"></addon-mod-forum-post>
             </ion-card>
             <div padding-left *ngIf="post.children.length && post.children[0].subject">
                 <ng-container *ngFor="let child of post.children">
diff --git a/src/addon/mod/forum/pages/discussion/discussion.ts b/src/addon/mod/forum/pages/discussion/discussion.ts
index 454a0147a..6d47d6db9 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.ts
+++ b/src/addon/mod/forum/pages/discussion/discussion.ts
@@ -51,7 +51,7 @@ export class AddonModForumDiscussionPage implements OnDestroy {
     discussion: any;
     posts: any[];
     discussionLoaded = false;
-    defaultSubject: string;
+    postSubjects: { [id: string]: string };
     isOnline: boolean;
     isSplitViewOn: boolean;
     postHasOffline: boolean;
@@ -375,10 +375,6 @@ export class AddonModForumDiscussionPage implements OnDestroy {
             }).catch(() => {
                 // Ignore errors.
             }).then(() => {
-                this.defaultSubject = this.translate.instant('addon.mod_forum.re') + ' ' +
-                    (this.discussion ? this.discussion.subject : '');
-                this.replyData.subject = this.defaultSubject;
-
                 const startingPost = this.forumProvider.extractStartingPost(posts);
                 if (startingPost) {
                     // Update discussion data from first post.
@@ -388,9 +384,6 @@ export class AddonModForumDiscussionPage implements OnDestroy {
                     return Promise.reject('Invalid forum discussion.');
                 }
 
-                this.defaultSubject = this.translate.instant('addon.mod_forum.re') + ' ' + this.discussion.subject;
-                this.replyData.subject = this.defaultSubject;
-
                 if (this.discussion.userfullname && this.discussion.parent == 0 && this.forum.type == 'single') {
                     // Hide author for first post and type single.
                     this.discussion.userfullname = null;
@@ -398,6 +391,11 @@ export class AddonModForumDiscussionPage implements OnDestroy {
 
                 this.posts = posts;
                 this.ratingInfo = ratingInfo;
+                this.postSubjects = this.posts.reduce((postSubjects, post) => {
+                    postSubjects[post.id] = post.subject;
+
+                    return postSubjects;
+                }, { [this.discussion.id]: this.discussion.subject });
             });
         }).then(() => {
             if (this.forumProvider.isSetPinStateAvailableForSite()) {

From 256c883f57df44766595494c45475588bf00721a Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 26 Nov 2019 16:16:13 +0100
Subject: [PATCH 129/257] MOBILE-3230 forum: Avoid updating reply subject if
 it's been modified

---
 src/addon/mod/forum/components/post/post.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/addon/mod/forum/components/post/post.ts b/src/addon/mod/forum/components/post/post.ts
index 97b599cef..16aedbeb5 100644
--- a/src/addon/mod/forum/components/post/post.ts
+++ b/src/addon/mod/forum/components/post/post.ts
@@ -291,8 +291,13 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
         } else {
             // The post being replied has changed but the data will be kept.
             this.replyData.replyingTo = this.post.id;
-            this.replyData.subject = this.defaultReplySubject;
-            this.originalData.subject = this.defaultReplySubject;
+
+            if (this.replyData.subject == this.originalData.subject) {
+                // Update subject only if it hadn't been modified
+                this.replyData.subject = this.defaultReplySubject;
+                this.originalData.subject = this.defaultReplySubject;
+            }
+
             this.messageControl.setValue(this.replyData.message);
         }
 

From 41abc66640484d49a4f36eacd3ebadae04140749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 27 Nov 2019 10:48:55 +0100
Subject: [PATCH 130/257]  MOBILE-3222 iframe: Fix Embed youtube url

---
 .../filter/mediaplugin/providers/handler.ts   | 70 ++-----------------
 src/components/iframe/iframe.ts               | 14 ++--
 src/providers/utils/url.ts                    | 52 ++++++++++++++
 3 files changed, 67 insertions(+), 69 deletions(-)

diff --git a/src/addon/filter/mediaplugin/providers/handler.ts b/src/addon/filter/mediaplugin/providers/handler.ts
index ddbcfc652..bc8b5ce03 100644
--- a/src/addon/filter/mediaplugin/providers/handler.ts
+++ b/src/addon/filter/mediaplugin/providers/handler.ts
@@ -69,25 +69,16 @@ export class AddonFilterMediaPluginHandler extends CoreFilterDefaultHandler {
         }
 
         const data = this.textUtils.parseJSON(video.getAttribute('data-setup') || video.getAttribute('data-setup-lazy') || '{}'),
-            youtubeData = data.techOrder && data.techOrder[0] && data.techOrder[0] == 'youtube' &&
-                    this.parseYoutubeUrl(data.sources && data.sources[0] && data.sources[0].src);
+            youtubeUrl = data.techOrder && data.techOrder[0] && data.techOrder[0] == 'youtube' &&
+                    this.urlUtils.getYoutubeEmbedUrl(data.sources && data.sources[0] && data.sources[0].src);
 
-        if (!youtubeData || !youtubeData.videoId) {
+        if (!youtubeUrl) {
             return;
         }
 
-        const iframe = document.createElement('iframe'),
-            params: any = {};
-
-        if (youtubeData.listId !== null) {
-            params.list = youtubeData.listId;
-        }
-        if (youtubeData.start !== null) {
-            params.start = youtubeData.start;
-        }
-
+        const iframe = document.createElement('iframe');
         iframe.id = video.id;
-        iframe.src = this.urlUtils.addParamsToUrl('https://www.youtube.com/embed/' + youtubeData.videoId, params);
+        iframe.src = youtubeUrl;
         iframe.setAttribute('frameborder', '0');
         iframe.setAttribute('allowfullscreen', '1');
         iframe.width = '100%';
@@ -96,55 +87,4 @@ export class AddonFilterMediaPluginHandler extends CoreFilterDefaultHandler {
         // Replace video tag by the iframe.
         video.parentNode.replaceChild(iframe, video);
     }
-
-    /**
-     * Parse a YouTube URL.
-     * Based on Youtube.parseUrl from Moodle media/player/videojs/amd/src/Youtube-lazy.js
-     *
-     * @param url URL of the video.
-     * @return Data of the video.
-     */
-    protected parseYoutubeUrl(url: string): {videoId: string, listId?: string, start?: number} {
-        const result = {
-            videoId: null,
-            listId: null,
-            start: null
-        };
-
-        if (!url) {
-            return result;
-        }
-
-        url = this.textUtils.decodeHTML(url);
-
-        // Get the video ID.
-        let match = url.match(/^.*(youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/);
-
-        if (match && match[2].length === 11) {
-            result.videoId = match[2];
-        }
-
-        // Now get the playlist (if any).
-        match = url.match(/[?&]list=([^#\&\?]+)/);
-
-        if (match && match[1]) {
-            result.listId = match[1];
-        }
-
-        // Now get the start time (if any).
-        match = url.match(/[?&]start=(\d+)/);
-
-        if (match && match[1]) {
-            result.start = parseInt(match[1], 10);
-        } else {
-            // No start param, but it could have a time param.
-            match = url.match(/[?&]t=(\d+h)?(\d+m)?(\d+s)?/);
-            if (match) {
-                result.start = (match[1] ? parseInt(match[1], 10) * 3600 : 0) + (match[2] ? parseInt(match[2], 10) * 60 : 0) +
-                        (match[3] ? parseInt(match[3], 10) : 0);
-            }
-        }
-
-        return result;
-    }
 }
diff --git a/src/components/iframe/iframe.ts b/src/components/iframe/iframe.ts
index 1f544a633..f6517fde6 100644
--- a/src/components/iframe/iframe.ts
+++ b/src/components/iframe/iframe.ts
@@ -19,6 +19,7 @@ import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
 import { NavController } from 'ionic-angular';
 import { CoreLoggerProvider } from '@providers/logger';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
+import { CoreUrlUtilsProvider } from '@providers/utils/url';
 import { CoreIframeUtilsProvider } from '@providers/utils/iframe';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 
@@ -39,9 +40,13 @@ export class CoreIframeComponent implements OnInit, OnChanges {
     protected logger;
     protected IFRAME_TIMEOUT = 15000;
 
-    constructor(logger: CoreLoggerProvider, private iframeUtils: CoreIframeUtilsProvider, private domUtils: CoreDomUtilsProvider,
-            private sanitizer: DomSanitizer, private navCtrl: NavController,
-            @Optional() private svComponent: CoreSplitViewComponent) {
+    constructor(logger: CoreLoggerProvider,
+            protected iframeUtils: CoreIframeUtilsProvider,
+            protected domUtils: CoreDomUtilsProvider,
+            protected sanitizer: DomSanitizer,
+            protected navCtrl: NavController,
+            protected urlUtils: CoreUrlUtilsProvider,
+            @Optional() protected svComponent: CoreSplitViewComponent) {
 
         this.logger = logger.getInstance('CoreIframe');
         this.loaded = new EventEmitter<HTMLIFrameElement>();
@@ -84,7 +89,8 @@ export class CoreIframeComponent implements OnInit, OnChanges {
      */
     ngOnChanges(changes: {[name: string]: SimpleChange }): void {
         if (changes.src) {
-            this.safeUrl = this.sanitizer.bypassSecurityTrustResourceUrl(changes.src.currentValue);
+            const youtubeUrl = this.urlUtils.getYoutubeEmbedUrl(changes.src.currentValue);
+            this.safeUrl = this.sanitizer.bypassSecurityTrustResourceUrl(youtubeUrl || changes.src.currentValue);
         }
     }
 }
diff --git a/src/providers/utils/url.ts b/src/providers/utils/url.ts
index 39604bfd3..d2e9e0d47 100644
--- a/src/providers/utils/url.ts
+++ b/src/providers/utils/url.ts
@@ -233,6 +233,58 @@ export class CoreUrlUtilsProvider {
         });
     }
 
+    /**
+     * Returns the Youtube Embed Video URL or null if not found.
+     *
+     * @param  url URL
+     * @return Youtube Embed Video URL or null if not found.
+     */
+    getYoutubeEmbedUrl(url: string): string {
+        if (!url) {
+            return;
+        }
+
+        let videoId;
+        const params: any = {};
+
+        url = this.textUtils.decodeHTML(url);
+
+        // Get the video ID.
+        let match = url.match(/^.*(youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/);
+
+        if (match && match[2].length === 11) {
+            videoId = match[2];
+        }
+
+        // No videoId, do not continue.
+        if (!videoId) {
+            return;
+        }
+
+        // Now get the playlist (if any).
+        match = url.match(/[?&]list=([^#\&\?]+)/);
+
+        if (match && match[1]) {
+            params.list = match[1];
+        }
+
+        // Now get the start time (if any).
+        match = url.match(/[?&]start=(\d+)/);
+
+        if (match && match[1]) {
+            params.start = parseInt(match[1], 10);
+        } else {
+            // No start param, but it could have a time param.
+            match = url.match(/[?&]t=(\d+h)?(\d+m)?(\d+s)?/);
+            if (match) {
+                params.start = (match[1] ? parseInt(match[1], 10) * 3600 : 0) + (match[2] ? parseInt(match[2], 10) * 60 : 0) +
+                        (match[3] ? parseInt(match[3], 10) : 0);
+            }
+        }
+
+        return this.addParamsToUrl('https://www.youtube.com/embed/' + videoId, params);
+    }
+
     /**
      * Given a URL, returns what's after the last '/' without params.
      * Example:

From a401649b94686b3842e4d0aa395b19dcd919cd65 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 27 Nov 2019 10:54:27 +0100
Subject: [PATCH 131/257] MOBILE-3206 lang: Update invalid moodle version
 message

---
 src/assets/lang/en.json     | 2 +-
 src/core/login/lang/en.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 2a5ba7432..6879a9d11 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1611,7 +1611,7 @@
     "core.login.invalidaccount": "Please check your login details or ask your site administrator to check the site configuration.",
     "core.login.invaliddate": "Invalid date",
     "core.login.invalidemail": "Invalid email address",
-    "core.login.invalidmoodleversion": "Invalid Moodle version. The minimum version required is 3.1.",
+    "core.login.invalidmoodleversion": "<p>Invalid Moodle site version. The Moodle app only supports Moodle systems 3.1 onwards.</p>\n<p>You can contact your site administrators and ask them to update their Moodle system.</p>\n<p>\"Site Administrators\" are the people who manages the Moodle at your school/university/company or learning organisation. If you don't know how to contact them, please contact your teachers/trainers.</p>",
     "core.login.invalidsite": "The site URL is invalid.",
     "core.login.invalidtime": "Invalid time",
     "core.login.invalidurl": "Invalid URL specified",
diff --git a/src/core/login/lang/en.json b/src/core/login/lang/en.json
index e4780131c..0e7cbf3cf 100644
--- a/src/core/login/lang/en.json
+++ b/src/core/login/lang/en.json
@@ -38,7 +38,7 @@
     "invalidaccount": "Please check your login details or ask your site administrator to check the site configuration.",
     "invaliddate": "Invalid date",
     "invalidemail": "Invalid email address",
-    "invalidmoodleversion": "Invalid Moodle version. The minimum version required is 3.1.",
+    "invalidmoodleversion": "<p>Invalid Moodle site version. The Moodle app only supports Moodle systems 3.1 onwards.</p>\n<p>You can contact your site administrators and ask them to update their Moodle system.</p>\n<p>\"Site Administrators\" are the people who manages the Moodle at your school/university/company or learning organisation. If you don't know how to contact them, please contact your teachers/trainers.</p>",
     "invalidsite": "The site URL is invalid.",
     "invalidtime": "Invalid time",
     "invalidurl": "Invalid URL specified",

From 9ebf923964491a8cd501ef2109fabee029f6c7b9 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 27 Nov 2019 12:47:18 +0100
Subject: [PATCH 132/257] MOBILE-3230 forum: Update parentheses formatting

---
 src/addon/mod/forum/components/post/post.ts | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/addon/mod/forum/components/post/post.ts b/src/addon/mod/forum/components/post/post.ts
index 16aedbeb5..8900dc980 100644
--- a/src/addon/mod/forum/components/post/post.ts
+++ b/src/addon/mod/forum/components/post/post.ts
@@ -90,17 +90,11 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy {
         this.uniqueId = this.post.id ? 'reply' + this.post.id : 'edit' + this.post.parent;
 
         const reTranslated = this.translate.instant('addon.mod_forum.re');
-        this.displaySubject = !this.parentSubject || (
-            this.post.subject != this.parentSubject &&
-            this.post.subject != `Re: ${this.parentSubject}` &&
-            this.post.subject != `${reTranslated} ${this.parentSubject}`
-        );
-        this.defaultReplySubject = (
-                this.post.subject.startsWith('Re: ') ||
-                this.post.subject.startsWith(reTranslated)
-            )
-                ? this.post.subject
-                : `${reTranslated} ${this.post.subject}`;
+        this.displaySubject = !this.parentSubject ||
+            (this.post.subject != this.parentSubject && this.post.subject != `Re: ${this.parentSubject}` &&
+                this.post.subject != `${reTranslated} ${this.parentSubject}`);
+        this.defaultReplySubject = (this.post.subject.startsWith('Re: ') || this.post.subject.startsWith(reTranslated))
+            ? this.post.subject : `${reTranslated} ${this.post.subject}`;
 
         this.optionsMenuEnabled = !this.post.id || (this.forumProvider.isGetDiscussionPostAvailable() &&
                     (this.forumProvider.isDeletePostAvailable() || this.forumProvider.isUpdatePostAvailable()));

From f5fdac6df930f6a902073a2c8929d28678f42abd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 25 Nov 2019 14:02:35 +0100
Subject: [PATCH 133/257] MOBILE-3228 login: Match login and reconnect pages

---
 src/core/login/pages/reconnect/reconnect.html | 61 ++++++++++---------
 src/core/login/pages/reconnect/reconnect.scss | 23 ++++---
 src/core/login/pages/reconnect/reconnect.ts   |  6 +-
 3 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/src/core/login/pages/reconnect/reconnect.html b/src/core/login/pages/reconnect/reconnect.html
index 1aed56c2a..3876f7e76 100644
--- a/src/core/login/pages/reconnect/reconnect.html
+++ b/src/core/login/pages/reconnect/reconnect.html
@@ -3,17 +3,21 @@
         <ion-title>{{ 'core.login.reconnect' | translate }}</ion-title>
     </ion-navbar>
 </ion-header>
-<ion-content padding class="core-center-view">
+<ion-content class="core-center-view">
     <div class="box">
-        <div *ngIf="site" text-wrap text-center margin-bottom [ngClass]="{'item-avatar-center': site.avatar}">
-            <ion-avatar *ngIf="site.avatar">
-                <!-- Show user avatar. -->
-                <img [src]="site.avatar" class="avatar" core-external-content [siteId]="site.id" alt="{{ 'core.pictureof' | translate:{$a: site.fullname} }}" role="presentation" onError="this.src='assets/img/user-avatar.png'">
-            </ion-avatar>
+        <div *ngIf="site" text-wrap text-center margin-bottom [ngClass]="{'item-avatar-center': showSiteAvatar}">
+            <ng-container *ngIf="showSiteAvatar">
+                <ion-avatar>
+                    <!-- Show user avatar. -->
+                    <img [src]="site.avatar" class="avatar" core-external-content [siteId]="site.id" alt="{{ 'core.pictureof' | translate:{$a: site.fullname} }}" role="presentation" onError="this.src='assets/img/user-avatar.png'">
+                </ion-avatar>
+            </ng-container>
 
-            <!-- Show site logo or a default image. -->
-            <img *ngIf="!site.avatar && logoUrl" [src]="logoUrl" core-external-content [siteId]="site.id" role="presentation">
-            <img *ngIf="!site.avatar && !logoUrl" src="assets/img/login_logo.png" class="login-logo" role="presentation">
+            <ng-container *ngIf="!showSiteAvatar">
+                <!-- Show site logo or a default image. -->
+                <img *ngIf="logoUrl" [src]="logoUrl" core-external-content [siteId]="site.id" role="presentation">
+                <img *ngIf="!logoUrl" src="assets/img/login_logo.png" class="login-logo" role="presentation">
+            </ng-container>
 
             <!-- If no sitename show big siteurl. -->
             <p *ngIf="!siteName" class="item-heading core-siteurl">{{siteUrl}}</p>
@@ -25,29 +29,26 @@
                 <ion-icon padding name="alert"></ion-icon> {{ 'core.login.reconnectdescription' | translate }}
             </p>
         </div>
-        <ion-list class="core-login-form">
-            <ion-item padding text-wrap class="core-username">
-                <p class="item-heading">{{ 'core.login.username' | translate }}</p>
+        <form ion-list [formGroup]="credForm" (ngSubmit)="login($event)" class="core-login-form">
+            <ion-item text-wrap class="core-username">
                 <p>{{username}}</p>
             </ion-item>
-            <form [formGroup]="credForm" (ngSubmit)="login($event)" class="core-login-form">
-                <ion-item margin-bottom>
-                    <core-show-password item-content [name]="'password'">
-                        <ion-input class="core-ioninput-password" name="password" type="password" placeholder="{{ 'core.login.password' | translate }}" formControlName="password" [clearOnEdit]="false"></ion-input>
-                    </core-show-password>
-                </ion-item>
-                <ion-grid>
-                    <ion-row>
-                        <ion-col>
-                            <a ion-button block color="light" (click)="cancel($event)">{{ 'core.login.cancel' | translate }}</a>
-                        </ion-col>
-                        <ion-col>
-                            <button ion-button block [disabled]="!credForm.valid">{{ 'core.login.loginbutton' | translate }}</button>
-                        </ion-col>
-                    </ion-row>
-                </ion-grid>
-            </form>
-        </ion-list>
+            <ion-item margin-bottom>
+                <core-show-password item-content [name]="'password'">
+                    <ion-input class="core-ioninput-password" name="password" type="password" placeholder="{{ 'core.login.password' | translate }}" formControlName="password" [clearOnEdit]="false"></ion-input>
+                </core-show-password>
+            </ion-item>
+            <ion-grid no-padding>
+                <ion-row>
+                    <ion-col>
+                        <a ion-button block color="light" (click)="cancel($event)">{{ 'core.login.cancel' | translate }}</a>
+                    </ion-col>
+                    <ion-col>
+                        <button ion-button block [disabled]="!credForm.valid">{{ 'core.login.loginbutton' | translate }}</button>
+                    </ion-col>
+                </ion-row>
+            </ion-grid>
+        </form>
 
         <!-- Forgotten password button. -->
         <div *ngIf="showForgottenPassword" padding-top class="core-login-forgotten-password">
diff --git a/src/core/login/pages/reconnect/reconnect.scss b/src/core/login/pages/reconnect/reconnect.scss
index a9bbabece..a28e78d05 100644
--- a/src/core/login/pages/reconnect/reconnect.scss
+++ b/src/core/login/pages/reconnect/reconnect.scss
@@ -2,8 +2,6 @@ ion-app.app-root page-core-login-reconnect {
     .box {
         .core-login-form .item {
             background-color: $core-login-item-background-color;
-            @include padding-horizontal(0);
-
             @include darkmode() {
                 background-color: $core-dark-login-item-background-color;
             }
@@ -14,20 +12,21 @@ ion-app.app-root page-core-login-reconnect {
             @include darkmode() {
                 background-color: $core-dark-login-item-inner-background-color;
             }
-            @include padding-horizontal(0);
         }
     }
 
-    .list .core-username {
-        &.item {
-            @include padding-horizontal(0);
-        }
-        .item-heading {
-            margin-top: 0;
-        }
+    form .core-username.item p {
+        @include padding-horizontal(8px);
+        font-size: 16px;
+    }
+    form .item:first-child {
+        margin-bottom: 20px;
+    }
 
-        .item-inner {
-            @include padding(null, null, null, 8px);
+    ion-col {
+        @include padding-horizontal(10px !important, 0);
+        &:first-child {
+            @include padding-horizontal(0 !important);
         }
     }
 
diff --git a/src/core/login/pages/reconnect/reconnect.ts b/src/core/login/pages/reconnect/reconnect.ts
index 58e24a078..afa776e21 100644
--- a/src/core/login/pages/reconnect/reconnect.ts
+++ b/src/core/login/pages/reconnect/reconnect.ts
@@ -37,6 +37,7 @@ export class CoreLoginReconnectPage {
     identityProviders: any[];
     site: any;
     showForgottenPassword = true;
+    showSiteAvatar = false;
 
     protected infoSiteUrl: string;
     protected pageName: string;
@@ -88,11 +89,14 @@ export class CoreLoginReconnectPage {
             this.siteUrl = site.infos.siteurl;
             this.siteName = site.getSiteName();
 
+            // Show logo instead of avatar if it's a fixed site.
+            this.showSiteAvatar = this.site.avatar && !this.loginHelper.getFixedSites();
+
             return site.getPublicConfig().then((config) => {
                 return this.sitesProvider.checkRequiredMinimumVersion(config).then(() => {
                     // Check logoURL if user avatar is not set.
                     if (this.site.avatar.startsWith(site.infos.siteurl + '/theme/image.php')) {
-                        this.site.avatar = false;
+                        this.showSiteAvatar = false;
                         this.logoUrl = config.logourl || config.compactlogourl;
                     }
 

From 135e2cd5e389ba632ab4f8347e6d85e0b5e81a7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 22 Nov 2019 14:59:37 +0100
Subject: [PATCH 134/257] MOBILE-3070 forum: Fix finding discussion by Id.

---
 src/addon/mod/forum/providers/forum.ts  | 3 ++-
 src/addon/mod/forum/providers/helper.ts | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/addon/mod/forum/providers/forum.ts b/src/addon/mod/forum/providers/forum.ts
index 450593d75..2b354bfb8 100644
--- a/src/addon/mod/forum/providers/forum.ts
+++ b/src/addon/mod/forum/providers/forum.ts
@@ -599,7 +599,8 @@ export class AddonModForumProvider {
      * @param forceCache True to always get the value from cache. false otherwise.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with an object with:
-     *         - discussions: List of discussions.
+     *         - discussions: List of discussions. Note that for every discussion in the list discussion.id is the main post ID but
+     *             discussion ID is discussion.discussion.
      *         - canLoadMore: True if there may be more discussions to load.
      */
     getDiscussions(forumId: number, sortOrder?: number, page: number = 0, forceCache?: boolean, siteId?: string): Promise<any> {
diff --git a/src/addon/mod/forum/providers/helper.ts b/src/addon/mod/forum/providers/helper.ts
index 001337358..99ca1b487 100644
--- a/src/addon/mod/forum/providers/helper.ts
+++ b/src/addon/mod/forum/providers/helper.ts
@@ -280,7 +280,8 @@ export class AddonModForumHelperProvider {
         const findDiscussion = (page: number): Promise<any> => {
             return this.forumProvider.getDiscussions(forumId, undefined, page, false, siteId).then((response) => {
                 if (response.discussions && response.discussions.length > 0) {
-                    const discussion = response.discussions.find((discussion) => discussion.id == discussionId);
+                    // Note that discussion.id is the main post ID but discussion ID is discussion.discussion.
+                    const discussion = response.discussions.find((discussion) => discussion.discussion == discussionId);
                     if (discussion) {
                         return discussion;
                     }

From e6fd969855d51e7a78a5076fbe1ad41fed3a376d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 28 Nov 2019 13:03:37 +0100
Subject: [PATCH 135/257] MOBILE-2877 glossary: Include comments into glossary

---
 src/addon/mod/glossary/pages/entry/entry.html |  3 +++
 .../mod/glossary/pages/entry/entry.module.ts  |  2 ++
 src/addon/mod/glossary/pages/entry/entry.ts   | 26 +++++++++++++++----
 .../glossary/providers/prefetch-handler.ts    | 16 +++++++++---
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/addon/mod/glossary/pages/entry/entry.html b/src/addon/mod/glossary/pages/entry/entry.html
index 7a9741482..47cc11542 100644
--- a/src/addon/mod/glossary/pages/entry/entry.html
+++ b/src/addon/mod/glossary/pages/entry/entry.html
@@ -35,6 +35,9 @@
             <ion-item text-wrap *ngIf="entry.approved != 1">
                 <p><em>{{ 'addon.mod_glossary.entrypendingapproval' | translate }}</em></p>
             </ion-item>
+            <ion-item *ngIf="glossary && glossary.allowcomments && entry && entry.id > 0 && commentsEnabled">
+                <core-comments contextLevel="module" [instanceId]="glossary.coursemodule" component="mod_glossary" [itemId]="entry.id" area="glossary_entry" [courseId]="glossary.courseid"></core-comments>
+            </ion-item>
             <core-rating-rate *ngIf="glossary && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="glossary.coursemodule" [itemId]="entry.id" [itemSetId]="0" [courseId]="glossary.courseid" [aggregateMethod]="glossary.assessed" [scaleId]="glossary.scale" [userId]="entry.userid" (onUpdate)="ratingUpdated()"></core-rating-rate>
             <core-rating-aggregate *ngIf="glossary && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="glossary.coursemodule" [itemId]="entry.id" [courseId]="glossary.courseid" [aggregateMethod]="glossary.assessed" [scaleId]="glossary.scale"></core-rating-aggregate>
         </ng-container>
diff --git a/src/addon/mod/glossary/pages/entry/entry.module.ts b/src/addon/mod/glossary/pages/entry/entry.module.ts
index 0825ef745..c045e4040 100644
--- a/src/addon/mod/glossary/pages/entry/entry.module.ts
+++ b/src/addon/mod/glossary/pages/entry/entry.module.ts
@@ -18,6 +18,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { CoreComponentsModule } from '@components/components.module';
 import { CoreDirectivesModule } from '@directives/directives.module';
 import { CorePipesModule } from '@pipes/pipes.module';
+import { CoreCommentsComponentsModule } from '@core/comments/components/components.module';
 import { CoreRatingComponentsModule } from '@core/rating/components/components.module';
 import { CoreTagComponentsModule } from '@core/tag/components/components.module';
 import { AddonModGlossaryEntryPage } from './entry';
@@ -32,6 +33,7 @@ import { AddonModGlossaryEntryPage } from './entry';
         CorePipesModule,
         IonicPageModule.forChild(AddonModGlossaryEntryPage),
         TranslateModule.forChild(),
+        CoreCommentsComponentsModule,
         CoreRatingComponentsModule,
         CoreTagComponentsModule
     ],
diff --git a/src/addon/mod/glossary/pages/entry/entry.ts b/src/addon/mod/glossary/pages/entry/entry.ts
index 16df7e03b..dc11406ec 100644
--- a/src/addon/mod/glossary/pages/entry/entry.ts
+++ b/src/addon/mod/glossary/pages/entry/entry.ts
@@ -12,11 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component } from '@angular/core';
+import { Component, ViewChild } from '@angular/core';
 import { IonicPage, NavParams } from 'ionic-angular';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreRatingInfo } from '@core/rating/providers/rating';
 import { CoreTagProvider } from '@core/tag/providers/tag';
+import { CoreCommentsProvider } from '@core/comments/providers/comments';
+import { CoreCommentsCommentsComponent } from '@core/comments/components/comments/comments';
 import { AddonModGlossaryProvider } from '../../providers/glossary';
 
 /**
@@ -28,6 +30,8 @@ import { AddonModGlossaryProvider } from '../../providers/glossary';
     templateUrl: 'entry.html',
 })
 export class AddonModGlossaryEntryPage {
+    @ViewChild(CoreCommentsCommentsComponent) comments: CoreCommentsCommentsComponent;
+
     component = AddonModGlossaryProvider.COMPONENT;
     componentId: number;
     entry: any;
@@ -37,23 +41,27 @@ export class AddonModGlossaryEntryPage {
     showDate = false;
     ratingInfo: CoreRatingInfo;
     tagsEnabled: boolean;
+    commentsEnabled: boolean;
 
     protected courseId: number;
     protected entryId: number;
 
     constructor(navParams: NavParams,
-            private domUtils: CoreDomUtilsProvider,
-            private glossaryProvider: AddonModGlossaryProvider,
-            private tagProvider: CoreTagProvider) {
+            protected domUtils: CoreDomUtilsProvider,
+            protected glossaryProvider: AddonModGlossaryProvider,
+            protected tagProvider: CoreTagProvider,
+            protected commentsProvider: CoreCommentsProvider) {
         this.courseId = navParams.get('courseId');
         this.entryId = navParams.get('entryId');
-        this.tagsEnabled = this.tagProvider.areTagsAvailableInSite();
     }
 
     /**
      * View loaded.
      */
     ionViewDidLoad(): void {
+        this.tagsEnabled = this.tagProvider.areTagsAvailableInSite();
+        this.commentsEnabled = !this.commentsProvider.areCommentsDisabledInSite();
+
         this.fetchEntry().then(() => {
             this.glossaryProvider.logEntryView(this.entry.id, this.componentId, this.glossary.name).catch(() => {
                 // Ignore errors.
@@ -70,6 +78,14 @@ export class AddonModGlossaryEntryPage {
      * @return Promise resolved when done.
      */
      doRefresh(refresher?: any): Promise<any> {
+        if (this.glossary && this.glossary.allowcomments && this.entry && this.entry.id > 0 && this.commentsEnabled &&
+                this.comments) {
+            // Refresh comments. Don't add it to promises because we don't want the comments fetch to block the entry fetch.
+                this.comments.doRefresh().catch(() => {
+                    // Ignore errors.
+            });
+        }
+
         return this.glossaryProvider.invalidateEntry(this.entry.id).catch(() => {
             // Ignore errors.
         }).then(() => {
diff --git a/src/addon/mod/glossary/providers/prefetch-handler.ts b/src/addon/mod/glossary/providers/prefetch-handler.ts
index b087762ac..3051f1467 100644
--- a/src/addon/mod/glossary/providers/prefetch-handler.ts
+++ b/src/addon/mod/glossary/providers/prefetch-handler.ts
@@ -20,6 +20,7 @@ import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreCourseProvider } from '@core/course/providers/course';
+import { CoreCommentsProvider } from '@core/comments/providers/comments';
 import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/activity-prefetch-handler';
 import { AddonModGlossaryProvider } from './glossary';
 import { AddonModGlossarySyncProvider } from './sync';
@@ -43,8 +44,9 @@ export class AddonModGlossaryPrefetchHandler extends CoreCourseActivityPrefetchH
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
-            private glossaryProvider: AddonModGlossaryProvider,
-            private syncProvider: AddonModGlossarySyncProvider) {
+            protected glossaryProvider: AddonModGlossaryProvider,
+            protected commentsProvider: CoreCommentsProvider,
+            protected syncProvider: AddonModGlossarySyncProvider) {
 
         super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
     }
@@ -160,8 +162,9 @@ export class AddonModGlossaryPrefetchHandler extends CoreCourseActivityPrefetchH
             // Fetch all entries to get information from.
             promises.push(this.glossaryProvider.fetchAllEntries(this.glossaryProvider.getEntriesByLetter,
                     [glossary.id, 'ALL'], false, false, siteId).then((entries) => {
-                const promises = [];
-                const avatars = {}; // List of user avatars, preventing duplicates.
+                const promises = [],
+                    commentsEnabled = !this.commentsProvider.areCommentsDisabledInSite(),
+                    avatars = {}; // List of user avatars, preventing duplicates.
 
                 entries.forEach((entry) => {
                     // Don't fetch individual entries, it's too many WS calls.
@@ -169,6 +172,11 @@ export class AddonModGlossaryPrefetchHandler extends CoreCourseActivityPrefetchH
                     if (entry.userpictureurl) {
                         avatars[entry.userpictureurl] = true;
                     }
+
+                    if (glossary.allowcomments && commentsEnabled) {
+                        promises.push(this.commentsProvider.getComments('module', glossary.coursemodule, 'mod_glossary', entry.id,
+                            'glossary_entry', 0, siteId));
+                    }
                 });
 
                 // Prefetch intro files, entries files and user avatars.

From 9f51f547c4860a52c3ca2c94897ad1f4fc2771a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 28 Nov 2019 13:11:55 +0100
Subject: [PATCH 136/257] MOBILE-2877 data: Check comments disabled on prefetch

---
 src/addon/mod/data/providers/prefetch-handler.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/addon/mod/data/providers/prefetch-handler.ts b/src/addon/mod/data/providers/prefetch-handler.ts
index 631599d5b..63d531b8a 100644
--- a/src/addon/mod/data/providers/prefetch-handler.ts
+++ b/src/addon/mod/data/providers/prefetch-handler.ts
@@ -282,6 +282,7 @@ export class AddonModDataPrefetchHandler extends CoreCourseActivityPrefetchHandl
         return this.getDatabaseInfoHelper(module, courseId, false, false, true, siteId).then((info) => {
             // Prefetch the database data.
             const database = info.database,
+                commentsEnabled = !this.commentsProvider.areCommentsDisabledInSite(),
                 promises = [];
 
             promises.push(this.dataProvider.getFields(database.id, false, true, siteId));
@@ -295,7 +296,7 @@ export class AddonModDataPrefetchHandler extends CoreCourseActivityPrefetchHandl
             info.entries.forEach((entry) => {
                 promises.push(this.dataProvider.getEntry(database.id, entry.id, true, siteId));
 
-                if (database.comments) {
+                if (commentsEnabled && database.comments) {
                     promises.push(this.commentsProvider.getComments('module', database.coursemodule, 'mod_data', entry.id,
                         'database_entry', 0, siteId));
                 }

From 85b43959090b4d392992dd814040278ed47f57fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 28 Nov 2019 12:51:18 +0100
Subject: [PATCH 137/257] MOBILE-2877 comments: Sync comments views

---
 .../comments/components/comments/comments.ts  |  21 +-
 .../components/comments/core-comments.html    |   2 +-
 src/core/comments/pages/viewer/viewer.ts      | 217 ++++++++++++------
 src/core/comments/providers/comments.ts       |  12 +-
 src/core/comments/providers/sync.ts           |  14 ++
 5 files changed, 192 insertions(+), 74 deletions(-)

diff --git a/src/core/comments/components/comments/comments.ts b/src/core/comments/components/comments/comments.ts
index 0f23b3353..e5c9d701b 100644
--- a/src/core/comments/components/comments/comments.ts
+++ b/src/core/comments/components/comments/comments.ts
@@ -44,9 +44,12 @@ export class CoreCommentsCommentsComponent implements OnChanges, OnDestroy {
 
     protected updateSiteObserver;
     protected refreshCommentsObserver;
+    protected commentsCountObserver;
 
-    constructor(private navCtrl: NavController, private commentsProvider: CoreCommentsProvider,
-            sitesProvider: CoreSitesProvider, eventsProvider: CoreEventsProvider,
+    constructor(private navCtrl: NavController,
+            private commentsProvider: CoreCommentsProvider,
+            sitesProvider: CoreSitesProvider,
+            eventsProvider: CoreEventsProvider,
             @Optional() private svComponent: CoreSplitViewComponent) {
 
         this.onLoading = new EventEmitter<boolean>();
@@ -76,6 +79,19 @@ export class CoreCommentsCommentsComponent implements OnChanges, OnDestroy {
                 });
             }
         }, sitesProvider.getCurrentSiteId());
+
+        // Refresh comments count if event received.
+        this.commentsCountObserver = eventsProvider.on(CoreCommentsProvider.COMMENTS_COUNT_CHANGED_EVENT, (data) => {
+            // Verify these comments need to be updated.
+            if (this.undefinedOrEqual(data, 'contextLevel') && this.undefinedOrEqual(data, 'instanceId') &&
+                    this.undefinedOrEqual(data, 'component') && this.undefinedOrEqual(data, 'itemId') &&
+                    this.undefinedOrEqual(data, 'area') && !this.countError) {
+                if (!this.commentsCount.endsWith('+')) {
+                    // Parse and unparse string.
+                    this.commentsCount = parseInt(this.commentsCount, 10) + data.countChange + '';
+                }
+            }
+        }, sitesProvider.getCurrentSiteId());
     }
 
     /**
@@ -167,6 +183,7 @@ export class CoreCommentsCommentsComponent implements OnChanges, OnDestroy {
     ngOnDestroy(): void {
         this.updateSiteObserver && this.updateSiteObserver.off();
         this.refreshCommentsObserver && this.refreshCommentsObserver.off();
+        this.commentsCountObserver && this.commentsCountObserver.off();
     }
 
     /**
diff --git a/src/core/comments/components/comments/core-comments.html b/src/core/comments/components/comments/core-comments.html
index 4375edc5a..b5ac94cb1 100644
--- a/src/core/comments/components/comments/core-comments.html
+++ b/src/core/comments/components/comments/core-comments.html
@@ -1,5 +1,5 @@
 <core-loading *ngIf="!disabled" [hideUntil]="commentsLoaded || !displaySpinner">
-    <div (click)="openComments($event)" *ngIf="!countError" [class.core-comments-clickable]="!disabled">
+    <div *ngIf="!countError" (click)="openComments($event)" [class.core-comments-clickable]="!disabled">
         {{ 'core.comments.commentscount' | translate : {'$a': commentsCount} }}
     </div>
     <div *ngIf="countError">
diff --git a/src/core/comments/pages/viewer/viewer.ts b/src/core/comments/pages/viewer/viewer.ts
index 07fb57a03..a935d0544 100644
--- a/src/core/comments/pages/viewer/viewer.ts
+++ b/src/core/comments/pages/viewer/viewer.ts
@@ -63,11 +63,18 @@ export class CoreCommentsViewerPage implements OnDestroy {
     protected syncObserver: any;
     protected currentUser: any;
 
-    constructor(navParams: NavParams, private sitesProvider: CoreSitesProvider, private userProvider: CoreUserProvider,
-             private domUtils: CoreDomUtilsProvider, private translate: TranslateService, private modalCtrl: ModalController,
-             private commentsProvider: CoreCommentsProvider, private offlineComments: CoreCommentsOfflineProvider,
-             eventsProvider: CoreEventsProvider, private commentsSync: CoreCommentsSyncProvider,
-             private textUtils: CoreTextUtilsProvider, private timeUtils: CoreTimeUtilsProvider) {
+    constructor(navParams: NavParams,
+            protected sitesProvider: CoreSitesProvider,
+            protected userProvider: CoreUserProvider,
+            protected domUtils: CoreDomUtilsProvider,
+            protected translate: TranslateService,
+            protected modalCtrl: ModalController,
+            protected commentsProvider: CoreCommentsProvider,
+            protected offlineComments: CoreCommentsOfflineProvider,
+            protected eventsProvider: CoreEventsProvider,
+            protected commentsSync: CoreCommentsSyncProvider,
+            protected textUtils: CoreTextUtilsProvider,
+            protected timeUtils: CoreTimeUtilsProvider) {
 
         this.contextLevel = navParams.get('contextLevel');
         this.instanceId = navParams.get('instanceId');
@@ -127,31 +134,8 @@ export class CoreCommentsViewerPage implements OnDestroy {
         return promise.catch(() => {
             // Ignore errors.
         }).then(() => {
-            return this.offlineComments.getComment(this.contextLevel, this.instanceId, this.componentName, this.itemId,
-                    this.area).then((offlineComment) => {
-                this.offlineComment = offlineComment;
-
-                if (offlineComment && !this.currentUser) {
-                    return this.userProvider.getProfile(this.currentUserId, undefined, true).then((user) => {
-                        this.currentUser = user;
-                        this.offlineComment.profileimageurl = user.profileimageurl;
-                        this.offlineComment.fullname = user.fullname;
-                        this.offlineComment.userid = user.id;
-                    }).catch(() => {
-                        // Ignore errors.
-                    });
-                } else if (offlineComment) {
-                    this.offlineComment.profileimageurl = this.currentUser.profileimageurl;
-                    this.offlineComment.fullname = this.currentUser.fullname;
-                    this.offlineComment.userid = this.currentUser.id;
-                }
-
-                return this.offlineComments.getDeletedComments(this.contextLevel, this.instanceId, this.componentName, this.itemId,
-                    this.area);
-            });
-        }).then((deletedComments) => {
-            this.hasOffline = !!this.offlineComment || deletedComments.length > 0;
-
+            return this.loadOfflineData();
+        }).then(() => {
             // Get comments data.
             return this.commentsProvider.getComments(this.contextLevel, this.instanceId, this.componentName, this.itemId,
                     this.area, this.page).then((response) => {
@@ -165,30 +149,10 @@ export class CoreCommentsViewerPage implements OnDestroy {
                     this.canLoadMore = response.comments.length > 0 && response.comments.length >= CoreCommentsProvider.pageSize;
                 }
 
-                return Promise.all(comments.map((comment) => {
-                    // Get the user profile image.
-                    return this.userProvider.getProfile(comment.userid, undefined, true).then((user) => {
-                        comment.profileimageurl = user.profileimageurl;
-
-                        return comment;
-                    }).catch(() => {
-                        // Ignore errors.
-                        return comment;
-                    });
-                }));
+                return Promise.all(comments.map((comment) => this.loadCommentProfile(comment)));
             }).then((comments) => {
                 this.comments = this.comments.concat(comments);
 
-                deletedComments && deletedComments.forEach((deletedComment) => {
-                    const comment = this.comments.find((comment) => {
-                        return comment.id == deletedComment.commentid;
-                    });
-
-                    if (comment) {
-                        comment.deleted = deletedComment.deleted;
-                    }
-                });
-
                 this.canDeleteComments = this.addDeleteCommentsAvailable && (this.hasOffline || this.comments.some((comment) => {
                     return !!comment.delete;
                 }));
@@ -231,11 +195,11 @@ export class CoreCommentsViewerPage implements OnDestroy {
      * @return Resolved when done.
      */
     refreshComments(showErrors: boolean, refresher?: any): Promise<any> {
+        this.commentsLoaded = false;
         this.refreshIcon = 'spinner';
         this.syncIcon = 'spinner';
 
-        return this.commentsProvider.invalidateCommentsData(this.contextLevel, this.instanceId, this.componentName,
-                this.itemId, this.area).finally(() => {
+        return this.invalidateComments().finally(() => {
             this.page = 0;
             this.comments = [];
 
@@ -297,10 +261,25 @@ export class CoreCommentsViewerPage implements OnDestroy {
         const modal = this.modalCtrl.create('CoreCommentsAddPage', params);
         modal.onDidDismiss((data) => {
             if (data && data.comments) {
-                this.comments = data.comments.concat(this.comments);
-                this.canDeleteComments = this.addDeleteCommentsAvailable;
+                this.invalidateComments();
+
+                return Promise.all(data.comments.map((comment) => this.loadCommentProfile(comment))).then((addedComments) => {
+                    // Add the comment to the top.
+                    this.comments = addedComments.concat(this.comments);
+                    this.canDeleteComments = this.addDeleteCommentsAvailable;
+
+                    this.eventsProvider.trigger(CoreCommentsProvider.COMMENTS_COUNT_CHANGED_EVENT, {
+                            contextLevel: this.contextLevel,
+                            instanceId: this.instanceId,
+                            component: this.componentName,
+                            itemId: this.itemId,
+                            area: this.area,
+                            countChange: addedComments.length,
+                        }, this.sitesProvider.getCurrentSiteId());
+                });
             } else if (data && !data.comments) {
-                this.fetchComments(false);
+                // Comments added in offline mode.
+                return this.loadOfflineData();
             }
         });
         modal.present();
@@ -310,26 +289,45 @@ export class CoreCommentsViewerPage implements OnDestroy {
      * Delete a comment.
      *
      * @param e Click event.
-     * @param comment Comment to delete.
+     * @param deleteComment Comment to delete.
      */
-    deleteComment(e: Event, comment: any): void {
+    deleteComment(e: Event, deleteComment: any): void {
         e.preventDefault();
         e.stopPropagation();
 
-        const time = this.timeUtils.userDate((comment.lastmodified || comment.timecreated) * 1000, 'core.strftimerecentfull');
+        const time = this.timeUtils.userDate((deleteComment.lastmodified || deleteComment.timecreated) * 1000,
+            'core.strftimerecentfull');
 
-        comment.contextlevel = this.contextLevel;
-        comment.instanceid = this.instanceId;
-        comment.component = this.componentName;
-        comment.itemid = this.itemId;
-        comment.area = this.area;
+        deleteComment.contextlevel = this.contextLevel;
+        deleteComment.instanceid = this.instanceId;
+        deleteComment.component = this.componentName;
+        deleteComment.itemid = this.itemId;
+        deleteComment.area = this.area;
 
         this.domUtils.showDeleteConfirm('core.comments.deletecommentbyon', {$a:
-                { user: comment.fullname || '', time: time } }).then(() => {
-            this.commentsProvider.deleteComment(comment).then(() => {
+                { user: deleteComment.fullname || '', time: time } }).then(() => {
+            this.commentsProvider.deleteComment(deleteComment).then((deletedOnline) => {
                 this.showDelete = false;
 
-                this.refreshComments(true);
+                if (deletedOnline) {
+                    const index = this.comments.findIndex((comment) => comment.id == deleteComment.id);
+                    if (index >= 0) {
+                        this.comments.splice(index, 1);
+                    }
+                } else {
+                    this.loadOfflineData();
+                }
+
+                this.eventsProvider.trigger(CoreCommentsProvider.COMMENTS_COUNT_CHANGED_EVENT, {
+                        contextLevel: this.contextLevel,
+                        instanceId: this.instanceId,
+                        component: this.componentName,
+                        itemId: this.itemId,
+                        area: this.area,
+                        countChange: -1,
+                    }, this.sitesProvider.getCurrentSiteId());
+
+                this.invalidateComments();
 
                 this.domUtils.showToast('core.comments.eventcommentdeleted', true, 3000);
             }).catch((error) => {
@@ -340,6 +338,91 @@ export class CoreCommentsViewerPage implements OnDestroy {
         });
     }
 
+    /**
+     * Invalidate comments.
+     *
+     * @return Resolved when done.
+     */
+    protected invalidateComments(): Promise<void> {
+        return this.commentsProvider.invalidateCommentsData(this.contextLevel, this.instanceId, this.componentName, this.itemId,
+                    this.area);
+    }
+
+    /**
+     * Loads the profile info onto the comment object.
+     *
+     * @param  comment Comment object.
+     * @return Promise resolved with modified comment when done.
+     */
+    protected loadCommentProfile(comment: any): Promise<any> {
+        // Get the user profile image.
+        return this.userProvider.getProfile(comment.userid, undefined, true).then((user) => {
+            comment.profileimageurl = user.profileimageurl;
+            comment.fullname = user.fullname;
+            comment.userid = user.id;
+
+            return comment;
+        }).catch(() => {
+            // Ignore errors.
+            return comment;
+        });
+    }
+
+    /**
+     * Load offline comments.
+     *
+     * @return Promise resolved when done.
+     */
+    protected loadOfflineData(): Promise<void> {
+        const promises = [];
+        let hasDeletedComments = false;
+
+        // Load the only offline comment allowed if any.
+        promises.push(this.offlineComments.getComment(this.contextLevel, this.instanceId, this.componentName, this.itemId,
+                this.area).then((offlineComment) => {
+
+            if (offlineComment && !this.currentUser) {
+                offlineComment.userid = this.currentUserId;
+
+                this.loadCommentProfile(offlineComment).then((comment) => {
+                    // Save this fields for further requests.
+                    if (comment.fullname) {
+                        this.currentUser = {};
+                        this.currentUser.profileimageurl = comment.profileimageurl;
+                        this.currentUser.fullname = comment.fullname;
+                        this.currentUser.userid = comment.userid;
+                    }
+                });
+            } else if (offlineComment) {
+                offlineComment.profileimageurl = this.currentUser.profileimageurl;
+                offlineComment.fullname = this.currentUser.fullname;
+                offlineComment.userid = this.currentUser.id;
+            }
+
+            this.offlineComment = offlineComment;
+        }));
+
+        // Load deleted comments offline.
+        promises.push(this.offlineComments.getDeletedComments(this.contextLevel, this.instanceId, this.componentName, this.itemId,
+                this.area).then((deletedComments) => {
+            hasDeletedComments = deletedComments && deletedComments.length > 0;
+
+            hasDeletedComments && deletedComments.forEach((deletedComment) => {
+                const comment = this.comments.find((comment) => {
+                    return comment.id == deletedComment.commentid;
+                });
+
+                if (comment) {
+                    comment.deleted = deletedComment.deleted;
+                }
+            });
+        }));
+
+        return Promise.all(promises).then(() => {
+            this.hasOffline = !!this.offlineComment || hasDeletedComments;
+        });
+    }
+
     /**
      * Restore a comment.
      *
diff --git a/src/core/comments/providers/comments.ts b/src/core/comments/providers/comments.ts
index faff7a892..960e6688b 100644
--- a/src/core/comments/providers/comments.ts
+++ b/src/core/comments/providers/comments.ts
@@ -26,6 +26,7 @@ import { CoreCommentsOfflineProvider } from './offline';
 export class CoreCommentsProvider {
 
     static REFRESH_COMMENTS_EVENT = 'core_comments_refresh_comments';
+    static COMMENTS_COUNT_CHANGED_EVENT = 'core_comments_count_changed';
 
     protected ROOT_CACHE_KEY = 'mmComments:';
     static pageSize = 1; // At least it will be one.
@@ -162,15 +163,18 @@ export class CoreCommentsProvider {
      *
      * @param comment Comment object to delete.
      * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved when deleted, rejected otherwise. Promise resolved doesn't mean that comments
-     *         have been deleted, the resolve param can contain errors for comments not deleted.
+     * @return Promise resolved when deleted (with true if deleted in online, false otherwise), rejected otherwise. Promise resolved
+     *         doesn't mean that comments have been deleted, the resolve param can contain errors for comments not deleted.
      */
-    deleteComment(comment: any, siteId?: string): Promise<void> {
+    deleteComment(comment: any, siteId?: string): Promise<boolean> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
 
+        // Offline comment, just delete it.
         if (!comment.id) {
             return this.commentsOffline.removeComment(comment.contextlevel, comment.instanceid, comment.component, comment.itemid,
-                    comment.area, siteId);
+                    comment.area, siteId).then(() => {
+                return false;
+            });
         }
 
         // Convenience function to store the action to be synchronized later.
diff --git a/src/core/comments/providers/sync.ts b/src/core/comments/providers/sync.ts
index 651cb12fa..4397c88c4 100644
--- a/src/core/comments/providers/sync.ts
+++ b/src/core/comments/providers/sync.ts
@@ -159,6 +159,7 @@ export class CoreCommentsSyncProvider extends CoreSyncBaseProvider {
             const errors = [],
                 promises = [],
                 deleteCommentIds = [];
+            let countChange = 0;
 
             comments.forEach((comment) => {
                 if (comment.commentid) {
@@ -166,6 +167,8 @@ export class CoreCommentsSyncProvider extends CoreSyncBaseProvider {
                 } else {
                     promises.push(this.commentsProvider.addCommentOnline(comment.content, contextLevel, instanceId, component,
                         itemId, area, siteId).then((response) => {
+                            countChange++;
+
                             return this.commentsOffline.removeComment(contextLevel, instanceId, component, itemId, area, siteId);
                     }));
                 }
@@ -174,6 +177,8 @@ export class CoreCommentsSyncProvider extends CoreSyncBaseProvider {
             if (deleteCommentIds.length > 0) {
                 promises.push(this.commentsProvider.deleteCommentsOnline(deleteCommentIds, contextLevel, instanceId, component,
                     itemId, area, siteId).then((response) => {
+                        countChange--;
+
                         return this.commentsOffline.removeDeletedComments(contextLevel, instanceId, component, itemId, area,
                             siteId);
                     }));
@@ -181,6 +186,15 @@ export class CoreCommentsSyncProvider extends CoreSyncBaseProvider {
 
             // Send the comments.
             return Promise.all(promises).then(() => {
+                this.eventsProvider.trigger(CoreCommentsProvider.COMMENTS_COUNT_CHANGED_EVENT, {
+                        contextLevel: contextLevel,
+                        instanceId: instanceId,
+                        component: component,
+                        itemId: itemId,
+                        area: area,
+                        countChange: countChange,
+                    }, this.sitesProvider.getCurrentSiteId());
+
                 // Fetch the comments from server to be sure they're up to date.
                 return this.commentsProvider.invalidateCommentsData(contextLevel, instanceId, component, itemId, area, siteId)
                         .then(() => {

From 338334b8c6ca4816daee9e1c1ab53ba61c0f520a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 28 Nov 2019 14:36:49 +0100
Subject: [PATCH 138/257] MOBILE-3205 forum: Reload discussion list after
 changes

---
 src/addon/mod/forum/components/index/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/addon/mod/forum/components/index/index.ts b/src/addon/mod/forum/components/index/index.ts
index 8951cfdcd..5bb4e2f2d 100644
--- a/src/addon/mod/forum/components/index/index.ts
+++ b/src/addon/mod/forum/components/index/index.ts
@@ -127,6 +127,8 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
                             if (typeof data.starred != 'undefined') {
                                 discussion.starred = data.starred;
                             }
+
+                            this.showLoadingAndFetch(false);
                         }
                     }
 

From dcf33d4fc198b410a5779fc50d262d1745d2f039 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 28 Nov 2019 16:40:53 +0100
Subject: [PATCH 139/257] MOBILE-3235 blocks: Fix activities block outside of
 course context level

---
 .../components/activitymodules/activitymodules.ts        | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts b/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts
index 566ddc0b8..512e93b52 100644
--- a/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts
+++ b/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts
@@ -18,6 +18,7 @@ import { CoreCourseModuleDelegate } from '@core/course/providers/module-delegate
 import { CoreBlockBaseComponent } from '@core/block/classes/base-block-component';
 import { CoreConstants } from '@core/constants';
 import { TranslateService } from '@ngx-translate/core';
+import { CoreSitesProvider } from '@providers/sites';
 
 /**
  * Component to render an "activity modules" block.
@@ -36,7 +37,8 @@ export class AddonBlockActivityModulesComponent extends CoreBlockBaseComponent i
     protected fetchContentDefaultError = 'Error getting activity modules data.';
 
     constructor(injector: Injector, protected courseProvider: CoreCourseProvider,
-            protected translate: TranslateService, protected moduleDelegate: CoreCourseModuleDelegate) {
+            protected translate: TranslateService, protected moduleDelegate: CoreCourseModuleDelegate,
+            protected sitesProvider: CoreSitesProvider) {
 
         super(injector, 'AddonBlockActivityModulesComponent');
     }
@@ -63,8 +65,11 @@ export class AddonBlockActivityModulesComponent extends CoreBlockBaseComponent i
      * @return Promise resolved when done.
      */
     protected fetchContent(): Promise<any> {
-        return this.courseProvider.getSections(this.instanceId, false, true).then((sections) => {
+        const courseId = this.contextLevel === 'course'
+            ? this.instanceId
+            : this.sitesProvider.getCurrentSiteHomeId();
 
+        return this.courseProvider.getSections(courseId, false, true).then((sections) => {
             this.entries = [];
 
             const archetypes = {},

From 46cc61cc016afe0aa2b86058d298640ef2f22368 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 28 Nov 2019 17:18:13 +0100
Subject: [PATCH 140/257] MOBILE-3235 core: Add enumeration defining available
 context levels

---
 .../activitymodules/activitymodules.ts        | 24 +++++++++++++------
 src/core/constants.ts                         | 12 ++++++++++
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts b/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts
index 512e93b52..adc6e9173 100644
--- a/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts
+++ b/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts
@@ -16,7 +16,7 @@ import { Component, OnInit, Injector, Input } from '@angular/core';
 import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseModuleDelegate } from '@core/course/providers/module-delegate';
 import { CoreBlockBaseComponent } from '@core/block/classes/base-block-component';
-import { CoreConstants } from '@core/constants';
+import { CoreConstants, ContextLevel } from '@core/constants';
 import { TranslateService } from '@ngx-translate/core';
 import { CoreSitesProvider } from '@providers/sites';
 
@@ -29,7 +29,7 @@ import { CoreSitesProvider } from '@providers/sites';
 })
 export class AddonBlockActivityModulesComponent extends CoreBlockBaseComponent implements OnInit {
     @Input() block: any; // The block to render.
-    @Input() contextLevel: string; // The context where the block will be used.
+    @Input() contextLevel: ContextLevel; // The context where the block will be used.
     @Input() instanceId: number; // The instance ID associated with the context level.
 
     entries: any[] = [];
@@ -65,11 +65,7 @@ export class AddonBlockActivityModulesComponent extends CoreBlockBaseComponent i
      * @return Promise resolved when done.
      */
     protected fetchContent(): Promise<any> {
-        const courseId = this.contextLevel === 'course'
-            ? this.instanceId
-            : this.sitesProvider.getCurrentSiteHomeId();
-
-        return this.courseProvider.getSections(courseId, false, true).then((sections) => {
+        return this.courseProvider.getSections(this.getCourseId(), false, true).then((sections) => {
             this.entries = [];
 
             const archetypes = {},
@@ -127,4 +123,18 @@ export class AddonBlockActivityModulesComponent extends CoreBlockBaseComponent i
             }
         });
     }
+
+    /**
+     * Obtain the appropiate course id for the block.
+     *
+     * @return Course id.
+     */
+    protected getCourseId(): number {
+        switch (this.contextLevel) {
+            case ContextLevel.Course:
+                return this.instanceId;
+            default:
+                return this.sitesProvider.getCurrentSiteHomeId();
+        }
+    }
 }
diff --git a/src/core/constants.ts b/src/core/constants.ts
index de6898658..ac5a28de1 100644
--- a/src/core/constants.ts
+++ b/src/core/constants.ts
@@ -12,6 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+/**
+ * Context levels enumeration.
+ */
+export const enum ContextLevel {
+    System = 'system',
+    User = 'user',
+    Category = 'category',
+    Course = 'course',
+    ActivityModule = 'module',
+    Block = 'block',
+}
+
 /**
  * Static class to contain all the core constants.
  */

From 31c4595bbdf7f4a35c6420e526ee6f207e6329b1 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 2 Dec 2019 11:17:24 +0100
Subject: [PATCH 141/257] MOBILE-3235 core: Rename ContextLevel enum keys

---
 .../components/activitymodules/activitymodules.ts    |  2 +-
 src/core/constants.ts                                | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts b/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts
index adc6e9173..b46a9b366 100644
--- a/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts
+++ b/src/addon/block/activitymodules/components/activitymodules/activitymodules.ts
@@ -131,7 +131,7 @@ export class AddonBlockActivityModulesComponent extends CoreBlockBaseComponent i
      */
     protected getCourseId(): number {
         switch (this.contextLevel) {
-            case ContextLevel.Course:
+            case ContextLevel.COURSE:
                 return this.instanceId;
             default:
                 return this.sitesProvider.getCurrentSiteHomeId();
diff --git a/src/core/constants.ts b/src/core/constants.ts
index ac5a28de1..65c666882 100644
--- a/src/core/constants.ts
+++ b/src/core/constants.ts
@@ -16,12 +16,12 @@
  * Context levels enumeration.
  */
 export const enum ContextLevel {
-    System = 'system',
-    User = 'user',
-    Category = 'category',
-    Course = 'course',
-    ActivityModule = 'module',
-    Block = 'block',
+    SYSTEM = 'system',
+    USER = 'user',
+    COURSECAT = 'category',
+    COURSE = 'course',
+    MODULE = 'module',
+    BLOCK = 'block',
 }
 
 /**

From f16042ee7da7ea3c2f7dc06776aba30ce3196799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 28 Nov 2019 14:42:09 +0100
Subject: [PATCH 142/257] MOBILE-2877 assign: Leave feedback comment enabled

---
 .../assign/feedback/comments/providers/handler.ts    |  3 +++
 src/addon/mod/glossary/pages/entry/entry.ts          |  4 ++--
 src/core/comments/components/comments/comments.ts    | 12 +++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/addon/mod/assign/feedback/comments/providers/handler.ts b/src/addon/mod/assign/feedback/comments/providers/handler.ts
index 559f00029..6898521e6 100644
--- a/src/addon/mod/assign/feedback/comments/providers/handler.ts
+++ b/src/addon/mod/assign/feedback/comments/providers/handler.ts
@@ -183,6 +183,9 @@ export class AddonModAssignFeedbackCommentsHandler implements AddonModAssignFeed
      * @return True or promise resolved with true if enabled.
      */
     isEnabled(): boolean | Promise<boolean> {
+        // In here we should check if comments is not disabled in site.
+        // But due to this is not a common comments place and it can be disabled separately into Moodle (disabling the plugin).
+        // We are leaving it always enabled. It's also a teacher's feature.
         return true;
     }
 
diff --git a/src/addon/mod/glossary/pages/entry/entry.ts b/src/addon/mod/glossary/pages/entry/entry.ts
index dc11406ec..d1e22e722 100644
--- a/src/addon/mod/glossary/pages/entry/entry.ts
+++ b/src/addon/mod/glossary/pages/entry/entry.ts
@@ -81,8 +81,8 @@ export class AddonModGlossaryEntryPage {
         if (this.glossary && this.glossary.allowcomments && this.entry && this.entry.id > 0 && this.commentsEnabled &&
                 this.comments) {
             // Refresh comments. Don't add it to promises because we don't want the comments fetch to block the entry fetch.
-                this.comments.doRefresh().catch(() => {
-                    // Ignore errors.
+            this.comments.doRefresh().catch(() => {
+                // Ignore errors.
             });
         }
 
diff --git a/src/core/comments/components/comments/comments.ts b/src/core/comments/components/comments/comments.ts
index e5c9d701b..9f8408442 100644
--- a/src/core/comments/components/comments/comments.ts
+++ b/src/core/comments/components/comments/comments.ts
@@ -83,13 +83,11 @@ export class CoreCommentsCommentsComponent implements OnChanges, OnDestroy {
         // Refresh comments count if event received.
         this.commentsCountObserver = eventsProvider.on(CoreCommentsProvider.COMMENTS_COUNT_CHANGED_EVENT, (data) => {
             // Verify these comments need to be updated.
-            if (this.undefinedOrEqual(data, 'contextLevel') && this.undefinedOrEqual(data, 'instanceId') &&
-                    this.undefinedOrEqual(data, 'component') && this.undefinedOrEqual(data, 'itemId') &&
-                    this.undefinedOrEqual(data, 'area') && !this.countError) {
-                if (!this.commentsCount.endsWith('+')) {
-                    // Parse and unparse string.
-                    this.commentsCount = parseInt(this.commentsCount, 10) + data.countChange + '';
-                }
+            if (!this.commentsCount.endsWith('+') && this.undefinedOrEqual(data, 'contextLevel') &&
+                    this.undefinedOrEqual(data, 'instanceId') && this.undefinedOrEqual(data, 'component') &&
+                    this.undefinedOrEqual(data, 'itemId') && this.undefinedOrEqual(data, 'area') && !this.countError) {
+                // Parse and unparse string.
+                this.commentsCount = parseInt(this.commentsCount, 10) + data.countChange + '';
             }
         }, sitesProvider.getCurrentSiteId());
     }

From 8af17d2cf7cdba267286fb5b171c4eb54667d8ea Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 2 Dec 2019 13:10:53 +0100
Subject: [PATCH 143/257] MOBILE-3230 forum: Use nested children in a
 discussion when calculating parent subjects

---
 .../mod/forum/pages/discussion/discussion.ts  | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/addon/mod/forum/pages/discussion/discussion.ts b/src/addon/mod/forum/pages/discussion/discussion.ts
index 6d47d6db9..798125d78 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.ts
+++ b/src/addon/mod/forum/pages/discussion/discussion.ts
@@ -33,6 +33,8 @@ import { AddonModForumSyncProvider } from '../../providers/sync';
 
 type SortType = 'flat-newest' | 'flat-oldest' | 'nested';
 
+type Post = any & { children?: Post[]; };
+
 /**
  * Page that displays a forum discussion.
  */
@@ -391,7 +393,7 @@ export class AddonModForumDiscussionPage implements OnDestroy {
 
                 this.posts = posts;
                 this.ratingInfo = ratingInfo;
-                this.postSubjects = this.posts.reduce((postSubjects, post) => {
+                this.postSubjects = this.getAllPosts().reduce((postSubjects, post) => {
                     postSubjects[post.id] = post.subject;
 
                     return postSubjects;
@@ -651,4 +653,31 @@ export class AddonModForumDiscussionPage implements OnDestroy {
     ngOnDestroy(): void {
         this.onlineObserver && this.onlineObserver.unsubscribe();
     }
+
+    /**
+     * Get all the posts contained in the discussion.
+     *
+     * @return Array containing all the posts of the discussion.
+     */
+    protected getAllPosts(): Post[] {
+        return [].concat(...this.posts.map(this.flattenPostHierarchy.bind(this)));
+    }
+
+    /**
+     * Flatten a post's hierarchy into an array.
+     *
+     * @param parent Parent post.
+     * @return Array containing all the posts within the hierarchy (including the parent).
+     */
+    protected flattenPostHierarchy(parent: Post): Post[] {
+        const posts = [parent];
+        const children = parent.children || [];
+
+        for (const child of children) {
+            posts.push(...this.flattenPostHierarchy(child));
+        }
+
+        return posts;
+    }
+
 }

From cf4331bc89d4e9ee558b238861161c5c9395b14f Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 2 Dec 2019 13:21:51 +0100
Subject: [PATCH 144/257] MOBILE-3235 core: Rename 'category' context level to
 'coursecat'

Renamed in order to remain consistent with the LMS.
---
 src/addon/calendar/pages/event/event.html | 2 +-
 src/addon/calendar/providers/helper.ts    | 2 +-
 src/core/constants.ts                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/addon/calendar/pages/event/event.html b/src/addon/calendar/pages/event/event.html
index 704a23bec..63f53e1e6 100644
--- a/src/addon/calendar/pages/event/event.html
+++ b/src/addon/calendar/pages/event/event.html
@@ -60,7 +60,7 @@
                 </ion-item>
                 <a ion-item text-wrap *ngIf="categoryPath">
                     <h2>{{ 'core.category' | translate}}</h2>
-                    <p><core-format-text [text]="categoryPath" contextLevel="category" [contextInstanceId]="event.category.id"></core-format-text></p>
+                    <p><core-format-text [text]="categoryPath" contextLevel="coursecat" [contextInstanceId]="event.category.id"></core-format-text></p>
                 </a>
                 <ion-item text-wrap *ngIf="event.description">
                     <h2>{{ 'core.description' | translate}}</h2>
diff --git a/src/addon/calendar/providers/helper.ts b/src/addon/calendar/providers/helper.ts
index 976c21431..a6bed59b5 100644
--- a/src/addon/calendar/providers/helper.ts
+++ b/src/addon/calendar/providers/helper.ts
@@ -144,7 +144,7 @@ export class AddonCalendarHelperProvider {
             courseId = e.course ? e.course.id : e.courseid;
 
         if (categoryId > 0) {
-            e.contextLevel = 'category';
+            e.contextLevel = 'coursecat';
             e.contextInstanceId = categoryId;
         } else if (courseId > 0) {
             e.contextLevel = 'course';
diff --git a/src/core/constants.ts b/src/core/constants.ts
index 65c666882..c9784ccc3 100644
--- a/src/core/constants.ts
+++ b/src/core/constants.ts
@@ -18,7 +18,7 @@
 export const enum ContextLevel {
     SYSTEM = 'system',
     USER = 'user',
-    COURSECAT = 'category',
+    COURSECAT = 'coursecat',
     COURSE = 'course',
     MODULE = 'module',
     BLOCK = 'block',

From 281d97a43aee1a59c0687d3d2024ea6397665ced Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 2 Dec 2019 17:16:01 +0100
Subject: [PATCH 145/257] MOBILE-3224 files: Upgraded file-opener2 plugin and
 fixed Android

---
 config.xml        |  12 ++++
 package-lock.json | 170 +++++++++++++++++++++++++++++++++-------------
 package.json      |   4 +-
 3 files changed, 137 insertions(+), 49 deletions(-)

diff --git a/config.xml b/config.xml
index dac0bbd86..f5b891fa1 100644
--- a/config.xml
+++ b/config.xml
@@ -79,6 +79,18 @@
         <icon background="@color/background" density="xhdpi" foreground="resources/android/icon/xhdpi-foreground.png" src="resources/android/icon/drawable-xhdpi-icon.png" />
         <icon background="@color/background" density="xxhdpi" foreground="resources/android/icon/xxhdpi-foreground.png" src="resources/android/icon/drawable-xxhdpi-icon.png" />
         <icon background="@color/background" density="xxxhdpi" foreground="resources/android/icon/xxxhdpi-foreground.png" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
+
+        <!--
+            This should be added by the file-opener2 plugin, but it's not working at the moment. This can be removed
+            once the following issue is resolved and the plugin is updated to include the fix:
+            https://github.com/pwlin/cordova-plugin-file-opener2/issues/246
+        -->
+        <config-file parent="/manifest/application" target="AndroidManifest.xml">
+            <provider android:authorities="${applicationId}.opener.provider" android:exported="false" android:grantUriPermissions="true" android:name="io.github.pwlin.cordova.plugins.fileopener2.FileProvider">
+                <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/opener_paths" />
+            </provider>
+        </config-file>
+
     </platform>
     <platform name="ios">
         <resource-file src="GoogleService-Info.plist" />
diff --git a/package-lock.json b/package-lock.json
index acf72dd24..2b45e89dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -503,7 +503,8 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -524,12 +525,14 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -544,17 +547,20 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -671,7 +677,8 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "ini": {
               "version": "1.3.5",
@@ -683,6 +690,7 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -697,6 +705,7 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -704,12 +713,14 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -728,6 +739,7 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -808,7 +820,8 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -820,6 +833,7 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -905,7 +919,8 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -941,6 +956,7 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -960,6 +976,7 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -1003,12 +1020,14 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             }
           }
         },
@@ -3132,9 +3151,9 @@
       "integrity": "sha512-m7cughw327CjONN/qjzsTpSesLaeybksQh420/gRuSXJX5Zt9NfgsSbqqKDon6jnQ9Mm7h7imgyO2uJ34XMBtA=="
     },
     "cordova-plugin-file-opener2": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-file-opener2/-/cordova-plugin-file-opener2-2.0.19.tgz",
-      "integrity": "sha1-yjrhIlOVt3qx/lsgrMv+zGiOJJM="
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-file-opener2/-/cordova-plugin-file-opener2-2.2.1.tgz",
+      "integrity": "sha512-yeN242U6T+TDlrJ5m00br+lAKsf2fHXn1u1TsDxB5fFUGINZUYLKthEctCMFkQUnURWk+Nh6tc+WtdQjY581Uw=="
     },
     "cordova-plugin-file-transfer": {
       "version": "1.7.1",
@@ -5224,7 +5243,8 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5242,11 +5262,13 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5259,15 +5281,18 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5370,7 +5395,8 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5380,6 +5406,7 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5392,17 +5419,20 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5419,6 +5449,7 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5497,7 +5528,8 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5507,6 +5539,7 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5582,7 +5615,8 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5612,6 +5646,7 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5629,6 +5664,7 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5667,11 +5703,13 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         }
       }
     },
@@ -6098,7 +6136,8 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -6119,12 +6158,14 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -6139,17 +6180,20 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -6266,7 +6310,8 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "ini": {
               "version": "1.3.5",
@@ -6278,6 +6323,7 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -6292,6 +6338,7 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -6299,12 +6346,14 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -6323,6 +6372,7 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -6403,7 +6453,8 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -6415,6 +6466,7 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -6500,7 +6552,8 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -6536,6 +6589,7 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -6555,6 +6609,7 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -6598,12 +6653,14 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             }
           }
         },
@@ -12869,7 +12926,8 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -12890,12 +12948,14 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -12910,17 +12970,20 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -13037,7 +13100,8 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "ini": {
               "version": "1.3.5",
@@ -13049,6 +13113,7 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -13063,6 +13128,7 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -13070,12 +13136,14 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -13094,6 +13162,7 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -13174,7 +13243,8 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -13186,6 +13256,7 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -13271,7 +13342,8 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -13307,6 +13379,7 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -13326,6 +13399,7 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -13369,12 +13443,14 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             }
           }
         },
diff --git a/package.json b/package.json
index bede60886..8544d10eb 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "cordova-plugin-customurlscheme": "^4.4.0",
     "cordova-plugin-device": "^2.0.3",
     "cordova-plugin-file": "^6.0.2",
-    "cordova-plugin-file-opener2": "2.0.19",
+    "cordova-plugin-file-opener2": "^2.2.1",
     "cordova-plugin-file-transfer": "^1.7.1",
     "cordova-plugin-geolocation": "^4.0.2",
     "cordova-plugin-globalization": "^1.11.0",
@@ -243,4 +243,4 @@
       "deleteAppDataOnUninstall": true
     }
   }
-}
+}
\ No newline at end of file

From 2a6a3876b9a104f47015323db9dd7e1b9fd9f52e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 22 Nov 2019 13:44:49 +0100
Subject: [PATCH 146/257] MOBILE-3217 course: Support custom course card colors

---
 .../core-courses-course-progress.html         |  4 +-
 .../course-progress/course-progress.scss      |  1 +
 src/core/courses/providers/helper.ts          | 38 ++++++++++++++-----
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/core/courses/components/course-progress/core-courses-course-progress.html b/src/core/courses/components/course-progress/core-courses-course-progress.html
index fb870dbba..646d9edcb 100644
--- a/src/core/courses/components/course-progress/core-courses-course-progress.html
+++ b/src/core/courses/components/course-progress/core-courses-course-progress.html
@@ -1,5 +1,5 @@
-<ion-card [attr.course-color]="course.id % 10">
-    <div (click)="openCourse(course)" class="core-course-thumb" [class.core-course-color-img]="course.courseImage">
+<ion-card [attr.course-color]="course.color ? null : course.colorNumber">
+    <div (click)="openCourse(course)" class="core-course-thumb" [class.core-course-color-img]="course.courseImage" [style.background-color]="course.color">
         <img *ngIf="course.courseImage" [src]="course.courseImage" core-external-content alt=""/>
     </div>
     <ion-item tappable text-wrap detail-none (click)="openCourse(course)" [title]="course.displayname || course.fullname" class="core-course-link" [class.item-disabled]="course.visible == 0" [class.core-course-more-than-title]="(course.progress != null && course.progress >= 0)">
diff --git a/src/core/courses/components/course-progress/course-progress.scss b/src/core/courses/components/course-progress/course-progress.scss
index ef274566e..a5f0f750a 100644
--- a/src/core/courses/components/course-progress/course-progress.scss
+++ b/src/core/courses/components/course-progress/course-progress.scss
@@ -21,6 +21,7 @@ ion-app.app-root core-courses-course-progress {
             position: relative;
             background-position: center;
             background-size: cover;
+            @include core-transition(all, 50ms);
 
             &.core-course-color-img {
                 background: white;
diff --git a/src/core/courses/providers/helper.ts b/src/core/courses/providers/helper.ts
index 33d4ca571..b918d3b1c 100644
--- a/src/core/courses/providers/helper.ts
+++ b/src/core/courses/providers/helper.ts
@@ -15,6 +15,7 @@
 import { Injectable } from '@angular/core';
 import { PopoverController } from 'ionic-angular';
 import { CoreUtilsProvider } from '@providers/utils/utils';
+import { CoreSitesProvider } from '@providers/sites';
 import { CoreCoursesProvider } from './courses';
 import { AddonCourseCompletionProvider } from '@addon/coursecompletion/providers/coursecompletion';
 import { TranslateService } from '@ngx-translate/core';
@@ -26,11 +27,12 @@ import { CoreCoursePickerMenuPopoverComponent } from '@components/course-picker-
 @Injectable()
 export class CoreCoursesHelperProvider {
 
-    constructor(private coursesProvider: CoreCoursesProvider,
-            private utils: CoreUtilsProvider,
-            private courseCompletionProvider: AddonCourseCompletionProvider,
-            private translate: TranslateService,
-            private popoverCtrl: PopoverController) { }
+    constructor(protected coursesProvider: CoreCoursesProvider,
+            protected utils: CoreUtilsProvider,
+            protected courseCompletionProvider: AddonCourseCompletionProvider,
+            protected translate: TranslateService,
+            protected popoverCtrl: PopoverController,
+            protected sitesProvider: CoreSitesProvider) { }
 
     /**
      * Get the courses to display the course picker popover. If a courseId is specified, it will also return its categoryId.
@@ -105,10 +107,22 @@ export class CoreCoursesHelperProvider {
             return Promise.resolve();
         }
 
-        const promises = [];
-        let coursesInfo = [];
+        let coursesInfo = [],
+            courseInfoAvailable = false;
 
-        let courseInfoAvalaible = false;
+        const site = this.sitesProvider.getCurrentSite(),
+            promises = [],
+            colors = [];
+
+        if (site.isVersionGreaterEqualThan('3.8')) {
+            promises.push(site.getConfig().then((configs) => {
+                for (let x = 0; x < 10; x++) {
+                    colors[x] = configs['core_admin_coursecolor' + (x + 1)] || null;
+                }
+            }).catch(() => {
+                // Ignore errors.
+            }));
+        }
 
         if (this.coursesProvider.isGetCoursesByFieldAvailable() && (loadCategoryNames ||
                 (typeof courses[0].overviewfiles == 'undefined' && typeof courses[0].displayname == 'undefined'))) {
@@ -116,7 +130,7 @@ export class CoreCoursesHelperProvider {
                 return course.id;
             }).join(',');
 
-            courseInfoAvalaible = true;
+            courseInfoAvailable = true;
 
             // Get the extra data for the courses.
             promises.push(this.coursesProvider.getCoursesByField('ids', courseIds).then((coursesInfos) => {
@@ -126,7 +140,11 @@ export class CoreCoursesHelperProvider {
 
         return Promise.all(promises).then(() => {
             courses.forEach((course) => {
-                this.loadCourseExtraInfo(course, courseInfoAvalaible ? coursesInfo[course.id] : course, loadCategoryNames);
+                this.loadCourseExtraInfo(course, courseInfoAvailable ? coursesInfo[course.id] : course, loadCategoryNames);
+                if (!course.courseImage) {
+                    course.colorNumber = course.id % 10;
+                    course.color = colors[course.colorNumber];
+                }
             });
         });
     }

From 021f5106eaab5a6d5b7da9123fcfdbc9b1a2f399 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noeldemartin@gmail.com>
Date: Tue, 3 Dec 2019 12:33:47 +0100
Subject: [PATCH 147/257] MOBILE-3224 files: Update file-opener2 plugin version
 in config.xml

---
 config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.xml b/config.xml
index f5b891fa1..d7439c757 100644
--- a/config.xml
+++ b/config.xml
@@ -160,7 +160,7 @@
     </plugin>
     <plugin name="cordova-plugin-device" spec="^2.0.3" />
     <plugin name="cordova-plugin-file" spec="^6.0.2" />
-    <plugin name="cordova-plugin-file-opener2" spec="2.0.19" />
+    <plugin name="cordova-plugin-file-opener2" spec="2.2.1" />
     <plugin name="cordova-plugin-file-transfer" spec="^1.7.1" />
     <plugin name="cordova-plugin-geolocation" spec="^4.0.2">
         <variable name="GEOLOCATION_USAGE_DESCRIPTION" value="We need your location so you can attach it as part of your submissions." />

From a6432ad7b7d8c05f03088164d5355479c912a045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 29 Nov 2019 11:21:19 +0100
Subject: [PATCH 148/257] MOBILE-3218 mod: Fix isPluginEnabled return type on
 activities

---
 src/addon/mod/imscp/providers/imscp.ts   | 2 +-
 src/addon/mod/lesson/providers/lesson.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addon/mod/imscp/providers/imscp.ts b/src/addon/mod/imscp/providers/imscp.ts
index 58667b135..bd7eb8cf4 100644
--- a/src/addon/mod/imscp/providers/imscp.ts
+++ b/src/addon/mod/imscp/providers/imscp.ts
@@ -304,7 +304,7 @@ export class AddonModImscpProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
      */
-    isPluginEnabled(siteId?: string): Promise<any> {
+    isPluginEnabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             return site.canDownloadFiles();
         });
diff --git a/src/addon/mod/lesson/providers/lesson.ts b/src/addon/mod/lesson/providers/lesson.ts
index 4c7a52711..b7fabe1f1 100644
--- a/src/addon/mod/lesson/providers/lesson.ts
+++ b/src/addon/mod/lesson/providers/lesson.ts
@@ -2775,7 +2775,7 @@ export class AddonModLessonProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with true if plugin is enabled, rejected or resolved with false otherwise.
      */
-    isPluginEnabled(siteId?: string): Promise<any> {
+    isPluginEnabled(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
             // All WS were introduced at the same time so checking one is enough.
             return site.wsAvailable('mod_lesson_get_lesson_access_information');

From ed1fc4c09d905f497649f51b75b3da889e047b69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 29 Nov 2019 13:49:58 +0100
Subject: [PATCH 149/257] MOBILE-3218 course: Add general navigation to module
 by instance

---
 .../classes/module-index-handler.ts           | 38 +++++++++++++++++--
 src/core/course/providers/helper.ts           | 31 +++++++++++++++
 2 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/src/core/contentlinks/classes/module-index-handler.ts b/src/core/contentlinks/classes/module-index-handler.ts
index 859d72c1d..32037482d 100644
--- a/src/core/contentlinks/classes/module-index-handler.ts
+++ b/src/core/contentlinks/classes/module-index-handler.ts
@@ -15,6 +15,8 @@
 import { CoreContentLinksAction } from '../providers/delegate';
 import { CoreContentLinksHandlerBase } from './base-handler';
 import { CoreCourseHelperProvider } from '@core/course/providers/helper';
+import { CoreCourseProvider } from '@core/course/providers/course';
+import { CoreDomUtilsProvider } from '@providers/utils/dom';
 
 /**
  * Handler to handle URLs pointing to the index of a module.
@@ -33,15 +35,33 @@ export class CoreContentLinksModuleIndexHandler extends CoreContentLinksHandlerB
      * @param courseHelper The CoreCourseHelperProvider instance.
      * @param addon Name of the addon as it's registered in course delegate. It'll be used to check if it's disabled.
      * @param modName Name of the module (assign, book, ...).
+     * @param instanceIdParam Param name for instance ID gathering. Only if set.
      */
-    constructor(protected courseHelper: CoreCourseHelperProvider, public addon: string, public modName: string) {
+    constructor(protected courseHelper: CoreCourseHelperProvider, public addon: string, public modName: string,
+            protected instanceIdParam?: string) {
         super();
 
+        const pattern = instanceIdParam ?
+            '\/mod\/' + modName + '\/view\.php.*([\&\?](' + instanceIdParam + '|id)=\\d+)' :
+            '\/mod\/' + modName + '\/view\.php.*([\&\?]id=\\d+)';
+
         // Match the view.php URL with an id param.
-        this.pattern = new RegExp('\/mod\/' + modName + '\/view\.php.*([\&\?]id=\\d+)');
+        this.pattern = new RegExp(pattern);
         this.featureName = 'CoreCourseModuleDelegate_' + addon;
     }
 
+    /**
+     * Get the mod params necessary to open an activity.
+     *
+     * @param  url The URL to treat.
+     * @param  params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param  courseId Course ID related to the URL. Optional but recommended.
+     * @return List of params to pass to navigateToModule / navigateToModuleByInstance.
+     */
+    getModParams(url: string, params: any, courseId?: number): any {
+        return undefined;
+    }
+
     /**
      * Get the list of actions for a link (url).
      *
@@ -55,11 +75,23 @@ export class CoreContentLinksModuleIndexHandler extends CoreContentLinksHandlerB
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
 
         courseId = courseId || params.courseid || params.cid;
+        const modParams = this.getModParams(url, params, courseId);
+
+        if (this.instanceIdParam && typeof params[this.instanceIdParam] != 'undefined') {
+            const instanceId = parseInt(params[this.instanceIdParam], 10);
+
+            return [{
+                action: (siteId, navCtrl?): void => {
+                    this.courseHelper.navigateToModuleByInstance(instanceId, this.modName, siteId, courseId, undefined,
+                        this.useModNameToGetModule, modParams, navCtrl);
+                }
+            }];
+        }
 
         return [{
             action: (siteId, navCtrl?): void => {
                 this.courseHelper.navigateToModule(parseInt(params.id, 10), siteId, courseId, undefined,
-                    this.useModNameToGetModule ? this.modName : undefined, undefined, navCtrl);
+                    this.useModNameToGetModule ? this.modName : undefined, modParams, navCtrl);
             }
         }];
     }
diff --git a/src/core/course/providers/helper.ts b/src/core/course/providers/helper.ts
index 1ecf7a124..86db51423 100644
--- a/src/core/course/providers/helper.ts
+++ b/src/core/course/providers/helper.ts
@@ -1114,6 +1114,37 @@ export class CoreCourseHelperProvider {
         return 'Section-' + section.id;
     }
 
+    /**
+     * Navigate to a module using instance ID and module name.
+     *
+     * @param instanceId Activity instance ID.
+     * @param modName Module name of the activity.
+     * @param siteId Site ID. If not defined, current site.
+     * @param courseId Course ID. If not defined we'll try to retrieve it from the site.
+     * @param sectionId Section the module belongs to. If not defined we'll try to retrieve it from the site.
+     * @param useModNameToGetModule If true, the app will retrieve all modules of this type with a single WS call. This reduces the
+     *                number of WS calls, but it isn't recommended for modules that can return a lot of contents.
+     * @param modParams Params to pass to the module
+     * @param navCtrl NavController for adding new pages to the current history. Optional for legacy support, but
+     *                generates a warning if omitted.
+     * @return Promise resolved when done.
+     */
+    navigateToModuleByInstance(instanceId: number, modName: string, siteId?: string, courseId?: number, sectionId?: number,
+            useModNameToGetModule: boolean = false, modParams?: any, navCtrl?: NavController): Promise<void> {
+
+        const modal = this.domUtils.showModalLoading();
+
+        return this.courseProvider.getModuleBasicInfoByInstance(instanceId, modName, siteId).then((module) => {
+            this.navigateToModule(parseInt(module.id, 10), siteId, module.course, sectionId,
+                useModNameToGetModule ? modName : undefined, modParams, navCtrl);
+        }).catch((error) => {
+            this.domUtils.showErrorModalDefault(error, 'core.course.errorgetmodule', true);
+        }).finally(() => {
+            // Just in case. In fact we need to dismiss the modal before showing a toast or error message.
+            modal.dismiss();
+        });
+    }
+
     /**
      * Navigate to a module.
      *

From 30e6feab240bd762d75384694e8cb7deb2ba141d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 29 Nov 2019 11:37:20 +0100
Subject: [PATCH 150/257] MOBILE-3218 links: Implement all index handlers
 enabled on activity

---
 src/addon/mod/book/providers/link-handler.ts    | 17 ++++++++++++++++-
 src/addon/mod/data/providers/link-handler.ts    | 17 ++++++++++++++++-
 .../mod/feedback/providers/link-handler.ts      | 17 ++++++++++++++++-
 .../mod/forum/providers/index-link-handler.ts   | 17 +----------------
 src/addon/mod/imscp/providers/link-handler.ts   | 17 ++++++++++++++++-
 src/addon/mod/page/providers/link-handler.ts    | 17 ++++++++++++++++-
 .../mod/quiz/providers/index-link-handler.ts    | 14 --------------
 .../mod/resource/providers/link-handler.ts      | 17 ++++++++++++++++-
 .../mod/workshop/providers/link-handler.ts      | 16 +++++++++++++++-
 9 files changed, 112 insertions(+), 37 deletions(-)

diff --git a/src/addon/mod/book/providers/link-handler.ts b/src/addon/mod/book/providers/link-handler.ts
index cde3d391f..427060748 100644
--- a/src/addon/mod/book/providers/link-handler.ts
+++ b/src/addon/mod/book/providers/link-handler.ts
@@ -16,6 +16,7 @@ import { Injectable } from '@angular/core';
 import { CoreContentLinksModuleIndexHandler } from '@core/contentlinks/classes/module-index-handler';
 import { CoreCourseHelperProvider } from '@core/course/providers/helper';
 import { CoreContentLinksAction } from '@core/contentlinks/providers/delegate';
+import { AddonModBookProvider } from './book';
 
 /**
  * Handler to treat links to book.
@@ -24,7 +25,8 @@ import { CoreContentLinksAction } from '@core/contentlinks/providers/delegate';
 export class AddonModBookLinkHandler extends CoreContentLinksModuleIndexHandler {
     name = 'AddonModBookLinkHandler';
 
-    constructor(courseHelper: CoreCourseHelperProvider) {
+    constructor(courseHelper: CoreCourseHelperProvider,
+            protected bookProvider: AddonModBookProvider) {
         super(courseHelper, 'AddonModBook', 'book');
     }
 
@@ -50,4 +52,17 @@ export class AddonModBookLinkHandler extends CoreContentLinksModuleIndexHandler
             }
         }];
     }
+
+    /**
+     * Check if the handler is enabled for a certain site (site + user) and a URL.
+     *
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
+     */
+    isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
+        return this.bookProvider.isPluginEnabled();
+    }
 }
diff --git a/src/addon/mod/data/providers/link-handler.ts b/src/addon/mod/data/providers/link-handler.ts
index 622e18d6a..00e5903aa 100644
--- a/src/addon/mod/data/providers/link-handler.ts
+++ b/src/addon/mod/data/providers/link-handler.ts
@@ -15,6 +15,7 @@
 import { Injectable } from '@angular/core';
 import { CoreContentLinksModuleIndexHandler } from '@core/contentlinks/classes/module-index-handler';
 import { CoreCourseHelperProvider } from '@core/course/providers/helper';
+import { AddonModDataProvider } from './data';
 
 /**
  * Handler to treat links to data.
@@ -23,7 +24,21 @@ import { CoreCourseHelperProvider } from '@core/course/providers/helper';
 export class AddonModDataLinkHandler extends CoreContentLinksModuleIndexHandler {
     name = 'AddonModDataLinkHandler';
 
-    constructor(courseHelper: CoreCourseHelperProvider) {
+    constructor(courseHelper: CoreCourseHelperProvider,
+            protected dataProvider: AddonModDataProvider) {
         super(courseHelper, 'AddonModData', 'data');
     }
+
+    /**
+     * Check if the handler is enabled for a certain site (site + user) and a URL.
+     *
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
+     */
+    isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
+        return this.dataProvider.isPluginEnabled();
+    }
 }
diff --git a/src/addon/mod/feedback/providers/link-handler.ts b/src/addon/mod/feedback/providers/link-handler.ts
index 420db096d..a6021911e 100644
--- a/src/addon/mod/feedback/providers/link-handler.ts
+++ b/src/addon/mod/feedback/providers/link-handler.ts
@@ -15,6 +15,7 @@
 import { Injectable } from '@angular/core';
 import { CoreContentLinksModuleIndexHandler } from '@core/contentlinks/classes/module-index-handler';
 import { CoreCourseHelperProvider } from '@core/course/providers/helper';
+import { AddonModFeedbackProvider } from './feedback';
 
 /**
  * Handler to treat links to feedback.
@@ -23,7 +24,21 @@ import { CoreCourseHelperProvider } from '@core/course/providers/helper';
 export class AddonModFeedbackLinkHandler extends CoreContentLinksModuleIndexHandler {
     name = 'AddonModFeedbackLinkHandler';
 
-    constructor(courseHelper: CoreCourseHelperProvider) {
+    constructor(courseHelper: CoreCourseHelperProvider,
+            protected feedbackProvider: AddonModFeedbackProvider) {
         super(courseHelper, 'AddonModFeedback', 'feedback');
     }
+
+    /**
+     * Check if the handler is enabled for a certain site (site + user) and a URL.
+     *
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
+     */
+    isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
+        return this.feedbackProvider.isPluginEnabled();
+    }
 }
diff --git a/src/addon/mod/forum/providers/index-link-handler.ts b/src/addon/mod/forum/providers/index-link-handler.ts
index ac0468cb9..e131ffb6d 100644
--- a/src/addon/mod/forum/providers/index-link-handler.ts
+++ b/src/addon/mod/forum/providers/index-link-handler.ts
@@ -15,7 +15,6 @@
 import { Injectable } from '@angular/core';
 import { CoreContentLinksModuleIndexHandler } from '@core/contentlinks/classes/module-index-handler';
 import { CoreCourseHelperProvider } from '@core/course/providers/helper';
-import { AddonModForumProvider } from './forum';
 import { CoreContentLinksAction } from '@core/contentlinks/providers/delegate';
 import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
@@ -27,7 +26,7 @@ import { CoreDomUtilsProvider } from '@providers/utils/dom';
 export class AddonModForumIndexLinkHandler extends CoreContentLinksModuleIndexHandler {
     name = 'AddonModForumIndexLinkHandler';
 
-    constructor(courseHelper: CoreCourseHelperProvider, protected forumProvider: AddonModForumProvider,
+    constructor(courseHelper: CoreCourseHelperProvider,
             private courseProvider: CoreCourseProvider, private domUtils: CoreDomUtilsProvider) {
         super(courseHelper, 'AddonModForum', 'forum');
 
@@ -35,20 +34,6 @@ export class AddonModForumIndexLinkHandler extends CoreContentLinksModuleIndexHa
         this.pattern = new RegExp('\/mod\/forum\/view\.php.*([\&\?](f|id)=\\d+)');
     }
 
-    /**
-     * Check if the handler is enabled for a certain site (site + user) and a URL.
-     * If not defined, defaults to true.
-     *
-     * @param siteId The site ID.
-     * @param url The URL to treat.
-     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param courseId Course ID related to the URL. Optional but recommended.
-     * @return Whether the handler is enabled for the URL and site.
-     */
-    isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
-        return true;
-    }
-
     /**
      * Get the list of actions for a link (url).
      *
diff --git a/src/addon/mod/imscp/providers/link-handler.ts b/src/addon/mod/imscp/providers/link-handler.ts
index 870f1ad0c..4795a50d3 100644
--- a/src/addon/mod/imscp/providers/link-handler.ts
+++ b/src/addon/mod/imscp/providers/link-handler.ts
@@ -15,6 +15,7 @@
 import { Injectable } from '@angular/core';
 import { CoreContentLinksModuleIndexHandler } from '@core/contentlinks/classes/module-index-handler';
 import { CoreCourseHelperProvider } from '@core/course/providers/helper';
+import { AddonModImscpProvider } from './imscp';
 
 /**
  * Handler to treat links to IMSCP.
@@ -23,7 +24,21 @@ import { CoreCourseHelperProvider } from '@core/course/providers/helper';
 export class AddonModImscpLinkHandler extends CoreContentLinksModuleIndexHandler {
     name = 'AddonModImscpLinkHandler';
 
-    constructor(courseHelper: CoreCourseHelperProvider) {
+    constructor(courseHelper: CoreCourseHelperProvider,
+            protected imscpProvider: AddonModImscpProvider) {
         super(courseHelper, 'AddonModImscp', 'imscp');
     }
+
+    /**
+     * Check if the handler is enabled for a certain site (site + user) and a URL.
+     *
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
+     */
+    isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
+        return this.imscpProvider.isPluginEnabled();
+    }
 }
diff --git a/src/addon/mod/page/providers/link-handler.ts b/src/addon/mod/page/providers/link-handler.ts
index c49947c63..d4d779c5e 100644
--- a/src/addon/mod/page/providers/link-handler.ts
+++ b/src/addon/mod/page/providers/link-handler.ts
@@ -15,6 +15,7 @@
 import { Injectable } from '@angular/core';
 import { CoreContentLinksModuleIndexHandler } from '@core/contentlinks/classes/module-index-handler';
 import { CoreCourseHelperProvider } from '@core/course/providers/helper';
+import { AddonModPageProvider } from './page';
 
 /**
  * Handler to treat links to resource.
@@ -23,7 +24,21 @@ import { CoreCourseHelperProvider } from '@core/course/providers/helper';
 export class AddonModPageLinkHandler extends CoreContentLinksModuleIndexHandler {
     name = 'AddonModPageLinkHandler';
 
-    constructor(courseHelper: CoreCourseHelperProvider) {
+    constructor(courseHelper: CoreCourseHelperProvider,
+            protected pageProvider: AddonModPageProvider) {
         super(courseHelper, 'AddonModPage', 'page');
     }
+
+    /**
+     * Check if the handler is enabled for a certain site (site + user) and a URL.
+     *
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
+     */
+    isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
+        return this.pageProvider.isPluginEnabled();
+    }
 }
diff --git a/src/addon/mod/quiz/providers/index-link-handler.ts b/src/addon/mod/quiz/providers/index-link-handler.ts
index 11f99de3b..eeb82ab38 100644
--- a/src/addon/mod/quiz/providers/index-link-handler.ts
+++ b/src/addon/mod/quiz/providers/index-link-handler.ts
@@ -27,18 +27,4 @@ export class AddonModQuizIndexLinkHandler extends CoreContentLinksModuleIndexHan
     constructor(courseHelper: CoreCourseHelperProvider, protected quizProvider: AddonModQuizProvider) {
         super(courseHelper, 'AddonModQuiz', 'quiz');
     }
-
-    /**
-     * Check if the handler is enabled for a certain site (site + user) and a URL.
-     * If not defined, defaults to true.
-     *
-     * @param siteId The site ID.
-     * @param url The URL to treat.
-     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param courseId Course ID related to the URL. Optional but recommended.
-     * @return Whether the handler is enabled for the URL and site.
-     */
-    isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
-        return this.quizProvider.isPluginEnabled();
-    }
 }
diff --git a/src/addon/mod/resource/providers/link-handler.ts b/src/addon/mod/resource/providers/link-handler.ts
index 39a1795de..e17ec1721 100644
--- a/src/addon/mod/resource/providers/link-handler.ts
+++ b/src/addon/mod/resource/providers/link-handler.ts
@@ -15,6 +15,7 @@
 import { Injectable } from '@angular/core';
 import { CoreContentLinksModuleIndexHandler } from '@core/contentlinks/classes/module-index-handler';
 import { CoreCourseHelperProvider } from '@core/course/providers/helper';
+import { AddonModResourceProvider } from './resource';
 
 /**
  * Handler to treat links to resource.
@@ -23,7 +24,21 @@ import { CoreCourseHelperProvider } from '@core/course/providers/helper';
 export class AddonModResourceLinkHandler extends CoreContentLinksModuleIndexHandler {
     name = 'AddonModResourceLinkHandler';
 
-    constructor(courseHelper: CoreCourseHelperProvider) {
+    constructor(courseHelper: CoreCourseHelperProvider,
+            protected resourceProvider: AddonModResourceProvider) {
         super(courseHelper, 'AddonModResource', 'resource');
     }
+
+    /**
+     * Check if the handler is enabled for a certain site (site + user) and a URL.
+     *
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
+     */
+    isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
+        return this.resourceProvider.isPluginEnabled();
+    }
 }
diff --git a/src/addon/mod/workshop/providers/link-handler.ts b/src/addon/mod/workshop/providers/link-handler.ts
index 94637f4b2..0e62d1cbf 100644
--- a/src/addon/mod/workshop/providers/link-handler.ts
+++ b/src/addon/mod/workshop/providers/link-handler.ts
@@ -24,7 +24,21 @@ import { AddonModWorkshopProvider } from './workshop';
 export class AddonModWorkshopLinkHandler extends CoreContentLinksModuleIndexHandler {
     name = 'AddonModWorkshopLinkHandler';
 
-    constructor(courseHelper: CoreCourseHelperProvider) {
+    constructor(courseHelper: CoreCourseHelperProvider,
+            protected workshopProvider: AddonModWorkshopProvider) {
         super(courseHelper, AddonModWorkshopProvider.COMPONENT, 'workshop');
     }
+
+    /**
+     * Check if the handler is enabled for a certain site (site + user) and a URL.
+     *
+     * @param siteId The site ID.
+     * @param url The URL to treat.
+     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param courseId Course ID related to the URL. Optional but recommended.
+     * @return Whether the handler is enabled for the URL and site.
+     */
+    isEnabled(siteId: string, url: string, params: any, courseId?: number): boolean | Promise<boolean> {
+        return this.workshopProvider.isPluginEnabled(siteId);
+    }
 }

From ce602321ff2be8c1062a4328b6def688e465e51c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 29 Nov 2019 11:39:36 +0100
Subject: [PATCH 151/257] MOBILE-3218 links: Adapt links to new handler
 functions

---
 src/addon/mod/book/providers/link-handler.ts  | 26 +++--------
 .../mod/forum/providers/index-link-handler.ts | 43 +------------------
 .../classes/module-index-handler.ts           |  8 ++--
 src/core/course/providers/helper.ts           | 16 +++----
 4 files changed, 21 insertions(+), 72 deletions(-)

diff --git a/src/addon/mod/book/providers/link-handler.ts b/src/addon/mod/book/providers/link-handler.ts
index 427060748..ecc033eeb 100644
--- a/src/addon/mod/book/providers/link-handler.ts
+++ b/src/addon/mod/book/providers/link-handler.ts
@@ -15,7 +15,6 @@
 import { Injectable } from '@angular/core';
 import { CoreContentLinksModuleIndexHandler } from '@core/contentlinks/classes/module-index-handler';
 import { CoreCourseHelperProvider } from '@core/course/providers/helper';
-import { CoreContentLinksAction } from '@core/contentlinks/providers/delegate';
 import { AddonModBookProvider } from './book';
 
 /**
@@ -31,26 +30,15 @@ export class AddonModBookLinkHandler extends CoreContentLinksModuleIndexHandler
     }
 
     /**
-     * Get the list of actions for a link (url).
+     * Get the mod params necessary to open an activity.
      *
-     * @param siteIds List of sites the URL belongs to.
-     * @param url The URL to treat.
-     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param courseId Course ID related to the URL. Optional but recommended.
-     * @return List of (or promise resolved with list of) actions.
+     * @param  url      The URL to treat.
+     * @param  params   The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
+     * @param  courseId Course ID related to the URL. Optional but recommended.
+     * @return List of params to pass to navigateToModule / navigateToModuleByInstance.
      */
-    getActions(siteIds: string[], url: string, params: any, courseId?: number):
-            CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
-
-        const modParams = params.chapterid ? {chapterId: params.chapterid} : undefined;
-        courseId = courseId || params.courseid || params.cid;
-
-        return [{
-            action: (siteId, navCtrl?): void => {
-                this.courseHelper.navigateToModule(parseInt(params.id, 10), siteId, courseId, undefined,
-                    this.useModNameToGetModule ? this.modName : undefined, modParams, navCtrl);
-            }
-        }];
+    getPageParams(url: string, params: any, courseId?: number): any {
+        return params.chapterid ? {chapterId: parseInt(params.chapterid, 10)} : undefined;
     }
 
     /**
diff --git a/src/addon/mod/forum/providers/index-link-handler.ts b/src/addon/mod/forum/providers/index-link-handler.ts
index e131ffb6d..9e059e491 100644
--- a/src/addon/mod/forum/providers/index-link-handler.ts
+++ b/src/addon/mod/forum/providers/index-link-handler.ts
@@ -15,9 +15,6 @@
 import { Injectable } from '@angular/core';
 import { CoreContentLinksModuleIndexHandler } from '@core/contentlinks/classes/module-index-handler';
 import { CoreCourseHelperProvider } from '@core/course/providers/helper';
-import { CoreContentLinksAction } from '@core/contentlinks/providers/delegate';
-import { CoreCourseProvider } from '@core/course/providers/course';
-import { CoreDomUtilsProvider } from '@providers/utils/dom';
 
 /**
  * Handler to treat links to forum index.
@@ -26,43 +23,7 @@ import { CoreDomUtilsProvider } from '@providers/utils/dom';
 export class AddonModForumIndexLinkHandler extends CoreContentLinksModuleIndexHandler {
     name = 'AddonModForumIndexLinkHandler';
 
-    constructor(courseHelper: CoreCourseHelperProvider,
-            private courseProvider: CoreCourseProvider, private domUtils: CoreDomUtilsProvider) {
-        super(courseHelper, 'AddonModForum', 'forum');
-
-        // Match the view.php URL with an id param.
-        this.pattern = new RegExp('\/mod\/forum\/view\.php.*([\&\?](f|id)=\\d+)');
-    }
-
-    /**
-     * Get the list of actions for a link (url).
-     *
-     * @param siteIds List of sites the URL belongs to.
-     * @param url The URL to treat.
-     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param courseId Course ID related to the URL. Optional but recommended.
-     * @return List of (or promise resolved with list of) actions.
-     */
-    getActions(siteIds: string[], url: string, params: any, courseId?: number):
-            CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
-
-        if (typeof params.f != 'undefined') {
-            return [{
-                action: (siteId, navCtrl?): void => {
-                    const modal = this.domUtils.showModalLoading(),
-                        forumId = parseInt(params.f, 10);
-
-                    this.courseProvider.getModuleBasicInfoByInstance(forumId, 'forum', siteId).then((module) => {
-                        this.courseHelper.navigateToModule(parseInt(module.id, 10), siteId, module.course, undefined,
-                                undefined, undefined, navCtrl);
-                    }).finally(() => {
-                        // Just in case. In fact we need to dismiss the modal before showing a toast or error message.
-                        modal.dismiss();
-                    });
-                }
-            }];
-        }
-
-        return super.getActions(siteIds, url, params, courseId);
+    constructor(courseHelper: CoreCourseHelperProvider) {
+        super(courseHelper, 'AddonModForum', 'forum', 'f');
     }
 }
diff --git a/src/core/contentlinks/classes/module-index-handler.ts b/src/core/contentlinks/classes/module-index-handler.ts
index 32037482d..1af14a851 100644
--- a/src/core/contentlinks/classes/module-index-handler.ts
+++ b/src/core/contentlinks/classes/module-index-handler.ts
@@ -58,7 +58,7 @@ export class CoreContentLinksModuleIndexHandler extends CoreContentLinksHandlerB
      * @param  courseId Course ID related to the URL. Optional but recommended.
      * @return List of params to pass to navigateToModule / navigateToModuleByInstance.
      */
-    getModParams(url: string, params: any, courseId?: number): any {
+    getPageParams(url: string, params: any, courseId?: number): any {
         return undefined;
     }
 
@@ -75,7 +75,7 @@ export class CoreContentLinksModuleIndexHandler extends CoreContentLinksHandlerB
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
 
         courseId = courseId || params.courseid || params.cid;
-        const modParams = this.getModParams(url, params, courseId);
+        const pageParams = this.getPageParams(url, params, courseId);
 
         if (this.instanceIdParam && typeof params[this.instanceIdParam] != 'undefined') {
             const instanceId = parseInt(params[this.instanceIdParam], 10);
@@ -83,7 +83,7 @@ export class CoreContentLinksModuleIndexHandler extends CoreContentLinksHandlerB
             return [{
                 action: (siteId, navCtrl?): void => {
                     this.courseHelper.navigateToModuleByInstance(instanceId, this.modName, siteId, courseId, undefined,
-                        this.useModNameToGetModule, modParams, navCtrl);
+                        this.useModNameToGetModule, pageParams, navCtrl);
                 }
             }];
         }
@@ -91,7 +91,7 @@ export class CoreContentLinksModuleIndexHandler extends CoreContentLinksHandlerB
         return [{
             action: (siteId, navCtrl?): void => {
                 this.courseHelper.navigateToModule(parseInt(params.id, 10), siteId, courseId, undefined,
-                    this.useModNameToGetModule ? this.modName : undefined, modParams, navCtrl);
+                    this.useModNameToGetModule ? this.modName : undefined, pageParams, navCtrl);
             }
         }];
     }
diff --git a/src/core/course/providers/helper.ts b/src/core/course/providers/helper.ts
index 86db51423..324c4a29a 100644
--- a/src/core/course/providers/helper.ts
+++ b/src/core/course/providers/helper.ts
@@ -1197,13 +1197,6 @@ export class CoreCourseHelperProvider {
             // Get the module.
             return this.courseProvider.getModule(moduleId, courseId, sectionId, false, false, siteId, modName);
         }).then((module) => {
-            const params = {
-                course: { id: courseId },
-                module: module,
-                sectionId: sectionId,
-                modParams: modParams
-            };
-
             module.handlerData = this.moduleDelegate.getModuleDataFor(module.modname, module, courseId, sectionId);
 
             if (navCtrl && module.handlerData && module.handlerData.action) {
@@ -1211,11 +1204,18 @@ export class CoreCourseHelperProvider {
                 // Otherwise, we will redirect below.
                 modal.dismiss();
 
-                return module.handlerData.action(new Event('click'), navCtrl, module, courseId);
+                return module.handlerData.action(new Event('click'), navCtrl, module, courseId, undefined, modParams);
             }
 
             this.logger.warn('navCtrl was not passed to navigateToModule by the link handler for ' + module.modname);
 
+            const params = {
+                course: { id: courseId },
+                module: module,
+                sectionId: sectionId,
+                modParams: modParams
+            };
+
             if (courseId == site.getSiteHomeId()) {
                 // Check if site home is available.
                 return this.siteHomeProvider.isAvailable().then(() => {

From 22ab48800e6c9a818c55bce8f4a9fe4d4253f474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 29 Nov 2019 13:48:12 +0100
Subject: [PATCH 152/257] MOBILE-3218 forum: Discussions link only works from
 notifications

---
 .../mod/forum/pages/discussion/discussion.ts  | 33 ++++++++++++++-----
 .../providers/discussion-link-handler.ts      |  6 ++++
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/addon/mod/forum/pages/discussion/discussion.ts b/src/addon/mod/forum/pages/discussion/discussion.ts
index 6d47d6db9..bbeca74e6 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.ts
+++ b/src/addon/mod/forum/pages/discussion/discussion.ts
@@ -191,8 +191,8 @@ export class AddonModForumDiscussionPage implements OnDestroy {
         });
 
         this.changeDiscObserver = this.eventsProvider.on(AddonModForumProvider.CHANGE_DISCUSSION_EVENT, (data) => {
-            if ((this.forum && this.forum.id === data.forumId) || data.cmId === this.cmId) {
-                this.forumProvider.invalidateDiscussionsList(this.forum.id).finally(() => {
+            if ((this.forumId && this.forumId === data.forumId) || data.cmId === this.cmId) {
+                this.forumProvider.invalidateDiscussionsList(this.forumId).finally(() => {
                     if (typeof data.locked != 'undefined') {
                         this.discussion.locked = data.locked;
                     }
@@ -350,7 +350,7 @@ export class AddonModForumDiscussionPage implements OnDestroy {
 
                 const promises = [];
 
-                promises.push(this.forumProvider.getAccessInformation(this.forum.id).then((accessInfo) => {
+                promises.push(this.forumProvider.getAccessInformation(this.forumId).then((accessInfo) => {
                     this.accessInfo = accessInfo;
 
                     // Disallow replying if cut-off date is reached and the user has not the capability to override it.
@@ -364,11 +364,7 @@ export class AddonModForumDiscussionPage implements OnDestroy {
 
                 // Fetch the discussion if not passed as parameter.
                 if (!this.discussion) {
-                    promises.push(this.forumHelper.getDiscussionById(forum.id, this.discussionId).then((discussion) => {
-                        this.discussion = discussion;
-                    }).catch(() => {
-                        // Ignore errors.
-                    }));
+                    promises.push(this.loadDiscussion(this.forumId, this.discussionId));
                 }
 
                 return Promise.all(promises);
@@ -434,6 +430,27 @@ export class AddonModForumDiscussionPage implements OnDestroy {
         });
     }
 
+    /**
+     * Convenience function to load discussion.
+     *
+     * @param  forumId Forum ID.
+     * @param  discussionId Discussion ID.
+     * @return Promise resolved when done.
+     */
+    protected loadDiscussion(forumId: number, discussionId: number): Promise<void> {
+        // Fetch the discussion if not passed as parameter.
+        if (!this.discussion && forumId) {
+            return this.forumHelper.getDiscussionById(forumId, discussionId).then((discussion) => {
+                this.discussion = discussion;
+                this.discussionId = this.discussion.discussion;
+            }).catch(() => {
+                // Ignore errors.
+            });
+        }
+
+        return Promise.resolve();
+    }
+
     /**
      * Tries to synchronize the posts discussion.
      *
diff --git a/src/addon/mod/forum/providers/discussion-link-handler.ts b/src/addon/mod/forum/providers/discussion-link-handler.ts
index 243a1d09d..67e87c4cd 100644
--- a/src/addon/mod/forum/providers/discussion-link-handler.ts
+++ b/src/addon/mod/forum/providers/discussion-link-handler.ts
@@ -45,6 +45,12 @@ export class AddonModForumDiscussionLinkHandler extends CoreContentLinksHandlerB
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
         data = data || {};
 
+        if (!data.instance) {
+            // Without the forumId discussions cannot be loaded (from link).
+
+            return [];
+        }
+
         return [{
             action: (siteId, navCtrl?): void => {
                 const pageParams: any = {

From a03162f70b9ea7b6e121ab21b0c4ba9f380ff22b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 29 Nov 2019 13:51:06 +0100
Subject: [PATCH 153/257] MOBILE-3218 links: Use instanceId on module index
 links

---
 src/addon/mod/book/providers/link-handler.ts           | 2 +-
 src/addon/mod/chat/providers/link-handler.ts           | 2 +-
 src/addon/mod/data/providers/link-handler.ts           | 2 +-
 src/addon/mod/folder/providers/link-handler.ts         | 2 +-
 src/addon/mod/glossary/providers/index-link-handler.ts | 2 +-
 src/addon/mod/imscp/providers/link-handler.ts          | 2 +-
 src/addon/mod/label/providers/link-handler.ts          | 2 +-
 src/addon/mod/lti/providers/link-handler.ts            | 2 +-
 src/addon/mod/page/providers/link-handler.ts           | 2 +-
 src/addon/mod/quiz/providers/index-link-handler.ts     | 2 +-
 src/addon/mod/resource/providers/link-handler.ts       | 2 +-
 src/addon/mod/scorm/providers/index-link-handler.ts    | 2 +-
 src/addon/mod/url/providers/link-handler.ts            | 2 +-
 src/addon/mod/wiki/providers/index-link-handler.ts     | 2 +-
 src/addon/mod/workshop/providers/link-handler.ts       | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/addon/mod/book/providers/link-handler.ts b/src/addon/mod/book/providers/link-handler.ts
index ecc033eeb..051d08429 100644
--- a/src/addon/mod/book/providers/link-handler.ts
+++ b/src/addon/mod/book/providers/link-handler.ts
@@ -26,7 +26,7 @@ export class AddonModBookLinkHandler extends CoreContentLinksModuleIndexHandler
 
     constructor(courseHelper: CoreCourseHelperProvider,
             protected bookProvider: AddonModBookProvider) {
-        super(courseHelper, 'AddonModBook', 'book');
+        super(courseHelper, 'AddonModBook', 'book', 'b');
     }
 
     /**
diff --git a/src/addon/mod/chat/providers/link-handler.ts b/src/addon/mod/chat/providers/link-handler.ts
index 73b77063d..a2fb3035f 100644
--- a/src/addon/mod/chat/providers/link-handler.ts
+++ b/src/addon/mod/chat/providers/link-handler.ts
@@ -24,6 +24,6 @@ export class AddonModChatLinkHandler extends CoreContentLinksModuleIndexHandler
     name = 'AddonModChatLinkHandler';
 
     constructor(courseHelper: CoreCourseHelperProvider) {
-        super(courseHelper, 'AddonModChat', 'chat');
+        super(courseHelper, 'AddonModChat', 'chat', 'c');
     }
 }
diff --git a/src/addon/mod/data/providers/link-handler.ts b/src/addon/mod/data/providers/link-handler.ts
index 00e5903aa..30879d5ec 100644
--- a/src/addon/mod/data/providers/link-handler.ts
+++ b/src/addon/mod/data/providers/link-handler.ts
@@ -26,7 +26,7 @@ export class AddonModDataLinkHandler extends CoreContentLinksModuleIndexHandler
 
     constructor(courseHelper: CoreCourseHelperProvider,
             protected dataProvider: AddonModDataProvider) {
-        super(courseHelper, 'AddonModData', 'data');
+        super(courseHelper, 'AddonModData', 'data', 'd');
     }
 
     /**
diff --git a/src/addon/mod/folder/providers/link-handler.ts b/src/addon/mod/folder/providers/link-handler.ts
index c71004b19..cba59acfb 100644
--- a/src/addon/mod/folder/providers/link-handler.ts
+++ b/src/addon/mod/folder/providers/link-handler.ts
@@ -24,6 +24,6 @@ export class AddonModFolderLinkHandler extends CoreContentLinksModuleIndexHandle
     name = 'AddonModFolderLinkHandler';
 
     constructor(courseHelper: CoreCourseHelperProvider) {
-        super(courseHelper, 'AddonModFolder', 'folder');
+        super(courseHelper, 'AddonModFolder', 'folder', 'f');
     }
 }
diff --git a/src/addon/mod/glossary/providers/index-link-handler.ts b/src/addon/mod/glossary/providers/index-link-handler.ts
index 5162325d8..a4e78aa5e 100644
--- a/src/addon/mod/glossary/providers/index-link-handler.ts
+++ b/src/addon/mod/glossary/providers/index-link-handler.ts
@@ -25,6 +25,6 @@ export class AddonModGlossaryIndexLinkHandler extends CoreContentLinksModuleInde
     name = 'AddonModGlossaryIndexLinkHandler';
 
     constructor(courseHelper: CoreCourseHelperProvider, protected glossaryProvider: AddonModGlossaryProvider) {
-        super(courseHelper, 'AddonModGlossary', 'glossary');
+        super(courseHelper, 'AddonModGlossary', 'glossary', 'g');
     }
 }
diff --git a/src/addon/mod/imscp/providers/link-handler.ts b/src/addon/mod/imscp/providers/link-handler.ts
index 4795a50d3..f7e4c14bd 100644
--- a/src/addon/mod/imscp/providers/link-handler.ts
+++ b/src/addon/mod/imscp/providers/link-handler.ts
@@ -26,7 +26,7 @@ export class AddonModImscpLinkHandler extends CoreContentLinksModuleIndexHandler
 
     constructor(courseHelper: CoreCourseHelperProvider,
             protected imscpProvider: AddonModImscpProvider) {
-        super(courseHelper, 'AddonModImscp', 'imscp');
+        super(courseHelper, 'AddonModImscp', 'imscp', 'i');
     }
 
     /**
diff --git a/src/addon/mod/label/providers/link-handler.ts b/src/addon/mod/label/providers/link-handler.ts
index be593f328..75bb57f31 100644
--- a/src/addon/mod/label/providers/link-handler.ts
+++ b/src/addon/mod/label/providers/link-handler.ts
@@ -24,6 +24,6 @@ export class AddonModLabelLinkHandler extends CoreContentLinksModuleIndexHandler
     name = 'AddonModLabelLinkHandler';
 
     constructor(courseHelper: CoreCourseHelperProvider) {
-        super(courseHelper, 'AddonModLabel', 'label');
+        super(courseHelper, 'AddonModLabel', 'label', 'l');
     }
 }
diff --git a/src/addon/mod/lti/providers/link-handler.ts b/src/addon/mod/lti/providers/link-handler.ts
index bc0c0a6b2..2a174688c 100644
--- a/src/addon/mod/lti/providers/link-handler.ts
+++ b/src/addon/mod/lti/providers/link-handler.ts
@@ -24,6 +24,6 @@ export class AddonModLtiLinkHandler extends CoreContentLinksModuleIndexHandler {
     name = 'AddonModLtiLinkHandler';
 
     constructor(courseHelper: CoreCourseHelperProvider) {
-        super(courseHelper, 'AddonModLti', 'lti');
+        super(courseHelper, 'AddonModLti', 'lti', 'l');
     }
 }
diff --git a/src/addon/mod/page/providers/link-handler.ts b/src/addon/mod/page/providers/link-handler.ts
index d4d779c5e..6374fb2d1 100644
--- a/src/addon/mod/page/providers/link-handler.ts
+++ b/src/addon/mod/page/providers/link-handler.ts
@@ -26,7 +26,7 @@ export class AddonModPageLinkHandler extends CoreContentLinksModuleIndexHandler
 
     constructor(courseHelper: CoreCourseHelperProvider,
             protected pageProvider: AddonModPageProvider) {
-        super(courseHelper, 'AddonModPage', 'page');
+        super(courseHelper, 'AddonModPage', 'page', 'p');
     }
 
     /**
diff --git a/src/addon/mod/quiz/providers/index-link-handler.ts b/src/addon/mod/quiz/providers/index-link-handler.ts
index eeb82ab38..dbb36cc8e 100644
--- a/src/addon/mod/quiz/providers/index-link-handler.ts
+++ b/src/addon/mod/quiz/providers/index-link-handler.ts
@@ -25,6 +25,6 @@ export class AddonModQuizIndexLinkHandler extends CoreContentLinksModuleIndexHan
     name = 'AddonModQuizIndexLinkHandler';
 
     constructor(courseHelper: CoreCourseHelperProvider, protected quizProvider: AddonModQuizProvider) {
-        super(courseHelper, 'AddonModQuiz', 'quiz');
+        super(courseHelper, 'AddonModQuiz', 'quiz', 'q');
     }
 }
diff --git a/src/addon/mod/resource/providers/link-handler.ts b/src/addon/mod/resource/providers/link-handler.ts
index e17ec1721..a9cc54f1a 100644
--- a/src/addon/mod/resource/providers/link-handler.ts
+++ b/src/addon/mod/resource/providers/link-handler.ts
@@ -26,7 +26,7 @@ export class AddonModResourceLinkHandler extends CoreContentLinksModuleIndexHand
 
     constructor(courseHelper: CoreCourseHelperProvider,
             protected resourceProvider: AddonModResourceProvider) {
-        super(courseHelper, 'AddonModResource', 'resource');
+        super(courseHelper, 'AddonModResource', 'resource', 'r');
     }
 
     /**
diff --git a/src/addon/mod/scorm/providers/index-link-handler.ts b/src/addon/mod/scorm/providers/index-link-handler.ts
index 999c01595..a8182a2ed 100644
--- a/src/addon/mod/scorm/providers/index-link-handler.ts
+++ b/src/addon/mod/scorm/providers/index-link-handler.ts
@@ -24,6 +24,6 @@ export class AddonModScormIndexLinkHandler extends CoreContentLinksModuleIndexHa
     name = 'AddonModScormIndexLinkHandler';
 
     constructor(courseHelper: CoreCourseHelperProvider) {
-        super(courseHelper, 'AddonModScorm', 'scorm');
+        super(courseHelper, 'AddonModScorm', 'scorm', 'a');
     }
 }
diff --git a/src/addon/mod/url/providers/link-handler.ts b/src/addon/mod/url/providers/link-handler.ts
index 26d02f5f3..9d43f2975 100644
--- a/src/addon/mod/url/providers/link-handler.ts
+++ b/src/addon/mod/url/providers/link-handler.ts
@@ -25,6 +25,6 @@ export class AddonModUrlLinkHandler extends CoreContentLinksModuleIndexHandler {
     useModNameToGetModule = true;
 
     constructor(courseHelper: CoreCourseHelperProvider) {
-        super(courseHelper, 'AddonModUrl', 'url');
+        super(courseHelper, 'AddonModUrl', 'url', 'u');
     }
 }
diff --git a/src/addon/mod/wiki/providers/index-link-handler.ts b/src/addon/mod/wiki/providers/index-link-handler.ts
index 26286449e..8b734e980 100644
--- a/src/addon/mod/wiki/providers/index-link-handler.ts
+++ b/src/addon/mod/wiki/providers/index-link-handler.ts
@@ -24,6 +24,6 @@ export class AddonModWikiIndexLinkHandler extends CoreContentLinksModuleIndexHan
     name = 'AddonModWikiIndexLinkHandler';
 
     constructor(courseHelper: CoreCourseHelperProvider) {
-        super(courseHelper, 'AddonModWiki', 'wiki');
+        super(courseHelper, 'AddonModWiki', 'wiki', 'wid');
     }
 }
diff --git a/src/addon/mod/workshop/providers/link-handler.ts b/src/addon/mod/workshop/providers/link-handler.ts
index 0e62d1cbf..a934b63bc 100644
--- a/src/addon/mod/workshop/providers/link-handler.ts
+++ b/src/addon/mod/workshop/providers/link-handler.ts
@@ -26,7 +26,7 @@ export class AddonModWorkshopLinkHandler extends CoreContentLinksModuleIndexHand
 
     constructor(courseHelper: CoreCourseHelperProvider,
             protected workshopProvider: AddonModWorkshopProvider) {
-        super(courseHelper, AddonModWorkshopProvider.COMPONENT, 'workshop');
+        super(courseHelper, AddonModWorkshopProvider.COMPONENT, 'workshop', 'w');
     }
 
     /**

From 3f842b84833421d4b45ba469ce4f673e664dfd88 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 3 Dec 2019 15:08:35 +0100
Subject: [PATCH 154/257] MOBILE-1501 participants: Select first when search or
 clear

---
 .../user/components/participants/participants.ts     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/core/user/components/participants/participants.ts b/src/core/user/components/participants/participants.ts
index 0ace51d8d..bcb4edce8 100644
--- a/src/core/user/components/participants/participants.ts
+++ b/src/core/user/components/participants/participants.ts
@@ -165,7 +165,12 @@ export class CoreUserParticipantsComponent implements OnInit {
 
         // Remove search results and display all participants.
         this.participantsLoaded = false;
-        this.fetchData(true);
+        this.fetchData(true).then(() => {
+            if (this.splitviewCtrl.isOn() && this.participants.length > 0) {
+                // Take first and load it.
+                this.gotoParticipant(this.participants[0].id);
+            }
+        });
     }
 
     /**
@@ -196,6 +201,11 @@ export class CoreUserParticipantsComponent implements OnInit {
             this.canLoadMore = result.canLoadMore;
             this.searchPage++;
 
+            if (!loadMore && this.splitviewCtrl.isOn() && this.participants.length > 0) {
+                // Take first and load it.
+                this.gotoParticipant(this.participants[0].id);
+            }
+
         }).catch((error) => {
             this.domUtils.showErrorModalDefault(error, 'Error searching users.');
             this.loadMoreError = true;

From fd5d07ccdcbb443ef522e6ca8cd0991670b9843b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 3 Dec 2019 16:06:16 +0100
Subject: [PATCH 155/257] MOBILE-3223 ios: Fix playsinline for iOS in
 InAppBrowser

---
 src/providers/utils/utils.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/providers/utils/utils.ts b/src/providers/utils/utils.ts
index 8165bb6c2..31834a365 100644
--- a/src/providers/utils/utils.ts
+++ b/src/providers/utils/utils.ts
@@ -904,6 +904,10 @@ export class CoreUtilsProvider {
             options.enableViewPortScale = 'yes'; // Enable zoom on iOS.
         }
 
+        if (!options.allowInlineMediaPlayback) {
+            options.allowInlineMediaPlayback = 'yes'; // Allow playing inline videos in iOS.
+        }
+
         if (!options.location && this.platform.is('ios') && url.indexOf('file://') === 0) {
             // The URL uses file protocol, don't show it on iOS.
             // In Android we keep it because otherwise we lose the whole toolbar.

From 1daa5c57c91340daba13b7a6d6c3a072e557b808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 4 Dec 2019 10:16:40 +0100
Subject: [PATCH 156/257] MOBILE-3205 forum: Refresh info after pin or star

---
 src/addon/mod/forum/components/index/index.ts         | 2 +-
 src/core/contentlinks/classes/module-index-handler.ts | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/addon/mod/forum/components/index/index.ts b/src/addon/mod/forum/components/index/index.ts
index 5bb4e2f2d..6795fccac 100644
--- a/src/addon/mod/forum/components/index/index.ts
+++ b/src/addon/mod/forum/components/index/index.ts
@@ -128,7 +128,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
                                 discussion.starred = data.starred;
                             }
 
-                            this.showLoadingAndFetch(false);
+                            this.showLoadingAndRefresh(false);
                         }
                     }
 
diff --git a/src/core/contentlinks/classes/module-index-handler.ts b/src/core/contentlinks/classes/module-index-handler.ts
index 1af14a851..6487d4e29 100644
--- a/src/core/contentlinks/classes/module-index-handler.ts
+++ b/src/core/contentlinks/classes/module-index-handler.ts
@@ -15,8 +15,6 @@
 import { CoreContentLinksAction } from '../providers/delegate';
 import { CoreContentLinksHandlerBase } from './base-handler';
 import { CoreCourseHelperProvider } from '@core/course/providers/helper';
-import { CoreCourseProvider } from '@core/course/providers/course';
-import { CoreDomUtilsProvider } from '@providers/utils/dom';
 
 /**
  * Handler to handle URLs pointing to the index of a module.

From c4b21f0fb097291b18ea515b4f0a3a55cf78cb6b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 4 Dec 2019 10:10:38 +0100
Subject: [PATCH 157/257] MOBILE-3164 core: Fix file ID calculation with
 tokenpluginfile

---
 src/providers/filepool.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/providers/filepool.ts b/src/providers/filepool.ts
index db8b0f9ea..b025fbbc0 100644
--- a/src/providers/filepool.ts
+++ b/src/providers/filepool.ts
@@ -1411,16 +1411,19 @@ export class CoreFilepoolProvider {
      * @return The file ID.
      */
     protected getFileIdByUrl(fileUrl: string): string {
-        let url = this.removeRevisionFromUrl(fileUrl),
+        let url = fileUrl,
             filename;
 
-        // Decode URL.
-        url = this.textUtils.decodeHTML(this.textUtils.decodeURIComponent(url));
-
         // If site supports it, since 3.8 we use tokenpluginfile instead of pluginfile.
         // For compatibility with files already downloaded, we need to use pluginfile to calculate the file ID.
         url = url.replace(/\/tokenpluginfile\.php\/[^\/]+\//, '/webservice/pluginfile.php/');
 
+        // Remove the revision number from the URL so updates on the file aren't detected as a different file.
+        url = this.removeRevisionFromUrl(url);
+
+        // Decode URL.
+        url = this.textUtils.decodeHTML(this.textUtils.decodeURIComponent(url));
+
         if (url.indexOf('/webservice/pluginfile') !== -1) {
             // Remove attributes that do not matter.
             this.urlAttributes.forEach((regex) => {

From 466da5c7afafc9f6f88090af5844dc2c40099862 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 4 Dec 2019 11:32:04 +0100
Subject: [PATCH 158/257] MOBILE-3227 filter: Get all enrolled courses filters
 at once

---
 src/core/courses/providers/courses.ts | 87 ++++++++++++++++-----------
 src/core/filter/providers/helper.ts   | 83 +++++++++++++++++++------
 2 files changed, 117 insertions(+), 53 deletions(-)

diff --git a/src/core/courses/providers/courses.ts b/src/core/courses/providers/courses.ts
index 50a6f0511..051256bf7 100644
--- a/src/core/courses/providers/courses.ts
+++ b/src/core/courses/providers/courses.ts
@@ -99,42 +99,7 @@ export class CoreCoursesProvider {
 
             if (courseIds.length == 1) {
                 // Only 1 course, check if it belongs to the user courses. If so, use all user courses.
-                return this.getUserCourses(true, siteId).then((courses) => {
-                    const courseId = courseIds[0];
-                    let useAllCourses = false;
-
-                    if (courseId == siteHomeId) {
-                        // It's site home, use all courses.
-                        useAllCourses = true;
-                    } else {
-                        for (let i = 0; i < courses.length; i++) {
-                            if (courses[i].id == courseId) {
-                                useAllCourses = true;
-                                break;
-                            }
-                        }
-                    }
-
-                    if (useAllCourses) {
-                        // User is enrolled, retrieve all the courses.
-                        courseIds = courses.map((course) => {
-                            return course.id;
-                        });
-
-                        // Always add the site home ID.
-                        courseIds.push(siteHomeId);
-
-                        // Sort the course IDs.
-                        courseIds.sort((a, b) => {
-                           return b - a;
-                        });
-                    }
-
-                    return courseIds;
-                }).catch(() => {
-                    // Ignore errors.
-                    return courseIds;
-                });
+                return this.getCourseIdsIfEnrolled(courseIds[0], siteId);
             } else {
                 if (courseIds.length > 1 && courseIds.indexOf(siteHomeId) == -1) {
                     courseIds.push(siteHomeId);
@@ -150,6 +115,56 @@ export class CoreCoursesProvider {
         });
     }
 
+    /**
+     * Given a course ID, if user is enrolled in the course it will return the IDs of all enrolled courses and site home.
+     * Return only the course ID otherwise.
+     *
+     * @param courseIds Course IDs.
+     * @param siteId Site Id. If not defined, use current site.
+     * @return Promise resolved with the list of course IDs.
+     */
+    getCourseIdsIfEnrolled(courseId: number, siteId?: string): Promise<number[]> {
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            const siteHomeId = site.getSiteHomeId();
+
+            // Check if user is enrolled in the course.
+            return this.getUserCourses(true, siteId).then((courses) => {
+                let useAllCourses = false;
+
+                if (courseId == siteHomeId) {
+                    // It's site home, use all courses.
+                    useAllCourses = true;
+                } else {
+                    useAllCourses = !!courses.find((course) => {
+                        return course.id == courseId;
+                    });
+                }
+
+                if (useAllCourses) {
+                    // User is enrolled, return all the courses.
+                    const courseIds = courses.map((course) => {
+                        return course.id;
+                    });
+
+                    // Always add the site home ID.
+                    courseIds.push(siteHomeId);
+
+                    // Sort the course IDs.
+                    courseIds.sort((a, b) => {
+                       return b - a;
+                    });
+
+                    return courseIds;
+                }
+
+                return [courseId];
+            }).catch(() => {
+                // Ignore errors.
+                return [courseId];
+            });
+        });
+    }
+
     /**
      * Check if download a whole course is disabled in a certain site.
      *
diff --git a/src/core/filter/providers/helper.ts b/src/core/filter/providers/helper.ts
index ee4767346..fd8cba551 100644
--- a/src/core/filter/providers/helper.ts
+++ b/src/core/filter/providers/helper.ts
@@ -20,6 +20,7 @@ import { CoreSitesProvider } from '@providers/sites';
 import { CoreFilterDelegate } from './delegate';
 import { CoreFilterProvider, CoreFilterFilter, CoreFilterFormatTextOptions, CoreFilterClassifiedFilters } from './filter';
 import { CoreCourseProvider } from '@core/course/providers/course';
+import { CoreCoursesProvider } from '@core/courses/providers/courses';
 import { CoreSite } from '@classes/site';
 
 /**
@@ -45,11 +46,12 @@ export class CoreFilterHelperProvider {
 
     constructor(logger: CoreLoggerProvider,
             eventsProvider: CoreEventsProvider,
-            private appProvider: CoreAppProvider,
-            private sitesProvider: CoreSitesProvider,
-            private filterDelegate: CoreFilterDelegate,
-            private courseProvider: CoreCourseProvider,
-            private filterProvider: CoreFilterProvider) {
+            protected appProvider: CoreAppProvider,
+            protected sitesProvider: CoreSitesProvider,
+            protected filterDelegate: CoreFilterDelegate,
+            protected courseProvider: CoreCourseProvider,
+            protected filterProvider: CoreFilterProvider,
+            protected coursesProvider: CoreCoursesProvider) {
 
         this.logger = logger.getInstance('CoreFilterHelperProvider');
 
@@ -62,6 +64,59 @@ export class CoreFilterHelperProvider {
         });
     }
 
+    /**
+     * Get some filters from memory cache. If not in cache, get them and store them in cache.
+     *
+     * @param contextLevel The context level.
+     * @param instanceId Instance ID related to the context.
+     * @param options Options for format text.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the filters.
+     */
+    protected getCacheableFilters(contextLevel: string, instanceId: number, getFilters: () => Promise<{contextlevel: string,
+            instanceid: number}[]>, options?: CoreFilterFormatTextOptions, site?: CoreSite): Promise<CoreFilterFilter[]> {
+
+        // Check the memory cache first.
+        const result = this.getFromMemoryCache(options.courseId, contextLevel, instanceId, site);
+        if (result) {
+            return Promise.resolve(result);
+        }
+
+        const siteId = site.getId();
+
+        return getFilters().then((contexts) => {
+
+            return this.filterProvider.getAvailableInContexts(contexts, siteId).then((filters) => {
+                this.storeInMemoryCache(options.courseId, filters, siteId);
+
+                return filters[contextLevel][instanceId] || [];
+            });
+        });
+    }
+
+    /**
+     * If user is enrolled in the course, return contexts of all enrolled courses to decrease number of WS requests.
+     *
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the contexts.
+     */
+    getCourseContexts(courseId: number, siteId?: string): Promise<{contextlevel: string, instanceid: number}[]> {
+
+        return this.coursesProvider.getCourseIdsIfEnrolled(courseId, siteId).then((courseIds) => {
+            const contexts: {contextlevel: string, instanceid: number}[] = [];
+
+            courseIds.forEach((courseId) => {
+                contexts.push({
+                    contextlevel: 'course',
+                    instanceid: courseId
+                });
+            });
+
+            return contexts;
+        });
+    }
+
     /**
      * Get the contexts of all course modules in a course.
      *
@@ -137,21 +192,15 @@ export class CoreFilterHelperProvider {
 
                         if (contextLevel == 'module' && options.courseId) {
                             // Get all the modules filters with a single call to decrease the number of WS calls.
-                            // Check the memory cache first to speed up the process.
+                            const getFilters = this.getCourseModulesContexts.bind(this, options.courseId, siteId);
 
-                            const result = this.getFromMemoryCache(options.courseId, contextLevel, instanceId, site);
-                            if (result) {
-                                return result;
-                            }
+                            return this.getCacheableFilters(contextLevel, instanceId, getFilters, options, site);
 
-                            return this.getCourseModulesContexts(options.courseId, siteId).then((contexts) => {
+                        } else if (contextLevel == 'course') {
+                            // If enrolled, get all enrolled courses filters with a single call to decrease number of WS calls.
+                            const getFilters = this.getCourseContexts.bind(this, instanceId, siteId);
 
-                                return this.filterProvider.getAvailableInContexts(contexts, siteId).then((filters) => {
-                                    this.storeInMemoryCache(options.courseId, filters, siteId);
-
-                                    return filters[contextLevel][instanceId] || [];
-                                });
-                            });
+                            return this.getCacheableFilters(contextLevel, instanceId, getFilters, options, site);
                         }
 
                         return this.filterProvider.getAvailableInContext(contextLevel, instanceId, siteId);

From dca93cb6e47b1178d5f7896bfa28df82c729311c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 4 Dec 2019 11:50:53 +0100
Subject: [PATCH 159/257] MOBILE-3227 filter: Get all course blocks filters at
 once

---
 .../core-block-pre-rendered.html              |  6 ++--
 .../pre-rendered-block/pre-rendered-block.ts  |  4 +++
 src/core/course/providers/course.ts           |  8 ++++--
 src/core/filter/providers/helper.ts           | 28 +++++++++++++++++++
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/core/block/components/pre-rendered-block/core-block-pre-rendered.html b/src/core/block/components/pre-rendered-block/core-block-pre-rendered.html
index 4b3f46315..ab4dcb92e 100644
--- a/src/core/block/components/pre-rendered-block/core-block-pre-rendered.html
+++ b/src/core/block/components/pre-rendered-block/core-block-pre-rendered.html
@@ -1,11 +1,11 @@
 <ion-item-divider text-wrap *ngIf="title">
-    <h2><core-format-text [text]="title | translate" contextLevel="block" [contextInstanceId]="block.instanceid"></core-format-text></h2>
+    <h2><core-format-text [text]="title | translate" contextLevel="block" [contextInstanceId]="block.instanceid" [courseId]="courseId"></core-format-text></h2>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" class="core-loading-center">
     <ion-item *ngIf="block.contents.content" text-wrap class="core-block-content">
-        <core-format-text [text]="block.contents.content" contextLevel="block" [contextInstanceId]="block.instanceid"></core-format-text>
+        <core-format-text [text]="block.contents.content" contextLevel="block" [contextInstanceId]="block.instanceid" [courseId]="courseId"></core-format-text>
     </ion-item>
     <ion-item *ngIf="block.contents.footer" text-wrap class="core-block-footer">
-        <core-format-text [text]="block.contents.footer" contextLevel="block" [contextInstanceId]="block.instanceid"></core-format-text>
+        <core-format-text [text]="block.contents.footer" contextLevel="block" [contextInstanceId]="block.instanceid" [courseId]="courseId"></core-format-text>
     </ion-item>
 </core-loading>
diff --git a/src/core/block/components/pre-rendered-block/pre-rendered-block.ts b/src/core/block/components/pre-rendered-block/pre-rendered-block.ts
index a88659e36..0f9cd1087 100644
--- a/src/core/block/components/pre-rendered-block/pre-rendered-block.ts
+++ b/src/core/block/components/pre-rendered-block/pre-rendered-block.ts
@@ -24,6 +24,8 @@ import { CoreBlockBaseComponent } from '../../classes/base-block-component';
 })
 export class CoreBlockPreRenderedComponent  extends CoreBlockBaseComponent implements OnInit {
 
+    courseId: number;
+
     constructor(injector: Injector) {
         super(injector, 'CoreBlockPreRenderedComponent');
     }
@@ -34,6 +36,8 @@ export class CoreBlockPreRenderedComponent  extends CoreBlockBaseComponent imple
     ngOnInit(): void {
         super.ngOnInit();
 
+        this.courseId = this.contextLevel == 'course' ? this.instanceId : undefined;
+
         this.fetchContentDefaultError = 'Error getting ' + this.block.contents.title + ' data.';
     }
 
diff --git a/src/core/course/providers/course.ts b/src/core/course/providers/course.ts
index 832eeda4c..c6f99929b 100644
--- a/src/core/course/providers/course.ts
+++ b/src/core/course/providers/course.ts
@@ -113,12 +113,14 @@ export class CoreCourseProvider {
     /**
      * Check if the get course blocks WS is available in current site.
      *
+     * @param site Site to check. If not defined, current site.
      * @return Whether it's available.
      * @since 3.7
      */
-    canGetCourseBlocks(): boolean {
-        return this.sitesProvider.getCurrentSite().isVersionGreaterEqualThan('3.7') &&
-            this.sitesProvider.wsAvailableInCurrentSite('core_block_get_course_blocks');
+    canGetCourseBlocks(site?: CoreSite): boolean {
+        site = site || this.sitesProvider.getCurrentSite();
+
+        return site.isVersionGreaterEqualThan('3.7') && site.wsAvailable('core_block_get_course_blocks');
     }
 
     /**
diff --git a/src/core/filter/providers/helper.ts b/src/core/filter/providers/helper.ts
index fd8cba551..82c89e8ac 100644
--- a/src/core/filter/providers/helper.ts
+++ b/src/core/filter/providers/helper.ts
@@ -64,6 +64,29 @@ export class CoreFilterHelperProvider {
         });
     }
 
+    /**
+     * Get the contexts of all blocks in a course.
+     *
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the contexts.
+     */
+    getBlocksContexts(courseId: number, siteId?: string): Promise<{contextlevel: string, instanceid: number}[]> {
+
+        return this.courseProvider.getCourseBlocks(courseId, siteId).then((blocks) => {
+            const contexts: {contextlevel: string, instanceid: number}[] = [];
+
+            blocks.forEach((block) => {
+                contexts.push({
+                    contextlevel: 'block',
+                    instanceid: block.instanceid
+                });
+            });
+
+            return contexts;
+        });
+    }
+
     /**
      * Get some filters from memory cache. If not in cache, get them and store them in cache.
      *
@@ -200,6 +223,11 @@ export class CoreFilterHelperProvider {
                             // If enrolled, get all enrolled courses filters with a single call to decrease number of WS calls.
                             const getFilters = this.getCourseContexts.bind(this, instanceId, siteId);
 
+                            return this.getCacheableFilters(contextLevel, instanceId, getFilters, options, site);
+                        } else if (contextLevel == 'block' && options.courseId && this.courseProvider.canGetCourseBlocks(site)) {
+                            // Get all the course blocks filters with a single call to decrease number of WS calls.
+                            const getFilters = this.getBlocksContexts.bind(this, options.courseId, siteId);
+
                             return this.getCacheableFilters(contextLevel, instanceId, getFilters, options, site);
                         }
 

From 5a7bff9bb92c795274a222ca17abc3db559c9c4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 4 Dec 2019 11:50:23 +0100
Subject: [PATCH 160/257] MOBILE-2877 comments: Fix comments offline load

---
 .../comments/components/comments/comments.ts  |  5 ++++-
 src/core/comments/pages/viewer/viewer.html    |  2 +-
 src/core/comments/pages/viewer/viewer.ts      | 22 +++++++++----------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/core/comments/components/comments/comments.ts b/src/core/comments/components/comments/comments.ts
index 9f8408442..442f58b06 100644
--- a/src/core/comments/components/comments/comments.ts
+++ b/src/core/comments/components/comments/comments.ts
@@ -86,8 +86,11 @@ export class CoreCommentsCommentsComponent implements OnChanges, OnDestroy {
             if (!this.commentsCount.endsWith('+') && this.undefinedOrEqual(data, 'contextLevel') &&
                     this.undefinedOrEqual(data, 'instanceId') && this.undefinedOrEqual(data, 'component') &&
                     this.undefinedOrEqual(data, 'itemId') && this.undefinedOrEqual(data, 'area') && !this.countError) {
+                let newNumber = parseInt(this.commentsCount, 10) + data.countChange;
+                newNumber = newNumber >= 0 ? newNumber : 0;
+
                 // Parse and unparse string.
-                this.commentsCount = parseInt(this.commentsCount, 10) + data.countChange + '';
+                this.commentsCount = newNumber + '';
             }
         }, sitesProvider.getCurrentSiteId());
     }
diff --git a/src/core/comments/pages/viewer/viewer.html b/src/core/comments/pages/viewer/viewer.html
index 40eadf01b..6c4678862 100644
--- a/src/core/comments/pages/viewer/viewer.html
+++ b/src/core/comments/pages/viewer/viewer.html
@@ -56,7 +56,7 @@
                 </button>
             </ion-item>
             <ion-item text-wrap>
-                <core-format-text clean="true" [text]="comment.content" [contextLevel]="contextLevel" [contextInstanceId]="instanceId" [courseId]="courseId"></core-format-text>
+                <core-format-text [text]="comment.content" [contextLevel]="contextLevel" [contextInstanceId]="instanceId" [courseId]="courseId"></core-format-text>
             </ion-item>
         </ion-card>
 
diff --git a/src/core/comments/pages/viewer/viewer.ts b/src/core/comments/pages/viewer/viewer.ts
index a935d0544..678769992 100644
--- a/src/core/comments/pages/viewer/viewer.ts
+++ b/src/core/comments/pages/viewer/viewer.ts
@@ -133,8 +133,6 @@ export class CoreCommentsViewerPage implements OnDestroy {
 
         return promise.catch(() => {
             // Ignore errors.
-        }).then(() => {
-            return this.loadOfflineData();
         }).then(() => {
             // Get comments data.
             return this.commentsProvider.getComments(this.contextLevel, this.instanceId, this.componentName, this.itemId,
@@ -157,6 +155,8 @@ export class CoreCommentsViewerPage implements OnDestroy {
                     return !!comment.delete;
                 }));
             });
+        }).then(() => {
+            return this.loadOfflineData();
         }).catch((error) => {
             this.loadMoreError = true; // Set to prevent infinite calls with infinite-loading.
             if (error && this.componentName == 'assignsubmission_comments') {
@@ -313,20 +313,20 @@ export class CoreCommentsViewerPage implements OnDestroy {
                     const index = this.comments.findIndex((comment) => comment.id == deleteComment.id);
                     if (index >= 0) {
                         this.comments.splice(index, 1);
+
+                        this.eventsProvider.trigger(CoreCommentsProvider.COMMENTS_COUNT_CHANGED_EVENT, {
+                            contextLevel: this.contextLevel,
+                            instanceId: this.instanceId,
+                            component: this.componentName,
+                            itemId: this.itemId,
+                            area: this.area,
+                            countChange: -1,
+                        }, this.sitesProvider.getCurrentSiteId());
                     }
                 } else {
                     this.loadOfflineData();
                 }
 
-                this.eventsProvider.trigger(CoreCommentsProvider.COMMENTS_COUNT_CHANGED_EVENT, {
-                        contextLevel: this.contextLevel,
-                        instanceId: this.instanceId,
-                        component: this.componentName,
-                        itemId: this.itemId,
-                        area: this.area,
-                        countChange: -1,
-                    }, this.sitesProvider.getCurrentSiteId());
-
                 this.invalidateComments();
 
                 this.domUtils.showToast('core.comments.eventcommentdeleted', true, 3000);

From bc33ae3bf809b8d03f85b3675e36732aeb674771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 4 Dec 2019 15:07:22 +0100
Subject: [PATCH 161/257] MOBILE-3217 course: Check colors array is populated

---
 src/core/courses/providers/helper.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/courses/providers/helper.ts b/src/core/courses/providers/helper.ts
index b918d3b1c..0d98fe61e 100644
--- a/src/core/courses/providers/helper.ts
+++ b/src/core/courses/providers/helper.ts
@@ -143,7 +143,7 @@ export class CoreCoursesHelperProvider {
                 this.loadCourseExtraInfo(course, courseInfoAvailable ? coursesInfo[course.id] : course, loadCategoryNames);
                 if (!course.courseImage) {
                     course.colorNumber = course.id % 10;
-                    course.color = colors[course.colorNumber];
+                    course.color = colors.length && colors[course.colorNumber];
                 }
             });
         });

From 05fafe3e67977d6694c12e11be849181d472cbfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 11 Nov 2019 09:14:43 +0100
Subject: [PATCH 162/257] MOBILE-3210 myoverview: Add custom filters

---
 .../myoverview/addon-block-myoverview.html    |  11 +-
 .../components/myoverview/myoverview.ts       | 114 ++++++++++++++----
 src/core/courses/providers/courses.ts         |  30 +++++
 3 files changed, 127 insertions(+), 28 deletions(-)

diff --git a/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html
index 589048b3f..e4016144a 100644
--- a/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addon/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -1,8 +1,8 @@
 <ion-item-divider>
     <h2>{{ 'addon.block_myoverview.pluginname' | translate }}</h2>
     <!-- Download all courses. -->
-    <div *ngIf="downloadCoursesEnabled && downloadEnabled && courses[selectedFilter] && courses[selectedFilter].length > 1 && !showFilter" class="core-button-spinner" item-end>
-        <button *ngIf="prefetchCoursesData[selectedFilter].icon && prefetchCoursesData[selectedFilter].icon != 'spinner'" ion-button icon-only clear color="dark" (click)="prefetchCourses()">
+    <div *ngIf="downloadCoursesEnabled && downloadEnabled && filteredCourses.length > 1 && !showFilter" class="core-button-spinner" item-end>
+        <button *ngIf="prefetchCoursesData[selectedFilter] && prefetchCoursesData[selectedFilter].icon && prefetchCoursesData[selectedFilter].icon != 'spinner'" ion-button icon-only clear color="dark" (click)="prefetchCourses()">
             <core-icon [name]="prefetchCoursesData[selectedFilter].icon"></core-icon>
         </button>
         <ion-badge class="core-course-download-courses-progress" *ngIf="prefetchCoursesData[selectedFilter].badge">{{prefetchCoursesData[selectedFilter].badge}}</ion-badge>
@@ -23,11 +23,16 @@
             <ion-option value="inprogress" *ngIf="showFilters.inprogress != 'hidden'" [disabled]="showFilters.inprogress == 'disabled'">{{ 'addon.block_myoverview.inprogress' | translate }}</ion-option>
             <ion-option value="future" *ngIf="showFilters.future != 'hidden'" [disabled]="showFilters.future == 'disabled'">{{ 'addon.block_myoverview.future' | translate }}</ion-option>
             <ion-option value="past" *ngIf="showFilters.past != 'hidden'" [disabled]="showFilters.past == 'disabled'">{{ 'addon.block_myoverview.past' | translate }}</ion-option>
+            <ng-container *ngIf="showFilters.custom != 'hidden'">
+                <ng-container *ngFor="let customOption of customFilter; let index = index">
+                    <ion-option value="custom-{{index}}">{{ customOption.name }}</ion-option>
+                </ng-container>
+            </ng-container>
             <ion-option value="favourite" *ngIf="showFilters.favourite != 'hidden'" [disabled]="showFilters.favourite == 'disabled'">{{ 'addon.block_myoverview.favourites' | translate }}</ion-option>
             <ion-option value="hidden" *ngIf="showFilters.hidden != 'hidden'" [disabled]="showFilters.hidden == 'disabled'">{{ 'addon.block_myoverview.hiddencourses' | translate }}</ion-option>
         </ion-select>
     </div>
-    <core-empty-box *ngIf="courses[selectedFilter].length == 0" image="assets/img/icons/courses.svg" [message]="'addon.block_myoverview.nocourses' | translate"></core-empty-box>
+    <core-empty-box *ngIf="filteredCourses.length == 0" image="assets/img/icons/courses.svg" [message]="'addon.block_myoverview.nocourses' | translate"></core-empty-box>
 
     <!-- Filter courses. -->
     <ion-searchbar #searchbar *ngIf="showFilter" [(ngModel)]="courses.filter" (ionInput)="filterChanged($event)" (ionCancel)="filterChanged()" [placeholder]="'core.courses.filtermycourses' | translate">
diff --git a/src/addon/block/myoverview/components/myoverview/myoverview.ts b/src/addon/block/myoverview/components/myoverview/myoverview.ts
index 3c75be8bd..76e6b1357 100644
--- a/src/addon/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addon/block/myoverview/components/myoverview/myoverview.ts
@@ -43,12 +43,14 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         inprogress: [],
         future: [],
         favourite: [],
-        hidden: []
+        hidden: [],
+        custom: [], // Leave it empty to avoid download all those courses.
     };
+    customFilter: any[] = [];
     selectedFilter = 'inprogress';
     sort = 'fullname';
     currentSite: any;
-    filteredCourses: any[];
+    filteredCourses: any[] = [];
     prefetchCoursesData = {
         all: {},
         allincludinghidden: {},
@@ -56,7 +58,8 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         past: {},
         future: {},
         favourite: {},
-        hidden: {}
+        hidden: {},
+        custom: {}, // Leave it empty to avoid download all those courses.
     };
     showFilters = { // Options are show, disabled, hidden.
         all: 'show',
@@ -65,7 +68,8 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         inprogress: 'show',
         future: 'show',
         favourite: 'show',
-        hidden: 'show'
+        hidden: 'show',
+        custom: 'hidden', // True or false to show or hide.
     };
     showFilter = false;
     showSelectorFilter = false;
@@ -80,11 +84,15 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     protected courseIds = [];
     protected fetchContentDefaultError = 'Error getting my overview data.';
 
-    constructor(injector: Injector, private coursesProvider: CoreCoursesProvider,
-            private courseCompletionProvider: AddonCourseCompletionProvider, private eventsProvider: CoreEventsProvider,
-            private courseHelper: CoreCourseHelperProvider,
-            private courseOptionsDelegate: CoreCourseOptionsDelegate, private coursesHelper: CoreCoursesHelperProvider,
-            private sitesProvider: CoreSitesProvider, private timeUtils: CoreTimeUtilsProvider) {
+    constructor(injector: Injector,
+            protected coursesProvider: CoreCoursesProvider,
+            protected courseCompletionProvider: AddonCourseCompletionProvider,
+            protected eventsProvider: CoreEventsProvider,
+            protected courseHelper: CoreCourseHelperProvider,
+            protected courseOptionsDelegate: CoreCourseOptionsDelegate,
+            protected coursesHelper: CoreCoursesHelperProvider,
+            protected sitesProvider: CoreSitesProvider,
+            protected timeUtils: CoreTimeUtilsProvider) {
 
         super(injector, 'AddonBlockMyOverviewComponent');
     }
@@ -115,7 +123,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
             this.sort = value;
         }));
         promises.push(this.currentSite.getLocalSiteConfig('AddonBlockMyOverviewFilter', this.selectedFilter).then((value) => {
-            this.selectedFilter = typeof this.courses[value] == 'undefined' ? 'inprogress' : value;
+            this.selectedFilter = value;
         }));
 
         Promise.all(promises).finally(() => {
@@ -213,6 +221,15 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
                     (!config || config.displaygroupingstarred.value == '1'),
                 this.courses.favourite.length === 0);
 
+            this.showFilters.custom = this.getShowFilterValue(this.showSelectorFilter && config &&
+                    config.displaygroupingcustomfield.value == '1' && config.customfieldsexport && config.customfieldsexport.value,
+                    false);
+            if (this.showFilters.custom == 'show') {
+                this.customFilter = this.textUtils.parseJSON(config.customfieldsexport.value);
+            } else {
+                this.customFilter = [];
+            }
+
             if (this.showSelectorFilter) {
                 // Check if any selector is shown and not disabled.
                 this.showSelectorFilter = Object.keys(this.showFilters).some((key) => {
@@ -224,7 +241,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
                 // No selector, or the default option is disabled, show all.
                 this.selectedFilter = 'all';
             }
-            this.filteredCourses = this.courses[this.selectedFilter];
+            this.setCourseFilter(this.selectedFilter);
 
             this.initPrefetchCoursesIcons();
         });
@@ -248,17 +265,17 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
      */
     filterChanged(event: any): void {
         const newValue = event.target.value && event.target.value.trim().toLowerCase();
-        if (!newValue || !this.courses['all']) {
-            this.filteredCourses = this.courses['all'];
+        if (!newValue || this.courses.allincludinghidden.length <= 0) {
+            this.filteredCourses = this.courses.allincludinghidden;
         } else {
             // Use displayname if avalaible, or fullname if not.
-            if (this.courses['all'].length > 0 &&
-                    typeof this.courses['all'][0].displayname != 'undefined') {
-                this.filteredCourses = this.courses['all'].filter((course) => {
+            if (this.courses.allincludinghidden.length > 0 &&
+                    typeof this.courses.allincludinghidden[0].displayname != 'undefined') {
+                this.filteredCourses = this.courses.allincludinghidden.filter((course) => {
                     return course.displayname.toLowerCase().indexOf(newValue) > -1;
                 });
             } else {
-                this.filteredCourses = this.courses['all'].filter((course) => {
+                this.filteredCourses = this.courses.allincludinghidden.filter((course) => {
                     return course.fullname.toLowerCase().indexOf(newValue) > -1;
                 });
             }
@@ -304,8 +321,50 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
      * The selected courses filter have changed.
      */
     selectedChanged(): void {
-        this.currentSite.setLocalSiteConfig('AddonBlockMyOverviewFilter', this.selectedFilter);
-        this.filteredCourses = this.courses[this.selectedFilter];
+        this.setCourseFilter(this.selectedFilter);
+    }
+
+    /**
+     * Set selected courses filter.
+     *
+     * @param {string} filter Filter name to set.
+     */
+    protected setCourseFilter(filter: string): void {
+        this.selectedFilter = filter;
+
+        if (this.showFilters.custom == 'show' && filter.startsWith('custom-') &&
+                typeof this.customFilter[filter.substr(7)] != 'undefined') {
+            const filterName = this.block.configs.customfiltergrouping.value,
+                filterValue = this.customFilter[filter.substr(7)].value;
+
+            this.loaded = false;
+
+            this.coursesProvider.getEnrolledCoursesByCustomField(filterName, filterValue).then((courses) => {
+                // Get the courses information from allincludinghidden to get the max info about the course.
+                const courseIds = courses.map((course) => course.id);
+                this.filteredCourses = this.courses.allincludinghidden.filter((allCourse) =>
+                    courseIds.indexOf(allCourse.id) !== -1);
+            }).catch((error) => {
+                this.domUtils.showErrorModalDefault(error, this.fetchContentDefaultError);
+            }).finally(() => {
+                this.loaded = true;
+            });
+        } else {
+            // Only save the filter if not a custom one.
+            this.currentSite.setLocalSiteConfig('AddonBlockMyOverviewFilter', filter);
+
+            if (this.showFilters[filter] == 'show') {
+                this.filteredCourses = this.courses[filter];
+            } else {
+                const activeFilter = Object.keys(this.showFilters).find((name) => {
+                    return this.showFilters[name] == 'show';
+                });
+
+                if (activeFilter) {
+                    this.setCourseFilter(activeFilter);
+                }
+            }
+        }
     }
 
     /**
@@ -314,6 +373,8 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
      * @param courses Courses to filter.
      */
     initCourseFilters(courses: any[]): void {
+        this.courses.allincludinghidden = courses;
+
         if (this.showSortFilter) {
                 if (this.sort == 'lastaccess') {
                 courses.sort((a, b) => {
@@ -330,7 +391,6 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         }
 
         this.courses.all = [];
-        this.courses.allincludinghidden = [];
         this.courses.past = [];
         this.courses.inprogress = [];
         this.courses.future = [];
@@ -339,7 +399,6 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
 
         const today = this.timeUtils.timestamp();
         courses.forEach((course) => {
-            this.courses.allincludinghidden.push(course);
             if (course.hidden) {
                 this.courses.hidden.push(course);
             } else  {
@@ -362,7 +421,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
             }
         });
 
-        this.filteredCourses = this.courses[this.selectedFilter];
+        this.setCourseFilter(this.selectedFilter);
     }
 
     /**
@@ -373,7 +432,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     switchSort(sort: string): void {
         this.sort = sort;
         this.currentSite.setLocalSiteConfig('AddonBlockMyOverviewSort', this.sort);
-        this.initCourseFilters(this.courses.all.concat(this.courses.hidden));
+        this.initCourseFilters(this.courses.allincludinghidden);
     }
 
     /**
@@ -382,7 +441,12 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     switchFilter(): void {
         this.showFilter = !this.showFilter;
         this.courses.filter = '';
-        this.filteredCourses = this.courses[this.showFilter ? 'all' : this.selectedFilter];
+
+        if (this.showFilter) {
+            this.filteredCourses = this.courses.allincludinghidden;
+        } else {
+            this.setCourseFilter(this.selectedFilter);
+        }
     }
 
     /**
@@ -402,7 +466,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
      * @return If switch button that enables the filter input is shown or not.
      */
     showFilterSwitchButton(): boolean {
-        return this.loaded && this.courses['all'] && this.courses['all'].length > 5;
+        return this.loaded && this.courses.allincludinghidden && this.courses.allincludinghidden.length > 5;
     }
 
     /**
diff --git a/src/core/courses/providers/courses.ts b/src/core/courses/providers/courses.ts
index 50a6f0511..b9d135c54 100644
--- a/src/core/courses/providers/courses.ts
+++ b/src/core/courses/providers/courses.ts
@@ -514,6 +514,36 @@ export class CoreCoursesProvider {
         return this.ROOT_CACHE_KEY + 'coursesbyfield:' + field + ':' + value;
     }
 
+    /**
+     * Get courses matching the given custom field. Only works in online.
+     *
+     * @param  customFieldName Custom field name.
+     * @param  customFieldValue Custom field value.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the list of courses.
+     * @since 3.8
+     */
+    getEnrolledCoursesByCustomField(customFieldName: string, customFieldValue: string, siteId?: string): Promise<any[]> {
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            const data = {
+                    classification: 'customfield',
+                    customfieldname: customFieldName,
+                    customfieldvalue: customFieldValue
+                },
+                preSets = {
+                    getFromCache: false
+                };
+
+            return site.read('core_course_get_enrolled_courses_by_timeline_classification', data, preSets).then((courses) => {
+                if (courses.courses) {
+                    return courses.courses;
+                }
+
+                return Promise.reject(null);
+            });
+        });
+    }
+
     /**
      * Check if get courses by field WS is available in a certain site.
      *

From 067c46e8c55d0c277e0beaa554243eb6eaab521c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 4 Dec 2019 12:36:43 +0100
Subject: [PATCH 163/257] MOBILE-3216 core: Check if user agent is controlled
 by automation

---
 src/providers/app.ts  | 13 ++++++++++++-
 src/providers/lang.ts |  8 ++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/providers/app.ts b/src/providers/app.ts
index 4129fe48e..7aa6a6a70 100644
--- a/src/providers/app.ts
+++ b/src/providers/app.ts
@@ -101,7 +101,9 @@ export class CoreAppProvider {
         }, 100);
 
         // Export the app provider so Behat tests can change the forceOffline flag.
-        (<any> window).appProvider = this;
+        if (CoreAppProvider.isAutomated()) {
+            (<any> window).appProvider = this;
+        }
     }
 
     /**
@@ -159,6 +161,15 @@ export class CoreAppProvider {
         return this.appCtrl.getRootNavs()[0];
     }
 
+    /**
+     * Returns whether the user agent is controlled by automation. I.e. Behat testing.
+     *
+     * @return {boolean} True if the user agent is controlled by automation, false otherwise.
+     */
+    static isAutomated(): boolean {
+        return !!navigator.webdriver;
+    }
+
     /**
      * Checks if the app is running in a 64 bits desktop environment (not browser).
      *
diff --git a/src/providers/lang.ts b/src/providers/lang.ts
index 14c478d9b..df16004e3 100644
--- a/src/providers/lang.ts
+++ b/src/providers/lang.ts
@@ -17,6 +17,7 @@ import { TranslateService } from '@ngx-translate/core';
 import * as moment from 'moment';
 import { Globalization } from '@ionic-native/globalization';
 import { Platform, Config } from 'ionic-angular';
+import { CoreAppProvider } from '@providers/app';
 import { CoreConfigProvider } from './config';
 import { CoreConfigConstants } from '../configconstants';
 
@@ -39,6 +40,13 @@ export class CoreLangProvider {
         translate.use(this.defaultLanguage);
 
         platform.ready().then(() => {
+            if (CoreAppProvider.isAutomated()) {
+                // Force current language to English when Behat is running.
+                this.changeCurrentLanguage('en');
+
+                return;
+            }
+
             this.getCurrentLanguage().then((language) => {
                 this.changeCurrentLanguage(language);
             });

From 410fd8989a7850b011c2ebef15ddc267b1007b70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 5 Dec 2019 10:39:53 +0100
Subject: [PATCH 164/257] MOBILE-3232 scripts: Remove lib directory

---
 scripts/aot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/aot.sh b/scripts/aot.sh
index 931d8e4b5..e13b5759b 100755
--- a/scripts/aot.sh
+++ b/scripts/aot.sh
@@ -51,7 +51,7 @@ if [ ! -z $GIT_ORG ] && [ ! -z $GIT_TOKEN ] ; then
 
     git checkout $TRAVIS_BRANCH
 
-    rm -Rf assets build index.html templates www destkop
+    rm -Rf assets build index.html templates www destkop lib
 
     if [ $TRAVIS_BRANCH == 'desktop' ] ; then
         cp -Rf ../$gitfolder/desktop ./

From 44f746bd86035c4e2157bb10a6ff07ca458f18ec Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 5 Dec 2019 16:11:12 +0100
Subject: [PATCH 165/257] MOBILE-3232 filters: Use svg mathjax output

---
 config/copy.config.js                         | 22 ++++++------
 .../filter/mathjaxloader/providers/handler.ts | 35 +++++++++++++++----
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/config/copy.config.js b/config/copy.config.js
index eb780e38e..3bf310e37 100644
--- a/config/copy.config.js
+++ b/config/copy.config.js
@@ -14,24 +14,24 @@ module.exports = {
     dest: '{{WWW}}/'
   },
   copyMathJaxMain: {
-    src: ['{{ROOT}}/node_modules/mathjax/*.js'],
+    src: ['{{ROOT}}/node_modules/mathjax/MathJax.js'],
     dest: '{{WWW}}/lib/mathjax'
   },
-  copyMathJaxConfig: {
-    src: ['{{ROOT}}/node_modules/mathjax/config/**/*'],
-    dest: '{{WWW}}/lib/mathjax/config'
-  },
   copyMathJaxExtensions: {
     src: ['{{ROOT}}/node_modules/mathjax/extensions/**/*'],
     dest: '{{WWW}}/lib/mathjax/extensions'
   },
-  copyMathJaxFonts: {
-    src: ['{{ROOT}}/node_modules/mathjax/fonts/**/*'],
-    dest: '{{WWW}}/lib/mathjax/fonts'
+  copyMathJaxElement: {
+    src: ['{{ROOT}}/node_modules/mathjax/jax/element/**/*'],
+    dest: '{{WWW}}/lib/mathjax/jax/element'
   },
-  copyMathJaxJax: {
-    src: ['{{ROOT}}/node_modules/mathjax/jax/**/*'],
-    dest: '{{WWW}}/lib/mathjax/jax'
+  copyMathJaxInput: {
+    src: ['{{ROOT}}/node_modules/mathjax/jax/input/**/*'],
+    dest: '{{WWW}}/lib/mathjax/jax/input'
+  },
+  copyMathJaxOutput: {
+    src: ['{{ROOT}}/node_modules/mathjax/jax/output/SVG/**/*'],
+    dest: '{{WWW}}/lib/mathjax/jax/output/SVG'
   },
   copyMathJaxLocalization: {
     src: ['{{ROOT}}/node_modules/mathjax/localization/**/*'],
diff --git a/src/addon/filter/mathjaxloader/providers/handler.ts b/src/addon/filter/mathjaxloader/providers/handler.ts
index 72f67ba66..51c9d8d0c 100644
--- a/src/addon/filter/mathjaxloader/providers/handler.ts
+++ b/src/addon/filter/mathjaxloader/providers/handler.ts
@@ -32,12 +32,35 @@ export class AddonFilterMathJaxLoaderHandler extends CoreFilterDefaultHandler {
 
     // Default values for MathJax config for sites where we cannot retrieve it.
     protected DEFAULT_URL = 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/MathJax.js';
-    protected DEFAULT_CONFIG = 'MathJax.Hub.Config({' +
-            'config: ["Accessible.js", "Safe.js"],' +
-            'errorSettings: { message: ["!"] },' +
-            'skipStartupTypeset: true,' +
-            'messageStyle: "none"' +
-        '});';
+    protected DEFAULT_CONFIG = `
+        MathJax.Hub.Config({
+            extensions: [
+                "Safe.js",
+                "tex2jax.js",
+                "mml2jax.js",
+                "MathEvents.js",
+                "MathZoom.js",
+                "MathMenu.js",
+                "toMathML.js",
+                "TeX/noErrors.js",
+                "TeX/noUndefined.js",
+                "TeX/AMSmath.js",
+                "TeX/AMSsymbols.js",
+                "fast-preview.js",
+                "AssistiveMML.js",
+                "[a11y]/accessibility-menu.js"
+            ],
+            jax: ["input/TeX","input/MathML","output/SVG"],
+            menuSettings: {
+                zoom: "Double-Click",
+                mpContext: true,
+                mpMouse: true
+            },
+            errorSettings: { message: ["!"] },
+            skipStartupTypeset: true,
+            messageStyle: "none"
+        });
+    `;
 
     // List of language codes found in the MathJax/localization/ directory.
     protected MATHJAX_LANG_CODES = [

From c94c319225d2fc1b911efaed8c72cc300bf72085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 5 Dec 2019 17:18:44 +0100
Subject: [PATCH 166/257] MOBILE-3201 log: Delete logs if WS call fails

---
 src/addon/mod/data/components/index/index.ts |  2 +-
 src/core/course/providers/log-helper.ts      | 22 ++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/addon/mod/data/components/index/index.ts b/src/addon/mod/data/components/index/index.ts
index ecdd5064e..0b3e22870 100644
--- a/src/addon/mod/data/components/index/index.ts
+++ b/src/addon/mod/data/components/index/index.ts
@@ -124,7 +124,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
         this.selectedGroup = this.group || 0;
 
         this.loadContent(false, true).then(() => {
-            if (!this.data) {
+            if (!this.data || !this.data.id) {
                 return;
             }
 
diff --git a/src/core/course/providers/log-helper.ts b/src/core/course/providers/log-helper.ts
index f2319aad3..8792eab81 100644
--- a/src/core/course/providers/log-helper.ts
+++ b/src/core/course/providers/log-helper.ts
@@ -185,14 +185,17 @@ export class CoreCourseLogHelperProvider {
      */
     protected logOnline(ws: string, data: any, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
-            return site.write(ws, data).then((response) => {
+            // Clone to have an unmodified data object.
+            const wsData = Object.assign({}, data);
+
+            return site.write(ws, wsData).then((response) => {
                 if (!response.status) {
                     return Promise.reject(this.utils.createFakeWSError(''));
                 }
 
                 // Remove all the logs performed.
                 // TODO: Remove this lines when time is accepted in logs.
-                return this.deleteWSLogs(ws, data);
+                return this.deleteWSLogs(ws, data, siteId);
             });
         });
     }
@@ -335,8 +338,19 @@ export class CoreCourseLogHelperProvider {
      */
     protected syncLogs(logs: any[], siteId: string): Promise<any> {
         return Promise.all(logs.map((log) => {
-            return this.logOnline(log.ws, this.textUtils.parseJSON(log.data), siteId).then(() => {
-                return this.deleteWSLogsByComponent(log.component, log.componentid, log.ws);
+            const data = this.textUtils.parseJSON(log.data);
+
+            return this.logOnline(log.ws, data, siteId).catch((error) => {
+                const promise = this.utils.isWebServiceError(error) ? this.deleteWSLogs(log.ws, data, siteId) : Promise.resolve();
+
+                return promise.catch(() => {
+                    // Ignore errors.
+                }).then(() => {
+                    // The WebService has thrown an error, this means that responses cannot be submitted.
+                    return Promise.reject(error);
+                });
+            }).then(() => {
+                return this.deleteWSLogsByComponent(log.component, log.componentid, log.ws, siteId);
             });
         }));
     }

From a9e1ba54694ad2691276bddfb5a1415445e2b7c1 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 5 Dec 2019 17:24:57 +0100
Subject: [PATCH 167/257] MOBILE-3232 filters: Add PreviewHTML mathjax output

---
 config/copy.config.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/copy.config.js b/config/copy.config.js
index 3bf310e37..77007db47 100644
--- a/config/copy.config.js
+++ b/config/copy.config.js
@@ -29,10 +29,14 @@ module.exports = {
     src: ['{{ROOT}}/node_modules/mathjax/jax/input/**/*'],
     dest: '{{WWW}}/lib/mathjax/jax/input'
   },
-  copyMathJaxOutput: {
+  copyMathJaxSVGOutput: {
     src: ['{{ROOT}}/node_modules/mathjax/jax/output/SVG/**/*'],
     dest: '{{WWW}}/lib/mathjax/jax/output/SVG'
   },
+  copyMathJaxPreviewHTMLOutput: {
+    src: ['{{ROOT}}/node_modules/mathjax/jax/output/PreviewHTML/**/*'],
+    dest: '{{WWW}}/lib/mathjax/jax/output/PreviewHTML'
+  },
   copyMathJaxLocalization: {
     src: ['{{ROOT}}/node_modules/mathjax/localization/**/*'],
     dest: '{{WWW}}/lib/mathjax/localization'

From a0611a168d2b6fb17e4a5a3997230389a38dc6a2 Mon Sep 17 00:00:00 2001
From: Mark Johnson <mark.johnson@open.ac.uk>
Date: Mon, 9 Dec 2019 09:28:56 +0000
Subject: [PATCH 168/257] MOBILE-3191 UX: Fix condition for keeping tabs
 visible on short pages

---
 src/components/tabs/tabs.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/tabs/tabs.ts b/src/components/tabs/tabs.ts
index 93e6c5016..578367399 100644
--- a/src/components/tabs/tabs.ts
+++ b/src/components/tabs/tabs.ts
@@ -443,7 +443,7 @@ export class CoreTabsComponent implements OnInit, AfterViewInit, OnChanges, OnDe
             this.calculateSlides();
         }
 
-        if (this.tabsShown && scrollElement.scrollHeight > scrollElement.clientHeight + this.tabBarHeight) {
+        if (this.tabsShown && scrollElement.scrollHeight > scrollElement.clientHeight + (this.tabBarHeight - scroll)) {
             // Smooth translation.
             this.topTabsElement.style.transform = 'translateY(-' + scroll + 'px)';
             this.originalTabsContainer.style.transform = 'translateY(-' + scroll + 'px)';

From b4f563282bfee1b8b0aa299aa4fbeebddacadd25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 9 Dec 2019 11:32:42 +0100
Subject: [PATCH 169/257] MOBILE-3201 libs: Fix sortProperties null object
 error

---
 src/providers/utils/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/providers/utils/utils.ts b/src/providers/utils/utils.ts
index 31834a365..4f71eede7 100644
--- a/src/providers/utils/utils.ts
+++ b/src/providers/utils/utils.ts
@@ -1252,7 +1252,7 @@ export class CoreUtilsProvider {
      * @return Sorted object.
      */
     sortProperties(obj: object): object {
-        if (typeof obj == 'object' && !Array.isArray(obj)) {
+        if (obj != null && typeof obj == 'object' && !Array.isArray(obj)) {
             // It's an object, sort it.
             return Object.keys(obj).sort().reduce((accumulator, key) => {
                 // Always call sort with the value. If it isn't an object, the original value will be returned.

From 07873688723b5bf8c77b035700e5b0acf5e3a548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 5 Dec 2019 16:54:33 +0100
Subject: [PATCH 170/257] MOBILE-3201 wiki: Fix wiki page log

---
 src/addon/mod/wiki/components/index/index.scss |  2 +-
 src/addon/mod/wiki/components/index/index.ts   | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/addon/mod/wiki/components/index/index.scss b/src/addon/mod/wiki/components/index/index.scss
index e7edc2e28..4e4fcb283 100644
--- a/src/addon/mod/wiki/components/index/index.scss
+++ b/src/addon/mod/wiki/components/index/index.scss
@@ -13,7 +13,7 @@ ion-app.app-root addon-mod-wiki-index {
     .addon-mod_wiki-page-content {
         background-color: $white;
         border-top: 1px solid $gray;
-        @include safe-area-padding-horizontal(0px, 0px);
+        @include safe-area-padding-horizontal(10px, 10px);
         @include darkmode() {
             background-color: $black;
         }
diff --git a/src/addon/mod/wiki/components/index/index.ts b/src/addon/mod/wiki/components/index/index.ts
index 5bb22176e..f72447642 100644
--- a/src/addon/mod/wiki/components/index/index.ts
+++ b/src/addon/mod/wiki/components/index/index.ts
@@ -99,14 +99,14 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
                 return;
             }
 
-            if (this.isMainPage) {
+            if (!this.pageId) {
                 this.wikiProvider.logView(this.wiki.id, this.wiki.name).then(() => {
                     this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
                 }).catch((error) => {
                     // Ignore errors.
                 });
             } else {
-                this.wikiProvider.logPageView(this.pageId, this.wiki.id, this.wiki.name).catch(() => {
+                this.wikiProvider.logPageView(this.pageId, this.wiki.id, this.wiki.name).catch((error) => {
                     // Ignore errors.
                 });
             }
@@ -280,9 +280,11 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
                             this.currentPage = data.pageId;
 
                             this.showLoadingAndFetch(true, false).then(() => {
-                                this.wikiProvider.logPageView(this.currentPage, this.wiki.id, this.wiki.name).catch(() => {
-                                    // Ignore errors.
-                                });
+                                if (this.currentPage) {
+                                    this.wikiProvider.logPageView(this.currentPage, this.wiki.id, this.wiki.name).catch(() => {
+                                        // Ignore errors.
+                                    });
+                                }
                             });
 
                             // Stop listening for new page events.

From 82eded5e5f85658dd24d669430154ae2aa7c33dd Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 25 Oct 2019 14:23:03 +0200
Subject: [PATCH 171/257] MOBILE-3095 core: Make easier to support label site
 plugins

---
 .../components/myoverview/myoverview.ts       |  2 +-
 .../components/sitemainmenu/sitemainmenu.ts   |  2 +-
 .../components/module/core-course-module.html |  9 ++-
 src/core/course/components/module/module.scss | 10 +++
 src/core/course/pages/section/section.ts      |  3 +-
 src/core/course/providers/helper.ts           | 12 ++-
 src/core/course/providers/module-delegate.ts  | 16 +++-
 src/core/sitehome/components/index/index.ts   |  3 +-
 src/core/sitehome/components/news/news.ts     |  2 +-
 .../classes/handlers/module-handler.ts        | 77 ++++++++++++++++---
 src/core/siteplugins/providers/helper.ts      |  7 +-
 11 files changed, 113 insertions(+), 30 deletions(-)

diff --git a/src/addon/block/myoverview/components/myoverview/myoverview.ts b/src/addon/block/myoverview/components/myoverview/myoverview.ts
index 76e6b1357..26c82500a 100644
--- a/src/addon/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addon/block/myoverview/components/myoverview/myoverview.ts
@@ -69,7 +69,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
         future: 'show',
         favourite: 'show',
         hidden: 'show',
-        custom: 'hidden', // True or false to show or hide.
+        custom: 'hidden',
     };
     showFilter = false;
     showSelectorFilter = false;
diff --git a/src/addon/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts b/src/addon/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
index 20651772a..968af16b8 100644
--- a/src/addon/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
+++ b/src/addon/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
@@ -82,7 +82,7 @@ export class AddonBlockSiteMainMenuComponent extends CoreBlockBaseComponent impl
 
             if (this.mainMenuBlock) {
                 this.mainMenuBlock.hasContent = this.courseHelper.sectionHasContent(this.mainMenuBlock);
-                this.courseHelper.addHandlerDataForModules([this.mainMenuBlock], this.siteHomeId);
+                this.courseHelper.addHandlerDataForModules([this.mainMenuBlock], this.siteHomeId, undefined, undefined, true);
 
                 // Check if Site Home displays announcements. If so, remove it from the main menu block.
                 const currentSite = this.sitesProvider.getCurrentSite(),
diff --git a/src/core/course/components/module/core-course-module.html b/src/core/course/components/module/core-course-module.html
index 3c57e9abb..39358083f 100644
--- a/src/core/course/components/module/core-course-module.html
+++ b/src/core/course/components/module/core-course-module.html
@@ -1,4 +1,4 @@
-<ion-item *ngIf="module && module.visibleoncoursepage !== 0" text-wrap id="core-course-module-{{module.id}}" class="core-course-module-handler {{module.handlerData.class}}" (click)="moduleClicked($event)" [ngClass]="{'item-media': module.handlerData.icon, 'core-not-clickable': !module.handlerData.action || module.uservisible === false, 'item-dimmed': module.visible === 0 || module.uservisible === false}" [title]="module.handlerData.a11yTitle" detail-none>
+<ion-item *ngIf="module && module.visibleoncoursepage !== 0 && !module.handlerData.loading" text-wrap id="core-course-module-{{module.id}}" class="core-course-module-handler {{module.handlerData.class}}" (click)="moduleClicked($event)" [ngClass]="{'item-media': module.handlerData.icon, 'core-not-clickable': !module.handlerData.action || module.uservisible === false, 'item-dimmed': module.visible === 0 || module.uservisible === false}" [title]="module.handlerData.a11yTitle" detail-none>
 
     <img item-start *ngIf="module.handlerData.icon" [src]="module.handlerData.icon" [alt]="module.modnametranslated" class="core-module-icon">
     <div class="core-module-title">
@@ -32,4 +32,9 @@
         <ion-badge item-end *ngIf="module.completiondata && module.completiondata.offline" color="warning" text-wrap>{{ 'core.course.manualcompletionnotsynced' | translate }}</ion-badge>
     </div>
     <core-format-text class="core-module-description" *ngIf="module.description" maxHeight="80" [text]="module.description" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
-</ion-item>
\ No newline at end of file
+</ion-item>
+
+<!-- Loading. -->
+<ion-item *ngIf="module && module.visibleoncoursepage !== 0 && module.handlerData.loading" role="status" text-wrap id="core-course-module-{{module.id}}" [ngClass]="['core-course-module-handler', 'core-module-loading', module.handlerData.class]" [title]="module.handlerData.a11yTitle" detail-none>
+    <ion-spinner></ion-spinner>
+</ion-item>
diff --git a/src/core/course/components/module/module.scss b/src/core/course/components/module/module.scss
index 739d79166..1f1af0389 100644
--- a/src/core/course/components/module/module.scss
+++ b/src/core/course/components/module/module.scss
@@ -87,6 +87,16 @@ ion-app.app-root core-course-module {
         }
     }
 
+    .core-module-loading {
+        width: 100%;
+        text-align: center;
+        padding-top: 10px;
+        clear: both;
+        @include darkmode() {
+            color: $core-dark-text-color;
+        }
+    }
+
     @include darkmode() {
         .item.core-course-module-handler {
             background: $core-dark-item-bg-color;
diff --git a/src/core/course/pages/section/section.ts b/src/core/course/pages/section/section.ts
index de531d268..7ff78fd7e 100644
--- a/src/core/course/pages/section/section.ts
+++ b/src/core/course/pages/section/section.ts
@@ -259,7 +259,8 @@ export class CoreCourseSectionPage implements OnDestroy {
                 }
 
                 return promise.then((completionStatus) => {
-                    this.courseHelper.addHandlerDataForModules(sections, this.course.id, completionStatus, this.course.fullname);
+                    this.courseHelper.addHandlerDataForModules(sections, this.course.id, completionStatus, this.course.fullname,
+                            true);
 
                     // Format the name of each section and check if it has content.
                     this.sections = sections.map((section) => {
diff --git a/src/core/course/providers/helper.ts b/src/core/course/providers/helper.ts
index 324c4a29a..82b9d03d6 100644
--- a/src/core/course/providers/helper.ts
+++ b/src/core/course/providers/helper.ts
@@ -143,9 +143,12 @@ export class CoreCourseHelperProvider {
      * @param courseId Course ID of the modules.
      * @param completionStatus List of completion status.
      * @param courseName Course name. Recommended if completionStatus is supplied.
+     * @param forCoursePage Whether the data will be used to render the course page.
      * @return Whether the sections have content.
      */
-    addHandlerDataForModules(sections: any[], courseId: number, completionStatus?: any, courseName?: string): boolean {
+    addHandlerDataForModules(sections: any[], courseId: number, completionStatus?: any, courseName?: string,
+            forCoursePage?: boolean): boolean {
+
         let hasContent = false;
 
         sections.forEach((section) => {
@@ -156,7 +159,8 @@ export class CoreCourseHelperProvider {
             hasContent = true;
 
             section.modules.forEach((module) => {
-                module.handlerData = this.moduleDelegate.getModuleDataFor(module.modname, module, courseId, section.id);
+                module.handlerData = this.moduleDelegate.getModuleDataFor(module.modname, module, courseId, section.id,
+                        forCoursePage);
 
                 if (module.completiondata && module.completion > 0) {
                     module.completiondata.courseId = courseId;
@@ -1197,7 +1201,7 @@ export class CoreCourseHelperProvider {
             // Get the module.
             return this.courseProvider.getModule(moduleId, courseId, sectionId, false, false, siteId, modName);
         }).then((module) => {
-            module.handlerData = this.moduleDelegate.getModuleDataFor(module.modname, module, courseId, sectionId);
+            module.handlerData = this.moduleDelegate.getModuleDataFor(module.modname, module, courseId, sectionId, false);
 
             if (navCtrl && module.handlerData && module.handlerData.action) {
                 // If the link handler for this module passed through navCtrl, we can use the module's handler to navigate cleanly.
@@ -1246,7 +1250,7 @@ export class CoreCourseHelperProvider {
      */
     openModule(navCtrl: NavController, module: any, courseId: number, sectionId?: number, modParams?: any): boolean {
         if (!module.handlerData) {
-            module.handlerData = this.moduleDelegate.getModuleDataFor(module.modname, module, courseId, sectionId);
+            module.handlerData = this.moduleDelegate.getModuleDataFor(module.modname, module, courseId, sectionId, false);
         }
 
         if (module.handlerData && module.handlerData.action) {
diff --git a/src/core/course/providers/module-delegate.ts b/src/core/course/providers/module-delegate.ts
index aedcbdfbb..4b21284e7 100644
--- a/src/core/course/providers/module-delegate.ts
+++ b/src/core/course/providers/module-delegate.ts
@@ -45,9 +45,10 @@ export interface CoreCourseModuleHandler extends CoreDelegateHandler {
      * @param module The module object.
      * @param courseId The course ID.
      * @param sectionId The section ID.
+     * @param forCoursePage Whether the data will be used to render the course page.
      * @return Data to render the module.
      */
-    getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData;
+    getData(module: any, courseId: number, sectionId: number, forCoursePage: boolean): CoreCourseModuleHandlerData;
 
     /**
      * Get the component to render the module. This is needed to support singleactivity course format.
@@ -133,10 +134,15 @@ export interface CoreCourseModuleHandlerData {
     buttons?: CoreCourseModuleHandlerButton[];
 
     /**
-     * Whether to display a spinner in the module item.
+     * Whether to display a spinner where the download button is displayed. The module icon, title, etc. will be displayed.
      */
     spinner?: boolean;
 
+    /**
+     * Whether the data is being loaded. If true, it will display a spinner in the whole module, nothing else will be shown.
+     */
+    loading?: boolean;
+
     /**
      * Action to perform when the module is clicked.
      *
@@ -251,10 +257,12 @@ export class CoreCourseModuleDelegate extends CoreDelegate {
      * @param module The module object.
      * @param courseId The course ID.
      * @param sectionId The section ID.
+     * @param forCoursePage Whether the data will be used to render the course page.
      * @return Data to render the module.
      */
-    getModuleDataFor(modname: string, module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
-        return this.executeFunctionOnEnabled(modname, 'getData', [module, courseId, sectionId]);
+    getModuleDataFor(modname: string, module: any, courseId: number, sectionId: number, forCoursePage?: boolean)
+            : CoreCourseModuleHandlerData {
+        return this.executeFunctionOnEnabled(modname, 'getData', [module, courseId, sectionId, forCoursePage]);
     }
 
     /**
diff --git a/src/core/sitehome/components/index/index.ts b/src/core/sitehome/components/index/index.ts
index 524743108..372c4a47a 100644
--- a/src/core/sitehome/components/index/index.ts
+++ b/src/core/sitehome/components/index/index.ts
@@ -134,7 +134,8 @@ export class CoreSiteHomeIndexComponent implements OnInit {
             this.section = config.numsections ? sections.find((section) => section.section == 1) : false;
             if (this.section) {
                 this.section.hasContent = this.courseHelper.sectionHasContent(this.section);
-                this.hasContent = this.courseHelper.addHandlerDataForModules([this.section], this.siteHomeId) || this.hasContent;
+                this.hasContent = this.courseHelper.addHandlerDataForModules([this.section], this.siteHomeId, undefined,
+                        undefined, true) || this.hasContent;
             }
 
             // Add log in Moodle.
diff --git a/src/core/sitehome/components/news/news.ts b/src/core/sitehome/components/news/news.ts
index 3bd648dbe..ce8f55f97 100644
--- a/src/core/sitehome/components/news/news.ts
+++ b/src/core/sitehome/components/news/news.ts
@@ -53,7 +53,7 @@ export class CoreSiteHomeNewsComponent implements OnInit {
             return this.courseProvider.getModuleBasicInfo(forum.cmid).then((module) => {
                 this.show = true;
                 this.module = module;
-                module.handlerData = this.moduleDelegate.getModuleDataFor(module.modname, module, siteHomeId, module.section);
+                module.handlerData = this.moduleDelegate.getModuleDataFor(module.modname, module, siteHomeId, module.section, true);
             });
         }).catch(() => {
             // Ignore errors.
diff --git a/src/core/siteplugins/classes/handlers/module-handler.ts b/src/core/siteplugins/classes/handlers/module-handler.ts
index 00466c2f9..41b4ba052 100644
--- a/src/core/siteplugins/classes/handlers/module-handler.ts
+++ b/src/core/siteplugins/classes/handlers/module-handler.ts
@@ -14,9 +14,11 @@
 
 import { Injector } from '@angular/core';
 import { NavController, NavOptions } from 'ionic-angular';
+import { CoreLoggerProvider } from '@providers/logger';
 import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@core/course/providers/module-delegate';
 import { CoreSitePluginsBaseHandler } from './base-handler';
 import { CoreSitePluginsModuleIndexComponent } from '../../components/module-index/module-index';
+import { CoreSitePluginsProvider } from '../../providers/siteplugins';
 
 /**
  * Handler to support a module using a site plugin.
@@ -26,9 +28,18 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
     supportedFeatures: {[name: string]: any};
     supportsFeature: (feature: string) => any;
 
-    constructor(name: string, public modName: string, protected handlerSchema: any, protected initResult: any) {
+    protected logger: any;
+
+    constructor(name: string,
+            public modName: string,
+            protected plugin: any,
+            protected handlerSchema: any,
+            protected initResult: any,
+            protected sitePluginsProvider: CoreSitePluginsProvider,
+            loggerProvider: CoreLoggerProvider) {
         super(name);
 
+        this.logger = loggerProvider.getInstance('CoreSitePluginsModuleHandler');
         this.supportedFeatures = handlerSchema.supportedfeatures;
 
         if (initResult && initResult.jsResult && initResult.jsResult.supportsFeature) {
@@ -43,18 +54,38 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
      * @param module The module object.
      * @param courseId The course ID.
      * @param sectionId The section ID.
+     * @param forCoursePage Whether the data will be used to render the course page.
      * @return Data to render the module.
      */
-    getData(module: any, courseId: number, sectionId: number): CoreCourseModuleHandlerData {
-        const hasOffline = !!(this.handlerSchema.offlinefunctions && Object.keys(this.handlerSchema.offlinefunctions).length),
-            showDowloadButton = this.handlerSchema.downloadbutton;
+    getData(module: any, courseId: number, sectionId: number, forCoursePage: boolean): CoreCourseModuleHandlerData {
+        const callMethod = forCoursePage && this.handlerSchema.coursepagemethod;
 
-        return {
-            title: module.name,
-            icon: this.handlerSchema.displaydata.icon,
-            class: this.handlerSchema.displaydata.class,
-            showDownloadButton: typeof showDowloadButton != 'undefined' ? showDowloadButton : hasOffline,
-            action: (event: Event, navCtrl: NavController, module: any, courseId: number, options: NavOptions): void => {
+        if (module.noviewlink && !callMethod) {
+            // The module doesn't link to a new page (similar to label). Only display the description.
+            const title = module.description;
+            module.description = '';
+
+            return {
+                icon: this.handlerSchema.displaydata.icon,
+                title: title,
+                a11yTitle: '',
+                class: this.handlerSchema.displaydata.class
+            };
+        }
+
+        const hasOffline = !!(this.handlerSchema.offlinefunctions && Object.keys(this.handlerSchema.offlinefunctions).length),
+            showDowloadButton = this.handlerSchema.downloadbutton,
+            handlerData: CoreCourseModuleHandlerData = {
+                title: module.name,
+                icon: this.handlerSchema.displaydata.icon,
+                class: this.handlerSchema.displaydata.class,
+                showDownloadButton: typeof showDowloadButton != 'undefined' ? showDowloadButton : hasOffline,
+            };
+
+        if (this.handlerSchema.method) {
+            // There is a method, add an action.
+            handlerData.action = (event: Event, navCtrl: NavController, module: any, courseId: number, options: NavOptions)
+                    : void => {
                 event.preventDefault();
                 event.stopPropagation();
 
@@ -63,8 +94,30 @@ export class CoreSitePluginsModuleHandler extends CoreSitePluginsBaseHandler imp
                     module: module,
                     courseId: courseId
                 }, options);
-            }
-        };
+            };
+        }
+
+        if (callMethod && module.visibleoncoursepage !== 0) {
+            // Call the method to get the course page template.
+            handlerData.loading = true;
+
+            const args = {
+                    courseid: courseId,
+                    cmid: module.id
+                };
+
+            this.sitePluginsProvider.getContent(this.plugin.component, this.handlerSchema.coursepagemethod, args).then((result) => {
+                // Use the html returned.
+                handlerData.title = result.templates && result.templates[0] ? result.templates[0].html : '';
+                module.description = '';
+            }).catch((error) => {
+                this.logger.error('Error calling course page method:', error);
+            }).finally(() => {
+                handlerData.loading = false;
+            });
+        }
+
+        return handlerData;
     }
 
     /**
diff --git a/src/core/siteplugins/providers/helper.ts b/src/core/siteplugins/providers/helper.ts
index d80bfe84b..3ec5d444f 100644
--- a/src/core/siteplugins/providers/helper.ts
+++ b/src/core/siteplugins/providers/helper.ts
@@ -85,7 +85,7 @@ export class CoreSitePluginsHelperProvider {
     protected logger;
     protected courseRestrictHandlers = {};
 
-    constructor(logger: CoreLoggerProvider,
+    constructor(protected loggerProvider: CoreLoggerProvider,
             private sitesProvider: CoreSitesProvider,
             private domUtils: CoreDomUtilsProvider,
             private mainMenuDelegate: CoreMainMenuDelegate,
@@ -119,7 +119,7 @@ export class CoreSitePluginsHelperProvider {
             private blockDelegate: CoreBlockDelegate,
             private filterHelper: CoreFilterHelperProvider) {
 
-        this.logger = logger.getInstance('CoreSitePluginsHelperProvider');
+        this.logger = loggerProvider.getInstance('CoreSitePluginsHelperProvider');
 
         // Fetch the plugins on login.
         eventsProvider.on(CoreEventsProvider.LOGIN, (data) => {
@@ -834,7 +834,8 @@ export class CoreSitePluginsHelperProvider {
         const uniqueName = this.sitePluginsProvider.getHandlerUniqueName(plugin, handlerName),
             modName = (handlerSchema.moodlecomponent || plugin.component).replace('mod_', '');
 
-        this.moduleDelegate.registerHandler(new CoreSitePluginsModuleHandler(uniqueName, modName, handlerSchema, initResult));
+        this.moduleDelegate.registerHandler(new CoreSitePluginsModuleHandler(uniqueName, modName, plugin, handlerSchema,
+                initResult, this.sitePluginsProvider, this.loggerProvider));
 
         if (handlerSchema.offlinefunctions && Object.keys(handlerSchema.offlinefunctions).length) {
             // Register the prefetch handler.

From 0efa423bf6dc9c9ce498ef50a9ef05d7d217ee10 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 9 Dec 2019 10:24:22 +0100
Subject: [PATCH 172/257] MOBILE-3233 course: Implement prefetch handlers for
 URL and LTI

These prefetch handlers won't download anything, but they will be used to invalidate data when the user performs a PTR in the course page.
---
 src/addon/mod/lti/lti.module.ts               | 16 +++-
 .../mod/lti/providers/prefetch-handler.ts     | 96 +++++++++++++++++++
 .../mod/url/providers/prefetch-handler.ts     | 95 ++++++++++++++++++
 src/addon/mod/url/url.module.ts               | 16 +++-
 4 files changed, 215 insertions(+), 8 deletions(-)
 create mode 100644 src/addon/mod/lti/providers/prefetch-handler.ts
 create mode 100644 src/addon/mod/url/providers/prefetch-handler.ts

diff --git a/src/addon/mod/lti/lti.module.ts b/src/addon/mod/lti/lti.module.ts
index 08d670c13..4e2c83878 100644
--- a/src/addon/mod/lti/lti.module.ts
+++ b/src/addon/mod/lti/lti.module.ts
@@ -18,8 +18,10 @@ import { AddonModLtiModuleHandler } from './providers/module-handler';
 import { AddonModLtiProvider } from './providers/lti';
 import { AddonModLtiLinkHandler } from './providers/link-handler';
 import { AddonModLtiListLinkHandler } from './providers/list-link-handler';
+import { AddonModLtiPrefetchHandler } from './providers/prefetch-handler';
 import { CoreContentLinksDelegate } from '@core/contentlinks/providers/delegate';
 import { CoreCourseModuleDelegate } from '@core/course/providers/module-delegate';
+import { CoreCourseModulePrefetchDelegate } from '@core/course/providers/module-prefetch-delegate';
 
 // List of providers (without handlers).
 export const ADDON_MOD_LTI_PROVIDERS: any[] = [
@@ -36,16 +38,22 @@ export const ADDON_MOD_LTI_PROVIDERS: any[] = [
         AddonModLtiProvider,
         AddonModLtiModuleHandler,
         AddonModLtiLinkHandler,
-        AddonModLtiListLinkHandler
+        AddonModLtiListLinkHandler,
+        AddonModLtiPrefetchHandler
     ]
 })
 export class AddonModLtiModule {
-    constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModLtiModuleHandler,
-            contentLinksDelegate: CoreContentLinksDelegate, linkHandler: AddonModLtiLinkHandler,
-            listLinkHandler: AddonModLtiListLinkHandler) {
+    constructor(moduleDelegate: CoreCourseModuleDelegate,
+            moduleHandler: AddonModLtiModuleHandler,
+            contentLinksDelegate: CoreContentLinksDelegate,
+            linkHandler: AddonModLtiLinkHandler,
+            listLinkHandler: AddonModLtiListLinkHandler,
+            prefetchDelegate: CoreCourseModulePrefetchDelegate,
+            prefetchHandler: AddonModLtiPrefetchHandler) {
 
         moduleDelegate.registerHandler(moduleHandler);
         contentLinksDelegate.registerHandler(linkHandler);
         contentLinksDelegate.registerHandler(listLinkHandler);
+        prefetchDelegate.registerHandler(prefetchHandler);
     }
 }
diff --git a/src/addon/mod/lti/providers/prefetch-handler.ts b/src/addon/mod/lti/providers/prefetch-handler.ts
new file mode 100644
index 000000000..14d3c2584
--- /dev/null
+++ b/src/addon/mod/lti/providers/prefetch-handler.ts
@@ -0,0 +1,96 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import { CoreAppProvider } from '@providers/app';
+import { CoreFilepoolProvider } from '@providers/filepool';
+import { CoreSitesProvider } from '@providers/sites';
+import { CoreDomUtilsProvider } from '@providers/utils/dom';
+import { CoreUtilsProvider } from '@providers/utils/utils';
+import { CoreCourseProvider } from '@core/course/providers/course';
+import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/activity-prefetch-handler';
+import { AddonModLtiProvider } from './lti';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+
+/**
+ * Handler to prefetch LTIs. LTIs cannot be prefetched, but the handler will be used to invalidate some data on course PTR.
+ */
+@Injectable()
+export class AddonModLtiPrefetchHandler extends CoreCourseActivityPrefetchHandlerBase {
+    name = 'AddonModLti';
+    modName = 'lti';
+    component = AddonModLtiProvider.COMPONENT;
+
+    constructor(translate: TranslateService,
+            appProvider: CoreAppProvider,
+            utils: CoreUtilsProvider,
+            courseProvider: CoreCourseProvider,
+            filepoolProvider: CoreFilepoolProvider,
+            sitesProvider: CoreSitesProvider,
+            domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider,
+            protected ltiProvider: AddonModLtiProvider) {
+
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+    }
+
+    /**
+     * Download the module.
+     *
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when all content is downloaded.
+     */
+    download(module: any, courseId: number, dirPath?: string): Promise<any> {
+        return Promise.resolve();
+    }
+
+    /**
+     * Invalidate WS calls needed to determine module status (usually, to check if module is downloadable).
+     * It doesn't need to invalidate check updates. It should NOT invalidate files nor all the prefetched data.
+     *
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when invalidated.
+     */
+    invalidateModule(module: any, courseId: number): Promise<any> {
+        return this.ltiProvider.invalidateLti(courseId);
+    }
+
+    /**
+     * Check if a module can be downloaded.
+     *
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Whether the module can be downloaded. The promise should never be rejected.
+     */
+    isDownloadable(module: any, courseId: number): boolean | Promise<boolean> {
+        return false; // LTIs aren't downloadable.
+    }
+
+    /**
+     * Prefetch a module.
+     *
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
+     */
+    prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string): Promise<any> {
+        return Promise.resolve();
+    }
+}
diff --git a/src/addon/mod/url/providers/prefetch-handler.ts b/src/addon/mod/url/providers/prefetch-handler.ts
new file mode 100644
index 000000000..f904fc429
--- /dev/null
+++ b/src/addon/mod/url/providers/prefetch-handler.ts
@@ -0,0 +1,95 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import { CoreAppProvider } from '@providers/app';
+import { CoreFilepoolProvider } from '@providers/filepool';
+import { CoreSitesProvider } from '@providers/sites';
+import { CoreDomUtilsProvider } from '@providers/utils/dom';
+import { CoreUtilsProvider } from '@providers/utils/utils';
+import { CoreCourseProvider } from '@core/course/providers/course';
+import { CoreCourseResourcePrefetchHandlerBase } from '@core/course/classes/resource-prefetch-handler';
+import { AddonModUrlProvider } from './url';
+import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+
+/**
+ * Handler to prefetch URLs. URLs cannot be prefetched, but the handler will be used to invalidate some data on course PTR.
+ */
+@Injectable()
+export class AddonModUrlPrefetchHandler extends CoreCourseResourcePrefetchHandlerBase {
+    name = 'AddonModUrl';
+    modName = 'url';
+    component = AddonModUrlProvider.COMPONENT;
+
+    constructor(translate: TranslateService,
+            appProvider: CoreAppProvider,
+            utils: CoreUtilsProvider,
+            courseProvider: CoreCourseProvider,
+            filepoolProvider: CoreFilepoolProvider,
+            sitesProvider: CoreSitesProvider,
+            domUtils: CoreDomUtilsProvider,
+            filterHelper: CoreFilterHelperProvider) {
+
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+    }
+
+    /**
+     * Download the module.
+     *
+     * @param module The module object returned by WS.
+     * @param courseId Course ID.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when all content is downloaded.
+     */
+    download(module: any, courseId: number, dirPath?: string): Promise<any> {
+        return Promise.resolve();
+    }
+
+    /**
+     * Invalidate WS calls needed to determine module status (usually, to check if module is downloadable).
+     * It doesn't need to invalidate check updates. It should NOT invalidate files nor all the prefetched data.
+     *
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Promise resolved when invalidated.
+     */
+    invalidateModule(module: any, courseId: number): Promise<any> {
+        return this.courseProvider.invalidateModule(module.id, undefined, this.modName);
+    }
+
+    /**
+     * Check if a module can be downloaded.
+     *
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @return Whether the module can be downloaded. The promise should never be rejected.
+     */
+    isDownloadable(module: any, courseId: number): boolean | Promise<boolean> {
+        return false; // URLs aren't downloadable.
+    }
+
+    /**
+     * Prefetch a module.
+     *
+     * @param module Module.
+     * @param courseId Course ID the module belongs to.
+     * @param single True if we're downloading a single module, false if we're downloading a whole section.
+     * @param dirPath Path of the directory where to store all the content files.
+     * @return Promise resolved when done.
+     */
+    prefetch(module: any, courseId?: number, single?: boolean, dirPath?: string): Promise<any> {
+        return Promise.resolve();
+    }
+}
diff --git a/src/addon/mod/url/url.module.ts b/src/addon/mod/url/url.module.ts
index 1e9c7231b..1066155af 100644
--- a/src/addon/mod/url/url.module.ts
+++ b/src/addon/mod/url/url.module.ts
@@ -18,9 +18,11 @@ import { AddonModUrlModuleHandler } from './providers/module-handler';
 import { AddonModUrlProvider } from './providers/url';
 import { AddonModUrlLinkHandler } from './providers/link-handler';
 import { AddonModUrlListLinkHandler } from './providers/list-link-handler';
+import { AddonModUrlPrefetchHandler } from './providers/prefetch-handler';
 import { AddonModUrlHelperProvider } from './providers/helper';
 import { CoreContentLinksDelegate } from '@core/contentlinks/providers/delegate';
 import { CoreCourseModuleDelegate } from '@core/course/providers/module-delegate';
+import { CoreCourseModulePrefetchDelegate } from '@core/course/providers/module-prefetch-delegate';
 
 // List of providers (without handlers).
 export const ADDON_MOD_URL_PROVIDERS: any[] = [
@@ -39,16 +41,22 @@ export const ADDON_MOD_URL_PROVIDERS: any[] = [
         AddonModUrlHelperProvider,
         AddonModUrlModuleHandler,
         AddonModUrlLinkHandler,
-        AddonModUrlListLinkHandler
+        AddonModUrlListLinkHandler,
+        AddonModUrlPrefetchHandler
     ]
 })
 export class AddonModUrlModule {
-    constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModUrlModuleHandler,
-            contentLinksDelegate: CoreContentLinksDelegate, linkHandler: AddonModUrlLinkHandler,
-            listLinkHandler: AddonModUrlListLinkHandler) {
+    constructor(moduleDelegate: CoreCourseModuleDelegate,
+            moduleHandler: AddonModUrlModuleHandler,
+            contentLinksDelegate: CoreContentLinksDelegate,
+            linkHandler: AddonModUrlLinkHandler,
+            listLinkHandler: AddonModUrlListLinkHandler,
+            prefetchDelegate: CoreCourseModulePrefetchDelegate,
+            prefetchHandler: AddonModUrlPrefetchHandler) {
 
         moduleDelegate.registerHandler(moduleHandler);
         contentLinksDelegate.registerHandler(linkHandler);
         contentLinksDelegate.registerHandler(listLinkHandler);
+        prefetchDelegate.registerHandler(prefetchHandler);
     }
 }

From 4db28cfb0099749e7939b99969cd9504ae533280 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 9 Dec 2019 10:55:28 +0100
Subject: [PATCH 173/257] MOBILE-3233 url: Fix URL not udpated when PTR in URL
 index

---
 src/addon/mod/url/components/index/index.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/addon/mod/url/components/index/index.ts b/src/addon/mod/url/components/index/index.ts
index 1bb02097b..b9381aae0 100644
--- a/src/addon/mod/url/components/index/index.ts
+++ b/src/addon/mod/url/components/index/index.ts
@@ -120,10 +120,8 @@ export class AddonModUrlIndexComponent extends CoreCourseModuleMainResourceCompo
             } else {
                 mod = this.module;
 
-                if (!mod.contents || !mod.contents.length) {
-                    // Try to load module contents, it's needed to get the URL with parameters.
-                    return this.courseProvider.loadModuleContents(mod, this.courseId, undefined, false, false, undefined, 'url');
-                }
+                // Try to load module contents, it's needed to get the URL with parameters.
+                return this.courseProvider.loadModuleContents(mod, this.courseId, undefined, false, refresh, undefined, 'url');
             }
         }).then(() => {
             // Always use the URL from the module because it already includes the parameters.

From 5e2e1d1a241eff30e5026044641d40a45afb0e56 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 28 Oct 2019 15:09:13 +0100
Subject: [PATCH 174/257] MOBILE-2235 h5p: Add h5p extension to list of
 extensions

---
 src/assets/exttomime.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/assets/exttomime.json b/src/assets/exttomime.json
index 445a11777..bab000445 100644
--- a/src/assets/exttomime.json
+++ b/src/assets/exttomime.json
@@ -359,6 +359,7 @@
 "h261": {"type":"video/h261"},
 "h263": {"type":"video/h263"},
 "h264": {"type":"video/h264"},
+"h5p": {"type":"application/zip","icon":"archive","string":"archive","groups":["archive"]},
 "hal": {"type":"application/vnd.hal+xml"},
 "hbci": {"type":"application/vnd.hbci"},
 "hdf": {"type":"application/x-hdf"},

From 690544afbf61106e3d9be63299da651c68f218f3 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 29 Oct 2019 16:07:22 +0100
Subject: [PATCH 175/257] MOBILE-2235 h5p: Show placeholder instead of H5P
 directly

---
 .../filter/displayh5p/displayh5p.module.ts    | 34 +++++++
 .../filter/displayh5p/providers/handler.ts    | 93 +++++++++++++++++++
 src/addon/filter/filter.module.ts             |  2 +
 .../filter/mathjaxloader/providers/handler.ts |  7 +-
 .../filter/mediaplugin/providers/handler.ts   |  9 +-
 src/app/app.module.ts                         |  2 +
 src/assets/img/icons/h5p.svg                  | 14 +++
 src/assets/lang/en.json                       |  1 +
 src/core/filter/providers/default-filter.ts   |  7 +-
 src/core/filter/providers/delegate.ts         | 14 +--
 src/core/h5p/components/components.module.ts  | 43 +++++++++
 .../h5p-player/core-h5p-player.html           |  9 ++
 .../h5p/components/h5p-player/h5p-player.scss | 24 +++++
 .../h5p/components/h5p-player/h5p-player.ts   | 56 +++++++++++
 src/core/h5p/h5p.module.ts                    | 27 ++++++
 src/core/h5p/lang/en.json                     |  3 +
 src/directives/format-text.ts                 | 10 +-
 src/providers/utils/text.ts                   |  5 +-
 src/theme/variables.scss                      |  3 +
 19 files changed, 341 insertions(+), 22 deletions(-)
 create mode 100644 src/addon/filter/displayh5p/displayh5p.module.ts
 create mode 100644 src/addon/filter/displayh5p/providers/handler.ts
 create mode 100644 src/assets/img/icons/h5p.svg
 create mode 100644 src/core/h5p/components/components.module.ts
 create mode 100644 src/core/h5p/components/h5p-player/core-h5p-player.html
 create mode 100644 src/core/h5p/components/h5p-player/h5p-player.scss
 create mode 100644 src/core/h5p/components/h5p-player/h5p-player.ts
 create mode 100644 src/core/h5p/h5p.module.ts
 create mode 100644 src/core/h5p/lang/en.json

diff --git a/src/addon/filter/displayh5p/displayh5p.module.ts b/src/addon/filter/displayh5p/displayh5p.module.ts
new file mode 100644
index 000000000..8a7197c71
--- /dev/null
+++ b/src/addon/filter/displayh5p/displayh5p.module.ts
@@ -0,0 +1,34 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { IonicModule } from 'ionic-angular';
+import { CoreFilterDelegate } from '@core/filter/providers/delegate';
+import { AddonFilterDisplayH5PHandler } from './providers/handler';
+
+@NgModule({
+    declarations: [
+    ],
+    imports: [
+        IonicModule
+    ],
+    providers: [
+        AddonFilterDisplayH5PHandler
+    ]
+})
+export class AddonFilterDisplayH5PModule {
+    constructor(filterDelegate: CoreFilterDelegate, handler: AddonFilterDisplayH5PHandler) {
+        filterDelegate.registerHandler(handler);
+    }
+}
diff --git a/src/addon/filter/displayh5p/providers/handler.ts b/src/addon/filter/displayh5p/providers/handler.ts
new file mode 100644
index 000000000..3956d3299
--- /dev/null
+++ b/src/addon/filter/displayh5p/providers/handler.ts
@@ -0,0 +1,93 @@
+
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable, ViewContainerRef, ComponentFactoryResolver } from '@angular/core';
+import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
+import { CoreFilterFilter, CoreFilterFormatTextOptions } from '@core/filter/providers/filter';
+import { CoreH5PPlayerComponent } from '@core/h5p/components/h5p-player/h5p-player';
+
+/**
+ * Handler to support the Display H5P filter.
+ */
+@Injectable()
+export class AddonFilterDisplayH5PHandler extends CoreFilterDefaultHandler {
+    name = 'AddonFilterDisplayH5PHandler';
+    filterName = 'displayh5p';
+
+    protected template = document.createElement('template'); // A template element to convert HTML to element.
+
+    constructor(protected factoryResolver: ComponentFactoryResolver) {
+        super();
+    }
+
+    /**
+     * Filter some text.
+     *
+     * @param text The text to filter.
+     * @param filter The filter.
+     * @param options Options passed to the filters.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Filtered text (or promise resolved with the filtered text).
+     */
+    filter(text: string, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions, siteId?: string)
+            : string | Promise<string> {
+
+        this.template.innerHTML = text;
+
+        const h5pIframes = <HTMLIFrameElement[]> Array.from(this.template.content.querySelectorAll('iframe.h5p-iframe'));
+
+        // Replace all iframes with an empty div that will be treated in handleHtml.
+        h5pIframes.forEach((iframe) => {
+            const placeholder = document.createElement('div');
+
+            placeholder.classList.add('core-h5p-tmp-placeholder');
+            placeholder.setAttribute('data-player-src', iframe.src);
+
+            iframe.parentElement.replaceChild(placeholder, iframe);
+        });
+
+        return this.template.innerHTML;
+    }
+
+    /**
+     * Handle HTML. This function is called after "filter", and it will receive an HTMLElement containing the text that was
+     * filtered.
+     *
+     * @param container The HTML container to handle.
+     * @param filter The filter.
+     * @param options Options passed to the filters.
+     * @param viewContainerRef The ViewContainerRef where the container is.
+     * @param siteId Site ID. If not defined, current site.
+     * @return If async, promise resolved when done.
+     */
+    handleHtml(container: HTMLElement, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions,
+            viewContainerRef: ViewContainerRef, siteId?: string): void | Promise<void> {
+
+        const placeholders = <HTMLElement[]> Array.from(container.querySelectorAll('div.core-h5p-tmp-placeholder'));
+
+        placeholders.forEach((placeholder) => {
+            const url = placeholder.getAttribute('data-player-src');
+
+            // Create the component to display the player.
+            const factory = this.factoryResolver.resolveComponentFactory(CoreH5PPlayerComponent),
+                componentRef = viewContainerRef.createComponent(factory);
+
+            componentRef.instance.src = url;
+
+            // Move the component to its right position.
+            placeholder.parentElement.replaceChild(componentRef.instance.elementRef.nativeElement, placeholder);
+        });
+    }
+}
diff --git a/src/addon/filter/filter.module.ts b/src/addon/filter/filter.module.ts
index 57e177598..29ab01243 100644
--- a/src/addon/filter/filter.module.ts
+++ b/src/addon/filter/filter.module.ts
@@ -17,6 +17,7 @@ import { AddonFilterActivityNamesModule } from './activitynames/activitynames.mo
 import { AddonFilterAlgebraModule } from './algebra/algebra.module';
 import { AddonFilterCensorModule } from './censor/censor.module';
 import { AddonFilterDataModule } from './data/data.module';
+import { AddonFilterDisplayH5PModule } from './displayh5p/displayh5p.module';
 import { AddonFilterEmailProtectModule } from './emailprotect/emailprotect.module';
 import { AddonFilterEmoticonModule } from './emoticon/emoticon.module';
 import { AddonFilterGlossaryModule } from './glossary/glossary.module';
@@ -34,6 +35,7 @@ import { AddonFilterUrlToLinkModule } from './urltolink/urltolink.module';
         AddonFilterAlgebraModule,
         AddonFilterCensorModule,
         AddonFilterDataModule,
+        AddonFilterDisplayH5PModule,
         AddonFilterEmailProtectModule,
         AddonFilterEmoticonModule,
         AddonFilterGlossaryModule,
diff --git a/src/addon/filter/mathjaxloader/providers/handler.ts b/src/addon/filter/mathjaxloader/providers/handler.ts
index 51c9d8d0c..e1d514e05 100644
--- a/src/addon/filter/mathjaxloader/providers/handler.ts
+++ b/src/addon/filter/mathjaxloader/providers/handler.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Injectable } from '@angular/core';
+import { Injectable, ViewContainerRef } from '@angular/core';
 import { CoreFilterDefaultHandler } from '@core/filter/providers/default-filter';
 import { CoreFilterFilter, CoreFilterFormatTextOptions } from '@core/filter/providers/filter';
 import { CoreEventsProvider } from '@providers/events';
@@ -161,11 +161,12 @@ export class AddonFilterMathJaxLoaderHandler extends CoreFilterDefaultHandler {
      * @param container The HTML container to handle.
      * @param filter The filter.
      * @param options Options passed to the filters.
+     * @param viewContainerRef The ViewContainerRef where the container is.
      * @param siteId Site ID. If not defined, current site.
      * @return If async, promise resolved when done.
      */
-    handleHtml(container: HTMLElement, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions, siteId?: string)
-            : void | Promise<void> {
+    handleHtml(container: HTMLElement, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions,
+            viewContainerRef: ViewContainerRef, siteId?: string): void | Promise<void> {
 
         return this.waitForReady().then(() => {
             this.window.M.filter_mathjaxloader.typeset(container);
diff --git a/src/addon/filter/mediaplugin/providers/handler.ts b/src/addon/filter/mediaplugin/providers/handler.ts
index bc8b5ce03..e1c5a93fc 100644
--- a/src/addon/filter/mediaplugin/providers/handler.ts
+++ b/src/addon/filter/mediaplugin/providers/handler.ts
@@ -27,6 +27,8 @@ export class AddonFilterMediaPluginHandler extends CoreFilterDefaultHandler {
     name = 'AddonFilterMediaPluginHandler';
     filterName = 'mediaplugin';
 
+    protected template = document.createElement('template'); // A template element to convert HTML to element.
+
     constructor(private textUtils: CoreTextUtilsProvider,
             private urlUtils: CoreUrlUtilsProvider) {
         super();
@@ -44,16 +46,15 @@ export class AddonFilterMediaPluginHandler extends CoreFilterDefaultHandler {
     filter(text: string, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions, siteId?: string)
             : string | Promise<string> {
 
-        const div = document.createElement('div');
-        div.innerHTML = text;
+        this.template.innerHTML = text;
 
-        const videos = Array.from(div.querySelectorAll('video'));
+        const videos = Array.from(this.template.content.querySelectorAll('video'));
 
         videos.forEach((video) => {
             this.treatVideoFilters(video);
         });
 
-        return div.innerHTML;
+        return this.template.innerHTML;
     }
 
     /**
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 6f9966fa8..f28974676 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -83,6 +83,7 @@ import { CoreBlockModule } from '@core/block/block.module';
 import { CoreRatingModule } from '@core/rating/rating.module';
 import { CoreTagModule } from '@core/tag/tag.module';
 import { CoreFilterModule } from '@core/filter/filter.module';
+import { CoreH5PModule } from '@core/h5p/h5p.module';
 
 // Addon modules.
 import { AddonBadgesModule } from '@addon/badges/badges.module';
@@ -230,6 +231,7 @@ export const WP_PROVIDER: any = null;
         CorePushNotificationsModule,
         CoreTagModule,
         CoreFilterModule,
+        CoreH5PModule,
         AddonBadgesModule,
         AddonBlogModule,
         AddonCalendarModule,
diff --git a/src/assets/img/icons/h5p.svg b/src/assets/img/icons/h5p.svg
new file mode 100644
index 000000000..7856f9efb
--- /dev/null
+++ b/src/assets/img/icons/h5p.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 345 150" style="enable-background:new 0 0 345 150;" xml:space="preserve">
+<g>
+	<path d="M325.7,14.7C317.6,6.9,305.3,3,289,3h-43.5H234v31h-66l-5.4,22.2c4.5-2.1,10.9-4.2,15.3-5.3c4.4-1.1,8.8-0.9,13.1-0.9
+		c14.6,0,26.5,4.5,35.6,13.3c9.1,8.8,13.6,20,13.6,33.4c0,9.4-2.3,18.5-7,27.2s-11.3,15.4-19.9,20c-3.1,1.6-6.5,3.1-10.2,4.1h42.4
+		H259V95h25c18.2,0,31.7-4.2,40.6-12.5s13.3-19.9,13.3-34.6C337.9,33.6,333.8,22.5,325.7,14.7z M288.7,60.6c-3.5,3-9.6,4.4-18.3,4.4
+		H259V33h13.2c8.4,0,14.2,1.5,17.2,4.7c3.1,3.2,4.6,6.9,4.6,11.5C294,53.9,292.2,57.6,288.7,60.6z"/>
+	<path d="M176.5,76.3c-7.9,0-14.7,4.6-18,11.2L119,81.9L136.8,3h-23.6H101v62H51V3H7v145h44V95h50v53h12.2h42
+		c-6.7-2-12.5-4.6-17.2-8.1c-4.8-3.6-8.7-7.7-11.7-12.3c-3-4.6-5.3-9.7-7.3-16.5l39.6-5.7c3.3,6.6,10.1,11.1,17.9,11.1
+		c11.1,0,20.1-9,20.1-20.1S187.5,76.3,176.5,76.3z"/>
+</g>
+</svg>
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 6879a9d11..e3d599345 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1550,6 +1550,7 @@
     "core.group": "Group",
     "core.groupsseparate": "Separate groups",
     "core.groupsvisible": "Visible groups",
+    "core.h5p.play": "Play H5P",
     "core.hasdatatosync": "This {{$a}} has offline data to be synchronised.",
     "core.help": "Help",
     "core.hide": "Hide",
diff --git a/src/core/filter/providers/default-filter.ts b/src/core/filter/providers/default-filter.ts
index bb9ff9d32..8b86c3028 100644
--- a/src/core/filter/providers/default-filter.ts
+++ b/src/core/filter/providers/default-filter.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Injectable } from '@angular/core';
+import { Injectable, ViewContainerRef } from '@angular/core';
 import { CoreFilterHandler } from './delegate';
 import { CoreFilterFilter, CoreFilterFormatTextOptions } from './filter';
 import { CoreSite } from '@classes/site';
@@ -50,11 +50,12 @@ export class CoreFilterDefaultHandler implements CoreFilterHandler {
      * @param container The HTML container to handle.
      * @param filter The filter.
      * @param options Options passed to the filters.
+     * @param viewContainerRef The ViewContainerRef where the container is.
      * @param siteId Site ID. If not defined, current site.
      * @return If async, promise resolved when done.
      */
-    handleHtml(container: HTMLElement, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions, siteId?: string)
-            : void | Promise<void> {
+    handleHtml(container: HTMLElement, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions,
+            viewContainerRef: ViewContainerRef, siteId?: string): void | Promise<void> {
         // To be overridden.
     }
 
diff --git a/src/core/filter/providers/delegate.ts b/src/core/filter/providers/delegate.ts
index ef1e5852a..9b6184536 100644
--- a/src/core/filter/providers/delegate.ts
+++ b/src/core/filter/providers/delegate.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Injectable } from '@angular/core';
+import { Injectable, ViewContainerRef } from '@angular/core';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider } from '@providers/sites';
@@ -48,11 +48,12 @@ export interface CoreFilterHandler extends CoreDelegateHandler {
      * @param container The HTML container to handle.
      * @param filter The filter.
      * @param options Options passed to the filters.
+     * @param viewContainerRef The ViewContainerRef where the container is.
      * @param siteId Site ID. If not defined, current site.
      * @return If async, promise resolved when done.
      */
-    handleHtml?(container: HTMLElement, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions, siteId?: string)
-            : void | Promise<void>;
+    handleHtml?(container: HTMLElement, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions,
+            viewContainerRef: ViewContainerRef, siteId?: string): void | Promise<void>;
 
     /**
      * Check if the filter should be applied in a certain site based on some filter options.
@@ -156,13 +157,14 @@ export class CoreFilterDelegate extends CoreDelegate {
      *
      * @param container The HTML container to handle.
      * @param filters Filters to apply.
+     * @param viewContainerRef The ViewContainerRef where the container is.
      * @param options Options passed to the filters.
      * @param skipFilters Names of filters that shouldn't be applied.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    handleHtml(container: HTMLElement, filters: CoreFilterFilter[], options?: any, skipFilters?: string[], siteId?: string)
-            : Promise<any> {
+    handleHtml(container: HTMLElement, filters: CoreFilterFilter[], viewContainerRef?: ViewContainerRef, options?: any,
+            skipFilters?: string[], siteId?: string): Promise<any> {
 
         // Wait for filters to be initialized.
         return this.handlersInitPromise.then(() => {
@@ -182,7 +184,7 @@ export class CoreFilterDelegate extends CoreDelegate {
 
                 promise = promise.then(() => {
                     return Promise.resolve(this.executeFunctionOnEnabled(filter.filter, 'handleHtml',
-                            [container, filter, options, siteId])).catch((error) => {
+                            [container, filter, options, viewContainerRef, siteId])).catch((error) => {
                         this.logger.error('Error handling HTML' + filter.filter, error);
                     });
                 });
diff --git a/src/core/h5p/components/components.module.ts b/src/core/h5p/components/components.module.ts
new file mode 100644
index 000000000..09480a6bb
--- /dev/null
+++ b/src/core/h5p/components/components.module.ts
@@ -0,0 +1,43 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { IonicModule } from 'ionic-angular';
+import { TranslateModule } from '@ngx-translate/core';
+import { CoreDirectivesModule } from '@directives/directives.module';
+import { CoreH5PPlayerComponent } from './h5p-player/h5p-player';
+import { CoreComponentsModule } from '@components/components.module';
+
+@NgModule({
+    declarations: [
+        CoreH5PPlayerComponent
+    ],
+    imports: [
+        CommonModule,
+        IonicModule,
+        CoreDirectivesModule,
+        TranslateModule.forChild(),
+        CoreComponentsModule
+    ],
+    providers: [
+    ],
+    exports: [
+        CoreH5PPlayerComponent
+    ],
+    entryComponents: [
+        CoreH5PPlayerComponent
+    ]
+})
+export class CoreH5PComponentsModule {}
diff --git a/src/core/h5p/components/h5p-player/core-h5p-player.html b/src/core/h5p/components/h5p-player/core-h5p-player.html
new file mode 100644
index 000000000..3d9e67912
--- /dev/null
+++ b/src/core/h5p/components/h5p-player/core-h5p-player.html
@@ -0,0 +1,9 @@
+<div *ngIf="!showPackage" class="core-h5p-placeholder">
+    <button *ngIf="!loading" class="core-h5p-placeholder-play-button" ion-button icon-only clear color="dark" (click)="play($event)">
+        <core-icon name="fa-play-circle"></core-icon>
+    </button>
+
+    <ion-spinner *ngIf="loading" class="core-h5p-placeholder-spinner"></ion-spinner>
+
+</div>
+<core-iframe *ngIf="showPackage" [src]="src"></core-iframe>
diff --git a/src/core/h5p/components/h5p-player/h5p-player.scss b/src/core/h5p/components/h5p-player/h5p-player.scss
new file mode 100644
index 000000000..0c963aa79
--- /dev/null
+++ b/src/core/h5p/components/h5p-player/h5p-player.scss
@@ -0,0 +1,24 @@
+ion-app.app-root core-h5p-player {
+    .core-h5p-placeholder {
+        position: relative;
+        width: 100%;
+        height: 230px;
+        background: url('../assets/img/icons/h5p.svg') center top 25px / 100px auto no-repeat $core-h5p-placeholder-bg-color;
+
+        .core-h5p-placeholder-play-button {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+            font-size: 30px;
+            min-height: 50px;
+        }
+
+        .core-h5p-placeholder-download-container {
+            position: absolute;
+            right: 10px;
+            font-size: 1.8em;
+        }
+    }
+
+}
diff --git a/src/core/h5p/components/h5p-player/h5p-player.ts b/src/core/h5p/components/h5p-player/h5p-player.ts
new file mode 100644
index 000000000..e6a73b2a4
--- /dev/null
+++ b/src/core/h5p/components/h5p-player/h5p-player.ts
@@ -0,0 +1,56 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Component, Input, ElementRef } from '@angular/core';
+import { CoreSitesProvider } from '@providers/sites';
+
+/**
+ * Component to render an H5P package.
+ */
+@Component({
+    selector: 'core-h5p-player',
+    templateUrl: 'core-h5p-player.html'
+})
+export class CoreH5PPlayerComponent {
+    @Input() src: string; // The URL of the player to display the H5P package.
+
+    showPackage = false;
+    loading = false;
+    status: string;
+    canDownload: boolean;
+    calculating = true;
+
+    constructor(public elementRef: ElementRef,
+            protected sitesProvider: CoreSitesProvider) {
+    }
+
+    /**
+     * Play the H5P.
+     *
+     * @param e Event.
+     */
+    play(e: MouseEvent): void {
+        e.preventDefault();
+        e.stopPropagation();
+
+        this.loading = true;
+
+        // Get auto-login URL so the user is automatically authenticated.
+        this.sitesProvider.getCurrentSite().getAutoLoginUrl(this.src, false).then((url) => {
+            this.src = url;
+            this.loading = false;
+            this.showPackage = true;
+        });
+    }
+}
diff --git a/src/core/h5p/h5p.module.ts b/src/core/h5p/h5p.module.ts
new file mode 100644
index 000000000..4fb4f6ba4
--- /dev/null
+++ b/src/core/h5p/h5p.module.ts
@@ -0,0 +1,27 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { NgModule } from '@angular/core';
+import { CoreH5PComponentsModule } from './components/components.module';
+
+@NgModule({
+    declarations: [],
+    imports: [
+        CoreH5PComponentsModule
+    ],
+    providers: [
+    ],
+    exports: []
+})
+export class CoreH5PModule { }
diff --git a/src/core/h5p/lang/en.json b/src/core/h5p/lang/en.json
new file mode 100644
index 000000000..954fa438a
--- /dev/null
+++ b/src/core/h5p/lang/en.json
@@ -0,0 +1,3 @@
+{
+    "play": "Play H5P"
+}
\ No newline at end of file
diff --git a/src/directives/format-text.ts b/src/directives/format-text.ts
index 68ef57895..1ae718161 100644
--- a/src/directives/format-text.ts
+++ b/src/directives/format-text.ts
@@ -12,7 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Directive, ElementRef, Input, Output, EventEmitter, OnChanges, SimpleChange, Optional } from '@angular/core';
+import {
+    Directive, ElementRef, Input, Output, EventEmitter, OnChanges, SimpleChange, Optional, ViewContainerRef
+} from '@angular/core';
 import { Platform, NavController, Content } from 'ionic-angular';
 import { TranslateService } from '@ngx-translate/core';
 import { CoreAppProvider } from '@providers/app';
@@ -90,7 +92,8 @@ export class CoreFormatTextDirective implements OnChanges {
             private eventsProvider: CoreEventsProvider,
             private filterProvider: CoreFilterProvider,
             private filterHelper: CoreFilterHelperProvider,
-            private filterDelegate: CoreFilterDelegate) {
+            private filterDelegate: CoreFilterDelegate,
+            private viewContainerRef: ViewContainerRef) {
 
         this.element = element.nativeElement;
         this.element.classList.add('opacity-hide'); // Hide contents until they're treated.
@@ -371,7 +374,8 @@ export class CoreFormatTextDirective implements OnChanges {
 
             if (result.options.filter) {
                 // Let filters hnadle HTML. We do it here because we don't want them to block the render of the text.
-                this.filterDelegate.handleHtml(this.element, result.filters, result.options, [], result.siteId);
+                this.filterDelegate.handleHtml(this.element, result.filters, this.viewContainerRef, result.options, [],
+                        result.siteId);
             }
 
             this.element.classList.remove('core-disable-media-adapt');
diff --git a/src/providers/utils/text.ts b/src/providers/utils/text.ts
index d08b82fe9..0a858127e 100644
--- a/src/providers/utils/text.ts
+++ b/src/providers/utils/text.ts
@@ -514,10 +514,9 @@ export class CoreTextUtilsProvider {
             return true;
         }
 
-        const div = document.createElement('div');
-        div.innerHTML = content;
+        this.template.innerHTML = content;
 
-        return div.textContent === '' && div.querySelector('img, object, hr') === null;
+        return this.template.textContent === '' && this.template.content.querySelector('img, object, hr') === null;
     }
 
     /**
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index ebab93935..326cc4671 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -369,6 +369,9 @@ $core-question-state-incorrect-color: $red-light !default;
 $core-dd-question-selected-shadow: 2px 2px 4px $gray-dark !default;
 $core-dd-question-colors: $white, $blue-light, #DCDCDC, #D8BFD8, #87CEFA, #DAA520, #FFD700, #F0E68C !default;
 
+// H5P variables.
+$core-h5p-placeholder-bg-color: $gray-dark !default;
+
 // Mixins
 // -------------------------
 @mixin core-transition($where: all, $time: 500ms) {

From 9b637fc496da5884155903a06a95811b297b188e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 31 Oct 2019 12:30:45 +0100
Subject: [PATCH 176/257] MOBILE-2235 h5p: Display download button in H5P
 placeholder

---
 src/components/iframe/core-iframe.html        |   2 +-
 src/components/iframe/iframe.scss             |   3 -
 src/core/compile/providers/compile.ts         |   3 +-
 src/core/filter/providers/filter.ts           |   2 +-
 .../h5p-player/core-h5p-player.html           |  11 +-
 .../h5p/components/h5p-player/h5p-player.scss |  39 +++-
 .../h5p/components/h5p-player/h5p-player.ts   |  80 ++++++++-
 src/core/h5p/h5p.module.ts                    |   7 +
 src/core/h5p/providers/h5p.ts                 | 169 ++++++++++++++++++
 src/theme/variables.scss                      |   3 -
 10 files changed, 300 insertions(+), 19 deletions(-)
 create mode 100644 src/core/h5p/providers/h5p.ts

diff --git a/src/components/iframe/core-iframe.html b/src/components/iframe/core-iframe.html
index a94b5d110..7bdeac425 100644
--- a/src/components/iframe/core-iframe.html
+++ b/src/components/iframe/core-iframe.html
@@ -1,4 +1,4 @@
-<div [class.core-loading-container]="loading">
+<div [class.core-loading-container]="loading" [ngStyle]="{'width': iframeWidth, 'height': iframeHeight}">
     <iframe #iframe [hidden]="loading" class="core-iframe" [ngStyle]="{'width': iframeWidth, 'height': iframeHeight}" [src]="safeUrl"></iframe>
     <span class="core-loading-spinner">
         <ion-spinner *ngIf="loading"></ion-spinner>
diff --git a/src/components/iframe/iframe.scss b/src/components/iframe/iframe.scss
index 0d0e5ca92..782a554cb 100644
--- a/src/components/iframe/iframe.scss
+++ b/src/components/iframe/iframe.scss
@@ -1,7 +1,4 @@
 ion-app.app-root core-iframe {
-    > div {
-        height: 100%;
-    }
     iframe {
         border: 0;
         display: block;
diff --git a/src/core/compile/providers/compile.ts b/src/core/compile/providers/compile.ts
index bbfc35f48..8f0c7e1b6 100644
--- a/src/core/compile/providers/compile.ts
+++ b/src/core/compile/providers/compile.ts
@@ -30,6 +30,7 @@ import { CORE_COURSES_PROVIDERS } from '@core/courses/courses.module';
 import { CORE_FILEUPLOADER_PROVIDERS } from '@core/fileuploader/fileuploader.module';
 import { CORE_FILTER_PROVIDERS } from '@core/filter/filter.module';
 import { CORE_GRADES_PROVIDERS } from '@core/grades/grades.module';
+import { CORE_H5P_PROVIDERS } from '@core/h5p/h5p.module';
 import { CORE_LOGIN_PROVIDERS } from '@core/login/login.module';
 import { CORE_MAINMENU_PROVIDERS } from '@core/mainmenu/mainmenu.module';
 import { CORE_QUESTION_PROVIDERS } from '@core/question/question.module';
@@ -236,7 +237,7 @@ export class CoreCompileProvider {
                 .concat(ADDON_MOD_SURVEY_PROVIDERS).concat(ADDON_MOD_URL_PROVIDERS).concat(ADDON_MOD_WIKI_PROVIDERS)
                 .concat(ADDON_MOD_WORKSHOP_PROVIDERS).concat(ADDON_NOTES_PROVIDERS).concat(ADDON_NOTIFICATIONS_PROVIDERS)
                 .concat(CORE_PUSHNOTIFICATIONS_PROVIDERS).concat(ADDON_REMOTETHEMES_PROVIDERS).concat(CORE_BLOCK_PROVIDERS)
-                .concat(CORE_FILTER_PROVIDERS);
+                .concat(CORE_FILTER_PROVIDERS).concat(CORE_H5P_PROVIDERS);
 
         // We cannot inject anything to this constructor. Use the Injector to inject all the providers into the instance.
         for (const i in providers) {
diff --git a/src/core/filter/providers/filter.ts b/src/core/filter/providers/filter.ts
index 42802335f..a404d5616 100644
--- a/src/core/filter/providers/filter.ts
+++ b/src/core/filter/providers/filter.ts
@@ -402,7 +402,7 @@ export type CoreFilterFilter = {
  */
 export type CoreFilterGetAvailableInContextResult = {
     filters: CoreFilterFilter[]; // Available filters.
-    warning: CoreWSExternalWarning[]; // List of warnings.
+    warnings: CoreWSExternalWarning[]; // List of warnings.
 };
 
 /**
diff --git a/src/core/h5p/components/h5p-player/core-h5p-player.html b/src/core/h5p/components/h5p-player/core-h5p-player.html
index 3d9e67912..af48001df 100644
--- a/src/core/h5p/components/h5p-player/core-h5p-player.html
+++ b/src/core/h5p/components/h5p-player/core-h5p-player.html
@@ -1,9 +1,14 @@
 <div *ngIf="!showPackage" class="core-h5p-placeholder">
-    <button *ngIf="!loading" class="core-h5p-placeholder-play-button" ion-button icon-only clear color="dark" (click)="play($event)">
+    <button *ngIf="!loading && !errorMessage" class="core-h5p-placeholder-play-button" ion-button icon-only clear (click)="play($event)">
         <core-icon name="fa-play-circle"></core-icon>
     </button>
 
-    <ion-spinner *ngIf="loading" class="core-h5p-placeholder-spinner"></ion-spinner>
+    <ion-spinner *ngIf="loading && !errorMessage" class="core-h5p-placeholder-spinner"></ion-spinner>
 
+    <div *ngIf="errorMessage" class="core-h5p-placeholder-error">{{ errorMessage }}</div>
+
+    <div class="core-h5p-placeholder-download-container">
+        <core-download-refresh [status]="state" [enabled]="canDownload" [loading]="calculating" [canTrustDownload]="true" (action)="download()"></core-download-refresh>
+    </div>
 </div>
-<core-iframe *ngIf="showPackage" [src]="src"></core-iframe>
+<core-iframe *ngIf="showPackage" [src]="playerSrc" iframeHeight="230px"></core-iframe>
diff --git a/src/core/h5p/components/h5p-player/h5p-player.scss b/src/core/h5p/components/h5p-player/h5p-player.scss
index 0c963aa79..b5ba7f82c 100644
--- a/src/core/h5p/components/h5p-player/h5p-player.scss
+++ b/src/core/h5p/components/h5p-player/h5p-player.scss
@@ -1,23 +1,56 @@
+// H5P variables.
+$core-h5p-placeholder-bg-color: $gray !default;
+$core-h5p-placeholder-text-color: $text-color !default;
+
 ion-app.app-root core-h5p-player {
     .core-h5p-placeholder {
         position: relative;
         width: 100%;
         height: 230px;
         background: url('../assets/img/icons/h5p.svg') center top 25px / 100px auto no-repeat $core-h5p-placeholder-bg-color;
+        color: $core-h5p-placeholder-text-color;
 
-        .core-h5p-placeholder-play-button {
+        .icon {
+            color: $core-h5p-placeholder-text-color;
+        }
+
+        .core-h5p-placeholder-play-button, .core-h5p-placeholder-spinner {
             position: absolute;
             top: 50%;
             left: 50%;
             transform: translate(-50%, -50%);
+        }
+
+        .core-h5p-placeholder-play-button {
             font-size: 30px;
             min-height: 50px;
         }
 
         .core-h5p-placeholder-download-container {
             position: absolute;
-            right: 10px;
-            font-size: 1.8em;
+            top: 0;
+            right: 0;
+
+            ion-spinner {
+                margin-right: 0.75em;
+            }
+
+            core-download-refresh > ion-icon {
+                margin: 0.4rem 0.2rem;
+                padding: 0 0.5em;
+                line-height: .67;
+            }
+        }
+
+        .core-h5p-placeholder-error {
+            position: absolute;
+            width: 100%;
+            text-align: center;
+            top: 50%;
+        }
+
+        ion-spinner circle {
+            stroke: $core-h5p-placeholder-text-color;
         }
     }
 
diff --git a/src/core/h5p/components/h5p-player/h5p-player.ts b/src/core/h5p/components/h5p-player/h5p-player.ts
index e6a73b2a4..0c4f3e937 100644
--- a/src/core/h5p/components/h5p-player/h5p-player.ts
+++ b/src/core/h5p/components/h5p-player/h5p-player.ts
@@ -12,8 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Input, ElementRef } from '@angular/core';
+import { Component, Input, ElementRef, OnInit, SimpleChange } from '@angular/core';
 import { CoreSitesProvider } from '@providers/sites';
+import { CoreTextUtilsProvider } from '@providers/utils/text';
+import { CoreUrlUtilsProvider } from '@providers/utils/url';
+import { CoreUtilsProvider } from '@providers/utils/utils';
+import { CoreH5PProvider } from '@core/h5p/providers/h5p';
 
 /**
  * Component to render an H5P package.
@@ -22,17 +26,39 @@ import { CoreSitesProvider } from '@providers/sites';
     selector: 'core-h5p-player',
     templateUrl: 'core-h5p-player.html'
 })
-export class CoreH5PPlayerComponent {
+export class CoreH5PPlayerComponent implements OnInit {
     @Input() src: string; // The URL of the player to display the H5P package.
 
+    playerSrc: string;
     showPackage = false;
     loading = false;
     status: string;
     canDownload: boolean;
     calculating = true;
+    errorMessage: string;
 
     constructor(public elementRef: ElementRef,
-            protected sitesProvider: CoreSitesProvider) {
+            protected sitesProvider: CoreSitesProvider,
+            protected urlUtils: CoreUrlUtilsProvider,
+            protected utils: CoreUtilsProvider,
+            protected textUtils: CoreTextUtilsProvider,
+            protected h5pProvider: CoreH5PProvider) { }
+
+    /**
+     * Component being initialized.
+     */
+    ngOnInit(): void {
+        this.checkCanDownload();
+    }
+
+    /**
+     * Detect changes on input properties.
+     */
+    ngOnChanges(changes: {[name: string]: SimpleChange}): void {
+        // If it's already playing and the src changes, don't change the player src, the user could lose data.
+        if (changes.src && !this.showPackage) {
+            this.checkCanDownload();
+        }
     }
 
     /**
@@ -46,11 +72,57 @@ export class CoreH5PPlayerComponent {
 
         this.loading = true;
 
+        // @TODO: Check if package is downloaded and use the local player if so.
+
         // Get auto-login URL so the user is automatically authenticated.
         this.sitesProvider.getCurrentSite().getAutoLoginUrl(this.src, false).then((url) => {
-            this.src = url;
+            this.playerSrc = url;
             this.loading = false;
             this.showPackage = true;
         });
     }
+
+    /**
+     * Download the package.
+     */
+    download(): void {
+        // @TODO: Implement package download.
+    }
+
+    /**
+     * Check if the package can be downloaded.
+     */
+    protected checkCanDownload(): void {
+        if (this.src && this.h5pProvider.canGetTrustedH5PFileInSite()) {
+            const params = this.urlUtils.extractUrlParams(this.src);
+
+            // @todo: Check if H5P offline is disabled in the site.
+
+            // Now check if the package can be played.
+            this.calculating = true;
+
+            const options = {
+                frame: this.utils.isTrueOrOne(params.frame),
+                export: this.utils.isTrueOrOne(params.export),
+                embed: this.utils.isTrueOrOne(params.embed),
+                copyright: this.utils.isTrueOrOne(params.copyright),
+            };
+
+            this.h5pProvider.getTrustedH5PFile(params.url, options).then((file) => {
+                this.canDownload = true;
+                this.errorMessage = undefined;
+            }).catch((error) => {
+                this.canDownload = false;
+                this.errorMessage = this.textUtils.getErrorMessageFromError(error);
+            }).finally(() => {
+                this.calculating = false;
+            });
+
+            return;
+        }
+
+        this.calculating = false;
+        this.canDownload = false;
+        this.errorMessage = undefined;
+    }
 }
diff --git a/src/core/h5p/h5p.module.ts b/src/core/h5p/h5p.module.ts
index 4fb4f6ba4..ddc625a0b 100644
--- a/src/core/h5p/h5p.module.ts
+++ b/src/core/h5p/h5p.module.ts
@@ -14,6 +14,12 @@
 
 import { NgModule } from '@angular/core';
 import { CoreH5PComponentsModule } from './components/components.module';
+import { CoreH5PProvider } from './providers/h5p';
+
+// List of providers (without handlers).
+export const CORE_H5P_PROVIDERS: any[] = [
+    CoreH5PProvider
+];
 
 @NgModule({
     declarations: [],
@@ -21,6 +27,7 @@ import { CoreH5PComponentsModule } from './components/components.module';
         CoreH5PComponentsModule
     ],
     providers: [
+        CoreH5PProvider
     ],
     exports: []
 })
diff --git a/src/core/h5p/providers/h5p.ts b/src/core/h5p/providers/h5p.ts
new file mode 100644
index 000000000..335e5025f
--- /dev/null
+++ b/src/core/h5p/providers/h5p.ts
@@ -0,0 +1,169 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreLoggerProvider } from '@providers/logger';
+import { CoreSitesProvider } from '@providers/sites';
+import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
+import { CoreWSExternalWarning, CoreWSExternalFile } from '@providers/ws';
+
+/**
+ * Service to provide H5P functionalities.
+ */
+@Injectable()
+export class CoreH5PProvider {
+
+    protected ROOT_CACHE_KEY = 'mmH5P:';
+
+    protected logger;
+
+    constructor(logger: CoreLoggerProvider,
+            private sitesProvider: CoreSitesProvider) {
+
+        this.logger = logger.getInstance('CoreFilterProvider');
+    }
+
+    /**
+     * Returns whether or not WS to get trusted H5P file is available.
+     *
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with true if ws is available, false otherwise.
+     * @since 3.8
+     */
+    canGetTrustedH5PFile(siteId?: string): Promise<boolean> {
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            return this.canGetTrustedH5PFileInSite(site);
+        });
+    }
+
+    /**
+     * Returns whether or not WS to get trusted H5P file is available in a certain site.
+     *
+     * @param site Site. If not defined, current site.
+     * @return Promise resolved with true if ws is available, false otherwise.
+     * @since 3.4
+     */
+    canGetTrustedH5PFileInSite(site?: CoreSite): boolean {
+        site = site || this.sitesProvider.getCurrentSite();
+
+        return site.wsAvailable('core_h5p_get_trusted_h5p_file');
+    }
+
+    /**
+     * Get a trusted H5P file.
+     *
+     * @param url The file URL.
+     * @param options Options.
+     * @param ignoreCache Whether to ignore cache..
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the file data.
+     */
+    getTrustedH5PFile(url: string, options: CoreH5PGetTrustedFileOptions, ignoreCache?: boolean, siteId?: string)
+            : Promise<CoreWSExternalFile> {
+
+        return this.sitesProvider.getSite(siteId).then((site) => {
+
+            const data = {
+                    url: url,
+                    frame: options.frame ? 1 : 0,
+                    export: options.export ? 1 : 0,
+                    embed: options.embed ? 1 : 0,
+                    copyright: options.copyright ? 1 : 0,
+                },
+                preSets: CoreSiteWSPreSets = {
+                    cacheKey: this.getTrustedH5PFileCacheKey(url),
+                    updateFrequency: CoreSite.FREQUENCY_RARELY
+                };
+
+            if (ignoreCache) {
+                preSets.getFromCache = false;
+                preSets.emergencyCache = false;
+            }
+
+            return site.read('core_h5p_get_trusted_h5p_file', data, preSets).then((result: CoreH5PGetTrustedH5PFileResult): any => {
+                if (result.warnings && result.warnings.length) {
+                    return Promise.reject(result.warnings[0]);
+                }
+
+                if (result.files && result.files.length) {
+                    return result.files[0];
+                }
+
+                return Promise.reject(null);
+            });
+        });
+    }
+
+    /**
+     * Get cache key for trusted H5P file WS calls.
+     *
+     * @param url The file URL.
+     * @return Cache key.
+     */
+    protected getTrustedH5PFileCacheKey(url: string): string {
+        return this.getTrustedH5PFilePrefixCacheKey() + url;
+    }
+
+    /**
+     * Get prefixed cache key for trusted H5P file WS calls.
+     *
+     * @return Cache key.
+     */
+    protected getTrustedH5PFilePrefixCacheKey(): string {
+        return this.ROOT_CACHE_KEY + 'trustedH5PFile:';
+    }
+
+    /**
+     * Invalidates all trusted H5P file WS calls.
+     *
+     * @param siteId Site ID (empty for current site).
+     * @return Promise resolved when the data is invalidated.
+     */
+    invalidateAllGetTrustedH5PFile(siteId?: string): Promise<any> {
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            return site.invalidateWsCacheForKeyStartingWith(this.getTrustedH5PFilePrefixCacheKey());
+        });
+    }
+
+    /**
+     * Invalidates get trusted H5P file WS call.
+     *
+     * @param url The URL of the file.
+     * @param siteId Site ID (empty for current site).
+     * @return Promise resolved when the data is invalidated.
+     */
+    invalidateAvailableInContexts(url: string, siteId?: string): Promise<any> {
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            return site.invalidateWsCacheForKey(this.getTrustedH5PFileCacheKey(url));
+        });
+    }
+}
+
+/**
+ * Options for core_h5p_get_trusted_h5p_file.
+ */
+export type CoreH5PGetTrustedFileOptions = {
+    frame?: boolean; // Whether to show the bar options below the content.
+    export?: boolean; // Whether to allow to download the package.
+    embed?: boolean; // Whether to allow to copy the code to your site.
+    copyright?: boolean; // The copyright option.
+};
+
+/**
+ * Result of core_h5p_get_trusted_h5p_file.
+ */
+export type CoreH5PGetTrustedH5PFileResult = {
+    files: CoreWSExternalFile[]; // Files.
+    warnings: CoreWSExternalWarning[]; // List of warnings.
+};
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 326cc4671..ebab93935 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -369,9 +369,6 @@ $core-question-state-incorrect-color: $red-light !default;
 $core-dd-question-selected-shadow: 2px 2px 4px $gray-dark !default;
 $core-dd-question-colors: $white, $blue-light, #DCDCDC, #D8BFD8, #87CEFA, #DAA520, #FFD700, #F0E68C !default;
 
-// H5P variables.
-$core-h5p-placeholder-bg-color: $gray-dark !default;
-
 // Mixins
 // -------------------------
 @mixin core-transition($where: all, $time: 500ms) {

From c4a58d9ee8fc65d6ae224a31a77979e3f75152a4 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 5 Nov 2019 13:00:05 +0100
Subject: [PATCH 177/257] MOBILE-2235 h5p: Implement H5P download and unzip

---
 .../filter/displayh5p/providers/handler.ts    |   7 +-
 .../filter/mathjaxloader/providers/handler.ts |   5 +-
 .../mod/assign/providers/prefetch-handler.ts  |   5 +-
 .../mod/book/providers/prefetch-handler.ts    |   5 +-
 .../mod/chat/providers/prefetch-handler.ts    |   5 +-
 .../mod/choice/providers/prefetch-handler.ts  |   5 +-
 .../mod/data/providers/prefetch-handler.ts    |   5 +-
 .../feedback/providers/prefetch-handler.ts    |   5 +-
 .../mod/folder/providers/prefetch-handler.ts  |   5 +-
 .../mod/forum/providers/prefetch-handler.ts   |   5 +-
 .../glossary/providers/prefetch-handler.ts    |   5 +-
 .../mod/imscp/providers/prefetch-handler.ts   |   5 +-
 .../mod/label/providers/prefetch-handler.ts   |   5 +-
 .../mod/lesson/providers/prefetch-handler.ts  |   9 +-
 .../mod/lti/providers/prefetch-handler.ts     |   5 +-
 .../mod/page/providers/prefetch-handler.ts    |   5 +-
 .../mod/quiz/providers/prefetch-handler.ts    |   5 +-
 .../resource/providers/prefetch-handler.ts    |   5 +-
 .../mod/scorm/providers/prefetch-handler.ts   |   5 +-
 .../mod/survey/providers/prefetch-handler.ts  |   5 +-
 .../mod/url/providers/prefetch-handler.ts     |   7 +-
 .../mod/wiki/providers/prefetch-handler.ts    |   7 +-
 .../workshop/providers/prefetch-handler.ts    |   5 +-
 src/components/file/file.ts                   |  47 ++--
 .../course/classes/module-prefetch-handler.ts |   6 +-
 src/core/filter/providers/default-filter.ts   |   5 +-
 src/core/filter/providers/delegate.ts         |  11 +-
 .../h5p-player/core-h5p-player.html           |   6 +-
 .../h5p/components/h5p-player/h5p-player.scss |   7 -
 .../h5p/components/h5p-player/h5p-player.ts   | 107 +++++--
 src/core/h5p/h5p.module.ts                    |  13 +-
 src/core/h5p/providers/h5p.ts                 |  25 +-
 src/core/h5p/providers/pluginfile-handler.ts  | 121 ++++++++
 .../handlers/module-prefetch-handler.ts       |   5 +-
 src/core/siteplugins/providers/helper.ts      |   6 +-
 src/directives/format-text.ts                 |   2 +-
 src/providers/filepool.ts                     | 262 ++++++++++--------
 src/providers/plugin-file-delegate.ts         | 197 ++++++++++++-
 src/providers/utils/dom.ts                    |  25 +-
 src/providers/utils/utils.ts                  |   1 +
 40 files changed, 751 insertions(+), 220 deletions(-)
 create mode 100644 src/core/h5p/providers/pluginfile-handler.ts

diff --git a/src/addon/filter/displayh5p/providers/handler.ts b/src/addon/filter/displayh5p/providers/handler.ts
index 3956d3299..abbfdb957 100644
--- a/src/addon/filter/displayh5p/providers/handler.ts
+++ b/src/addon/filter/displayh5p/providers/handler.ts
@@ -69,11 +69,14 @@ export class AddonFilterDisplayH5PHandler extends CoreFilterDefaultHandler {
      * @param filter The filter.
      * @param options Options passed to the filters.
      * @param viewContainerRef The ViewContainerRef where the container is.
+     * @param component Component.
+     * @param componentId Component ID.
      * @param siteId Site ID. If not defined, current site.
      * @return If async, promise resolved when done.
      */
     handleHtml(container: HTMLElement, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions,
-            viewContainerRef: ViewContainerRef, siteId?: string): void | Promise<void> {
+            viewContainerRef: ViewContainerRef, component?: string, componentId?: string | number, siteId?: string)
+            : void | Promise<void> {
 
         const placeholders = <HTMLElement[]> Array.from(container.querySelectorAll('div.core-h5p-tmp-placeholder'));
 
@@ -85,6 +88,8 @@ export class AddonFilterDisplayH5PHandler extends CoreFilterDefaultHandler {
                 componentRef = viewContainerRef.createComponent(factory);
 
             componentRef.instance.src = url;
+            componentRef.instance.component = component;
+            componentRef.instance.componentId = componentId;
 
             // Move the component to its right position.
             placeholder.parentElement.replaceChild(componentRef.instance.elementRef.nativeElement, placeholder);
diff --git a/src/addon/filter/mathjaxloader/providers/handler.ts b/src/addon/filter/mathjaxloader/providers/handler.ts
index e1d514e05..0ef005bc7 100644
--- a/src/addon/filter/mathjaxloader/providers/handler.ts
+++ b/src/addon/filter/mathjaxloader/providers/handler.ts
@@ -162,11 +162,14 @@ export class AddonFilterMathJaxLoaderHandler extends CoreFilterDefaultHandler {
      * @param filter The filter.
      * @param options Options passed to the filters.
      * @param viewContainerRef The ViewContainerRef where the container is.
+     * @param component Component.
+     * @param componentId Component ID.
      * @param siteId Site ID. If not defined, current site.
      * @return If async, promise resolved when done.
      */
     handleHtml(container: HTMLElement, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions,
-            viewContainerRef: ViewContainerRef, siteId?: string): void | Promise<void> {
+            viewContainerRef: ViewContainerRef, component?: string, componentId?: string | number, siteId?: string)
+            : void | Promise<void> {
 
         return this.waitForReady().then(() => {
             this.window.M.filter_mathjaxloader.typeset(container);
diff --git a/src/addon/mod/assign/providers/prefetch-handler.ts b/src/addon/mod/assign/providers/prefetch-handler.ts
index 9552032af..56d0b4ba0 100644
--- a/src/addon/mod/assign/providers/prefetch-handler.ts
+++ b/src/addon/mod/assign/providers/prefetch-handler.ts
@@ -32,6 +32,7 @@ import { AddonModAssignSyncProvider } from './assign-sync';
 import { AddonModAssignFeedbackDelegate } from './feedback-delegate';
 import { AddonModAssignSubmissionDelegate } from './submission-delegate';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch assigns.
@@ -51,6 +52,7 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             protected assignProvider: AddonModAssignProvider,
             protected textUtils: CoreTextUtilsProvider,
             protected feedbackDelegate: AddonModAssignFeedbackDelegate,
@@ -62,7 +64,8 @@ export class AddonModAssignPrefetchHandler extends CoreCourseActivityPrefetchHan
             protected assignHelper: AddonModAssignHelperProvider,
             protected syncProvider: AddonModAssignSyncProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
diff --git a/src/addon/mod/book/providers/prefetch-handler.ts b/src/addon/mod/book/providers/prefetch-handler.ts
index 22c6bf8bb..d4eb5903a 100644
--- a/src/addon/mod/book/providers/prefetch-handler.ts
+++ b/src/addon/mod/book/providers/prefetch-handler.ts
@@ -23,6 +23,7 @@ import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseResourcePrefetchHandlerBase } from '@core/course/classes/resource-prefetch-handler';
 import { AddonModBookProvider } from './book';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch books.
@@ -42,9 +43,11 @@ export class AddonModBookPrefetchHandler extends CoreCourseResourcePrefetchHandl
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             protected bookProvider: AddonModBookProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
diff --git a/src/addon/mod/chat/providers/prefetch-handler.ts b/src/addon/mod/chat/providers/prefetch-handler.ts
index 556d34982..ecf8cde63 100644
--- a/src/addon/mod/chat/providers/prefetch-handler.ts
+++ b/src/addon/mod/chat/providers/prefetch-handler.ts
@@ -25,6 +25,7 @@ import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/acti
 import { CoreUserProvider } from '@core/user/providers/user';
 import { AddonModChatProvider, AddonModChatChat } from './chat';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch chats.
@@ -43,11 +44,13 @@ export class AddonModChatPrefetchHandler extends CoreCourseActivityPrefetchHandl
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             private groupsProvider: CoreGroupsProvider,
             private userProvider: CoreUserProvider,
             private chatProvider: AddonModChatProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
diff --git a/src/addon/mod/choice/providers/prefetch-handler.ts b/src/addon/mod/choice/providers/prefetch-handler.ts
index cbe113b6a..656ab5efc 100644
--- a/src/addon/mod/choice/providers/prefetch-handler.ts
+++ b/src/addon/mod/choice/providers/prefetch-handler.ts
@@ -25,6 +25,7 @@ import { CoreUserProvider } from '@core/user/providers/user';
 import { AddonModChoiceSyncProvider } from './sync';
 import { AddonModChoiceProvider } from './choice';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch choices.
@@ -46,11 +47,13 @@ export class AddonModChoicePrefetchHandler extends CoreCourseActivityPrefetchHan
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             protected choiceProvider: AddonModChoiceProvider,
             protected userProvider: CoreUserProvider,
             protected injector: Injector) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
diff --git a/src/addon/mod/data/providers/prefetch-handler.ts b/src/addon/mod/data/providers/prefetch-handler.ts
index 63d531b8a..ecdf8927a 100644
--- a/src/addon/mod/data/providers/prefetch-handler.ts
+++ b/src/addon/mod/data/providers/prefetch-handler.ts
@@ -28,6 +28,7 @@ import { AddonModDataProvider, AddonModDataEntry } from './data';
 import { AddonModDataSyncProvider } from './sync';
 import { AddonModDataHelperProvider } from './helper';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch databases.
@@ -47,6 +48,7 @@ export class AddonModDataPrefetchHandler extends CoreCourseActivityPrefetchHandl
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             protected dataProvider: AddonModDataProvider,
             protected timeUtils: CoreTimeUtilsProvider,
             protected dataHelper: AddonModDataHelperProvider,
@@ -54,7 +56,8 @@ export class AddonModDataPrefetchHandler extends CoreCourseActivityPrefetchHandl
             protected commentsProvider: CoreCommentsProvider,
             protected syncProvider: AddonModDataSyncProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
diff --git a/src/addon/mod/feedback/providers/prefetch-handler.ts b/src/addon/mod/feedback/providers/prefetch-handler.ts
index 2aed13f52..01c846d74 100644
--- a/src/addon/mod/feedback/providers/prefetch-handler.ts
+++ b/src/addon/mod/feedback/providers/prefetch-handler.ts
@@ -27,6 +27,7 @@ import { CoreTimeUtilsProvider } from '@providers/utils/time';
 import { CoreGroupsProvider } from '@providers/groups';
 import { AddonModFeedbackSyncProvider } from './sync';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch feedbacks.
@@ -48,13 +49,15 @@ export class AddonModFeedbackPrefetchHandler extends CoreCourseActivityPrefetchH
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             protected feedbackProvider: AddonModFeedbackProvider,
             protected feedbackHelper: AddonModFeedbackHelperProvider,
             protected timeUtils: CoreTimeUtilsProvider,
             protected groupsProvider: CoreGroupsProvider,
             protected injector: Injector) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
diff --git a/src/addon/mod/folder/providers/prefetch-handler.ts b/src/addon/mod/folder/providers/prefetch-handler.ts
index 3ad1f329e..9a5dfc307 100644
--- a/src/addon/mod/folder/providers/prefetch-handler.ts
+++ b/src/addon/mod/folder/providers/prefetch-handler.ts
@@ -23,6 +23,7 @@ import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseResourcePrefetchHandlerBase } from '@core/course/classes/resource-prefetch-handler';
 import { AddonModFolderProvider } from './folder';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch folders.
@@ -41,9 +42,11 @@ export class AddonModFolderPrefetchHandler extends CoreCourseResourcePrefetchHan
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             protected folderProvider: AddonModFolderProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
diff --git a/src/addon/mod/forum/providers/prefetch-handler.ts b/src/addon/mod/forum/providers/prefetch-handler.ts
index f9ab412c2..2f1e05b5d 100644
--- a/src/addon/mod/forum/providers/prefetch-handler.ts
+++ b/src/addon/mod/forum/providers/prefetch-handler.ts
@@ -26,6 +26,7 @@ import { CoreGroupsProvider } from '@providers/groups';
 import { AddonModForumProvider } from './forum';
 import { AddonModForumSyncProvider } from './sync';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch forums.
@@ -45,12 +46,14 @@ export class AddonModForumPrefetchHandler extends CoreCourseActivityPrefetchHand
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             private userProvider: CoreUserProvider,
             private groupsProvider: CoreGroupsProvider,
             private forumProvider: AddonModForumProvider,
             private syncProvider: AddonModForumSyncProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
diff --git a/src/addon/mod/glossary/providers/prefetch-handler.ts b/src/addon/mod/glossary/providers/prefetch-handler.ts
index 3051f1467..34a94b142 100644
--- a/src/addon/mod/glossary/providers/prefetch-handler.ts
+++ b/src/addon/mod/glossary/providers/prefetch-handler.ts
@@ -25,6 +25,7 @@ import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/acti
 import { AddonModGlossaryProvider } from './glossary';
 import { AddonModGlossarySyncProvider } from './sync';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch forums.
@@ -44,11 +45,13 @@ export class AddonModGlossaryPrefetchHandler extends CoreCourseActivityPrefetchH
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             protected glossaryProvider: AddonModGlossaryProvider,
             protected commentsProvider: CoreCommentsProvider,
             protected syncProvider: AddonModGlossarySyncProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
diff --git a/src/addon/mod/imscp/providers/prefetch-handler.ts b/src/addon/mod/imscp/providers/prefetch-handler.ts
index 0b9c5b57e..6fe5ab2b9 100644
--- a/src/addon/mod/imscp/providers/prefetch-handler.ts
+++ b/src/addon/mod/imscp/providers/prefetch-handler.ts
@@ -23,6 +23,7 @@ import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseResourcePrefetchHandlerBase } from '@core/course/classes/resource-prefetch-handler';
 import { AddonModImscpProvider } from './imscp';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch IMSCPs.
@@ -41,9 +42,11 @@ export class AddonModImscpPrefetchHandler extends CoreCourseResourcePrefetchHand
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             protected imscpProvider: AddonModImscpProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
diff --git a/src/addon/mod/label/providers/prefetch-handler.ts b/src/addon/mod/label/providers/prefetch-handler.ts
index 140c23538..e05f9ac0c 100644
--- a/src/addon/mod/label/providers/prefetch-handler.ts
+++ b/src/addon/mod/label/providers/prefetch-handler.ts
@@ -23,6 +23,7 @@ import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseResourcePrefetchHandlerBase } from '@core/course/classes/resource-prefetch-handler';
 import { AddonModLabelProvider } from './label';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch labels.
@@ -43,9 +44,11 @@ export class AddonModLabelPrefetchHandler extends CoreCourseResourcePrefetchHand
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             protected labelProvider: AddonModLabelProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
diff --git a/src/addon/mod/lesson/providers/prefetch-handler.ts b/src/addon/mod/lesson/providers/prefetch-handler.ts
index 834845d47..f0732535e 100644
--- a/src/addon/mod/lesson/providers/prefetch-handler.ts
+++ b/src/addon/mod/lesson/providers/prefetch-handler.ts
@@ -26,6 +26,7 @@ import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/acti
 import { AddonModLessonProvider } from './lesson';
 import { AddonModLessonSyncProvider } from './lesson-sync';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch lessons.
@@ -48,12 +49,14 @@ export class AddonModLessonPrefetchHandler extends CoreCourseActivityPrefetchHan
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             protected modalCtrl: ModalController,
             protected groupsProvider: CoreGroupsProvider,
             protected lessonProvider: AddonModLessonProvider,
             protected injector: Injector) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
@@ -108,7 +111,9 @@ export class AddonModLessonPrefetchHandler extends CoreCourseActivityPrefetchHan
             let files = lesson.mediafiles || [];
             files = files.concat(this.getIntroFilesFromInstance(module, lesson));
 
-            result = this.utils.sumFileSizes(files);
+            return this.pluginFileDelegate.getFilesSize(files);
+        }).then((res) => {
+            result = res;
 
             // Get the pages to calculate the size.
             return this.lessonProvider.getPages(lesson.id, password, false, false, siteId);
diff --git a/src/addon/mod/lti/providers/prefetch-handler.ts b/src/addon/mod/lti/providers/prefetch-handler.ts
index 14d3c2584..d2b02d014 100644
--- a/src/addon/mod/lti/providers/prefetch-handler.ts
+++ b/src/addon/mod/lti/providers/prefetch-handler.ts
@@ -23,6 +23,7 @@ import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/activity-prefetch-handler';
 import { AddonModLtiProvider } from './lti';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch LTIs. LTIs cannot be prefetched, but the handler will be used to invalidate some data on course PTR.
@@ -41,9 +42,11 @@ export class AddonModLtiPrefetchHandler extends CoreCourseActivityPrefetchHandle
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             protected ltiProvider: AddonModLtiProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
diff --git a/src/addon/mod/page/providers/prefetch-handler.ts b/src/addon/mod/page/providers/prefetch-handler.ts
index 982b1d45b..5f72b882f 100644
--- a/src/addon/mod/page/providers/prefetch-handler.ts
+++ b/src/addon/mod/page/providers/prefetch-handler.ts
@@ -24,6 +24,7 @@ import { CoreCourseResourcePrefetchHandlerBase } from '@core/course/classes/reso
 import { AddonModPageProvider } from './page';
 import { AddonModPageHelperProvider } from './helper';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch pages.
@@ -43,10 +44,12 @@ export class AddonModPagePrefetchHandler extends CoreCourseResourcePrefetchHandl
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             protected pageProvider: AddonModPageProvider,
             protected pageHelper: AddonModPageHelperProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
diff --git a/src/addon/mod/quiz/providers/prefetch-handler.ts b/src/addon/mod/quiz/providers/prefetch-handler.ts
index 1874ce516..fdd66c7e5 100644
--- a/src/addon/mod/quiz/providers/prefetch-handler.ts
+++ b/src/addon/mod/quiz/providers/prefetch-handler.ts
@@ -29,6 +29,7 @@ import { AddonModQuizAccessRuleDelegate } from './access-rules-delegate';
 import { AddonModQuizSyncProvider } from './quiz-sync';
 import { CoreConstants } from '@core/constants';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch quizzes.
@@ -50,6 +51,7 @@ export class AddonModQuizPrefetchHandler extends CoreCourseActivityPrefetchHandl
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             protected injector: Injector,
             protected quizProvider: AddonModQuizProvider,
             protected textUtils: CoreTextUtilsProvider,
@@ -57,7 +59,8 @@ export class AddonModQuizPrefetchHandler extends CoreCourseActivityPrefetchHandl
             protected accessRuleDelegate: AddonModQuizAccessRuleDelegate,
             protected questionHelper: CoreQuestionHelperProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
diff --git a/src/addon/mod/resource/providers/prefetch-handler.ts b/src/addon/mod/resource/providers/prefetch-handler.ts
index 2f9bb6215..27c52989d 100644
--- a/src/addon/mod/resource/providers/prefetch-handler.ts
+++ b/src/addon/mod/resource/providers/prefetch-handler.ts
@@ -25,6 +25,7 @@ import { AddonModResourceProvider } from './resource';
 import { AddonModResourceHelperProvider } from './helper';
 import { CoreConstants } from '@core/constants';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch resources.
@@ -43,10 +44,12 @@ export class AddonModResourcePrefetchHandler extends CoreCourseResourcePrefetchH
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             protected resourceProvider: AddonModResourceProvider,
             protected resourceHelper: AddonModResourceHelperProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
diff --git a/src/addon/mod/scorm/providers/prefetch-handler.ts b/src/addon/mod/scorm/providers/prefetch-handler.ts
index fd2d34b6e..7c6dcccde 100644
--- a/src/addon/mod/scorm/providers/prefetch-handler.ts
+++ b/src/addon/mod/scorm/providers/prefetch-handler.ts
@@ -26,6 +26,7 @@ import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/acti
 import { AddonModScormProvider } from './scorm';
 import { AddonModScormSyncProvider } from './scorm-sync';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Progress event used when downloading a SCORM.
@@ -67,12 +68,14 @@ export class AddonModScormPrefetchHandler extends CoreCourseActivityPrefetchHand
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             protected fileProvider: CoreFileProvider,
             protected textUtils: CoreTextUtilsProvider,
             protected scormProvider: AddonModScormProvider,
             protected injector: Injector) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
diff --git a/src/addon/mod/survey/providers/prefetch-handler.ts b/src/addon/mod/survey/providers/prefetch-handler.ts
index faa894364..026d00c0e 100644
--- a/src/addon/mod/survey/providers/prefetch-handler.ts
+++ b/src/addon/mod/survey/providers/prefetch-handler.ts
@@ -25,6 +25,7 @@ import { AddonModSurveyProvider } from './survey';
 import { AddonModSurveySyncProvider } from './sync';
 import { AddonModSurveyHelperProvider } from './helper';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch surveys.
@@ -46,11 +47,13 @@ export class AddonModSurveyPrefetchHandler extends CoreCourseActivityPrefetchHan
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             protected surveyProvider: AddonModSurveyProvider,
             protected surveyHelper: AddonModSurveyHelperProvider,
             protected injector: Injector) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
diff --git a/src/addon/mod/url/providers/prefetch-handler.ts b/src/addon/mod/url/providers/prefetch-handler.ts
index f904fc429..0063f8a25 100644
--- a/src/addon/mod/url/providers/prefetch-handler.ts
+++ b/src/addon/mod/url/providers/prefetch-handler.ts
@@ -23,6 +23,7 @@ import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCourseResourcePrefetchHandlerBase } from '@core/course/classes/resource-prefetch-handler';
 import { AddonModUrlProvider } from './url';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch URLs. URLs cannot be prefetched, but the handler will be used to invalidate some data on course PTR.
@@ -40,9 +41,11 @@ export class AddonModUrlPrefetchHandler extends CoreCourseResourcePrefetchHandle
             filepoolProvider: CoreFilepoolProvider,
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
-            filterHelper: CoreFilterHelperProvider) {
+            filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
diff --git a/src/addon/mod/wiki/providers/prefetch-handler.ts b/src/addon/mod/wiki/providers/prefetch-handler.ts
index 918ad0441..cfec49818 100644
--- a/src/addon/mod/wiki/providers/prefetch-handler.ts
+++ b/src/addon/mod/wiki/providers/prefetch-handler.ts
@@ -29,6 +29,7 @@ import { CoreUserProvider } from '@core/user/providers/user';
 import { AddonModWikiProvider } from './wiki';
 import { AddonModWikiSyncProvider } from './wiki-sync';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch wikis.
@@ -48,6 +49,7 @@ export class AddonModWikiPrefetchHandler extends CoreCourseActivityPrefetchHandl
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             protected wikiProvider: AddonModWikiProvider,
             protected userProvider: CoreUserProvider,
             protected textUtils: CoreTextUtilsProvider,
@@ -56,7 +58,8 @@ export class AddonModWikiPrefetchHandler extends CoreCourseActivityPrefetchHandl
             protected gradesHelper: CoreGradesHelperProvider,
             protected syncProvider: AddonModWikiSyncProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
@@ -96,7 +99,7 @@ export class AddonModWikiPrefetchHandler extends CoreCourseActivityPrefetchHandl
             siteId = this.sitesProvider.getCurrentSiteId();
 
         promises.push(this.getFiles(module, courseId, single, siteId).then((files) => {
-            return this.utils.sumFileSizes(files);
+            return this.pluginFileDelegate.getFilesSize(files);
         }));
 
         promises.push(this.getAllPages(module, courseId, false, true, siteId).then((pages) => {
diff --git a/src/addon/mod/workshop/providers/prefetch-handler.ts b/src/addon/mod/workshop/providers/prefetch-handler.ts
index 0b7b47eee..cf7b99d42 100644
--- a/src/addon/mod/workshop/providers/prefetch-handler.ts
+++ b/src/addon/mod/workshop/providers/prefetch-handler.ts
@@ -27,6 +27,7 @@ import { AddonModWorkshopProvider } from './workshop';
 import { AddonModWorkshopSyncProvider } from './sync';
 import { AddonModWorkshopHelperProvider } from './helper';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch workshops.
@@ -47,13 +48,15 @@ export class AddonModWorkshopPrefetchHandler extends CoreCourseActivityPrefetchH
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             private groupsProvider: CoreGroupsProvider,
             private userProvider: CoreUserProvider,
             private workshopProvider: AddonModWorkshopProvider,
             private workshopHelper: AddonModWorkshopHelperProvider,
             private syncProvider: AddonModWorkshopSyncProvider) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
     }
 
     /**
diff --git a/src/components/file/file.ts b/src/components/file/file.ts
index a1c97cf3e..b8e7a7965 100644
--- a/src/components/file/file.ts
+++ b/src/components/file/file.ts
@@ -23,6 +23,7 @@ import { CoreMimetypeUtilsProvider } from '@providers/utils/mimetype';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
 import { CoreConstants } from '@core/constants';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Component to handle a remote file. Shows the file name, icon (depending on mimetype) and a button
@@ -56,10 +57,16 @@ export class CoreFileComponent implements OnInit, OnDestroy {
     protected timemodified: number;
     protected observer;
 
-    constructor(private sitesProvider: CoreSitesProvider, private utils: CoreUtilsProvider, private domUtils: CoreDomUtilsProvider,
-            private filepoolProvider: CoreFilepoolProvider, private appProvider: CoreAppProvider,
-            private fileHelper: CoreFileHelperProvider, private mimeUtils: CoreMimetypeUtilsProvider,
-            private eventsProvider: CoreEventsProvider, private textUtils: CoreTextUtilsProvider) {
+    constructor(private sitesProvider: CoreSitesProvider,
+            private utils: CoreUtilsProvider,
+            private domUtils: CoreDomUtilsProvider,
+            private filepoolProvider: CoreFilepoolProvider,
+            private appProvider: CoreAppProvider,
+            private fileHelper: CoreFileHelperProvider,
+            private mimeUtils: CoreMimetypeUtilsProvider,
+            private eventsProvider: CoreEventsProvider,
+            private textUtils: CoreTextUtilsProvider,
+            private pluginFileDelegate: CorePluginFileDelegate) {
         this.onDelete = new EventEmitter();
     }
 
@@ -141,8 +148,6 @@ export class CoreFileComponent implements OnInit, OnDestroy {
         e && e.preventDefault();
         e && e.stopPropagation();
 
-        let promise;
-
         if (this.isDownloading && !openAfterDownload) {
             return;
         }
@@ -177,20 +182,26 @@ export class CoreFileComponent implements OnInit, OnDestroy {
             });
         } else {
             // File doesn't need to be opened (it's a prefetch). Show confirm modal if file size is defined and it's big.
-            promise = this.fileSize ? this.domUtils.confirmDownloadSize({ size: this.fileSize, total: true }) : Promise.resolve();
-            promise.then(() => {
-                // User confirmed, add the file to queue.
-                return this.filepoolProvider.invalidateFileByUrl(this.siteId, this.fileUrl).finally(() => {
-                    this.isDownloading = true;
+            this.pluginFileDelegate.getFileSize({fileurl: this.fileUrl, filesize: this.fileSize}, this.siteId).then((size) => {
 
-                    this.filepoolProvider.addToQueueByUrl(this.siteId, this.fileUrl, this.component,
-                        this.componentId, this.timemodified, undefined, undefined, 0, this.file).catch((error) => {
-                            this.domUtils.showErrorModalDefault(error, 'core.errordownloading', true);
-                            this.calculateState();
-                        });
+                const promise = size ? this.domUtils.confirmDownloadSize({ size: size, total: true }) : Promise.resolve();
+
+                return promise.then(() => {
+                    // User confirmed, add the file to queue.
+                    return this.filepoolProvider.invalidateFileByUrl(this.siteId, this.fileUrl).finally(() => {
+                        this.isDownloading = true;
+
+                        this.filepoolProvider.addToQueueByUrl(this.siteId, this.fileUrl, this.component,
+                            this.componentId, this.timemodified, undefined, undefined, 0, this.file).catch((error) => {
+                                this.domUtils.showErrorModalDefault(error, 'core.errordownloading', true);
+                                this.calculateState();
+                            });
+                    });
+                }).catch(() => {
+                    // User cancelled.
                 });
-            }).catch(() => {
-                // Ignore error.
+            }).catch((error) => {
+                this.domUtils.showErrorModalDefault(error, 'core.errordownloading', true);
             });
         }
     }
diff --git a/src/core/course/classes/module-prefetch-handler.ts b/src/core/course/classes/module-prefetch-handler.ts
index 2e344104a..0448dcd33 100644
--- a/src/core/course/classes/module-prefetch-handler.ts
+++ b/src/core/course/classes/module-prefetch-handler.ts
@@ -21,6 +21,7 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreCourseProvider } from '../providers/course';
 import { CoreCourseModulePrefetchHandler } from '../providers/module-prefetch-delegate';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Base prefetch handler to be registered in CoreCourseModulePrefetchDelegate. Prefetch handlers should inherit either
@@ -67,7 +68,8 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
             protected filepoolProvider: CoreFilepoolProvider,
             protected sitesProvider: CoreSitesProvider,
             protected domUtils: CoreDomUtilsProvider,
-            protected filterHelper: CoreFilterHelperProvider) { }
+            protected filterHelper: CoreFilterHelperProvider,
+            protected pluginFileDelegate: CorePluginFileDelegate) { }
 
     /**
      * Add an ongoing download to the downloadPromises list. When the promise finishes it will be removed.
@@ -137,7 +139,7 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
      */
     getDownloadSize(module: any, courseId: number, single?: boolean): Promise<{ size: number, total: boolean }> {
         return this.getFiles(module, courseId).then((files) => {
-            return this.utils.sumFileSizes(files);
+            return this.pluginFileDelegate.getFilesSize(files);
         }).catch(() => {
             return { size: -1, total: false };
         });
diff --git a/src/core/filter/providers/default-filter.ts b/src/core/filter/providers/default-filter.ts
index 8b86c3028..f5f307500 100644
--- a/src/core/filter/providers/default-filter.ts
+++ b/src/core/filter/providers/default-filter.ts
@@ -51,11 +51,14 @@ export class CoreFilterDefaultHandler implements CoreFilterHandler {
      * @param filter The filter.
      * @param options Options passed to the filters.
      * @param viewContainerRef The ViewContainerRef where the container is.
+     * @param component Component.
+     * @param componentId Component ID.
      * @param siteId Site ID. If not defined, current site.
      * @return If async, promise resolved when done.
      */
     handleHtml(container: HTMLElement, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions,
-            viewContainerRef: ViewContainerRef, siteId?: string): void | Promise<void> {
+            viewContainerRef: ViewContainerRef, component?: string, componentId?: string | number, siteId?: string)
+            : void | Promise<void> {
         // To be overridden.
     }
 
diff --git a/src/core/filter/providers/delegate.ts b/src/core/filter/providers/delegate.ts
index 9b6184536..d712ffb31 100644
--- a/src/core/filter/providers/delegate.ts
+++ b/src/core/filter/providers/delegate.ts
@@ -49,11 +49,14 @@ export interface CoreFilterHandler extends CoreDelegateHandler {
      * @param filter The filter.
      * @param options Options passed to the filters.
      * @param viewContainerRef The ViewContainerRef where the container is.
+     * @param component Component.
+     * @param componentId Component ID.
      * @param siteId Site ID. If not defined, current site.
      * @return If async, promise resolved when done.
      */
     handleHtml?(container: HTMLElement, filter: CoreFilterFilter, options: CoreFilterFormatTextOptions,
-            viewContainerRef: ViewContainerRef, siteId?: string): void | Promise<void>;
+            viewContainerRef: ViewContainerRef, component?: string, componentId?: string | number, siteId?: string)
+            : void | Promise<void>;
 
     /**
      * Check if the filter should be applied in a certain site based on some filter options.
@@ -160,11 +163,13 @@ export class CoreFilterDelegate extends CoreDelegate {
      * @param viewContainerRef The ViewContainerRef where the container is.
      * @param options Options passed to the filters.
      * @param skipFilters Names of filters that shouldn't be applied.
+     * @param component Component.
+     * @param componentId Component ID.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
     handleHtml(container: HTMLElement, filters: CoreFilterFilter[], viewContainerRef?: ViewContainerRef, options?: any,
-            skipFilters?: string[], siteId?: string): Promise<any> {
+            skipFilters?: string[], component?: string, componentId?: string | number, siteId?: string): Promise<any> {
 
         // Wait for filters to be initialized.
         return this.handlersInitPromise.then(() => {
@@ -184,7 +189,7 @@ export class CoreFilterDelegate extends CoreDelegate {
 
                 promise = promise.then(() => {
                     return Promise.resolve(this.executeFunctionOnEnabled(filter.filter, 'handleHtml',
-                            [container, filter, options, viewContainerRef, siteId])).catch((error) => {
+                            [container, filter, options, viewContainerRef, component, componentId, siteId])).catch((error) => {
                         this.logger.error('Error handling HTML' + filter.filter, error);
                     });
                 });
diff --git a/src/core/h5p/components/h5p-player/core-h5p-player.html b/src/core/h5p/components/h5p-player/core-h5p-player.html
index af48001df..2fb1e9989 100644
--- a/src/core/h5p/components/h5p-player/core-h5p-player.html
+++ b/src/core/h5p/components/h5p-player/core-h5p-player.html
@@ -1,11 +1,9 @@
 <div *ngIf="!showPackage" class="core-h5p-placeholder">
-    <button *ngIf="!loading && !errorMessage" class="core-h5p-placeholder-play-button" ion-button icon-only clear (click)="play($event)">
+    <button *ngIf="!loading" class="core-h5p-placeholder-play-button" ion-button icon-only clear (click)="play($event)">
         <core-icon name="fa-play-circle"></core-icon>
     </button>
 
-    <ion-spinner *ngIf="loading && !errorMessage" class="core-h5p-placeholder-spinner"></ion-spinner>
-
-    <div *ngIf="errorMessage" class="core-h5p-placeholder-error">{{ errorMessage }}</div>
+    <ion-spinner *ngIf="loading" class="core-h5p-placeholder-spinner"></ion-spinner>
 
     <div class="core-h5p-placeholder-download-container">
         <core-download-refresh [status]="state" [enabled]="canDownload" [loading]="calculating" [canTrustDownload]="true" (action)="download()"></core-download-refresh>
diff --git a/src/core/h5p/components/h5p-player/h5p-player.scss b/src/core/h5p/components/h5p-player/h5p-player.scss
index b5ba7f82c..8a4875ac9 100644
--- a/src/core/h5p/components/h5p-player/h5p-player.scss
+++ b/src/core/h5p/components/h5p-player/h5p-player.scss
@@ -42,13 +42,6 @@ ion-app.app-root core-h5p-player {
             }
         }
 
-        .core-h5p-placeholder-error {
-            position: absolute;
-            width: 100%;
-            text-align: center;
-            top: 50%;
-        }
-
         ion-spinner circle {
             stroke: $core-h5p-placeholder-text-color;
         }
diff --git a/src/core/h5p/components/h5p-player/h5p-player.ts b/src/core/h5p/components/h5p-player/h5p-player.ts
index 0c4f3e937..e3eac156f 100644
--- a/src/core/h5p/components/h5p-player/h5p-player.ts
+++ b/src/core/h5p/components/h5p-player/h5p-player.ts
@@ -12,12 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, Input, ElementRef, OnInit, SimpleChange } from '@angular/core';
+import { Component, Input, ElementRef, OnInit, OnDestroy, OnChanges, SimpleChange } from '@angular/core';
+import { CoreAppProvider } from '@providers/app';
+import { CoreEventsProvider } from '@providers/events';
+import { CoreFilepoolProvider } from '@providers/filepool';
 import { CoreSitesProvider } from '@providers/sites';
+import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
 import { CoreUrlUtilsProvider } from '@providers/utils/url';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreH5PProvider } from '@core/h5p/providers/h5p';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Component to render an H5P package.
@@ -26,23 +31,38 @@ import { CoreH5PProvider } from '@core/h5p/providers/h5p';
     selector: 'core-h5p-player',
     templateUrl: 'core-h5p-player.html'
 })
-export class CoreH5PPlayerComponent implements OnInit {
+export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
     @Input() src: string; // The URL of the player to display the H5P package.
+    @Input() component?: string; // Component.
+    @Input() componentId?: string | number; // Component ID to use in conjunction with the component.
 
     playerSrc: string;
     showPackage = false;
     loading = false;
-    status: string;
+    state: string;
     canDownload: boolean;
     calculating = true;
-    errorMessage: string;
+
+    protected siteId: string;
+    protected siteCanDownload: boolean;
+    protected observer;
+    protected urlParams;
 
     constructor(public elementRef: ElementRef,
             protected sitesProvider: CoreSitesProvider,
             protected urlUtils: CoreUrlUtilsProvider,
             protected utils: CoreUtilsProvider,
             protected textUtils: CoreTextUtilsProvider,
-            protected h5pProvider: CoreH5PProvider) { }
+            protected h5pProvider: CoreH5PProvider,
+            protected filepoolProvider: CoreFilepoolProvider,
+            protected eventsProvider: CoreEventsProvider,
+            protected appProvider: CoreAppProvider,
+            protected domUtils: CoreDomUtilsProvider,
+            protected pluginFileDelegate: CorePluginFileDelegate) {
+
+        this.siteId = sitesProvider.getCurrentSiteId();
+        this.siteCanDownload = this.sitesProvider.getCurrentSite().canDownloadFiles();
+    }
 
     /**
      * Component being initialized.
@@ -85,37 +105,49 @@ export class CoreH5PPlayerComponent implements OnInit {
     /**
      * Download the package.
      */
-    download(): void {
-        // @TODO: Implement package download.
+    download(e: Event): void {
+        e && e.preventDefault();
+        e && e.stopPropagation();
+
+        if (!this.appProvider.isOnline()) {
+            this.domUtils.showErrorModal('core.networkerrormsg', true);
+
+            return;
+        }
+
+        // Get the file size and ask the user to confirm.
+        this.pluginFileDelegate.getFileSize({fileurl: this.urlParams.url}, this.siteId).then((size) => {
+            return this.domUtils.confirmDownloadSize({ size: size, total: true }).then(() => {
+
+                // User confirmed, add to the queue.
+                return this.filepoolProvider.addToQueueByUrl(this.siteId, this.urlParams.url, this.component, this.componentId);
+            }, () => {
+                // User cancelled.
+            });
+        }).catch((error) => {
+            this.domUtils.showErrorModalDefault(error, 'core.errordownloading', true);
+            this.calculateState();
+        });
     }
 
     /**
      * Check if the package can be downloaded.
      */
     protected checkCanDownload(): void {
-        if (this.src && this.h5pProvider.canGetTrustedH5PFileInSite()) {
-            const params = this.urlUtils.extractUrlParams(this.src);
+        this.observer && this.observer.off();
+        this.urlParams = this.urlUtils.extractUrlParams(this.src);
 
-            // @todo: Check if H5P offline is disabled in the site.
+        if (this.src && this.siteCanDownload && this.h5pProvider.canGetTrustedH5PFileInSite()) {
 
-            // Now check if the package can be played.
             this.calculating = true;
 
-            const options = {
-                frame: this.utils.isTrueOrOne(params.frame),
-                export: this.utils.isTrueOrOne(params.export),
-                embed: this.utils.isTrueOrOne(params.embed),
-                copyright: this.utils.isTrueOrOne(params.copyright),
-            };
+            this.calculateState();
 
-            this.h5pProvider.getTrustedH5PFile(params.url, options).then((file) => {
-                this.canDownload = true;
-                this.errorMessage = undefined;
-            }).catch((error) => {
-                this.canDownload = false;
-                this.errorMessage = this.textUtils.getErrorMessageFromError(error);
-            }).finally(() => {
-                this.calculating = false;
+            // Listen for changes in the state.
+            this.filepoolProvider.getFileEventNameByUrl(this.siteId, this.urlParams.url).then((eventName) => {
+                this.observer = this.eventsProvider.on(eventName, () => {
+                    this.calculateState();
+                });
             });
 
             return;
@@ -123,6 +155,29 @@ export class CoreH5PPlayerComponent implements OnInit {
 
         this.calculating = false;
         this.canDownload = false;
-        this.errorMessage = undefined;
+    }
+
+    /**
+     * Calcuñate state of the file.
+     *
+     * @param fileUrl The H5P file URL.
+     */
+    protected calculateState(): void {
+        // Get the status of the file.
+        this.filepoolProvider.getFileStateByUrl(this.siteId, this.urlParams.url).then((state) => {
+            this.canDownload = true;
+            this.state = state;
+        }).catch((error) => {
+            this.canDownload = false;
+        }).finally(() => {
+            this.calculating = false;
+        });
+    }
+
+    /**
+     * Component destroyed.
+     */
+    ngOnDestroy(): void {
+        this.observer && this.observer.off();
     }
 }
diff --git a/src/core/h5p/h5p.module.ts b/src/core/h5p/h5p.module.ts
index ddc625a0b..f05f16c29 100644
--- a/src/core/h5p/h5p.module.ts
+++ b/src/core/h5p/h5p.module.ts
@@ -15,6 +15,8 @@
 import { NgModule } from '@angular/core';
 import { CoreH5PComponentsModule } from './components/components.module';
 import { CoreH5PProvider } from './providers/h5p';
+import { CoreH5PPluginFileHandler } from './providers/pluginfile-handler';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 // List of providers (without handlers).
 export const CORE_H5P_PROVIDERS: any[] = [
@@ -27,8 +29,15 @@ export const CORE_H5P_PROVIDERS: any[] = [
         CoreH5PComponentsModule
     ],
     providers: [
-        CoreH5PProvider
+        CoreH5PProvider,
+        CoreH5PPluginFileHandler
     ],
     exports: []
 })
-export class CoreH5PModule { }
+export class CoreH5PModule {
+    constructor(pluginfileDelegate: CorePluginFileDelegate,
+            pluginfileHandler: CoreH5PPluginFileHandler) {
+
+        pluginfileDelegate.registerHandler(pluginfileHandler);
+    }
+}
diff --git a/src/core/h5p/providers/h5p.ts b/src/core/h5p/providers/h5p.ts
index 335e5025f..557d2c3c1 100644
--- a/src/core/h5p/providers/h5p.ts
+++ b/src/core/h5p/providers/h5p.ts
@@ -17,6 +17,7 @@ import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreWSExternalWarning, CoreWSExternalFile } from '@providers/ws';
+import { CoreTextUtilsProvider } from '@providers/utils/text';
 
 /**
  * Service to provide H5P functionalities.
@@ -29,7 +30,8 @@ export class CoreH5PProvider {
     protected logger;
 
     constructor(logger: CoreLoggerProvider,
-            private sitesProvider: CoreSitesProvider) {
+            private sitesProvider: CoreSitesProvider,
+            private textUtils: CoreTextUtilsProvider) {
 
         this.logger = logger.getInstance('CoreFilterProvider');
     }
@@ -69,13 +71,15 @@ export class CoreH5PProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the file data.
      */
-    getTrustedH5PFile(url: string, options: CoreH5PGetTrustedFileOptions, ignoreCache?: boolean, siteId?: string)
+    getTrustedH5PFile(url: string, options?: CoreH5PGetTrustedFileOptions, ignoreCache?: boolean, siteId?: string)
             : Promise<CoreWSExternalFile> {
 
+        options = options || {};
+
         return this.sitesProvider.getSite(siteId).then((site) => {
 
             const data = {
-                    url: url,
+                    url: this.treatH5PUrl(url, site.getURL()),
                     frame: options.frame ? 1 : 0,
                     export: options.export ? 1 : 0,
                     embed: options.embed ? 1 : 0,
@@ -124,6 +128,21 @@ export class CoreH5PProvider {
         return this.ROOT_CACHE_KEY + 'trustedH5PFile:';
     }
 
+    /**
+     * Treat an H5P url before sending it to WS.
+     *
+     * @param url H5P file URL.
+     * @param siteUrl Site URL.
+     * @return Treated url.
+     */
+    protected treatH5PUrl(url: string, siteUrl: string): string {
+        if (url.indexOf(this.textUtils.concatenatePaths(siteUrl, '/webservice/pluginfile.php')) === 0) {
+            url = url.replace('/webservice/pluginfile', '/pluginfile');
+        }
+
+        return url;
+    }
+
     /**
      * Invalidates all trusted H5P file WS calls.
      *
diff --git a/src/core/h5p/providers/pluginfile-handler.ts b/src/core/h5p/providers/pluginfile-handler.ts
new file mode 100644
index 000000000..b61de5b00
--- /dev/null
+++ b/src/core/h5p/providers/pluginfile-handler.ts
@@ -0,0 +1,121 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+import { CoreFileProvider } from '@providers/file';
+import { CorePluginFileHandler } from '@providers/plugin-file-delegate';
+import { CoreMimetypeUtilsProvider } from '@providers/utils/mimetype';
+import { CoreTextUtilsProvider } from '@providers/utils/text';
+import { CoreUrlUtilsProvider } from '@providers/utils/url';
+import { CoreUtilsProvider } from '@providers/utils/utils';
+import { CoreH5PProvider } from './h5p';
+import { CoreWSExternalFile } from '@providers/ws';
+
+/**
+ * Handler to treat H5P files.
+ */
+@Injectable()
+export class CoreH5PPluginFileHandler implements CorePluginFileHandler {
+    name = 'CoreH5PPluginFileHandler';
+
+    constructor(protected urlUtils: CoreUrlUtilsProvider,
+            protected mimeUtils: CoreMimetypeUtilsProvider,
+            protected textUtils: CoreTextUtilsProvider,
+            protected utils: CoreUtilsProvider,
+            protected fileProvider: CoreFileProvider,
+            protected h5pProvider: CoreH5PProvider) { }
+
+    /**
+     * Check whether a file can be downloaded. If so, return the file to download.
+     *
+     * @param file The file data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the file to use. Rejected if cannot download.
+     */
+    canDownloadFile(file: CoreWSExternalFile, siteId?: string): Promise<CoreWSExternalFile> {
+        return this.h5pProvider.getTrustedH5PFile(file.fileurl, {}, false, siteId);
+    }
+
+    /**
+     * Given an HTML element, get the URLs of the files that should be downloaded and weren't treated by
+     * CoreDomUtilsProvider.extractDownloadableFilesFromHtml.
+     *
+     * @param container Container where to get the URLs from.
+     * @return {string[]} List of URLs.
+     */
+    getDownloadableFiles(container: HTMLElement): string[] {
+        const iframes = <HTMLIFrameElement[]> Array.from(container.querySelectorAll('iframe.h5p-iframe'));
+        const urls = [];
+
+        for (let i = 0; i < iframes.length; i++) {
+            const params = this.urlUtils.extractUrlParams(iframes[i].src);
+
+            if (params.url) {
+                urls.push(params.url);
+            }
+        }
+
+        return urls;
+    }
+
+    /**
+     * Get a file size.
+     *
+     * @param file The file data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the size.
+     */
+    getFileSize(file: CoreWSExternalFile, siteId?: string): Promise<number> {
+        return this.h5pProvider.getTrustedH5PFile(file.fileurl, {}, false, siteId).then((file) => {
+            return file.filesize;
+        }).catch((error): any => {
+            if (this.utils.isWebServiceError(error)) {
+                // WS returned an error, it means it cannot be downloaded.
+                return 0;
+            }
+
+            return Promise.reject(error);
+        });
+    }
+
+    /**
+     * Check whether the file should be treated by this handler. It is used in functions where the component isn't used.
+     *
+     * @param file The file data.
+     * @return Whether the file should be treated by this handler.
+     */
+    shouldHandleFile(file: CoreWSExternalFile): boolean {
+        return this.mimeUtils.guessExtensionFromUrl(file.fileurl) == 'h5p';
+    }
+
+    /**
+     * Treat a downloaded file.
+     *
+     * @param fileUrl The file URL used to download the file.
+     * @param file The file entry of the downloaded file.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    treatDownloadedFile(fileUrl: string, file: FileEntry, siteId?: string): Promise<any> {
+        // Unzip the file.
+        const destFolder = this.textUtils.concatenatePaths(CoreFileProvider.TMPFOLDER,
+                'h5p/' + this.mimeUtils.removeExtension(file.name));
+
+        return this.fileProvider.createDir(destFolder).then(() => {
+            return this.fileProvider.unzipFile(file.toURL(), destFolder);
+        }).then(() => {
+            // @todo: Deploy the package.
+        });
+    }
+}
diff --git a/src/core/siteplugins/classes/handlers/module-prefetch-handler.ts b/src/core/siteplugins/classes/handlers/module-prefetch-handler.ts
index e2cc1d795..d4a22f79d 100644
--- a/src/core/siteplugins/classes/handlers/module-prefetch-handler.ts
+++ b/src/core/siteplugins/classes/handlers/module-prefetch-handler.ts
@@ -22,6 +22,7 @@ import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreSitePluginsProvider } from '../../providers/siteplugins';
 import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/activity-prefetch-handler';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 /**
  * Handler to prefetch a module site plugin.
@@ -39,13 +40,15 @@ export class CoreSitePluginsModulePrefetchHandler extends CoreCourseActivityPref
             sitesProvider: CoreSitesProvider,
             domUtils: CoreDomUtilsProvider,
             filterHelper: CoreFilterHelperProvider,
+            pluginFileDelegate: CorePluginFileDelegate,
             protected sitePluginsProvider: CoreSitePluginsProvider,
             component: string,
             name: string,
             modName: string,
             protected handlerSchema: any) {
 
-        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper);
+        super(translate, appProvider, utils, courseProvider, filepoolProvider, sitesProvider, domUtils, filterHelper,
+                pluginFileDelegate);
 
         this.component = component;
         this.name = name;
diff --git a/src/core/siteplugins/providers/helper.ts b/src/core/siteplugins/providers/helper.ts
index 3ec5d444f..170ccf2aa 100644
--- a/src/core/siteplugins/providers/helper.ts
+++ b/src/core/siteplugins/providers/helper.ts
@@ -32,6 +32,7 @@ import { CoreQuestionProvider } from '@core/question/providers/question';
 import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
 import { CoreFilterHelperProvider } from '@core/filter/providers/helper';
+import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 // Delegates
 import { CoreMainMenuDelegate } from '@core/mainmenu/providers/delegate';
@@ -117,7 +118,8 @@ export class CoreSitePluginsHelperProvider {
             private workshopAssessmentStrategyDelegate: AddonWorkshopAssessmentStrategyDelegate,
             private courseProvider: CoreCourseProvider,
             private blockDelegate: CoreBlockDelegate,
-            private filterHelper: CoreFilterHelperProvider) {
+            private filterHelper: CoreFilterHelperProvider,
+            private pluginFileDelegate: CorePluginFileDelegate) {
 
         this.logger = loggerProvider.getInstance('CoreSitePluginsHelperProvider');
 
@@ -841,7 +843,7 @@ export class CoreSitePluginsHelperProvider {
             // Register the prefetch handler.
             this.prefetchDelegate.registerHandler(new CoreSitePluginsModulePrefetchHandler(this.translate, this.appProvider,
                 this.utils, this.courseProvider, this.filepoolProvider, this.sitesProvider, this.domUtils, this.filterHelper,
-                this.sitePluginsProvider, plugin.component, uniqueName, modName, handlerSchema));
+                this.pluginFileDelegate, this.sitePluginsProvider, plugin.component, uniqueName, modName, handlerSchema));
         }
 
         return uniqueName;
diff --git a/src/directives/format-text.ts b/src/directives/format-text.ts
index 1ae718161..54e627c9f 100644
--- a/src/directives/format-text.ts
+++ b/src/directives/format-text.ts
@@ -375,7 +375,7 @@ export class CoreFormatTextDirective implements OnChanges {
             if (result.options.filter) {
                 // Let filters hnadle HTML. We do it here because we don't want them to block the render of the text.
                 this.filterDelegate.handleHtml(this.element, result.filters, this.viewContainerRef, result.options, [],
-                        result.siteId);
+                        this.component, this.componentId, result.siteId);
             }
 
             this.element.classList.remove('core-disable-media-adapt');
diff --git a/src/providers/filepool.ts b/src/providers/filepool.ts
index b025fbbc0..ddea2ddbb 100644
--- a/src/providers/filepool.ts
+++ b/src/providers/filepool.ts
@@ -21,7 +21,7 @@ import { CoreInitDelegate } from './init';
 import { CoreLoggerProvider } from './logger';
 import { CorePluginFileDelegate } from './plugin-file-delegate';
 import { CoreSitesProvider, CoreSiteSchema } from './sites';
-import { CoreWSProvider } from './ws';
+import { CoreWSProvider, CoreWSExternalFile } from './ws';
 import { CoreDomUtilsProvider } from './utils/dom';
 import { CoreMimetypeUtilsProvider } from './utils/mimetype';
 import { CoreTextUtilsProvider } from './utils/text';
@@ -473,8 +473,8 @@ export class CoreFilepoolProvider {
      * downloading a file automatically does this. Note that this method does not check if the file exists in the pool.
      */
     addFileLinkByUrl(siteId: string, fileUrl: string, component: string, componentId?: string | number): Promise<any> {
-        return this.fixPluginfileURL(siteId, fileUrl).then((fileUrl) => {
-            const fileId = this.getFileIdByUrl(fileUrl);
+        return this.fixPluginfileURL(siteId, fileUrl).then((file) => {
+            const fileId = this.getFileIdByUrl(file.fileurl);
 
             return this.addFileLink(siteId, fileId, component, componentId);
         });
@@ -605,11 +605,12 @@ export class CoreFilepoolProvider {
      * @param priority The priority this file should get in the queue (range 0-999).
      * @param options Extra options (isexternalfile, repositorytype).
      * @param revision File revision. If not defined, it will be calculated using the URL.
+     * @param alreadyFixed Whether the URL has already been fixed.
      * @return Resolved on success.
      */
     addToQueueByUrl(siteId: string, fileUrl: string, component?: string, componentId?: string | number, timemodified: number = 0,
-            filePath?: string, onProgress?: (event: any) => any, priority: number = 0, options: any = {}, revision?: number)
-            : Promise<any> {
+            filePath?: string, onProgress?: (event: any) => any, priority: number = 0, options: any = {}, revision?: number,
+            alreadyFixed?: boolean): Promise<any> {
         let fileId,
             link,
             queueDeferred;
@@ -623,94 +624,102 @@ export class CoreFilepoolProvider {
                 return Promise.reject(null);
             }
 
-            return this.fixPluginfileURL(siteId, fileUrl).then((fileUrl) => {
-                const primaryKey = { siteId: siteId, fileId: fileId };
+            if (alreadyFixed) {
+                // Already fixed, if we reached here it means it can be downloaded.
+                return <CoreWSExternalFile> {fileurl: fileUrl};
+            } else {
+                return this.fixPluginfileURL(siteId, fileUrl);
+            }
+        }).then((file) => {
 
-                revision = revision || this.getRevisionFromUrl(fileUrl);
-                fileId = this.getFileIdByUrl(fileUrl);
+            fileUrl = file.fileurl;
+            timemodified = file.timemodified || timemodified;
+            revision = revision || this.getRevisionFromUrl(fileUrl);
+            fileId = this.getFileIdByUrl(fileUrl);
 
-                // Set up the component.
-                if (typeof component != 'undefined') {
-                    link = {
-                        component: component,
-                        componentId: this.fixComponentId(componentId)
-                    };
-                }
+            const primaryKey = { siteId: siteId, fileId: fileId };
 
-                // Retrieve the queue deferred now if it exists.
-                // This is to prevent errors if file is removed from queue while we're checking if the file is in queue.
-                queueDeferred = this.getQueueDeferred(siteId, fileId, false, onProgress);
+            // Set up the component.
+            if (typeof component != 'undefined') {
+                link = {
+                    component: component,
+                    componentId: this.fixComponentId(componentId)
+                };
+            }
 
-                return this.hasFileInQueue(siteId, fileId).then((entry: CoreFilepoolQueueEntry) => {
-                    const newData: any = {};
-                    let foundLink = false;
+            // Retrieve the queue deferred now if it exists.
+            // This is to prevent errors if file is removed from queue while we're checking if the file is in queue.
+            queueDeferred = this.getQueueDeferred(siteId, fileId, false, onProgress);
 
-                    if (entry) {
-                        // We already have the file in queue, we update the priority and links.
-                        if (entry.priority < priority) {
-                            newData.priority = priority;
-                        }
-                        if (revision && entry.revision !== revision) {
-                            newData.revision = revision;
-                        }
-                        if (timemodified && entry.timemodified !== timemodified) {
-                            newData.timemodified = timemodified;
-                        }
-                        if (filePath && entry.path !== filePath) {
-                            newData.path = filePath;
-                        }
-                        if (entry.isexternalfile !== options.isexternalfile && (entry.isexternalfile || options.isexternalfile)) {
-                            newData.isexternalfile = options.isexternalfile;
-                        }
-                        if (entry.repositorytype !== options.repositorytype && (entry.repositorytype || options.repositorytype)) {
-                            newData.repositorytype = options.repositorytype;
-                        }
+            return this.hasFileInQueue(siteId, fileId).then((entry: CoreFilepoolQueueEntry) => {
+                const newData: any = {};
+                let foundLink = false;
 
-                        if (link) {
-                            // We need to add the new link if it does not exist yet.
-                            if (entry.links && entry.links.length) {
-                                for (const i in entry.links) {
-                                    const fileLink = entry.links[i];
-                                    if (fileLink.component == link.component && fileLink.componentId == link.componentId) {
-                                        foundLink = true;
-                                        break;
-                                    }
+                if (entry) {
+                    // We already have the file in queue, we update the priority and links.
+                    if (entry.priority < priority) {
+                        newData.priority = priority;
+                    }
+                    if (revision && entry.revision !== revision) {
+                        newData.revision = revision;
+                    }
+                    if (timemodified && entry.timemodified !== timemodified) {
+                        newData.timemodified = timemodified;
+                    }
+                    if (filePath && entry.path !== filePath) {
+                        newData.path = filePath;
+                    }
+                    if (entry.isexternalfile !== options.isexternalfile && (entry.isexternalfile || options.isexternalfile)) {
+                        newData.isexternalfile = options.isexternalfile;
+                    }
+                    if (entry.repositorytype !== options.repositorytype && (entry.repositorytype || options.repositorytype)) {
+                        newData.repositorytype = options.repositorytype;
+                    }
+
+                    if (link) {
+                        // We need to add the new link if it does not exist yet.
+                        if (entry.links && entry.links.length) {
+                            for (const i in entry.links) {
+                                const fileLink = entry.links[i];
+                                if (fileLink.component == link.component && fileLink.componentId == link.componentId) {
+                                    foundLink = true;
+                                    break;
                                 }
                             }
-
-                            if (!foundLink) {
-                                newData.links = entry.links || [];
-                                newData.links.push(link);
-                                newData.links = JSON.stringify(entry.links);
-                            }
                         }
 
-                        if (Object.keys(newData).length) {
-                            // Update only when required.
-                            this.logger.debug(`Updating file ${fileId} which is already in queue`);
-
-                            return this.appDB.updateRecords(this.QUEUE_TABLE, newData, primaryKey).then(() => {
-                                return this.getQueuePromise(siteId, fileId, true, onProgress);
-                            });
+                        if (!foundLink) {
+                            newData.links = entry.links || [];
+                            newData.links.push(link);
+                            newData.links = JSON.stringify(entry.links);
                         }
-
-                        this.logger.debug(`File ${fileId} already in queue and does not require update`);
-                        if (queueDeferred) {
-                            // If we were able to retrieve the queue deferred before, we use that one.
-                            return queueDeferred.promise;
-                        } else {
-                            // Create a new deferred and return its promise.
-                            return this.getQueuePromise(siteId, fileId, true, onProgress);
-                        }
-                    } else {
-                        return this.addToQueue(
-                            siteId, fileId, fileUrl, priority, revision, timemodified, filePath, onProgress, options, link);
                     }
-                }, () => {
-                    // Unsure why we could not get the record, let's add to the queue anyway.
+
+                    if (Object.keys(newData).length) {
+                        // Update only when required.
+                        this.logger.debug(`Updating file ${fileId} which is already in queue`);
+
+                        return this.appDB.updateRecords(this.QUEUE_TABLE, newData, primaryKey).then(() => {
+                            return this.getQueuePromise(siteId, fileId, true, onProgress);
+                        });
+                    }
+
+                    this.logger.debug(`File ${fileId} already in queue and does not require update`);
+                    if (queueDeferred) {
+                        // If we were able to retrieve the queue deferred before, we use that one.
+                        return queueDeferred.promise;
+                    } else {
+                        // Create a new deferred and return its promise.
+                        return this.getQueuePromise(siteId, fileId, true, onProgress);
+                    }
+                } else {
                     return this.addToQueue(
                         siteId, fileId, fileUrl, priority, revision, timemodified, filePath, onProgress, options, link);
-                });
+                }
+            }, () => {
+                // Unsure why we could not get the record, let's add to the queue anyway.
+                return this.addToQueue(
+                    siteId, fileId, fileUrl, priority, revision, timemodified, filePath, onProgress, options, link);
             });
         });
     }
@@ -719,7 +728,7 @@ export class CoreFilepoolProvider {
      * Adds a file to the queue if the size is allowed to be downloaded.
      *
      * @param siteId The site ID.
-     * @param fileUrl The absolute URL to the file.
+     * @param fileUrl The absolute URL to the file, already fixed.
      * @param component The component to link the file to.
      * @param componentId An ID to use in conjunction with the component.
      * @param timemodified The time this file was modified.
@@ -760,18 +769,18 @@ export class CoreFilepoolProvider {
                 // Check if the file should be downloaded.
                 if (sizeUnknown) {
                     if (downloadUnknown && isWifi) {
-                        return this.addToQueueByUrl(
-                            siteId, fileUrl, component, componentId, timemodified, undefined, undefined, 0, options, revision);
+                        return this.addToQueueByUrl(siteId, fileUrl, component, componentId, timemodified, undefined, undefined,
+                                0, options, revision, true);
                     }
                 } else if (size <= this.DOWNLOAD_THRESHOLD || (isWifi && size <= this.WIFI_DOWNLOAD_THRESHOLD)) {
-                    return this.addToQueueByUrl(
-                        siteId, fileUrl, component, componentId, timemodified, undefined, undefined, 0, options, revision);
+                    return this.addToQueueByUrl(siteId, fileUrl, component, componentId, timemodified, undefined, undefined, 0,
+                            options, revision, true);
                 }
             });
         } else {
             // No need to check size, just add it to the queue.
             return this.addToQueueByUrl(siteId, fileUrl, component, componentId, timemodified, undefined, undefined, 0, options,
-                    revision);
+                    revision, true);
         }
     }
 
@@ -938,7 +947,13 @@ export class CoreFilepoolProvider {
                     return Promise.reject(null);
                 }
 
-                return this.wsProvider.downloadFile(fileUrl, filePath, addExtension, onProgress).then((fileEntry) => {
+                let fileEntry;
+
+                return this.wsProvider.downloadFile(fileUrl, filePath, addExtension, onProgress).then((entry) => {
+                    fileEntry = entry;
+
+                    return this.pluginFileDelegate.treatDownloadedFile(fileUrl, fileEntry, siteId);
+                }).then(() => {
                     const data: CoreFilepoolFileEntry = poolFileObject || {};
 
                     data.downloadTime = Date.now();
@@ -1157,8 +1172,10 @@ export class CoreFilepoolProvider {
             promise;
 
         if (this.fileProvider.isAvailable()) {
-            return this.fixPluginfileURL(siteId, fileUrl).then((fixedUrl) => {
-                fileUrl = fixedUrl;
+            return this.fixPluginfileURL(siteId, fileUrl).then((file) => {
+
+                fileUrl = file.fileurl;
+                timemodified = file.timemodified || timemodified;
 
                 options = Object.assign({}, options); // Create a copy to prevent modifying the original object.
                 options.timemodified = timemodified || 0;
@@ -1313,15 +1330,24 @@ export class CoreFilepoolProvider {
     }
 
     /**
-     * Add the wstoken url and points to the correct script.
+     * Check whether the file can be downloaded, add the wstoken url and points to the correct script.
      *
      * @param siteId The site ID.
      * @param fileUrl The file URL.
-     * @return Resolved with fixed URL on success, rejected otherwise.
+     * @param timemodified The timemodified of the file.
+     * @return Promise resolved with the file data to use.
      */
-    protected fixPluginfileURL(siteId: string, fileUrl: string): Promise<string> {
-        return this.sitesProvider.getSite(siteId).then((site) => {
-            return site.checkAndFixPluginfileURL(fileUrl);
+    protected fixPluginfileURL(siteId: string, fileUrl: string, timemodified: number = 0): Promise<CoreWSExternalFile> {
+
+        return this.pluginFileDelegate.canDownloadFile({fileurl: fileUrl, timemodified: timemodified}).then((file) => {
+
+            return this.sitesProvider.getSite(siteId).then((site) => {
+                return site.checkAndFixPluginfileURL(file.fileurl);
+            }).then((fixedUrl) => {
+                file.fileurl = fixedUrl;
+
+                return file;
+            });
         });
     }
 
@@ -1351,8 +1377,8 @@ export class CoreFilepoolProvider {
      */
     getDirectoryUrlByUrl(siteId: string, fileUrl: string): Promise<string> {
         if (this.fileProvider.isAvailable()) {
-            return this.fixPluginfileURL(siteId, fileUrl).then((fileUrl) => {
-                const fileId = this.getFileIdByUrl(fileUrl),
+            return this.fixPluginfileURL(siteId, fileUrl).then((file) => {
+                const fileId = this.getFileIdByUrl(file.fileurl),
                     filePath = <string> this.getFilePath(siteId, fileId, ''); // No extension, the function will return a string.
 
                 return this.fileProvider.getDir(filePath).then((dirEntry) => {
@@ -1394,8 +1420,8 @@ export class CoreFilepoolProvider {
      * @return Promise resolved with event name.
      */
     getFileEventNameByUrl(siteId: string, fileUrl: string): Promise<string> {
-        return this.fixPluginfileURL(siteId, fileUrl).then((fileUrl) => {
-            const fileId = this.getFileIdByUrl(fileUrl);
+        return this.fixPluginfileURL(siteId, fileUrl).then((file) => {
+            const fileId = this.getFileIdByUrl(file.fileurl);
 
             return this.getFileEventName(siteId, fileId);
         });
@@ -1490,8 +1516,8 @@ export class CoreFilepoolProvider {
      * @return Promise resolved with the path to the file relative to storage root.
      */
     getFilePathByUrl(siteId: string, fileUrl: string): Promise<string> {
-        return this.fixPluginfileURL(siteId, fileUrl).then((fileUrl) => {
-            const fileId = this.getFileIdByUrl(fileUrl);
+        return this.fixPluginfileURL(siteId, fileUrl).then((file) => {
+            const fileId = this.getFileIdByUrl(file.fileurl);
 
             return this.getFilePath(siteId, fileId);
         });
@@ -1587,8 +1613,10 @@ export class CoreFilepoolProvider {
             : Promise<string> {
         let fileId;
 
-        return this.fixPluginfileURL(siteId, fileUrl).then((fixedUrl) => {
-            fileUrl = fixedUrl;
+        return this.fixPluginfileURL(siteId, fileUrl, timemodified).then((file) => {
+
+            fileUrl = file.fileurl;
+            timemodified = file.timemodified || timemodified;
             revision = revision || this.getRevisionFromUrl(fileUrl);
             fileId = this.getFileIdByUrl(fileUrl);
 
@@ -1618,6 +1646,8 @@ export class CoreFilepoolProvider {
                     });
                 });
             });
+        }, () => {
+            return CoreConstants.NOT_DOWNLOADABLE;
         });
     }
 
@@ -1655,8 +1685,10 @@ export class CoreFilepoolProvider {
                     });
             };
 
-        return this.fixPluginfileURL(siteId, fileUrl).then((fixedUrl) => {
-            fileUrl = fixedUrl;
+        return this.fixPluginfileURL(siteId, fileUrl, timemodified).then((file) => {
+
+            fileUrl = file.fileurl;
+            timemodified = file.timemodified || timemodified;
             revision = revision || this.getRevisionFromUrl(fileUrl);
             fileId = this.getFileIdByUrl(fileUrl);
 
@@ -1779,8 +1811,8 @@ export class CoreFilepoolProvider {
      */
     getInternalUrlByUrl(siteId: string, fileUrl: string): Promise<string> {
         if (this.fileProvider.isAvailable()) {
-            return this.fixPluginfileURL(siteId, fileUrl).then((fileUrl) => {
-                const fileId = this.getFileIdByUrl(fileUrl);
+            return this.fixPluginfileURL(siteId, fileUrl).then((file) => {
+                const fileId = this.getFileIdByUrl(file.fileurl);
 
                 return this.getInternalUrlById(siteId, fileId);
             });
@@ -1843,8 +1875,8 @@ export class CoreFilepoolProvider {
      * @return Promise resolved with the path of the package.
      */
     getPackageDirPathByUrl(siteId: string, url: string): Promise<string> {
-        return this.fixPluginfileURL(siteId, url).then((fixedUrl) => {
-            const dirName = this.getPackageDirNameByUrl(fixedUrl);
+        return this.fixPluginfileURL(siteId, url).then((file) => {
+            const dirName = this.getPackageDirNameByUrl(file.fileurl);
 
             return this.getFilePath(siteId, dirName, '');
         });
@@ -1859,8 +1891,8 @@ export class CoreFilepoolProvider {
      */
     getPackageDirUrlByUrl(siteId: string, url: string): Promise<string> {
         if (this.fileProvider.isAvailable()) {
-            return this.fixPluginfileURL(siteId, url).then((fixedUrl) => {
-                const dirName = this.getPackageDirNameByUrl(fixedUrl),
+            return this.fixPluginfileURL(siteId, url).then((file) => {
+                const dirName = this.getPackageDirNameByUrl(file.fileurl),
                     dirPath = <string> this.getFilePath(siteId, dirName, ''); // No extension, the function will return a string.
 
                 return this.fileProvider.getDir(dirPath).then((dirEntry) => {
@@ -2270,8 +2302,8 @@ export class CoreFilepoolProvider {
      * Please note that, if a file is stale, the user will be presented the stale file if there is no network access.
      */
     invalidateFileByUrl(siteId: string, fileUrl: string): Promise<any> {
-        return this.fixPluginfileURL(siteId, fileUrl).then((fileUrl) => {
-            const fileId = this.getFileIdByUrl(fileUrl);
+        return this.fixPluginfileURL(siteId, fileUrl).then((file) => {
+            const fileId = this.getFileIdByUrl(file.fileurl);
 
             return this.sitesProvider.getSiteDb(siteId).then((db) => {
                 return db.updateRecords(this.FILES_TABLE, { stale: 1 }, { fileId: fileId });
@@ -2318,8 +2350,8 @@ export class CoreFilepoolProvider {
      * @param Promise resolved if file is downloading, rejected otherwise.
      */
     isFileDownloadingByUrl(siteId: string, fileUrl: string): Promise<any> {
-        return this.fixPluginfileURL(siteId, fileUrl).then((fileUrl) => {
-            const fileId = this.getFileIdByUrl(fileUrl);
+        return this.fixPluginfileURL(siteId, fileUrl).then((file) => {
+            const fileId = this.getFileIdByUrl(file.fileurl);
 
             return this.hasFileInQueue(siteId, fileId);
         });
@@ -2667,8 +2699,8 @@ export class CoreFilepoolProvider {
      * @return Resolved on success, rejected on failure.
      */
     removeFileByUrl(siteId: string, fileUrl: string): Promise<any> {
-        return this.fixPluginfileURL(siteId, fileUrl).then((fileUrl) => {
-            const fileId = this.getFileIdByUrl(fileUrl);
+        return this.fixPluginfileURL(siteId, fileUrl).then((file) => {
+            const fileId = this.getFileIdByUrl(file.fileurl);
 
             return this.removeFileById(siteId, fileId);
         });
diff --git a/src/providers/plugin-file-delegate.ts b/src/providers/plugin-file-delegate.ts
index b6b9851b0..b1c33e1f0 100644
--- a/src/providers/plugin-file-delegate.ts
+++ b/src/providers/plugin-file-delegate.ts
@@ -14,6 +14,7 @@
 
 import { Injectable } from '@angular/core';
 import { CoreLoggerProvider } from './logger';
+import { CoreWSExternalFile } from '@providers/ws';
 
 /**
  * Interface that all plugin file handlers must implement.
@@ -26,8 +27,9 @@ export interface CorePluginFileHandler {
 
     /**
      * The "component" of the handler. It should match the "component" of pluginfile URLs.
+     * It is used to treat revision from URLs.
      */
-    component: string;
+    component?: string;
 
     /**
      * Return the RegExp to match the revision on pluginfile URLs.
@@ -44,6 +46,51 @@ export interface CorePluginFileHandler {
      * @return String to remove the revision on pluginfile url.
      */
     getComponentRevisionReplace?(args: string[]): string;
+
+    /**
+     * Check whether a file can be downloaded. If so, return the file to download.
+     *
+     * @param file The file data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the file to use. Rejected if cannot download.
+     */
+    canDownloadFile?(file: CoreWSExternalFile, siteId?: string): Promise<CoreWSExternalFile>;
+
+    /**
+     * Given an HTML element, get the URLs of the files that should be downloaded and weren't treated by
+     * CoreDomUtilsProvider.extractDownloadableFilesFromHtml.
+     *
+     * @param container Container where to get the URLs from.
+     * @return {string[]} List of URLs.
+     */
+    getDownloadableFiles?(container: HTMLElement): string[];
+
+    /**
+     * Get a file size.
+     *
+     * @param file The file data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the size.
+     */
+    getFileSize?(file: CoreWSExternalFile, siteId?: string): Promise<number>;
+
+    /**
+     * Check whether the file should be treated by this handler. It is used in functions where the component isn't used.
+     *
+     * @param file The file data.
+     * @return Whether the file should be treated by this handler.
+     */
+    shouldHandleFile?(file: CoreWSExternalFile): boolean;
+
+    /**
+     * Treat a downloaded file.
+     *
+     * @param fileUrl The file URL used to download the file.
+     * @param file The file entry of the downloaded file.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    treatDownloadedFile?(fileUrl: string, file: FileEntry, siteId?: string): Promise<any>;
 }
 
 /**
@@ -58,6 +105,39 @@ export class CorePluginFileDelegate {
         this.logger = logger.getInstance('CorePluginFileDelegate');
     }
 
+    /**
+     * Check whether a file can be downloaded. If so, return the file to download.
+     *
+     * @param file The file data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the file to use. Rejected if cannot download.
+     */
+    canDownloadFile(file: CoreWSExternalFile, siteId?: string): Promise<CoreWSExternalFile> {
+        const handler = this.getHandlerForFile(file);
+
+        return this.canHandlerDownloadFile(file, handler, siteId);
+    }
+
+    /**
+     * Check whether a file can be downloaded. If so, return the file to download.
+     *
+     * @param file The file data.
+     * @param handler The handler to use.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the file to use. Rejected if cannot download.
+     */
+    protected canHandlerDownloadFile(file: CoreWSExternalFile, handler: CorePluginFileHandler, siteId?: string)
+            : Promise<CoreWSExternalFile> {
+
+        if (handler && handler.canDownloadFile) {
+            return handler.canDownloadFile(file, siteId).then((newFile) => {
+                return newFile || file;
+            });
+        }
+
+        return Promise.resolve(file);
+    }
+
     /**
      * Get the handler for a certain pluginfile url.
      *
@@ -85,6 +165,99 @@ export class CorePluginFileDelegate {
         }
     }
 
+    /**
+     * Given an HTML element, get the URLs of the files that should be downloaded and weren't treated by
+     * CoreDomUtilsProvider.extractDownloadableFilesFromHtml.
+     *
+     * @param container Container where to get the URLs from.
+     * @return List of URLs.
+     */
+    getDownloadableFiles(container: HTMLElement): string[] {
+        let files = [];
+
+        for (const component in this.handlers) {
+            const handler = this.handlers[component];
+
+            if (handler && handler.getDownloadableFiles) {
+                files = files.concat(handler.getDownloadableFiles(container));
+            }
+        }
+
+        return files;
+    }
+
+    /**
+     * Sum the filesizes from a list of files checking if the size will be partial or totally calculated.
+     *
+     * @param files List of files to sum its filesize.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with file size and a boolean to indicate if it is the total size or only partial.
+     */
+    getFilesSize(files: CoreWSExternalFile[], siteId?: string): Promise<{ size: number, total: boolean }> {
+        const promises = [],
+            result = {
+                size: 0,
+                total: true
+            };
+
+        files.forEach((file) => {
+            promises.push(this.getFileSize(file, siteId).then((size) => {
+                if (typeof size == 'undefined') {
+                    // We don't have the file size, cannot calculate its total size.
+                    result.total = false;
+                } else {
+                    result.size += size;
+                }
+            }));
+        });
+
+        return Promise.all(promises).then(() => {
+            return result;
+        });
+    }
+
+    /**
+     * Get a file size.
+     *
+     * @param file The file data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the size.
+     */
+    getFileSize(file: CoreWSExternalFile, siteId?: string): Promise<number> {
+        const handler = this.getHandlerForFile(file);
+
+        // First of all check if file can be downloaded.
+        return this.canHandlerDownloadFile(file, handler, siteId).then((canDownload) => {
+            if (!canDownload) {
+                return 0;
+            }
+
+            if (handler && handler.getFileSize) {
+                return handler.getFileSize(file, siteId).catch(() => {
+                    return file.filesize;
+                });
+            }
+
+            return Promise.resolve(file.filesize);
+        });
+    }
+
+    /**
+     * Get a handler to treat a certain file.
+     *
+     * @param file File data.
+     * @return Handler.
+     */
+    protected getHandlerForFile(file: CoreWSExternalFile): CorePluginFileHandler {
+        for (const component in this.handlers) {
+            const handler = this.handlers[component];
+
+            if (handler && handler.shouldHandleFile && handler.shouldHandleFile(file)) {
+                return handler;
+            }
+        }
+    }
+
     /**
      * Register a handler.
      *
@@ -92,14 +265,14 @@ export class CorePluginFileDelegate {
      * @return True if registered successfully, false otherwise.
      */
     registerHandler(handler: CorePluginFileHandler): boolean {
-        if (typeof this.handlers[handler.component] !== 'undefined') {
+        if (typeof this.handlers[handler.component || handler.name] !== 'undefined') {
             this.logger.log(`Handler '${handler.component}' already registered`);
 
             return false;
         }
 
         this.logger.log(`Registered handler '${handler.component}'`);
-        this.handlers[handler.component] = handler;
+        this.handlers[handler.component || handler.name] = handler;
 
         return true;
     }
@@ -124,4 +297,22 @@ export class CorePluginFileDelegate {
 
         return url;
     }
+
+    /**
+     * Treat a downloaded file.
+     *
+     * @param fileUrl The file URL used to download the file.
+     * @param file The file entry of the downloaded file.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    treatDownloadedFile(fileUrl: string, file: FileEntry, siteId?: string): Promise<any> {
+        const handler = this.getHandlerForFile({fileurl: fileUrl});
+
+        if (handler && handler.getFileSize) {
+            return handler.treatDownloadedFile(fileUrl, file, siteId);
+        }
+
+        return Promise.resolve();
+    }
 }
diff --git a/src/providers/utils/dom.ts b/src/providers/utils/dom.ts
index c8246dd1d..37bb85907 100644
--- a/src/providers/utils/dom.ts
+++ b/src/providers/utils/dom.ts
@@ -22,6 +22,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { CoreTextUtilsProvider } from './text';
 import { CoreAppProvider } from '../app';
 import { CoreConfigProvider } from '../config';
+import { CorePluginFileDelegate } from '../plugin-file-delegate';
 import { CoreUrlUtilsProvider } from './url';
 import { CoreFileProvider } from '@providers/file';
 import { CoreConstants } from '@core/constants';
@@ -62,11 +63,20 @@ export class CoreDomUtilsProvider {
     protected debugDisplay = false; // Whether to display debug messages. Store it in a variable to make it synchronous.
     protected displayedAlerts = {}; // To prevent duplicated alerts.
 
-    constructor(private translate: TranslateService, private loadingCtrl: LoadingController, private toastCtrl: ToastController,
-            private alertCtrl: AlertController, private textUtils: CoreTextUtilsProvider, private appProvider: CoreAppProvider,
-            private platform: Platform, private configProvider: CoreConfigProvider, private urlUtils: CoreUrlUtilsProvider,
-            private modalCtrl: ModalController, private sanitizer: DomSanitizer, private popoverCtrl: PopoverController,
-            private fileProvider: CoreFileProvider) {
+    constructor(private translate: TranslateService,
+            private loadingCtrl: LoadingController,
+            private toastCtrl: ToastController,
+            private alertCtrl: AlertController,
+            private textUtils: CoreTextUtilsProvider,
+            private appProvider: CoreAppProvider,
+            private platform: Platform,
+            private configProvider: CoreConfigProvider,
+            private urlUtils: CoreUrlUtilsProvider,
+            private modalCtrl: ModalController,
+            private sanitizer: DomSanitizer,
+            private popoverCtrl: PopoverController,
+            private fileProvider: CoreFileProvider,
+            private pluginFileDelegate: CorePluginFileDelegate) {
 
         // Check if debug messages should be displayed.
         configProvider.get(CoreConstants.SETTINGS_DEBUG_DISPLAY, false).then((debugDisplay) => {
@@ -252,7 +262,7 @@ export class CoreDomUtilsProvider {
      * @return List of file urls.
      */
     extractDownloadableFilesFromHtml(html: string): string[] {
-        const urls = [];
+        let urls = [];
         let elements;
 
         const element = this.convertToElement(html);
@@ -275,6 +285,9 @@ export class CoreDomUtilsProvider {
             }
         }
 
+        // Now get other files from plugin file handlers.
+        urls = urls.concat(this.pluginFileDelegate.getDownloadableFiles(element));
+
         return urls;
     }
 
diff --git a/src/providers/utils/utils.ts b/src/providers/utils/utils.ts
index 4f71eede7..c4f051645 100644
--- a/src/providers/utils/utils.ts
+++ b/src/providers/utils/utils.ts
@@ -1287,6 +1287,7 @@ export class CoreUtilsProvider {
      *
      * @param files List of files to sum its filesize.
      * @return File size and a boolean to indicate if it is the total size or only partial.
+     * @deprecated since 3.8.0. Use CorePluginFileDelegate.getFilesSize instead.
      */
     sumFileSizes(files: any[]): { size: number, total: boolean } {
         const result = {

From b9850b08dc66d2c5704493adc38c950f8a2fc362 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 7 Nov 2019 11:41:19 +0100
Subject: [PATCH 178/257] MOBILE-2235 core: Fix site.getid() exceptions due to
 format text

---
 src/components/site-picker/site-picker.ts | 2 +-
 src/directives/format-text.ts             | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/site-picker/site-picker.ts b/src/components/site-picker/site-picker.ts
index dca537560..60bfd17e5 100644
--- a/src/components/site-picker/site-picker.ts
+++ b/src/components/site-picker/site-picker.ts
@@ -51,7 +51,7 @@ export class CoreSitePickerComponent implements OnInit {
             sites.forEach((site: any) => {
                 // Format the site name.
                 promises.push(this.filterProvider.formatText(site.siteName, {clean: true, singleLine: true, filter: false}, [],
-                        site.getId()).catch(() => {
+                        site.id).catch(() => {
                     return site.siteName;
                 }).then((siteName) => {
                     site.fullNameAndSiteName = this.translate.instant('core.fullnameandsitename',
diff --git a/src/directives/format-text.ts b/src/directives/format-text.ts
index 54e627c9f..9c4a8c314 100644
--- a/src/directives/format-text.ts
+++ b/src/directives/format-text.ts
@@ -404,7 +404,10 @@ export class CoreFormatTextDirective implements OnChanges {
             // Error getting the site. This probably means that there is no current site and no siteId was supplied.
         }).then((siteInstance: CoreSite) => {
             site = siteInstance;
-            result.siteId = site.getId();
+
+            if (site) {
+                result.siteId = site.getId();
+            }
 
             if (this.contextLevel == 'course' && this.contextInstanceId <= 0) {
                 this.contextInstanceId = site.getSiteHomeId();
@@ -422,14 +425,14 @@ export class CoreFormatTextDirective implements OnChanges {
 
             if (this.filter) {
                 return this.filterHelper.getFiltersAndFormatText(this.text, this.contextLevel, this.contextInstanceId,
-                        result.options, site.getId()).then((res) => {
+                        result.options, result.siteId).then((res) => {
 
                     result.filters = res.filters;
 
                     return res.text;
                 });
             } else {
-                return this.filterProvider.formatText(this.text, result.options, [], site.getId());
+                return this.filterProvider.formatText(this.text, result.options, [], result.siteId);
             }
 
         }).then((formatted) => {

From 93259097d6104210717f7f3adb1bd126405e49dd Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 7 Nov 2019 17:30:37 +0100
Subject: [PATCH 179/257] MOBILE-2235 h5p: Install H5P libraries and save
 content

---
 .../h5p/components/h5p-player/h5p-player.ts   |   2 +
 src/core/h5p/h5p.module.ts                    |   5 +-
 src/core/h5p/providers/h5p.ts                 | 931 +++++++++++++++++-
 src/core/h5p/providers/pluginfile-handler.ts  |  10 +-
 src/core/h5p/providers/utils.ts               |  71 ++
 src/providers/file.ts                         | 113 ++-
 6 files changed, 1093 insertions(+), 39 deletions(-)
 create mode 100644 src/core/h5p/providers/utils.ts

diff --git a/src/core/h5p/components/h5p-player/h5p-player.ts b/src/core/h5p/components/h5p-player/h5p-player.ts
index e3eac156f..e7ad45ce6 100644
--- a/src/core/h5p/components/h5p-player/h5p-player.ts
+++ b/src/core/h5p/components/h5p-player/h5p-player.ts
@@ -148,6 +148,8 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
                 this.observer = this.eventsProvider.on(eventName, () => {
                     this.calculateState();
                 });
+            }).catch(() => {
+                // An error probably means the file cannot be downloaded or we cannot check it (offline).
             });
 
             return;
diff --git a/src/core/h5p/h5p.module.ts b/src/core/h5p/h5p.module.ts
index f05f16c29..95874d33d 100644
--- a/src/core/h5p/h5p.module.ts
+++ b/src/core/h5p/h5p.module.ts
@@ -15,12 +15,14 @@
 import { NgModule } from '@angular/core';
 import { CoreH5PComponentsModule } from './components/components.module';
 import { CoreH5PProvider } from './providers/h5p';
+import { CoreH5PUtilsProvider } from './providers/utils';
 import { CoreH5PPluginFileHandler } from './providers/pluginfile-handler';
 import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 
 // List of providers (without handlers).
 export const CORE_H5P_PROVIDERS: any[] = [
-    CoreH5PProvider
+    CoreH5PProvider,
+    CoreH5PUtilsProvider
 ];
 
 @NgModule({
@@ -30,6 +32,7 @@ export const CORE_H5P_PROVIDERS: any[] = [
     ],
     providers: [
         CoreH5PProvider,
+        CoreH5PUtilsProvider,
         CoreH5PPluginFileHandler
     ],
     exports: []
diff --git a/src/core/h5p/providers/h5p.ts b/src/core/h5p/providers/h5p.ts
index 557d2c3c1..012689ff8 100644
--- a/src/core/h5p/providers/h5p.ts
+++ b/src/core/h5p/providers/h5p.ts
@@ -13,11 +13,15 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
+import { CoreEventsProvider } from '@providers/events';
+import { CoreFileProvider } from '@providers/file';
 import { CoreLoggerProvider } from '@providers/logger';
-import { CoreSitesProvider } from '@providers/sites';
+import { CoreSitesProvider, CoreSiteSchema } from '@providers/sites';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreWSExternalWarning, CoreWSExternalFile } from '@providers/ws';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
+import { CoreMimetypeUtilsProvider } from '@providers/utils/mimetype';
+import { CoreH5PUtilsProvider } from './utils';
 
 /**
  * Service to provide H5P functionalities.
@@ -25,15 +29,179 @@ import { CoreTextUtilsProvider } from '@providers/utils/text';
 @Injectable()
 export class CoreH5PProvider {
 
+    protected CONTENT_TABLE = 'h5p_content'; // H5P content.
+    protected LIBRARIES_TABLE = 'h5p_libraries'; // Installed libraries.
+    protected LIBRARY_DEPENDENCIES_TABLE = 'h5p_library_dependencies'; // Library dependencies.
+
+    protected siteSchema: CoreSiteSchema = {
+        name: 'CoreH5PProvider',
+        version: 1,
+        tables: [
+            {
+                name: this.CONTENT_TABLE,
+                columns: [
+                    {
+                        name: 'id',
+                        type: 'INTEGER',
+                        primaryKey: true,
+                        autoIncrement: true
+                    },
+                    {
+                        name: 'jsoncontent',
+                        type: 'TEXT',
+                        notNull: true
+                    },
+                    {
+                        name: 'mainlibraryid',
+                        type: 'INTEGER',
+                        notNull: true
+                    },
+                    {
+                        name: 'displayoptions',
+                        type: 'INTEGER'
+                    },
+                    {
+                        name: 'foldername',
+                        type: 'TEXT',
+                        notNull: true
+                    },
+                    {
+                        name: 'filtered',
+                        type: 'TEXT'
+                    },
+                    {
+                        name: 'timecreated',
+                        type: 'INTEGER',
+                        notNull: true
+                    },
+                    {
+                        name: 'timemodified',
+                        type: 'INTEGER',
+                        notNull: true
+                    }
+                ]
+            },
+            {
+                name: this.LIBRARIES_TABLE,
+                columns: [
+                    {
+                        name: 'id',
+                        type: 'INTEGER',
+                        primaryKey: true,
+                        autoIncrement: true
+                    },
+                    {
+                        name: 'machinename',
+                        type: 'TEXT',
+                        notNull: true
+                    },
+                    {
+                        name: 'title',
+                        type: 'TEXT',
+                        notNull: true
+                    },
+                    {
+                        name: 'majorversion',
+                        type: 'INTEGER',
+                        notNull: true
+                    },
+                    {
+                        name: 'minorversion',
+                        type: 'INTEGER',
+                        notNull: true
+                    },
+                    {
+                        name: 'patchversion',
+                        type: 'INTEGER',
+                        notNull: true
+                    },
+                    {
+                        name: 'runnable',
+                        type: 'INTEGER',
+                        notNull: true
+                    },
+                    {
+                        name: 'fullscreen',
+                        type: 'INTEGER',
+                        notNull: true
+                    },
+                    {
+                        name: 'embedtypes',
+                        type: 'TEXT',
+                        notNull: true
+                    },
+                    {
+                        name: 'preloadedjs',
+                        type: 'TEXT'
+                    },
+                    {
+                        name: 'preloadedcss',
+                        type: 'TEXT'
+                    },
+                    {
+                        name: 'droplibrarycss',
+                        type: 'TEXT'
+                    },
+                    {
+                        name: 'semantics',
+                        type: 'TEXT'
+                    },
+                    {
+                        name: 'addto',
+                        type: 'TEXT'
+                    }
+                ]
+            },
+            {
+                name: this.LIBRARY_DEPENDENCIES_TABLE,
+                columns: [
+                    {
+                        name: 'id',
+                        type: 'INTEGER',
+                        primaryKey: true,
+                        autoIncrement: true
+                    },
+                    {
+                        name: 'libraryid',
+                        type: 'INTEGER',
+                        notNull: true
+                    },
+                    {
+                        name: 'requiredlibraryid',
+                        type: 'INTEGER',
+                        notNull: true
+                    },
+                    {
+                        name: 'dependencytype',
+                        type: 'TEXT',
+                        notNull: true
+                    }
+                ]
+            }
+        ]
+    };
+
     protected ROOT_CACHE_KEY = 'mmH5P:';
 
     protected logger;
 
     constructor(logger: CoreLoggerProvider,
+            eventsProvider: CoreEventsProvider,
             private sitesProvider: CoreSitesProvider,
-            private textUtils: CoreTextUtilsProvider) {
+            private textUtils: CoreTextUtilsProvider,
+            private fileProvider: CoreFileProvider,
+            private mimeUtils: CoreMimetypeUtilsProvider,
+            private h5pUtils: CoreH5PUtilsProvider) {
 
-        this.logger = logger.getInstance('CoreFilterProvider');
+        this.logger = logger.getInstance('CoreH5PProvider');
+
+        this.sitesProvider.registerSiteSchema(this.siteSchema);
+
+        eventsProvider.on(CoreEventsProvider.SITE_STORAGE_DELETED, (data) => {
+            this.deleteAllData(data.siteId).catch((error) => {
+                this.logger.error('Error deleting all H5P data from site.', error);
+            });
+        });
     }
 
     /**
@@ -54,7 +222,7 @@ export class CoreH5PProvider {
      *
      * @param site Site. If not defined, current site.
      * @return Promise resolved with true if ws is available, false otherwise.
-     * @since 3.4
+     * @since 3.8
      */
     canGetTrustedH5PFileInSite(site?: CoreSite): boolean {
         site = site || this.sitesProvider.getCurrentSite();
@@ -62,6 +230,346 @@ export class CoreH5PProvider {
         return site.wsAvailable('core_h5p_get_trusted_h5p_file');
     }
 
+    /**
+     * Will clear filtered params for all the content that uses the specified libraries.
+     * This means that the content dependencies will have to be rebuilt and the parameters re-filtered.
+     *
+     * @param libraryIds Array of library ids.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    protected clearFilteredParameters(libraryIds: number[], siteId?: string): Promise<any> {
+
+        if (!libraryIds || !libraryIds.length) {
+            return Promise.resolve();
+        }
+
+        return this.sitesProvider.getSiteDb(siteId).then((db) => {
+            const whereAndParams = db.getInOrEqual(libraryIds);
+            whereAndParams[0] = 'mainlibraryid ' + whereAndParams[0];
+
+            return db.updateRecordsWhere(this.CONTENT_TABLE, { filtered: null }, whereAndParams[0], whereAndParams[1]);
+        });
+    }
+
+    /**
+     * Delete all the H5P data from the DB of a certain site.
+     *
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
+     */
+    protected deleteAllData(siteId: string): Promise<any> {
+        return this.sitesProvider.getSiteDb(siteId).then((db) => {
+            return Promise.all([
+                db.deleteRecords(this.CONTENT_TABLE),
+                db.deleteRecords(this.LIBRARIES_TABLE),
+                db.deleteRecords(this.LIBRARY_DEPENDENCIES_TABLE)
+            ]);
+        });
+    }
+
+    /**
+     * Delete content data from DB.
+     *
+     * @param id Content ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    deleteContentData(id: number, siteId?: string): Promise<any> {
+        return this.sitesProvider.getSiteDb(siteId).then((db) => {
+            return db.deleteRecords(this.CONTENT_TABLE, {id: id});
+        });
+    }
+
+    /**
+     * Delete library data from DB.
+     *
+     * @param id Library ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    deleteLibraryData(id: number, siteId?: string): Promise<any> {
+        return this.sitesProvider.getSiteDb(siteId).then((db) => {
+            return db.deleteRecords(this.LIBRARIES_TABLE, {id: id});
+        });
+    }
+
+    /**
+     * Delete all dependencies belonging to given library.
+     *
+     * @param libraryId Library ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    deleteLibraryDependencies(libraryId: number, siteId?: string): Promise<any> {
+        return this.sitesProvider.getSiteDb(siteId).then((db) => {
+            return db.deleteRecords(this.LIBRARY_DEPENDENCIES_TABLE, {libraryid: libraryId});
+        });
+    }
+
+    /**
+     * Deletes a library from the file system.
+     *
+     * @param libraryData The library data.
+     * @param folderName Folder name. If not provided, it will be calculated.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    deleteLibraryFolder(libraryData: any, folderName?: string, siteId?: string): Promise<any> {
+        return this.fileProvider.removeDir(this.getLibraryFolderPath(libraryData, siteId, folderName));
+    }
+
+    /**
+     * Extract an H5P file. Some of this code was copied from the isValidPackage function in Moodle's H5PValidator.
+     * This function won't validate most things because it should've been done by the server already.
+     *
+     * @param fileUrl The file URL used to download the file.
+     * @param file The file entry of the downloaded file.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    extractH5PFile(fileUrl: string, file: FileEntry, siteId?: string): Promise<any> {
+        siteId = siteId || this.sitesProvider.getCurrentSiteId();
+
+        // Unzip the file.
+        const folderName = this.mimeUtils.removeExtension(file.name),
+            destFolder = this.textUtils.concatenatePaths(CoreFileProvider.TMPFOLDER, 'h5p/' + folderName);
+
+        // Make sure the dest dir doesn't exist already.
+        return this.fileProvider.removeDir(destFolder).catch(() => {
+            // Ignore errors.
+        }).then(() => {
+            return this.fileProvider.createDir(destFolder);
+        }).then(() => {
+            return this.fileProvider.unzipFile(file.toURL(), destFolder);
+        }).then(() => {
+            // Read the contents of the unzipped dir.
+            return this.fileProvider.getDirectoryContents(destFolder);
+        }).then((contents) => {
+            return this.processH5PFiles(destFolder, contents).then((data) => {
+                const content: any = {};
+
+                // Save the libraries that were processed.
+                return this.saveLibraries(data.librariesJsonData, siteId).then(() => {
+                    // Now treat contents.
+
+                    // Find main library version
+                    for (const i in data.mainJsonData.preloadedDependencies) {
+                        const dependency = data.mainJsonData.preloadedDependencies[i];
+
+                        if (dependency.machineName === data.mainJsonData.mainLibrary) {
+                            return this.getLibraryIdByData(dependency).then((id) => {
+                                dependency.libraryId = id;
+                                content.library = dependency;
+                            });
+                        }
+                    }
+                }).then(() => {
+                    // Save the content data in DB.
+                    content.params = JSON.stringify(data.contentJsonData);
+
+                    return this.saveContentData(content, folderName, siteId);
+                }).then(() => {
+                    // Save the content files in their right place.
+                    const contentPath = this.textUtils.concatenatePaths(destFolder, 'content');
+
+                    return this.saveContentInFS(contentPath, folderName, siteId).catch((error) => {
+                        // An error occurred, delete the DB data because the content data has been deleted.
+                        return this.deleteContentData(content.id, siteId).catch(() => {
+                            // Ignore errors.
+                        }).then(() => {
+                            return Promise.reject(error);
+                        });
+                    });
+                }).then(() => {
+                    // Remove tmp folder.
+                    return this.fileProvider.removeDir(destFolder).catch(() => {
+                        // Ignore errors, it will be deleted eventually.
+                    });
+                });
+
+                // @todo: Load content? It's done in the player construct.
+            });
+        });
+    }
+
+    /**
+     * Get a package content path.
+     *
+     * @param folderName Name of the folder of the H5P package.
+     * @param siteId The site ID.
+     * @return Folder path.
+     */
+    getContentFolderPath(folderName: string, siteId: string): string {
+        return this.textUtils.concatenatePaths(this.fileProvider.getSiteFolder(siteId), 'h5p/packages/' + folderName + '/content');
+    }
+
+    /**
+     * Get library data. This code is based on the getLibraryData from Moodle's H5PValidator.
+     * This function won't validate most things because it should've been done by the server already.
+     *
+     * @param libDir Directory where the library files are.
+     * @param libPath Path to the directory where the library files are.
+     * @param h5pDir Path to the directory where this h5p files are.
+     * @return Library data.
+     */
+    protected getLibraryData(libDir: DirectoryEntry, libPath: string, h5pDir: string): any {
+        const libraryJsonPath = this.textUtils.concatenatePaths(libPath, 'library.json'),
+            semanticsPath = this.textUtils.concatenatePaths(libPath, 'semantics.json'),
+            langPath = this.textUtils.concatenatePaths(libPath, 'language'),
+            iconPath = this.textUtils.concatenatePaths(libPath, 'icon.svg'),
+            promises = [];
+        let h5pData,
+            semanticsData,
+            langData,
+            hasIcon;
+
+        // Read the library json file.
+        promises.push(this.fileProvider.readFile(libraryJsonPath, CoreFileProvider.FORMATJSON).then((data) => {
+            h5pData = data;
+        }));
+
+        // Get library semantics if it exists.
+        promises.push(this.fileProvider.readFile(semanticsPath, CoreFileProvider.FORMATJSON).then((data) => {
+            semanticsData = data;
+        }).catch(() => {
+            // Probably doesn't exist, ignore.
+        }));
+
+        // Get language data if it exists.
+        promises.push(this.fileProvider.getDirectoryContents(langPath).then((entries) => {
+            const subPromises = [];
+            langData = {};
+
+            entries.forEach((entry) => {
+                const langFilePath = this.textUtils.concatenatePaths(langPath, entry.name);
+
+                subPromises.push(this.fileProvider.readFile(langFilePath, CoreFileProvider.FORMATJSON).then((data) => {
+                    const parts = entry.name.split('.'); // The language code is in parts[0].
+                    langData[parts[0]] = data;
+                }));
+            });
+        }).catch(() => {
+            // Probably doesn't exist, ignore.
+        }));
+
+        // Check if it has icon.
+        promises.push(this.fileProvider.getFile(iconPath).then(() => {
+            hasIcon = true;
+        }).catch(() => {
+            hasIcon = false;
+        }));
+
+        return Promise.all(promises).then(() => {
+            h5pData.semantics = semanticsData;
+            h5pData.language = langData;
+            h5pData.hasIcon = hasIcon;
+
+            return h5pData;
+        });
+    }
+
+    /**
+     * Get a library data stored in DB.
+     *
+     * @param machineName Machine name.
+     * @param majorVersion Major version number.
+     * @param minorVersion Minor version number.
+     * @param siteId The site ID. If not defined, current site.
+     * @return Promise resolved with the library data, rejected if not found.
+     */
+    protected getLibrary(machineName: string, majorVersion?: string | number, minorVersion?: string | number, siteId?: string)
+            : Promise<CoreH5PLibraryDBData> {
+
+        return this.sitesProvider.getSiteDb(siteId).then((db) => {
+            const conditions: any = {
+                machinename: machineName
+            };
+
+            if (typeof majorVersion != 'undefined') {
+                conditions.majorversion = majorVersion;
+            }
+            if (typeof minorVersion != 'undefined') {
+                conditions.minorversion = minorVersion;
+            }
+
+            return db.getRecords(this.LIBRARIES_TABLE, conditions);
+        }).then((libraries) => {
+            if (!libraries.length) {
+                return Promise.reject(null);
+            }
+
+            return libraries[0];
+        });
+    }
+
+    /**
+     * Get a library data stored in DB.
+     *
+     * @param libraryData Library data.
+     * @param siteId The site ID. If not defined, current site.
+     * @return Promise resolved with the library data, rejected if not found.
+     */
+    protected getLibraryByData(libraryData: any, siteId?: string): Promise<CoreH5PLibraryDBData> {
+        return this.getLibrary(libraryData.machineName, libraryData.majorVersion, libraryData.minorVersion, siteId);
+    }
+
+    /**
+     * Get a library ID. If not found, return null.
+     *
+     * @param machineName Machine name.
+     * @param majorVersion Major version number.
+     * @param minorVersion Minor version number.
+     * @param siteId The site ID. If not defined, current site.
+     * @return Promise resolved with the library ID, null if not found.
+     */
+    protected getLibraryId(machineName: string, majorVersion?: string | number, minorVersion?: string | number, siteId?: string)
+            : Promise<number> {
+
+        return this.getLibrary(machineName, majorVersion, minorVersion, siteId).then((library) => {
+            return (library && library.id) || null;
+        }).catch(() => {
+            return null;
+        });
+    }
+
+    /**
+     * Get a library ID. If not found, return null.
+     *
+     * @param libraryData Library data.
+     * @param siteId The site ID. If not defined, current site.
+     * @return Promise resolved with the library ID, null if not found.
+     */
+    protected getLibraryIdByData(libraryData: any, siteId?: string): Promise<number> {
+        return this.getLibraryId(libraryData.machineName, libraryData.majorVersion, libraryData.minorVersion, siteId);
+    }
+
+    /**
+     * Get libraries folder path.
+     *
+     * @param siteId The site ID.
+     * @return Folder path.
+     */
+    getLibrariesFolderPath(siteId: string): string {
+        return this.textUtils.concatenatePaths(this.fileProvider.getSiteFolder(siteId), 'h5p/lib');
+    }
+
+    /**
+     * Get a library's folder path.
+     *
+     * @param libraryData The library data.
+     * @param siteId The site ID.
+     * @param folderName Folder name. If not provided, it will be calculated.
+     * @return Folder path.
+     */
+    getLibraryFolderPath(libraryData: any, siteId: string, folderName?: string): string {
+        if (!folderName) {
+            folderName = this.libraryToString(libraryData, true);
+        }
+
+        return this.textUtils.concatenatePaths(this.getLibrariesFolderPath(siteId), folderName);
+    }
+
     /**
      * Get a trusted H5P file.
      *
@@ -128,21 +636,6 @@ export class CoreH5PProvider {
         return this.ROOT_CACHE_KEY + 'trustedH5PFile:';
     }
 
-    /**
-     * Treat an H5P url before sending it to WS.
-     *
-     * @param url H5P file URL.
-     * @param siteUrl Site URL.
-     * @return Treated url.
-     */
-    protected treatH5PUrl(url: string, siteUrl: string): string {
-        if (url.indexOf(this.textUtils.concatenatePaths(siteUrl, '/webservice/pluginfile.php')) === 0) {
-            url = url.replace('/webservice/pluginfile', '/pluginfile');
-        }
-
-        return url;
-    }
-
     /**
      * Invalidates all trusted H5P file WS calls.
      *
@@ -167,6 +660,362 @@ export class CoreH5PProvider {
             return site.invalidateWsCacheForKey(this.getTrustedH5PFileCacheKey(url));
         });
     }
+
+    /**
+     * Writes library data as string on the form {machineName} {majorVersion}.{minorVersion}.
+     *
+     * @param libraryData Library data.
+     * @param folderName Use hyphen instead of space in returned string.
+     * @return String on the form {machineName} {majorVersion}.{minorVersion}.
+     */
+    protected libraryToString(libraryData: any, folderName?: boolean): string {
+        return (libraryData.machineName ? libraryData.machineName : libraryData.name) + (folderName ? '-' : ' ') +
+                libraryData.majorVersion + '.' + libraryData.minorVersion;
+    }
+
+    /**
+     * Process libraries from an H5P library, getting the required data to save them.
+     * This code was copied from the isValidPackage function in Moodle's H5PValidator.
+     * This function won't validate most things because it should've been done by the server already.
+     *
+     * @param fileUrl The file URL used to download the file.
+     * @param file The file entry of the downloaded file.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    protected processH5PFiles(destFolder: string, entries: (DirectoryEntry | FileEntry)[])
+            : Promise<{librariesJsonData: any, mainJsonData: any, contentJsonData: any}> {
+
+        const promises = [],
+            libraries: any = {};
+        let contentJsonData,
+            mainH5PData;
+
+        // Read the h5p.json file.
+        const h5pJsonPath = this.textUtils.concatenatePaths(destFolder, 'h5p.json');
+        promises.push(this.fileProvider.readFile(h5pJsonPath, CoreFileProvider.FORMATJSON).then((data) => {
+            mainH5PData = data;
+        }));
+
+        // Read the content.json file.
+        const contentJsonPath = this.textUtils.concatenatePaths(destFolder, 'content/content.json');
+        promises.push(this.fileProvider.readFile(contentJsonPath, CoreFileProvider.FORMATJSON).then((data) => {
+            contentJsonData = data;
+        }));
+
+        // Treat libraries.
+        entries.forEach((entry) => {
+            if (entry.name[0] == '.' || entry.name[0] == '_' || entry.name == 'content' || entry.isFile) {
+                // Skip files, the content folder and any folder starting with a . or _.
+                return;
+            }
+
+            const libDirPath = this.textUtils.concatenatePaths(destFolder, entry.name);
+
+            promises.push(this.getLibraryData(<DirectoryEntry> entry, libDirPath, destFolder).then((libraryH5PData) => {
+                libraryH5PData.uploadDirectory = libDirPath;
+                libraries[this.libraryToString(libraryH5PData)] = libraryH5PData;
+            }));
+        });
+
+        return Promise.all(promises).then(() => {
+            return {
+                librariesJsonData: libraries,
+                mainJsonData: mainH5PData,
+                contentJsonData: contentJsonData
+            };
+        });
+    }
+
+    /**
+     * Save content data in DB and clear cache.
+     *
+     * @param content Content to save.
+     * @param folderName The name of the folder that contains the H5P.
+     * @return Promise resolved with content ID.
+     */
+    protected saveContentData(content: any, folderName: string, siteId?: string): Promise<number> {
+        // Save in DB.
+        return this.sitesProvider.getSiteDb(siteId).then((db) => {
+
+            const data: any = {
+                jsoncontent: content.params,
+                displayoptions: content.disable,
+                mainlibraryid: content.library.libraryId,
+                timemodified: Date.now(),
+                filtered: null,
+                foldername: folderName
+            };
+
+            if (typeof content.id != 'undefined') {
+                data.id = content.id;
+            } else {
+                data.timecreated = data.timemodified;
+            }
+
+            return db.insertRecord(this.CONTENT_TABLE, data).then(() => {
+                if (!data.id) {
+                    // New content. Get its ID.
+                    return db.getRecord(this.CONTENT_TABLE, data).then((entry) => {
+                        content.id = entry.id;
+                    });
+                }
+            });
+        }).then(() => {
+            // If resetContentUserData is implemented in the future, it should be called in here.
+            return content.id;
+        });
+    }
+
+    /**
+     * Save the content in filesystem.
+     *
+     * @param contentPath Path to the current content folder (tmp).
+     * @param folderName Name to put to the content folder.
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
+     */
+    protected saveContentInFS(contentPath: string, folderName: string, siteId: string): Promise<any> {
+        const folderPath = this.getContentFolderPath(folderName, siteId);
+
+        // Delete existing content for this package.
+        return this.fileProvider.removeDir(folderPath).catch(() => {
+            // Ignore errors, maybe it doesn't exist.
+        }).then(() => {
+            // Copy the new one.
+            return this.fileProvider.moveDir(contentPath, folderPath);
+        });
+    }
+
+    /**
+     * Save libraries. This code is based on the saveLibraries function from Moodle's H5PStorage.
+     *
+     * @param librariesJsonData Data about libraries.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    protected saveLibraries(librariesJsonData: any, siteId?: string): Promise<any> {
+        const libraryIds = [];
+
+        // First of all, try to create the dir where the libraries are stored. This way we don't have to do it for each lib.
+        return this.fileProvider.createDir(this.getLibrariesFolderPath(siteId)).then(() => {
+            const promises = [];
+
+            // Go through libraries that came with this package.
+            for (const libString in librariesJsonData) {
+                const libraryData = librariesJsonData[libString];
+
+                // Find local library identifier
+                promises.push(this.getLibraryByData(libraryData).catch(() => {
+                    // Not found.
+                }).then((dbData) => {
+                    if (dbData) {
+                        // Library already installed.
+                        libraryData.libraryId = dbData.id;
+
+                        if (libraryData.patchVersion <= dbData.patchversion) {
+                            // Same or older version, no need to save.
+                            libraryData.saveDependencies = false;
+
+                            return;
+                        }
+                    }
+
+                    libraryData.saveDependencies = true;
+
+                    // Convert metadataSettings values to boolean and json_encode it before saving.
+                    libraryData.metadataSettings = libraryData.metadataSettings ?
+                            this.h5pUtils.boolifyAndEncodeMetadataSettings(libraryData.metadataSettings) : null;
+
+                    // Save the library data in DB.
+                    return this.saveLibraryData(libraryData, siteId).then(() => {
+                        // Now save it in FS.
+                        return this.saveLibraryInFS(libraryData, siteId).catch((error) => {
+                            // An error occurred, delete the DB data because the lib FS data has been deleted.
+                            return this.deleteLibraryData(libraryData.libraryId, siteId).catch(() => {
+                                // Ignore errors.
+                            }).then(() => {
+                                return Promise.reject(error);
+                            });
+                        });
+                    }).then(() => {
+                        // @todo: Remove cached asses that use this library.
+                    });
+                }));
+            }
+
+            return Promise.all(promises);
+        }).then(() => {
+            // Go through the libraries again to save dependencies.
+            const promises = [];
+
+            for (const libString in librariesJsonData) {
+                const libraryData = librariesJsonData[libString];
+                if (!libraryData.saveDependencies) {
+                    continue;
+                }
+
+                libraryIds.push(libraryData.libraryId);
+
+                // Remove any old dependencies.
+                promises.push(this.deleteLibraryDependencies(libraryData.libraryId).then(() => {
+                    // Insert the different new ones.
+                    const subPromises = [];
+
+                    if (typeof libraryData.preloadedDependencies != 'undefined') {
+                        subPromises.push(this.saveLibraryDependencies(libraryData.libraryId, libraryData.preloadedDependencies,
+                                'preloaded'));
+                    }
+                    if (typeof libraryData.dynamicDependencies != 'undefined') {
+                        subPromises.push(this.saveLibraryDependencies(libraryData.libraryId, libraryData.dynamicDependencies,
+                                'dynamic'));
+                    }
+                    if (typeof libraryData.editorDependencies != 'undefined') {
+                        subPromises.push(this.saveLibraryDependencies(libraryData.libraryId, libraryData.editorDependencies,
+                                'editor'));
+                    }
+
+                    return Promise.all(subPromises);
+                }));
+            }
+
+            return Promise.all(promises);
+        }).then(() => {
+            // Make sure dependencies, parameter filtering and export files get regenerated for content who uses these libraries.
+            if (libraryIds.length) {
+                return this.clearFilteredParameters(libraryIds, siteId);
+            }
+        });
+    }
+
+    /**
+     * Save a library in filesystem.
+     *
+     * @param libraryData Library data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    protected saveLibraryInFS(libraryData: any, siteId?: string): Promise<any> {
+        const folderPath = this.getLibraryFolderPath(libraryData, siteId);
+
+        // Delete existing library version.
+        return this.fileProvider.removeDir(folderPath).catch(() => {
+            // Ignore errors, maybe it doesn't exist.
+        }).then(() => {
+            // Copy the new one.
+            return this.fileProvider.moveDir(libraryData.uploadDirectory, folderPath, true);
+        });
+    }
+
+    /**
+     * Save library data in DB.
+     *
+     * @param libraryData Library data to save.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    protected saveLibraryData(libraryData: any, siteId?: string): Promise<any> {
+        // Some special properties needs some checking and converting before they can be saved.
+        const preloadedJS = this.h5pUtils.libraryParameterValuesToCsv(libraryData, 'preloadedJs', 'path'),
+            preloadedCSS = this.h5pUtils.libraryParameterValuesToCsv(libraryData, 'preloadedCss', 'path'),
+            dropLibraryCSS = this.h5pUtils.libraryParameterValuesToCsv(libraryData, 'dropLibraryCss', 'machineName');
+
+        if (typeof libraryData.semantics == 'undefined') {
+            libraryData.semantics = '';
+        }
+        if (typeof libraryData.fullscreen == 'undefined') {
+            libraryData.fullscreen = 0;
+        }
+
+        let embedTypes = '';
+        if (typeof libraryData.embedTypes != 'undefined') {
+            embedTypes = libraryData.embedTypes.join(', ');
+        }
+
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            const db = site.getDb(),
+                data: any = {
+                    title: libraryData.title,
+                    machinename: libraryData.machineName,
+                    majorversion: libraryData.majorVersion,
+                    minorversion: libraryData.minorVersion,
+                    patchversion: libraryData.patchVersion,
+                    runnable: libraryData.runnable,
+                    fullscreen: libraryData.fullscreen,
+                    embedtypes: embedTypes,
+                    preloadedjs: preloadedJS,
+                    preloadedcss: preloadedCSS,
+                    droplibrarycss: dropLibraryCSS,
+                    semantics: libraryData.semantics,
+                    addto: typeof libraryData.addTo != 'undefined' ? JSON.stringify(libraryData.addTo) : null,
+                };
+
+            if (libraryData.libraryId) {
+                data.id = libraryData.libraryId;
+            }
+
+            return db.insertRecord(this.LIBRARIES_TABLE, data).then(() => {
+                if (!data.id) {
+                    // New library. Get its ID.
+                    return db.getRecord(this.LIBRARIES_TABLE, data).then((entry) => {
+                        libraryData.libraryId = entry.id;
+                    });
+                } else {
+                    // Updated libary. Remove old dependencies.
+                    return this.deleteLibraryDependencies(data.id, site.getId());
+                }
+            });
+        });
+    }
+
+    /**
+     * Save what libraries a library is depending on.
+     *
+     * @param libraryId Library Id for the library we're saving dependencies for.
+     * @param dependencies List of dependencies as associative arrays containing machineName, majorVersion, minorVersion.
+     * @param dependencytype The type of dependency.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    protected saveLibraryDependencies(libraryId: number, dependencies: any[], dependencyType: string, siteId?: string)
+            : Promise<any> {
+
+        return this.sitesProvider.getSiteDb(siteId).then((db) => {
+
+            const promises = [];
+
+            dependencies.forEach((dependency) => {
+                // Get the ID of the library.
+                promises.push(this.getLibraryIdByData(dependency, siteId).then((dependencyId) => {
+                    // Create the relation.
+                    const entry = {
+                        libraryid: libraryId,
+                        requiredlibraryid: dependencyId,
+                        dependencytype: dependencyType
+                    };
+
+                    return db.insertRecord(this.LIBRARY_DEPENDENCIES_TABLE, entry);
+                }));
+            });
+
+            return Promise.all(promises);
+        });
+    }
+
+    /**
+     * Treat an H5P url before sending it to WS.
+     *
+     * @param url H5P file URL.
+     * @param siteUrl Site URL.
+     * @return Treated url.
+     */
+    protected treatH5PUrl(url: string, siteUrl: string): string {
+        if (url.indexOf(this.textUtils.concatenatePaths(siteUrl, '/webservice/pluginfile.php')) === 0) {
+            url = url.replace('/webservice/pluginfile', '/pluginfile');
+        }
+
+        return url;
+    }
 }
 
 /**
@@ -186,3 +1035,47 @@ export type CoreH5PGetTrustedH5PFileResult = {
     files: CoreWSExternalFile[]; // Files.
     warnings: CoreWSExternalWarning[]; // List of warnings.
 };
+
+/**
+ * Content data stored in DB.
+ */
+export type CoreH5PContentDBData = {
+    id: number; // The id of the content.
+    jsoncontent: string; // The content in json format.
+    mainlibraryid: number; // The library we first instantiate for this node.
+    displayoptions: number; // H5P Button display options.
+    foldername: string; // Name of the folder that contains the contents.
+    filtered: string; // Filtered version of json_content.
+    timecreated: number; // Time created.
+    timemodified: number; // Time modified.
+};
+
+/**
+ * Library data stored in DB.
+ */
+export type CoreH5PLibraryDBData = {
+    id: number; // The id of the library.
+    machinename: string; // The library machine name.
+    title: string; // The human readable name of this library.
+    majorversion: number; // Major version.
+    minorversion: number; // Minor version.
+    patchversion: number; // Patch version.
+    runnable: number; // Can this library be started by the module? I.e. not a dependency.
+    fullscreen: number; // Display fullscreen button.
+    embedtypes: string; // List of supported embed types.
+    preloadedjs?: string; // Comma separated list of scripts to load.
+    preloadedcss?: string; // Comma separated list of stylesheets to load.
+    droplibrarycss?: string; // List of libraries that should not have CSS included if this library is used. Comma separated list.
+    semantics?: string; // The semantics definition in json format.
+    addto?: string; // Plugin configuration data.
+};
+
+/**
+ * Library dependencies stored in DB.
+ */
+export type CoreH5PLibraryDependenciesDBData = {
+    id: number; // Id.
+    libraryid: number; // The id of an H5P library.
+    requiredlibraryid: number; // The dependent library to load.
+    dependencytype: string; // Type: preloaded, dynamic, or editor.
+};
diff --git a/src/core/h5p/providers/pluginfile-handler.ts b/src/core/h5p/providers/pluginfile-handler.ts
index b61de5b00..a7787a3f0 100644
--- a/src/core/h5p/providers/pluginfile-handler.ts
+++ b/src/core/h5p/providers/pluginfile-handler.ts
@@ -108,14 +108,6 @@ export class CoreH5PPluginFileHandler implements CorePluginFileHandler {
      * @return Promise resolved when done.
      */
     treatDownloadedFile(fileUrl: string, file: FileEntry, siteId?: string): Promise<any> {
-        // Unzip the file.
-        const destFolder = this.textUtils.concatenatePaths(CoreFileProvider.TMPFOLDER,
-                'h5p/' + this.mimeUtils.removeExtension(file.name));
-
-        return this.fileProvider.createDir(destFolder).then(() => {
-            return this.fileProvider.unzipFile(file.toURL(), destFolder);
-        }).then(() => {
-            // @todo: Deploy the package.
-        });
+        return this.h5pProvider.extractH5PFile(fileUrl, file, siteId);
     }
 }
diff --git a/src/core/h5p/providers/utils.ts b/src/core/h5p/providers/utils.ts
new file mode 100644
index 000000000..3a36071cb
--- /dev/null
+++ b/src/core/h5p/providers/utils.ts
@@ -0,0 +1,71 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Injectable } from '@angular/core';
+
+/**
+ * Utils service with helper functions for H5P.
+ */
+@Injectable()
+export class CoreH5PUtilsProvider {
+
+    constructor() {
+        // Nothing to do.
+    }
+
+    /**
+     * The metadataSettings field in libraryJson uses 1 for true and 0 for false.
+     * Here we are converting these to booleans, and also doing JSON encoding.
+     *
+     * @param metadataSettings Settings.
+     * @return Stringified settings.
+     */
+    boolifyAndEncodeMetadataSettings(metadataSettings: any): string {
+        // Convert metadataSettings values to boolean.
+        if (typeof metadataSettings.disable != 'undefined') {
+            metadataSettings.disable = metadataSettings.disable === 1;
+        }
+        if (typeof metadataSettings.disableExtraTitleField != 'undefined') {
+            metadataSettings.disableExtraTitleField = metadataSettings.disableExtraTitleField === 1;
+        }
+
+        return JSON.stringify(metadataSettings);
+    }
+
+    /**
+     * Convert list of library parameter values to csv.
+     *
+     * @param libraryData Library data as found in library.json files.
+     * @param key Key that should be found in libraryData.
+     * @param searchParam The library parameter (Default: 'path').
+     * @return Library parameter values separated by ', '
+     */
+    libraryParameterValuesToCsv(libraryData: any, key: string, searchParam: string = 'path'): string {
+        if (typeof libraryData[key] != 'undefined') {
+            const parameterValues = [];
+
+            libraryData[key].forEach((file) => {
+                for (const index in file) {
+                    if (index === searchParam) {
+                        parameterValues.push(file[index]);
+                    }
+                }
+            });
+
+            return parameterValues.join(',');
+        }
+
+        return '';
+    }
+}
diff --git a/src/providers/file.ts b/src/providers/file.ts
index 32dc56bc4..dd48837c3 100644
--- a/src/providers/file.ts
+++ b/src/providers/file.ts
@@ -52,6 +52,7 @@ export class CoreFileProvider {
     static FORMATDATAURL = 1;
     static FORMATBINARYSTRING = 2;
     static FORMATARRAYBUFFER = 3;
+    static FORMATJSON = 4;
 
     // Folders.
     static SITESFOLDER = 'sites';
@@ -491,6 +492,7 @@ export class CoreFileProvider {
      *               FORMATDATAURL
      *               FORMATBINARYSTRING
      *               FORMATARRAYBUFFER
+     *               FORMATJSON
      * @return Promise to be resolved when the file is read.
      */
     readFile(path: string, format: number = CoreFileProvider.FORMATTEXT): Promise<any> {
@@ -505,6 +507,16 @@ export class CoreFileProvider {
                 return this.file.readAsBinaryString(this.basePath, path);
             case CoreFileProvider.FORMATARRAYBUFFER:
                 return this.file.readAsArrayBuffer(this.basePath, path);
+            case CoreFileProvider.FORMATJSON:
+                return this.file.readAsText(this.basePath, path).then((text) => {
+                    const parsed = this.textUtils.parseJSON(text, null);
+
+                    if (parsed == null && text != null) {
+                        return Promise.reject('Error parsing JSON file: ' + path);
+                    }
+
+                    return parsed;
+                });
             default:
                 return this.file.readAsText(this.basePath, path);
         }
@@ -519,6 +531,7 @@ export class CoreFileProvider {
      *               FORMATDATAURL
      *               FORMATBINARYSTRING
      *               FORMATARRAYBUFFER
+     *               FORMATJSON
      * @return Promise to be resolved when the file is read.
      */
     readFileData(fileData: any, format: number = CoreFileProvider.FORMATTEXT): Promise<any> {
@@ -531,7 +544,18 @@ export class CoreFileProvider {
             reader.onloadend = (evt): void => {
                 const target = <any> evt.target; // Convert to <any> to be able to use non-standard properties.
                 if (target.result !== undefined || target.result !== null) {
-                    resolve(target.result);
+                    if (format == CoreFileProvider.FORMATJSON) {
+                        // Convert to object.
+                        const parsed = this.textUtils.parseJSON(target.result, null);
+
+                        if (parsed == null) {
+                            reject('Error parsing JSON file.');
+                        }
+
+                        resolve(parsed);
+                    } else {
+                        resolve(target.result);
+                    }
                 } else if (target.error !== undefined || target.error !== null) {
                     reject(target.error);
                 } else {
@@ -728,19 +752,58 @@ export class CoreFileProvider {
         }
     }
 
+    /**
+     * Move a dir.
+     *
+     * @param originalPath Path to the dir to move.
+     * @param newPath New path of the dir.
+     * @param destDirExists Set it to true if you know the directory where to put the dir exists. If false, the function will
+     *                      try to create it (slower).
+     * @return Promise resolved when the entry is moved.
+     */
+    moveDir(originalPath: string, newPath: string, destDirExists?: boolean): Promise<any> {
+        return this.moveFileOrDir(originalPath, newPath, true);
+    }
+
     /**
      * Move a file.
      *
      * @param originalPath Path to the file to move.
      * @param newPath New path of the file.
+     * @param destDirExists Set it to true if you know the directory where to put the file exists. If false, the function will
+     *                      try to create it (slower).
      * @return Promise resolved when the entry is moved.
      */
-    moveFile(originalPath: string, newPath: string): Promise<any> {
+    moveFile(originalPath: string, newPath: string, destDirExists?: boolean): Promise<any> {
+        return this.moveFileOrDir(originalPath, newPath, false);
+    }
+
+    /**
+     * Move a file/dir.
+     *
+     * @param originalPath Path to the file/dir to move.
+     * @param newPath New path of the file/dir.
+     * @param isDir Whether it's a dir or a file.
+     * @param destDirExists Set it to true if you know the directory where to put the file/dir exists. If false, the function will
+     *                      try to create it (slower).
+     * @return Promise resolved when the entry is moved.
+     */
+    protected moveFileOrDir(originalPath: string, newPath: string, isDir?: boolean, destDirExists?: boolean): Promise<any> {
+        const moveFn = isDir ? this.file.moveDir.bind(this.file) : this.file.moveFile.bind(this.file);
+
         return this.init().then(() => {
             // Remove basePath if it's in the paths.
             originalPath = this.removeStartingSlash(originalPath.replace(this.basePath, ''));
             newPath = this.removeStartingSlash(newPath.replace(this.basePath, ''));
 
+            const newPathFileAndDir = this.getFileAndDirectoryFromPath(newPath);
+
+            if (newPathFileAndDir.directory && !destDirExists) {
+                // Create the target directory if it doesn't exist.
+                return this.createDir(newPathFileAndDir.directory);
+            }
+        }).then(() => {
+
             if (this.isHTMLAPI) {
                 // In Cordova API we need to calculate the longest matching path to make it work.
                 // The function this.file.moveFile('a/', 'b/c.ext', 'a/', 'b/d.ext') doesn't work.
@@ -763,15 +826,15 @@ export class CoreFileProvider {
                     }
                 }
 
-                return this.file.moveFile(commonPath, originalPath, commonPath, newPath);
+                return moveFn(commonPath, originalPath, commonPath, newPath);
             } else {
-                return this.file.moveFile(this.basePath, originalPath, this.basePath, newPath).catch((error) => {
+                return moveFn(this.basePath, originalPath, this.basePath, newPath).catch((error) => {
                     // The move can fail if the path has encoded characters. Try again if that's the case.
                     const decodedOriginal = decodeURI(originalPath),
                         decodedNew = decodeURI(newPath);
 
                     if (decodedOriginal != originalPath || decodedNew != newPath) {
-                        return this.file.moveFile(this.basePath, decodedOriginal, this.basePath, decodedNew);
+                        return moveFn(this.basePath, decodedOriginal, this.basePath, decodedNew);
                     } else {
                         return Promise.reject(error);
                     }
@@ -780,16 +843,46 @@ export class CoreFileProvider {
         });
     }
 
+    /**
+     * Copy a directory.
+     *
+     * @param from Path to the directory to move.
+     * @param to New path of the directory.
+     * @param destDirExists Set it to true if you know the directory where to put the dir exists. If false, the function will
+     *                      try to create it (slower).
+     * @return Promise resolved when the entry is copied.
+     */
+    copyDir(from: string, to: string, destDirExists?: boolean): Promise<any> {
+        return this.copyFileOrDir(from, to, true, destDirExists);
+    }
+
     /**
      * Copy a file.
      *
      * @param from Path to the file to move.
      * @param to New path of the file.
+     * @param destDirExists Set it to true if you know the directory where to put the file exists. If false, the function will
+     *                      try to create it (slower).
      * @return Promise resolved when the entry is copied.
      */
-    copyFile(from: string, to: string): Promise<any> {
+    copyFile(from: string, to: string, destDirExists?: boolean): Promise<any> {
+        return this.copyFileOrDir(from, to, false, destDirExists);
+    }
+
+    /**
+     * Copy a file or a directory.
+     *
+     * @param from Path to the file/dir to move.
+     * @param to New path of the file/dir.
+     * @param isDir Whether it's a dir or a file.
+     * @param destDirExists Set it to true if you know the directory where to put the file/dir exists. If false, the function will
+     *                      try to create it (slower).
+     * @return Promise resolved when the entry is copied.
+     */
+    protected copyFileOrDir(from: string, to: string, isDir?: boolean, destDirExists?: boolean): Promise<any> {
         let fromFileAndDir,
             toFileAndDir;
+        const copyFn = isDir ? this.file.copyDir.bind(this.file) : this.file.copyFile.bind(this.file);
 
         return this.init().then(() => {
             // Paths cannot start with "/". Remove basePath if present.
@@ -799,7 +892,7 @@ export class CoreFileProvider {
             fromFileAndDir = this.getFileAndDirectoryFromPath(from);
             toFileAndDir = this.getFileAndDirectoryFromPath(to);
 
-            if (toFileAndDir.directory) {
+            if (toFileAndDir.directory && !destDirExists) {
                 // Create the target directory if it doesn't exist.
                 return this.createDir(toFileAndDir.directory);
             }
@@ -809,15 +902,15 @@ export class CoreFileProvider {
                 const fromDir = this.textUtils.concatenatePaths(this.basePath, fromFileAndDir.directory),
                     toDir = this.textUtils.concatenatePaths(this.basePath, toFileAndDir.directory);
 
-                return this.file.copyFile(fromDir, fromFileAndDir.name, toDir, toFileAndDir.name);
+                return copyFn(fromDir, fromFileAndDir.name, toDir, toFileAndDir.name);
             } else {
-                return this.file.copyFile(this.basePath, from, this.basePath, to).catch((error) => {
+                return copyFn(this.basePath, from, this.basePath, to).catch((error) => {
                     // The copy can fail if the path has encoded characters. Try again if that's the case.
                     const decodedFrom = decodeURI(from),
                         decodedTo = decodeURI(to);
 
                     if (from != decodedFrom || to != decodedTo) {
-                        return this.file.copyFile(this.basePath, decodedFrom, this.basePath, decodedTo);
+                        return copyFn(this.basePath, decodedFrom, this.basePath, decodedTo);
                     } else {
                         return Promise.reject(error);
                     }

From ef5f96a6438c10e07a655a7fce5ad0ff41c74621 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 22 Nov 2019 11:27:56 +0100
Subject: [PATCH 180/257] MOBILE-2235 h5p: Include core H5P libraries and
 assets

---
 config/copy.config.js                         |    4 +
 src/core/h5p/assets/fonts/h5p-core-23.eot     |  Bin 0 -> 9224 bytes
 src/core/h5p/assets/fonts/h5p-core-23.svg     |   62 +
 src/core/h5p/assets/fonts/h5p-core-23.ttf     |  Bin 0 -> 9044 bytes
 src/core/h5p/assets/fonts/h5p-core-23.woff    |  Bin 0 -> 9120 bytes
 src/core/h5p/assets/js/h5p-action-bar.js      |  100 +
 .../h5p/assets/js/h5p-confirmation-dialog.js  |  410 +++
 src/core/h5p/assets/js/h5p-content-type.js    |   41 +
 .../assets/js/h5p-content-upgrade-process.js  |  313 ++
 .../assets/js/h5p-content-upgrade-worker.js   |   63 +
 src/core/h5p/assets/js/h5p-content-upgrade.js |  445 +++
 src/core/h5p/assets/js/h5p-data-view.js       |  442 +++
 src/core/h5p/assets/js/h5p-display-options.js |   54 +
 src/core/h5p/assets/js/h5p-embed.js           |   75 +
 .../h5p/assets/js/h5p-event-dispatcher.js     |  258 ++
 src/core/h5p/assets/js/h5p-library-details.js |  297 ++
 src/core/h5p/assets/js/h5p-library-list.js    |  140 +
 src/core/h5p/assets/js/h5p-resizer.js         |  131 +
 src/core/h5p/assets/js/h5p-utils.js           |  506 +++
 src/core/h5p/assets/js/h5p-version.js         |   40 +
 src/core/h5p/assets/js/h5p-x-api-event.js     |  331 ++
 src/core/h5p/assets/js/h5p-x-api.js           |  119 +
 src/core/h5p/assets/js/h5p.js                 | 2847 +++++++++++++++++
 src/core/h5p/assets/js/jquery.js              |   20 +
 src/core/h5p/assets/js/request-queue.js       |  436 +++
 .../h5p/assets/js/settings/h5p-disable-hub.js |   68 +
 src/core/h5p/assets/styles/h5p-admin.css      |  358 +++
 .../assets/styles/h5p-confirmation-dialog.css |  183 ++
 .../h5p/assets/styles/h5p-core-button.css     |   60 +
 src/core/h5p/assets/styles/h5p.css            |  566 ++++
 30 files changed, 8369 insertions(+)
 create mode 100644 src/core/h5p/assets/fonts/h5p-core-23.eot
 create mode 100644 src/core/h5p/assets/fonts/h5p-core-23.svg
 create mode 100644 src/core/h5p/assets/fonts/h5p-core-23.ttf
 create mode 100644 src/core/h5p/assets/fonts/h5p-core-23.woff
 create mode 100644 src/core/h5p/assets/js/h5p-action-bar.js
 create mode 100644 src/core/h5p/assets/js/h5p-confirmation-dialog.js
 create mode 100644 src/core/h5p/assets/js/h5p-content-type.js
 create mode 100644 src/core/h5p/assets/js/h5p-content-upgrade-process.js
 create mode 100644 src/core/h5p/assets/js/h5p-content-upgrade-worker.js
 create mode 100644 src/core/h5p/assets/js/h5p-content-upgrade.js
 create mode 100644 src/core/h5p/assets/js/h5p-data-view.js
 create mode 100644 src/core/h5p/assets/js/h5p-display-options.js
 create mode 100644 src/core/h5p/assets/js/h5p-embed.js
 create mode 100644 src/core/h5p/assets/js/h5p-event-dispatcher.js
 create mode 100644 src/core/h5p/assets/js/h5p-library-details.js
 create mode 100644 src/core/h5p/assets/js/h5p-library-list.js
 create mode 100644 src/core/h5p/assets/js/h5p-resizer.js
 create mode 100644 src/core/h5p/assets/js/h5p-utils.js
 create mode 100644 src/core/h5p/assets/js/h5p-version.js
 create mode 100644 src/core/h5p/assets/js/h5p-x-api-event.js
 create mode 100644 src/core/h5p/assets/js/h5p-x-api.js
 create mode 100644 src/core/h5p/assets/js/h5p.js
 create mode 100644 src/core/h5p/assets/js/jquery.js
 create mode 100644 src/core/h5p/assets/js/request-queue.js
 create mode 100644 src/core/h5p/assets/js/settings/h5p-disable-hub.js
 create mode 100644 src/core/h5p/assets/styles/h5p-admin.css
 create mode 100644 src/core/h5p/assets/styles/h5p-confirmation-dialog.css
 create mode 100644 src/core/h5p/assets/styles/h5p-core-button.css
 create mode 100644 src/core/h5p/assets/styles/h5p.css

diff --git a/config/copy.config.js b/config/copy.config.js
index 77007db47..cf81edd35 100644
--- a/config/copy.config.js
+++ b/config/copy.config.js
@@ -41,4 +41,8 @@ module.exports = {
     src: ['{{ROOT}}/node_modules/mathjax/localization/**/*'],
     dest: '{{WWW}}/lib/mathjax/localization'
   },
+  copyH5P: {
+    src: ['{{ROOT}}/src/core/h5p/assets/**/*'],
+    dest: '{{WWW}}/h5p/'
+  },
 };
diff --git a/src/core/h5p/assets/fonts/h5p-core-23.eot b/src/core/h5p/assets/fonts/h5p-core-23.eot
new file mode 100644
index 0000000000000000000000000000000000000000..f86828cffdda12bed59b2ad866f8df857a15fca1
GIT binary patch
literal 9224
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

literal 0
HcmV?d00001

diff --git a/src/core/h5p/assets/fonts/h5p-core-23.svg b/src/core/h5p/assets/fonts/h5p-core-23.svg
new file mode 100644
index 000000000..dd65f1809
--- /dev/null
+++ b/src/core/h5p/assets/fonts/h5p-core-23.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMid meet">
+<metadata>
+<json>
+<![CDATA[
+{
+	"fontFamily": "h5p-core-21",
+	"description": "Font generated by IcoMoon.",
+	"majorVersion": 1,
+	"minorVersion": 1,
+	"version": "Version 1.1",
+	"fontId": "h5p-core-21",
+	"psName": "h5p-core-21",
+	"subFamily": "Regular",
+	"fullName": "h5p-core-21"
+}
+]]>
+</json>
+</metadata>
+<defs>
+<font id="h5p-core-21" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
+<glyph unicode="&#xe565;" glyph-name="arrow-down" data-tags="arrow-down" d="M234 389.669h556l-278-278z" />
+<glyph unicode="&#xe566;" glyph-name="arrow-left" data-tags="arrow-left" d="M381-11.331v524l262-262z" />
+<glyph unicode="&#xe58e;" glyph-name="colapse" data-tags="colapse" d="M512 447.336l256-256-60-60-196 196-196-196-60 60z" />
+<glyph unicode="&#xe58f;" glyph-name="expand" data-tags="expand" d="M708 423.336l60-60-256-256-256 256 60 60 196-196z" />
+<glyph unicode="&#xe600;" glyph-name="move" data-tags="move" d="M386.662 725.063h71.27v-71.27h-71.27v71.27zM566.067 725.063h71.27v-71.27h-71.27v71.27zM386.662 568.8h71.27v-71.27h-71.27v71.27zM566.067 568.8h71.27v-71.27h-71.27v71.27zM386.662 412.435h71.27v-71.27h-71.27v71.27zM566.067 412.435h71.27v-71.27h-71.27v71.27zM386.662 256.173h71.27v-71.27h-71.27v71.27zM566.067 256.173h71.27v-71.27h-71.27v71.27zM386.662 99.808h71.27v-71.27h-71.27v71.27zM566.067 99.808h71.27v-71.27h-71.27v71.27zM386.662-56.454h71.27v-71.27h-71.27v71.27zM566.067-56.454h71.27v-71.27h-71.27v71.27z" />
+<glyph unicode="&#xe601;" glyph-name="check-mark" data-tags="check-mark" d="M454.299 245.924l-116.917 116.917-84.781-84.707 201.696-201.697 317.097 317.097-84.781 84.706z" />
+<glyph unicode="&#xe888;" glyph-name="arrow-up-circle" data-tags="arrow-up-circle" d="M512 606.057c-148.616 0-264.722-120.75-260.077-269.367 0-125.395 88.241-232.212 208.991-255.434v213.636h-92.885c-13.933 0-13.933 9.288-9.288 18.577l139.327 171.838c4.645 9.288 13.933 9.288 23.221 4.645 0 0 4.645-4.645 4.645-4.645l139.327-171.838c9.288-9.288 4.645-18.577-9.288-18.577h-92.885v-213.636c143.972 32.51 232.212 171.838 199.703 315.808-23.221 120.75-130.039 204.347-250.789 208.991z" />
+<glyph unicode="&#xe889;" glyph-name="info-circle" data-tags="info-circle" d="M512 601.601c-144.077 0-260.266-116.191-260.266-260.266s116.191-260.266 260.266-260.266 260.266 116.191 260.266 260.266v0c0 139.429-116.191 255.619-260.266 260.266zM470.171 550.478h88.305v-69.714h-88.305v69.714zM600.305 160.078h-181.257v51.123h51.123v162.666h-51.123v51.123h139.429v-218.438h46.477l-4.648-46.477z" />
+<glyph unicode="&#xe88a;" glyph-name="search" data-tags="search" d="M772.098 125.51l-110.68 110.68c71.943 99.612 49.806 243.494-49.806 315.437s-243.494 44.27-315.437-55.339c-71.943-99.612-49.806-243.494 49.806-315.437 77.475-55.339 182.623-55.339 260.098 0l110.68-110.68c5.533-5.533 11.068-5.533 16.601 0 0 0 0 0 0 0l33.205 33.205c11.068 5.533 11.068 16.601 5.533 22.137 0 0 0 0 0 0zM478.795 202.985c-88.544 0-160.486 71.943-160.486 160.486s71.943 160.486 160.486 160.486 160.486-71.943 160.486-160.486-71.943-160.486-160.486-160.486v0z" />
+<glyph unicode="&#xe88c;" glyph-name="fullscreen" data-tags="fullscreen" d="M368.55 490.521c5.737 5.737 0 5.737-5.737 5.737l-103.284 11.476c-5.737 5.737-11.476 0-11.476-5.737l11.476-109.021c0-5.737 5.737-5.737 5.737-5.737l103.284 103.284zM293.959 427.403l63.118-63.118c5.737-5.737 11.476-5.737 17.213 0l22.953 22.953c5.737 5.737 5.737 11.476 0 17.213l-63.118 57.379-40.166-34.429zM787.42 387.237c5.737-5.737 5.737 0 5.737 5.737l11.476 109.021c0 5.737-5.737 11.476-11.476 11.476l-109.021-11.476c-5.737 0-5.737-5.737-5.737-5.737l109.021-109.021zM724.305 461.832l-63.118-63.118c-5.737-5.737-5.737-11.476 0-17.213l22.953-22.953c5.737-5.737 11.476-5.737 17.213 0l63.118 63.118-40.166 40.166zM689.876 180.672c-5.737-5.737 0-5.737 5.737-5.737l109.021-11.476c5.737 0 11.476 5.737 11.476 11.476l-17.213 103.284c0 5.737-5.737 5.737-5.737 5.737l-103.284-103.284zM758.731 249.527l-63.118 63.118c-5.737 5.737-11.476 5.737-17.213 0l-22.953-22.953c-5.737-5.737-5.737-11.476 0-17.213l63.118-63.118 40.166 40.166zM265.269 283.956c-5.737 5.737-5.737 0-5.737-5.737l-11.476-109.021c0-5.737 5.737-11.476 11.476-11.476l109.021 11.476c5.737 0 5.737 5.737 5.737 5.737l-109.021 109.021zM334.124 209.362l63.118 63.118c5.737 5.737 5.737 11.476 0 17.213l-22.953 22.953c-5.737 5.737-11.476 5.737-17.213 0l-63.118-63.118 40.166-40.166zM161.985 593.805v-499.201h722.979v499.201h-722.979zM844.799 134.77h-636.911v413.13h636.911v-413.13z" />
+<glyph unicode="&#xe88e;" glyph-name="h5p" data-tags="h5p" d="M934.072 489.192c-22.319 16.738-50.216 27.897-89.273 27.897h-139.487v-66.954h-156.225l-11.159-55.795c11.159 5.579 27.897 11.159 39.057 11.159s22.319 0 33.476 0c33.476 0 66.954-11.159 89.273-33.476s33.476-50.216 33.476-83.692c0-22.319-5.579-44.635-16.738-66.954s-27.897-39.057-50.216-50.216c-5.579-5.579-16.738 0-22.319-11.159h117.17v133.908h66.954c44.635 0 78.113 11.159 100.43 27.897 22.319 22.319 33.476 50.216 33.476 83.692 0 39.057-11.159 66.954-27.897 83.692v0zM839.221 377.603c-11.159-5.579-22.319-11.159-44.635-11.159h-33.476v83.692h39.057c22.319 0 33.476-5.579 44.635-11.159 5.579-5.579 11.159-16.738 11.159-27.897 0-16.738-5.579-27.897-16.738-33.476v0zM565.826 338.546c-16.738 0-33.476-11.159-44.635-27.897l-94.851 16.738 44.635 195.281h-94.851v-150.646h-117.17v150.646h-111.589v-362.667h111.589v133.908h117.17v-133.908h139.487c-16.738 11.159-33.476 11.159-44.635 22.319s-22.319 22.319-27.897 33.476c-5.579 11.159-11.159 22.319-16.738 39.057l94.851 16.738c5.579-16.738 22.319-27.897 44.635-27.897 27.897 0 50.216 22.319 50.216 50.216 0 22.319-22.319 44.635-50.216 44.635v0z" />
+<glyph unicode="&#xe88f;" glyph-name="rights-of-use" data-tags="rights-of-use" d="M899.611 329.519c0-5.907 0-5.907 0-5.907-23.631-23.631-47.261-35.448-76.799-41.355-11.813 0-23.631-5.907-35.448-5.907s-17.724 0-29.537 0c0 0-5.907 0-5.907 5.907-64.985 59.079-135.877 118.153-200.863 183.139 0 0-5.907 0-5.907 0-23.631-5.907-47.261-11.813-70.892-17.724s-53.168 0-76.799 11.813c-17.724 11.813-23.631 17.724-29.537 35.448-5.907 5.907 0 23.631 11.813 23.631 41.355 11.813 88.616 29.537 129.971 47.261 11.813 5.907 29.537 5.907 41.355 5.907 5.907 0 11.813-5.907 11.813-5.907 41.355-17.724 82.709-29.537 124.060-47.261 0 0 5.907 0 5.907 0 29.537 5.907 64.985 17.724 94.523 23.631 5.907 0 5.907 0 5.907 0l106.34-212.676zM291.12 335.429c17.724 11.813 35.448 5.907 53.168-11.813 11.813-11.813 11.813-29.537 5.907-47.261 17.724 5.907 35.448-5.907 41.355-17.724 11.813-17.724 5.907-35.448-5.907-47.261 5.907 0 11.813 0 17.724 0 11.813-5.907 23.631-11.813 29.537-29.537s0-29.537-5.907-35.448c-5.907-5.907-11.813-11.813-17.724-17.724s-11.813-11.813-17.724-17.724-35.448-17.724-53.168 0c-29.537 29.537-53.168 64.985-82.709 94.523-17.724 23.631-35.448 41.355-47.261 64.985-5.907 11.813-11.813 17.724-11.813 29.537 0 5.907 0 17.724 5.907 23.631 11.813 11.813 17.724 17.724 29.537 29.537 17.724 17.724 47.261 11.813 64.985-5.907-5.907 0-5.907-5.907-5.907-11.813v0zM438.811 128.66l29.537-29.537c17.724-17.724 47.261-11.813 59.079 5.907l-5.907 5.907c-23.631 23.631-47.261 47.261-70.892 70.892-5.907 5.907-5.907 5.907-5.907 11.813s5.907 5.907 11.813 11.813c5.907 0 11.813 0 11.813-5.907 11.813-11.813 29.537-29.537 47.261-47.261 11.813-11.813 29.537-29.537 47.261-47.261 5.907-11.813 17.724-11.813 29.537-11.813 11.813 5.907 23.631 11.813 29.537 23.631 0 5.907 0 5.907 0 5.907-41.355 41.355-88.616 82.709-129.971 129.971-5.907 5.907-5.907 5.907-5.907 11.813 0 11.813 11.813 11.813 23.631 5.907 0 0 5.907 0 5.907-5.907 41.355-41.355 88.616-88.616 129.971-129.971 5.907-5.907 5.907-5.907 5.907-5.907 17.724 0 35.448 17.724 35.448 35.448 0 5.907 0 5.907 0 5.907-47.261 47.261-100.429 100.429-147.691 147.691-5.907 5.907-5.907 5.907-5.907 11.813s5.907 11.813 5.907 11.813c5.907 0 11.813 0 11.813-5.907 5.907-5.907 5.907-5.907 11.813-11.813 35.448-35.448 70.892-70.892 106.34-106.34 11.813-11.813 23.631-23.631 29.537-29.537 0 0 5.907-5.907 5.907 0 23.631 5.907 35.448 29.537 29.537 53.168h35.448c0 0 0 0 0 0 0-5.907 0-17.724 0-23.631-5.907-29.537-23.631-47.261-53.168-59.079 0 0-5.907 0-5.907-5.907-11.813-29.537-35.448-53.168-64.985-53.168-5.907 0-5.907 0-5.907-5.907-17.724-35.448-59.079-47.261-88.616-35.448-5.907 0-11.813 5.907-11.813 5.907-5.907-5.907-11.813-11.813-23.631-17.724-29.537-11.813-59.079-5.907-76.799 11.813-11.813 11.813-17.724 17.724-29.537 29.537 17.724 23.631 23.631 29.537 29.537 41.355v0 0zM273.396 642.628c29.537-11.813 64.985-23.631 94.523-29.537 35.448-11.813 64.985-23.631 100.429-29.537 0 0 0 0 5.907 0-17.724-5.907-35.448-11.813-47.261-17.724 0 0-5.907 0-5.907 0-47.261 11.813-94.523 23.631-135.877 41.355-5.907 0-5.907 0-5.907 0l-76.799-183.139c0-11.813 5.907-17.724 11.813-23.631s5.907-5.907 5.907-11.813c-5.907-5.907-11.813-17.724-23.631-23.631-17.724 17.724-29.537 35.448-29.537 64.985l88.616 212.676c-5.907-11.813 5.907 5.907 17.724 0v0z" />
+<glyph unicode="&#xe890;" glyph-name="delete-circle" data-tags="delete-circle" d="M512 601.601c-147.107 0-260.266-118.817-260.266-260.266s118.817-260.266 260.266-260.266 260.266 118.817 260.266 260.266-113.158 260.266-260.266 260.266zM653.449 262.123c5.659-5.659 5.659-16.973 0-28.29l-33.949-33.949c-5.659-5.659-16.973-5.659-28.29 0l-79.212 79.212-79.212-79.212c-5.659-5.659-16.973-5.659-28.29 0l-33.949 33.949c-5.659 5.659-5.659 16.973 0 28.29l84.871 79.212-79.212 79.212c-5.659 5.659-5.659 16.973 0 28.29l33.949 33.949c5.659 5.659 16.973 5.659 28.29 0l73.554-84.871 79.212 79.212c5.659 5.659 16.973 5.659 28.29 0l33.949-33.949c5.659-5.659 5.659-16.973 0-28.29l-79.212-73.554 79.212-79.212z" />
+<glyph unicode="&#xe891;" glyph-name="window" data-tags="window" d="M203.936 461.136c-5.704-5.704 0-5.704 5.704-5.704l108.394-11.41c5.704 0 11.41 5.704 11.41 11.41l-17.114 102.687c0 5.704-5.704 5.704-5.704 5.704l-102.687-102.687zM272.395 523.891l-62.752 62.752c-5.704 5.704-11.41 5.704-17.114 0l-17.114-22.821c-5.704-5.704-5.704-11.41 0-17.114l62.752-62.752 34.228 39.935zM751.605 558.119c-5.704 5.704-5.704 0-5.704-5.704l-11.41-108.394c0-5.704 5.704-11.41 11.41-11.41l108.394 11.41c5.704 0 5.704 5.704 5.704 5.704l-108.394 108.394zM814.357 483.957l62.752 62.752c5.704 5.704 5.704 11.41 0 17.114l-22.821 22.821c-5.704 5.704-11.41 5.704-17.114 0l-62.752-62.752 39.935-39.935zM848.588 221.534c5.704 5.704 0 5.704-5.704 5.704l-102.687 17.114c-5.704 0-11.41-5.704-11.41-11.41l11.41-108.394c0-5.704 5.704-5.704 5.704-5.704l102.687 102.687zM780.129 158.779l62.752-62.752c5.704-5.704 11.41-5.704 17.114 0l22.821 22.821c5.704 5.704 5.704 11.41 0 17.114l-62.752 62.752-39.935-39.935zM300.919 124.551c5.704-5.704 5.704 0 5.704 5.704l11.41 108.394c0 5.704-5.704 11.41-11.41 11.41l-108.394-11.41c-5.704 0-5.704-5.704-5.704-5.704l108.394-108.394zM238.167 193.010l-62.752-62.752c-5.704-5.704-5.704-11.41 0-17.114l22.821-22.821c5.704-5.704 11.41-5.704 17.114 0l62.752 62.752-39.935 39.935zM352.264 466.843v-239.605h347.998v239.605h-347.998zM654.622 267.172h-262.424v154.032h262.424v-154.032z" />
+<glyph unicode="&#xe892;" glyph-name="code" data-tags="code" d="M449.641 235.325c6.235-6.235 6.235-12.472 6.235-18.707v-62.359c0-6.235-6.235-6.235-6.235-6.235l-230.728 155.897c-6.235 6.235-6.235 12.472-6.235 18.707v49.886c0 6.235 6.235 12.472 6.235 18.707l230.728 155.897c6.235 6.235 6.235 0 6.235-6.235v-62.359c0-6.235-6.235-12.472-6.235-18.707l-162.134-112.245c-6.235-6.235-6.235-6.235 0-12.472l162.134-99.776zM736.493 341.335c6.235 6.235 6.235 6.235 0 12.472l-155.897 112.245c-6.235 6.235-6.235 12.472-6.235 18.707v62.359c0 6.235 6.235 6.235 6.235 6.235l230.728-155.897c6.235-6.235 6.235-12.472 6.235-18.707v-49.886c0-6.235-6.235-12.472-6.235-18.707l-230.728-155.897c-6.235-6.235-6.235 0-6.235 6.235v62.359c0 6.235 6.235 12.472 6.235 18.707l155.897 99.776z" />
+<glyph unicode="&#xe893;" glyph-name="download" data-tags="download" d="M358.941 435.525c-11.773 0-17.66-5.887-5.887-17.66l153.059-188.382c5.887-11.773 23.547-11.773 29.433 0l153.059 188.382c5.887 11.773 5.887 17.66-5.887 17.66h-323.782zM576.756 423.751v135.399c0 11.773-11.773 23.547-23.547 23.547h-70.643c-11.773 0-23.547-11.773-23.547-23.547v-141.286h117.739zM653.286 288.352c-5.887 0-17.66-5.887-23.547-11.773l-76.53-94.19c-5.887-5.887-17.66-17.66-23.547-23.547 0 0-5.887-5.887-11.773-5.887s-17.66 11.773-17.66 11.773c-5.887 5.887-17.66 17.66-23.547 23.547l-76.53 94.19c-5.887 5.887-17.66 11.773-23.547 11.773h-123.626c-5.887 0-17.66-5.887-17.66-17.66v-141.286c0-5.887 5.887-17.66 17.66-17.66h529.824c5.887 0 17.66 5.887 17.66 17.66v141.286c0 5.887-5.887 17.66-17.66 17.66l-129.513-5.887zM305.958 176.502c-17.66 0-29.433 11.773-29.433 29.433s11.773 29.433 29.433 29.433c17.66 0 29.433-11.773 29.433-29.433s-11.773-29.433-29.433-29.433v0z" />
+<glyph unicode="&#xe894;" glyph-name="delete" data-tags="delete" d="M620.266 341.335l134.045 134.045c10.311 10.311 10.311 30.934 0 41.245l-61.866 61.866c-10.311 10.311-30.934 10.311-41.245 0l-134.045-134.045-134.045 134.045c-10.311 10.311-30.934 10.311-41.245 0l-61.866-61.866c-10.311-10.311-10.311-30.934 0-41.245l134.045-134.045-134.045-134.045c-10.311-10.311-10.311-30.934 0-41.245l61.866-61.866c10.311-10.311 30.934-10.311 41.245 0l134.045 134.045 134.045-134.045c10.311-10.311 30.934-10.311 41.245 0l61.866 61.866c10.311 10.311 10.311 30.934 0 41.245l-134.045 134.045z" />
+<glyph unicode="&#xe900;" glyph-name="edit-image" data-tags="edit-image" d="M300.237 621.639c69.018 23.142 133.325 14.234 189.133-33.28 56.627-48.128 77.619-110.592 63.181-183.808-2.355-12.186 0.307-19.456 8.704-27.853 93.901-93.389 156.774-156.467 250.47-250.163 5.427-5.427 10.957-10.854 15.667-16.896 39.424-50.278 16.794-124.006-44.237-142.029-36.966-10.957-68.403 0-95.334 27.034-95.642 96.051-160.973 160.973-256.614 257.024-6.963 6.963-12.8 8.909-22.63 6.758-117.76-26.317-229.171 60.826-231.731 181.453-0.614 26.419 3.584 52.326 15.974 77.926 34.816-34.816 68.506-67.789 101.274-101.786 10.445-10.752 20.992-15.36 36.045-15.36 14.643 0 25.19 3.891 34.816 14.848 10.752 12.39 23.040 23.347 34.611 35.021 14.336 14.438 14.336 46.080-0.205 60.518-35.123 35.226-70.349 70.349-106.598 106.496 3.891 2.253 5.632 3.482 7.475 4.096zM703.386 63.559c-0.41-24.269 20.685-45.466 44.851-45.158 23.757 0.41 44.032 20.992 43.93 44.544-0.102 23.757-20.275 44.032-44.237 44.134-23.859 0.307-44.237-19.661-44.544-43.52z" />
+<glyph unicode="&#xe901;" glyph-name="hourglass" data-tags="hourglass" d="M733.286-10.579c-147.763 0-295.526 0-443.29 0 0 2.048 0.102 4.096 0 6.144-0.307 13.824-1.024 32.666-0.922 46.49 0.41 39.731 6.861 78.131 19.046 115.2 17.203 52.224 43.725 96.256 81.306 130.355 4.506 4.096 9.216 7.885 13.722 11.776-0.205 0.717-0.307 1.126-0.41 1.229-1.331 1.229-2.765 2.355-4.198 3.584-28.058 22.63-50.688 51.405-68.403 85.606-30.618 59.085-43.52 123.597-41.165 192.614 0.205 7.168 0.614 18.33 0.922 25.498 147.763 0 295.526 0 443.29 0 0.205-1.331 0.512-2.662 0.614-3.994 2.662-36.966 1.229-77.722-5.939-113.869-14.336-72.909-44.544-133.837-95.027-179.405-4.096-3.686-8.294-7.066-12.39-10.547 0.205-0.717 0.307-1.126 0.512-1.331 0.819-0.717 1.638-1.434 2.458-2.15 42.189-33.894 71.68-79.872 90.931-135.782 11.776-34.202 18.637-69.837 20.070-106.701 0.819-19.763-0.614-44.851-1.126-64.717zM687.309 32.634c0 6.554 0.205 12.493 0 18.432-1.331 37.581-7.27 74.138-19.866 108.749-17.92 49.562-45.568 88.269-88.678 108.646-2.458 1.126-2.97 3.072-2.97 5.837 0.102 16.691 0.102 33.485 0 50.176 0 3.994 1.331 5.427 4.096 6.963 9.114 5.325 18.432 10.24 26.829 16.896 29.696 23.552 49.152 56.934 62.362 95.744 10.342 30.413 15.77 62.259 17.818 94.822 0.614 9.114 0.102 18.227 0.102 27.546-116.634 0-233.574 0-351.027 0 0.307-8.704 0.614-16.998 1.024-25.395 1.946-37.274 8.499-73.216 21.504-107.213 18.125-47.104 45.261-83.558 86.528-103.117 2.253-1.024 2.867-2.662 2.867-5.427-0.102-17.203-0.102-34.509 0-51.712 0-3.072-1.024-4.506-3.277-5.632-5.632-2.867-11.366-5.734-16.691-9.216-34.304-22.733-56.832-57.754-71.987-100.147-12.493-35.123-18.125-71.987-19.661-109.875-0.205-5.325 0-10.752 0-16.282 117.35 0.205 234.189 0.205 351.027 0.205zM410.214 451.962c68.096 0 135.373 0 203.674 0-3.789-6.554-7.168-12.595-10.752-18.227-10.957-16.998-24.269-30.618-39.731-41.472s-27.75-25.293-32.768-46.592c-1.638-6.963-2.765-14.336-2.867-21.606-0.307-17.203-0.205-34.406 0.307-51.712 0.717-28.058 12.493-48.947 32.154-62.566 43.008-30.003 65.843-75.878 75.776-132.506 0.307-1.638 0.307-3.379 0.614-5.53-83.149 0-166.093 0-249.242 0 2.662 20.685 7.885 40.346 15.462 59.085 13.312 32.973 32.768 59.187 59.494 77.722 16.589 11.469 28.365 27.955 32.358 50.995 0.819 4.813 1.331 9.83 1.434 14.746 0.102 18.637 0.614 37.274-0.205 55.808-1.126 24.678-11.981 43.213-28.57 57.139-9.216 7.782-18.944 14.746-27.648 23.142-11.981 11.162-21.197 25.395-29.491 41.574z" />
+<glyph unicode="&#xe902;" glyph-name="plus-icon" data-tags="plus-icon" d="M768 285.015c0-19.323-15.664-34.987-34.987-34.987h-151.040v-151.467c0-19.323-15.664-34.987-34.987-34.987h-69.547c-19.323 0-34.987 15.664-34.987 34.987v151.467h-151.467c-19.323 0-34.987 15.664-34.987 34.987v69.547c0 19.323 15.664 34.987 34.987 34.987h151.467v151.467c0 19.323 15.664 34.987 34.987 34.987h69.547c19.323 0 34.987-15.664 34.987-34.987v-151.467h151.467c19.323 0 34.987-15.664 34.987-34.987z" />
+<glyph unicode="&#xe903;" glyph-name="video-upload-icon" data-tags="video-upload-icon" d="M384 328.535v-128c0-21.333 21.333-42.667 42.667-42.667h128c21.333 0 42.667 17.067 42.667 42.667v128c0 21.333-17.067 42.667-42.667 42.667h-128c-21.333 0-42.667-17.067-42.667-42.667zM785.067 499.201l-102.4 106.667c-12.8 12.8-38.4 21.333-55.467 21.333h-140.8l21.333-42.667h89.6v-136.533c0-17.067 12.8-29.867 29.867-29.867h140.8v-341.333h-426.667v328.533h-42.667v-341.333c0-17.067 12.8-29.867 29.867-29.867h448c17.067 0 29.867 12.8 29.867 29.867v384c4.267 17.067-8.533 38.4-21.333 51.2zM640 456.535v123.733c4.267 0 12.8-4.267 12.8-8.533l102.4-102.4c4.267-4.267 4.267-8.533 8.533-12.8h-123.733zM725.333 166.401v196.267c0 4.267-4.267 8.533-8.533 8.533s-8.533 0-12.8-4.267l-89.6-89.6v-29.867l89.6-89.6c8.533-4.267 8.533 0 12.8 0 4.267 4.267 8.533 4.267 8.533 8.533zM349.867 473.601v136.533l59.733-59.733c8.533-8.533 17.067-4.267 25.6 0l12.8 12.8c8.533 8.533 8.533 17.067 0 25.6l-115.2 106.667c-8.533 8.533-17.067 8.533-21.333 0l-115.2-110.933c-4.267-8.533-4.267-17.067 0-25.6l12.8-12.8c8.533-8.533 17.067-8.533 21.333 0l59.733 59.733v-136.533c0-8.533 8.533-17.067 17.067-17.067h25.6c0 0 17.067 8.533 17.067 21.333z" />
+<glyph unicode="&#xe904;" glyph-name="play-icon" data-tags="play-icon" d="M392.533 597.335c81.067 46.933 187.733 46.933 273.067 0 42.667-25.6 72.533-55.467 98.133-98.133 72.533-128 29.867-294.4-98.133-371.2-128-72.533-294.4-29.867-371.2 98.133-46.933 81.067-46.933 187.733 0 273.067 21.333 42.667 55.467 72.533 98.133 98.133zM661.333 345.601c12.8 8.533 12.8 29.867 0 38.4l-192 110.933c-8.533 4.267-12.8 4.267-21.333 0s-12.8-12.8-12.8-21.333v-226.133c0-8.533 4.267-17.067 12.8-21.333s17.067-4.267 21.333 0l192 119.467z" />
+<glyph unicode="&#xe905;" glyph-name="copy" data-tags="copy" d="M722.133 561.201h-247.733c-65.867 0-119.2-53.333-119.2-119.2v-288.533c0-65.867 53.333-119.2 119.2-119.2h247.867c65.867 0 119.2 53.333 119.2 119.2v288.533c-0.267 65.867-53.467 119.2-119.333 119.2zM778.533 156.534c0-31.333-25.067-56.4-56.4-56.4h-247.867c-31.333 0-56.4 25.067-56.4 56.4v285.467c0 31.333 25.067 56.4 56.4 56.4h247.733c31.333 0 56.4-25.067 56.4-56.4v-285.467zM245.2 326.001v288.533c0 31.333 25.067 56.4 56.4 56.4h247.733c31.333 0 56.4-25.067 56.4-56.4v-18.8h62.667v18.8c0 65.867-53.333 119.2-119.2 119.2h-247.467c-65.867 0-119.2-53.333-119.2-119.2v-288.533c0-65.867 53.333-119.2 119.2-119.2h18.8v62.667h-18.8c-31.467-3.067-56.533 22-56.533 56.533zM681.2 360.534h-163.067c-18.8 0-31.333 12.533-31.333 31.333s12.533 31.333 31.333 31.333h163.067c18.8 0 31.333-12.533 31.333-31.333s-15.6-31.333-31.333-31.333zM681.2 266.401h-163.067c-18.8 0-31.333 12.533-31.333 31.333s12.533 31.333 31.333 31.333h163.067c18.8 0 31.333-12.533 31.333-31.333s-15.6-31.333-31.333-31.333zM681.2 172.268h-163.067c-18.8 0-31.333 12.533-31.333 31.333s12.533 31.333 31.333 31.333h163.067c18.8 0 31.333-12.533 31.333-31.333s-15.6-31.333-31.333-31.333z" />
+<glyph unicode="&#xe906;" glyph-name="examples-icon" data-tags="examples-icon" d="M213.333 166.402c89.6 38.4 183.467 68.267 273.067 17.067v281.6c-68.267 46.933-157.867 55.467-234.667 12.8l-38.4-311.467zM810.667 166.402l-42.667 315.733c-72.533 38.4-166.4 34.133-234.667-17.067v-285.867c93.867 51.2 187.733 21.333 277.333-12.8zM832 520.535c-51.2 29.867-110.933 46.933-170.667 55.467-51.2 0-102.4-8.533-149.333-29.867-46.933 21.333-98.133 29.867-149.333 29.867-59.733-4.267-119.467-25.6-170.667-55.467l-64-452.267c0 0 29.867-17.067 110.933 21.333 46.933 25.6 102.4 34.133 157.867 25.6 42.667-4.267 85.333-21.333 115.2-55.467v0c29.867 34.133 72.533 51.2 115.2 55.467 55.467 4.267 106.667-4.267 157.867-29.867 81.067-38.4 110.933-21.333 110.933-21.333l-64 456.533zM793.6 115.202c-42.667 21.333-89.6 34.133-140.8 34.133-8.533 0-21.333 0-29.867 0-42.667-4.267-81.067-17.067-115.2-42.667-34.133 25.6-72.533 38.4-115.2 42.667-12.8 0-21.333 0-34.133 0-46.933 0-93.867-8.533-136.533-29.867-21.333-12.8-46.933-21.333-72.533-25.6l64 413.867c46.933 25.6 98.133 38.4 149.333 42.667 46.933 0 93.867-8.533 136.533-25.6l12.8-8.533 12.8 4.267c42.667 17.067 89.6 25.6 136.533 25.6 51.2-4.267 102.4-17.067 149.333-42.667l59.733-418.133c-29.867 8.533-51.2 17.067-76.8 29.867z" />
+<glyph unicode="&#xe907;" glyph-name="tutorials-icon" data-tags="tutorials-icon" d="M887.467 430.935l-375.467-110.933h-4.267l-217.6 68.267c-21.333-25.6-34.133-59.733-34.133-98.133 21.333-12.8 25.6-38.4 12.8-59.733-4.267-4.267-8.533-8.533-12.8-12.8l17.067-145.067c0-4.267 0-4.267-4.267-8.533 0 0 0 0-4.267 0h-64c-4.267 0-4.267 0-8.533 4.267 0 4.267-4.267 4.267-4.267 8.533l17.067 145.067c-12.8 8.533-17.067 21.333-17.067 34.133 0 17.067 8.533 29.867 21.333 38.4 0 38.4 12.8 76.8 34.133 110.933l-106.667 29.867c-8.533 4.267-8.533 8.533-8.533 17.067 0 4.267 4.267 4.267 4.267 4.267l375.467 119.467h4.267l375.467-123.733c4.267 0 8.533-4.267 8.533-8.533s-4.267-8.533-8.533-12.8zM725.333 234.669c4.267-46.933-93.867-85.333-213.333-85.333s-213.333 38.4-213.333 85.333l4.267 106.667 192-64c4.267 0 12.8 0 17.067 0s12.8 0 17.067 4.267l192 59.733 4.267-106.667z" />
+<glyph unicode="&#xe908;" glyph-name="info-important-description" data-tags="info-important-description" d="M512 697.368c-188.5 0-341.3-152.8-341.3-341.3s152.8-341.4 341.3-341.4 341.3 152.8 341.3 341.3-152.8 341.4-341.3 341.4v0zM512 43.268c-172.7 0-312.7 140-312.7 312.7s140 312.7 312.7 312.7c172.7 0 312.7-140 312.7-312.7-0.2-172.6-140.1-312.5-312.7-312.7v0zM512 605.568c-137.9 0-249.6-111.8-249.6-249.6s111.7-249.6 249.6-249.6 249.6 111.8 249.6 249.6-111.8 249.6-249.6 249.6v0z" />
+<glyph unicode="&#xe909;" glyph-name="icon-info" data-tags="icon-info" d="M467.2 459.522h87.467c0.028 0 0.062 0 0.095 0 6.056 0 11.499 2.629 15.248 6.808 3.979 4.15 6.419 9.769 6.419 15.957 0 0.097-0.001 0.194-0.002 0.29v70.385c0.001 0.082 0.002 0.179 0.002 0.276 0 6.188-2.44 11.806-6.409 15.946-3.759 4.19-9.201 6.819-15.257 6.819-0.033 0-0.067 0-0.1 0h-87.462c-0.028 0-0.062 0-0.095 0-6.056 0-11.499-2.629-15.248-6.808-3.979-4.15-6.419-9.769-6.419-15.957 0-0.097 0.001-0.194 0.002-0.29v-69.959c-0.001-0.082-0.002-0.179-0.002-0.276 0-6.188 2.44-11.806 6.409-15.946 3.715-4.373 9.2-7.159 15.338-7.245zM597.333 156.589h-22.187v209.92c0.001 0.082 0.002 0.179 0.002 0.276 0 6.188-2.44 11.806-6.409 15.946-3.759 4.19-9.201 6.819-15.257 6.819-0.033 0-0.067 0-0.1 0h-130.128c-0.028 0-0.062 0-0.095 0-6.056 0-11.499-2.629-15.248-6.808-3.979-4.15-6.419-9.769-6.419-15.957 0-0.097 0.001-0.194 0.002-0.29v-46.492c-0.001-0.082-0.002-0.179-0.002-0.276 0-6.188 2.44-11.806 6.409-15.946 3.759-4.19 9.201-6.819 15.257-6.819 0.033 0 0.067 0 0.1 0h22.182v-139.947h-22.187c-0.028 0-0.062 0-0.095 0-6.056 0-11.499-2.629-15.248-6.808-3.979-4.15-6.419-9.769-6.419-15.957 0-0.097 0.001-0.194 0.002-0.29v-46.492c-0.001-0.082-0.002-0.179-0.002-0.276 0-6.188 2.44-11.806 6.409-15.946 3.759-4.19 9.201-6.819 15.257-6.819 0.033 0 0.067 0 0.1 0h174.075c0.028 0 0.062 0 0.095 0 6.056 0 11.499 2.629 15.248 6.808 3.979 4.15 6.419 9.769 6.419 15.957 0 0.097-0.001 0.194-0.002 0.29v46.065c0.043 0.527 0.067 1.141 0.067 1.761 0 5.302-1.791 10.185-4.8 14.079-3.742 4.424-9.36 7.247-15.636 7.247-0.489 0-0.975-0.017-1.456-0.051z" />
+<glyph unicode="&#xe90a;" glyph-name="paste" data-tags="paste" d="M394.402 702.4h-75.333c-65.867 0-119.2-53.333-119.2-119.2v-288.533c0-56.4 37.6-100.4 87.867-116v69.067c-15.733 9.467-25.067 25.067-25.067 47.067v288.4c0 31.333 25.067 56.4 56.4 56.4h131.733c0 0 0 0 3.2 3.2v0c0 31.333-28.267 59.6-59.6 59.6zM704.802 592.533c0 0-28.267 0-40.8 0-12.533 34.533-43.867 59.6-84.667 59.6s-69.067-25.067-81.6-59.6c-12.533 0-40.8 0-40.8 0-65.867 0-119.2-53.333-119.2-119.2v-288.533c0-65.867 53.333-119.2 119.2-119.2h247.867c65.867 0 119.2 53.333 119.2 119.2v285.467c3.2 65.867-53.2 122.267-119.2 122.267zM582.535 605.2c22 0 40.8-18.8 40.8-40.8s-18.8-40.8-40.8-40.8c-22 0-40.8 18.8-40.8 40.8s15.733 40.8 40.8 40.8zM764.402 181.733c0-31.333-25.067-56.4-56.4-56.4h-250.933c-31.333 0-56.4 25.067-56.4 56.4v288.533c0 18.8 9.467 37.6 25.067 47.067v0c0-43.867 34.533-78.4 78.4-78.4h160c43.867 0 78.4 34.533 78.4 78.4v0c12.533-9.467 22-28.267 22-47.067v-288.533z" />
+<glyph unicode="&#xe90b;" glyph-name="reuse" data-tags="reuse" d="M734.974 624.751c-54.605 61.619-134.123 100.573-222.977 100.573-164.936 0-298.661-133.724-298.661-298.661h74.667c0 123.721 100.272 223.993 223.993 223.993 68.214 0 128.747-30.96 169.766-79.119l-70.213-70.213h199.109v199.109l-75.689-75.689zM511.999 202.671c-68.214 0-128.747 30.96-169.766 79.119l70.213 70.213h-199.109v-199.109l75.689 75.689c54.605-61.619 134.123-100.573 222.977-100.573 164.936 0 298.661 133.724 298.661 298.661h-74.667c0-123.721-100.272-223.993-223.993-223.993z" />
+<glyph unicode="&#xe90c;" glyph-name="info-outlined" data-tags="info-outlined" d="M467.199 181.336h89.599v268.8h-89.599v-268.8zM512 853.335c-247.296 0-448.001-200.705-448.001-448.001s200.705-448.001 448.001-448.001 448.001 200.705 448.001 448.001-200.705 448.001-448.001 448.001zM512 46.936c-197.568 0-358.398 160.83-358.398 358.398s160.83 358.398 358.398 358.398 358.398-160.83 358.398-358.398-160.83-358.398-358.398-358.398zM467.199 539.734h89.599v89.599h-89.599v-89.599z" />
+<glyph unicode="&#xe90d;" glyph-name="spinner" data-tags="spinner" d="M600 808.001c0-48.602-39.398-88-88-88s-88 39.398-88 88 39.398 88 88 88 88-39.398 88-88zM512 133.333c-48.602 0-88-39.398-88-88s39.398-88 88-88 88 39.398 88 88-39.398 88-88 88zM893.334 514.667c-48.602 0-88-39.398-88-88s39.398-88 88-88 88 39.398 88 88-39.398 88-88 88zM218.666 426.667c0 48.602-39.398 88-88 88s-88-39.398-88-88 39.398-88 88-88 88 39.398 88 88zM242.357 245.024c-48.602 0-88-39.398-88-88s39.398-88 88-88 88 39.398 88 88c0 48.6-39.4 88-88 88zM781.643 245.024c-48.602 0-88-39.398-88-88s39.398-88 88-88 88 39.398 88 88c0 48.6-39.398 88-88 88zM242.357 784.31c-48.602 0-88-39.398-88-88s39.398-88 88-88 88 39.398 88 88-39.4 88-88 88z" />
+<glyph unicode="&#xe90e;" glyph-name="copy-enabled" data-tags="copy-enabled" d="M614.525 809.292h-317.672c-74.968 0-135.9-60.931-135.9-135.9v-370.388c0-43.817 20.88-82.842 53.231-107.83v70.346c-4.45 11.297-7.016 23.962-7.016 37.484v370.388c0 49.292 40.224 89.516 89.516 89.516h318.014c15.232 0 29.611-3.766 42.107-10.613h68.294c-24.646 34.402-65.039 56.997-110.57 56.997zM674.431 267.403h-209.327c-14.721 0-23.105-8.388-23.105-23.105s8.388-23.105 23.105-23.105h209.327c11.124 0 23.105 8.899 23.105 23.105 0 14.721-8.388 23.105-23.105 23.105zM674.431 388.244h-209.327c-14.721 0-23.105-8.388-23.105-23.105s8.388-23.105 23.105-23.105h209.327c11.124 0 23.105 8.899 23.105 23.105 0 14.721-8.388 23.105-23.105 23.105zM726.978 686.23h-318.014c-74.968 0-135.9-60.931-135.9-135.9v-370.388c0-74.968 60.931-135.9 135.9-135.9v0h318.183c74.968 0 135.9 60.931 135.9 135.9v370.388c-0.342 74.968-61.273 135.9-136.073 135.9zM816.494 183.878c0-49.292-40.224-89.516-89.516-89.516h-318.183c-49.292 0-89.516 40.224-89.516 89.516v366.449c0 49.292 40.224 89.516 89.516 89.516h318.014c49.292 0 89.516-40.224 89.516-89.516v-349.334h0.173v-17.115zM674.431 509.081h-209.327c-14.721 0-23.105-8.388-23.105-23.105s8.388-23.105 23.105-23.105h209.327c11.124 0 23.105 8.899 23.105 23.105 0 14.721-8.388 23.105-23.105 23.105z" />
+<glyph unicode="&#xe90f;" glyph-name="copy-disabled" data-tags="copy-disabled" d="M614.525 809.292h-317.672c-74.968 0-135.9-60.931-135.9-135.9v-370.388c0-43.817 20.88-82.842 53.231-107.83v70.346c-4.45 11.297-7.016 23.962-7.016 37.484v370.388c0 49.292 40.224 89.516 89.516 89.516h318.014c15.232 0 29.611-3.766 42.107-10.613h68.294c-24.646 34.402-65.039 56.997-110.57 56.997zM726.978 686.23h-318.014c-74.968 0-135.9-60.931-135.9-135.9v-370.388c0-74.968 60.931-135.9 135.9-135.9v0h318.183c74.968 0 135.9 60.931 135.9 135.9v370.388c-0.342 74.968-61.273 135.9-136.073 135.9zM816.494 183.878c0-49.292-40.224-89.516-89.516-89.516h-318.183c-49.292 0-89.516 40.224-89.516 89.516v366.449c0 49.292 40.224 89.516 89.516 89.516h318.014c49.292 0 89.516-40.224 89.516-89.516v-349.334h0.173v-17.115zM709.521 468.857l-27.728 27.555-109.544-109.544-109.544 109.544-27.555-27.555 109.544-109.544-109.544-109.544 27.555-27.555 109.544 109.544 109.544-109.544 27.555 27.555-109.544 109.544 109.713 109.544z" />
+<glyph unicode="&#xe910;" glyph-name="paste-enabled" data-tags="paste-enabled" d="M410.237 57.275c-75.402 0-136.793 61.394-136.793 136.793v373.025c0 75.402 61.394 136.793 136.793 136.793h64.85l4.152 11.413c15.219 41.678 47.732 65.715 89.237 65.715 42.716 0 78.512-25.075 93.212-65.715l4.152-11.413h64.85c37.007 0 73.499-15.911 99.786-43.581 25.594-26.805 38.737-61.048 37.007-96.326v-369.738c0-75.402-61.394-136.793-136.793-136.793l-320.453-0.173zM360.947 638.689c-24.729-15.046-40.64-44.619-40.64-75.575v-373.025c0-49.804 40.467-90.271 90.271-90.271h324.432c43.754 0 80.415 31.476 88.545 72.981h1.73l0.173 17.295v373.025c0 28.708-14.181 58.627-35.277 74.71l-27.67 20.923v-17.468c0-47.213-36.834-84.048-84.048-84.048h-207.351c-47.213 0-84.048 36.834-84.048 84.048v13.489l-26.113-16.084zM572.451 733.631c-27.843 0-48.766-20.923-48.766-48.766 0-26.459 22.307-48.766 48.766-48.766s48.766 22.307 48.766 48.766c0.173 26.286-22.134 48.766-48.766 48.766zM422.169 764.069c7.78 8.818 16.603 16.776 24.383 25.594 1.903 2.076 3.806 4.325 5.709 6.401h-158.585c-75.748 0-137.312-61.567-137.312-137.312v-374.236c0-44.965 21.788-84.913 55.167-109.988v68.829c-5.536 12.278-8.472 26.113-8.472 41.159v374.236c0 49.804 40.64 90.444 90.444 90.444h116.561c3.633 5.19 7.78 10.202 12.105 14.873z" />
+<glyph unicode="&#xe911;" glyph-name="paste-disabled" data-tags="paste-disabled" d="M410.237 57.275c-75.402 0-136.793 61.394-136.793 136.793v373.025c0 75.402 61.394 136.793 136.793 136.793h64.85l4.152 11.413c15.219 41.678 47.732 65.715 89.237 65.715 42.716 0 78.512-25.075 93.212-65.715l4.152-11.413h64.85c37.007 0 73.499-15.911 99.786-43.581 25.594-26.805 38.737-61.048 37.007-96.326v-369.738c0-75.402-61.394-136.793-136.793-136.793l-320.453-0.173zM360.947 638.689c-24.729-15.046-40.64-44.619-40.64-75.575v-373.025c0-49.804 40.467-90.271 90.271-90.271h324.432c43.754 0 80.415 31.476 88.545 72.981h1.73l0.173 17.295v373.025c0 28.708-14.181 58.627-35.277 74.71l-27.67 20.923v-17.468c0-47.213-36.834-84.048-84.048-84.048h-207.351c-47.213 0-84.048 36.834-84.048 84.048v13.489l-26.113-16.084zM572.451 733.631c-27.843 0-48.766-20.923-48.766-48.766 0-26.459 22.307-48.766 48.766-48.766s48.766 22.307 48.766 48.766c0.173 26.286-22.134 48.766-48.766 48.766zM422.169 764.069c7.78 8.818 16.603 16.776 24.383 25.594 1.903 2.076 3.806 4.325 5.709 6.401h-158.585c-75.748 0-137.312-61.567-137.312-137.312v-374.236c0-44.965 21.788-84.913 55.167-109.988v68.829c-5.536 12.278-8.472 26.113-8.472 41.159v374.236c0 49.804 40.64 90.444 90.444 90.444h116.561c3.633 5.19 7.78 10.202 12.105 14.873zM718.585 463.848l-28.016 27.843-110.68-110.68-110.68 110.68-27.843-27.843 110.68-110.68-110.68-110.68 27.843-27.843 110.68 110.68 110.68-110.68 27.843 27.843-110.68 110.68 110.853 110.68z" />
+<glyph unicode="&#xe912;" glyph-name="button-disabled" data-tags="button-disabled" d="M853.333 699.246l-68.754 68.754-272.579-272.579-272.579 272.579-68.754-68.754 272.579-272.579-272.579-272.579 68.754-68.754 272.579 272.579 272.579-272.579 68.754 68.754-272.579 272.579z" />
+</font></defs></svg>
\ No newline at end of file
diff --git a/src/core/h5p/assets/fonts/h5p-core-23.ttf b/src/core/h5p/assets/fonts/h5p-core-23.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..3a3348adf7f30f859ea69837ae25932cbd9d4c89
GIT binary patch
literal 9044
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

literal 0
HcmV?d00001

diff --git a/src/core/h5p/assets/fonts/h5p-core-23.woff b/src/core/h5p/assets/fonts/h5p-core-23.woff
new file mode 100644
index 0000000000000000000000000000000000000000..ff03f42489c69ff862254a487b6de5afb4b28998
GIT binary patch
literal 9120
zcmcgyd5~O3dGCJR@0yu6GjFapJIC%EyEA*w&b=$Gc309KvL#1aMe9h5C3!8@D`f4i
z(1C9dmP^4WR@vafC}8XaC$S5P1mc1KR=Gql6d}PzRN)jypuks%T}}ujpizGP-mJ8C
zjLjcZ-cG;%`s=U1zP_WsetZ4a$w@*9p6tWKZRa~swlSi#`q}!&g%TlD1MX^(d;z6@
z-{RaM;P#_@yGZ~1`t6m4xg!GiZzu~|k^Bn>Z@d<`|0JaK-6E|&{I#?D=jQ;YcA~x}
zQe^)}H|_@#xcg9U7fF4Py|jPv=ncSq9_5Ec`Y35_J-ECNbm<)^Zx`u=a`Vo`xf{@L
z`Y%yV*{MncOLL3!z&(S$|4yXC=e{|7X!*!d%=h?3ItGZb*XeykCPey}^evP>?Bw(n
zQl>h}s~_rLT@vsZAuk2knG0vg7()VP^$Mm?Mi0%DK%IaScnhio;bcGZ2=N1>0GImN
zwLkmt&*_VIzIgYG54;q(aQ?yt)Dz(6e|GQB$%`KX{@#~}ji(oW8vA7IhL~pEW_{2)
zZiSm%?FMgpVPC<?XZPw<Nrcpg?4e#7?>pgMCWlyro+O|Prs>O4Z{uZpvhgw)QhMu!
zUrHw=D(YktMXI<ZPvd{=Izmoh!cU1c)~T9T^AZL!eD>@xed>apqdg(lf#xwmLoJ=w
zE$Qs=1tO~HV*ms_czNiF3&*8frE{383aRyxAhAfCw2>^ylU`Cp>vA|-M^b-}yt<Z#
zvsHRxYU*#_=_j3=nwpwHy0V!IcxDqGv7VHiCtDb!KNREd$g393(|<U&;~R9{j{iC~
z^G!Meai!$9WLj!Sdq_VD8P!Ww#R^%i)QVWuY$i8KN2oOrDOwSwhlXqQ5n8Y1bNPOX
zmqZ2!2Bv}`$?qG?<@<KK7{7~qRQWDdaqX`4bk|(EN4KIIySn?NJ>l?WrDDC%(>)%w
z^zV6;CsfMhClt^3JZ)_=m2#~wm#h2y*eD^H7!%{tEJ>0y)^BB8VP{<Bl0AxQvEmFv
ztZ6V?Emx7kWmO`z!oXxW6berc6l$yC?wvbt`$D;VS3#C$!=b6dz#D3-{e{U$SgK4k
zo+>|De!c+Jqnu1)9GkI=Rk4D#dM$@}<4;lTzX(<-QmTtINQ)R&9$7~wSFO~_rARoW
zWQ&Y1$6YRO#OlcP_WVgMACK!U!?HTo+_z?#YdoV--uRb|d-iPHuxHPP_b=sodaulb
zNYi~$E7#GBQZC-zz07%9HsmYzY;Z`4i#$U1vSZSA;(@GXv3qOC1eqpR!4|@b(ONEx
zQHHHhq*zxmzEN7M6sRgkYSnrrmsK-L(NdLA8x>V~rbNnCsaDNbaz!<t%lN3Ms&{~c
z8j6(brCKpx7Ysy|#muzH(q@{zmn(chRz33m&7)lBmMo8U(qG8bqwz&9^^bCH0X^E8
z;j+BQRa41~%9?C(KGxX?a0*db<g{~C21<}UAwAc5{)BWZeFb%34IcZ)1QS`~YqFg-
zMs?dvoW2?_*nKU?G~<xTqg~Cu95T_@Xczrp!=V4ssM0?ZvUNXsm_04INf%aZFIK9b
zLa?*y2raLn*ffYf_RZFVoLa7yOG4(Wm0Z3ETn`0eg`_BF6g6MZLRqsWD8prFh4ZVo
zf>jNzu>YSndy;pbc59ZVnOdx1`b|yOT1@Wc$2Mk4e$(_Bd$o{1lQ)ApS2exys$uDS
z`}Q6?bm-XKMpV=MoNMx49yP<sWSG8W_%;s83fgtI_%o)zMdwsI=`+l(mey|1vaIe<
zIrnQGljr>&|Jes0Y<%S8Nlnpozpe!g)9@w3W`e-RKSui5?a~QSCkM$3)Q6Qw&?3}7
zqhz~jb|6>9R0c8vqd59rD?|CQOr=N>=3$^zL~#u*S{*g9A}ZbyMa3El+hH#tntE4O
zq#tYOSdWO6QNl$CUajt|mZ*TTpqc#>y$sW$y^yGa@o}n(SkP7Y;;JT~sY3V4P`(5W
zquT)m?=1R3|C!vSIe_&LWlm26rLv&Rh@QG>5ppiJ9w-d8uGFj|yFJhm(F3~X(Usyt
zQ3+%NW_Q5wa9Pva#@lpD=UUrHn-VESWP08CPa1JUmt-Rf5!WHlx?hIGa$N>2XT6bJ
z#EZRBsSJKb-r&*$NpFWH2ii>;ddXG2#jC{(4(TvC*mKFJD<Y@fNc)y{E-A9gnH;Od
zz*sR&xm}J~vYtWT-f9Gv1QOO|z~Fk_@~5p*BwmO~+-T92>?C+?QMpV(;`Q&6y&An-
zrh%ZWNW5=$KnzdQbg#ifqJK#-!Up&8@5;JrU`!wv<MtRvz@CYYDH)h@pw&cY+-FZm
z_Nwx?TMfk!i-b{f#wkZ*y~WU(?9#c^HrfunCSeqqluRRrOtV)AoLCaj$E$JO4?Drz
z0<u?*By=iA+Nc~0=!#fQ)vLSpfKQhsOkWTJ7c`#KU81e*<3?-boNjP<`W4@iAnSjZ
z=WrZHHW&%P&}Cp2#Vc2VAr!A#38qiHM71T6`aoe4-Xt_NP^eZ515*G)lZAo$J+hpZ
zefrj|+^?r)dB;}HGtj)to8_%r;bp?`GH6to3gek7fWd%(8&7~R!#Ud8ZMJUXJ{{$m
zi#&uMbdk@JS#|{e$Ai;Y2A*(;jFWBTU5<?pt~T2Bi&p!sjdoBt1SrJs=@5e9bTus_
zeG6N15T;vR7$1Qd4#1vD*hE<PgEGBn;WrCMz+sygCTvFls?J85OKufLoc1+s_-N;0
zdR61kX`%7oRHgrDS1)jBVRXe&T<&xxY&WD**zU%&oSLfW>k?IGMi#ySy>+gTb<)6V
zuRZe+)=VPj$OEh-b>SR41fShXlQg6hVQJRU3VdHJBFbUg^>ql3=2R4+`^}1+Lr9;7
zD!{)eFCc$JmLH+5vixybQh(k|AAg0r_$Zf7%eq_wcv@EE5!uBL$xMFt0lW^OVnn8=
zQC9+Z8f!F)d>?G@E98AFB~97BdmXu4$f@GEVr)~|g5&4`CP~Y%l|E`4G@Qj?sl<4l
zD!AozsfMw_naitB9CSff^pD9Q`D2{wjW0j%(<gP``?f%(uRzkcEVNsIw{WknO95_Z
z`fZKBF#LW)B>H(>|B9x4Mb|xls{4HUJ-4ZRFQ^p{UVCI!*X|W9@KTnY7KR8vD2<Z+
z((BR&oJ9!Kr+HSmD3uq_8qKpvUOISE(?-;o2Jh6Ojc6iA)*|wliZY!6psjN%)&V?u
z64Vz7V=DIga~FQh)=Eq8<df*t@k5HR<KhP=<an-rD7bJnIJed6j*qduIz}nba0(Qw
zX?uD24BA_{x~r$nC2?hHaf)lKHPN3agf_i*lk8Iay1Lc}LzHTItQ^%$x7$>;fbMd~
zs&O2&>HYCQAQnTCmP}uJ`|g^{qf9PMLUD5MGIU>9FkzDJa+PwqzED0GE5$Tb(REXI
z<-sFCC3^nZV4MmTF~VpX@yidTtH~5OMG!N}8R42U*<o=YY5LPu-V&3kL&i(?L8csv
zgfF_`QV1?vcx`7{@?e08+duf!OPp+G)n+eX;Ix2Sgj;nEMUX}OP^{U#F!*~1WxoZT
z(<VVJ3>EyGABI(_IUS0(^n?0feHn?mbfYuDRfd^IGKLkB=t_;mWOsj#DV$Q8>htO@
z<dA-xo_kUfl_b?rBdsn?lX`o5cJ}u6QtEaY-EF9Xi{-Jb8!dp|+1v9{`Pwp*nHKW6
z15BdS?@M*4bo7={NmE?OkYQryDD@etSJ8cl5SiqPxmt%3`3*5N6Lr+=iS^Ev6`u_5
ziM8?iY{sdHjdx?)d|6*F98#hl>lpM=CK)XrNCQr7fnw4sv|yz0jEP!Hw&oSJF%L!|
z$&y)Vi`Nq%qx4ZUH^Q10@hdLHh#BEFm$k8nGU{vfw&cB9OMq$2oA3q`F2$|rVUO?+
zB0e2sL>jYoE+hgp@yfu0!CDA2wpQ%zT3Uk96Y&TmA>V^x@1!^Upf9uvq{%m9>`Kvx
zOwN)F%Slfns_jJ-G)d;saX1tKSKImsYt(@~?V(oLMk6@LnvQj<nuwRwDtZ=z$HaM9
z*t4(|5ogINtpacYla-J|L?bqrfm)RwkNc1NV^;9EKTc0w>q;B<M0T0RJ&l=e)1YT?
z!u7dMG1s+>vAoQf%4TO3&Y0Y|V;IYAD9RDl&5tl<C>}QKR$?Z-44kZx;Q8Qnx~KaN
z!)!cGH#HtNOfWodB=zo_WwyW+*7(8Km`vGh>n<>t7_EG0SOFu|qaIMzCDrCWe23!p
zxWpPsG>2F$Db0`==@WLSWb2u2fJB^VM~oGr39@4sp+ayrB6J+3^p4?=jHL>}xT3^T
zZ3CG1d{1vOoAsAd)Z=oUQFKL7RRwc6Bh9q82MZ}2DCT>6lFbI|9uTd6qr{YDjMbz3
z6qJnNf{Nho=1J_`Wzr9ElanSRWDA)UH#_#h7&|0(uxesYf{xSxwq+%3b~GVKP16;H
zZTf0f$yGZbTTQ7FHsNhb(zCxVPEHnoU7DCE4W*;Mw$f<}uk){@qrZx#M<z<Y5;ehK
zG)+JMsMj>Tk9q?k&s#uJakAL>k>Ews#mUCOXgVFG$!IDSZT$4FXj<?M21T_X8j;em
ztmzf}yyo730|fT009Y4Jj+0?_TpGh&ph?PznF%(>GW)5@(hRY^2~QG)nL>QmPqVOW
zY#<^iAjBf*5s^-<$QbHi<4_G!VVCWoCkTQPPOhLAk&s|>Zv4)T<@XQer7L@CAFNE>
zH6G6G?8|M*X1C<}cIL)P>$20`sdbUax>WZc<<^zPa;d2tg5}hjme^3r<#S~xQvQz6
zSo`KYAj3#aWb>Qb*G96zPbcGf8q2y;jc4d^Qp+`dl8?pczDQj0`u$$k8fmOmlR-me
z@s<|&CnJ<l={Fh&`~emU21Cs2*9}HL0mx(Mvd3VdP-71c+E^m^*5j}(VvQ=eS0Gf*
z=DotU3+r!T+Xphj(BQtHT6aP_1aYte5R76+S%$`gMvW*!I_j1PtfA-@yS{M;f8HPP
zD>~HGgn46QTw>gGscu)me?XNuy@Au~MHui1|G@0*&HM~=GyKkQ`q}02U@56*{m{=-
zXhk9B?35C489^mE)Y8f{g-O@nVq1c<?WI!tficS09>81}d7SvzjPym^C#@yBFdOHd
z>rMAb&8VPgW-yUFWL#)0?s05o4u{0dai3$pZCi;<jg0J$#pAKvBO_C*;q^m9Gtrio
z=*-a2`X=1618}9Ue`5&G#{Ry_YFPSWEPjc{B{&{CfA|etRygixX_3nRmyg2}HtG}^
zldi*l771>%sfd-GtBrw5v5Eq2I3UjeM6yLW3_v71FfQYU4e(o1CFw;f0Jx3A`z<(#
zIwYr809Ewt@XHKj>2o`A)UqFq+aQN6*Z6G_;57L*QR!eJ2zFQC&&Z+;95yaNDE$^-
z061<n>tz9Q*7(k|Tz62Y?zgM&7To2+C47P66v8>g1@_??vVjdsUnNmU|ClW?&~9M^
zEu5PiJ2_CQWAs^hAd|(qVY;|OaA+L6D&j3$4IBfx%Es2QqBac<WMPxuxw$x5%6W{m
zbvu>XqqLsV^}e>&Zr#;pThHR8w5fQLKN|I$(a1BY=x?mF;pt01obJ~R>8lf^#*ceO
z+!Ly0(o{6ftoFs0Or~WLXklDwvUHgzYC5eOyKKXm^2XG3Utd~{c^f|#^A$1Ean^(T
z>lRo;aU+&(3VC@&2O<{k!c+#0$9-2_+-}**QO!2hLi$nHk&Pp@`m`0@95B~)b@i8b
zwoQJ0%a5Gw&6U!7`)gKox>g(M@9G*31bW)1zP`CJ+tZFF1-qs`Qt0Yj7cj;6I2pTe
zj-6pM(Bw8~@F?QCvY8FOjV7|U(P4(0V*1?dY~Swb?Kfrd+_Zgq_iFg^^&93Ac;+^&
zzkC&Z{p{=)s6p>XgX!(NuiC!-#%z0g_QvhouiCwR8jODXd?InpdNkRvelD3vB<I#|
zK=bw2Bog!&FggU^26`}$bL=?25r{k60vRTo$P88-7sV?f9D@+y^km;2;%IddmhHon
zQxrF7D>T{ks>139S!rjby}csRPA99-T>|JRm(LH`Sx0-tYGOL11n@vq&YxL9u}%RA
z)R0|+mh}BA4Q-xia%!cMm0XIi5Q{l0<Wr=V?PXoir5v<r656zY8H-V`(kH~S5exUH
zxX8DsW9tWu!y8J$W}|Wuk?+dM1@q4djT9WhW--j(&_r5jJUzHA8D+fMK}XzS*LYw}
zX6<*}9*_Gwy3cT5gt`UYwm~`~-n%Ltji)=RqDe>P-itJ>YwJ+s-t=H_N(;K^;f|^z
z$J);S#N&2*442z;qX0yr-Ga_$cX()P!)0??67R;NCY@LzgIr%)n{MLV1N^Rav3{?)
z<13bGsaD;p=j(4d^+UgNng<d~i;1PB#NtwXap^5*dh^@ODj8o~jIVIOzH@S#46%JI
zVc)|{;KquG?;`fWQXGxM5y`nqS4~KNn&ET-c@TFR^|IL8!lhtFt*;Vs5w7DWc6pWj
zti@-lI(=wxdU|j@_w=`=OK!eCUJZtV(ze0IQ^jDUnxo_CqDq7Qc(MJTvc=eQp+qtm
zN+$mrp#n}KpBS2Mjmf;4JBstg(DWcZHnh#1%4FNzRyb6OVLzv(Nl%y6xT~Yu-Dc8b
zkuFa-kS!LoUjN=i7>q)pWGf;B%IUVD#+{ipfpJ&JL*Lg?g}*`^_2%_h{Qp>y)dKN{
zTOQh#SYCF1@ulTI_+mA_yTW@ZzPt=$f%Dr8n_&cYlh8cA*6Q}xSjuL`8?QEA9jE@r
zYva_U=6K^Z>F*~RuTpcO@mk~632NFe$Rk2!LR%hsto5#c-Rm3vC2`xHo_zmHi7Qdl
z%r6|bt+V(a0sBLw)6V{m4uKXAJ7;sU;pVH;sc}l88OkqnLT^O^Y^M{zok#kulc+dn
zJc4vT(qj&ed=~jRq*u@;iu`lP(@uMG7I_Z1Cy|af)8oLM0{je;Xg7w`gY>CpI*nYU
z$L*21NQkr|f?tCu@M`h|`6|`u7W$A>lfJ}r{BAiX-yr`)Nho)#r`2z3S8Gq`gZejJ
z1FpYuZ*rgU_&rBG|8Cr3yzD*f^ZW2$7xpT2;vWy}i-?P><t&2p_L9#u*NTdLYr+z|
z;ImDb0e@c;=73*l!ZP6HCaeJdToZO7zE0x|fKLm+L{Q_v67iDnH(>_+$D1$*{CX3X
z0pHYw6~JF^!Y=rvwfn1w`t~g!p6@Fa5g=E|A%yY!FoeUn?C2vUQk+~~I+|LTUz$HW
zcXa;UscUXbUAAxeisj{{emJycvP6!O6x`Z8pn0^KLwO#bVN>K9awFcC+1#!GrJ(J<
za{lm<_be}^iv2}$rQP5Nd5>L{!s)!96yI????|wHe&N``xx@HplzEKn7(VgMk;CuU
M3cCa)d%Nd<0Xg+y%K!iX

literal 0
HcmV?d00001

diff --git a/src/core/h5p/assets/js/h5p-action-bar.js b/src/core/h5p/assets/js/h5p-action-bar.js
new file mode 100644
index 000000000..608a848b3
--- /dev/null
+++ b/src/core/h5p/assets/js/h5p-action-bar.js
@@ -0,0 +1,100 @@
+/**
+ * @class
+ * @augments H5P.EventDispatcher
+ * @param {Object} displayOptions
+ * @param {boolean} displayOptions.export Triggers the display of the 'Download' button
+ * @param {boolean} displayOptions.copyright Triggers the display of the 'Copyright' button
+ * @param {boolean} displayOptions.embed Triggers the display of the 'Embed' button
+ * @param {boolean} displayOptions.icon Triggers the display of the 'H5P icon' link
+ */
+H5P.ActionBar = (function ($, EventDispatcher) {
+  "use strict";
+
+  function ActionBar(displayOptions) {
+    EventDispatcher.call(this);
+
+    /** @alias H5P.ActionBar# */
+    var self = this;
+
+    var hasActions = false;
+
+    // Create action bar
+    var $actions = H5P.jQuery('<ul class="h5p-actions"></ul>');
+
+    /**
+     * Helper for creating action bar buttons.
+     *
+     * @private
+     * @param {string} type
+     * @param {string} customClass Instead of type class
+     */
+    var addActionButton = function (type, customClass) {
+      /**
+       * Handles selection of action
+       */
+      var handler = function () {
+        self.trigger(type);
+      };
+      H5P.jQuery('<li/>', {
+        'class': 'h5p-button h5p-noselect h5p-' + (customClass ? customClass : type),
+        role: 'button',
+        tabindex: 0,
+        title: H5P.t(type + 'Description'),
+        html: H5P.t(type),
+        on: {
+          click: handler,
+          keypress: function (e) {
+            if (e.which === 32) {
+              handler();
+              e.preventDefault(); // (since return false will block other inputs)
+            }
+          }
+        },
+        appendTo: $actions
+      });
+
+      hasActions = true;
+    };
+
+    // Register action bar buttons
+    if (displayOptions.export || displayOptions.copy) {
+      // Add export button
+      addActionButton('reuse', 'export');
+    }
+    if (displayOptions.copyright) {
+      addActionButton('copyrights');
+    }
+    if (displayOptions.embed) {
+      addActionButton('embed');
+    }
+    if (displayOptions.icon) {
+      // Add about H5P button icon
+      H5P.jQuery('<li><a class="h5p-link" href="http://h5p.org" target="_blank" title="' + H5P.t('h5pDescription') + '"></a></li>').appendTo($actions);
+      hasActions = true;
+    }
+
+    /**
+     * Returns a reference to the dom element
+     *
+     * @return {H5P.jQuery}
+     */
+    self.getDOMElement = function () {
+      return $actions;
+    };
+
+    /**
+     * Does the actionbar contain actions?
+     *
+     * @return {Boolean}
+     */
+    self.hasActions = function () {
+      return hasActions;
+    };
+  }
+
+  ActionBar.prototype = Object.create(EventDispatcher.prototype);
+  ActionBar.prototype.constructor = ActionBar;
+
+  return ActionBar;
+
+})(H5P.jQuery, H5P.EventDispatcher);
diff --git a/src/core/h5p/assets/js/h5p-confirmation-dialog.js b/src/core/h5p/assets/js/h5p-confirmation-dialog.js
new file mode 100644
index 000000000..cd3536e7a
--- /dev/null
+++ b/src/core/h5p/assets/js/h5p-confirmation-dialog.js
@@ -0,0 +1,410 @@
+/*global H5P*/
+H5P.ConfirmationDialog = (function (EventDispatcher) {
+  "use strict";
+
+  /**
+   * Create a confirmation dialog
+   *
+   * @param [options] Options for confirmation dialog
+   * @param [options.instance] Instance that uses confirmation dialog
+   * @param [options.headerText] Header text
+   * @param [options.dialogText] Dialog text
+   * @param [options.cancelText] Cancel dialog button text
+   * @param [options.confirmText] Confirm dialog button text
+   * @param [options.hideCancel] Hide cancel button
+   * @param [options.hideExit] Hide exit button
+   * @param [options.skipRestoreFocus] Skip restoring focus when hiding the dialog
+   * @param [options.classes] Extra classes for popup
+   * @constructor
+   */
+  function ConfirmationDialog(options) {
+    EventDispatcher.call(this);
+    var self = this;
+
+    // Make sure confirmation dialogs have unique id
+    H5P.ConfirmationDialog.uniqueId += 1;
+    var uniqueId = H5P.ConfirmationDialog.uniqueId;
+
+    // Default options
+    options = options || {};
+    options.headerText = options.headerText || H5P.t('confirmDialogHeader');
+    options.dialogText = options.dialogText || H5P.t('confirmDialogBody');
+    options.cancelText = options.cancelText || H5P.t('cancelLabel');
+    options.confirmText = options.confirmText || H5P.t('confirmLabel');
+
+    /**
+     * Handle confirming event
+     * @param {Event} e
+     */
+    function dialogConfirmed(e) {
+      self.hide();
+      self.trigger('confirmed');
+      e.preventDefault();
+    }
+
+    /**
+     * Handle dialog canceled
+     * @param {Event} e
+     */
+    function dialogCanceled(e) {
+      self.hide();
+      self.trigger('canceled');
+      e.preventDefault();
+    }
+
+    /**
+     * Flow focus to element
+     * @param {HTMLElement} element Next element to be focused
+     * @param {Event} e Original tab event
+     */
+    function flowTo(element, e) {
+      element.focus();
+      e.preventDefault();
+    }
+
+    // Offset of exit button
+    var exitButtonOffset = 2 * 16;
+    var shadowOffset = 8;
+
+    // Determine if we are too large for our container and must resize
+    var resizeIFrame = false;
+
+    // Create background
+    var popupBackground = document.createElement('div');
+    popupBackground.classList
+      .add('h5p-confirmation-dialog-background', 'hidden', 'hiding');
+
+    // Create outer popup
+    var popup = document.createElement('div');
+    popup.classList.add('h5p-confirmation-dialog-popup', 'hidden');
+    if (options.classes) {
+      options.classes.forEach(function (popupClass) {
+        popup.classList.add(popupClass);
+      });
+    }
+
+    popup.setAttribute('role', 'dialog');
+    popup.setAttribute('aria-labelledby', 'h5p-confirmation-dialog-dialog-text-' + uniqueId);
+    popupBackground.appendChild(popup);
+    popup.addEventListener('keydown', function (e) {
+      if (e.which === 27) {// Esc key
+        // Exit dialog
+        dialogCanceled(e);
+      }
+    });
+
+    // Popup header
+    var header = document.createElement('div');
+    header.classList.add('h5p-confirmation-dialog-header');
+    popup.appendChild(header);
+
+    // Header text
+    var headerText = document.createElement('div');
+    headerText.classList.add('h5p-confirmation-dialog-header-text');
+    headerText.innerHTML = options.headerText;
+    header.appendChild(headerText);
+
+    // Popup body
+    var body = document.createElement('div');
+    body.classList.add('h5p-confirmation-dialog-body');
+    popup.appendChild(body);
+
+    // Popup text
+    var text = document.createElement('div');
+    text.classList.add('h5p-confirmation-dialog-text');
+    text.innerHTML = options.dialogText;
+    text.id = 'h5p-confirmation-dialog-dialog-text-' + uniqueId;
+    body.appendChild(text);
+
+    // Popup buttons
+    var buttons = document.createElement('div');
+    buttons.classList.add('h5p-confirmation-dialog-buttons');
+    body.appendChild(buttons);
+
+    // Cancel button
+    var cancelButton = document.createElement('button');
+    cancelButton.classList.add('h5p-core-cancel-button');
+    cancelButton.textContent = options.cancelText;
+
+    // Confirm button
+    var confirmButton = document.createElement('button');
+    confirmButton.classList.add('h5p-core-button');
+    confirmButton.classList.add('h5p-confirmation-dialog-confirm-button');
+    confirmButton.textContent = options.confirmText;
+
+    // Exit button
+    var exitButton = document.createElement('button');
+    exitButton.classList.add('h5p-confirmation-dialog-exit');
+    exitButton.setAttribute('aria-hidden', 'true');
+    exitButton.tabIndex = -1;
+    exitButton.title = options.cancelText;
+
+    // Cancel handler
+    cancelButton.addEventListener('click', dialogCanceled);
+    cancelButton.addEventListener('keydown', function (e) {
+      if (e.which === 32) { // Space
+        dialogCanceled(e);
+      }
+      else if (e.which === 9 && e.shiftKey) { // Shift-tab
+        flowTo(confirmButton, e);
+      }
+    });
+
+    if (!options.hideCancel) {
+      buttons.appendChild(cancelButton);
+    }
+    else {
+      // Center buttons
+      buttons.classList.add('center');
+    }
+
+    // Confirm handler
+    confirmButton.addEventListener('click', dialogConfirmed);
+    confirmButton.addEventListener('keydown', function (e) {
+      if (e.which === 32) { // Space
+        dialogConfirmed(e);
+      }
+      else if (e.which === 9 && !e.shiftKey) { // Tab
+        const nextButton = !options.hideCancel ? cancelButton : confirmButton;
+        flowTo(nextButton, e);
+      }
+    });
+    buttons.appendChild(confirmButton);
+
+    // Exit handler
+    exitButton.addEventListener('click', dialogCanceled);
+    exitButton.addEventListener('keydown', function (e) {
+      if (e.which === 32) { // Space
+        dialogCanceled(e);
+      }
+    });
+    if (!options.hideExit) {
+      popup.appendChild(exitButton);
+    }
+
+    // Wrapper element
+    var wrapperElement;
+
+    // Focus capturing
+    var focusPredator;
+
+    // Maintains hidden state of elements
+    var wrapperSiblingsHidden = [];
+    var popupSiblingsHidden = [];
+
+    // Element with focus before dialog
+    var previouslyFocused;
+
+    /**
+     * Set parent of confirmation dialog
+     * @param {HTMLElement} wrapper
+     * @returns {H5P.ConfirmationDialog}
+     */
+    this.appendTo = function (wrapper) {
+      wrapperElement = wrapper;
+      return this;
+    };
+
+    /**
+     * Capture the focus element, send it to confirmation button
+     * @param {Event} e Original focus event
+     */
+    var captureFocus = function (e) {
+      if (!popupBackground.contains(e.target)) {
+        e.preventDefault();
+        confirmButton.focus();
+      }
+    };
+
+    /**
+     * Hide siblings of element from assistive technology
+     *
+     * @param {HTMLElement} element
+     * @returns {Array} The previous hidden state of all siblings
+     */
+    var hideSiblings = function (element) {
+      var hiddenSiblings = [];
+      var siblings = element.parentNode.children;
+      var i;
+      for (i = 0; i < siblings.length; i += 1) {
+        // Preserve hidden state
+        hiddenSiblings[i] = siblings[i].getAttribute('aria-hidden') ?
+          true : false;
+
+        if (siblings[i] !== element) {
+          siblings[i].setAttribute('aria-hidden', true);
+        }
+      }
+      return hiddenSiblings;
+    };
+
+    /**
+     * Restores assistive technology state of element's siblings
+     *
+     * @param {HTMLElement} element
+     * @param {Array} hiddenSiblings Hidden state of all siblings
+     */
+    var restoreSiblings = function (element, hiddenSiblings) {
+      var siblings = element.parentNode.children;
+      var i;
+      for (i = 0; i < siblings.length; i += 1) {
+        if (siblings[i] !== element && !hiddenSiblings[i]) {
+          siblings[i].removeAttribute('aria-hidden');
+        }
+      }
+    };
+
+    /**
+     * Start capturing focus of parent and send it to dialog
+     */
+    var startCapturingFocus = function () {
+      focusPredator = wrapperElement.parentNode || wrapperElement;
+      focusPredator.addEventListener('focus', captureFocus, true);
+    };
+
+    /**
+     * Clean up event listener for capturing focus
+     */
+    var stopCapturingFocus = function () {
+      focusPredator.removeAttribute('aria-hidden');
+      focusPredator.removeEventListener('focus', captureFocus, true);
+    };
+
+    /**
+     * Hide siblings in underlay from assistive technologies
+     */
+    var disableUnderlay = function () {
+      wrapperSiblingsHidden = hideSiblings(wrapperElement);
+      popupSiblingsHidden = hideSiblings(popupBackground);
+    };
+
+    /**
+     * Restore state of underlay for assistive technologies
+     */
+    var restoreUnderlay = function () {
+      restoreSiblings(wrapperElement, wrapperSiblingsHidden);
+      restoreSiblings(popupBackground, popupSiblingsHidden);
+    };
+
+    /**
+     * Fit popup to container. Makes sure it doesn't overflow.
+     * @params {number} [offsetTop] Offset of popup
+     */
+    var fitToContainer = function (offsetTop) {
+      var popupOffsetTop = parseInt(popup.style.top, 10);
+      if (offsetTop !== undefined) {
+        popupOffsetTop = offsetTop;
+      }
+
+      if (!popupOffsetTop) {
+        popupOffsetTop = 0;
+      }
+
+      // Overflows height
+      if (popupOffsetTop + popup.offsetHeight > wrapperElement.offsetHeight) {
+        popupOffsetTop = wrapperElement.offsetHeight - popup.offsetHeight - shadowOffset;
+      }
+
+      if (popupOffsetTop - exitButtonOffset <= 0) {
+        popupOffsetTop = exitButtonOffset + shadowOffset;
+
+        // We are too big and must resize
+        resizeIFrame = true;
+      }
+      popup.style.top = popupOffsetTop + 'px';
+    };
+
+    /**
+     * Show confirmation dialog
+     * @params {number} offsetTop Offset top
+     * @returns {H5P.ConfirmationDialog}
+     */
+    this.show = function (offsetTop) {
+      // Capture focused item
+      previouslyFocused = document.activeElement;
+      wrapperElement.appendChild(popupBackground);
+      startCapturingFocus();
+      disableUnderlay();
+      popupBackground.classList.remove('hidden');
+      fitToContainer(offsetTop);
+      setTimeout(function () {
+        popup.classList.remove('hidden');
+        popupBackground.classList.remove('hiding');
+
+        setTimeout(function () {
+          // Focus confirm button
+          confirmButton.focus();
+
+          // Resize iFrame if necessary
+          if (resizeIFrame && options.instance) {
+            var minHeight = parseInt(popup.offsetHeight, 10) +
+              exitButtonOffset + (2 * shadowOffset);
+            self.setViewPortMinimumHeight(minHeight);
+            options.instance.trigger('resize');
+            resizeIFrame = false;
+          }
+        }, 100);
+      }, 0);
+
+      return this;
+    };
+
+    /**
+     * Hide confirmation dialog
+     * @returns {H5P.ConfirmationDialog}
+     */
+    this.hide = function () {
+      popupBackground.classList.add('hiding');
+      popup.classList.add('hidden');
+
+      // Restore focus
+      stopCapturingFocus();
+      if (!options.skipRestoreFocus) {
+        previouslyFocused.focus();
+      }
+      restoreUnderlay();
+      setTimeout(function () {
+        popupBackground.classList.add('hidden');
+        wrapperElement.removeChild(popupBackground);
+        self.setViewPortMinimumHeight(null);
+      }, 100);
+
+      return this;
+    };
+
+    /**
+     * Retrieve element
+     *
+     * @return {HTMLElement}
+     */
+    this.getElement = function () {
+      return popup;
+    };
+
+    /**
+     * Get previously focused element
+     * @return {HTMLElement}
+     */
+    this.getPreviouslyFocused = function () {
+      return previouslyFocused;
+    };
+
+    /**
+     * Sets the minimum height of the view port
+     *
+     * @param {number|null} minHeight
+     */
+    this.setViewPortMinimumHeight = function (minHeight) {
+      var container = document.querySelector('.h5p-container') || document.body;
+      container.style.minHeight = (typeof minHeight === 'number') ? (minHeight + 'px') : minHeight;
+    };
+  }
+
+  ConfirmationDialog.prototype = Object.create(EventDispatcher.prototype);
+  ConfirmationDialog.prototype.constructor = ConfirmationDialog;
+
+  return ConfirmationDialog;
+
+}(H5P.EventDispatcher));
+
+H5P.ConfirmationDialog.uniqueId = -1;
diff --git a/src/core/h5p/assets/js/h5p-content-type.js b/src/core/h5p/assets/js/h5p-content-type.js
new file mode 100644
index 000000000..47c4d21bf
--- /dev/null
+++ b/src/core/h5p/assets/js/h5p-content-type.js
@@ -0,0 +1,41 @@
+/**
+ * H5P.ContentType is a base class for all content types. Used by newRunnable()
+ *
+ * Functions here may be overridable by the libraries. In special cases,
+ * it is also possible to override H5P.ContentType on a global level.
+ *
+ * NOTE that this doesn't actually 'extend' the event dispatcher but instead
+ * it creates a single instance which all content types shares as their base
+ * prototype. (in some cases this may be the root of strange event behavior)
+ *
+ * @class
+ * @augments H5P.EventDispatcher
+ */
+H5P.ContentType = function (isRootLibrary) {
+
+  function ContentType() {}
+
+  // Inherit from EventDispatcher.
+  ContentType.prototype = new H5P.EventDispatcher();
+
+  /**
+   * Is library standalone or not? Not beeing standalone, means it is
+   * included in another library
+   *
+   * @return {Boolean}
+   */
+  ContentType.prototype.isRoot = function () {
+    return isRootLibrary;
+  };
+
+  /**
+   * Returns the file path of a file in the current library
+   * @param  {string} filePath The path to the file relative to the library folder
+   * @return {string} The full path to the file
+   */
+  ContentType.prototype.getLibraryFilePath = function (filePath) {
+    return H5P.getLibraryPath(this.libraryInfo.versionedNameNoSpaces) + '/' + filePath;
+  };
+
+  return ContentType;
+};
diff --git a/src/core/h5p/assets/js/h5p-content-upgrade-process.js b/src/core/h5p/assets/js/h5p-content-upgrade-process.js
new file mode 100644
index 000000000..fbaa4f2bf
--- /dev/null
+++ b/src/core/h5p/assets/js/h5p-content-upgrade-process.js
@@ -0,0 +1,313 @@
+/*jshint -W083 */
+var H5PUpgrades = H5PUpgrades || {};
+
+H5P.ContentUpgradeProcess = (function (Version) {
+
+  /**
+   * @class
+   * @namespace H5P
+   */
+  function ContentUpgradeProcess(name, oldVersion, newVersion, params, id, loadLibrary, done) {
+    var self = this;
+
+    // Make params possible to work with
+    try {
+      params = JSON.parse(params);
+      if (!(params instanceof Object)) {
+        throw true;
+      }
+    }
+    catch (event) {
+      return done({
+        type: 'errorParamsBroken',
+        id: id
+      });
+    }
+
+    self.loadLibrary = loadLibrary;
+    self.upgrade(name, oldVersion, newVersion, params.params, params.metadata, function (err, upgradedParams, upgradedMetadata) {
+      if (err) {
+        err.id = id;
+        return done(err);
+      }
+
+      done(null, JSON.stringify({params: upgradedParams, metadata: upgradedMetadata}));
+    });
+  }
+
+  /**
+   * Run content upgrade.
+   *
+   * @public
+   * @param {string} name
+   * @param {Version} oldVersion
+   * @param {Version} newVersion
+   * @param {Object} params
+   * @param {Object} metadata
+   * @param {Function} done
+   */
+  ContentUpgradeProcess.prototype.upgrade = function (name, oldVersion, newVersion, params, metadata, done) {
+    var self = this;
+
+    // Load library details and upgrade routines
+    self.loadLibrary(name, newVersion, function (err, library) {
+      if (err) {
+        return done(err);
+      }
+      if (library.semantics === null) {
+        return done({
+          type: 'libraryMissing',
+          library: library.name + ' ' + library.version.major + '.' + library.version.minor
+        });
+      }
+
+      // Run upgrade routines on params
+      self.processParams(library, oldVersion, newVersion, params, metadata, function (err, params, metadata) {
+        if (err) {
+          return done(err);
+        }
+
+        // Check if any of the sub-libraries need upgrading
+        asyncSerial(library.semantics, function (index, field, next) {
+          self.processField(field, params[field.name], function (err, upgradedParams) {
+            if (upgradedParams) {
+              params[field.name] = upgradedParams;
+            }
+            next(err);
+          });
+        }, function (err) {
+          done(err, params, metadata);
+        });
+      });
+    });
+  };
+
+  /**
+   * Run upgrade hooks on params.
+   *
+   * @public
+   * @param {Object} library
+   * @param {Version} oldVersion
+   * @param {Version} newVersion
+   * @param {Object} params
+   * @param {Function} next
+   */
+  ContentUpgradeProcess.prototype.processParams = function (library, oldVersion, newVersion, params, metadata, next) {
+    if (H5PUpgrades[library.name] === undefined) {
+      if (library.upgradesScript) {
+        // Upgrades script should be loaded so the upgrades should be here.
+        return next({
+          type: 'scriptMissing',
+          library: library.name + ' ' + newVersion
+        });
+      }
+
+      // No upgrades script. Move on
+      return next(null, params, metadata);
+    }
+
+    // Run upgrade hooks. Start by going through major versions
+    asyncSerial(H5PUpgrades[library.name], function (major, minors, nextMajor) {
+      if (major < oldVersion.major || major > newVersion.major) {
+        // Older than the current version or newer than the selected
+        nextMajor();
+      }
+      else {
+        // Go through the minor versions for this major version
+        asyncSerial(minors, function (minor, upgrade, nextMinor) {
+          minor =+ minor;
+          if (minor <= oldVersion.minor || minor > newVersion.minor) {
+            // Older than or equal to the current version or newer than the selected
+            nextMinor();
+          }
+          else {
+            // We found an upgrade hook, run it
+            var unnecessaryWrapper = (upgrade.contentUpgrade !== undefined ? upgrade.contentUpgrade : upgrade);
+
+            try {
+              unnecessaryWrapper(params, function (err, upgradedParams, upgradedExtras) {
+                params = upgradedParams;
+                if (upgradedExtras && upgradedExtras.metadata) { // Optional
+                  metadata = upgradedExtras.metadata;
+                }
+                nextMinor(err);
+              }, {metadata: metadata});
+            }
+            catch (err) {
+              if (console && console.error) {
+                console.error("Error", err.stack);
+                console.error("Error", err.name);
+                console.error("Error", err.message);
+              }
+              next(err);
+            }
+          }
+        }, nextMajor);
+      }
+    }, function (err) {
+      next(err, params, metadata);
+    });
+  };
+
+  /**
+   * Process parameter fields to find and upgrade sub-libraries.
+   *
+   * @public
+   * @param {Object} field
+   * @param {Object} params
+   * @param {Function} done
+   */
+  ContentUpgradeProcess.prototype.processField = function (field, params, done) {
+    var self = this;
+
+    if (params === undefined) {
+      return done();
+    }
+
+    switch (field.type) {
+      case 'library':
+        if (params.library === undefined || params.params === undefined) {
+          return done();
+        }
+
+        // Look for available upgrades
+        var usedLib = params.library.split(' ', 2);
+        for (var i = 0; i < field.options.length; i++) {
+          var availableLib = (typeof field.options[i] === 'string') ? field.options[i].split(' ', 2) : field.options[i].name.split(' ', 2);
+          if (availableLib[0] === usedLib[0]) {
+            if (availableLib[1] === usedLib[1]) {
+              return done(); // Same version
+            }
+
+            // We have different versions
+            var usedVer = new Version(usedLib[1]);
+            var availableVer = new Version(availableLib[1]);
+            if (usedVer.major > availableVer.major || (usedVer.major === availableVer.major && usedVer.minor >= availableVer.minor)) {
+              return done({
+                type: 'errorTooHighVersion',
+                used: usedLib[0] + ' ' + usedVer,
+                supported: availableLib[0] + ' ' + availableVer
+              }); // Larger or same version that's available
+            }
+
+            // A newer version is available, upgrade params
+            return self.upgrade(availableLib[0], usedVer, availableVer, params.params, params.metadata, function (err, upgradedParams, upgradedMetadata) {
+              if (!err) {
+                params.library = availableLib[0] + ' ' + availableVer.major + '.' + availableVer.minor;
+                params.params = upgradedParams;
+                if (upgradedMetadata) {
+                  params.metadata = upgradedMetadata;
+                }
+              }
+              done(err, params);
+            });
+          }
+        }
+
+        // Content type was not supporte by the higher version
+        done({
+          type: 'errorNotSupported',
+          used: usedLib[0] + ' ' + usedVer
+        });
+        break;
+
+      case 'group':
+        if (field.fields.length === 1 && field.isSubContent !== true) {
+          // Single field to process, wrapper will be skipped
+          self.processField(field.fields[0], params, function (err, upgradedParams) {
+            if (upgradedParams) {
+              params = upgradedParams;
+            }
+            done(err, params);
+          });
+        }
+        else {
+          // Go through all fields in the group
+          asyncSerial(field.fields, function (index, subField, next) {
+            var paramsToProcess = params ? params[subField.name] : null;
+            self.processField(subField, paramsToProcess, function (err, upgradedParams) {
+              if (upgradedParams) {
+                params[subField.name] = upgradedParams;
+              }
+              next(err);
+            });
+
+          }, function (err) {
+            done(err, params);
+          });
+        }
+        break;
+
+      case 'list':
+        // Go trough all params in the list
+        asyncSerial(params, function (index, subParams, next) {
+          self.processField(field.field, subParams, function (err, upgradedParams) {
+            if (upgradedParams) {
+              params[index] = upgradedParams;
+            }
+            next(err);
+          });
+        }, function (err) {
+          done(err, params);
+        });
+        break;
+
+      default:
+        done();
+    }
+  };
+
+  /**
+   * Helps process each property on the given object asynchronously in serial order.
+   *
+   * @private
+   * @param {Object} obj
+   * @param {Function} process
+   * @param {Function} finished
+   */
+  var asyncSerial = function (obj, process, finished) {
+    var id, isArray = obj instanceof Array;
+
+    // Keep track of each property that belongs to this object.
+    if (!isArray) {
+      var ids = [];
+      for (id in obj) {
+        if (obj.hasOwnProperty(id)) {
+          ids.push(id);
+        }
+      }
+    }
+
+    var i = -1; // Keeps track of the current property
+
+    /**
+     * Private. Process the next property
+     */
+    var next = function () {
+      id = isArray ? i : ids[i];
+      process(id, obj[id], check);
+    };
+
+    /**
+     * Private. Check if we're done or have an error.
+     *
+     * @param {String} err
+     */
+    var check = function (err) {
+      // We need to use a real async function in order for the stack to clear.
+      setTimeout(function () {
+        i++;
+        if (i === (isArray ? obj.length : ids.length) || (err !== undefined && err !== null)) {
+          finished(err);
+        }
+        else {
+          next();
+        }
+      }, 0);
+    };
+
+    check(); // Start
+  };
+
+  return ContentUpgradeProcess;
+})(H5P.Version);
diff --git a/src/core/h5p/assets/js/h5p-content-upgrade-worker.js b/src/core/h5p/assets/js/h5p-content-upgrade-worker.js
new file mode 100644
index 000000000..3507a358a
--- /dev/null
+++ b/src/core/h5p/assets/js/h5p-content-upgrade-worker.js
@@ -0,0 +1,63 @@
+/* global importScripts */
+var H5P = H5P || {};
+importScripts('h5p-version.js', 'h5p-content-upgrade-process.js');
+
+var libraryLoadedCallback;
+
+/**
+ * Register message handlers
+ */
+var messageHandlers = {
+  newJob: function (job) {
+    // Start new job
+    new H5P.ContentUpgradeProcess(job.name, new H5P.Version(job.oldVersion), new H5P.Version(job.newVersion), job.params, job.id, function loadLibrary(name, version, next) {
+      // TODO: Cache?
+      postMessage({
+        action: 'loadLibrary',
+        name: name,
+        version: version.toString()
+      });
+      libraryLoadedCallback = next;
+    }, function done(err, result) {
+      if (err) {
+        // Return error
+        postMessage({
+          action: 'error',
+          id: job.id,
+          err: err.message ? err.message : err
+        });
+
+        return;
+      }
+
+      // Return upgraded content
+      postMessage({
+        action: 'done',
+        id: job.id,
+        params: result
+      });
+    });
+  },
+  libraryLoaded: function (data) {
+    var library = data.library;
+    if (library.upgradesScript) {
+      try {
+        importScripts(library.upgradesScript);
+      }
+      catch (err) {
+        libraryLoadedCallback(err);
+        return;
+      }
+    }
+    libraryLoadedCallback(null, data.library);
+  }
+};
+
+/**
+ * Handle messages from our master
+ */
+onmessage = function (event) {
+  if (event.data.action !== undefined && messageHandlers[event.data.action]) {
+    messageHandlers[event.data.action].call(this, event.data);
+  }
+};
diff --git a/src/core/h5p/assets/js/h5p-content-upgrade.js b/src/core/h5p/assets/js/h5p-content-upgrade.js
new file mode 100644
index 000000000..9dc066c5c
--- /dev/null
+++ b/src/core/h5p/assets/js/h5p-content-upgrade.js
@@ -0,0 +1,445 @@
+/* global H5PAdminIntegration H5PUtils */
+
+(function ($, Version) {
+  var info, $log, $container, librariesCache = {}, scriptsCache = {};
+
+  // Initialize
+  $(document).ready(function () {
+    // Get library info
+    info = H5PAdminIntegration.libraryInfo;
+
+    // Get and reset container
+    const $wrapper = $('#h5p-admin-container').html('');
+    $log = $('<ul class="content-upgrade-log"></ul>').appendTo($wrapper);
+    $container = $('<div><p>' + info.message + '</p></div>').appendTo($wrapper);
+
+    // Make it possible to select version
+    var $version = $(getVersionSelect(info.versions)).appendTo($container);
+
+    // Add "go" button
+    $('<button/>', {
+      class: 'h5p-admin-upgrade-button',
+      text: info.buttonLabel,
+      click: function () {
+        // Start new content upgrade
+        new ContentUpgrade($version.val());
+      }
+    }).appendTo($container);
+  });
+
+  /**
+   * Generate html for version select.
+   *
+   * @param {Object} versions
+   * @returns {String}
+   */
+  var getVersionSelect = function (versions) {
+    var html = '';
+    for (var id in versions) {
+      html += '<option value="' + id + '">' + versions[id] + '</option>';
+    }
+    if (html !== '') {
+      html = '<select>' + html + '</select>';
+      return html;
+    }
+  };
+
+  /**
+   * Displays a throbber in the status field.
+   *
+   * @param {String} msg
+   * @returns {_L1.Throbber}
+   */
+  function Throbber(msg) {
+    var $throbber = H5PUtils.throbber(msg);
+    $container.html('').append($throbber);
+
+    /**
+     * Makes it possible to set the progress.
+     *
+     * @param {String} progress
+     */
+    this.setProgress = function (progress) {
+      $throbber.text(msg + ' ' + progress);
+    };
+  }
+
+  /**
+   * Start a new content upgrade.
+   *
+   * @param {Number} libraryId
+   * @returns {_L1.ContentUpgrade}
+   */
+  function ContentUpgrade(libraryId) {
+    var self = this;
+
+    // Get selected version
+    self.version = new Version(info.versions[libraryId]);
+    self.version.libraryId = libraryId;
+
+    // Create throbber with loading text and progress
+    self.throbber = new Throbber(info.inProgress.replace('%ver', self.version));
+
+    self.started = new Date().getTime();
+    self.io = 0;
+
+    // Track number of working
+    self.working = 0;
+
+    var start = function () {
+      // Get the next batch
+      self.nextBatch({
+        libraryId: libraryId,
+        token: info.token
+      });
+    };
+
+    if (window.Worker !== undefined) {
+      // Prepare our workers
+      self.initWorkers();
+      start();
+    }
+    else {
+      // No workers, do the job ourselves
+      self.loadScript(info.scriptBaseUrl + '/h5p-content-upgrade-process.js' + info.buster, start);
+    }
+  }
+
+  /**
+   * Initialize workers
+   */
+  ContentUpgrade.prototype.initWorkers = function () {
+    var self = this;
+
+    // Determine number of workers (defaults to 4)
+    var numWorkers = (window.navigator !== undefined && window.navigator.hardwareConcurrency ? window.navigator.hardwareConcurrency : 4);
+    self.workers = new Array(numWorkers);
+
+    // Register message handlers
+    var messageHandlers = {
+      done: function (result) {
+        self.workDone(result.id, result.params, this);
+      },
+      error: function (error) {
+        self.printError(error.err);
+        self.workDone(error.id, null, this);
+      },
+      loadLibrary: function (details) {
+        var worker = this;
+        self.loadLibrary(details.name, new Version(details.version), function (err, library) {
+          if (err) {
+            // Reset worker?
+            return;
+          }
+
+          worker.postMessage({
+            action: 'libraryLoaded',
+            library: library
+          });
+        });
+      }
+    };
+
+    for (var i = 0; i < numWorkers; i++) {
+      self.workers[i] = new Worker(info.scriptBaseUrl + '/h5p-content-upgrade-worker.js' + info.buster);
+      self.workers[i].onmessage = function (event) {
+        if (event.data.action !== undefined && messageHandlers[event.data.action]) {
+          messageHandlers[event.data.action].call(this, event.data);
+        }
+      };
+    }
+  };
+
+  /**
+   * Get the next batch and start processing it.
+   *
+   * @param {Object} outData
+   */
+  ContentUpgrade.prototype.nextBatch = function (outData) {
+    var self = this;
+
+    // Track time spent on IO
+    var start = new Date().getTime();
+    $.post(info.infoUrl, outData, function (inData) {
+      self.io += new Date().getTime() - start;
+      if (!(inData instanceof Object)) {
+        // Print errors from backend
+        return self.setStatus(inData);
+      }
+      if (inData.left === 0) {
+        var total = new Date().getTime() - self.started;
+
+        if (window.console && console.log) {
+          console.log('The upgrade process took ' + (total / 1000) + ' seconds. (' + (Math.round((self.io / (total / 100)) * 100) / 100) + ' % IO)' );
+        }
+
+        // Terminate workers
+        self.terminate();
+
+        // Nothing left to process
+        return self.setStatus(info.done);
+      }
+
+      self.left = inData.left;
+      self.token = inData.token;
+
+      // Start processing
+      self.processBatch(inData.params, inData.skipped);
+    });
+  };
+
+  /**
+   * Set current status message.
+   *
+   * @param {String} msg
+   */
+  ContentUpgrade.prototype.setStatus = function (msg) {
+    $container.html(msg);
+  };
+
+  /**
+   * Process the given parameters.
+   *
+   * @param {Object} parameters
+   */
+  ContentUpgrade.prototype.processBatch = function (parameters, skipped) {
+    var self = this;
+
+    // Track upgraded params
+    self.upgraded = {};
+    self.skipped = skipped;
+
+    // Track current batch
+    self.parameters = parameters;
+
+    // Create id mapping
+    self.ids = [];
+    for (var id in parameters) {
+      if (parameters.hasOwnProperty(id)) {
+        self.ids.push(id);
+      }
+    }
+
+    // Keep track of current content
+    self.current = -1;
+
+    if (self.workers !== undefined) {
+      // Assign each worker content to upgrade
+      for (var i = 0; i < self.workers.length; i++) {
+        self.assignWork(self.workers[i]);
+      }
+    }
+    else {
+
+      self.assignWork();
+    }
+  };
+
+  /**
+   *
+   */
+  ContentUpgrade.prototype.assignWork = function (worker) {
+    var self = this;
+
+    var id = self.ids[self.current + 1];
+    if (id === undefined) {
+      return false; // Out of work
+    }
+    self.current++;
+    self.working++;
+
+    if (worker) {
+      worker.postMessage({
+        action: 'newJob',
+        id: id,
+        name: info.library.name,
+        oldVersion: info.library.version,
+        newVersion: self.version.toString(),
+        params: self.parameters[id]
+      });
+    }
+    else {
+      new H5P.ContentUpgradeProcess(info.library.name, new Version(info.library.version), self.version, self.parameters[id], id, function loadLibrary(name, version, next) {
+        self.loadLibrary(name, version, function (err, library) {
+          if (library.upgradesScript) {
+            self.loadScript(library.upgradesScript, function (err) {
+              if (err) {
+                err = info.errorScript.replace('%lib', name + ' ' + version);
+              }
+              next(err, library);
+            });
+          }
+          else {
+            next(null, library);
+          }
+        });
+
+      }, function done(err, result) {
+        if (err) {
+          self.printError(err);
+          result = null;
+        }
+
+        self.workDone(id, result);
+      });
+    }
+  };
+
+  /**
+   *
+   */
+  ContentUpgrade.prototype.workDone = function (id, result, worker) {
+    var self = this;
+
+    self.working--;
+    if (result === null) {
+      self.skipped.push(id);
+    }
+    else {
+      self.upgraded[id] = result;
+    }
+
+    // Update progress message
+    self.throbber.setProgress(Math.round((info.total - self.left + self.current) / (info.total / 100)) + ' %');
+
+    // Assign next job
+    if (self.assignWork(worker) === false && self.working === 0) {
+      // All workers have finsihed.
+      self.nextBatch({
+        libraryId: self.version.libraryId,
+        token: self.token,
+        skipped: JSON.stringify(self.skipped),
+        params: JSON.stringify(self.upgraded)
+      });
+    }
+  };
+
+  /**
+   *
+   */
+  ContentUpgrade.prototype.terminate = function () {
+    var self = this;
+
+    if (self.workers) {
+      // Stop all workers
+      for (var i = 0; i < self.workers.length; i++) {
+        self.workers[i].terminate();
+      }
+    }
+  };
+
+  var librariesLoadedCallbacks = {};
+
+  /**
+   * Load library data needed for content upgrade.
+   *
+   * @param {String} name
+   * @param {Version} version
+   * @param {Function} next
+   */
+  ContentUpgrade.prototype.loadLibrary = function (name, version, next) {
+    var self = this;
+
+    var key = name + '/' + version.major + '/' + version.minor;
+
+    if (librariesCache[key] === true) {
+      // Library is being loaded, que callback
+      if (librariesLoadedCallbacks[key] === undefined) {
+        librariesLoadedCallbacks[key] = [next];
+        return;
+      }
+      librariesLoadedCallbacks[key].push(next);
+      return;
+    }
+    else if (librariesCache[key] !== undefined) {
+      // Library has been loaded before. Return cache.
+      next(null, librariesCache[key]);
+      return;
+    }
+
+    // Track time spent loading
+    var start = new Date().getTime();
+    librariesCache[key] = true;
+    $.ajax({
+      dataType: 'json',
+      cache: true,
+      url: info.libraryBaseUrl + '/' + key
+    }).fail(function () {
+      self.io += new Date().getTime() - start;
+      next(info.errorData.replace('%lib', name + ' ' + version));
+    }).done(function (library) {
+      self.io += new Date().getTime() - start;
+      librariesCache[key] = library;
+      next(null, library);
+
+      if (librariesLoadedCallbacks[key] !== undefined) {
+        for (var i = 0; i < librariesLoadedCallbacks[key].length; i++) {
+          librariesLoadedCallbacks[key][i](null, library);
+        }
+      }
+      delete librariesLoadedCallbacks[key];
+    });
+  };
+
+  /**
+   * Load script with upgrade hooks.
+   *
+   * @param {String} url
+   * @param {Function} next
+   */
+  ContentUpgrade.prototype.loadScript = function (url, next) {
+    var self = this;
+
+    if (scriptsCache[url] !== undefined) {
+      next();
+      return;
+    }
+
+    // Track time spent loading
+    var start = new Date().getTime();
+    $.ajax({
+      dataType: 'script',
+      cache: true,
+      url: url
+    }).fail(function () {
+      self.io += new Date().getTime() - start;
+      next(true);
+    }).done(function () {
+      scriptsCache[url] = true;
+      self.io += new Date().getTime() - start;
+      next();
+    });
+  };
+
+  /**
+   *
+   */
+  ContentUpgrade.prototype.printError = function (error) {
+    var self = this;
+
+    switch (error.type) {
+      case 'errorParamsBroken':
+        error = info.errorContent.replace('%id', error.id) + ' ' + info.errorParamsBroken;
+        break;
+
+      case 'libraryMissing':
+        error = info.errorLibrary.replace('%lib', error.library);
+        break;
+
+      case 'scriptMissing':
+        error = info.errorScript.replace('%lib', error.library);
+        break;
+
+      case 'errorTooHighVersion':
+        error = info.errorContent.replace('%id', error.id) + ' ' + info.errorTooHighVersion.replace('%used', error.used).replace('%supported', error.supported);
+        break;
+
+      case 'errorNotSupported':
+        error = info.errorContent.replace('%id', error.id) + ' ' + info.errorNotSupported.replace('%used', error.used);
+        break;
+    }
+
+    $('<li>' + info.error + '<br/>' + error + '</li>').appendTo($log);
+  };
+
+})(H5P.jQuery, H5P.Version);
diff --git a/src/core/h5p/assets/js/h5p-data-view.js b/src/core/h5p/assets/js/h5p-data-view.js
new file mode 100644
index 000000000..3d628bb9d
--- /dev/null
+++ b/src/core/h5p/assets/js/h5p-data-view.js
@@ -0,0 +1,442 @@
+/* global H5PUtils */
+var H5PDataView = (function ($) {
+
+  /**
+   * Initialize a new H5P data view.
+   *
+   * @class
+   * @param {Object} container
+   *   Element to clear out and append to.
+   * @param {String} source
+   *   URL to get data from. Data format: {num: 123, rows:[[1,2,3],[2,4,6]]}
+   * @param {Array} headers
+   *   List with column headers. Can be strings or objects with options like
+   *   "text" and "sortable". E.g.
+   *   [{text: 'Col 1', sortable: true}, 'Col 2', 'Col 3']
+   * @param {Object} l10n
+   *   Localization / translations. e.g.
+   *   {
+   *     loading: 'Loading data.',
+   *     ajaxFailed: 'Failed to load data.',
+   *     noData: "There's no data available that matches your criteria.",
+   *     currentPage: 'Page $current of $total',
+   *     nextPage: 'Next page',
+   *     previousPage: 'Previous page',
+   *     search: 'Search'
+   *   }
+   * @param {Object} classes
+   *   Custom html classes to use on elements.
+   *   e.g. {tableClass: 'fixed'}.
+   * @param {Array} filters
+   *   Make it possible to filter/search in the given column.
+   *   e.g. [null, true, null, null] will make it possible to do a text
+   *   search in column 2.
+   * @param {Function} loaded
+   *   Callback for when data has been loaded.
+   * @param {Object} order
+   */
+  function H5PDataView(container, source, headers, l10n, classes, filters, loaded, order) {
+    var self = this;
+
+    self.$container = $(container).addClass('h5p-data-view').html('');
+
+    self.source = source;
+    self.headers = headers;
+    self.l10n = l10n;
+    self.classes = (classes === undefined ? {} : classes);
+    self.filters = (filters === undefined ? [] : filters);
+    self.loaded = loaded;
+    self.order = order;
+
+    self.limit = 20;
+    self.offset = 0;
+    self.filterOn = [];
+    self.facets = {};
+
+    // Index of column with author name; could be made more general by passing database column names and checking for position
+    self.columnIdAuthor = 2;
+
+    // Future option: Create more general solution for filter presets
+    if (H5PIntegration.user && parseInt(H5PIntegration.user.canToggleViewOthersH5PContents) === 1) {
+      self.updateTable([]);
+      self.filterByFacet(self.columnIdAuthor, H5PIntegration.user.id, H5PIntegration.user.name || '');
+    }
+    else {
+      self.loadData();
+    }
+  }
+
+  /**
+   * Load data from source URL.
+   */
+  H5PDataView.prototype.loadData = function () {
+    var self = this;
+
+    // Throbb
+    self.setMessage(H5PUtils.throbber(self.l10n.loading));
+
+    // Create URL
+    var url = self.source;
+    url += (url.indexOf('?') === -1 ? '?' : '&') + 'offset=' + self.offset + '&limit=' + self.limit;
+
+    // Add sorting
+    if (self.order !== undefined) {
+      url += '&sortBy=' + self.order.by + '&sortDir=' + self.order.dir;
+    }
+
+    // Add filters
+    var filtering;
+    for (var i = 0; i < self.filterOn.length; i++) {
+      if (self.filterOn[i] === undefined) {
+        continue;
+      }
+
+      filtering = true;
+      url += '&filters[' + i + ']=' + encodeURIComponent(self.filterOn[i]);
+    }
+
+    // Add facets
+    for (var col in self.facets) {
+      if (!self.facets.hasOwnProperty(col)) {
+        continue;
+      }
+
+      url += '&facets[' + col + ']=' + self.facets[col].id;
+    }
+
+    // Fire ajax request
+    $.ajax({
+      dataType: 'json',
+      cache: true,
+      url: url
+    }).fail(function () {
+      // Error handling
+      self.setMessage($('<p/>', {text: self.l10n.ajaxFailed}));
+    }).done(function (data) {
+      if (!data.rows.length) {
+        self.setMessage($('<p/>', {text: filtering ? self.l10n.noData : self.l10n.empty}));
+      }
+      else {
+        // Update table data
+        self.updateTable(data.rows);
+      }
+
+      // Update pagination widget
+      self.updatePagination(data.num);
+
+      if (self.loaded !== undefined) {
+        self.loaded();
+      }
+    });
+  };
+
+  /**
+   * Display the given message to the user.
+   *
+   * @param {jQuery} $message wrapper with message
+   */
+  H5PDataView.prototype.setMessage = function ($message) {
+    var self = this;
+
+    if (self.table === undefined) {
+      self.$container.html('').append($message);
+    }
+    else {
+      self.table.setBody($message);
+    }
+  };
+
+  /**
+   * Update table data.
+   *
+   * @param {Array} rows
+   */
+  H5PDataView.prototype.updateTable = function (rows) {
+    var self = this;
+
+    if (self.table === undefined) {
+      // Clear out container
+      self.$container.html('');
+
+      // Add filters
+      self.addFilters();
+
+      // Add toggler for others' content
+      if (H5PIntegration.user && parseInt(H5PIntegration.user.canToggleViewOthersH5PContents) > 0) {
+        // canToggleViewOthersH5PContents = 1 is setting for only showing current user's contents
+        self.addOthersContentToggler(parseInt(H5PIntegration.user.canToggleViewOthersH5PContents) === 1);
+      }
+
+      // Add facets
+      self.$facets = $('<div/>', {
+        'class': 'h5p-facet-wrapper',
+        appendTo: self.$container
+      });
+
+      // Create new table
+      self.table = new H5PUtils.Table(self.classes, self.headers);
+      self.table.setHeaders(self.headers, function (order) {
+        // Sorting column or direction has changed.
+        self.order = order;
+        self.loadData();
+      }, self.order);
+      self.table.appendTo(self.$container);
+    }
+
+    // Process cell data before updating table
+    for (var i = 0; i < self.headers.length; i++) {
+      if (self.headers[i].facet === true) {
+        // Process rows for col, expect object or array
+        for (var j = 0; j < rows.length; j++) {
+          rows[j][i] = self.createFacets(rows[j][i], i);
+        }
+      }
+    }
+
+    // Add/update rows
+    var $tbody = self.table.setRows(rows);
+
+    // Add event handlers for facets
+    $('.h5p-facet', $tbody).click(function () {
+      var $facet = $(this);
+      self.filterByFacet($facet.data('col'), $facet.data('id'), $facet.text());
+    }).keypress(function (event) {
+      if (event.which === 32) {
+        var $facet = $(this);
+        self.filterByFacet($facet.data('col'), $facet.data('id'), $facet.text());
+      }
+    });
+  };
+
+  /**
+   * Create button for adding facet to filter.
+   *
+   * @param (object|Array) input
+   * @param number col ID of column
+   */
+  H5PDataView.prototype.createFacets = function (input, col) {
+    var facets = '';
+
+    if (input instanceof Array) {
+      // Facet can be filtered on multiple values at the same time
+      for (var i = 0; i < input.length; i++) {
+        if (facets !== '') {
+          facets += ', ';
+        }
+        facets += '<span class="h5p-facet" role="button" tabindex="0" data-id="' + input[i].id + '" data-col="' + col + '">' + input[i].title + '</span>';
+      }
+    }
+    else {
+      // Single value facet filtering
+      facets += '<span class="h5p-facet" role="button" tabindex="0" data-id="' + input.id + '" data-col="' + col + '">' + input.title + '</span>';
+    }
+
+    return facets === '' ? '—' : facets;
+  };
+
+  /**
+   * Adds a filter based on the given facet.
+   *
+   * @param number col ID of column we're filtering
+   * @param number id ID to filter on
+   * @param string text Human readable label for the filter
+   */
+  H5PDataView.prototype.filterByFacet = function (col, id, text) {
+    var self = this;
+
+    if (self.facets[col] !== undefined) {
+      if (self.facets[col].id === id) {
+        return; // Don't use the same filter again
+      }
+
+      // Remove current filter for this col
+      self.facets[col].$tag.remove();
+    }
+
+    // Add to UI
+    self.facets[col] = {
+      id: id,
+      '$tag': $('<span/>', {
+        'class': 'h5p-facet-tag',
+        text: text,
+        appendTo: self.$facets,
+      })
+    };
+    /**
+     * Callback for removing filter.
+     *
+     * @private
+     */
+    var remove = function () {
+      // Uncheck toggler for others' H5P contents
+      if ( self.$othersContentToggler && self.facets.hasOwnProperty( self.columnIdAuthor ) ) {
+        self.$othersContentToggler.prop('checked', false );
+      }
+
+      self.facets[col].$tag.remove();
+      delete self.facets[col];
+      self.loadData();
+    };
+
+    // Remove button
+    $('<span/>', {
+      role: 'button',
+      tabindex: 0,
+      appendTo: self.facets[col].$tag,
+      text: self.l10n.remove,
+      title: self.l10n.remove,
+      on: {
+        click: remove,
+        keypress: function (event) {
+          if (event.which === 32) {
+            remove();
+          }
+        }
+      }
+    });
+
+    // Load data with new filter
+    self.loadData();
+  };
+
+  /**
+   * Update pagination widget.
+   *
+   * @param {Number} num size of data collection
+   */
+  H5PDataView.prototype.updatePagination = function (num) {
+    var self = this;
+
+    if (self.pagination === undefined) {
+      if (self.table === undefined) {
+        // No table, no pagination
+        return;
+      }
+
+      // Create new widget
+      var $pagerContainer = $('<div/>', {'class': 'h5p-pagination'});
+      self.pagination = new H5PUtils.Pagination(num, self.limit, function (offset) {
+        // Handle page changes in pagination widget
+        self.offset = offset;
+        self.loadData();
+      }, self.l10n);
+
+      self.pagination.appendTo($pagerContainer);
+      self.table.setFoot($pagerContainer);
+    }
+    else {
+      // Update existing widget
+      self.pagination.update(num, self.limit);
+    }
+  };
+
+  /**
+   * Add filters.
+   */
+  H5PDataView.prototype.addFilters = function () {
+    var self = this;
+
+    for (var i = 0; i < self.filters.length; i++) {
+      if (self.filters[i] === true) {
+        // Add text input filter for col i
+        self.addTextFilter(i);
+      }
+    }
+  };
+
+  /**
+   * Add text filter for given col num.
+   *
+   * @param {Number} col
+   */
+  H5PDataView.prototype.addTextFilter = function (col) {
+    var self = this;
+
+    /**
+     * Find input value and filter on it.
+     * @private
+     */
+    var search = function () {
+      var filterOn = $input.val().replace(/^\s+|\s+$/g, '');
+      if (filterOn === '') {
+        filterOn = undefined;
+      }
+      if (filterOn !== self.filterOn[col]) {
+        self.filterOn[col] = filterOn;
+        self.loadData();
+      }
+    };
+
+    // Add text field for filtering
+    var typing;
+    var $input = $('<input/>', {
+      type: 'text',
+      placeholder: self.l10n.search,
+      on: {
+        'blur': function () {
+          clearTimeout(typing);
+          search();
+        },
+        'keyup': function (event) {
+          if (event.keyCode === 13) {
+            clearTimeout(typing);
+            search();
+            return false;
+          }
+          else {
+            clearTimeout(typing);
+            typing = setTimeout(function () {
+              search();
+            }, 500);
+          }
+        }
+      }
+    }).appendTo(self.$container);
+  };
+
+  /**
+   * Add toggle for others' H5P content.
+   * @param {boolean} [checked=false] Initial check setting.
+   */
+  H5PDataView.prototype.addOthersContentToggler = function (checked) {
+    var self = this;
+
+    checked = (typeof checked === 'undefined') ? false : checked;
+
+    // Checkbox
+    this.$othersContentToggler = $('<input/>', {
+      type: 'checkbox',
+      'class': 'h5p-others-contents-toggler',
+      'id': 'h5p-others-contents-toggler',
+      'checked': checked,
+      'click': function () {
+        if ( this.checked ) {
+          // Add filter on current user
+          self.filterByFacet( self.columnIdAuthor, H5PIntegration.user.id, H5PIntegration.user.name );
+        }
+        else {
+          // Remove facet indicator and reload full data view
+          if ( self.facets.hasOwnProperty( self.columnIdAuthor ) && self.facets[self.columnIdAuthor].$tag ) {
+            self.facets[self.columnIdAuthor].$tag.remove();
+          }
+          delete self.facets[self.columnIdAuthor];
+          self.loadData();
+        }
+      }
+    });
+
+    // Label
+    var $label = $('<label>', {
+      'class': 'h5p-others-contents-toggler-label',
+      'text': this.l10n.showOwnContentOnly,
+      'for': 'h5p-others-contents-toggler'
+    }).prepend(this.$othersContentToggler);
+
+    $('<div>', {
+      'class': 'h5p-others-contents-toggler-wrapper'
+    }).append($label)
+      .appendTo(this.$container);
+  };
+
+  return H5PDataView;
+})(H5P.jQuery);
diff --git a/src/core/h5p/assets/js/h5p-display-options.js b/src/core/h5p/assets/js/h5p-display-options.js
new file mode 100644
index 000000000..216515274
--- /dev/null
+++ b/src/core/h5p/assets/js/h5p-display-options.js
@@ -0,0 +1,54 @@
+/**
+ * Utility that makes it possible to hide fields when a checkbox is unchecked
+ */
+(function ($) {
+  function setupHiding() {
+    var $toggler = $(this);
+
+    // Getting the field which should be hidden:
+    var $subject = $($toggler.data('h5p-visibility-subject-selector'));
+
+    var toggle = function () {
+      $subject.toggle($toggler.is(':checked'));
+    };
+
+    $toggler.change(toggle);
+    toggle();
+  }
+
+  function setupRevealing() {
+    var $button = $(this);
+
+    // Getting the field which should have the value:
+    var $input = $('#' + $button.data('control'));
+
+    if (!$input.data('value')) {
+      $button.remove();
+      return;
+    }
+
+    // Setup button action
+    var revealed = false;
+    var text = $button.html();
+    $button.click(function () {
+      if (revealed) {
+        $input.val('');
+        $button.html(text);
+        revealed = false;
+      }
+      else {
+        $input.val($input.data('value'));
+        $button.html($button.data('hide'));
+        revealed = true;
+      }
+    });
+  }
+
+  $(document).ready(function () {
+    // Get the checkboxes making other fields being hidden:
+    $('.h5p-visibility-toggler').each(setupHiding);
+
+    // Get the buttons making other fields have hidden values:
+    $('.h5p-reveal-value').each(setupRevealing);
+  });
+})(H5P.jQuery);
diff --git a/src/core/h5p/assets/js/h5p-embed.js b/src/core/h5p/assets/js/h5p-embed.js
new file mode 100644
index 000000000..c14145670
--- /dev/null
+++ b/src/core/h5p/assets/js/h5p-embed.js
@@ -0,0 +1,75 @@
+/*jshint multistr: true */
+
+/**
+ * Converts old script tag embed to iframe
+ */
+var H5POldEmbed = H5POldEmbed || (function () {
+  var head = document.getElementsByTagName('head')[0];
+  var resizer = false;
+
+  /**
+   * Loads the resizing script
+   */
+  var loadResizer = function (url) {
+    var data, callback = 'H5POldEmbed';
+    resizer = true;
+
+    // Callback for when content data is loaded.
+    window[callback] = function (content) {
+      // Add resizing script to head
+      var resizer = document.createElement('script');
+      resizer.src = content;
+      head.appendChild(resizer);
+
+      // Clean up
+      head.removeChild(data);
+      delete window[callback];
+    };
+
+    // Create data script
+    data = document.createElement('script');
+    data.src = url + (url.indexOf('?') === -1 ? '?' : '&') + 'callback=' + callback;
+    head.appendChild(data);
+  };
+
+  /**
+   * Replaced script tag with iframe
+   */
+  var addIframe = function (script) {
+    // Add iframe
+    var iframe = document.createElement('iframe');
+    iframe.src = script.getAttribute('data-h5p');
+    iframe.frameBorder = false;
+    iframe.allowFullscreen = true;
+    var parent = script.parentNode;
+    parent.insertBefore(iframe, script);
+    parent.removeChild(script);
+  };
+
+  /**
+   * Go throught all script tags with the data-h5p attribute and load content.
+   */
+  function H5POldEmbed() {
+    var scripts = document.getElementsByTagName('script');
+    var h5ps = []; // Use seperate array since scripts grow in size.
+    for (var i = 0; i < scripts.length; i++) {
+      var script = scripts[i];
+      if (script.src.indexOf('/h5p-resizer.js') !== -1) {
+        resizer = true;
+      }
+      else if (script.hasAttribute('data-h5p')) {
+        h5ps.push(script);
+      }
+    }
+    for (i = 0; i < h5ps.length; i++) {
+      if (!resizer) {
+        loadResizer(h5ps[i].getAttribute('data-h5p'));
+      }
+      addIframe(h5ps[i]);
+    }
+  }
+
+  return H5POldEmbed;
+})();
+
+new H5POldEmbed();
diff --git a/src/core/h5p/assets/js/h5p-event-dispatcher.js b/src/core/h5p/assets/js/h5p-event-dispatcher.js
new file mode 100644
index 000000000..2027cf7ac
--- /dev/null
+++ b/src/core/h5p/assets/js/h5p-event-dispatcher.js
@@ -0,0 +1,258 @@
+var H5P = window.H5P = window.H5P || {};
+
+/**
+ * The Event class for the EventDispatcher.
+ *
+ * @class
+ * @param {string} type
+ * @param {*} data
+ * @param {Object} [extras]
+ * @param {boolean} [extras.bubbles]
+ * @param {boolean} [extras.external]
+ */
+H5P.Event = function (type, data, extras) {
+  this.type = type;
+  this.data = data;
+  var bubbles = false;
+
+  // Is this an external event?
+  var external = false;
+
+  // Is this event scheduled to be sent externally?
+  var scheduledForExternal = false;
+
+  if (extras === undefined) {
+    extras = {};
+  }
+  if (extras.bubbles === true) {
+    bubbles = true;
+  }
+  if (extras.external === true) {
+    external = true;
+  }
+
+  /**
+   * Prevent this event from bubbling up to parent
+   */
+  this.preventBubbling = function () {
+    bubbles = false;
+  };
+
+  /**
+   * Get bubbling status
+   *
+   * @returns {boolean}
+   *   true if bubbling false otherwise
+   */
+  this.getBubbles = function () {
+    return bubbles;
+  };
+
+  /**
+   * Try to schedule an event for externalDispatcher
+   *
+   * @returns {boolean}
+   *   true if external and not already scheduled, otherwise false
+   */
+  this.scheduleForExternal = function () {
+    if (external && !scheduledForExternal) {
+      scheduledForExternal = true;
+      return true;
+    }
+    return false;
+  };
+};
+
+/**
+ * Callback type for event listeners.
+ *
+ * @callback H5P.EventCallback
+ * @param {H5P.Event} event
+ */
+
+H5P.EventDispatcher = (function () {
+
+  /**
+   * The base of the event system.
+   * Inherit this class if you want your H5P to dispatch events.
+   *
+   * @class
+   * @memberof H5P
+   */
+  function EventDispatcher() {
+    var self = this;
+
+    /**
+     * Keep track of listeners for each event.
+     *
+     * @private
+     * @type {Object}
+     */
+    var triggers = {};
+
+    /**
+     * Add new event listener.
+     *
+     * @throws {TypeError}
+     *   listener must be a function
+     * @param {string} type
+     *   Event type
+     * @param {H5P.EventCallback} listener
+     *   Event listener
+     * @param {Object} [thisArg]
+     *   Optionally specify the this value when calling listener.
+     */
+    this.on = function (type, listener, thisArg) {
+      if (typeof listener !== 'function') {
+        throw TypeError('listener must be a function');
+      }
+
+      // Trigger event before adding to avoid recursion
+      self.trigger('newListener', {'type': type, 'listener': listener});
+
+      var trigger = {'listener': listener, 'thisArg': thisArg};
+      if (!triggers[type]) {
+        // First
+        triggers[type] = [trigger];
+      }
+      else {
+        // Append
+        triggers[type].push(trigger);
+      }
+    };
+
+    /**
+     * Add new event listener that will be fired only once.
+     *
+     * @throws {TypeError}
+     *   listener must be a function
+     * @param {string} type
+     *   Event type
+     * @param {H5P.EventCallback} listener
+     *   Event listener
+     * @param {Object} thisArg
+     *   Optionally specify the this value when calling listener.
+     */
+    this.once = function (type, listener, thisArg) {
+      if (!(listener instanceof Function)) {
+        throw TypeError('listener must be a function');
+      }
+
+      var once = function (event) {
+        self.off(event.type, once);
+        listener.call(this, event);
+      };
+
+      self.on(type, once, thisArg);
+    };
+
+    /**
+     * Remove event listener.
+     * If no listener is specified, all listeners will be removed.
+     *
+     * @throws {TypeError}
+     *   listener must be a function
+     * @param {string} type
+     *   Event type
+     * @param {H5P.EventCallback} listener
+     *   Event listener
+     */
+    this.off = function (type, listener) {
+      if (listener !== undefined && !(listener instanceof Function)) {
+        throw TypeError('listener must be a function');
+      }
+
+      if (triggers[type] === undefined) {
+        return;
+      }
+
+      if (listener === undefined) {
+        // Remove all listeners
+        delete triggers[type];
+        self.trigger('removeListener', type);
+        return;
+      }
+
+      // Find specific listener
+      for (var i = 0; i < triggers[type].length; i++) {
+        if (triggers[type][i].listener === listener) {
+          triggers[type].splice(i, 1);
+          self.trigger('removeListener', type, {'listener': listener});
+          break;
+        }
+      }
+
+      // Clean up empty arrays
+      if (!triggers[type].length) {
+        delete triggers[type];
+      }
+    };
+
+    /**
+     * Try to call all event listeners for the given event type.
+     *
+     * @private
+     * @param {string} Event type
+     */
+    var call = function (type, event) {
+      if (triggers[type] === undefined) {
+        return;
+      }
+
+      // Clone array (prevents triggers from being modified during the event)
+      var handlers = triggers[type].slice();
+
+      // Call all listeners
+      for (var i = 0; i < handlers.length; i++) {
+        var trigger = handlers[i];
+        var thisArg = (trigger.thisArg ? trigger.thisArg : this);
+        trigger.listener.call(thisArg, event);
+      }
+    };
+
+    /**
+     * Dispatch event.
+     *
+     * @param {string|H5P.Event} event
+     *   Event object or event type as string
+     * @param {*} [eventData]
+     *   Custom event data(used when event type as string is used as first
+     *   argument).
+     * @param {Object} [extras]
+     * @param {boolean} [extras.bubbles]
+     * @param {boolean} [extras.external]
+     */
+    this.trigger = function (event, eventData, extras) {
+      if (event === undefined) {
+        return;
+      }
+      if (event instanceof String || typeof event === 'string') {
+        event = new H5P.Event(event, eventData, extras);
+      }
+      else if (eventData !== undefined) {
+        event.data = eventData;
+      }
+
+      // Check to see if this event should go externally after all triggering and bubbling is done
+      var scheduledForExternal = event.scheduleForExternal();
+
+      // Call all listeners
+      call.call(this, event.type, event);
+
+      // Call all * listeners
+      call.call(this, '*', event);
+
+      // Bubble
+      if (event.getBubbles() && self.parent instanceof H5P.EventDispatcher &&
+          (self.parent.trigger instanceof Function || typeof self.parent.trigger === 'function')) {
+        self.parent.trigger(event);
+      }
+
+      if (scheduledForExternal) {
+        H5P.externalDispatcher.trigger.call(this, event);
+      }
+    };
+  }
+
+  return EventDispatcher;
+})();
diff --git a/src/core/h5p/assets/js/h5p-library-details.js b/src/core/h5p/assets/js/h5p-library-details.js
new file mode 100644
index 000000000..b5ee01232
--- /dev/null
+++ b/src/core/h5p/assets/js/h5p-library-details.js
@@ -0,0 +1,297 @@
+/* global H5PAdminIntegration H5PUtils */
+var H5PLibraryDetails = H5PLibraryDetails || {};
+
+(function ($) {
+
+  H5PLibraryDetails.PAGER_SIZE = 20;
+  /**
+   * Initializing
+   */
+  H5PLibraryDetails.init = function () {
+    H5PLibraryDetails.$adminContainer = H5P.jQuery(H5PAdminIntegration.containerSelector);
+    H5PLibraryDetails.library = H5PAdminIntegration.libraryInfo;
+
+    // currentContent holds the current list if data (relevant for filtering)
+    H5PLibraryDetails.currentContent = H5PLibraryDetails.library.content;
+
+    // The current page index (for pager)
+    H5PLibraryDetails.currentPage = 0;
+
+    // The current filter
+    H5PLibraryDetails.currentFilter = '';
+
+    // We cache the filtered results, so we don't have to do unneccessary searches
+    H5PLibraryDetails.filterCache = [];
+
+    // Append library info
+    H5PLibraryDetails.$adminContainer.append(H5PLibraryDetails.createLibraryInfo());
+
+    // Append node list
+    H5PLibraryDetails.$adminContainer.append(H5PLibraryDetails.createContentElement());
+  };
+
+  /**
+   * Create the library details view
+   */
+  H5PLibraryDetails.createLibraryInfo = function () {
+    var $libraryInfo = $('<div class="h5p-library-info"></div>');
+
+    $.each(H5PLibraryDetails.library.info, function (title, value) {
+      $libraryInfo.append(H5PUtils.createLabeledField(title, value));
+    });
+
+    return $libraryInfo;
+  };
+
+  /**
+   * Create the content list with searching and paging
+   */
+  H5PLibraryDetails.createContentElement = function () {
+    if (H5PLibraryDetails.library.notCached !== undefined) {
+      return H5PUtils.getRebuildCache(H5PLibraryDetails.library.notCached);
+    }
+
+    if (H5PLibraryDetails.currentContent === undefined) {
+      H5PLibraryDetails.$content = $('<div class="h5p-content empty">' + H5PLibraryDetails.library.translations.noContent + '</div>');
+    }
+    else {
+      H5PLibraryDetails.$content = $('<div class="h5p-content"><h3>' + H5PLibraryDetails.library.translations.contentHeader + '</h3></div>');
+      H5PLibraryDetails.createSearchElement();
+      H5PLibraryDetails.createPageSizeSelector();
+      H5PLibraryDetails.createContentTable();
+      H5PLibraryDetails.createPagerElement();
+      return H5PLibraryDetails.$content;
+    }
+  };
+
+  /**
+   * Creates the content list
+   */
+  H5PLibraryDetails.createContentTable = function () {
+    // Remove it if it exists:
+    if (H5PLibraryDetails.$contentTable) {
+      H5PLibraryDetails.$contentTable.remove();
+    }
+
+    H5PLibraryDetails.$contentTable = H5PUtils.createTable();
+
+    var i = (H5PLibraryDetails.currentPage*H5PLibraryDetails.PAGER_SIZE);
+    var lastIndex = (i+H5PLibraryDetails.PAGER_SIZE);
+
+    if (lastIndex > H5PLibraryDetails.currentContent.length) {
+      lastIndex = H5PLibraryDetails.currentContent.length;
+    }
+    for (; i<lastIndex; i++) {
+      var content = H5PLibraryDetails.currentContent[i];
+      H5PLibraryDetails.$contentTable.append(H5PUtils.createTableRow(['<a href="' + content.url + '">' + content.title + '</a>']));
+    }
+
+    // Appends it to the browser DOM
+    H5PLibraryDetails.$contentTable.insertAfter(H5PLibraryDetails.$search);
+  };
+
+  /**
+   * Creates the pager element on the bottom of the list
+   */
+  H5PLibraryDetails.createPagerElement = function () {
+    H5PLibraryDetails.$previous = $('<button type="button" class="previous h5p-admin"><</button>');
+    H5PLibraryDetails.$next = $('<button type="button" class="next h5p-admin">></button>');
+
+    H5PLibraryDetails.$previous.on('click', function () {
+      if (H5PLibraryDetails.$previous.hasClass('disabled')) {
+        return;
+      }
+
+      H5PLibraryDetails.currentPage--;
+      H5PLibraryDetails.updatePager();
+      H5PLibraryDetails.createContentTable();
+    });
+
+    H5PLibraryDetails.$next.on('click', function () {
+      if (H5PLibraryDetails.$next.hasClass('disabled')) {
+        return;
+      }
+
+      H5PLibraryDetails.currentPage++;
+      H5PLibraryDetails.updatePager();
+      H5PLibraryDetails.createContentTable();
+    });
+
+    // This is the Page x of y widget:
+    H5PLibraryDetails.$pagerInfo = $('<span class="pager-info"></span>');
+
+    H5PLibraryDetails.$pager = $('<div class="h5p-content-pager"></div>').append(H5PLibraryDetails.$previous, H5PLibraryDetails.$pagerInfo, H5PLibraryDetails.$next);
+    H5PLibraryDetails.$content.append(H5PLibraryDetails.$pager);
+
+    H5PLibraryDetails.$pagerInfo.on('click', function () {
+      var width = H5PLibraryDetails.$pagerInfo.innerWidth();
+      H5PLibraryDetails.$pagerInfo.hide();
+
+      // User has updated the pageNumber
+      var pageNumerUpdated = function () {
+        var newPageNum = $gotoInput.val()-1;
+        var intRegex = /^\d+$/;
+
+        $goto.remove();
+        H5PLibraryDetails.$pagerInfo.css({display: 'inline-block'});
+
+        // Check if input value is valid, and that it has actually changed
+        if (!(intRegex.test(newPageNum) && newPageNum >= 0 && newPageNum < H5PLibraryDetails.getNumPages() && newPageNum != H5PLibraryDetails.currentPage)) {
+          return;
+        }
+
+        H5PLibraryDetails.currentPage = newPageNum;
+        H5PLibraryDetails.updatePager();
+        H5PLibraryDetails.createContentTable();
+      };
+
+      // We create an input box where the user may type in the page number
+      // he wants to be displayed.
+      // Reson for doing this is when user has ten-thousands of elements in list,
+      // this is the easiest way of getting to a specified page
+      var $gotoInput = $('<input/>', {
+        type: 'number',
+        min : 1,
+        max: H5PLibraryDetails.getNumPages(),
+        on: {
+          // Listen to blur, and the enter-key:
+          'blur': pageNumerUpdated,
+          'keyup': function (event) {
+            if (event.keyCode === 13) {
+              pageNumerUpdated();
+            }
+          }
+        }
+      }).css({width: width});
+      var $goto = $('<span/>', {
+        'class': 'h5p-pager-goto'
+      }).css({width: width}).append($gotoInput).insertAfter(H5PLibraryDetails.$pagerInfo);
+
+      $gotoInput.focus();
+    });
+
+    H5PLibraryDetails.updatePager();
+  };
+
+  /**
+   * Calculates number of pages
+   */
+  H5PLibraryDetails.getNumPages = function () {
+    return Math.ceil(H5PLibraryDetails.currentContent.length / H5PLibraryDetails.PAGER_SIZE);
+  };
+
+  /**
+   * Update the pager text, and enables/disables the next and previous buttons as needed
+   */
+  H5PLibraryDetails.updatePager = function () {
+    H5PLibraryDetails.$pagerInfo.css({display: 'inline-block'});
+
+    if (H5PLibraryDetails.getNumPages() > 0) {
+      var message = H5PUtils.translateReplace(H5PLibraryDetails.library.translations.pageXOfY, {
+        '$x': (H5PLibraryDetails.currentPage+1),
+        '$y': H5PLibraryDetails.getNumPages()
+      });
+      H5PLibraryDetails.$pagerInfo.html(message);
+    }
+    else {
+      H5PLibraryDetails.$pagerInfo.html('');
+    }
+
+    H5PLibraryDetails.$previous.toggleClass('disabled', H5PLibraryDetails.currentPage <= 0);
+    H5PLibraryDetails.$next.toggleClass('disabled', H5PLibraryDetails.currentContent.length < (H5PLibraryDetails.currentPage+1)*H5PLibraryDetails.PAGER_SIZE);
+  };
+
+  /**
+   * Creates the search element
+   */
+  H5PLibraryDetails.createSearchElement = function () {
+
+    H5PLibraryDetails.$search = $('<div class="h5p-content-search"><input placeholder="' + H5PLibraryDetails.library.translations.filterPlaceholder + '" type="search"></div>');
+
+    var performSeach = function () {
+      var searchString = $('.h5p-content-search > input').val();
+
+      // If search string same as previous, just do nothing
+      if (H5PLibraryDetails.currentFilter === searchString) {
+        return;
+      }
+
+      if (searchString.trim().length === 0) {
+        // If empty search, use the complete list
+        H5PLibraryDetails.currentContent = H5PLibraryDetails.library.content;
+      }
+      else if (H5PLibraryDetails.filterCache[searchString]) {
+        // If search is cached, no need to filter
+        H5PLibraryDetails.currentContent = H5PLibraryDetails.filterCache[searchString];
+      }
+      else {
+        var listToFilter = H5PLibraryDetails.library.content;
+
+        // Check if we can filter the already filtered results (for performance)
+        if (searchString.length > 1 && H5PLibraryDetails.currentFilter === searchString.substr(0, H5PLibraryDetails.currentFilter.length)) {
+          listToFilter = H5PLibraryDetails.currentContent;
+        }
+        H5PLibraryDetails.currentContent = $.grep(listToFilter, function (content) {
+          return content.title && content.title.match(new RegExp(searchString, 'i'));
+        });
+      }
+
+      H5PLibraryDetails.currentFilter = searchString;
+      // Cache the current result
+      H5PLibraryDetails.filterCache[searchString] = H5PLibraryDetails.currentContent;
+      H5PLibraryDetails.currentPage = 0;
+      H5PLibraryDetails.createContentTable();
+
+      // Display search results:
+      if (H5PLibraryDetails.$searchResults) {
+        H5PLibraryDetails.$searchResults.remove();
+      }
+      if (searchString.trim().length > 0) {
+        H5PLibraryDetails.$searchResults = $('<span class="h5p-admin-search-results">' + H5PLibraryDetails.currentContent.length + ' hits on ' + H5PLibraryDetails.currentFilter + '</span>');
+        H5PLibraryDetails.$search.append(H5PLibraryDetails.$searchResults);
+      }
+      H5PLibraryDetails.updatePager();
+    };
+
+    var inputTimer;
+    $('input', H5PLibraryDetails.$search).on('change keypress paste input', function () {
+      // Here we start the filtering
+      // We wait at least 500 ms after last input to perform search
+      if (inputTimer) {
+        clearTimeout(inputTimer);
+      }
+
+      inputTimer = setTimeout( function () {
+        performSeach();
+      }, 500);
+    });
+
+    H5PLibraryDetails.$content.append(H5PLibraryDetails.$search);
+  };
+
+  /**
+   * Creates the page size selector
+   */
+  H5PLibraryDetails.createPageSizeSelector = function () {
+    H5PLibraryDetails.$search.append('<div class="h5p-admin-pager-size-selector">' + H5PLibraryDetails.library.translations.pageSizeSelectorLabel + ':<span data-page-size="10">10</span><span class="selected" data-page-size="20">20</span><span data-page-size="50">50</span><span data-page-size="100">100</span><span data-page-size="200">200</span></div>');
+
+    // Listen to clicks on the page size selector:
+    $('.h5p-admin-pager-size-selector > span', H5PLibraryDetails.$search).on('click', function () {
+      H5PLibraryDetails.PAGER_SIZE = $(this).data('page-size');
+      $('.h5p-admin-pager-size-selector > span', H5PLibraryDetails.$search).removeClass('selected');
+      $(this).addClass('selected');
+      H5PLibraryDetails.currentPage = 0;
+      H5PLibraryDetails.createContentTable();
+      H5PLibraryDetails.updatePager();
+    });
+  };
+
+  // Initialize me:
+  $(document).ready(function () {
+    if (!H5PLibraryDetails.initialized) {
+      H5PLibraryDetails.initialized = true;
+      H5PLibraryDetails.init();
+    }
+  });
+
+})(H5P.jQuery);
diff --git a/src/core/h5p/assets/js/h5p-library-list.js b/src/core/h5p/assets/js/h5p-library-list.js
new file mode 100644
index 000000000..344b73672
--- /dev/null
+++ b/src/core/h5p/assets/js/h5p-library-list.js
@@ -0,0 +1,140 @@
+/* global H5PAdminIntegration H5PUtils */
+var H5PLibraryList = H5PLibraryList || {};
+
+(function ($) {
+
+  /**
+   * Initializing
+   */
+  H5PLibraryList.init = function () {
+    var $adminContainer = H5P.jQuery(H5PAdminIntegration.containerSelector).html('');
+
+    var libraryList = H5PAdminIntegration.libraryList;
+    if (libraryList.notCached) {
+      $adminContainer.append(H5PUtils.getRebuildCache(libraryList.notCached));
+    }
+
+    // Create library list
+    $adminContainer.append(H5PLibraryList.createLibraryList(H5PAdminIntegration.libraryList));
+  };
+
+  /**
+   * Create the library list
+   *
+   * @param {object} libraries List of libraries and headers
+   */
+  H5PLibraryList.createLibraryList = function (libraries) {
+    var t = H5PAdminIntegration.l10n;
+    if (libraries.listData === undefined || libraries.listData.length === 0) {
+      return $('<div>' + t.NA + '</div>');
+    }
+
+    // Create table
+    var $table = H5PUtils.createTable(libraries.listHeaders);
+    $table.addClass('libraries');
+
+    // Add libraries
+    $.each (libraries.listData, function (index, library) {
+      var $libraryRow = H5PUtils.createTableRow([
+        library.title,
+        '<input class="h5p-admin-restricted" type="checkbox"/>',
+        {
+          text: library.numContent,
+          class: 'h5p-admin-center'
+        },
+        {
+          text: library.numContentDependencies,
+          class: 'h5p-admin-center'
+        },
+        {
+          text: library.numLibraryDependencies,
+          class: 'h5p-admin-center'
+        },
+        '<div class="h5p-admin-buttons-wrapper">' +
+            '<button class="h5p-admin-upgrade-library"></button>' +
+            (library.detailsUrl ? '<button class="h5p-admin-view-library" title="' + t.viewLibrary + '"></button>' : '') +
+            (library.deleteUrl ? '<button class="h5p-admin-delete-library"></button>' : '') +
+            '</div>'
+      ]);
+
+      H5PLibraryList.addRestricted($('.h5p-admin-restricted', $libraryRow), library.restrictedUrl, library.restricted);
+
+      var hasContent = !(library.numContent === '' || library.numContent === 0);
+      if (library.upgradeUrl === null) {
+        $('.h5p-admin-upgrade-library', $libraryRow).remove();
+      }
+      else if (library.upgradeUrl === false || !hasContent) {
+        $('.h5p-admin-upgrade-library', $libraryRow).attr('disabled', true);
+      }
+      else {
+        $('.h5p-admin-upgrade-library', $libraryRow).attr('title', t.upgradeLibrary).click(function () {
+          window.location.href = library.upgradeUrl;
+        });
+      }
+
+      // Open details view when clicked
+      $('.h5p-admin-view-library', $libraryRow).on('click', function () {
+        window.location.href = library.detailsUrl;
+      });
+
+      var $deleteButton = $('.h5p-admin-delete-library', $libraryRow);
+      if (libraries.notCached !== undefined ||
+          hasContent ||
+          (library.numContentDependencies !== '' &&
+           library.numContentDependencies !== 0) ||
+          (library.numLibraryDependencies !== '' &&
+           library.numLibraryDependencies !== 0)) {
+        // Disabled delete if content.
+        $deleteButton.attr('disabled', true);
+      }
+      else {
+        // Go to delete page om click.
+        $deleteButton.attr('title', t.deleteLibrary).on('click', function () {
+          window.location.href = library.deleteUrl;
+        });
+      }
+
+      $table.append($libraryRow);
+    });
+
+    return $table;
+  };
+
+  H5PLibraryList.addRestricted = function ($checkbox, url, selected) {
+    if (selected === null) {
+      $checkbox.remove();
+    }
+    else {
+      $checkbox.change(function () {
+        $checkbox.attr('disabled', true);
+
+        $.ajax({
+          dataType: 'json',
+          url: url,
+          cache: false
+        }).fail(function () {
+          $checkbox.attr('disabled', false);
+
+          // Reset
+          $checkbox.attr('checked', !$checkbox.is(':checked'));
+        }).done(function (result) {
+          url = result.url;
+          $checkbox.attr('disabled', false);
+        });
+      });
+
+      if (selected) {
+        $checkbox.attr('checked', true);
+      }
+    }
+  };
+
+  // Initialize me:
+  $(document).ready(function () {
+    if (!H5PLibraryList.initialized) {
+      H5PLibraryList.initialized = true;
+      H5PLibraryList.init();
+    }
+  });
+
+})(H5P.jQuery);
diff --git a/src/core/h5p/assets/js/h5p-resizer.js b/src/core/h5p/assets/js/h5p-resizer.js
new file mode 100644
index 000000000..ed78724ec
--- /dev/null
+++ b/src/core/h5p/assets/js/h5p-resizer.js
@@ -0,0 +1,131 @@
+// H5P iframe Resizer
+(function () {
+  if (!window.postMessage || !window.addEventListener || window.h5pResizerInitialized) {
+    return; // Not supported
+  }
+  window.h5pResizerInitialized = true;
+
+  // Map actions to handlers
+  var actionHandlers = {};
+
+  /**
+   * Prepare iframe resize.
+   *
+   * @private
+   * @param {Object} iframe Element
+   * @param {Object} data Payload
+   * @param {Function} respond Send a response to the iframe
+   */
+  actionHandlers.hello = function (iframe, data, respond) {
+    // Make iframe responsive
+    iframe.style.width = '100%';
+
+    // Bugfix for Chrome: Force update of iframe width. If this is not done the
+    // document size may not be updated before the content resizes.
+    iframe.getBoundingClientRect();
+
+    // Tell iframe that it needs to resize when our window resizes
+    var resize = function () {
+      if (iframe.contentWindow) {
+        // Limit resize calls to avoid flickering
+        respond('resize');
+      }
+      else {
+        // Frame is gone, unregister.
+        window.removeEventListener('resize', resize);
+      }
+    };
+    window.addEventListener('resize', resize, false);
+
+    // Respond to let the iframe know we can resize it
+    respond('hello');
+  };
+
+  /**
+   * Prepare iframe resize.
+   *
+   * @private
+   * @param {Object} iframe Element
+   * @param {Object} data Payload
+   * @param {Function} respond Send a response to the iframe
+   */
+  actionHandlers.prepareResize = function (iframe, data, respond) {
+    // Do not resize unless page and scrolling differs
+    if (iframe.clientHeight !== data.scrollHeight ||
+        data.scrollHeight !== data.clientHeight) {
+
+      // Reset iframe height, in case content has shrinked.
+      iframe.style.height = data.clientHeight + 'px';
+      respond('resizePrepared');
+    }
+  };
+
+  /**
+   * Resize parent and iframe to desired height.
+   *
+   * @private
+   * @param {Object} iframe Element
+   * @param {Object} data Payload
+   * @param {Function} respond Send a response to the iframe
+   */
+  actionHandlers.resize = function (iframe, data) {
+    // Resize iframe so all content is visible. Use scrollHeight to make sure we get everything
+    iframe.style.height = data.scrollHeight + 'px';
+  };
+
+  /**
+   * Keyup event handler. Exits full screen on escape.
+   *
+   * @param {Event} event
+   */
+  var escape = function (event) {
+    if (event.keyCode === 27) {
+      exitFullScreen();
+    }
+  };
+
+  // Listen for messages from iframes
+  window.addEventListener('message', function receiveMessage(event) {
+    if (event.data.context !== 'h5p') {
+      return; // Only handle h5p requests.
+    }
+
+    // Find out who sent the message
+    var iframe, iframes = document.getElementsByTagName('iframe');
+    for (var i = 0; i < iframes.length; i++) {
+      if (iframes[i].contentWindow === event.source) {
+        iframe = iframes[i];
+        break;
+      }
+    }
+
+    if (!iframe) {
+      return; // Cannot find sender
+    }
+
+    // Find action handler handler
+    if (actionHandlers[event.data.action]) {
+      actionHandlers[event.data.action](iframe, event.data, function respond(action, data) {
+        if (data === undefined) {
+          data = {};
+        }
+        data.action = action;
+        data.context = 'h5p';
+        event.source.postMessage(data, event.origin);
+      });
+    }
+  }, false);
+
+  // Let h5p iframes know we're ready!
+  var iframes = document.getElementsByTagName('iframe');
+  var ready = {
+    context: 'h5p',
+    action: 'ready'
+  };
+  for (var i = 0; i < iframes.length; i++) {
+    if (iframes[i].src.indexOf('h5p') !== -1) {
+      iframes[i].contentWindow.postMessage(ready, '*');
+    }
+  }
+
+})();
diff --git a/src/core/h5p/assets/js/h5p-utils.js b/src/core/h5p/assets/js/h5p-utils.js
new file mode 100644
index 000000000..b5aa3334e
--- /dev/null
+++ b/src/core/h5p/assets/js/h5p-utils.js
@@ -0,0 +1,506 @@
+/* global H5PAdminIntegration*/
+var H5PUtils = H5PUtils || {};
+
+(function ($) {
+  /**
+   * Generic function for creating a table including the headers
+   *
+   * @param {array} headers List of headers
+   */
+  H5PUtils.createTable = function (headers) {
+    var $table = $('<table class="h5p-admin-table' + (H5PAdminIntegration.extraTableClasses !== undefined ? ' ' + H5PAdminIntegration.extraTableClasses : '') + '"></table>');
+
+    if (headers) {
+      var $thead = $('<thead></thead>');
+      var $tr = $('<tr></tr>');
+
+      $.each(headers, function (index, value) {
+        if (!(value instanceof Object)) {
+          value = {
+            html: value
+          };
+        }
+
+        $('<th/>', value).appendTo($tr);
+      });
+
+      $table.append($thead.append($tr));
+    }
+
+    return $table;
+  };
+
+  /**
+   * Generic function for creating a table row
+   *
+   * @param {array} rows Value list. Object name is used as class name in <TD>
+   */
+  H5PUtils.createTableRow = function (rows) {
+    var $tr = $('<tr></tr>');
+
+    $.each(rows, function (index, value) {
+      if (!(value instanceof Object)) {
+        value = {
+          html: value
+        };
+      }
+
+      $('<td/>', value).appendTo($tr);
+    });
+
+    return $tr;
+  };
+
+  /**
+   * Generic function for creating a field containing label and value
+   *
+   * @param {string} label The label displayed in front of the value
+   * @param {string} value The value
+   */
+  H5PUtils.createLabeledField = function (label, value) {
+    var $field = $('<div class="h5p-labeled-field"></div>');
+
+    $field.append('<div class="h5p-label">' + label + '</div>');
+    $field.append('<div class="h5p-value">' + value + '</div>');
+
+    return $field;
+  };
+
+  /**
+   * Replaces placeholder fields in translation strings
+   *
+   * @param {string} template The translation template string in the following format: "$name is a $sex"
+   * @param {array} replacors An js object with key and values. Eg: {'$name': 'Frode', '$sex': 'male'}
+   */
+  H5PUtils.translateReplace = function (template, replacors) {
+    $.each(replacors, function (key, value) {
+      template = template.replace(new RegExp('\\'+key, 'g'), value);
+    });
+    return template;
+  };
+
+  /**
+   * Get throbber with given text.
+   *
+   * @param {String} text
+   * @returns {$}
+   */
+  H5PUtils.throbber = function (text) {
+    return $('<div/>', {
+      class: 'h5p-throbber',
+      text: text
+    });
+  };
+
+  /**
+   * Makes it possbile to rebuild all content caches from admin UI.
+   * @param {Object} notCached
+   * @returns {$}
+   */
+  H5PUtils.getRebuildCache = function (notCached) {
+    var $container = $('<div class="h5p-admin-rebuild-cache"><p class="message">' + notCached.message + '</p><p class="progress">' + notCached.progress + '</p></div>');
+    var $button = $('<button>' + notCached.button + '</button>').appendTo($container).click(function () {
+      var $spinner = $('<div/>', {class: 'h5p-spinner'}).replaceAll($button);
+      var parts = ['|', '/', '-', '\\'];
+      var current = 0;
+      var spinning = setInterval(function () {
+        $spinner.text(parts[current]);
+        current++;
+        if (current === parts.length) current = 0;
+      }, 100);
+
+      var $counter = $container.find('.progress');
+      var build = function () {
+        $.post(notCached.url, function (left) {
+          if (left === '0') {
+            clearInterval(spinning);
+            $container.remove();
+            location.reload();
+          }
+          else {
+            var counter = $counter.text().split(' ');
+            counter[0] = left;
+            $counter.text(counter.join(' '));
+            build();
+          }
+        });
+      };
+      build();
+    });
+
+    return $container;
+  };
+
+  /**
+   * Generic table class with useful helpers.
+   *
+   * @class
+   * @param {Object} classes
+   *   Custom html classes to use on elements.
+   *   e.g. {tableClass: 'fixed'}.
+   */
+  H5PUtils.Table = function (classes) {
+    var numCols;
+    var sortByCol;
+    var $sortCol;
+    var sortCol;
+    var sortDir;
+
+    // Create basic table
+    var tableOptions = {};
+    if (classes.table !== undefined) {
+      tableOptions['class'] = classes.table;
+    }
+    var $table = $('<table/>', tableOptions);
+    var $thead = $('<thead/>').appendTo($table);
+    var $tfoot = $('<tfoot/>').appendTo($table);
+    var $tbody = $('<tbody/>').appendTo($table);
+
+    /**
+     * Add columns to given table row.
+     *
+     * @private
+     * @param {jQuery} $tr Table row
+     * @param {(String|Object)} col Column properties
+     * @param {Number} id Used to seperate the columns
+     */
+    var addCol = function ($tr, col, id) {
+      var options = {
+        on: {}
+      };
+
+      if (!(col instanceof Object)) {
+        options.text = col;
+      }
+      else {
+        if (col.text !== undefined) {
+          options.text = col.text;
+        }
+        if (col.class !== undefined) {
+          options.class = col.class;
+        }
+
+        if (sortByCol !== undefined && col.sortable === true) {
+          // Make sortable
+          options.role = 'button';
+          options.tabIndex = 0;
+
+          // This is the first sortable column, use as default sort
+          if (sortCol === undefined) {
+            sortCol = id;
+            sortDir = 0;
+          }
+
+          // This is the sort column
+          if (sortCol === id) {
+            options['class'] = 'h5p-sort';
+            if (sortDir === 1) {
+              options['class'] += ' h5p-reverse';
+            }
+          }
+
+          options.on.click = function () {
+            sort($th, id);
+          };
+          options.on.keypress = function (event) {
+            if ((event.charCode || event.keyCode) === 32) { // Space
+              sort($th, id);
+            }
+          };
+        }
+      }
+
+      // Append
+      var $th = $('<th>', options).appendTo($tr);
+      if (sortCol === id) {
+        $sortCol = $th; // Default sort column
+      }
+    };
+
+    /**
+     * Updates the UI when a column header has been clicked.
+     * Triggers sorting callback.
+     *
+     * @private
+     * @param {jQuery} $th Table header
+     * @param {Number} id Used to seperate the columns
+     */
+    var sort = function ($th, id) {
+      if (id === sortCol) {
+        // Change sorting direction
+        if (sortDir === 0) {
+          sortDir = 1;
+          $th.addClass('h5p-reverse');
+        }
+        else {
+          sortDir = 0;
+          $th.removeClass('h5p-reverse');
+        }
+      }
+      else {
+        // Change sorting column
+        $sortCol.removeClass('h5p-sort').removeClass('h5p-reverse');
+        $sortCol = $th.addClass('h5p-sort');
+        sortCol = id;
+        sortDir = 0;
+      }
+
+      sortByCol({
+        by: sortCol,
+        dir: sortDir
+      });
+    };
+
+    /**
+     * Set table headers.
+     *
+     * @public
+     * @param {Array} cols
+     *   Table header data. Can be strings or objects with options like
+     *   "text" and "sortable". E.g.
+     *   [{text: 'Col 1', sortable: true}, 'Col 2', 'Col 3']
+     * @param {Function} sort Callback which is runned when sorting changes
+     * @param {Object} [order]
+     */
+    this.setHeaders = function (cols, sort, order) {
+      numCols = cols.length;
+      sortByCol = sort;
+
+      if (order) {
+        sortCol = order.by;
+        sortDir = order.dir;
+      }
+
+      // Create new head
+      var $newThead = $('<thead/>');
+      var $tr = $('<tr/>').appendTo($newThead);
+      for (var i = 0; i < cols.length; i++) {
+        addCol($tr, cols[i], i);
+      }
+
+      // Update DOM
+      $thead.replaceWith($newThead);
+      $thead = $newThead;
+    };
+
+    /**
+     * Set table rows.
+     *
+     * @public
+     * @param {Array} rows Table rows with cols: [[1,'hello',3],[2,'asd',6]]
+     */
+    this.setRows = function (rows) {
+      var $newTbody = $('<tbody/>');
+
+      for (var i = 0; i < rows.length; i++) {
+        var $tr = $('<tr/>').appendTo($newTbody);
+
+        for (var j = 0; j < rows[i].length; j++) {
+          $('<td>', {
+            html: rows[i][j]
+          }).appendTo($tr);
+        }
+      }
+
+      $tbody.replaceWith($newTbody);
+      $tbody = $newTbody;
+
+      return $tbody;
+    };
+
+    /**
+     * Set custom table body content. This can be a message or a throbber.
+     * Will cover all table columns.
+     *
+     * @public
+     * @param {jQuery} $content Custom content
+     */
+    this.setBody = function ($content) {
+      var $newTbody = $('<tbody/>');
+      var $tr = $('<tr/>').appendTo($newTbody);
+      $('<td>', {
+        colspan: numCols
+      }).append($content).appendTo($tr);
+      $tbody.replaceWith($newTbody);
+      $tbody = $newTbody;
+    };
+
+    /**
+     * Set custom table foot content. This can be a pagination widget.
+     * Will cover all table columns.
+     *
+     * @public
+     * @param {jQuery} $content Custom content
+     */
+    this.setFoot = function ($content) {
+      var $newTfoot = $('<tfoot/>');
+      var $tr = $('<tr/>').appendTo($newTfoot);
+      $('<td>', {
+        colspan: numCols
+      }).append($content).appendTo($tr);
+      $tfoot.replaceWith($newTfoot);
+    };
+
+
+    /**
+     * Appends the table to the given container.
+     *
+     * @public
+     * @param {jQuery} $container
+     */
+    this.appendTo = function ($container) {
+      $table.appendTo($container);
+    };
+  };
+
+  /**
+   * Generic pagination class. Creates a useful pagination widget.
+   *
+   * @class
+   * @param {Number} num Total number of items to pagiate.
+   * @param {Number} limit Number of items to dispaly per page.
+   * @param {Function} goneTo
+   *   Callback which is fired when the user wants to go to another page.
+   * @param {Object} l10n
+   *   Localization / translations. e.g.
+   *   {
+   *     currentPage: 'Page $current of $total',
+   *     nextPage: 'Next page',
+   *     previousPage: 'Previous page'
+   *   }
+   */
+  H5PUtils.Pagination = function (num, limit, goneTo, l10n) {
+    var current = 0;
+    var pages = Math.ceil(num / limit);
+
+    // Create components
+
+    // Previous button
+    var $left = $('<button/>', {
+      html: '&lt;',
+      'class': 'button',
+      title: l10n.previousPage
+    }).click(function () {
+      goTo(current - 1);
+    });
+
+    // Current page text
+    var $text = $('<span/>').click(function () {
+      $input.width($text.width()).show().val(current + 1).focus();
+      $text.hide();
+    });
+
+    // Jump to page input
+    var $input = $('<input/>', {
+      type: 'number',
+      min : 1,
+      max: pages,
+      on: {
+        'blur': function () {
+          gotInput();
+        },
+        'keyup': function (event) {
+          if (event.keyCode === 13) {
+            gotInput();
+            return false;
+          }
+        }
+      }
+    }).hide();
+
+    // Next button
+    var $right = $('<button/>', {
+      html: '&gt;',
+      'class': 'button',
+      title: l10n.nextPage
+    }).click(function () {
+      goTo(current + 1);
+    });
+
+    /**
+     * Check what page the user has typed in and jump to it.
+     *
+     * @private
+     */
+    var gotInput = function () {
+      var page = parseInt($input.hide().val());
+      if (!isNaN(page)) {
+        goTo(page - 1);
+      }
+      $text.show();
+    };
+
+    /**
+     * Update UI elements.
+     *
+     * @private
+     */
+    var updateUI = function () {
+      var next = current + 1;
+
+      // Disable or enable buttons
+      $left.attr('disabled', current === 0);
+      $right.attr('disabled', next === pages);
+
+      // Update counter
+      $text.html(l10n.currentPage.replace('$current', next).replace('$total', pages));
+    };
+
+    /**
+     * Try to go to the requested page.
+     *
+     * @private
+     * @param {Number} page
+     */
+    var goTo = function (page) {
+      if (page === current || page < 0 || page >= pages) {
+        return; // Invalid page number
+      }
+      current = page;
+
+      updateUI();
+
+      // Fire callback
+      goneTo(page * limit);
+    };
+
+    /**
+     * Update number of items and limit.
+     *
+     * @public
+     * @param {Number} newNum Total number of items to pagiate.
+     * @param {Number} newLimit Number of items to dispaly per page.
+     */
+    this.update = function (newNum, newLimit) {
+      if (newNum !== num || newLimit !== limit) {
+        // Update num and limit
+        num = newNum;
+        limit = newLimit;
+        pages = Math.ceil(num / limit);
+        $input.attr('max', pages);
+
+        if (current >= pages) {
+          // Content is gone, move to last page.
+          goTo(pages - 1);
+          return;
+        }
+
+        updateUI();
+      }
+    };
+
+    /**
+     * Append the pagination widget to the given container.
+     *
+     * @public
+     * @param {jQuery} $container
+     */
+    this.appendTo = function ($container) {
+      $left.add($text).add($input).add($right).appendTo($container);
+    };
+
+    // Update UI
+    updateUI();
+  };
+
+})(H5P.jQuery);
diff --git a/src/core/h5p/assets/js/h5p-version.js b/src/core/h5p/assets/js/h5p-version.js
new file mode 100644
index 000000000..8457341d6
--- /dev/null
+++ b/src/core/h5p/assets/js/h5p-version.js
@@ -0,0 +1,40 @@
+H5P.Version = (function () {
+  /**
+   * Make it easy to keep track of version details.
+   *
+   * @class
+   * @namespace H5P
+   * @param {String} version
+   */
+  function Version(version) {
+
+    if (typeof version === 'string') {
+      // Name version string (used by content upgrade)
+      var versionSplit = version.split('.', 3);
+      this.major =+ versionSplit[0];
+      this.minor =+ versionSplit[1];
+    }
+    else {
+      // Library objects (used by editor)
+      if (version.localMajorVersion !== undefined) {
+        this.major =+ version.localMajorVersion;
+        this.minor =+ version.localMinorVersion;
+      }
+      else {
+        this.major =+ version.majorVersion;
+        this.minor =+ version.minorVersion;
+      }
+    }
+
+    /**
+     * Public. Custom string for this object.
+     *
+     * @returns {String}
+     */
+    this.toString = function () {
+      return version;
+    };
+  }
+
+  return Version;
+})();
diff --git a/src/core/h5p/assets/js/h5p-x-api-event.js b/src/core/h5p/assets/js/h5p-x-api-event.js
new file mode 100644
index 000000000..a26b58b70
--- /dev/null
+++ b/src/core/h5p/assets/js/h5p-x-api-event.js
@@ -0,0 +1,331 @@
+var H5P = window.H5P = window.H5P || {};
+
+/**
+ * Used for xAPI events.
+ *
+ * @class
+ * @extends H5P.Event
+ */
+H5P.XAPIEvent = function () {
+  H5P.Event.call(this, 'xAPI', {'statement': {}}, {bubbles: true, external: true});
+};
+
+H5P.XAPIEvent.prototype = Object.create(H5P.Event.prototype);
+H5P.XAPIEvent.prototype.constructor = H5P.XAPIEvent;
+
+/**
+ * Set scored result statements.
+ *
+ * @param {number} score
+ * @param {number} maxScore
+ * @param {object} instance
+ * @param {boolean} completion
+ * @param {boolean} success
+ */
+H5P.XAPIEvent.prototype.setScoredResult = function (score, maxScore, instance, completion, success) {
+  this.data.statement.result = {};
+
+  if (typeof score !== 'undefined') {
+    if (typeof maxScore === 'undefined') {
+      this.data.statement.result.score = {'raw': score};
+    }
+    else {
+      this.data.statement.result.score = {
+        'min': 0,
+        'max': maxScore,
+        'raw': score
+      };
+      if (maxScore > 0) {
+        this.data.statement.result.score.scaled = Math.round(score / maxScore * 10000) / 10000;
+      }
+    }
+  }
+
+  if (typeof completion === 'undefined') {
+    this.data.statement.result.completion = (this.getVerb() === 'completed' || this.getVerb() === 'answered');
+  }
+  else {
+    this.data.statement.result.completion = completion;
+  }
+
+  if (typeof success !== 'undefined') {
+    this.data.statement.result.success = success;
+  }
+
+  if (instance && instance.activityStartTime) {
+    var duration = Math.round((Date.now() - instance.activityStartTime ) / 10) / 100;
+    // xAPI spec allows a precision of 0.01 seconds
+
+    this.data.statement.result.duration = 'PT' + duration + 'S';
+  }
+};
+
+/**
+ * Set a verb.
+ *
+ * @param {string} verb
+ *   Verb in short form, one of the verbs defined at
+ *   {@link http://adlnet.gov/expapi/verbs/|ADL xAPI Vocabulary}
+ *
+ */
+H5P.XAPIEvent.prototype.setVerb = function (verb) {
+  if (H5P.jQuery.inArray(verb, H5P.XAPIEvent.allowedXAPIVerbs) !== -1) {
+    this.data.statement.verb = {
+      'id': 'http://adlnet.gov/expapi/verbs/' + verb,
+      'display': {
+        'en-US': verb
+      }
+    };
+  }
+  else if (verb.id !== undefined) {
+    this.data.statement.verb = verb;
+  }
+};
+
+/**
+ * Get the statements verb id.
+ *
+ * @param {boolean} full
+ *   if true the full verb id prefixed by http://adlnet.gov/expapi/verbs/
+ *   will be returned
+ * @returns {string}
+ *   Verb or null if no verb with an id has been defined
+ */
+H5P.XAPIEvent.prototype.getVerb = function (full) {
+  var statement = this.data.statement;
+  if ('verb' in statement) {
+    if (full === true) {
+      return statement.verb;
+    }
+    return statement.verb.id.slice(31);
+  }
+  else {
+    return null;
+  }
+};
+
+/**
+ * Set the object part of the statement.
+ *
+ * The id is found automatically (the url to the content)
+ *
+ * @param {Object} instance
+ *   The H5P instance
+ */
+H5P.XAPIEvent.prototype.setObject = function (instance) {
+  if (instance.contentId) {
+    this.data.statement.object = {
+      'id': this.getContentXAPIId(instance),
+      'objectType': 'Activity',
+      'definition': {
+        'extensions': {
+          'http://h5p.org/x-api/h5p-local-content-id': instance.contentId
+        }
+      }
+    };
+    if (instance.subContentId) {
+      this.data.statement.object.definition.extensions['http://h5p.org/x-api/h5p-subContentId'] = instance.subContentId;
+      // Don't set titles on main content, title should come from publishing platform
+      if (typeof instance.getTitle === 'function') {
+        this.data.statement.object.definition.name = {
+          "en-US": instance.getTitle()
+        };
+      }
+    }
+    else {
+      var content = H5P.getContentForInstance(instance.contentId);
+      if (content && content.metadata && content.metadata.title) {
+        this.data.statement.object.definition.name = {
+          "en-US": H5P.createTitle(content.metadata.title)
+        };
+      }
+    }
+  }
+  else {
+    // Content types view always expect to have a contentId when they are displayed.
+    // This is not the case if they are displayed in the editor as part of a preview.
+    // The fix is to set an empty object with definition for the xAPI event, so all
+    // the content types that rely on this does not have to handle it. This means
+    // that content types that are being previewed will send xAPI completed events,
+    // but since there are no scripts that catch these events in the editor,
+    // this is not a problem.
+    this.data.statement.object = {
+      definition: {}
+    };
+  }
+};
+
+/**
+ * Set the context part of the statement.
+ *
+ * @param {Object} instance
+ *   The H5P instance
+ */
+H5P.XAPIEvent.prototype.setContext = function (instance) {
+  if (instance.parent && (instance.parent.contentId || instance.parent.subContentId)) {
+    this.data.statement.context = {
+      "contextActivities": {
+        "parent": [
+          {
+            "id": this.getContentXAPIId(instance.parent),
+            "objectType": "Activity"
+          }
+        ]
+      }
+    };
+  }
+  if (instance.libraryInfo) {
+    if (this.data.statement.context === undefined) {
+      this.data.statement.context = {"contextActivities":{}};
+    }
+    this.data.statement.context.contextActivities.category = [
+      {
+        "id": "http://h5p.org/libraries/" + instance.libraryInfo.versionedNameNoSpaces,
+        "objectType": "Activity"
+      }
+    ];
+  }
+};
+
+/**
+ * Set the actor. Email and name will be added automatically.
+ */
+H5P.XAPIEvent.prototype.setActor = function () {
+  if (H5PIntegration.user !== undefined) {
+    this.data.statement.actor = {
+      'name': H5PIntegration.user.name,
+      'mbox': 'mailto:' + H5PIntegration.user.mail,
+      'objectType': 'Agent'
+    };
+  }
+  else {
+    var uuid;
+    try {
+      if (localStorage.H5PUserUUID) {
+        uuid = localStorage.H5PUserUUID;
+      }
+      else {
+        uuid = H5P.createUUID();
+        localStorage.H5PUserUUID = uuid;
+      }
+    }
+    catch (err) {
+      // LocalStorage and Cookies are probably disabled. Do not track the user.
+      uuid = 'not-trackable-' + H5P.createUUID();
+    }
+    this.data.statement.actor = {
+      'account': {
+        'name': uuid,
+        'homePage': H5PIntegration.siteUrl
+      },
+      'objectType': 'Agent'
+    };
+  }
+};
+
+/**
+ * Get the max value of the result - score part of the statement
+ *
+ * @returns {number}
+ *   The max score, or null if not defined
+ */
+H5P.XAPIEvent.prototype.getMaxScore = function () {
+  return this.getVerifiedStatementValue(['result', 'score', 'max']);
+};
+
+/**
+ * Get the raw value of the result - score part of the statement
+ *
+ * @returns {number}
+ *   The score, or null if not defined
+ */
+H5P.XAPIEvent.prototype.getScore = function () {
+  return this.getVerifiedStatementValue(['result', 'score', 'raw']);
+};
+
+/**
+ * Get content xAPI ID.
+ *
+ * @param {Object} instance
+ *   The H5P instance
+ */
+H5P.XAPIEvent.prototype.getContentXAPIId = function (instance) {
+  var xAPIId;
+  if (instance.contentId && H5PIntegration && H5PIntegration.contents && H5PIntegration.contents['cid-' + instance.contentId]) {
+    xAPIId =  H5PIntegration.contents['cid-' + instance.contentId].url;
+    if (instance.subContentId) {
+      xAPIId += '?subContentId=' +  instance.subContentId;
+    }
+  }
+  return xAPIId;
+};
+
+/**
+ * Check if this event is sent from a child (i.e not from grandchild)
+ *
+ * @return {Boolean}
+ */
+H5P.XAPIEvent.prototype.isFromChild = function () {
+  var parentId = this.getVerifiedStatementValue(['context', 'contextActivities', 'parent', 0, 'id']);
+  return !parentId || parentId.indexOf('subContentId') === -1;
+};
+
+/**
+ * Figure out if a property exists in the statement and return it
+ *
+ * @param {string[]} keys
+ *   List describing the property we're looking for. For instance
+ *   ['result', 'score', 'raw'] for result.score.raw
+ * @returns {*}
+ *   The value of the property if it is set, null otherwise.
+ */
+H5P.XAPIEvent.prototype.getVerifiedStatementValue = function (keys) {
+  var val = this.data.statement;
+  for (var i = 0; i < keys.length; i++) {
+    if (val[keys[i]] === undefined) {
+      return null;
+    }
+    val = val[keys[i]];
+  }
+  return val;
+};
+
+/**
+ * List of verbs defined at {@link http://adlnet.gov/expapi/verbs/|ADL xAPI Vocabulary}
+ *
+ * @type Array
+ */
+H5P.XAPIEvent.allowedXAPIVerbs = [
+  'answered',
+  'asked',
+  'attempted',
+  'attended',
+  'commented',
+  'completed',
+  'exited',
+  'experienced',
+  'failed',
+  'imported',
+  'initialized',
+  'interacted',
+  'launched',
+  'mastered',
+  'passed',
+  'preferred',
+  'progressed',
+  'registered',
+  'responded',
+  'resumed',
+  'scored',
+  'shared',
+  'suspended',
+  'terminated',
+  'voided',
+
+  // Custom verbs used for action toolbar below content
+  'downloaded',
+  'copied',
+  'accessed-reuse',
+  'accessed-embed',
+  'accessed-copyright'
+];
diff --git a/src/core/h5p/assets/js/h5p-x-api.js b/src/core/h5p/assets/js/h5p-x-api.js
new file mode 100644
index 000000000..66971cdef
--- /dev/null
+++ b/src/core/h5p/assets/js/h5p-x-api.js
@@ -0,0 +1,119 @@
+var H5P = window.H5P = window.H5P || {};
+
+/**
+ * The external event dispatcher. Others, outside of H5P may register and
+ * listen for H5P Events here.
+ *
+ * @type {H5P.EventDispatcher}
+ */
+H5P.externalDispatcher = new H5P.EventDispatcher();
+
+// EventDispatcher extensions
+
+/**
+ * Helper function for triggering xAPI added to the EventDispatcher.
+ *
+ * @param {string} verb
+ *   The short id of the verb we want to trigger
+ * @param {Oject} [extra]
+ *   Extra properties for the xAPI statement
+ */
+H5P.EventDispatcher.prototype.triggerXAPI = function (verb, extra) {
+  this.trigger(this.createXAPIEventTemplate(verb, extra));
+};
+
+/**
+ * Helper function to create event templates added to the EventDispatcher.
+ *
+ * Will in the future be used to add representations of the questions to the
+ * statements.
+ *
+ * @param {string} verb
+ *   Verb id in short form
+ * @param {Object} [extra]
+ *   Extra values to be added to the statement
+ * @returns {H5P.XAPIEvent}
+ *   Instance
+ */
+H5P.EventDispatcher.prototype.createXAPIEventTemplate = function (verb, extra) {
+  var event = new H5P.XAPIEvent();
+
+  event.setActor();
+  event.setVerb(verb);
+  if (extra !== undefined) {
+    for (var i in extra) {
+      event.data.statement[i] = extra[i];
+    }
+  }
+  if (!('object' in event.data.statement)) {
+    event.setObject(this);
+  }
+  if (!('context' in event.data.statement)) {
+    event.setContext(this);
+  }
+  return event;
+};
+
+/**
+ * Helper function to create xAPI completed events
+ *
+ * DEPRECATED - USE triggerXAPIScored instead
+ *
+ * @deprecated
+ *   since 1.5, use triggerXAPIScored instead.
+ * @param {number} score
+ *   Will be set as the 'raw' value of the score object
+ * @param {number} maxScore
+ *   will be set as the "max" value of the score object
+ * @param {boolean} success
+ *   will be set as the "success" value of the result object
+ */
+H5P.EventDispatcher.prototype.triggerXAPICompleted = function (score, maxScore, success) {
+  this.triggerXAPIScored(score, maxScore, 'completed', true, success);
+};
+
+/**
+ * Helper function to create scored xAPI events
+ *
+ * @param {number} score
+ *   Will be set as the 'raw' value of the score object
+ * @param {number} maxScore
+ *   Will be set as the "max" value of the score object
+ * @param {string} verb
+ *   Short form of adl verb
+ * @param {boolean} completion
+ *   Is this a statement from a completed activity?
+ * @param {boolean} success
+ *   Is this a statement from an activity that was done successfully?
+ */
+H5P.EventDispatcher.prototype.triggerXAPIScored = function (score, maxScore, verb, completion, success) {
+  var event = this.createXAPIEventTemplate(verb);
+  event.setScoredResult(score, maxScore, this, completion, success);
+  this.trigger(event);
+};
+
+H5P.EventDispatcher.prototype.setActivityStarted = function () {
+  if (this.activityStartTime === undefined) {
+    // Don't trigger xAPI events in the editor
+    if (this.contentId !== undefined &&
+        H5PIntegration.contents !== undefined &&
+        H5PIntegration.contents['cid-' + this.contentId] !== undefined) {
+      this.triggerXAPI('attempted');
+    }
+    this.activityStartTime = Date.now();
+  }
+};
+
+/**
+ * Internal H5P function listening for xAPI completed events and stores scores
+ *
+ * @param {H5P.XAPIEvent} event
+ */
+H5P.xAPICompletedListener = function (event) {
+  if ((event.getVerb() === 'completed' || event.getVerb() === 'answered') && !event.getVerifiedStatementValue(['context', 'contextActivities', 'parent'])) {
+    var score = event.getScore();
+    var maxScore = event.getMaxScore();
+    var contentId = event.getVerifiedStatementValue(['object', 'definition', 'extensions', 'http://h5p.org/x-api/h5p-local-content-id']);
+    H5P.setFinished(contentId, score, maxScore);
+  }
+};
diff --git a/src/core/h5p/assets/js/h5p.js b/src/core/h5p/assets/js/h5p.js
new file mode 100644
index 000000000..5d2a8f623
--- /dev/null
+++ b/src/core/h5p/assets/js/h5p.js
@@ -0,0 +1,2847 @@
+/*jshint multistr: true */
+// TODO: Should we split up the generic parts needed by the editor(and others), and the parts needed to "run" H5Ps?
+
+/** @namespace */
+var H5P = window.H5P = window.H5P || {};
+
+/**
+ * Tells us if we're inside of an iframe.
+ * @member {boolean}
+ */
+H5P.isFramed = (window.self !== window.parent);
+
+/**
+ * jQuery instance of current window.
+ * @member {H5P.jQuery}
+ */
+H5P.$window = H5P.jQuery(window);
+
+/**
+ * List over H5P instances on the current page.
+ * @member {Array}
+ */
+H5P.instances = [];
+
+// Detect if we support fullscreen, and what prefix to use.
+if (document.documentElement.requestFullScreen) {
+  /**
+   * Browser prefix to use when entering fullscreen mode.
+   * undefined means no fullscreen support.
+   * @member {string}
+   */
+  H5P.fullScreenBrowserPrefix = '';
+}
+else if (document.documentElement.webkitRequestFullScreen) {
+  H5P.safariBrowser = navigator.userAgent.match(/version\/([.\d]+)/i);
+  H5P.safariBrowser = (H5P.safariBrowser === null ? 0 : parseInt(H5P.safariBrowser[1]));
+
+  // Do not allow fullscreen for safari < 7.
+  if (H5P.safariBrowser === 0 || H5P.safariBrowser > 6) {
+    H5P.fullScreenBrowserPrefix = 'webkit';
+  }
+}
+else if (document.documentElement.mozRequestFullScreen) {
+  H5P.fullScreenBrowserPrefix = 'moz';
+}
+else if (document.documentElement.msRequestFullscreen) {
+  H5P.fullScreenBrowserPrefix = 'ms';
+}
+
+/**
+ * Keep track of when the H5Ps where started.
+ *
+ * @type {Object[]}
+ */
+H5P.opened = {};
+
+/**
+ * Initialize H5P content.
+ * Scans for ".h5p-content" in the document and initializes H5P instances where found.
+ *
+ * @param {Object} target DOM Element
+ */
+H5P.init = function (target) {
+  // Useful jQuery object.
+  if (H5P.$body === undefined) {
+    H5P.$body = H5P.jQuery(document.body);
+  }
+
+  // Determine if we can use full screen
+  if (H5P.fullscreenSupported === undefined) {
+    /**
+     * Use this variable to check if fullscreen is supported. Fullscreen can be
+     * restricted when embedding since not all browsers support the native
+     * fullscreen, and the semi-fullscreen solution doesn't work when embedded.
+     * @type {boolean}
+     */
+    H5P.fullscreenSupported = !H5PIntegration.fullscreenDisabled && !H5P.fullscreenDisabled && (!(H5P.isFramed && H5P.externalEmbed !== false) || !!(document.fullscreenEnabled || document.webkitFullscreenEnabled || document.mozFullScreenEnabled));
+    // -We should consider document.msFullscreenEnabled when they get their
+    // -element sizing corrected. Ref. https://connect.microsoft.com/IE/feedback/details/838286/ie-11-incorrectly-reports-dom-element-sizes-in-fullscreen-mode-when-fullscreened-element-is-within-an-iframe
+    // Update: Seems to be no need as they've moved on to Webkit
+  }
+
+  // Deprecated variable, kept to maintain backwards compatability
+  if (H5P.canHasFullScreen === undefined) {
+    /**
+     * @deprecated since version 1.11
+     * @type {boolean}
+     */
+    H5P.canHasFullScreen = H5P.fullscreenSupported;
+  }
+
+  // H5Ps added in normal DIV.
+  H5P.jQuery('.h5p-content:not(.h5p-initialized)', target).each(function () {
+    var $element = H5P.jQuery(this).addClass('h5p-initialized');
+    var $container = H5P.jQuery('<div class="h5p-container"></div>').appendTo($element);
+    var contentId = $element.data('content-id');
+    var contentData = H5PIntegration.contents['cid-' + contentId];
+    if (contentData === undefined) {
+      return H5P.error('No data for content id ' + contentId + '. Perhaps the library is gone?');
+    }
+    var library = {
+      library: contentData.library,
+      params: JSON.parse(contentData.jsonContent),
+      metadata: contentData.metadata
+    };
+
+    H5P.getUserData(contentId, 'state', function (err, previousState) {
+      if (previousState) {
+        library.userDatas = {
+          state: previousState
+        };
+      }
+      else if (previousState === null && H5PIntegration.saveFreq) {
+        // Content has been reset. Display dialog.
+        delete contentData.contentUserData;
+        var dialog = new H5P.Dialog('content-user-data-reset', 'Data Reset', '<p>' + H5P.t('contentChanged') + '</p><p>' + H5P.t('startingOver') + '</p><div class="h5p-dialog-ok-button" tabIndex="0" role="button">OK</div>', $container);
+        H5P.jQuery(dialog).on('dialog-opened', function (event, $dialog) {
+
+          var closeDialog = function (event) {
+            if (event.type === 'click' || event.which === 32) {
+              dialog.close();
+              H5P.deleteUserData(contentId, 'state', 0);
+            }
+          };
+
+          $dialog.find('.h5p-dialog-ok-button').click(closeDialog).keypress(closeDialog);
+          H5P.trigger(instance, 'resize');
+        }).on('dialog-closed', function () {
+          H5P.trigger(instance, 'resize');
+        });
+        dialog.open();
+      }
+      // If previousState is false we don't have a previous state
+    });
+
+    // Create new instance.
+    var instance = H5P.newRunnable(library, contentId, $container, true, {standalone: true});
+
+    H5P.offlineRequestQueue = new H5P.OfflineRequestQueue({instance: instance});
+
+    // Check if we should add and display a fullscreen button for this H5P.
+    if (contentData.fullScreen == 1 && H5P.fullscreenSupported) {
+      H5P.jQuery(
+        '<div class="h5p-content-controls">' +
+          '<div role="button" ' +
+                'tabindex="0" ' +
+                'class="h5p-enable-fullscreen" ' +
+                'aria-label="' + H5P.t('fullscreen') + '" ' +
+                'title="' + H5P.t('fullscreen') + '">' +
+          '</div>' +
+        '</div>')
+        .prependTo($container)
+          .children()
+          .click(function () {
+            H5P.fullScreen($container, instance);
+          })
+        .keydown(function (e) {
+          if (e.which === 32 || e.which === 13) {
+            H5P.fullScreen($container, instance);
+            return false;
+          }
+        })
+      ;
+    }
+
+    /**
+     * Create action bar
+     */
+    var displayOptions = contentData.displayOptions;
+    var displayFrame = false;
+    if (displayOptions.frame) {
+      // Special handling of copyrights
+      if (displayOptions.copyright) {
+        var copyrights = H5P.getCopyrights(instance, library.params, contentId, library.metadata);
+        if (!copyrights) {
+          displayOptions.copyright = false;
+        }
+      }
+
+      // Create action bar
+      var actionBar = new H5P.ActionBar(displayOptions);
+      var $actions = actionBar.getDOMElement();
+
+      actionBar.on('reuse', function () {
+        H5P.openReuseDialog($actions, contentData, library, instance, contentId);
+        instance.triggerXAPI('accessed-reuse');
+      });
+      actionBar.on('copyrights', function () {
+        var dialog = new H5P.Dialog('copyrights', H5P.t('copyrightInformation'), copyrights, $container);
+        dialog.open(true);
+        instance.triggerXAPI('accessed-copyright');
+      });
+      actionBar.on('embed', function () {
+        H5P.openEmbedDialog($actions, contentData.embedCode, contentData.resizeCode, {
+          width: $element.width(),
+          height: $element.height()
+        }, instance);
+        instance.triggerXAPI('accessed-embed');
+      });
+
+      if (actionBar.hasActions()) {
+        displayFrame = true;
+        $actions.insertAfter($container);
+      }
+    }
+
+    $element.addClass(displayFrame ? 'h5p-frame' : 'h5p-no-frame');
+
+    // Keep track of when we started
+    H5P.opened[contentId] = new Date();
+
+    // Handle events when the user finishes the content. Useful for logging exercise results.
+    H5P.on(instance, 'finish', function (event) {
+      if (event.data !== undefined) {
+        H5P.setFinished(contentId, event.data.score, event.data.maxScore, event.data.time);
+      }
+    });
+
+    // Listen for xAPI events.
+    H5P.on(instance, 'xAPI', H5P.xAPICompletedListener);
+
+    // Auto save current state if supported
+    if (H5PIntegration.saveFreq !== false && (
+        instance.getCurrentState instanceof Function ||
+        typeof instance.getCurrentState === 'function')) {
+
+      var saveTimer, save = function () {
+        var state = instance.getCurrentState();
+        if (state !== undefined) {
+          H5P.setUserData(contentId, 'state', state, {deleteOnChange: true});
+        }
+        if (H5PIntegration.saveFreq) {
+          // Continue autosave
+          saveTimer = setTimeout(save, H5PIntegration.saveFreq * 1000);
+        }
+      };
+
+      if (H5PIntegration.saveFreq) {
+        // Start autosave
+        saveTimer = setTimeout(save, H5PIntegration.saveFreq * 1000);
+      }
+
+      // xAPI events will schedule a save in three seconds.
+      H5P.on(instance, 'xAPI', function (event) {
+        var verb = event.getVerb();
+        if (verb === 'completed' || verb === 'progressed') {
+          clearTimeout(saveTimer);
+          saveTimer = setTimeout(save, 3000);
+        }
+      });
+    }
+
+    if (H5P.isFramed) {
+      var resizeDelay;
+      if (H5P.externalEmbed === false) {
+        // Internal embed
+        // Make it possible to resize the iframe when the content changes size. This way we get no scrollbars.
+        var iframe = window.frameElement;
+        var resizeIframe = function () {
+          if (window.parent.H5P.isFullscreen) {
+            return; // Skip if full screen.
+          }
+
+          // Retain parent size to avoid jumping/scrolling
+          var parentHeight = iframe.parentElement.style.height;
+          iframe.parentElement.style.height = iframe.parentElement.clientHeight + 'px';
+
+          // Note:  Force layout reflow
+          //        This fixes a flickering bug for embedded content on iPads
+          //        @see https://github.com/h5p/h5p-moodle-plugin/issues/237
+          iframe.getBoundingClientRect();
+
+          // Reset iframe height, in case content has shrinked.
+          iframe.style.height = '1px';
+
+          // Resize iframe so all content is visible.
+          iframe.style.height = (iframe.contentDocument.body.scrollHeight) + 'px';
+
+          // Free parent
+          iframe.parentElement.style.height = parentHeight;
+        };
+
+        H5P.on(instance, 'resize', function () {
+          // Use a delay to make sure iframe is resized to the correct size.
+          clearTimeout(resizeDelay);
+          resizeDelay = setTimeout(function () {
+            resizeIframe();
+          }, 1);
+        });
+      }
+      else if (H5P.communicator) {
+        // External embed
+        var parentIsFriendly = false;
+
+        // Handle that the resizer is loaded after the iframe
+        H5P.communicator.on('ready', function () {
+          H5P.communicator.send('hello');
+        });
+
+        // Handle hello message from our parent window
+        H5P.communicator.on('hello', function () {
+          // Initial setup/handshake is done
+          parentIsFriendly = true;
+
+          // Make iframe responsive
+          document.body.style.height = 'auto';
+
+          // Hide scrollbars for correct size
+          document.body.style.overflow = 'hidden';
+
+          // Content need to be resized to fit the new iframe size
+          H5P.trigger(instance, 'resize');
+        });
+
+        // When resize has been prepared tell parent window to resize
+        H5P.communicator.on('resizePrepared', function () {
+          H5P.communicator.send('resize', {
+            scrollHeight: document.body.scrollHeight
+          });
+        });
+
+        H5P.communicator.on('resize', function () {
+          H5P.trigger(instance, 'resize');
+        });
+
+        H5P.on(instance, 'resize', function () {
+          if (H5P.isFullscreen) {
+            return; // Skip iframe resize
+          }
+
+          // Use a delay to make sure iframe is resized to the correct size.
+          clearTimeout(resizeDelay);
+          resizeDelay = setTimeout(function () {
+            // Only resize if the iframe can be resized
+            if (parentIsFriendly) {
+              H5P.communicator.send('prepareResize', {
+                scrollHeight: document.body.scrollHeight,
+                clientHeight: document.body.clientHeight
+              });
+            }
+            else {
+              H5P.communicator.send('hello');
+            }
+          }, 0);
+        });
+      }
+    }
+
+    if (!H5P.isFramed || H5P.externalEmbed === false) {
+      // Resize everything when window is resized.
+      H5P.jQuery(window.parent).resize(function () {
+        if (window.parent.H5P.isFullscreen) {
+          // Use timeout to avoid bug in certain browsers when exiting fullscreen. Some browser will trigger resize before the fullscreenchange event.
+          H5P.trigger(instance, 'resize');
+        }
+        else {
+          H5P.trigger(instance, 'resize');
+        }
+      });
+    }
+
+    H5P.instances.push(instance);
+
+    // Resize content.
+    H5P.trigger(instance, 'resize');
+
+    // Logic for hiding focus effects when using mouse
+    $element.addClass('using-mouse');
+    $element.on('mousedown keydown keyup', function (event) {
+      $element.toggleClass('using-mouse', event.type === 'mousedown');
+    });
+
+    if (H5P.externalDispatcher) {
+      H5P.externalDispatcher.trigger('initialized');
+    }
+  });
+
+  // Insert H5Ps that should be in iframes.
+  H5P.jQuery('iframe.h5p-iframe:not(.h5p-initialized)', target).each(function () {
+    var contentId = H5P.jQuery(this).addClass('h5p-initialized').data('content-id');
+    this.contentDocument.open();
+    this.contentDocument.write('<!doctype html><html class="h5p-iframe"><head>' + H5P.getHeadTags(contentId) + '</head><body><div class="h5p-content" data-content-id="' + contentId + '"/></body></html>');
+    this.contentDocument.close();
+  });
+};
+
+/**
+ * Loop through assets for iframe content and create a set of tags for head.
+ *
+ * @private
+ * @param {number} contentId
+ * @returns {string} HTML
+ */
+H5P.getHeadTags = function (contentId) {
+  var createStyleTags = function (styles) {
+    var tags = '';
+    for (var i = 0; i < styles.length; i++) {
+      tags += '<link rel="stylesheet" href="' + styles[i] + '">';
+    }
+    return tags;
+  };
+
+  var createScriptTags = function (scripts) {
+    var tags = '';
+    for (var i = 0; i < scripts.length; i++) {
+      tags += '<script src="' + scripts[i] + '"></script>';
+    }
+    return tags;
+  };
+
+  return '<base target="_parent">' +
+         createStyleTags(H5PIntegration.core.styles) +
+         createStyleTags(H5PIntegration.contents['cid-' + contentId].styles) +
+         createScriptTags(H5PIntegration.core.scripts) +
+         createScriptTags(H5PIntegration.contents['cid-' + contentId].scripts) +
+         '<script>H5PIntegration = window.parent.H5PIntegration; var H5P = H5P || {}; H5P.externalEmbed = false;</script>';
+};
+
+/**
+ * When embedded the communicator helps talk to the parent page.
+ *
+ * @type {Communicator}
+ */
+H5P.communicator = (function () {
+  /**
+   * @class
+   * @private
+   */
+  function Communicator() {
+    var self = this;
+
+    // Maps actions to functions
+    var actionHandlers = {};
+
+    // Register message listener
+    window.addEventListener('message', function receiveMessage(event) {
+      if (window.parent !== event.source || event.data.context !== 'h5p') {
+        return; // Only handle messages from parent and in the correct context
+      }
+
+      if (actionHandlers[event.data.action] !== undefined) {
+        actionHandlers[event.data.action](event.data);
+      }
+    } , false);
+
+
+    /**
+     * Register action listener.
+     *
+     * @param {string} action What you are waiting for
+     * @param {function} handler What you want done
+     */
+    self.on = function (action, handler) {
+      actionHandlers[action] = handler;
+    };
+
+    /**
+     * Send a message to the all mighty father.
+     *
+     * @param {string} action
+     * @param {Object} [data] payload
+     */
+    self.send = function (action, data) {
+      if (data === undefined) {
+        data = {};
+      }
+      data.context = 'h5p';
+      data.action = action;
+
+      // Parent origin can be anything
+      window.parent.postMessage(data, '*');
+    };
+  }
+
+  return (window.postMessage && window.addEventListener ? new Communicator() : undefined);
+})();
+
+/**
+ * Enter semi fullscreen for the given H5P instance
+ *
+ * @param {H5P.jQuery} $element Content container.
+ * @param {Object} instance
+ * @param {function} exitCallback Callback function called when user exits fullscreen.
+ * @param {H5P.jQuery} $body For internal use. Gives the body of the iframe.
+ */
+H5P.semiFullScreen = function ($element, instance, exitCallback, body) {
+  H5P.fullScreen($element, instance, exitCallback, body, true);
+};
+
+/**
+ * Enter fullscreen for the given H5P instance.
+ *
+ * @param {H5P.jQuery} $element Content container.
+ * @param {Object} instance
+ * @param {function} exitCallback Callback function called when user exits fullscreen.
+ * @param {H5P.jQuery} $body For internal use. Gives the body of the iframe.
+ * @param {Boolean} forceSemiFullScreen
+ */
+H5P.fullScreen = function ($element, instance, exitCallback, body, forceSemiFullScreen) {
+  if (H5P.exitFullScreen !== undefined) {
+    return; // Cannot enter new fullscreen until previous is over
+  }
+
+  if (H5P.isFramed && H5P.externalEmbed === false) {
+    // Trigger resize on wrapper in parent window.
+    window.parent.H5P.fullScreen($element, instance, exitCallback, H5P.$body.get(), forceSemiFullScreen);
+    H5P.isFullscreen = true;
+    H5P.exitFullScreen = function () {
+      window.parent.H5P.exitFullScreen();
+    };
+    H5P.on(instance, 'exitFullScreen', function () {
+      H5P.isFullscreen = false;
+      H5P.exitFullScreen = undefined;
+    });
+    return;
+  }
+
+  var $container = $element;
+  var $classes, $iframe, $body;
+  if (body === undefined)  {
+    $body = H5P.$body;
+  }
+  else {
+    // We're called from an iframe.
+    $body = H5P.jQuery(body);
+    $classes = $body.add($element.get());
+    var iframeSelector = '#h5p-iframe-' + $element.parent().data('content-id');
+    $iframe = H5P.jQuery(iframeSelector);
+    $element = $iframe.parent(); // Put iframe wrapper in fullscreen, not container.
+  }
+
+  $classes = $element.add(H5P.$body).add($classes);
+
+  /**
+   * Prepare for resize by setting the correct styles.
+   *
+   * @private
+   * @param {string} classes CSS
+   */
+  var before = function (classes) {
+    $classes.addClass(classes);
+
+    if ($iframe !== undefined) {
+      // Set iframe to its default size(100%).
+      $iframe.css('height', '');
+    }
+  };
+
+  /**
+   * Gets called when fullscreen mode has been entered.
+   * Resizes and sets focus on content.
+   *
+   * @private
+   */
+  var entered = function () {
+    // Do not rely on window resize events.
+    H5P.trigger(instance, 'resize');
+    H5P.trigger(instance, 'focus');
+    H5P.trigger(instance, 'enterFullScreen');
+  };
+
+  /**
+   * Gets called when fullscreen mode has been exited.
+   * Resizes and sets focus on content.
+   *
+   * @private
+   * @param {string} classes CSS
+   */
+  var done = function (classes) {
+    H5P.isFullscreen = false;
+    $classes.removeClass(classes);
+
+    // Do not rely on window resize events.
+    H5P.trigger(instance, 'resize');
+    H5P.trigger(instance, 'focus');
+
+    H5P.exitFullScreen = undefined;
+    if (exitCallback !== undefined) {
+      exitCallback();
+    }
+
+    H5P.trigger(instance, 'exitFullScreen');
+  };
+
+  H5P.isFullscreen = true;
+  if (H5P.fullScreenBrowserPrefix === undefined || forceSemiFullScreen === true) {
+    // Create semi fullscreen.
+
+    if (H5P.isFramed) {
+      return; // TODO: Should we support semi-fullscreen for IE9 & 10 ?
+    }
+
+    before('h5p-semi-fullscreen');
+    var $disable = H5P.jQuery('<div role="button" tabindex="0" class="h5p-disable-fullscreen" title="' + H5P.t('disableFullscreen') + '" aria-label="' + H5P.t('disableFullscreen') + '"></div>').appendTo($container.find('.h5p-content-controls'));
+    var keyup, disableSemiFullscreen = H5P.exitFullScreen = function () {
+      if (prevViewportContent) {
+        // Use content from the previous viewport tag
+        h5pViewport.content = prevViewportContent;
+      }
+      else {
+        // Remove viewport tag
+        head.removeChild(h5pViewport);
+      }
+      $disable.remove();
+      $body.unbind('keyup', keyup);
+      done('h5p-semi-fullscreen');
+    };
+    keyup = function (event) {
+      if (event.keyCode === 27) {
+        disableSemiFullscreen();
+      }
+    };
+    $disable.click(disableSemiFullscreen);
+    $body.keyup(keyup);
+
+    // Disable zoom
+    var prevViewportContent, h5pViewport;
+    var metaTags = document.getElementsByTagName('meta');
+    for (var i = 0; i < metaTags.length; i++) {
+      if (metaTags[i].name === 'viewport') {
+        // Use the existing viewport tag
+        h5pViewport = metaTags[i];
+        prevViewportContent = h5pViewport.content;
+        break;
+      }
+    }
+    if (!prevViewportContent) {
+      // Create a new viewport tag
+      h5pViewport = document.createElement('meta');
+      h5pViewport.name = 'viewport';
+    }
+    h5pViewport.content = 'width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0';
+    if (!prevViewportContent) {
+      // Insert the new viewport tag
+      var head = document.getElementsByTagName('head')[0];
+      head.appendChild(h5pViewport);
+    }
+
+    entered();
+  }
+  else {
+    // Create real fullscreen.
+
+    before('h5p-fullscreen');
+    var first, eventName = (H5P.fullScreenBrowserPrefix === 'ms' ? 'MSFullscreenChange' : H5P.fullScreenBrowserPrefix + 'fullscreenchange');
+    document.addEventListener(eventName, function () {
+      if (first === undefined) {
+        // We are entering fullscreen mode
+        first = false;
+        entered();
+        return;
+      }
+
+      // We are exiting fullscreen
+      done('h5p-fullscreen');
+      document.removeEventListener(eventName, arguments.callee, false);
+    });
+
+    if (H5P.fullScreenBrowserPrefix === '') {
+      $element[0].requestFullScreen();
+    }
+    else {
+      var method = (H5P.fullScreenBrowserPrefix === 'ms' ? 'msRequestFullscreen' : H5P.fullScreenBrowserPrefix + 'RequestFullScreen');
+      var params = (H5P.fullScreenBrowserPrefix === 'webkit' && H5P.safariBrowser === 0 ? Element.ALLOW_KEYBOARD_INPUT : undefined);
+      $element[0][method](params);
+    }
+
+    // Allows everone to exit
+    H5P.exitFullScreen = function () {
+      if (H5P.fullScreenBrowserPrefix === '') {
+        document.exitFullscreen();
+      }
+      else if (H5P.fullScreenBrowserPrefix === 'moz') {
+        document.mozCancelFullScreen();
+      }
+      else {
+        document[H5P.fullScreenBrowserPrefix + 'ExitFullscreen']();
+      }
+    };
+  }
+};
+
+(function () {
+  /**
+   * Helper for adding a query parameter to an existing path that may already
+   * contain one or a hash.
+   *
+   * @param {string} path
+   * @param {string} parameter
+   * @return {string}
+   */
+  H5P.addQueryParameter = function (path, parameter) {
+    let newPath, secondSplit;
+    const firstSplit = path.split('?');
+    if (firstSplit[1]) {
+      // There is already an existing query
+      secondSplit = firstSplit[1].split('#');
+      newPath = firstSplit[0] + '?' + secondSplit[0] + '&';
+    }
+    else {
+      // No existing query, just need to take care of the hash
+      secondSplit = firstSplit[0].split('#');
+      newPath = secondSplit[0] + '?';
+    }
+    newPath += parameter;
+    if (secondSplit[1]) {
+      // Add back the hash
+      newPath += '#' + secondSplit[1];
+    }
+    return newPath;
+  };
+
+  /**
+   * Helper for setting the crossOrigin attribute + the complete correct source.
+   * Note: This will start loading the resource.
+   *
+   * @param {Element} element DOM element, typically img, video or audio
+   * @param {Object} source File object from parameters/json_content (created by H5PEditor)
+   * @param {number} contentId Needed to determine the complete correct file path
+   */
+  H5P.setSource = function (element, source, contentId) {
+    let path = source.path;
+
+    const crossOrigin = H5P.getCrossOrigin(source);
+    if (crossOrigin) {
+      element.crossOrigin = crossOrigin;
+
+      if (H5PIntegration.crossoriginCacheBuster) {
+        // Some sites may want to add a cache buster in case the same resource
+        // is used elsewhere without the crossOrigin attribute
+        path = H5P.addQueryParameter(path, H5PIntegration.crossoriginCacheBuster);
+      }
+    }
+    else {
+      // In case this element has been used before.
+      element.removeAttribute('crossorigin');
+    }
+
+    element.src = H5P.getPath(path, contentId);
+  };
+
+  /**
+   * Check if the given path has a protocol.
+   *
+   * @private
+   * @param {string} path
+   * @return {string}
+   */
+  var hasProtocol = function (path) {
+    return path.match(/^[a-z0-9]+:\/\//i);
+  };
+
+  /**
+   * Get the crossOrigin policy to use for img, video and audio tags on the current site.
+   *
+   * @param {Object|string} source File object from parameters/json_content - Can also be URL(deprecated usage)
+   * @returns {string|null} crossOrigin attribute value required by the source
+   */
+  H5P.getCrossOrigin = function (source) {
+    if (typeof source !== 'object') {
+      // Deprecated usage.
+      return H5PIntegration.crossorigin && H5PIntegration.crossoriginRegex && source.match(H5PIntegration.crossoriginRegex) ? H5PIntegration.crossorigin : null;
+    }
+
+    if (H5PIntegration.crossorigin && !hasProtocol(source.path)) {
+      // This is a local file, use the local crossOrigin policy.
+      return H5PIntegration.crossorigin;
+      // Note: We cannot use this for all external sources since we do not know
+      // each server's individual policy. We could add support for a list of
+      // external sources and their policy later on.
+    }
+  };
+
+  /**
+   * Find the path to the content files based on the id of the content.
+   * Also identifies and returns absolute paths.
+   *
+   * @param {string} path
+   *   Relative to content folder or absolute.
+   * @param {number} contentId
+   *   ID of the content requesting the path.
+   * @returns {string}
+   *   Complete URL to path.
+   */
+  H5P.getPath = function (path, contentId) {
+    if (hasProtocol(path)) {
+      return path;
+    }
+
+    var prefix;
+    var isTmpFile = (path.substr(-4,4) === '#tmp');
+    if (contentId !== undefined && !isTmpFile) {
+      // Check for custom override URL
+      if (H5PIntegration.contents !== undefined &&
+          H5PIntegration.contents['cid-' + contentId]) {
+        prefix = H5PIntegration.contents['cid-' + contentId].contentUrl;
+      }
+      if (!prefix) {
+        prefix = H5PIntegration.url + '/content/' + contentId;
+      }
+    }
+    else if (window.H5PEditor !== undefined) {
+      prefix = H5PEditor.filesPath;
+    }
+    else {
+      return;
+    }
+
+    if (!hasProtocol(prefix)) {
+      // Use absolute urls
+      prefix = window.location.protocol + "//" + window.location.host + prefix;
+    }
+
+    return prefix + '/' + path;
+  };
+})();
+
+/**
+ * THIS FUNCTION IS DEPRECATED, USE getPath INSTEAD
+ * Will be remove march 2016.
+ *
+ * Find the path to the content files folder based on the id of the content
+ *
+ * @deprecated
+ *   Will be removed march 2016.
+ * @param contentId
+ *   Id of the content requesting the path
+ * @returns {string}
+ *   URL
+ */
+H5P.getContentPath = function (contentId) {
+  return H5PIntegration.url + '/content/' + contentId;
+};
+
+/**
+ * Get library class constructor from H5P by classname.
+ * Note that this class will only work for resolve "H5P.NameWithoutDot".
+ * Also check out {@link H5P.newRunnable}
+ *
+ * Used from libraries to construct instances of other libraries' objects by name.
+ *
+ * @param {string} name Name of library
+ * @returns {Object} Class constructor
+ */
+H5P.classFromName = function (name) {
+  var arr = name.split(".");
+  return this[arr[arr.length - 1]];
+};
+
+/**
+ * A safe way of creating a new instance of a runnable H5P.
+ *
+ * @param {Object} library
+ *   Library/action object form params.
+ * @param {number} contentId
+ *   Identifies the content.
+ * @param {H5P.jQuery} [$attachTo]
+ *   Element to attach the instance to.
+ * @param {boolean} [skipResize]
+ *   Skip triggering of the resize event after attaching.
+ * @param {Object} [extras]
+ *   Extra parameters for the H5P content constructor
+ * @returns {Object}
+ *   Instance.
+ */
+H5P.newRunnable = function (library, contentId, $attachTo, skipResize, extras) {
+  var nameSplit, versionSplit, machineName;
+  try {
+    nameSplit = library.library.split(' ', 2);
+    machineName = nameSplit[0];
+    versionSplit = nameSplit[1].split('.', 2);
+  }
+  catch (err) {
+    return H5P.error('Invalid library string: ' + library.library);
+  }
+
+  if ((library.params instanceof Object) !== true || (library.params instanceof Array) === true) {
+    H5P.error('Invalid library params for: ' + library.library);
+    return H5P.error(library.params);
+  }
+
+  // Find constructor function
+  var constructor;
+  try {
+    nameSplit = nameSplit[0].split('.');
+    constructor = window;
+    for (var i = 0; i < nameSplit.length; i++) {
+      constructor = constructor[nameSplit[i]];
+    }
+    if (typeof constructor !== 'function') {
+      throw null;
+    }
+  }
+  catch (err) {
+    return H5P.error('Unable to find constructor for: ' + library.library);
+  }
+
+  if (extras === undefined) {
+    extras = {};
+  }
+  if (library.subContentId) {
+    extras.subContentId = library.subContentId;
+  }
+
+  if (library.userDatas && library.userDatas.state && H5PIntegration.saveFreq) {
+    extras.previousState = library.userDatas.state;
+  }
+
+  if (library.metadata) {
+    extras.metadata = library.metadata;
+  }
+
+  // Makes all H5P libraries extend H5P.ContentType:
+  var standalone = extras.standalone || false;
+  // This order makes it possible for an H5P library to override H5P.ContentType functions!
+  constructor.prototype = H5P.jQuery.extend({}, H5P.ContentType(standalone).prototype, constructor.prototype);
+
+  var instance;
+  // Some old library versions have their own custom third parameter.
+  // Make sure we don't send them the extras.
+  // (they will interpret it as something else)
+  if (H5P.jQuery.inArray(library.library, ['H5P.CoursePresentation 1.0', 'H5P.CoursePresentation 1.1', 'H5P.CoursePresentation 1.2', 'H5P.CoursePresentation 1.3']) > -1) {
+    instance = new constructor(library.params, contentId);
+  }
+  else {
+    instance = new constructor(library.params, contentId, extras);
+  }
+
+  if (instance.$ === undefined) {
+    instance.$ = H5P.jQuery(instance);
+  }
+
+  if (instance.contentId === undefined) {
+    instance.contentId = contentId;
+  }
+  if (instance.subContentId === undefined && library.subContentId) {
+    instance.subContentId = library.subContentId;
+  }
+  if (instance.parent === undefined && extras && extras.parent) {
+    instance.parent = extras.parent;
+  }
+  if (instance.libraryInfo === undefined) {
+    instance.libraryInfo = {
+      versionedName: library.library,
+      versionedNameNoSpaces: machineName + '-' + versionSplit[0] + '.' + versionSplit[1],
+      machineName: machineName,
+      majorVersion: versionSplit[0],
+      minorVersion: versionSplit[1]
+    };
+  }
+
+  if ($attachTo !== undefined) {
+    $attachTo.toggleClass('h5p-standalone', standalone);
+    instance.attach($attachTo);
+    H5P.trigger(instance, 'domChanged', {
+      '$target': $attachTo,
+      'library': machineName,
+      'key': 'newLibrary'
+    }, {'bubbles': true, 'external': true});
+
+    if (skipResize === undefined || !skipResize) {
+      // Resize content.
+      H5P.trigger(instance, 'resize');
+    }
+  }
+  return instance;
+};
+
+/**
+ * Used to print useful error messages. (to JavaScript error console)
+ *
+ * @param {*} err Error to print.
+ */
+H5P.error = function (err) {
+  if (window.console !== undefined && console.error !== undefined) {
+    console.error(err.stack ? err.stack : err);
+  }
+};
+
+/**
+ * Translate text strings.
+ *
+ * @param {string} key
+ *   Translation identifier, may only contain a-zA-Z0-9. No spaces or special chars.
+ * @param {Object} [vars]
+ *   Data for placeholders.
+ * @param {string} [ns]
+ *   Translation namespace. Defaults to H5P.
+ * @returns {string}
+ *   Translated text
+ */
+H5P.t = function (key, vars, ns) {
+  if (ns === undefined) {
+    ns = 'H5P';
+  }
+
+  if (H5PIntegration.l10n[ns] === undefined) {
+    return '[Missing translation namespace "' + ns + '"]';
+  }
+
+  if (H5PIntegration.l10n[ns][key] === undefined) {
+    return '[Missing translation "' + key + '" in "' + ns + '"]';
+  }
+
+  var translation = H5PIntegration.l10n[ns][key];
+
+  if (vars !== undefined) {
+    // Replace placeholder with variables.
+    for (var placeholder in vars) {
+      translation = translation.replace(placeholder, vars[placeholder]);
+    }
+  }
+
+  return translation;
+};
+
+/**
+ * Creates a new popup dialog over the H5P content.
+ *
+ * @class
+ * @param {string} name
+ *   Used for html class.
+ * @param {string} title
+ *   Used for header.
+ * @param {string} content
+ *   Displayed inside the dialog.
+ * @param {H5P.jQuery} $element
+ *   Which DOM element the dialog should be inserted after.
+ */
+H5P.Dialog = function (name, title, content, $element) {
+  /** @alias H5P.Dialog# */
+  var self = this;
+  var $dialog = H5P.jQuery('<div class="h5p-popup-dialog h5p-' + name + '-dialog">\
+                              <div class="h5p-inner">\
+                                <h2>' + title + '</h2>\
+                                <div class="h5p-scroll-content">' + content + '</div>\
+                                <div class="h5p-close" role="button" tabindex="0" aria-label="' + H5P.t('close') + '" title="' + H5P.t('close') + '"></div>\
+                              </div>\
+                            </div>')
+    .insertAfter($element)
+    .click(function (e) {
+      if (e && e.originalEvent && e.originalEvent.preventClosing) {
+        return;
+      }
+
+      self.close();
+    })
+    .children('.h5p-inner')
+      .click(function (e) {
+        e.originalEvent.preventClosing = true;
+      })
+      .find('.h5p-close')
+        .click(function () {
+          self.close();
+        })
+        .end()
+      .find('a')
+        .click(function (e) {
+          e.stopPropagation();
+        })
+      .end()
+    .end();
+
+  /**
+   * Opens the dialog.
+   */
+  self.open = function (scrollbar) {
+    if (scrollbar) {
+      $dialog.css('height', '100%');
+    }
+    setTimeout(function () {
+      $dialog.addClass('h5p-open'); // Fade in
+      // Triggering an event, in case something has to be done after dialog has been opened.
+      H5P.jQuery(self).trigger('dialog-opened', [$dialog]);
+    }, 1);
+  };
+
+  /**
+   * Closes the dialog.
+   */
+  self.close = function () {
+    $dialog.removeClass('h5p-open'); // Fade out
+    setTimeout(function () {
+      $dialog.remove();
+      H5P.jQuery(self).trigger('dialog-closed', [$dialog]);
+    }, 200);
+  };
+};
+
+/**
+ * Gather copyright information for the given content.
+ *
+ * @param {Object} instance
+ *   H5P instance to get copyright information for.
+ * @param {Object} parameters
+ *   Parameters of the content instance.
+ * @param {number} contentId
+ *   Identifies the H5P content
+ * @param {Object} metadata
+ *   Metadata of the content instance.
+ * @returns {string} Copyright information.
+ */
+H5P.getCopyrights = function (instance, parameters, contentId, metadata) {
+  var copyrights;
+
+  if (instance.getCopyrights !== undefined) {
+    try {
+      // Use the instance's own copyright generator
+      copyrights = instance.getCopyrights();
+    }
+    catch (err) {
+      // Failed, prevent crashing page.
+    }
+  }
+
+  if (copyrights === undefined) {
+    // Create a generic flat copyright list
+    copyrights = new H5P.ContentCopyrights();
+    H5P.findCopyrights(copyrights, parameters, contentId);
+  }
+
+  var metadataCopyrights = H5P.buildMetadataCopyrights(metadata, instance.libraryInfo.machineName);
+  if (metadataCopyrights !== undefined) {
+    copyrights.addMediaInFront(metadataCopyrights);
+  }
+
+  if (copyrights !== undefined) {
+    // Convert to string
+    copyrights = copyrights.toString();
+  }
+  return copyrights;
+};
+
+/**
+ * Gather a flat list of copyright information from the given parameters.
+ *
+ * @param {H5P.ContentCopyrights} info
+ *   Used to collect all information in.
+ * @param {(Object|Array)} parameters
+ *   To search for file objects in.
+ * @param {number} contentId
+ *   Used to insert thumbnails for images.
+ * @param {Object} extras - Extras.
+ * @param {object} extras.metadata - Metadata
+ * @param {object} extras.machineName - Library name of some kind.
+ *   Metadata of the content instance.
+ */
+H5P.findCopyrights = function (info, parameters, contentId, extras) {
+  // If extras are
+  if (extras) {
+    extras.params = parameters;
+    buildFromMetadata(extras, extras.machineName, contentId);
+  }
+
+  var lastContentTypeName;
+  // Cycle through parameters
+  for (var field in parameters) {
+    if (!parameters.hasOwnProperty(field)) {
+      continue; // Do not check
+    }
+
+    /**
+     * @deprecated This hack should be removed after 2017-11-01
+     * The code that was using this was removed by HFP-574
+     * This note was seen on 2018-04-04, and consultation with
+     * higher authorities lead to keeping the code for now ;-)
+     */
+    if (field === 'overrideSettings') {
+      console.warn("The semantics field 'overrideSettings' is DEPRECATED and should not be used.");
+      console.warn(parameters);
+      continue;
+    }
+
+    var value = parameters[field];
+
+    if (value && value.library && typeof value.library === 'string') {
+      lastContentTypeName = value.library.split(' ')[0];
+    }
+    else if (value && value.library && typeof value.library === 'object') {
+      lastContentTypeName = (value.library.library && typeof value.library.library === 'string') ? value.library.library.split(' ')[0] : lastContentTypeName;
+    }
+
+    if (value instanceof Array) {
+      // Cycle through array
+      H5P.findCopyrights(info, value, contentId);
+    }
+    else if (value instanceof Object) {
+      buildFromMetadata(value, lastContentTypeName, contentId);
+
+      // Check if object is a file with copyrights (old core)
+      if (value.copyright === undefined ||
+          value.copyright.license === undefined ||
+          value.path === undefined ||
+          value.mime === undefined) {
+
+        // Nope, cycle throught object
+        H5P.findCopyrights(info, value, contentId);
+      }
+      else {
+        // Found file, add copyrights
+        var copyrights = new H5P.MediaCopyright(value.copyright);
+        if (value.width !== undefined && value.height !== undefined) {
+          copyrights.setThumbnail(new H5P.Thumbnail(H5P.getPath(value.path, contentId), value.width, value.height));
+        }
+        info.addMedia(copyrights);
+      }
+    }
+  }
+
+  function buildFromMetadata(data, name, contentId) {
+    if (data.metadata) {
+      const metadataCopyrights = H5P.buildMetadataCopyrights(data.metadata, name);
+      if (metadataCopyrights !== undefined) {
+        if (data.params && data.params.contentName === 'Image' && data.params.file) {
+          const path = data.params.file.path;
+          const width = data.params.file.width;
+          const height = data.params.file.height;
+          metadataCopyrights.setThumbnail(new H5P.Thumbnail(H5P.getPath(path, contentId), width, height));
+        }
+        info.addMedia(metadataCopyrights);
+      }
+    }
+  }
+};
+
+H5P.buildMetadataCopyrights = function (metadata) {
+  if (metadata && metadata.license !== undefined && metadata.license !== 'U') {
+    var dataset = {
+      contentType: metadata.contentType,
+      title: metadata.title,
+      author: (metadata.authors && metadata.authors.length > 0) ? metadata.authors.map(function (author) {
+        return (author.role) ? author.name + ' (' + author.role + ')' : author.name;
+      }).join(', ') : undefined,
+      source: metadata.source,
+      year: (metadata.yearFrom) ? (metadata.yearFrom + ((metadata.yearTo) ? '-' + metadata.yearTo: '')) : undefined,
+      license: metadata.license,
+      version: metadata.licenseVersion,
+      licenseExtras: metadata.licenseExtras,
+      changes: (metadata.changes && metadata.changes.length > 0) ? metadata.changes.map(function (change) {
+        return change.log + (change.author ? ', ' + change.author : '') + (change.date ? ', ' + change.date : '');
+      }).join(' / ') : undefined
+    };
+
+    return new H5P.MediaCopyright(dataset);
+  }
+};
+
+/**
+ * Display a dialog containing the download button and copy button.
+ *
+ * @param {H5P.jQuery} $element
+ * @param {Object} contentData
+ * @param {Object} library
+ * @param {Object} instance
+ * @param {number} contentId
+ */
+H5P.openReuseDialog = function ($element, contentData, library, instance, contentId) {
+  let html = '';
+  if (contentData.displayOptions.export) {
+    html += '<button type="button" class="h5p-big-button h5p-download-button"><div class="h5p-button-title">Download as an .h5p file</div><div class="h5p-button-description">.h5p files may be uploaded to any web-site where H5P content may be created.</div></button>';
+  }
+  if (contentData.displayOptions.export && contentData.displayOptions.copy) {
+    html += '<div class="h5p-horizontal-line-text"><span>or</span></div>';
+  }
+  if (contentData.displayOptions.copy) {
+    html += '<button type="button" class="h5p-big-button h5p-copy-button"><div class="h5p-button-title">Copy content</div><div class="h5p-button-description">Copied content may be pasted anywhere this content type is supported on this website.</div></button>';
+  }
+
+  const dialog = new H5P.Dialog('reuse', H5P.t('reuseContent'), html, $element);
+
+  // Selecting embed code when dialog is opened
+  H5P.jQuery(dialog).on('dialog-opened', function (e, $dialog) {
+    H5P.jQuery('<a href="https://h5p.org/node/442225" target="_blank">More Info</a>').click(function (e) {
+      e.stopPropagation();
+    }).appendTo($dialog.find('h2'));
+    $dialog.find('.h5p-download-button').click(function () {
+      window.location.href = contentData.exportUrl;
+      instance.triggerXAPI('downloaded');
+      dialog.close();
+    });
+    $dialog.find('.h5p-copy-button').click(function () {
+      const item = new H5P.ClipboardItem(library);
+      item.contentId = contentId;
+      H5P.setClipboard(item);
+      instance.triggerXAPI('copied');
+      dialog.close();
+      H5P.attachToastTo(
+        H5P.jQuery('.h5p-content:first')[0],
+        H5P.t('contentCopied'),
+        {
+          position: {
+            horizontal: 'centered',
+            vertical: 'centered',
+            noOverflowX: true
+          }
+        }
+      );
+    });
+    H5P.trigger(instance, 'resize');
+  }).on('dialog-closed', function () {
+    H5P.trigger(instance, 'resize');
+  });
+
+  dialog.open();
+};
+
+/**
+ * Display a dialog containing the embed code.
+ *
+ * @param {H5P.jQuery} $element
+ *   Element to insert dialog after.
+ * @param {string} embedCode
+ *   The embed code.
+ * @param {string} resizeCode
+ *   The advanced resize code
+ * @param {Object} size
+ *   The content's size.
+ * @param {number} size.width
+ * @param {number} size.height
+ */
+H5P.openEmbedDialog = function ($element, embedCode, resizeCode, size, instance) {
+  var fullEmbedCode = embedCode + resizeCode;
+  var dialog = new H5P.Dialog('embed', H5P.t('embed'), '<textarea class="h5p-embed-code-container" autocorrect="off" autocapitalize="off" spellcheck="false"></textarea>' + H5P.t('size') + ': <input type="text" value="' + Math.ceil(size.width) + '" class="h5p-embed-size"/> × <input type="text" value="' + Math.ceil(size.height) + '" class="h5p-embed-size"/> px<br/><div role="button" tabindex="0" class="h5p-expander">' + H5P.t('showAdvanced') + '</div><div class="h5p-expander-content"><p>' + H5P.t('advancedHelp') + '</p><textarea class="h5p-embed-code-container" autocorrect="off" autocapitalize="off" spellcheck="false">' + resizeCode + '</textarea></div>', $element);
+
+  // Selecting embed code when dialog is opened
+  H5P.jQuery(dialog).on('dialog-opened', function (event, $dialog) {
+    var $inner = $dialog.find('.h5p-inner');
+    var $scroll = $inner.find('.h5p-scroll-content');
+    var diff = $scroll.outerHeight() - $scroll.innerHeight();
+    var positionInner = function () {
+      H5P.trigger(instance, 'resize');
+    };
+
+    // Handle changing of width/height
+    var $w = $dialog.find('.h5p-embed-size:eq(0)');
+    var $h = $dialog.find('.h5p-embed-size:eq(1)');
+    var getNum = function ($e, d) {
+      var num = parseFloat($e.val());
+      if (isNaN(num)) {
+        return d;
+      }
+      return Math.ceil(num);
+    };
+    var updateEmbed = function () {
+      $dialog.find('.h5p-embed-code-container:first').val(fullEmbedCode.replace(':w', getNum($w, size.width)).replace(':h', getNum($h, size.height)));
+    };
+
+    $w.change(updateEmbed);
+    $h.change(updateEmbed);
+    updateEmbed();
+
+    // Select text and expand textareas
+    $dialog.find('.h5p-embed-code-container').each(function () {
+      H5P.jQuery(this).css('height', this.scrollHeight + 'px').focus(function () {
+        H5P.jQuery(this).select();
+      });
+    });
+    $dialog.find('.h5p-embed-code-container').eq(0).select();
+    positionInner();
+
+    // Expand advanced embed
+    var expand = function () {
+      var $expander = H5P.jQuery(this);
+      var $content = $expander.next();
+      if ($content.is(':visible')) {
+        $expander.removeClass('h5p-open').text(H5P.t('showAdvanced'));
+        $content.hide();
+      }
+      else {
+        $expander.addClass('h5p-open').text(H5P.t('hideAdvanced'));
+        $content.show();
+      }
+      $dialog.find('.h5p-embed-code-container').each(function () {
+        H5P.jQuery(this).css('height', this.scrollHeight + 'px');
+      });
+      positionInner();
+    };
+    $dialog.find('.h5p-expander').click(expand).keypress(function (event) {
+      if (event.keyCode === 32) {
+        expand.apply(this);
+      }
+    });
+  }).on('dialog-closed', function () {
+    H5P.trigger(instance, 'resize');
+  });
+
+  dialog.open();
+};
+
+/**
+ * Show a toast message.
+ *
+ * The reference element could be dom elements the toast should be attached to,
+ * or e.g. the document body for general toast messages.
+ *
+ * @param {DOM} element Reference element to show toast message for.
+ * @param {string} message Message to show.
+ * @param {object} [config] Configuration.
+ * @param {string} [config.style=h5p-toast] Style name for the tooltip.
+ * @param {number} [config.duration=3000] Toast message length in ms.
+ * @param {object} [config.position] Relative positioning of the toast.
+ * @param {string} [config.position.horizontal=centered] [before|left|centered|right|after].
+ * @param {string} [config.position.vertical=below] [above|top|centered|bottom|below].
+ * @param {number} [config.position.offsetHorizontal=0] Extra horizontal offset.
+ * @param {number} [config.position.offsetVertical=0] Extra vetical offset.
+ * @param {boolean} [config.position.noOverflowLeft=false] True to prevent overflow left.
+ * @param {boolean} [config.position.noOverflowRight=false] True to prevent overflow right.
+ * @param {boolean} [config.position.noOverflowTop=false] True to prevent overflow top.
+ * @param {boolean} [config.position.noOverflowBottom=false] True to prevent overflow bottom.
+ * @param {boolean} [config.position.noOverflowX=false] True to prevent overflow left and right.
+ * @param {boolean} [config.position.noOverflowY=false] True to prevent overflow top and bottom.
+ * @param {object} [config.position.overflowReference=document.body] DOM reference for overflow.
+ */
+H5P.attachToastTo = function (element, message, config) {
+  if (element === undefined || message === undefined) {
+    return;
+  }
+
+  const eventPath = function (evt) {
+    var path = (evt.composedPath && evt.composedPath()) || evt.path;
+    var target = evt.target;
+
+    if (path != null) {
+      // Safari doesn't include Window, but it should.
+      return (path.indexOf(window) < 0) ? path.concat(window) : path;
+    }
+
+    if (target === window) {
+      return [window];
+    }
+
+    function getParents(node, memo) {
+      memo = memo || [];
+      var parentNode = node.parentNode;
+
+      if (!parentNode) {
+        return memo;
+      }
+      else {
+        return getParents(parentNode, memo.concat(parentNode));
+      }
+    }
+
+    return [target].concat(getParents(target), window);
+  };
+
+  /**
+   * Handle click while toast is showing.
+   */
+  const clickHandler = function (event) {
+    /*
+     * A common use case will be to attach toasts to buttons that are clicked.
+     * The click would remove the toast message instantly without this check.
+     * Children of the clicked element are also ignored.
+     */
+    var path = eventPath(event);
+    if (path.indexOf(element) !== -1) {
+      return;
+    }
+    clearTimeout(timer);
+    removeToast();
+  };
+
+
+
+  /**
+   * Remove the toast message.
+   */
+  const removeToast = function () {
+    document.removeEventListener('click', clickHandler);
+    if (toast.parentNode) {
+      toast.parentNode.removeChild(toast);
+    }
+  };
+
+  /**
+   * Get absolute coordinates for the toast.
+   *
+   * @param {DOM} element Reference element to show toast message for.
+   * @param {DOM} toast Toast element.
+   * @param {object} [position={}] Relative positioning of the toast message.
+   * @param {string} [position.horizontal=centered] [before|left|centered|right|after].
+   * @param {string} [position.vertical=below] [above|top|centered|bottom|below].
+   * @param {number} [position.offsetHorizontal=0] Extra horizontal offset.
+   * @param {number} [position.offsetVertical=0] Extra vetical offset.
+   * @param {boolean} [position.noOverflowLeft=false] True to prevent overflow left.
+   * @param {boolean} [position.noOverflowRight=false] True to prevent overflow right.
+   * @param {boolean} [position.noOverflowTop=false] True to prevent overflow top.
+   * @param {boolean} [position.noOverflowBottom=false] True to prevent overflow bottom.
+   * @param {boolean} [position.noOverflowX=false] True to prevent overflow left and right.
+   * @param {boolean} [position.noOverflowY=false] True to prevent overflow top and bottom.
+   * @return {object}
+   */
+  const getToastCoordinates = function (element, toast, position) {
+    position = position || {};
+    position.offsetHorizontal = position.offsetHorizontal || 0;
+    position.offsetVertical = position.offsetVertical || 0;
+
+    const toastRect = toast.getBoundingClientRect();
+    const elementRect = element.getBoundingClientRect();
+
+    let left = 0;
+    let top = 0;
+
+    // Compute horizontal position
+    switch (position.horizontal) {
+      case 'before':
+        left = elementRect.left - toastRect.width - position.offsetHorizontal;
+        break;
+      case 'after':
+        left = elementRect.left + elementRect.width + position.offsetHorizontal;
+        break;
+      case 'left':
+        left = elementRect.left + position.offsetHorizontal;
+        break;
+      case 'right':
+        left = elementRect.left + elementRect.width - toastRect.width - position.offsetHorizontal;
+        break;
+      case 'centered':
+        left = elementRect.left + elementRect.width / 2 - toastRect.width / 2 + position.offsetHorizontal;
+        break;
+      default:
+        left = elementRect.left + elementRect.width / 2 - toastRect.width / 2 + position.offsetHorizontal;
+    }
+
+    // Compute vertical position
+    switch (position.vertical) {
+      case 'above':
+        top = elementRect.top - toastRect.height - position.offsetVertical;
+        break;
+      case 'below':
+        top = elementRect.top + elementRect.height + position.offsetVertical;
+        break;
+      case 'top':
+        top = elementRect.top + position.offsetVertical;
+        break;
+      case 'bottom':
+        top = elementRect.top + elementRect.height - toastRect.height - position.offsetVertical;
+        break;
+      case 'centered':
+        top = elementRect.top + elementRect.height / 2 - toastRect.height / 2 + position.offsetVertical;
+        break;
+      default:
+        top = elementRect.top + elementRect.height + position.offsetVertical;
+    }
+
+    // Prevent overflow
+    const overflowElement = document.body;
+    const bounds = overflowElement.getBoundingClientRect();
+    if ((position.noOverflowLeft || position.noOverflowX) && (left < bounds.x)) {
+      left = bounds.x;
+    }
+    if ((position.noOverflowRight || position.noOverflowX) && ((left + toastRect.width) > (bounds.x + bounds.width))) {
+      left = bounds.x + bounds.width - toastRect.width;
+    }
+    if ((position.noOverflowTop || position.noOverflowY) && (top < bounds.y)) {
+      top = bounds.y;
+    }
+    if ((position.noOverflowBottom || position.noOverflowY) && ((top + toastRect.height) > (bounds.y + bounds.height))) {
+      left = bounds.y + bounds.height - toastRect.height;
+    }
+
+    return {left: left, top: top};
+  };
+
+  // Sanitization
+  config = config || {};
+  config.style = config.style || 'h5p-toast';
+  config.duration = config.duration || 3000;
+
+  // Build toast
+  const toast = document.createElement('div');
+  toast.setAttribute('id', config.style);
+  toast.classList.add('h5p-toast-disabled');
+  toast.classList.add(config.style);
+
+  const msg = document.createElement('span');
+  msg.innerHTML = message;
+  toast.appendChild(msg);
+
+  document.body.appendChild(toast);
+
+  // The message has to be set before getting the coordinates
+  const coordinates = getToastCoordinates(element, toast, config.position);
+  toast.style.left = Math.round(coordinates.left) + 'px';
+  toast.style.top = Math.round(coordinates.top) + 'px';
+
+  toast.classList.remove('h5p-toast-disabled');
+  const timer = setTimeout(removeToast, config.duration);
+
+  // The toast can also be removed by clicking somewhere
+  document.addEventListener('click', clickHandler);
+};
+
+/**
+ * Copyrights for a H5P Content Library.
+ *
+ * @class
+ */
+H5P.ContentCopyrights = function () {
+  var label;
+  var media = [];
+  var content = [];
+
+  /**
+   * Set label.
+   *
+   * @param {string} newLabel
+   */
+  this.setLabel = function (newLabel) {
+    label = newLabel;
+  };
+
+  /**
+   * Add sub content.
+   *
+   * @param {H5P.MediaCopyright} newMedia
+   */
+  this.addMedia = function (newMedia) {
+    if (newMedia !== undefined) {
+      media.push(newMedia);
+    }
+  };
+
+  /**
+   * Add sub content in front.
+   *
+   * @param {H5P.MediaCopyright} newMedia
+   */
+  this.addMediaInFront = function (newMedia) {
+    if (newMedia !== undefined) {
+      media.unshift(newMedia);
+    }
+  };
+
+  /**
+   * Add sub content.
+   *
+   * @param {H5P.ContentCopyrights} newContent
+   */
+  this.addContent = function (newContent) {
+    if (newContent !== undefined) {
+      content.push(newContent);
+    }
+  };
+
+  /**
+   * Print content copyright.
+   *
+   * @returns {string} HTML.
+   */
+  this.toString = function () {
+    var html = '';
+
+    // Add media rights
+    for (var i = 0; i < media.length; i++) {
+      html += media[i];
+    }
+
+    // Add sub content rights
+    for (i = 0; i < content.length; i++) {
+      html += content[i];
+    }
+
+
+    if (html !== '') {
+      // Add a label to this info
+      if (label !== undefined) {
+        html = '<h3>' + label + '</h3>' + html;
+      }
+
+      // Add wrapper
+      html = '<div class="h5p-content-copyrights">' + html + '</div>';
+    }
+
+    return html;
+  };
+};
+
+/**
+ * A ordered list of copyright fields for media.
+ *
+ * @class
+ * @param {Object} copyright
+ *   Copyright information fields.
+ * @param {Object} [labels]
+ *   Translation of labels.
+ * @param {Array} [order]
+ *   Order of the fields.
+ * @param {Object} [extraFields]
+ *   Add extra copyright fields.
+ */
+H5P.MediaCopyright = function (copyright, labels, order, extraFields) {
+  var thumbnail;
+  var list = new H5P.DefinitionList();
+
+  /**
+   * Get translated label for field.
+   *
+   * @private
+   * @param {string} fieldName
+   * @returns {string}
+   */
+  var getLabel = function (fieldName) {
+    if (labels === undefined || labels[fieldName] === undefined) {
+      return H5P.t(fieldName);
+    }
+
+    return labels[fieldName];
+  };
+
+  /**
+   * Get humanized value for the license field.
+   *
+   * @private
+   * @param {string} license
+   * @param {string} [version]
+   * @returns {string}
+   */
+  var humanizeLicense = function (license, version) {
+    var copyrightLicense = H5P.copyrightLicenses[license];
+
+    // Build license string
+    var value = '';
+    if (!(license === 'PD' && version)) {
+      // Add license label
+      value += (copyrightLicense.hasOwnProperty('label') ? copyrightLicense.label : copyrightLicense);
+    }
+
+    // Check for version info
+    var versionInfo;
+    if (copyrightLicense.versions) {
+      if (copyrightLicense.versions.default && (!version || !copyrightLicense.versions[version])) {
+        version = copyrightLicense.versions.default;
+      }
+      if (version && copyrightLicense.versions[version]) {
+        versionInfo = copyrightLicense.versions[version];
+      }
+    }
+
+    if (versionInfo) {
+      // Add license version
+      if (value) {
+        value += ' ';
+      }
+      value += (versionInfo.hasOwnProperty('label') ? versionInfo.label : versionInfo);
+    }
+
+    // Add link if specified
+    var link;
+    if (copyrightLicense.hasOwnProperty('link')) {
+      link = copyrightLicense.link.replace(':version', copyrightLicense.linkVersions ? copyrightLicense.linkVersions[version] : version);
+    }
+    else if (versionInfo && copyrightLicense.hasOwnProperty('link')) {
+      link = versionInfo.link;
+    }
+    if (link) {
+      value = '<a href="' + link + '" target="_blank">' + value + '</a>';
+    }
+
+    // Generate parenthesis
+    var parenthesis = '';
+    if (license !== 'PD' && license !== 'C') {
+      parenthesis += license;
+    }
+    if (version && version !== 'CC0 1.0') {
+      if (parenthesis && license !== 'GNU GPL') {
+        parenthesis += ' ';
+      }
+      parenthesis += version;
+    }
+    if (parenthesis) {
+      value += ' (' + parenthesis + ')';
+    }
+    if (license === 'C') {
+      value += ' &copy;';
+    }
+
+    return value;
+  };
+
+  if (copyright !== undefined) {
+    // Add the extra fields
+    for (var field in extraFields) {
+      if (extraFields.hasOwnProperty(field)) {
+        copyright[field] = extraFields[field];
+      }
+    }
+
+    if (order === undefined) {
+      // Set default order
+      order = ['contentType', 'title', 'license', 'author', 'year', 'source', 'licenseExtras', 'changes'];
+    }
+
+    for (var i = 0; i < order.length; i++) {
+      var fieldName = order[i];
+      if (copyright[fieldName] !== undefined && copyright[fieldName] !== '') {
+        var humanValue = copyright[fieldName];
+        if (fieldName === 'license') {
+          humanValue = humanizeLicense(copyright.license, copyright.version);
+        }
+        if (fieldName === 'source') {
+          humanValue = (humanValue) ? '<a href="' + humanValue + '" target="_blank">' + humanValue + '</a>' : undefined;
+        }
+        list.add(new H5P.Field(getLabel(fieldName), humanValue));
+      }
+    }
+  }
+
+  /**
+   * Set thumbnail.
+   *
+   * @param {H5P.Thumbnail} newThumbnail
+   */
+  this.setThumbnail = function (newThumbnail) {
+    thumbnail = newThumbnail;
+  };
+
+  /**
+   * Checks if this copyright is undisclosed.
+   * I.e. only has the license attribute set, and it's undisclosed.
+   *
+   * @returns {boolean}
+   */
+  this.undisclosed = function () {
+    if (list.size() === 1) {
+      var field = list.get(0);
+      if (field.getLabel() === getLabel('license') && field.getValue() === humanizeLicense('U')) {
+        return true;
+      }
+    }
+    return false;
+  };
+
+  /**
+   * Print media copyright.
+   *
+   * @returns {string} HTML.
+   */
+  this.toString = function () {
+    var html = '';
+
+    if (this.undisclosed()) {
+      return html; // No need to print a copyright with a single undisclosed license.
+    }
+
+    if (thumbnail !== undefined) {
+      html += thumbnail;
+    }
+    html += list;
+
+    if (html !== '') {
+      html = '<div class="h5p-media-copyright">' + html + '</div>';
+    }
+
+    return html;
+  };
+};
+
+/**
+ * A simple and elegant class for creating thumbnails of images.
+ *
+ * @class
+ * @param {string} source
+ * @param {number} width
+ * @param {number} height
+ */
+H5P.Thumbnail = function (source, width, height) {
+  var thumbWidth, thumbHeight = 100;
+  if (width !== undefined) {
+    thumbWidth = Math.round(thumbHeight * (width / height));
+  }
+
+  /**
+   * Print thumbnail.
+   *
+   * @returns {string} HTML.
+   */
+  this.toString = function () {
+    return '<img src="' + source + '" alt="' + H5P.t('thumbnail') + '" class="h5p-thumbnail" height="' + thumbHeight + '"' + (thumbWidth === undefined ? '' : ' width="' + thumbWidth + '"') + '/>';
+  };
+};
+
+/**
+ * Simple data structure class for storing a single field.
+ *
+ * @class
+ * @param {string} label
+ * @param {string} value
+ */
+H5P.Field = function (label, value) {
+  /**
+   * Public. Get field label.
+   *
+   * @returns {String}
+   */
+  this.getLabel = function () {
+    return label;
+  };
+
+  /**
+   * Public. Get field value.
+   *
+   * @returns {String}
+   */
+  this.getValue = function () {
+    return value;
+  };
+};
+
+/**
+ * Simple class for creating a definition list.
+ *
+ * @class
+ */
+H5P.DefinitionList = function () {
+  var fields = [];
+
+  /**
+   * Add field to list.
+   *
+   * @param {H5P.Field} field
+   */
+  this.add = function (field) {
+    fields.push(field);
+  };
+
+  /**
+   * Get Number of fields.
+   *
+   * @returns {number}
+   */
+  this.size = function () {
+    return fields.length;
+  };
+
+  /**
+   * Get field at given index.
+   *
+   * @param {number} index
+   * @returns {H5P.Field}
+   */
+  this.get = function (index) {
+    return fields[index];
+  };
+
+  /**
+   * Print definition list.
+   *
+   * @returns {string} HTML.
+   */
+  this.toString = function () {
+    var html = '';
+    for (var i = 0; i < fields.length; i++) {
+      var field = fields[i];
+      html += '<dt>' + field.getLabel() + '</dt><dd>' + field.getValue() + '</dd>';
+    }
+    return (html === '' ? html : '<dl class="h5p-definition-list">' + html + '</dl>');
+  };
+};
+
+/**
+ * THIS FUNCTION/CLASS IS DEPRECATED AND WILL BE REMOVED.
+ *
+ * Helper object for keeping coordinates in the same format all over.
+ *
+ * @deprecated
+ *   Will be removed march 2016.
+ * @class
+ * @param {number} x
+ * @param {number} y
+ * @param {number} w
+ * @param {number} h
+ */
+H5P.Coords = function (x, y, w, h) {
+  if ( !(this instanceof H5P.Coords) )
+    return new H5P.Coords(x, y, w, h);
+
+  /** @member {number} */
+  this.x = 0;
+  /** @member {number} */
+  this.y = 0;
+  /** @member {number} */
+  this.w = 1;
+  /** @member {number} */
+  this.h = 1;
+
+  if (typeof(x) === 'object') {
+    this.x = x.x;
+    this.y = x.y;
+    this.w = x.w;
+    this.h = x.h;
+  }
+  else {
+    if (x !== undefined) {
+      this.x = x;
+    }
+    if (y !== undefined) {
+      this.y = y;
+    }
+    if (w !== undefined) {
+      this.w = w;
+    }
+    if (h !== undefined) {
+      this.h = h;
+    }
+  }
+  return this;
+};
+
+/**
+ * Parse library string into values.
+ *
+ * @param {string} library
+ *   library in the format "machineName majorVersion.minorVersion"
+ * @returns {Object}
+ *   library as an object with machineName, majorVersion and minorVersion properties
+ *   return false if the library parameter is invalid
+ */
+H5P.libraryFromString = function (library) {
+  var regExp = /(.+)\s(\d+)\.(\d+)$/g;
+  var res = regExp.exec(library);
+  if (res !== null) {
+    return {
+      'machineName': res[1],
+      'majorVersion': parseInt(res[2]),
+      'minorVersion': parseInt(res[3])
+    };
+  }
+  else {
+    return false;
+  }
+};
+
+/**
+ * Get the path to the library
+ *
+ * @param {string} library
+ *   The library identifier in the format "machineName-majorVersion.minorVersion".
+ * @returns {string}
+ *   The full path to the library.
+ */
+H5P.getLibraryPath = function (library) {
+  if (H5PIntegration.urlLibraries !== undefined) {
+    // This is an override for those implementations that has a different libraries URL, e.g. Moodle
+    return H5PIntegration.urlLibraries + '/' + library;
+  }
+  else {
+    return H5PIntegration.url + '/libraries/' + library;
+  }
+};
+
+/**
+ * Recursivly clone the given object.
+ *
+ * @param {Object|Array} object
+ *   Object to clone.
+ * @param {boolean} [recursive]
+ * @returns {Object|Array}
+ *   A clone of object.
+ */
+H5P.cloneObject = function (object, recursive) {
+  // TODO: Consider if this needs to be in core. Doesn't $.extend do the same?
+  var clone = object instanceof Array ? [] : {};
+
+  for (var i in object) {
+    if (object.hasOwnProperty(i)) {
+      if (recursive !== undefined && recursive && typeof object[i] === 'object') {
+        clone[i] = H5P.cloneObject(object[i], recursive);
+      }
+      else {
+        clone[i] = object[i];
+      }
+    }
+  }
+
+  return clone;
+};
+
+/**
+ * Remove all empty spaces before and after the value.
+ *
+ * @param {string} value
+ * @returns {string}
+ */
+H5P.trim = function (value) {
+  return value.replace(/^\s+|\s+$/g, '');
+
+  // TODO: Only include this or String.trim(). What is best?
+  // I'm leaning towards implementing the missing ones: http://kangax.github.io/compat-table/es5/
+  // So should we make this function deprecated?
+};
+
+/**
+ * Check if JavaScript path/key is loaded.
+ *
+ * @param {string} path
+ * @returns {boolean}
+ */
+H5P.jsLoaded = function (path) {
+  H5PIntegration.loadedJs = H5PIntegration.loadedJs || [];
+  return H5P.jQuery.inArray(path, H5PIntegration.loadedJs) !== -1;
+};
+
+/**
+ * Check if styles path/key is loaded.
+ *
+ * @param {string} path
+ * @returns {boolean}
+ */
+H5P.cssLoaded = function (path) {
+  H5PIntegration.loadedCss = H5PIntegration.loadedCss || [];
+  return H5P.jQuery.inArray(path, H5PIntegration.loadedCss) !== -1;
+};
+
+/**
+ * Shuffle an array in place.
+ *
+ * @param {Array} array
+ *   Array to shuffle
+ * @returns {Array}
+ *   The passed array is returned for chaining.
+ */
+H5P.shuffleArray = function (array) {
+  // TODO: Consider if this should be a part of core. I'm guessing very few libraries are going to use it.
+  if (!(array instanceof Array)) {
+    return;
+  }
+
+  var i = array.length, j, tempi, tempj;
+  if ( i === 0 ) return false;
+  while ( --i ) {
+    j       = Math.floor( Math.random() * ( i + 1 ) );
+    tempi   = array[i];
+    tempj   = array[j];
+    array[i] = tempj;
+    array[j] = tempi;
+  }
+  return array;
+};
+
+/**
+ * Post finished results for user.
+ *
+ * @deprecated
+ *   Do not use this function directly, trigger the finish event instead.
+ *   Will be removed march 2016
+ * @param {number} contentId
+ *   Identifies the content
+ * @param {number} score
+ *   Achieved score/points
+ * @param {number} maxScore
+ *   The maximum score/points that can be achieved
+ * @param {number} [time]
+ *   Reported time consumption/usage
+ */
+H5P.setFinished = function (contentId, score, maxScore, time) {
+  var validScore = typeof score === 'number' || score instanceof Number;
+  if (validScore && H5PIntegration.postUserStatistics === true) {
+    /**
+     * Return unix timestamp for the given JS Date.
+     *
+     * @private
+     * @param {Date} date
+     * @returns {Number}
+     */
+    var toUnix = function (date) {
+      return Math.round(date.getTime() / 1000);
+    };
+
+    // Post the results
+    const data = {
+      contentId: contentId,
+      score: score,
+      maxScore: maxScore,
+      opened: toUnix(H5P.opened[contentId]),
+      finished: toUnix(new Date()),
+      time: time
+    };
+    H5P.jQuery.post(H5PIntegration.ajax.setFinished, data)
+      .fail(function () {
+        H5P.offlineRequestQueue.add(H5PIntegration.ajax.setFinished, data);
+      });
+  }
+};
+
+// Add indexOf to browsers that lack them. (IEs)
+if (!Array.prototype.indexOf) {
+  Array.prototype.indexOf = function (needle) {
+    for (var i = 0; i < this.length; i++) {
+      if (this[i] === needle) {
+        return i;
+      }
+    }
+    return -1;
+  };
+}
+
+// Need to define trim() since this is not available on older IEs,
+// and trim is used in several libs
+if (String.prototype.trim === undefined) {
+  String.prototype.trim = function () {
+    return H5P.trim(this);
+  };
+}
+
+/**
+ * Trigger an event on an instance
+ *
+ * Helper function that triggers an event if the instance supports event handling
+ *
+ * @param {Object} instance
+ *   Instance of H5P content
+ * @param {string} eventType
+ *   Type of event to trigger
+ * @param {*} data
+ * @param {Object} extras
+ */
+H5P.trigger = function (instance, eventType, data, extras) {
+  // Try new event system first
+  if (instance.trigger !== undefined) {
+    instance.trigger(eventType, data, extras);
+  }
+  // Try deprecated event system
+  else if (instance.$ !== undefined && instance.$.trigger !== undefined) {
+    instance.$.trigger(eventType);
+  }
+};
+
+/**
+ * Register an event handler
+ *
+ * Helper function that registers an event handler for an event type if
+ * the instance supports event handling
+ *
+ * @param {Object} instance
+ *   Instance of H5P content
+ * @param {string} eventType
+ *   Type of event to listen for
+ * @param {H5P.EventCallback} handler
+ *   Callback that gets triggered for events of the specified type
+ */
+H5P.on = function (instance, eventType, handler) {
+  // Try new event system first
+  if (instance.on !== undefined) {
+    instance.on(eventType, handler);
+  }
+  // Try deprecated event system
+  else if (instance.$ !== undefined && instance.$.on !== undefined) {
+    instance.$.on(eventType, handler);
+  }
+};
+
+/**
+ * Generate random UUID
+ *
+ * @returns {string} UUID
+ */
+H5P.createUUID = function () {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (char) {
+    var random = Math.random()*16|0, newChar = char === 'x' ? random : (random&0x3|0x8);
+    return newChar.toString(16);
+  });
+};
+
+/**
+ * Create title
+ *
+ * @param {string} rawTitle
+ * @param {number} maxLength
+ * @returns {string}
+ */
+H5P.createTitle = function (rawTitle, maxLength) {
+  if (!rawTitle) {
+    return '';
+  }
+  if (maxLength === undefined) {
+    maxLength = 60;
+  }
+  var title = H5P.jQuery('<div></div>')
+    .text(
+      // Strip tags
+      rawTitle.replace(/(<([^>]+)>)/ig,"")
+    // Escape
+    ).text();
+  if (title.length > maxLength) {
+    title = title.substr(0, maxLength - 3) + '...';
+  }
+  return title;
+};
+
+// Wrap in privates
+(function ($) {
+
+  /**
+   * Creates ajax requests for inserting, updateing and deleteing
+   * content user data.
+   *
+   * @private
+   * @param {number} contentId What content to store the data for.
+   * @param {string} dataType Identifies the set of data for this content.
+   * @param {string} subContentId Identifies sub content
+   * @param {function} [done] Callback when ajax is done.
+   * @param {object} [data] To be stored for future use.
+   * @param {boolean} [preload=false] Data is loaded when content is loaded.
+   * @param {boolean} [invalidate=false] Data is invalidated when content changes.
+   * @param {boolean} [async=true]
+   */
+  function contentUserDataAjax(contentId, dataType, subContentId, done, data, preload, invalidate, async) {
+    if (H5PIntegration.user === undefined) {
+      // Not logged in, no use in saving.
+      done('Not signed in.');
+      return;
+    }
+
+    var options = {
+      url: H5PIntegration.ajax.contentUserData.replace(':contentId', contentId).replace(':dataType', dataType).replace(':subContentId', subContentId ? subContentId : 0),
+      dataType: 'json',
+      async: async === undefined ? true : async
+    };
+    if (data !== undefined) {
+      options.type = 'POST';
+      options.data = {
+        data: (data === null ? 0 : data),
+        preload: (preload ? 1 : 0),
+        invalidate: (invalidate ? 1 : 0)
+      };
+    }
+    else {
+      options.type = 'GET';
+    }
+    if (done !== undefined) {
+      options.error = function (xhr, error) {
+        done(error);
+      };
+      options.success = function (response) {
+        if (!response.success) {
+          done(response.message);
+          return;
+        }
+
+        if (response.data === false || response.data === undefined) {
+          done();
+          return;
+        }
+
+        done(undefined, response.data);
+      };
+    }
+
+    $.ajax(options);
+  }
+
+  /**
+   * Get user data for given content.
+   *
+   * @param {number} contentId
+   *   What content to get data for.
+   * @param {string} dataId
+   *   Identifies the set of data for this content.
+   * @param {function} done
+   *   Callback with error and data parameters.
+   * @param {string} [subContentId]
+   *   Identifies which data belongs to sub content.
+   */
+  H5P.getUserData = function (contentId, dataId, done, subContentId) {
+    if (!subContentId) {
+      subContentId = 0; // Default
+    }
+
+    H5PIntegration.contents = H5PIntegration.contents || {};
+    var content = H5PIntegration.contents['cid-' + contentId] || {};
+    var preloadedData = content.contentUserData;
+    if (preloadedData && preloadedData[subContentId] && preloadedData[subContentId][dataId] !== undefined) {
+      if (preloadedData[subContentId][dataId] === 'RESET') {
+        done(undefined, null);
+        return;
+      }
+      try {
+        done(undefined, JSON.parse(preloadedData[subContentId][dataId]));
+      }
+      catch (err) {
+        done(err);
+      }
+    }
+    else {
+      contentUserDataAjax(contentId, dataId, subContentId, function (err, data) {
+        if (err || data === undefined) {
+          done(err, data);
+          return; // Error or no data
+        }
+
+        // Cache in preloaded
+        if (content.contentUserData === undefined) {
+          content.contentUserData = preloadedData = {};
+        }
+        if (preloadedData[subContentId] === undefined) {
+          preloadedData[subContentId] = {};
+        }
+        preloadedData[subContentId][dataId] = data;
+
+        // Done. Try to decode JSON
+        try {
+          done(undefined, JSON.parse(data));
+        }
+        catch (e) {
+          done(e);
+        }
+      });
+    }
+  };
+
+  /**
+   * Async error handling.
+   *
+   * @callback H5P.ErrorCallback
+   * @param {*} error
+   */
+
+  /**
+   * Set user data for given content.
+   *
+   * @param {number} contentId
+   *   What content to get data for.
+   * @param {string} dataId
+   *   Identifies the set of data for this content.
+   * @param {Object} data
+   *   The data that is to be stored.
+   * @param {Object} [extras]
+   *   Extra properties
+   * @param {string} [extras.subContentId]
+   *   Identifies which data belongs to sub content.
+   * @param {boolean} [extras.preloaded=true]
+   *   If the data should be loaded when content is loaded.
+   * @param {boolean} [extras.deleteOnChange=false]
+   *   If the data should be invalidated when the content changes.
+   * @param {H5P.ErrorCallback} [extras.errorCallback]
+   *   Callback with error as parameters.
+   * @param {boolean} [extras.async=true]
+   */
+  H5P.setUserData = function (contentId, dataId, data, extras) {
+    var options = H5P.jQuery.extend(true, {}, {
+      subContentId: 0,
+      preloaded: true,
+      deleteOnChange: false,
+      async: true
+    }, extras);
+
+    try {
+      data = JSON.stringify(data);
+    }
+    catch (err) {
+      if (options.errorCallback) {
+        options.errorCallback(err);
+      }
+      return; // Failed to serialize.
+    }
+
+    var content = H5PIntegration.contents['cid-' + contentId];
+    if (content === undefined) {
+      content = H5PIntegration.contents['cid-' + contentId] = {};
+    }
+    if (!content.contentUserData) {
+      content.contentUserData = {};
+    }
+    var preloadedData = content.contentUserData;
+    if (preloadedData[options.subContentId] === undefined) {
+      preloadedData[options.subContentId] = {};
+    }
+    if (data === preloadedData[options.subContentId][dataId]) {
+      return; // No need to save this twice.
+    }
+
+    preloadedData[options.subContentId][dataId] = data;
+    contentUserDataAjax(contentId, dataId, options.subContentId, function (error) {
+      if (options.errorCallback && error) {
+        options.errorCallback(error);
+      }
+    }, data, options.preloaded, options.deleteOnChange, options.async);
+  };
+
+  /**
+   * Delete user data for given content.
+   *
+   * @param {number} contentId
+   *   What content to remove data for.
+   * @param {string} dataId
+   *   Identifies the set of data for this content.
+   * @param {string} [subContentId]
+   *   Identifies which data belongs to sub content.
+   */
+  H5P.deleteUserData = function (contentId, dataId, subContentId) {
+    if (!subContentId) {
+      subContentId = 0; // Default
+    }
+
+    // Remove from preloaded/cache
+    var preloadedData = H5PIntegration.contents['cid-' + contentId].contentUserData;
+    if (preloadedData && preloadedData[subContentId] && preloadedData[subContentId][dataId]) {
+      delete preloadedData[subContentId][dataId];
+    }
+
+    contentUserDataAjax(contentId, dataId, subContentId, undefined, null);
+  };
+
+  /**
+   * Function for getting content for a certain ID
+   *
+   * @param {number} contentId
+   * @return {Object}
+   */
+  H5P.getContentForInstance = function (contentId) {
+    var key = 'cid-' + contentId;
+    var exists = H5PIntegration && H5PIntegration.contents &&
+                 H5PIntegration.contents[key];
+
+    return exists ? H5PIntegration.contents[key] : undefined;
+  };
+
+  /**
+   * Prepares the content parameters for storing in the clipboard.
+   *
+   * @class
+   * @param {Object} parameters The parameters for the content to store
+   * @param {string} [genericProperty] If only part of the parameters are generic, which part
+   * @param {string} [specificKey] If the parameters are specific, what content type does it fit
+   * @returns {Object} Ready for the clipboard
+   */
+  H5P.ClipboardItem = function (parameters, genericProperty, specificKey) {
+    var self = this;
+
+    /**
+     * Set relative dimensions when params contains a file with a width and a height.
+     * Very useful to be compatible with wysiwyg editors.
+     *
+     * @private
+     */
+    var setDimensionsFromFile = function () {
+      if (!self.generic) {
+        return;
+      }
+      var params = self.specific[self.generic];
+      if (!params.params.file || !params.params.file.width || !params.params.file.height) {
+        return;
+      }
+
+      self.width = 20; // %
+      self.height = (params.params.file.height / params.params.file.width) * self.width;
+    };
+
+    if (!genericProperty) {
+      genericProperty = 'action';
+      parameters = {
+        action: parameters
+      };
+    }
+
+    self.specific = parameters;
+
+    if (genericProperty && parameters[genericProperty]) {
+      self.generic = genericProperty;
+    }
+    if (specificKey) {
+      self.from = specificKey;
+    }
+
+    if (window.H5PEditor && H5PEditor.contentId) {
+      self.contentId = H5PEditor.contentId;
+    }
+
+    if (!self.specific.width && !self.specific.height) {
+      setDimensionsFromFile();
+    }
+  };
+
+  /**
+   * Store item in the H5P Clipboard.
+   *
+   * @param {H5P.ClipboardItem|*} clipboardItem
+   */
+  H5P.clipboardify = function (clipboardItem) {
+    if (!(clipboardItem instanceof H5P.ClipboardItem)) {
+      clipboardItem = new H5P.ClipboardItem(clipboardItem);
+    }
+    H5P.setClipboard(clipboardItem);
+  };
+
+  /**
+   * Retrieve parsed clipboard data.
+   *
+   * @return {Object}
+   */
+  H5P.getClipboard = function () {
+    return parseClipboard();
+  };
+
+  /**
+   * Set item in the H5P Clipboard.
+   *
+   * @param {H5P.ClipboardItem|object} clipboardItem - Data to be set.
+   */
+  H5P.setClipboard = function (clipboardItem) {
+    localStorage.setItem('h5pClipboard', JSON.stringify(clipboardItem));
+
+    // Trigger an event so all 'Paste' buttons may be enabled.
+    H5P.externalDispatcher.trigger('datainclipboard', {reset: false});
+  };
+
+  /**
+   * Get config for a library
+   *
+   * @param string machineName
+   * @return Object
+   */
+  H5P.getLibraryConfig = function (machineName) {
+    var hasConfig = H5PIntegration.libraryConfig && H5PIntegration.libraryConfig[machineName];
+    return hasConfig ? H5PIntegration.libraryConfig[machineName] : {};
+  };
+
+  /**
+   * Get item from the H5P Clipboard.
+   *
+   * @private
+   * @return {Object}
+   */
+  var parseClipboard = function () {
+    var clipboardData = localStorage.getItem('h5pClipboard');
+    if (!clipboardData) {
+      return;
+    }
+
+    // Try to parse clipboard dat
+    try {
+      clipboardData = JSON.parse(clipboardData);
+    }
+    catch (err) {
+      console.error('Unable to parse JSON from clipboard.', err);
+      return;
+    }
+
+    // Update file URLs and reset content Ids
+    recursiveUpdate(clipboardData.specific, function (path) {
+      var isTmpFile = (path.substr(-4, 4) === '#tmp');
+      if (!isTmpFile && clipboardData.contentId && !path.match(/^https?:\/\//i)) {
+        // Comes from existing content
+
+        if (H5PEditor.contentId) {
+          // .. to existing content
+          return '../' + clipboardData.contentId + '/' + path;
+        }
+        else {
+          // .. to new content
+          return (H5PEditor.contentRelUrl ? H5PEditor.contentRelUrl : '../content/') + clipboardData.contentId + '/' + path;
+        }
+      }
+      return path; // Will automatically be looked for in tmp folder
+    });
+
+
+    if (clipboardData.generic) {
+      // Use reference instead of key
+      clipboardData.generic = clipboardData.specific[clipboardData.generic];
+    }
+
+    return clipboardData;
+  };
+
+  /**
+   * Update file URLs and reset content IDs.
+   * Useful when copying content.
+   *
+   * @private
+   * @param {object} params Reference
+   * @param {function} handler Modifies the path to work when pasted
+   */
+  var recursiveUpdate = function (params, handler) {
+    for (var prop in params) {
+      if (params.hasOwnProperty(prop) && params[prop] instanceof Object) {
+        var obj = params[prop];
+        if (obj.path !== undefined && obj.mime !== undefined) {
+          obj.path = handler(obj.path);
+        }
+        else {
+          if (obj.library !== undefined && obj.subContentId !== undefined) {
+            // Avoid multiple content with same ID
+            delete obj.subContentId;
+          }
+          recursiveUpdate(obj, handler);
+        }
+      }
+    }
+  };
+
+  // Init H5P when page is fully loadded
+  $(document).ready(function () {
+
+    window.addEventListener('storage', function (event) {
+      // Pick up clipboard changes from other tabs
+      if (event.key === 'h5pClipboard') {
+        // Trigger an event so all 'Paste' buttons may be enabled.
+        H5P.externalDispatcher.trigger('datainclipboard', {reset: event.newValue === null});
+      }
+    });
+
+    var ccVersions = {
+      'default': '4.0',
+      '4.0': H5P.t('licenseCC40'),
+      '3.0': H5P.t('licenseCC30'),
+      '2.5': H5P.t('licenseCC25'),
+      '2.0': H5P.t('licenseCC20'),
+      '1.0': H5P.t('licenseCC10'),
+    };
+
+    /**
+     * Maps copyright license codes to their human readable counterpart.
+     *
+     * @type {Object}
+     */
+    H5P.copyrightLicenses = {
+      'U': H5P.t('licenseU'),
+      'CC BY': {
+        label: H5P.t('licenseCCBY'),
+        link: 'http://creativecommons.org/licenses/by/:version',
+        versions: ccVersions
+      },
+      'CC BY-SA': {
+        label: H5P.t('licenseCCBYSA'),
+        link: 'http://creativecommons.org/licenses/by-sa/:version',
+        versions: ccVersions
+      },
+      'CC BY-ND': {
+        label: H5P.t('licenseCCBYND'),
+        link: 'http://creativecommons.org/licenses/by-nd/:version',
+        versions: ccVersions
+      },
+      'CC BY-NC': {
+        label: H5P.t('licenseCCBYNC'),
+        link: 'http://creativecommons.org/licenses/by-nc/:version',
+        versions: ccVersions
+      },
+      'CC BY-NC-SA': {
+        label: H5P.t('licenseCCBYNCSA'),
+        link: 'http://creativecommons.org/licenses/by-nc-sa/:version',
+        versions: ccVersions
+      },
+      'CC BY-NC-ND': {
+        label: H5P.t('licenseCCBYNCND'),
+        link: 'http://creativecommons.org/licenses/by-nc-nd/:version',
+        versions: ccVersions
+      },
+      'CC0 1.0': {
+        label: H5P.t('licenseCC010'),
+        link: 'https://creativecommons.org/publicdomain/zero/1.0/'
+      },
+      'GNU GPL': {
+        label: H5P.t('licenseGPL'),
+        link: 'http://www.gnu.org/licenses/gpl-:version-standalone.html',
+        linkVersions: {
+          'v3': '3.0',
+          'v2': '2.0',
+          'v1': '1.0'
+        },
+        versions: {
+          'default': 'v3',
+          'v3': H5P.t('licenseV3'),
+          'v2': H5P.t('licenseV2'),
+          'v1': H5P.t('licenseV1')
+        }
+      },
+      'PD': {
+        label: H5P.t('licensePD'),
+        versions: {
+          'CC0 1.0': {
+            label: H5P.t('licenseCC010'),
+            link: 'https://creativecommons.org/publicdomain/zero/1.0/'
+          },
+          'CC PDM': {
+            label: H5P.t('licensePDM'),
+            link: 'https://creativecommons.org/publicdomain/mark/1.0/'
+          }
+        }
+      },
+      'ODC PDDL': '<a href="http://opendatacommons.org/licenses/pddl/1.0/" target="_blank">Public Domain Dedication and Licence</a>',
+      'CC PDM': {
+        label: H5P.t('licensePDM'),
+        link: 'https://creativecommons.org/publicdomain/mark/1.0/'
+      },
+      'C': H5P.t('licenseC'),
+    };
+
+    /**
+     * Indicates if H5P is embedded on an external page using iframe.
+     * @member {boolean} H5P.externalEmbed
+     */
+
+    // Relay events to top window. This must be done before H5P.init
+    // since events may be fired on initialization.
+    if (H5P.isFramed && H5P.externalEmbed === false) {
+      H5P.externalDispatcher.on('*', function (event) {
+        window.parent.H5P.externalDispatcher.trigger.call(this, event);
+      });
+    }
+
+    /**
+     * Prevent H5P Core from initializing. Must be overriden before document ready.
+     * @member {boolean} H5P.preventInit
+     */
+    if (!H5P.preventInit) {
+      // Note that this start script has to be an external resource for it to
+      // load in correct order in IE9.
+      H5P.init(document.body);
+    }
+
+    if (H5PIntegration.saveFreq !== false) {
+      // When was the last state stored
+      var lastStoredOn = 0;
+      // Store the current state of the H5P when leaving the page.
+      var storeCurrentState = function () {
+        // Make sure at least 250 ms has passed since last save
+        var currentTime = new Date().getTime();
+        if (currentTime - lastStoredOn > 250) {
+          lastStoredOn = currentTime;
+          for (var i = 0; i < H5P.instances.length; i++) {
+            var instance = H5P.instances[i];
+            if (instance.getCurrentState instanceof Function ||
+                typeof instance.getCurrentState === 'function') {
+              var state = instance.getCurrentState();
+              if (state !== undefined) {
+                // Async is not used to prevent the request from being cancelled.
+                H5P.setUserData(instance.contentId, 'state', state, {deleteOnChange: true, async: false});
+              }
+            }
+          }
+        }
+      };
+      // iPad does not support beforeunload, therefore using unload
+      H5P.$window.one('beforeunload unload', function () {
+        // Only want to do this once
+        H5P.$window.off('pagehide beforeunload unload');
+        storeCurrentState();
+      });
+      // pagehide is used on iPad when tabs are switched
+      H5P.$window.on('pagehide', storeCurrentState);
+    }
+  });
+
+})(H5P.jQuery);
diff --git a/src/core/h5p/assets/js/jquery.js b/src/core/h5p/assets/js/jquery.js
new file mode 100644
index 000000000..a05d5568b
--- /dev/null
+++ b/src/core/h5p/assets/js/jquery.js
@@ -0,0 +1,20 @@
+/*! jQuery v1.9.1 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license
+*/(function(e,t){var n,r,i=typeof t,o=e.document,a=e.location,s=e.jQuery,u=e.$,l={},c=[],p="1.9.1",f=c.concat,d=c.push,h=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,b=function(e,t){return new b.fn.init(e,t,r)},x=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^[\],:{}\s]*$/,E=/(?:^|:|,)(?:\s*\[)+/g,S=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,j=/^-ms-/,D=/-([\da-z])/gi,L=function(e,t){return t.toUpperCase()},H=function(e){(o.addEventListener||"load"===e.type||"complete"===o.readyState)&&(q(),b.ready())},q=function(){o.addEventListener?(o.removeEventListener("DOMContentLoaded",H,!1),e.removeEventListener("load",H,!1)):(o.detachEvent("onreadystatechange",H),e.detachEvent("onload",H))};b.fn=b.prototype={jquery:p,constructor:b,init:function(e,n,r){var i,a;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof b?n[0]:n,b.merge(this,b.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,!0)),C.test(i[1])&&b.isPlainObject(n))for(i in n)b.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(a=o.getElementById(i[2]),a&&a.parentNode){if(a.id!==i[2])return r.find(e);this.length=1,this[0]=a}return this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):b.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),b.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return h.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=b.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return b.each(this,e,t)},ready:function(e){return b.ready.promise().done(e),this},slice:function(){return this.pushStack(h.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(b.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:d,sort:[].sort,splice:[].splice},b.fn.init.prototype=b.fn,b.extend=b.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||b.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(o=arguments[u]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(b.isPlainObject(r)||(n=b.isArray(r)))?(n?(n=!1,a=e&&b.isArray(e)?e:[]):a=e&&b.isPlainObject(e)?e:{},s[i]=b.extend(c,a,r)):r!==t&&(s[i]=r));return s},b.extend({noConflict:function(t){return e.$===b&&(e.$=u),t&&e.jQuery===b&&(e.jQuery=s),b},isReady:!1,readyWait:1,holdReady:function(e){e?b.readyWait++:b.ready(!0)},ready:function(e){if(e===!0?!--b.readyWait:!b.isReady){if(!o.body)return setTimeout(b.ready);b.isReady=!0,e!==!0&&--b.readyWait>0||(n.resolveWith(o,[b]),b.fn.trigger&&b(o).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===b.type(e)},isArray:Array.isArray||function(e){return"array"===b.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==b.type(e)||e.nodeType||b.isWindow(e))return!1;try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||y.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=b.buildFragment([e],t,i),i&&b(i).remove(),b.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=b.trim(n),n&&k.test(n.replace(S,"@").replace(A,"]").replace(E,"")))?Function("return "+n)():(b.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||b.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&b.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(j,"ms-").replace(D,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:v&&!v.call("\ufeff\u00a0")?function(e){return null==e?"":v.call(e)}:function(e){return null==e?"":(e+"").replace(T,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?b.merge(n,"string"==typeof e?[e]:e):d.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(g)return g.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return f.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),b.isFunction(e)?(r=h.call(arguments,2),i=function(){return e.apply(n||this,r.concat(h.call(arguments)))},i.guid=e.guid=e.guid||b.guid++,i):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===b.type(r)){o=!0;for(u in r)b.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,b.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(b(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),b.ready.promise=function(t){if(!n)if(n=b.Deferred(),"complete"===o.readyState)setTimeout(b.ready);else if(o.addEventListener)o.addEventListener("DOMContentLoaded",H,!1),e.addEventListener("load",H,!1);else{o.attachEvent("onreadystatechange",H),e.attachEvent("onload",H);var r=!1;try{r=null==e.frameElement&&o.documentElement}catch(i){}r&&r.doScroll&&function a(){if(!b.isReady){try{r.doScroll("left")}catch(e){return setTimeout(a,50)}q(),b.ready()}}()}return n.promise(t)},b.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=b.type(e);return b.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=b(o);var _={};function F(e){var t=_[e]={};return b.each(e.match(w)||[],function(e,n){t[n]=!0}),t}b.Callbacks=function(e){e="string"==typeof e?_[e]||F(e):b.extend({},e);var n,r,i,o,a,s,u=[],l=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=u.length,n=!0;u&&o>a;a++)if(u[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,u&&(l?l.length&&c(l.shift()):r?u=[]:p.disable())},p={add:function(){if(u){var t=u.length;(function i(t){b.each(t,function(t,n){var r=b.type(n);"function"===r?e.unique&&p.has(n)||u.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=u.length:r&&(s=t,c(r))}return this},remove:function(){return u&&b.each(arguments,function(e,t){var r;while((r=b.inArray(t,u,r))>-1)u.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?b.inArray(e,u)>-1:!(!u||!u.length)},empty:function(){return u=[],this},disable:function(){return u=l=r=t,this},disabled:function(){return!u},lock:function(){return l=t,r||p.disable(),this},locked:function(){return!l},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!u||i&&!l||(n?l.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},b.extend({Deferred:function(e){var t=[["resolve","done",b.Callbacks("once memory"),"resolved"],["reject","fail",b.Callbacks("once memory"),"rejected"],["notify","progress",b.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return b.Deferred(function(n){b.each(t,function(t,o){var a=o[0],s=b.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&b.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?b.extend(e,r):r}},i={};return r.pipe=r.then,b.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=h.call(arguments),r=n.length,i=1!==r||e&&b.isFunction(e.promise)?r:0,o=1===i?e:b.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?h.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,u,l;if(r>1)for(s=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&b.isFunction(n[t].promise)?n[t].promise().done(a(t,l,n)).fail(o.reject).progress(a(t,u,s)):--i;return i||o.resolveWith(l,n),o.promise()}}),b.support=function(){var t,n,r,a,s,u,l,c,p,f,d=o.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*"),r=d.getElementsByTagName("a")[0],!n||!r||!n.length)return{};s=o.createElement("select"),l=s.appendChild(o.createElement("option")),a=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={getSetAttribute:"t"!==d.className,leadingWhitespace:3===d.firstChild.nodeType,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:"/a"===r.getAttribute("href"),opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:!!a.value,optSelected:l.selected,enctype:!!o.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==o.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===o.compatMode,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},a.checked=!0,t.noCloneChecked=a.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!l.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}a=o.createElement("input"),a.setAttribute("value",""),t.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),t.radioValue="t"===a.value,a.setAttribute("checked","t"),a.setAttribute("name","t"),u=o.createDocumentFragment(),u.appendChild(a),t.appendChecked=a.checked,t.checkClone=u.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;return d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip,b(function(){var n,r,a,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",u=o.getElementsByTagName("body")[0];u&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",u.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",a=d.getElementsByTagName("td"),a[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===a[0].offsetHeight,a[0].style.display="",a[1].style.display="none",t.reliableHiddenOffsets=p&&0===a[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=4===d.offsetWidth,t.doesNotIncludeMarginInBodyOffset=1!==u.offsetTop,e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(o.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(u.style.zoom=1)),u.removeChild(n),n=d=a=r=null)}),n=s=u=l=r=a=null,t}();var O=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,B=/([A-Z])/g;function P(e,n,r,i){if(b.acceptData(e)){var o,a,s=b.expando,u="string"==typeof n,l=e.nodeType,p=l?b.cache:e,f=l?e[s]:e[s]&&s;if(f&&p[f]&&(i||p[f].data)||!u||r!==t)return f||(l?e[s]=f=c.pop()||b.guid++:f=s),p[f]||(p[f]={},l||(p[f].toJSON=b.noop)),("object"==typeof n||"function"==typeof n)&&(i?p[f]=b.extend(p[f],n):p[f].data=b.extend(p[f].data,n)),o=p[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[b.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[b.camelCase(n)])):a=o,a}}function R(e,t,n){if(b.acceptData(e)){var r,i,o,a=e.nodeType,s=a?b.cache:e,u=a?e[b.expando]:b.expando;if(s[u]){if(t&&(o=n?s[u]:s[u].data)){b.isArray(t)?t=t.concat(b.map(t,b.camelCase)):t in o?t=[t]:(t=b.camelCase(t),t=t in o?[t]:t.split(" "));for(r=0,i=t.length;i>r;r++)delete o[t[r]];if(!(n?$:b.isEmptyObject)(o))return}(n||(delete s[u].data,$(s[u])))&&(a?b.cleanData([e],!0):b.support.deleteExpando||s!=s.window?delete s[u]:s[u]=null)}}}b.extend({cache:{},expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?b.cache[e[b.expando]]:e[b.expando],!!e&&!$(e)},data:function(e,t,n){return P(e,t,n)},removeData:function(e,t){return R(e,t)},_data:function(e,t,n){return P(e,t,n,!0)},_removeData:function(e,t){return R(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&b.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),b.fn.extend({data:function(e,n){var r,i,o=this[0],a=0,s=null;if(e===t){if(this.length&&(s=b.data(o),1===o.nodeType&&!b._data(o,"parsedAttrs"))){for(r=o.attributes;r.length>a;a++)i=r[a].name,i.indexOf("data-")||(i=b.camelCase(i.slice(5)),W(o,i,s[i]));b._data(o,"parsedAttrs",!0)}return s}return"object"==typeof e?this.each(function(){b.data(this,e)}):b.access(this,function(n){return n===t?o?W(o,e,b.data(o,e)):null:(this.each(function(){b.data(this,e,n)}),t)},null,n,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){b.removeData(this,e)})}});function W(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(B,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:O.test(r)?b.parseJSON(r):r}catch(o){}b.data(e,n,r)}else r=t}return r}function $(e){var t;for(t in e)if(("data"!==t||!b.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}b.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=b._data(e,n),r&&(!i||b.isArray(r)?i=b._data(e,n,b.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=b.queue(e,t),r=n.length,i=n.shift(),o=b._queueHooks(e,t),a=function(){b.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return b._data(e,n)||b._data(e,n,{empty:b.Callbacks("once memory").add(function(){b._removeData(e,t+"queue"),b._removeData(e,n)})})}}),b.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?b.queue(this[0],e):n===t?this:this.each(function(){var t=b.queue(this,e,n);b._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&b.dequeue(this,e)})},dequeue:function(e){return this.each(function(){b.dequeue(this,e)})},delay:function(e,t){return e=b.fx?b.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=b.Deferred(),a=this,s=this.length,u=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=b._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(u));return u(),o.promise(n)}});var I,z,X=/[\t\r\n]/g,U=/\r/g,V=/^(?:input|select|textarea|button|object)$/i,Y=/^(?:a|area)$/i,J=/^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,G=/^(?:checked|selected)$/i,Q=b.support.getSetAttribute,K=b.support.input;b.fn.extend({attr:function(e,t){return b.access(this,b.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){b.removeAttr(this,e)})},prop:function(e,t){return b.access(this,b.prop,e,t,arguments.length>1)},removeProp:function(e){return e=b.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,u="string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=b.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,u=0===arguments.length||"string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?b.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return b.isFunction(e)?this.each(function(n){b(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=b(this),u=t,l=e.match(w)||[];while(o=l[a++])u=r?u:!s.hasClass(o),s[u?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&b._data(this,"__className__",this.className),this.className=this.className||e===!1?"":b._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(X," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=b.isFunction(e),this.each(function(n){var o,a=b(this);1===this.nodeType&&(o=i?e.call(this,n,a.val()):e,null==o?o="":"number"==typeof o?o+="":b.isArray(o)&&(o=b.map(o,function(e){return null==e?"":e+""})),r=b.valHooks[this.type]||b.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=b.valHooks[o.type]||b.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(U,""):null==n?"":n)}}}),b.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,u=0>i?s:o?i:0;for(;s>u;u++)if(n=r[u],!(!n.selected&&u!==i||(b.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&b.nodeName(n.parentNode,"optgroup"))){if(t=b(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n=b.makeArray(t);return b(e).find("option").each(function(){this.selected=b.inArray(b(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attr:function(e,n,r){var o,a,s,u=e.nodeType;if(e&&3!==u&&8!==u&&2!==u)return typeof e.getAttribute===i?b.prop(e,n,r):(a=1!==u||!b.isXMLDoc(e),a&&(n=n.toLowerCase(),o=b.attrHooks[n]||(J.test(n)?z:I)),r===t?o&&a&&"get"in o&&null!==(s=o.get(e,n))?s:(typeof e.getAttribute!==i&&(s=e.getAttribute(n)),null==s?t:s):null!==r?o&&a&&"set"in o&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r):(b.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=b.propFix[n]||n,J.test(n)?!Q&&G.test(n)?e[b.camelCase("default-"+n)]=e[r]=!1:e[r]=!1:b.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!b.support.radioValue&&"radio"===t&&b.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!b.isXMLDoc(e),a&&(n=b.propFix[n]||n,o=b.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):V.test(e.nodeName)||Y.test(e.nodeName)&&e.href?0:t}}}}),z={get:function(e,n){var r=b.prop(e,n),i="boolean"==typeof r&&e.getAttribute(n),o="boolean"==typeof r?K&&Q?null!=i:G.test(n)?e[b.camelCase("default-"+n)]:!!i:e.getAttributeNode(n);return o&&o.value!==!1?n.toLowerCase():t},set:function(e,t,n){return t===!1?b.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&b.propFix[n]||n,n):e[b.camelCase("default-"+n)]=e[n]=!0,n}},K&&Q||(b.attrHooks.value={get:function(e,n){var r=e.getAttributeNode(n);return b.nodeName(e,"input")?e.defaultValue:r&&r.specified?r.value:t},set:function(e,n,r){return b.nodeName(e,"input")?(e.defaultValue=n,t):I&&I.set(e,n,r)}}),Q||(I=b.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},b.attrHooks.contenteditable={get:I.get,set:function(e,t,n){I.set(e,""===t?!1:t,n)}},b.each(["width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}})})),b.support.hrefNormalized||(b.each(["href","src","width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null==r?t:r}})}),b.each(["href","src"],function(e,t){b.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),b.support.style||(b.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),b.support.optSelected||(b.propHooks.selected=b.extend(b.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),b.support.enctype||(b.propFix.enctype="encoding"),b.support.checkOn||b.each(["radio","checkbox"],function(){b.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),b.each(["radio","checkbox"],function(){b.valHooks[this]=b.extend(b.valHooks[this],{set:function(e,n){return b.isArray(n)?e.checked=b.inArray(b(e).val(),n)>=0:t}})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}b.event={global:{},add:function(e,n,r,o,a){var s,u,l,c,p,f,d,h,g,m,y,v=b._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=b.guid++),(u=v.events)||(u=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof b===i||e&&b.event.triggered===e.type?t:b.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(w)||[""],l=n.length;while(l--)s=rt.exec(n[l])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),p=b.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=b.event.special[g]||{},d=b.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&b.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=u[g])||(h=u[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),b.event.global[g]=!0;e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,p,f,d,h,g,m=b.hasData(e)&&b._data(e);if(m&&(c=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(s=rt.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=b.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));u&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||b.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)b.event.remove(e,d+t[l],n,r,!0);b.isEmptyObject(c)&&(delete m.handle,b._removeData(e,"events"))}},trigger:function(n,r,i,a){var s,u,l,c,p,f,d,h=[i||o],g=y.call(n,"type")?n.type:n,m=y.call(n,"namespace")?n.namespace.split("."):[];if(l=f=i=i||o,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+b.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),u=0>g.indexOf(":")&&"on"+g,n=n[b.expando]?n:new b.Event(g,"object"==typeof n&&n),n.isTrigger=!0,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:b.makeArray(r,[n]),p=b.event.special[g]||{},a||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!a&&!p.noBubble&&!b.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(l=l.parentNode);l;l=l.parentNode)h.push(l),f=l;f===(i.ownerDocument||o)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((l=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(b._data(l,"events")||{})[n.type]&&b._data(l,"handle"),s&&s.apply(l,r),s=u&&l[u],s&&b.acceptData(l)&&s.apply&&s.apply(l,r)===!1&&n.preventDefault();if(n.type=g,!(a||n.isDefaultPrevented()||p._default&&p._default.apply(i.ownerDocument,r)!==!1||"click"===g&&b.nodeName(i,"a")||!b.acceptData(i)||!u||!i[g]||b.isWindow(i))){f=i[u],f&&(i[u]=null),b.event.triggered=g;try{i[g]()}catch(v){}b.event.triggered=t,f&&(i[u]=f)}return n.result}},dispatch:function(e){e=b.event.fix(e);var n,r,i,o,a,s=[],u=h.call(arguments),l=(b._data(this,"events")||{})[e.type]||[],c=b.event.special[e.type]||{};if(u[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=b.event.handlers.call(this,e,l),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((b.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,u),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],u=n.delegateCount,l=e.target;if(u&&l.nodeType&&(!e.button||"click"!==e.type))for(;l!=this;l=l.parentNode||this)if(1===l.nodeType&&(l.disabled!==!0||"click"!==e.type)){for(o=[],a=0;u>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?b(r,this).index(l)>=0:b.find(r,this,null,[l]).length),o[r]&&o.push(i);o.length&&s.push({elem:l,handlers:o})}return n.length>u&&s.push({elem:this,handlers:n.slice(u)}),s},fix:function(e){if(e[b.expando])return e;var t,n,r,i=e.type,a=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new b.Event(a),t=r.length;while(t--)n=r[t],e[n]=a[n];return e.target||(e.target=a.srcElement||o),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,a):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,a,s=n.button,u=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||o,a=i.documentElement,r=i.body,e.pageX=n.clientX+(a&&a.scrollLeft||r&&r.scrollLeft||0)-(a&&a.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(a&&a.scrollTop||r&&r.scrollTop||0)-(a&&a.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&u&&(e.relatedTarget=u===e.target?n.toElement:u),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},click:{trigger:function(){return b.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t}},focus:{trigger:function(){if(this!==o.activeElement&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===o.activeElement&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=b.extend(new b.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?b.event.trigger(i,null,t):b.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},b.removeEvent=o.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},b.Event=function(e,n){return this instanceof b.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&b.extend(this,n),this.timeStamp=e&&e.timeStamp||b.now(),this[b.expando]=!0,t):new b.Event(e,n)},b.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},b.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){b.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;
+return(!i||i!==r&&!b.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),b.support.submitBubbles||(b.event.special.submit={setup:function(){return b.nodeName(this,"form")?!1:(b.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=b.nodeName(n,"input")||b.nodeName(n,"button")?n.form:t;r&&!b._data(r,"submitBubbles")&&(b.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),b._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&b.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return b.nodeName(this,"form")?!1:(b.event.remove(this,"._submit"),t)}}),b.support.changeBubbles||(b.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(b.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),b.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),b.event.simulate("change",this,e,!0)})),!1):(b.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!b._data(t,"changeBubbles")&&(b.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||b.event.simulate("change",this.parentNode,e,!0)}),b._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return b.event.remove(this,"._change"),!Z.test(this.nodeName)}}),b.support.focusinBubbles||b.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){b.event.simulate(t,e.target,b.event.fix(e),!0)};b.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),b.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return b().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=b.guid++)),this.each(function(){b.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,b(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){b.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){b.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?b.event.trigger(e,n,r,!0):t}}),function(e,t){var n,r,i,o,a,s,u,l,c,p,f,d,h,g,m,y,v,x="sizzle"+-new Date,w=e.document,T={},N=0,C=0,k=it(),E=it(),S=it(),A=typeof t,j=1<<31,D=[],L=D.pop,H=D.push,q=D.slice,M=D.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},_="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=F.replace("w","w#"),B="([*^$|!~]?=)",P="\\["+_+"*("+F+")"+_+"*(?:"+B+_+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+O+")|)|)"+_+"*\\]",R=":("+F+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+P.replace(3,8)+")*)|.*)\\)|)",W=RegExp("^"+_+"+|((?:^|[^\\\\])(?:\\\\.)*)"+_+"+$","g"),$=RegExp("^"+_+"*,"+_+"*"),I=RegExp("^"+_+"*([\\x20\\t\\r\\n\\f>+~])"+_+"*"),z=RegExp(R),X=RegExp("^"+O+"$"),U={ID:RegExp("^#("+F+")"),CLASS:RegExp("^\\.("+F+")"),NAME:RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:RegExp("^("+F.replace("w","w*")+")"),ATTR:RegExp("^"+P),PSEUDO:RegExp("^"+R),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+_+"*(even|odd|(([+-]|)(\\d*)n|)"+_+"*(?:([+-]|)"+_+"*(\\d+)|))"+_+"*\\)|)","i"),needsContext:RegExp("^"+_+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+_+"*((?:-\\d)?\\d*)"+_+"*\\)|)(?=[^-]|$)","i")},V=/[\x20\t\r\n\f]*[+~]/,Y=/^[^{]+\{\s*\[native code/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,G=/^(?:input|select|textarea|button)$/i,Q=/^h\d$/i,K=/'|\\/g,Z=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,et=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,tt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{q.call(w.documentElement.childNodes,0)[0].nodeType}catch(nt){q=function(e){var t,n=[];while(t=this[e++])n.push(t);return n}}function rt(e){return Y.test(e+"")}function it(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>i.cacheLength&&delete e[t.shift()],e[n]=r}}function ot(e){return e[x]=!0,e}function at(e){var t=p.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}}function st(e,t,n,r){var i,o,a,s,u,l,f,g,m,v;if((t?t.ownerDocument||t:w)!==p&&c(t),t=t||p,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(!d&&!r){if(i=J.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&y(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return H.apply(n,q.call(t.getElementsByTagName(e),0)),n;if((a=i[3])&&T.getByClassName&&t.getElementsByClassName)return H.apply(n,q.call(t.getElementsByClassName(a),0)),n}if(T.qsa&&!h.test(e)){if(f=!0,g=x,m=t,v=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){l=ft(e),(f=t.getAttribute("id"))?g=f.replace(K,"\\$&"):t.setAttribute("id",g),g="[id='"+g+"'] ",u=l.length;while(u--)l[u]=g+dt(l[u]);m=V.test(e)&&t.parentNode||t,v=l.join(",")}if(v)try{return H.apply(n,q.call(m.querySelectorAll(v),0)),n}catch(b){}finally{f||t.removeAttribute("id")}}}return wt(e.replace(W,"$1"),t,n,r)}a=st.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},c=st.setDocument=function(e){var n=e?e.ownerDocument||e:w;return n!==p&&9===n.nodeType&&n.documentElement?(p=n,f=n.documentElement,d=a(n),T.tagNameNoComments=at(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),T.attributes=at(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),T.getByClassName=at(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),T.getByName=at(function(e){e.id=x+0,e.innerHTML="<a name='"+x+"'></a><div name='"+x+"'></div>",f.insertBefore(e,f.firstChild);var t=n.getElementsByName&&n.getElementsByName(x).length===2+n.getElementsByName(x+0).length;return T.getIdNotName=!n.getElementById(x),f.removeChild(e),t}),i.attrHandle=at(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==A&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},T.getIdNotName?(i.find.ID=function(e,t){if(typeof t.getElementById!==A&&!d){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){return e.getAttribute("id")===t}}):(i.find.ID=function(e,n){if(typeof n.getElementById!==A&&!d){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==A&&r.getAttributeNode("id").value===e?[r]:t:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){var n=typeof e.getAttributeNode!==A&&e.getAttributeNode("id");return n&&n.value===t}}),i.find.TAG=T.tagNameNoComments?function(e,n){return typeof n.getElementsByTagName!==A?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},i.find.NAME=T.getByName&&function(e,n){return typeof n.getElementsByName!==A?n.getElementsByName(name):t},i.find.CLASS=T.getByClassName&&function(e,n){return typeof n.getElementsByClassName===A||d?t:n.getElementsByClassName(e)},g=[],h=[":focus"],(T.qsa=rt(n.querySelectorAll))&&(at(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||h.push("\\["+_+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||h.push(":checked")}),at(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&h.push("[*^$]="+_+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").length||h.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),h.push(",.*:")})),(T.matchesSelector=rt(m=f.matchesSelector||f.mozMatchesSelector||f.webkitMatchesSelector||f.oMatchesSelector||f.msMatchesSelector))&&at(function(e){T.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),g.push("!=",R)}),h=RegExp(h.join("|")),g=RegExp(g.join("|")),y=rt(f.contains)||f.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},v=f.compareDocumentPosition?function(e,t){var r;return e===t?(u=!0,0):(r=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t))?1&r||e.parentNode&&11===e.parentNode.nodeType?e===n||y(w,e)?-1:t===n||y(w,t)?1:0:4&r?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return u=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:0;if(o===a)return ut(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?ut(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},u=!1,[0,0].sort(v),T.detectDuplicates=u,p):p},st.matches=function(e,t){return st(e,null,null,t)},st.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&c(e),t=t.replace(Z,"='$1']"),!(!T.matchesSelector||d||g&&g.test(t)||h.test(t)))try{var n=m.call(e,t);if(n||T.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return st(t,p,null,[e]).length>0},st.contains=function(e,t){return(e.ownerDocument||e)!==p&&c(e),y(e,t)},st.attr=function(e,t){var n;return(e.ownerDocument||e)!==p&&c(e),d||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):d||T.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},st.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},st.uniqueSort=function(e){var t,n=[],r=1,i=0;if(u=!T.detectDuplicates,e.sort(v),u){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e};function ut(e,t){var n=t&&e,r=n&&(~t.sourceIndex||j)-(~e.sourceIndex||j);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function lt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function ct(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function pt(e){return ot(function(t){return t=+t,ot(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}o=st.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=o(t);return n},i=st.selectors={cacheLength:50,createPseudo:ot,match:U,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(et,tt),e[3]=(e[4]||e[5]||"").replace(et,tt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||st.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&st.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return U.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&z.test(n)&&(t=ft(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(et,tt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[e+" "];return t||(t=RegExp("(^|"+_+")"+e+"("+_+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==A&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=st.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[x]||(m[x]={}),l=c[e]||[],d=l[0]===N&&l[1],f=l[0]===N&&l[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[N,d,f];break}}else if(v&&(l=(t[x]||(t[x]={}))[e])&&l[0]===N)f=l[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[x]||(p[x]={}))[e]=[N,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||st.error("unsupported pseudo: "+e);return r[x]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?ot(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=M.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ot(function(e){var t=[],n=[],r=s(e.replace(W,"$1"));return r[x]?ot(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ot(function(e){return function(t){return st(e,t).length>0}}),contains:ot(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:ot(function(e){return X.test(e||"")||st.error("unsupported lang: "+e),e=e.replace(et,tt).toLowerCase(),function(t){var n;do if(n=d?t.getAttribute("xml:lang")||t.getAttribute("lang"):t.lang)return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===f},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return Q.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:pt(function(){return[0]}),last:pt(function(e,t){return[t-1]}),eq:pt(function(e,t,n){return[0>n?n+t:n]}),even:pt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:pt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:pt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:pt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})i.pseudos[n]=lt(n);for(n in{submit:!0,reset:!0})i.pseudos[n]=ct(n);function ft(e,t){var n,r,o,a,s,u,l,c=E[e+" "];if(c)return t?0:c.slice(0);s=e,u=[],l=i.preFilter;while(s){(!n||(r=$.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),u.push(o=[])),n=!1,(r=I.exec(s))&&(n=r.shift(),o.push({value:n,type:r[0].replace(W," ")}),s=s.slice(n.length));for(a in i.filter)!(r=U[a].exec(s))||l[a]&&!(r=l[a](r))||(n=r.shift(),o.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?st.error(e):E(e,u).slice(0)}function dt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function ht(e,t,n){var i=t.dir,o=n&&"parentNode"===i,a=C++;return t.first?function(t,n,r){while(t=t[i])if(1===t.nodeType||o)return e(t,n,r)}:function(t,n,s){var u,l,c,p=N+" "+a;if(s){while(t=t[i])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[i])if(1===t.nodeType||o)if(c=t[x]||(t[x]={}),(l=c[i])&&l[0]===p){if((u=l[1])===!0||u===r)return u===!0}else if(l=c[i]=[p],l[1]=e(t,n,s)||r,l[1]===!0)return!0}}function gt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function mt(e,t,n,r,i){var o,a=[],s=0,u=e.length,l=null!=t;for(;u>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),l&&t.push(s));return a}function yt(e,t,n,r,i,o){return r&&!r[x]&&(r=yt(r)),i&&!i[x]&&(i=yt(i,o)),ot(function(o,a,s,u){var l,c,p,f=[],d=[],h=a.length,g=o||xt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:mt(g,f,e,s,u),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,u),r){l=mt(y,d),r(l,[],s,u),c=l.length;while(c--)(p=l[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){l=[],c=y.length;while(c--)(p=y[c])&&l.push(m[c]=p);i(null,y=[],l,u)}c=y.length;while(c--)(p=y[c])&&(l=i?M.call(o,p):f[c])>-1&&(o[l]=!(a[l]=p))}}else y=mt(y===a?y.splice(h,y.length):y),i?i(null,a,y,u):H.apply(a,y)})}function vt(e){var t,n,r,o=e.length,a=i.relative[e[0].type],s=a||i.relative[" "],u=a?1:0,c=ht(function(e){return e===t},s,!0),p=ht(function(e){return M.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;o>u;u++)if(n=i.relative[e[u].type])f=[ht(gt(f),n)];else{if(n=i.filter[e[u].type].apply(null,e[u].matches),n[x]){for(r=++u;o>r;r++)if(i.relative[e[r].type])break;return yt(u>1&&gt(f),u>1&&dt(e.slice(0,u-1)).replace(W,"$1"),n,r>u&&vt(e.slice(u,r)),o>r&&vt(e=e.slice(r)),o>r&&dt(e))}f.push(n)}return gt(f)}function bt(e,t){var n=0,o=t.length>0,a=e.length>0,s=function(s,u,c,f,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,T=l,C=s||a&&i.find.TAG("*",d&&u.parentNode||u),k=N+=null==T?1:Math.random()||.1;for(w&&(l=u!==p&&u,r=n);null!=(h=C[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,u,c)){f.push(h);break}w&&(N=k,r=++n)}o&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,o&&b!==v){g=0;while(m=t[g++])m(x,y,u,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=L.call(f));y=mt(y)}H.apply(f,y),w&&!s&&y.length>0&&v+t.length>1&&st.uniqueSort(f)}return w&&(N=k,l=T),x};return o?ot(s):s}s=st.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=ft(e)),n=t.length;while(n--)o=vt(t[n]),o[x]?r.push(o):i.push(o);o=S(e,bt(i,r))}return o};function xt(e,t,n){var r=0,i=t.length;for(;i>r;r++)st(e,t[r],n);return n}function wt(e,t,n,r){var o,a,u,l,c,p=ft(e);if(!r&&1===p.length){if(a=p[0]=p[0].slice(0),a.length>2&&"ID"===(u=a[0]).type&&9===t.nodeType&&!d&&i.relative[a[1].type]){if(t=i.find.ID(u.matches[0].replace(et,tt),t)[0],!t)return n;e=e.slice(a.shift().value.length)}o=U.needsContext.test(e)?0:a.length;while(o--){if(u=a[o],i.relative[l=u.type])break;if((c=i.find[l])&&(r=c(u.matches[0].replace(et,tt),V.test(a[0].type)&&t.parentNode||t))){if(a.splice(o,1),e=r.length&&dt(a),!e)return H.apply(n,q.call(r,0)),n;break}}}return s(e,p)(r,t,d,n,V.test(e)),n}i.pseudos.nth=i.pseudos.eq;function Tt(){}i.filters=Tt.prototype=i.pseudos,i.setFilters=new Tt,c(),st.attr=b.attr,b.find=st,b.expr=st.selectors,b.expr[":"]=b.expr.pseudos,b.unique=st.uniqueSort,b.text=st.getText,b.isXMLDoc=st.isXML,b.contains=st.contains}(e);var at=/Until$/,st=/^(?:parents|prev(?:Until|All))/,ut=/^.[^:#\[\.,]*$/,lt=b.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};b.fn.extend({find:function(e){var t,n,r,i=this.length;if("string"!=typeof e)return r=this,this.pushStack(b(e).filter(function(){for(t=0;i>t;t++)if(b.contains(r[t],this))return!0}));for(n=[],t=0;i>t;t++)b.find(e,this[t],n);return n=this.pushStack(i>1?b.unique(n):n),n.selector=(this.selector?this.selector+" ":"")+e,n},has:function(e){var t,n=b(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(b.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e,!1))},filter:function(e){return this.pushStack(ft(this,e,!0))},is:function(e){return!!e&&("string"==typeof e?lt.test(e)?b(e,this.context).index(this[0])>=0:b.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,o=[],a=lt.test(e)||"string"!=typeof e?b(e,t||this.context):0;for(;i>r;r++){n=this[r];while(n&&n.ownerDocument&&n!==t&&11!==n.nodeType){if(a?a.index(n)>-1:b.find.matchesSelector(n,e)){o.push(n);break}n=n.parentNode}}return this.pushStack(o.length>1?b.unique(o):o)},index:function(e){return e?"string"==typeof e?b.inArray(this[0],b(e)):b.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?b(e,t):b.makeArray(e&&e.nodeType?[e]:e),r=b.merge(this.get(),n);return this.pushStack(b.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),b.fn.andSelf=b.fn.addBack;function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}b.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return b.dir(e,"parentNode")},parentsUntil:function(e,t,n){return b.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return b.dir(e,"nextSibling")},prevAll:function(e){return b.dir(e,"previousSibling")},nextUntil:function(e,t,n){return b.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return b.dir(e,"previousSibling",n)},siblings:function(e){return b.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return b.sibling(e.firstChild)},contents:function(e){return b.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:b.merge([],e.childNodes)}},function(e,t){b.fn[e]=function(n,r){var i=b.map(this,t,n);return at.test(e)||(r=n),r&&"string"==typeof r&&(i=b.filter(r,i)),i=this.length>1&&!ct[e]?b.unique(i):i,this.length>1&&st.test(e)&&(i=i.reverse()),this.pushStack(i)}}),b.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?b.find.matchesSelector(t[0],e)?[t[0]]:[]:b.find.matches(e,t)},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!b(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(t=t||0,b.isFunction(t))return b.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return b.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=b.grep(e,function(e){return 1===e.nodeType});if(ut.test(t))return b.filter(t,r,!n);t=b.filter(t,r)}return b.grep(e,function(e){return b.inArray(e,t)>=0===n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Nt=/^(?:checkbox|radio)$/i,Ct=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:b.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(o),Dt=jt.appendChild(o.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,b.fn.extend({text:function(e){return b.access(this,function(e){return e===t?b.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(b.isFunction(e))return this.each(function(t){b(this).wrapAll(e.call(this,t))});if(this[0]){var t=b(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return b.isFunction(e)?this.each(function(t){b(this).wrapInner(e.call(this,t))}):this.each(function(){var t=b(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=b.isFunction(e);return this.each(function(n){b(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){b.nodeName(this,"body")||b(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.insertBefore(e,this.firstChild)})},before:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=0;for(;null!=(n=this[r]);r++)(!e||b.filter(e,[n]).length>0)&&(t||1!==n.nodeType||b.cleanData(Ot(n)),n.parentNode&&(t&&b.contains(n.ownerDocument,n)&&Mt(Ot(n,"script")),n.parentNode.removeChild(n)));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&b.cleanData(Ot(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&b.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return b.clone(this,e,t)})},html:function(e){return b.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!b.support.htmlSerialize&&mt.test(e)||!b.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(b.cleanData(Ot(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){var t=b.isFunction(e);return t||"string"==typeof e||(e=b(e).not(this).detach()),this.domManip([e],!0,function(e){var t=this.nextSibling,n=this.parentNode;n&&(b(this).remove(),n.insertBefore(e,t))})},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=f.apply([],e);var i,o,a,s,u,l,c=0,p=this.length,d=this,h=p-1,g=e[0],m=b.isFunction(g);if(m||!(1>=p||"string"!=typeof g||b.support.checkClone)&&Ct.test(g))return this.each(function(i){var o=d.eq(i);m&&(e[0]=g.call(this,i,n?o.html():t)),o.domManip(e,n,r)});if(p&&(l=b.buildFragment(e,this[0].ownerDocument,!1,this),i=l.firstChild,1===l.childNodes.length&&(l=i),i)){for(n=n&&b.nodeName(i,"tr"),s=b.map(Ot(l,"script"),Ht),a=s.length;p>c;c++)o=l,c!==h&&(o=b.clone(o,!0,!0),a&&b.merge(s,Ot(o,"script"))),r.call(n&&b.nodeName(this[c],"table")?Lt(this[c],"tbody"):this[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,b.map(s,qt),c=0;a>c;c++)o=s[c],kt.test(o.type||"")&&!b._data(o,"globalEval")&&b.contains(u,o)&&(o.src?b.ajax({url:o.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):b.globalEval((o.text||o.textContent||o.innerHTML||"").replace(St,"")));l=i=null}return this}});function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function Ht(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function Mt(e,t){var n,r=0;for(;null!=(n=e[r]);r++)b._data(n,"globalEval",!t||b._data(t[r],"globalEval"))}function _t(e,t){if(1===t.nodeType&&b.hasData(e)){var n,r,i,o=b._data(e),a=b._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)b.event.add(t,n,s[n][r])}a.data&&(a.data=b.extend({},a.data))}}function Ft(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!b.support.noCloneEvent&&t[b.expando]){i=b._data(t);for(r in i.events)b.removeEvent(t,r,i.handle);t.removeAttribute(b.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),b.support.html5Clone&&e.innerHTML&&!b.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Nt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}b.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){b.fn[e]=function(e){var n,r=0,i=[],o=b(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),b(o[r])[t](n),d.apply(i,n.get());return this.pushStack(i)}});function Ot(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||b.nodeName(o,n)?s.push(o):b.merge(s,Ot(o,n));return n===t||n&&b.nodeName(e,n)?b.merge([e],s):s}function Bt(e){Nt.test(e.type)&&(e.defaultChecked=e.checked)}b.extend({clone:function(e,t,n){var r,i,o,a,s,u=b.contains(e.ownerDocument,e);if(b.support.html5Clone||b.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(b.support.noCloneEvent&&b.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||b.isXMLDoc(e)))for(r=Ot(o),s=Ot(e),a=0;null!=(i=s[a]);++a)r[a]&&Ft(i,r[a]);if(t)if(n)for(s=s||Ot(e),r=r||Ot(o),a=0;null!=(i=s[a]);a++)_t(i,r[a]);else _t(e,o);return r=Ot(o,"script"),r.length>0&&Mt(r,!u&&Ot(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,u,l,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===b.type(o))b.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),u=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[u]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!b.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!b.support.tbody){o="table"!==u||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)b.nodeName(l=o.childNodes[i],"tbody")&&!l.childNodes.length&&o.removeChild(l)
+}b.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),b.support.appendChecked||b.grep(Ot(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===b.inArray(o,r))&&(a=b.contains(o.ownerDocument,o),s=Ot(f.appendChild(o),"script"),a&&Mt(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,u=b.expando,l=b.cache,p=b.support.deleteExpando,f=b.event.special;for(;null!=(n=e[s]);s++)if((t||b.acceptData(n))&&(o=n[u],a=o&&l[o])){if(a.events)for(r in a.events)f[r]?b.event.remove(n,r):b.removeEvent(n,r,a.handle);l[o]&&(delete l[o],p?delete n[u]:typeof n.removeAttribute!==i?n.removeAttribute(u):n[u]=null,c.push(o))}}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+x+")(.*)$","i"),Yt=RegExp("^("+x+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+x+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===b.css(e,"display")||!b.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=b._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=b._data(r,"olddisplay",un(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&b._data(r,"olddisplay",i?n:b.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}b.fn.extend({css:function(e,n){return b.access(this,function(e,n,r){var i,o,a={},s=0;if(b.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=b.css(e,n[s],!1,o);return a}return r!==t?b.style(e,n,r):b.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?b(this).show():b(this).hide()})}}),b.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":b.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,u=b.camelCase(n),l=e.style;if(n=b.cssProps[u]||(b.cssProps[u]=tn(l,u)),s=b.cssHooks[n]||b.cssHooks[u],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:l[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(b.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||b.cssNumber[u]||(r+="px"),b.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(l[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{l[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,u=b.camelCase(n);return n=b.cssProps[u]||(b.cssProps[u]=tn(e.style,u)),s=b.cssHooks[n]||b.cssHooks[u],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||b.isNumeric(o)?o||0:a):a},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s.getPropertyValue(n)||s[n]:t,l=e.style;return s&&(""!==u||b.contains(e.ownerDocument,e)||(u=b.style(e,n)),Yt.test(u)&&Ut.test(n)&&(i=l.width,o=l.minWidth,a=l.maxWidth,l.minWidth=l.maxWidth=l.width=u,u=s.width,l.width=i,l.minWidth=o,l.maxWidth=a)),u}):o.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s[n]:t,l=e.style;return null==u&&l&&l[n]&&(u=l[n]),Yt.test(u)&&!zt.test(n)&&(i=l.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),l.left="fontSize"===n?"1em":u,u=l.pixelLeft+"px",l.left=i,a&&(o.left=a)),""===u?"auto":u});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=b.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=b.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=b.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=b.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=b.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(b.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function un(e){var t=o,n=Gt[e];return n||(n=ln(e,t),"none"!==n&&n||(Pt=(Pt||b("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=ln(e,t),Pt.detach()),Gt[e]=n),n}function ln(e,t){var n=b(t.createElement(e)).appendTo(t.body),r=b.css(n[0],"display");return n.remove(),r}b.each(["height","width"],function(e,n){b.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(b.css(e,"display"))?b.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,i),i):0)}}}),b.support.opacity||(b.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=b.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===b.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),b(function(){b.support.reliableMarginRight||(b.cssHooks.marginRight={get:function(e,n){return n?b.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!b.support.pixelPosition&&b.fn.position&&b.each(["top","left"],function(e,n){b.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?b(e).position()[n]+"px":r):t}}})}),b.expr&&b.expr.filters&&(b.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!b.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||b.css(e,"display"))},b.expr.filters.visible=function(e){return!b.expr.filters.hidden(e)}),b.each({margin:"",padding:"",border:"Width"},function(e,t){b.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(b.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;b.fn.extend({serialize:function(){return b.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=b.prop(this,"elements");return e?b.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!b(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Nt.test(e))}).map(function(e,t){var n=b(this).val();return null==n?null:b.isArray(n)?b.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),b.param=function(e,n){var r,i=[],o=function(e,t){t=b.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=b.ajaxSettings&&b.ajaxSettings.traditional),b.isArray(e)||e.jquery&&!b.isPlainObject(e))b.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(b.isArray(t))b.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==b.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}b.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){b.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),b.fn.hover=function(e,t){return this.mouseenter(e).mouseleave(t||e)};var mn,yn,vn=b.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Nn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Cn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=b.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=a.href}catch(Ln){yn=o.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(w)||[];if(b.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(u){var l;return o[u]=!0,b.each(e[u]||[],function(e,u){var c=u(n,r,i);return"string"!=typeof c||a||o[c]?a?!(l=c):t:(n.dataTypes.unshift(c),s(c),!1)}),l}return s(n.dataTypes[0])||!o["*"]&&s("*")}function Mn(e,n){var r,i,o=b.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&b.extend(!0,e,r),e}b.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,u=e.indexOf(" ");return u>=0&&(i=e.slice(u,e.length),e=e.slice(0,u)),b.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&b.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?b("<div>").append(b.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},b.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){b.fn[t]=function(e){return this.on(t,e)}}),b.each(["get","post"],function(e,n){b[n]=function(e,r,i,o){return b.isFunction(r)&&(o=o||i,i=r,r=t),b.ajax({url:e,type:n,dataType:o,data:r,success:i})}}),b.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Nn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":b.parseJSON,"text xml":b.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Mn(Mn(e,b.ajaxSettings),t):Mn(b.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,u,l,c,p=b.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?b(f):b.event,h=b.Deferred(),g=b.Callbacks("once memory"),m=p.statusCode||{},y={},v={},x=0,T="canceled",N={readyState:0,getResponseHeader:function(e){var t;if(2===x){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===x?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return x||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return x||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>x)for(t in e)m[t]=[m[t],e[t]];else N.always(e[N.status]);return this},abort:function(e){var t=e||T;return l&&l.abort(t),k(0,t),this}};if(h.promise(N).complete=g.add,N.success=N.done,N.error=N.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=b.trim(p.dataType||"*").toLowerCase().match(w)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?80:443))==(mn[3]||("http:"===mn[1]?80:443)))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=b.param(p.data,p.traditional)),qn(An,p,n,N),2===x)return N;u=p.global,u&&0===b.active++&&b.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Cn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(b.lastModified[o]&&N.setRequestHeader("If-Modified-Since",b.lastModified[o]),b.etag[o]&&N.setRequestHeader("If-None-Match",b.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&N.setRequestHeader("Content-Type",p.contentType),N.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)N.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,N,p)===!1||2===x))return N.abort();T="abort";for(i in{success:1,error:1,complete:1})N[i](p[i]);if(l=qn(jn,p,n,N)){N.readyState=1,u&&d.trigger("ajaxSend",[N,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){N.abort("timeout")},p.timeout));try{x=1,l.send(y,k)}catch(C){if(!(2>x))throw C;k(-1,C)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,C=n;2!==x&&(x=2,s&&clearTimeout(s),l=t,a=i||"",N.readyState=e>0?4:0,r&&(w=_n(p,N,r)),e>=200&&300>e||304===e?(p.ifModified&&(T=N.getResponseHeader("Last-Modified"),T&&(b.lastModified[o]=T),T=N.getResponseHeader("etag"),T&&(b.etag[o]=T)),204===e?(c=!0,C="nocontent"):304===e?(c=!0,C="notmodified"):(c=Fn(p,w),C=c.state,y=c.data,v=c.error,c=!v)):(v=C,(e||!C)&&(C="error",0>e&&(e=0))),N.status=e,N.statusText=(n||C)+"",c?h.resolveWith(f,[y,C,N]):h.rejectWith(f,[N,C,v]),N.statusCode(m),m=t,u&&d.trigger(c?"ajaxSuccess":"ajaxError",[N,p,c?y:v]),g.fireWith(f,[N,C]),u&&(d.trigger("ajaxComplete",[N,p]),--b.active||b.event.trigger("ajaxStop")))}return N},getScript:function(e,n){return b.get(e,t,n,"script")},getJSON:function(e,t,n){return b.get(e,t,n,"json")}});function _n(e,n,r){var i,o,a,s,u=e.contents,l=e.dataTypes,c=e.responseFields;for(s in c)s in r&&(n[c[s]]=r[s]);while("*"===l[0])l.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in u)if(u[s]&&u[s].test(o)){l.unshift(s);break}if(l[0]in r)a=l[0];else{for(s in r){if(!l[0]||e.converters[s+" "+l[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==l[0]&&l.unshift(a),r[a]):t}function Fn(e,t){var n,r,i,o,a={},s=0,u=e.dataTypes.slice(),l=u[0];if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u[1])for(i in e.converters)a[i.toLowerCase()]=e.converters[i];for(;r=u[++s];)if("*"!==r){if("*"!==l&&l!==r){if(i=a[l+" "+r]||a["* "+r],!i)for(n in a)if(o=n.split(" "),o[1]===r&&(i=a[l+" "+o[0]]||a["* "+o[0]])){i===!0?i=a[n]:a[n]!==!0&&(r=o[0],u.splice(s--,0,r));break}if(i!==!0)if(i&&e["throws"])t=i(t);else try{t=i(t)}catch(c){return{state:"parsererror",error:i?c:"No conversion from "+l+" to "+r}}}l=r}return{state:"success",data:t}}b.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return b.globalEval(e),e}}}),b.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),b.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=o.head||b("head")[0]||o.documentElement;return{send:function(t,i){n=o.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var On=[],Bn=/(=)\?(?=&|$)|\?\?/;b.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=On.pop()||b.expando+"_"+vn++;return this[e]=!0,e}}),b.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,u=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return u||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=b.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,u?n[u]=n[u].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||b.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,On.push(o)),s&&b.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}b.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=b.ajaxSettings.xhr(),b.support.cors=!!Rn&&"withCredentials"in Rn,Rn=b.support.ajax=!!Rn,Rn&&b.ajaxTransport(function(n){if(!n.crossDomain||b.support.cors){var r;return{send:function(i,o){var a,s,u=n.xhr();if(n.username?u.open(n.type,n.url,n.async,n.username,n.password):u.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)u[s]=n.xhrFields[s];n.mimeType&&u.overrideMimeType&&u.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)u.setRequestHeader(s,i[s])}catch(l){}u.send(n.hasContent&&n.data||null),r=function(e,i){var s,l,c,p;try{if(r&&(i||4===u.readyState))if(r=t,a&&(u.onreadystatechange=b.noop,$n&&delete Pn[a]),i)4!==u.readyState&&u.abort();else{p={},s=u.status,l=u.getAllResponseHeaders(),"string"==typeof u.responseText&&(p.text=u.responseText);try{c=u.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,l)},n.async?4===u.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},b(e).unload($n)),Pn[a]=r),u.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+x+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n,r,i=this.createTween(e,t),o=Yn.exec(t),a=i.cur(),s=+a||0,u=1,l=20;if(o){if(n=+o[2],r=o[3]||(b.cssNumber[e]?"":"px"),"px"!==r&&s){s=b.css(i.elem,e,!0)||n||1;do u=u||".5",s/=u,b.style(i.elem,e,s+r);while(u!==(u=i.cur()/a)&&1!==u&&--l)}i.unit=r,i.start=s,i.end=o[1]?s+(o[1]+1)*n:n}return i}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=b.now()}function Zn(e,t){b.each(t,function(t,n){var r=(Qn[t]||[]).concat(Qn["*"]),i=0,o=r.length;for(;o>i;i++)if(r[i].call(e,t,n))return})}function er(e,t,n){var r,i,o=0,a=Gn.length,s=b.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;for(;u>a;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),1>o&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:b.extend({},t),opts:b.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=b.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?s.resolveWith(e,[l,t]):s.rejectWith(e,[l,t]),this}}),c=l.props;for(tr(c,l.opts.specialEasing);a>o;o++)if(r=Gn[o].call(l,e,c,l.opts))return r;return Zn(l,c),b.isFunction(l.opts.start)&&l.opts.start.call(e,l),b.fx.timer(b.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function tr(e,t){var n,r,i,o,a;for(i in e)if(r=b.camelCase(i),o=t[r],n=e[i],b.isArray(n)&&(o=n[1],n=e[i]=n[0]),i!==r&&(e[r]=n,delete e[i]),a=b.cssHooks[r],a&&"expand"in a){n=a.expand(n),delete e[r];for(i in n)i in e||(e[i]=n[i],t[i]=o)}else t[r]=o}b.Animation=b.extend(er,{tweener:function(e,t){b.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,u,l,c,p,f=this,d=e.style,h={},g=[],m=e.nodeType&&nn(e);n.queue||(c=b._queueHooks(e,"fx"),null==c.unqueued&&(c.unqueued=0,p=c.empty.fire,c.empty.fire=function(){c.unqueued||p()}),c.unqueued++,f.always(function(){f.always(function(){c.unqueued--,b.queue(e,"fx").length||c.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[d.overflow,d.overflowX,d.overflowY],"inline"===b.css(e,"display")&&"none"===b.css(e,"float")&&(b.support.inlineBlockNeedsLayout&&"inline"!==un(e.nodeName)?d.zoom=1:d.display="inline-block")),n.overflow&&(d.overflow="hidden",b.support.shrinkWrapBlocks||f.always(function(){d.overflow=n.overflow[0],d.overflowX=n.overflow[1],d.overflowY=n.overflow[2]}));for(i in t)if(a=t[i],Vn.exec(a)){if(delete t[i],u=u||"toggle"===a,a===(m?"hide":"show"))continue;g.push(i)}if(o=g.length){s=b._data(e,"fxshow")||b._data(e,"fxshow",{}),"hidden"in s&&(m=s.hidden),u&&(s.hidden=!m),m?b(e).show():f.done(function(){b(e).hide()}),f.done(function(){var t;b._removeData(e,"fxshow");for(t in h)b.style(e,t,h[t])});for(i=0;o>i;i++)r=g[i],l=f.createTween(r,m?s[r]:0),h[r]=s[r]||b.style(e,r),r in s||(s[r]=l.start,m&&(l.end=l.start,l.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}b.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(b.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?b.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=b.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){b.fx.step[e.prop]?b.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[b.cssProps[e.prop]]||b.cssHooks[e.prop])?b.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},b.each(["toggle","show","hide"],function(e,t){var n=b.fn[t];b.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),b.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=b.isEmptyObject(e),o=b.speed(t,n,r),a=function(){var t=er(this,b.extend({},e),o);a.finish=function(){t.stop(!0)},(i||b._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=b.timers,a=b._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&b.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=b._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=b.timers,a=r?r.length:0;for(n.finish=!0,b.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}b.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){b.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),b.speed=function(e,t,n){var r=e&&"object"==typeof e?b.extend({},e):{complete:n||!n&&t||b.isFunction(e)&&e,duration:e,easing:n&&t||t&&!b.isFunction(t)&&t};return r.duration=b.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in b.fx.speeds?b.fx.speeds[r.duration]:b.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){b.isFunction(r.old)&&r.old.call(this),r.queue&&b.dequeue(this,r.queue)},r},b.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},b.timers=[],b.fx=rr.prototype.init,b.fx.tick=function(){var e,n=b.timers,r=0;for(Xn=b.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||b.fx.stop(),Xn=t},b.fx.timer=function(e){e()&&b.timers.push(e)&&b.fx.start()},b.fx.interval=13,b.fx.start=function(){Un||(Un=setInterval(b.fx.tick,b.fx.interval))},b.fx.stop=function(){clearInterval(Un),Un=null},b.fx.speeds={slow:600,fast:200,_default:400},b.fx.step={},b.expr&&b.expr.filters&&(b.expr.filters.animated=function(e){return b.grep(b.timers,function(t){return e===t.elem}).length}),b.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){b.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,b.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},b.offset={setOffset:function(e,t,n){var r=b.css(e,"position");"static"===r&&(e.style.position="relative");var i=b(e),o=i.offset(),a=b.css(e,"top"),s=b.css(e,"left"),u=("absolute"===r||"fixed"===r)&&b.inArray("auto",[a,s])>-1,l={},c={},p,f;u?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),b.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(l.top=t.top-o.top+p),null!=t.left&&(l.left=t.left-o.left+f),"using"in t?t.using.call(e,l):i.css(l)}},b.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===b.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),b.nodeName(e[0],"html")||(n=e.offset()),n.top+=b.css(e[0],"borderTopWidth",!0),n.left+=b.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-b.css(r,"marginTop",!0),left:t.left-n.left-b.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||o.documentElement;while(e&&!b.nodeName(e,"html")&&"static"===b.css(e,"position"))e=e.offsetParent;return e||o.documentElement})}}),b.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);b.fn[e]=function(i){return b.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?b(a).scrollLeft():o,r?o:b(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return b.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}b.each({Height:"height",Width:"width"},function(e,n){b.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){b.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return b.access(this,function(n,r,i){var o;return b.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?b.css(n,r,s):b.style(n,r,i,s)},n,a?i:t,a,null)}})}),e.jQuery=e.$=b,"function"==typeof define&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return b})})(window);
+
+// Snap this specific version of jQuery into H5P. jQuery.noConflict will
+// revert the globals to what they were before this file was loaded.
+var H5P = window.H5P = window.H5P || {};
+
+/**
+ * jQuery v1.9.1
+ *
+ * @member
+ */
+H5P.jQuery = jQuery.noConflict(true);
+H5P.jQuery.ajaxPrefilter(function (s) {
+  if (s.crossDomain) {
+    s.contents.script = false;
+  }
+});
diff --git a/src/core/h5p/assets/js/request-queue.js b/src/core/h5p/assets/js/request-queue.js
new file mode 100644
index 000000000..5b367e147
--- /dev/null
+++ b/src/core/h5p/assets/js/request-queue.js
@@ -0,0 +1,436 @@
+/**
+ * Queue requests and handle them at your convenience
+ *
+ * @type {RequestQueue}
+ */
+H5P.RequestQueue = (function ($, EventDispatcher) {
+  /**
+   * A queue for requests, will be automatically processed when regaining connection
+   *
+   * @param {boolean} [options.showToast] Show toast when losing or regaining connection
+   * @constructor
+   */
+  const RequestQueue = function (options) {
+    EventDispatcher.call(this);
+    this.processingQueue = false;
+    options = options || {};
+
+    this.showToast = options.showToast;
+    this.itemName = 'requestQueue';
+  };
+
+  /**
+   * Add request to queue. Only supports posts currently.
+   *
+   * @param {string} url
+   * @param {Object} data
+   * @returns {boolean}
+   */
+  RequestQueue.prototype.add = function (url, data) {
+    if (!window.localStorage) {
+      return false;
+    }
+
+    let storedStatements = this.getStoredRequests();
+    if (!storedStatements) {
+      storedStatements = [];
+    }
+
+    storedStatements.push({
+      url: url,
+      data: data,
+    });
+
+    window.localStorage.setItem(this.itemName, JSON.stringify(storedStatements));
+
+    this.trigger('requestQueued', {
+      storedStatements: storedStatements,
+      processingQueue: this.processingQueue,
+    });
+    return true;
+  };
+
+  /**
+   * Get stored requests
+   *
+   * @returns {boolean|Array} Stored requests
+   */
+  RequestQueue.prototype.getStoredRequests = function () {
+    if (!window.localStorage) {
+      return false;
+    }
+
+    const item = window.localStorage.getItem(this.itemName);
+    if (!item) {
+      return [];
+    }
+
+    return JSON.parse(item);
+  };
+
+  /**
+   * Clear stored requests
+   *
+   * @returns {boolean} True if the storage was successfully cleared
+   */
+  RequestQueue.prototype.clearQueue = function () {
+    if (!window.localStorage) {
+      return false;
+    }
+
+    window.localStorage.removeItem(this.itemName);
+    return true;
+  };
+
+  /**
+   * Start processing of requests queue
+   *
+   * @return {boolean} Returns false if it was not possible to resume processing queue
+   */
+  RequestQueue.prototype.resumeQueue = function () {
+    // Not supported
+    if (!H5PIntegration || !window.navigator || !window.localStorage) {
+      return false;
+    }
+
+    // Already processing
+    if (this.processingQueue) {
+      return false;
+    }
+
+    // Attempt to send queued requests
+    const queue = this.getStoredRequests();
+    const queueLength = queue.length;
+
+    // Clear storage, failed requests will be re-added
+    this.clearQueue();
+
+    // No items left in queue
+    if (!queueLength) {
+      this.trigger('emptiedQueue', queue);
+      return true;
+    }
+
+    // Make sure requests are not changed while they're being handled
+    this.processingQueue = true;
+
+    // Process queue in original order
+    this.processQueue(queue);
+    return true
+  };
+
+  /**
+   * Process first item in the request queue
+   *
+   * @param {Array} queue Request queue
+   */
+  RequestQueue.prototype.processQueue = function (queue) {
+    if (!queue.length) {
+      return;
+    }
+
+    this.trigger('processingQueue');
+
+    // Make sure the requests are processed in a FIFO order
+    const request = queue.shift();
+
+    const self = this;
+    $.post(request.url, request.data)
+      .fail(self.onQueuedRequestFail.bind(self, request))
+      .always(self.onQueuedRequestProcessed.bind(self, queue))
+  };
+
+  /**
+   * Request fail handler
+   *
+   * @param {Object} request
+   */
+  RequestQueue.prototype.onQueuedRequestFail = function (request) {
+    // Queue the failed request again if we're offline
+    if (!window.navigator.onLine) {
+      this.add(request.url, request.data);
+    }
+  };
+
+  /**
+   * An item in the queue was processed
+   *
+   * @param {Array} queue Queue that was processed
+   */
+  RequestQueue.prototype.onQueuedRequestProcessed = function (queue) {
+    if (queue.length) {
+      this.processQueue(queue);
+      return;
+    }
+
+    // Finished processing this queue
+    this.processingQueue = false;
+
+    // Run empty queue callback with next request queue
+    const requestQueue = this.getStoredRequests();
+    this.trigger('queueEmptied', requestQueue);
+  };
+
+  /**
+   * Display toast message on the first content of current page
+   *
+   * @param {string} msg Message to display
+   * @param {boolean} [forceShow] Force override showing the toast
+   * @param {Object} [configOverride] Override toast message config
+   */
+  RequestQueue.prototype.displayToastMessage = function (msg, forceShow, configOverride) {
+    if (!this.showToast && !forceShow) {
+      return;
+    }
+
+    const config = H5P.jQuery.extend(true, {}, {
+      position: {
+        horizontal : 'centered',
+        vertical: 'centered',
+        noOverflowX: true,
+      }
+    }, configOverride);
+
+    H5P.attachToastTo(H5P.jQuery('.h5p-content:first')[0], msg, config);
+  };
+
+  return RequestQueue;
+})(H5P.jQuery, H5P.EventDispatcher);
+
+/**
+ * Request queue for retrying failing requests, will automatically retry them when you come online
+ *
+ * @type {offlineRequestQueue}
+ */
+H5P.OfflineRequestQueue = (function (RequestQueue, Dialog) {
+
+  /**
+   * Constructor
+   *
+   * @param {Object} [options] Options for offline request queue
+   * @param {Object} [options.instance] The H5P instance which UI components are placed within
+   */
+  const offlineRequestQueue = function (options) {
+    const requestQueue = new RequestQueue();
+
+    // We could handle requests from previous pages here, but instead we throw them away
+    requestQueue.clearQueue();
+
+    let startTime = null;
+    const retryIntervals = [10, 20, 40, 60, 120, 300, 600];
+    let intervalIndex = -1;
+    let currentInterval = null;
+    let isAttached = false;
+    let isShowing = false;
+    let isLoading = false;
+    const instance = options.instance;
+
+    const offlineDialog = new Dialog({
+      headerText: H5P.t('offlineDialogHeader'),
+      dialogText: H5P.t('offlineDialogBody'),
+      confirmText: H5P.t('offlineDialogRetryButtonLabel'),
+      hideCancel: true,
+      hideExit: true,
+      classes: ['offline'],
+      instance: instance,
+      skipRestoreFocus: true,
+    });
+
+    const dialog = offlineDialog.getElement();
+
+    // Add retry text to body
+    const countDownText = document.createElement('div');
+    countDownText.classList.add('count-down');
+    countDownText.innerHTML = H5P.t('offlineDialogRetryMessage')
+      .replace(':num', '<span class="count-down-num">0</span>');
+
+    dialog.querySelector('.h5p-confirmation-dialog-text').appendChild(countDownText);
+    const countDownNum = countDownText.querySelector('.count-down-num');
+
+    // Create throbber
+    const throbberWrapper = document.createElement('div');
+    throbberWrapper.classList.add('throbber-wrapper');
+    const throbber = document.createElement('div');
+    throbber.classList.add('sending-requests-throbber');
+    throbberWrapper.appendChild(throbber);
+
+    requestQueue.on('requestQueued', function (e) {
+      // Already processing queue, wait until queue has finished processing before showing dialog
+      if (e.data && e.data.processingQueue) {
+        return;
+      }
+
+      if (!isAttached) {
+        const rootContent = document.body.querySelector('.h5p-content');
+        if (!rootContent) {
+          return;
+        }
+        offlineDialog.appendTo(rootContent);
+        rootContent.appendChild(throbberWrapper);
+        isAttached = true;
+      }
+
+      startCountDown();
+    }.bind(this));
+
+    requestQueue.on('queueEmptied', function (e) {
+      if (e.data && e.data.length) {
+        // New requests were added while processing queue or requests failed again. Re-queue requests.
+        startCountDown(true);
+        return;
+      }
+
+      // Successfully emptied queue
+      clearInterval(currentInterval);
+      toggleThrobber(false);
+      intervalIndex = -1;
+      if (isShowing) {
+        offlineDialog.hide();
+        isShowing = false;
+      }
+
+      requestQueue.displayToastMessage(
+        H5P.t('offlineSuccessfulSubmit'),
+        true,
+        {
+          position: {
+            vertical: 'top',
+            offsetVertical: '100',
+          }
+        }
+      );
+
+    }.bind(this));
+
+    offlineDialog.on('confirmed', function () {
+      // Show dialog on next render in case it is being hidden by the 'confirm' button
+      isShowing = false;
+      setTimeout(function () {
+        retryRequests();
+      }, 100);
+    }.bind(this));
+
+    // Initialize listener for when requests are added to queue
+    window.addEventListener('online', function () {
+      retryRequests();
+    }.bind(this));
+
+    // Listen for queued requests outside the iframe
+    window.addEventListener('message', function (event) {
+      const isValidQueueEvent = window.parent === event.source
+        && event.data.context === 'h5p'
+        && event.data.action === 'queueRequest';
+
+      if (!isValidQueueEvent) {
+        return;
+      }
+
+      this.add(event.data.url, event.data.data);
+    }.bind(this));
+
+    /**
+     * Toggle throbber visibility
+     *
+     * @param {boolean} [forceShow] Will force throbber visibility if set
+     */
+    const toggleThrobber = function (forceShow) {
+      isLoading = !isLoading;
+      if (forceShow !== undefined) {
+        isLoading = forceShow;
+      }
+
+      if (isLoading && isShowing) {
+        offlineDialog.hide();
+        isShowing = false;
+      }
+
+      if (isLoading) {
+        throbberWrapper.classList.add('show');
+      }
+      else {
+        throbberWrapper.classList.remove('show');
+      }
+    };
+    /**
+     * Retries the failed requests
+     */
+    const retryRequests = function () {
+      clearInterval(currentInterval);
+      toggleThrobber(true);
+      requestQueue.resumeQueue();
+    };
+
+    /**
+     * Increments retry interval
+     */
+    const incrementRetryInterval = function () {
+      intervalIndex += 1;
+      if (intervalIndex >= retryIntervals.length) {
+        intervalIndex = retryIntervals.length - 1;
+      }
+    };
+
+    /**
+     * Starts counting down to retrying queued requests.
+     *
+     * @param forceDelayedShow
+     */
+    const startCountDown = function (forceDelayedShow) {
+      // Already showing, wait for retry
+      if (isShowing) {
+        return;
+      }
+
+      toggleThrobber(false);
+      if (!isShowing) {
+        if (forceDelayedShow) {
+          // Must force delayed show since dialog may be hiding, and confirmation dialog does not
+          //  support this.
+          setTimeout(function () {
+            offlineDialog.show(0);
+          }, 100);
+        }
+        else {
+          offlineDialog.show(0);
+        }
+      }
+      isShowing = true;
+      startTime = new Date().getTime();
+      incrementRetryInterval();
+      clearInterval(currentInterval);
+      currentInterval = setInterval(updateCountDown, 100);
+    };
+
+    /**
+     * Updates the count down timer. Retries requests when time expires.
+     */
+    const updateCountDown = function () {
+      const time = new Date().getTime();
+      const timeElapsed = Math.floor((time - startTime) / 1000);
+      const timeLeft = retryIntervals[intervalIndex] - timeElapsed;
+      countDownNum.textContent = timeLeft.toString();
+
+      // Retry interval reached, retry requests
+      if (timeLeft <= 0) {
+        retryRequests();
+      }
+    };
+
+    /**
+     * Add request to offline request queue. Only supports posts for now.
+     *
+     * @param {string} url The request url
+     * @param {Object} data The request data
+     */
+    this.add = function (url, data) {
+      // Only queue request if it failed because we are offline
+      if (window.navigator.onLine) {
+        return false;
+      }
+
+      requestQueue.add(url, data);
+    };
+  };
+
+  return offlineRequestQueue;
+})(H5P.RequestQueue, H5P.ConfirmationDialog);
diff --git a/src/core/h5p/assets/js/settings/h5p-disable-hub.js b/src/core/h5p/assets/js/settings/h5p-disable-hub.js
new file mode 100644
index 000000000..406e8b2d1
--- /dev/null
+++ b/src/core/h5p/assets/js/settings/h5p-disable-hub.js
@@ -0,0 +1,68 @@
+/* global H5PDisableHubData */
+
+/**
+ * Global data for disable hub functionality
+ *
+ * @typedef {object} H5PDisableHubData Data passed in from the backend
+ *
+ * @property {string} selector Selector for the disable hub check-button
+ * @property {string} overlaySelector Selector for the element that the confirmation dialog will mask
+ * @property {Array} errors Errors found with the current server setup
+ *
+ * @property {string} header Header of the confirmation dialog
+ * @property {string} confirmationDialogMsg Body of the confirmation dialog
+ * @property {string} cancelLabel Cancel label of the confirmation dialog
+ * @property {string} confirmLabel Confirm button label of the confirmation dialog
+ *
+ */
+/**
+ * Utility that makes it possible to force the user to confirm that he really
+ * wants to use the H5P hub without proper server settings.
+ */
+(function ($) {
+
+  $(document).on('ready', function () {
+
+    // No data found
+    if (!H5PDisableHubData) {
+      return;
+    }
+
+    // No errors found, no need for confirmation dialog
+    if (!H5PDisableHubData.errors || !H5PDisableHubData.errors.length) {
+      return;
+    }
+
+    H5PDisableHubData.selector = H5PDisableHubData.selector ||
+      '.h5p-settings-disable-hub-checkbox';
+    H5PDisableHubData.overlaySelector = H5PDisableHubData.overlaySelector ||
+      '.h5p-settings-container';
+
+    var dialogHtml = '<div>' +
+      '<p>' + H5PDisableHubData.errors.join('</p><p>') + '</p>' +
+      '<p>' + H5PDisableHubData.confirmationDialogMsg + '</p>';
+
+    // Create confirmation dialog, make sure to include translations
+    var confirmationDialog = new H5P.ConfirmationDialog({
+      headerText: H5PDisableHubData.header,
+      dialogText: dialogHtml,
+      cancelText: H5PDisableHubData.cancelLabel,
+      confirmText: H5PDisableHubData.confirmLabel
+    }).appendTo($(H5PDisableHubData.overlaySelector).get(0));
+
+    confirmationDialog.on('confirmed', function () {
+      enableButton.get(0).checked = true;
+    });
+
+    confirmationDialog.on('canceled', function () {
+      enableButton.get(0).checked = false;
+    });
+
+    var enableButton = $(H5PDisableHubData.selector);
+    enableButton.change(function () {
+      if ($(this).is(':checked')) {
+        confirmationDialog.show(enableButton.offset().top);
+      }
+    });
+  });
+})(H5P.jQuery);
diff --git a/src/core/h5p/assets/styles/h5p-admin.css b/src/core/h5p/assets/styles/h5p-admin.css
new file mode 100644
index 000000000..68306126f
--- /dev/null
+++ b/src/core/h5p/assets/styles/h5p-admin.css
@@ -0,0 +1,358 @@
+/* Administration interface styling */
+
+.h5p-content {
+  border: 1px solid #DDD;
+  border-radius: 3px;
+  padding: 10px;
+}
+
+.h5p-admin-table,
+.h5p-admin-table > tbody {
+  border: none;
+  width: 100%;
+}
+
+.h5p-admin-table tr:nth-child(odd),
+.h5p-data-view tr:nth-child(odd) {
+  background-color: #F9F9F9;
+}
+.h5p-admin-table tbody tr:hover {
+  background-color: #EEE;
+}
+.h5p-admin-table.empty {
+  padding: 1em;
+  background-color: #EEE;
+  font-size: 1.2em;
+  font-weight: bold;
+}
+
+.h5p-admin-table.libraries th:last-child,
+.h5p-admin-table.libraries td:last-child {
+  text-align: right;
+}
+
+.h5p-admin-buttons-wrapper {
+  white-space: nowrap;
+}
+
+.h5p-admin-table.libraries button {
+  font-size: 2em;
+  cursor: pointer;
+  border: 1px solid #AAA;
+  border-radius: .2em;
+  background-color: #e0e0e0;
+  text-shadow: 0 0 0.5em #fff;
+  padding: 0;
+  line-height: 1em;
+  width: 1.125em;
+  height: 1.05em;
+  text-indent: -0.125em;
+  margin: 0.125em 0.125em 0 0.125em;
+}
+.h5p-admin-upgrade-library:before {
+  font-family: 'H5P';
+  content: "\e888";
+}
+.h5p-admin-view-library:before {
+  font-family: 'H5P';
+  content: "\e889";
+}
+.h5p-admin-delete-library:before {
+  font-family: 'H5P';
+  content: "\e890";
+}
+
+.h5p-admin-table.libraries button:hover {
+  background-color: #d0d0d0;
+}
+.h5p-admin-table.libraries button:disabled:hover {
+  background-color: #e0e0e0;
+  cursor: default;
+}
+
+.h5p-admin-upgrade-library {
+  color: #339900;
+}
+.h5p-admin-view-library {
+  color: #0066cc;
+}
+.h5p-admin-delete-library {
+  color: #990000;
+}
+.h5p-admin-delete-library:disabled,
+.h5p-admin-upgrade-library:disabled {
+  cursor: default;
+  color: #c0c0c0;
+}
+
+.h5p-library-info {
+  padding: 1em 1em;
+  margin: 1em 0;
+
+  width: 350px;
+
+  border: 1px solid #DDD;
+  border-radius: 3px;
+}
+
+/* Labeled field (label + value) */
+.h5p-labeled-field {
+  border-bottom: 1px solid #ccc;
+}
+.h5p-labeled-field:last-child {
+  border-bottom: none;
+}
+
+.h5p-labeled-field .h5p-label {
+  display: inline-block;
+  min-width: 150px;
+  font-size: 1.2em;
+  font-weight: bold;
+  padding: 0.2em;
+}
+
+.h5p-labeled-field .h5p-value {
+  display: inline-block;
+  padding: 0.2em;
+}
+
+/* Search element */
+.h5p-content-search {
+  display: inline-block;
+  position: relative;
+
+  width: 100%;
+  padding: 5px 0;
+  margin-top: 10px;
+
+  border: 1px solid #CCC;
+  border-radius: 3px;
+  box-shadow: 2px 2px 5px #888888;
+}
+.h5p-content-search:before {
+  font-family: 'H5P';
+  vertical-align: bottom;
+  content: "\e88a";
+  font-size: 2em;
+  line-height: 1.25em;
+}
+.h5p-content-search input {
+  font-size: 120%;
+  line-height: 120%;
+}
+.h5p-admin-search-results {
+  margin-left: 10px;
+  color: #888;
+}
+
+.h5p-admin-pager-size-selector {
+  position: absolute;
+  right: 10px;
+  top: .75em;
+  display: inline-block;
+}
+.h5p-admin-pager-size-selector > span {
+  padding: 5px;
+  margin-left: 10px;
+  cursor: pointer;
+  border: 1px solid #CCC;
+  border-radius: 3px;
+}
+.h5p-admin-pager-size-selector > span.selected {
+  background-color: #edf5fa;
+}
+.h5p-admin-pager-size-selector > span:hover {
+  background-color: #555;
+  color: #FFF;
+}
+
+/* Generic "javascript"-action button */
+button.h5p-admin {
+  border: 1px solid #AAA;
+  border-radius: 5px;
+  padding: 3px 10px;
+  background-color: #EEE;
+  cursor: pointer;
+  display: inline-block;
+  text-align: center;
+  color: #222;
+}
+button.h5p-admin:hover {
+  background-color: #555;
+  color: #FFF;
+}
+button.h5p-admin.disabled,
+button.h5p-admin.disabled:hover {
+  cursor: auto;
+  color: #CCC;
+  background-color: #FFF;
+}
+
+/* Pager element */
+.h5p-content-pager {
+  display: inline-block;
+  border: 1px solid #CCC;
+  border-radius: 3px;
+  box-shadow: 2px 2px 5px #888888;
+  width: 100%;
+  text-align: center;
+  padding: 3px 0;
+}
+.h5p-content-pager > button {
+  min-width: 80px;
+  font-size: 130%;
+  line-height: 130%;
+  border: none;
+  background: none;
+  font-family: 'H5P';
+  font-size: 1.4em;
+}
+.h5p-content-pager > button:focus {
+  outline: 0;
+}
+.h5p-content-pager > button:last-child {
+  margin-left: 10px;
+}
+.h5p-content-pager > .pager-info {
+  cursor: pointer;
+  padding: 5px;
+  border-radius: 3px;
+}
+.h5p-content-pager > .pager-info:hover {
+  background-color: #555;
+  color: #FFF;
+}
+.h5p-content-pager > .pager-info,
+.h5p-content-pager > .h5p-pager-goto {
+  margin: 0 10px;
+  line-height: 130%;
+  display: inline-block;
+}
+
+.h5p-admin-header {
+  margin-top: 1.5em;
+}
+#h5p-library-upload-form.h5p-admin-upload-libraries-form,
+#h5p-content-type-cache-update-form.h5p-admin-upload-libraries-form {
+  position: relative;
+  margin: 0;
+
+}
+.h5p-admin-upload-libraries-form .form-submit {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
+.h5p-spinner {
+  padding: 0 0.5em;
+  font-size: 1.5em;
+  font-weight: bold;
+}
+#h5p-admin-container .h5p-admin-center {
+  text-align: center;
+}
+.h5p-pagination {
+  text-align: center;
+}
+.h5p-pagination > span, .h5p-pagination > input {
+  margin: 0 1em;
+}
+.h5p-data-view input[type="text"] {
+  margin-bottom: 0.5em;
+  margin-right: 0.5em;
+  float: left;
+}
+.h5p-data-view input[type="text"]::-ms-clear {
+  display: none;
+}
+
+.h5p-data-view .h5p-others-contents-toggler-wrapper {
+  float: right;
+  line-height: 2;
+  margin-right: 0.5em;
+}
+
+.h5p-data-view .h5p-others-contents-toggler-label {
+  font-size: 14px;
+}
+
+.h5p-data-view .h5p-others-contents-toggler {
+  margin-right: 0.5em;
+}
+
+.h5p-data-view th[role="button"] {
+  cursor: pointer;
+}
+.h5p-data-view th[role="button"].h5p-sort:after,
+.h5p-data-view th[role="button"]:hover:after,
+.h5p-data-view th[role="button"].h5p-sort.h5p-reverse:hover:after {
+  content: "\25BE";
+  position: relative;
+  left: 0.5em;
+  top: -1px;
+}
+.h5p-data-view th[role="button"].h5p-sort.h5p-reverse:after,
+.h5p-data-view th[role="button"].h5p-sort:hover:after {
+  content: "\25B4";
+  top: -2px;
+}
+.h5p-data-view th[role="button"]:hover:after,
+.h5p-data-view th[role="button"].h5p-sort.h5p-reverse:hover:after,
+.h5p-data-view th[role="button"].h5p-sort:hover:after {
+  color: #999;
+}
+.h5p-data-view .h5p-facet {
+  cursor: pointer;
+  color: #0073aa;
+  outline: none;
+}
+.h5p-data-view .h5p-facet:hover,
+.h5p-data-view .h5p-facet:active {
+  color: #00a0d2;
+}
+.h5p-data-view .h5p-facet:focus {
+  color: #124964;
+  box-shadow: 0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);
+}
+.h5p-data-view .h5p-facet-wrapper {
+  line-height: 23px;
+}
+.h5p-data-view .h5p-facet-tag {
+  margin: 2px 0 0 0.5em;
+  font-size: 12px;
+  background: #e8e8e8;
+  border: 1px solid #cbcbcc;
+  border-radius: 5px;
+  color: #5d5d5d;
+  padding: 0 24px 0 10px;
+  display: inline-block;
+  position: relative;
+}
+.h5p-data-view .h5p-facet-tag > span {
+  position: absolute;
+  right: 0;
+  top: auto;
+  bottom: auto;
+  font-size: 18px;
+  color: #a2a2a2;
+  outline: none;
+  width: 21px;
+  text-indent: 4px;
+  letter-spacing: 10px;
+  overflow: hidden;
+  cursor: pointer;
+}
+.h5p-data-view .h5p-facet-tag > span:before {
+  content: "×";
+  font-weight: bold;
+}
+.h5p-data-view .h5p-facet-tag > span:hover,
+.h5p-data-view .h5p-facet-tag > span:focus {
+  color: #a20000;
+}
+.h5p-data-view .h5p-facet-tag > span:active {
+  color: #d20000;
+}
+.content-upgrade-log {
+  color: red;
+}
diff --git a/src/core/h5p/assets/styles/h5p-confirmation-dialog.css b/src/core/h5p/assets/styles/h5p-confirmation-dialog.css
new file mode 100644
index 000000000..e849c23e6
--- /dev/null
+++ b/src/core/h5p/assets/styles/h5p-confirmation-dialog.css
@@ -0,0 +1,183 @@
+.h5p-confirmation-dialog-background {
+  position: fixed;
+  height: 100%;
+  width: 100%;
+  left: 0;
+  top: 0;
+
+  background: rgba(44, 44, 44, 0.9);
+  opacity: 1;
+  visibility: visible;
+  -webkit-transition: opacity 0.1s, linear 0s, visibility 0s linear 0s;
+  transition: opacity 0.1s linear 0s, visibility 0s linear 0s;
+
+  z-index: 201;
+}
+
+.h5p-confirmation-dialog-background.hidden {
+  display: none;
+}
+
+.h5p-confirmation-dialog-background.hiding {
+  opacity: 0;
+  visibility: hidden;
+  -webkit-transition: opacity 0.1s, linear 0s, visibility 0s linear 0.1s;
+  transition: opacity 0.1s linear 0s, visibility 0s linear 0.1s;
+}
+
+.h5p-confirmation-dialog-popup:focus {
+  outline: none;
+}
+
+.h5p-confirmation-dialog-popup {
+  position: absolute;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+
+  box-sizing: border-box;
+  max-width: 35em;
+  min-width: 25em;
+
+  top: 2em;
+  left: 50%;
+  -webkit-transform: translate(-50%, 0%);
+  -ms-transform: translate(-50%, 0%);
+  transform: translate(-50%, 0%);
+
+  color: #555;
+  box-shadow: 0 0 6px 6px rgba(10,10,10,0.3);
+
+  -webkit-transition: transform 0.1s ease-in;
+  transition: transform 0.1s ease-in;
+}
+
+.h5p-confirmation-dialog-popup.hidden {
+  -webkit-transform: translate(-50%, 50%);
+  -ms-transform: translate(-50%, 50%);
+  transform: translate(-50%, 50%);
+}
+
+.h5p-confirmation-dialog-header {
+  padding: 1.5em;
+  background: #fff;
+  color: #356593;
+}
+
+.h5p-confirmation-dialog-header-text {
+  font-size: 1.25em;
+}
+
+.h5p-confirmation-dialog-body {
+  background: #fafbfc;
+  border-top: solid 1px #dde0e9;
+  padding: 1.25em 1.5em;
+}
+
+.h5p-confirmation-dialog-text {
+  margin-bottom: 1.5em;
+}
+
+.h5p-confirmation-dialog-buttons {
+  float: right;
+}
+
+button.h5p-confirmation-dialog-exit:visited,
+button.h5p-confirmation-dialog-exit:link,
+button.h5p-confirmation-dialog-exit {
+  position: absolute;
+  background: none;
+  border: none;
+  font-size: 2.5em;
+  top: -0.9em;
+  right: -1.15em;
+  color: #fff;
+  cursor: pointer;
+  text-decoration: none;
+}
+
+button.h5p-confirmation-dialog-exit:focus,
+button.h5p-confirmation-dialog-exit:hover {
+  color: #E4ECF5;
+}
+
+.h5p-confirmation-dialog-exit:before {
+  font-family: "H5P";
+  content: "\e890";
+}
+
+.h5p-core-button.h5p-confirmation-dialog-confirm-button {
+  padding-left: 0.75em;
+  margin-bottom: 0;
+}
+
+.h5p-core-button.h5p-confirmation-dialog-confirm-button:before {
+  content: "\e601";
+  margin-top: -6px;
+  display: inline-block;
+}
+
+.h5p-confirmation-dialog-popup.offline .h5p-confirmation-dialog-buttons {
+  float: none;
+  text-align: center;
+}
+
+.h5p-confirmation-dialog-popup.offline .count-down {
+  font-family: Arial;
+  margin-top: 0.15em;
+  color: #000;
+}
+
+.h5p-confirmation-dialog-popup.offline .h5p-confirmation-dialog-confirm-button:before {
+  content: "\e90b";
+  font-weight: normal;
+  vertical-align: text-bottom;
+}
+
+.throbber-wrapper {
+  display: none;
+  position: absolute;
+  height: 100%;
+  width: 100%;
+  top: 0;
+  left: 0;
+  z-index: 1;
+  background: rgba(44, 44, 44, 0.9);
+}
+
+.throbber-wrapper.show {
+  display: block;
+}
+
+.throbber-wrapper .throbber-container {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.throbber-wrapper .sending-requests-throbber{
+  position: absolute;
+  top: 7em;
+  left: 50%;
+  transform: translateX(-50%);
+}
+
+.throbber-wrapper .sending-requests-throbber:before {
+  display: block;
+  font-family: 'H5P';
+  content: "\e90b";
+  color: white;
+  font-size: 10em;
+  animation: request-throbber 1.5s infinite linear;
+}
+
+@keyframes request-throbber {
+  from {
+    transform: rotate(0);
+  }
+
+  to {
+    transform: rotate(359deg);
+  }
+}
diff --git a/src/core/h5p/assets/styles/h5p-core-button.css b/src/core/h5p/assets/styles/h5p-core-button.css
new file mode 100644
index 000000000..e6511dc38
--- /dev/null
+++ b/src/core/h5p/assets/styles/h5p-core-button.css
@@ -0,0 +1,60 @@
+button.h5p-core-button:visited,
+button.h5p-core-button:link,
+button.h5p-core-button {
+  font-family: "Open Sans", sans-serif;
+  font-weight: 600;
+  font-size: 1em;
+  line-height: 1.2;
+  padding: 0.5em 1.25em;
+  border-radius: 2em;
+
+  background: #2579c6;
+  color: #fff;
+
+  cursor: pointer;
+  border: none;
+  box-shadow: none;
+  outline: none;
+
+  display: inline-block;
+  text-align: center;
+  text-shadow: none;
+  vertical-align: baseline;
+  text-decoration: none;
+
+  -webkit-transition: initial;
+  transition: initial;
+}
+button.h5p-core-button:focus {
+  background: #1f67a8;
+}
+button.h5p-core-button:hover {
+  background: rgba(31, 103, 168, 0.83);
+}
+button.h5p-core-button:active {
+  background: #104888;
+}
+button.h5p-core-button:before {
+  font-family: 'H5P';
+  padding-right: 0.15em;
+  font-size: 1.5em;
+  vertical-align: middle;
+  line-height: 0.7;
+}
+button.h5p-core-cancel-button:visited,
+button.h5p-core-cancel-button:link,
+button.h5p-core-cancel-button {
+  border: none;
+  background: none;
+  color: #a00;
+  margin-right: 1em;
+  font-size: 1em;
+  text-decoration: none;
+  cursor: pointer;
+}
+button.h5p-core-cancel-button:hover,
+button.h5p-core-cancel-button:focus {
+  background: none;
+  border: none;
+  color: #e40000;
+}
diff --git a/src/core/h5p/assets/styles/h5p.css b/src/core/h5p/assets/styles/h5p.css
new file mode 100644
index 000000000..1f89e4ead
--- /dev/null
+++ b/src/core/h5p/assets/styles/h5p.css
@@ -0,0 +1,566 @@
+/* General CSS for H5P. Licensed under the MIT License.*/
+
+/* Custom H5P font to use for icons. */
+@font-face {
+  font-family: 'h5p';
+  src:    url('../fonts/h5p-core-23.eot?mz1lkp');
+  src:    url('../fonts/h5p-core-23.eot?mz1lkp#iefix') format('embedded-opentype'),
+  url('../fonts/h5p-core-23.ttf?mz1lkp') format('truetype'),
+  url('../fonts/h5p-core-23.woff?mz1lkp') format('woff'),
+  url('../fonts/h5p-core-23.svg?mz1lkp#h5p') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
+html.h5p-iframe, html.h5p-iframe > body {
+  font-family: Sans-Serif; /* Use the browser's default sans-serif font. (Since Heletica doesn't look nice on Windows, and Arial on OS X.) */
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+}
+.h5p-semi-fullscreen, .h5p-fullscreen, html.h5p-iframe .h5p-container {
+  overflow: hidden;
+}
+.h5p-content {
+  position: relative;
+  background: #fefefe;
+  border: 1px solid #EEE;
+  border-bottom: none;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+}
+.h5p-noselect
+{
+  -khtml-user-select: none;
+  -ms-user-select: none;
+  -moz-user-select: none;
+  -webkit-user-select: none;
+  user-select: none;
+}
+html.h5p-iframe .h5p-content {
+  font-size: 16px;
+  line-height: 1.5em;
+  width: 100%;
+  height: auto;
+}
+html.h5p-iframe .h5p-fullscreen .h5p-content,
+html.h5p-iframe .h5p-semi-fullscreen .h5p-content {
+  height: 100%;
+}
+.h5p-content.h5p-no-frame,
+.h5p-fullscreen .h5p-content,
+.h5p-semi-fullscreen .h5p-content {
+  border: 0;
+}
+.h5p-container {
+  position: relative;
+  z-index: 1;
+}
+.h5p-iframe-wrapper.h5p-fullscreen {
+  background-color: #000;
+}
+body.h5p-semi-fullscreen {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+}
+.h5p-container.h5p-semi-fullscreen {
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 101;
+  width: 100%;
+  height: 100%;
+  background-color: #FFF;
+}
+
+.h5p-content-controls {
+  margin: 0;
+  position: absolute;
+  right: 0;
+  top: 0;
+  z-index: 3;
+}
+.h5p-fullscreen .h5p-content-controls {
+  display: none;
+}
+
+.h5p-content-controls > a:link, .h5p-content-controls > a:visited, a.h5p-disable-fullscreen:link, a.h5p-disable-fullscreen:visited {
+  color: #e5eef6;
+}
+
+.h5p-enable-fullscreen:before {
+  font-family: 'H5P';
+  content: "\e88c";
+}
+.h5p-disable-fullscreen:before {
+  font-family: 'H5P';
+  content: "\e891";
+}
+.h5p-enable-fullscreen, .h5p-disable-fullscreen {
+  cursor: pointer;
+  color: #EEE;
+  background: rgb(0,0,0);
+  background: rgba(0,0,0,0.3);
+  line-height: 0.975em;
+  font-size: 2em;
+  width: 1.125em;
+  height: 1em;
+  text-indent: 0.04em;
+}
+.h5p-disable-fullscreen {
+  line-height: 0.925em;
+  width: 1.1em;
+  height: 0.9em;
+}
+
+.h5p-enable-fullscreen:focus,
+.h5p-disable-fullscreen:focus {
+  outline-style: solid;
+  outline-width: 1px;
+  outline-offset: 0.25em;
+}
+
+.h5p-enable-fullscreen:hover, .h5p-disable-fullscreen:hover {
+  background: rgba(0,0,0,0.5);
+}
+.h5p-semi-fullscreen .h5p-enable-fullscreen {
+  display: none;
+}
+
+div.h5p-fullscreen {
+  width: 100%;
+  height: 100%;
+}
+.h5p-iframe-wrapper {
+  width: auto;
+  height: auto;
+}
+
+.h5p-fullscreen .h5p-iframe-wrapper,
+.h5p-semi-fullscreen .h5p-iframe-wrapper {
+  width: 100%;
+  height: 100%;
+}
+
+.h5p-iframe-wrapper.h5p-semi-fullscreen {
+  width: auto;
+  height: auto;
+  background: black;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 100001;
+}
+.h5p-iframe-wrapper.h5p-semi-fullscreen .buttons {
+  position: absolute;
+  top: 0;
+  right: 0;
+  z-index: 20;
+}
+.h5p-iframe-wrapper iframe.h5p-iframe {
+  /* Hack for IOS landscape / portrait */
+  width: 10px;
+  min-width: 100%;
+  *width: 100%;
+  /* End of hack */
+  height: 100%;
+  z-index: 10;
+  overflow: hidden;
+  border: 0;
+  display: block;
+}
+
+.h5p-content ul.h5p-actions {
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  overflow: hidden;
+  list-style: none;
+  padding: 0px 10px;
+  margin: 0;
+  height: 25px;
+  font-size: 12px;
+  background: #FAFAFA;
+  border-top: 1px solid #EEE;
+  border-bottom: 1px solid #EEE;
+  clear: both;
+  font-family: Sans-Serif;
+}
+.h5p-fullscreen .h5p-actions, .h5p-semi-fullscreen .h5p-actions {
+  display: none;
+}
+.h5p-actions > .h5p-button {
+  float: left;
+  cursor: pointer;
+  margin: 0 0.5em 0 0;
+  background: none;
+  padding: 0 0.75em 0 0.25em;
+  vertical-align: top;
+  color: #999;
+  text-decoration: none;
+  outline: none;
+  line-height: 23px;
+}
+.h5p-actions > .h5p-button:hover {
+  color: #666;
+}
+.h5p-actions > .h5p-button:active,
+.h5p-actions > .h5p-button:focus,
+.h5p-actions .h5p-link:active,
+.h5p-actions .h5p-link:focus {
+  color: #666;
+}
+.h5p-actions > .h5p-button:focus,
+.h5p-actions .h5p-link:focus {
+  outline-style: solid;
+  outline-width: thin;
+  outline-offset: -2px;
+  outline-color: #9ecaed;
+}
+.h5p-actions > .h5p-button:before {
+  font-family: 'H5P';
+  font-size: 20px;
+  line-height: 20px;
+  vertical-align: top;
+  padding-right: 0;
+}
+.h5p-actions > .h5p-button.h5p-export:before {
+  content: "\e90b";
+}
+.h5p-actions > .h5p-button.h5p-copyrights:before {
+  content: "\e88f";
+}
+.h5p-actions > .h5p-button.h5p-embed:before {
+  content: "\e892";
+}
+.h5p-actions .h5p-link {
+  float: right;
+  margin-right: 0;
+  font-size: 2.0em;
+  line-height: 23px;
+  overflow: hidden;
+  color: #999;
+  text-decoration: none;
+  outline: none;
+}
+.h5p-actions .h5p-link:before {
+  font-family: 'H5P';
+  content: "\e88e";
+  vertical-align: bottom;
+}
+.h5p-actions > li {
+  margin: 0;
+  list-style: none;
+}
+.h5p-popup-dialog {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  min-height: 100%;
+  z-index: 100;
+  padding: 2em;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  opacity: 0;
+  -webkit-transition: opacity 0.2s;
+  -moz-transition: opacity 0.2s;
+  -o-transition: opacity 0.2s;
+  transition: opacity 0.2s;
+  background:#000;
+  background:rgba(0,0,0,0.75);
+}
+.h5p-popup-dialog.h5p-open {
+  opacity: 1;
+}
+.h5p-popup-dialog .h5p-inner {
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  background: #fff;
+  height: 100%;
+  max-height: 100%;
+  position: relative;
+}
+.h5p-popup-dialog .h5p-inner > h2 {
+  position: absolute;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  width: 100%;
+  margin: 0;
+  background: #eee;
+  display: block;
+  color: #656565;
+  font-size: 1.25em;
+  padding: 0.325em 0.5em 0.25em;
+  line-height: 1.25em;
+  border-bottom: 1px solid #ccc;
+  z-index: 2;
+}
+.h5p-popup-dialog .h5p-inner > h2 > a {
+  font-size: 12px;
+  margin-left: 1em;
+}
+.h5p-embed-dialog .h5p-inner,
+.h5p-reuse-dialog .h5p-inner,
+.h5p-content-user-data-reset-dialog .h5p-inner {
+  min-width: 316px;
+  max-width: 400px;
+  left: 50%;
+  top: 50%;
+  transform: translateX(-50%);
+}
+.h5p-embed-dialog .h5p-embed-code-container,
+.h5p-embed-size {
+  resize: none;
+  outline: none;
+  width: 100%;
+  padding: 0.375em 0.5em 0.25em;
+  margin: 0;
+  overflow: hidden;
+  border: 1px solid #ccc;
+  box-shadow: 0 1px 2px 0 #d0d0d0 inset;
+  font-size: 0.875em;
+  letter-spacing: 0.065em;
+  font-family: sans-serif;
+  white-space: pre;
+  line-height: 1.5em;
+  height: 2.0714em;
+  background: #f5f5f5;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+}
+.h5p-embed-dialog .h5p-embed-code-container:focus {
+  height: 5em;
+}
+.h5p-embed-size {
+  width: 3.5em;
+  text-align: right;
+  margin: 0.5em 0;
+  line-height: 2em;
+}
+.h5p-popup-dialog .h5p-scroll-content {
+  border-top: 2.25em solid transparent;
+  padding: 1em;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  color: #555555;
+  z-index: 1;
+}
+.h5p-popup-dialog.h5p-open .h5p-scroll-content {
+  overflow: auto;
+  overflow-x: hidden;
+  overflow-y: auto;
+  height: 100%;
+}
+.h5p-popup-dialog .h5p-scroll-content::-webkit-scrollbar {
+  width: 8px;
+}
+.h5p-popup-dialog .h5p-scroll-content::-webkit-scrollbar-track {
+  background: #e0e0e0;
+}
+.h5p-popup-dialog .h5p-scroll-content::-webkit-scrollbar-thumb {
+  box-shadow: 0 0 10px #000 inset;
+  border-radius: 4px;
+}
+.h5p-popup-dialog .h5p-close {
+  cursor: pointer;
+}
+.h5p-popup-dialog .h5p-close:after {
+  font-family: 'H5P';
+  content: "\e894";
+  font-size: 2em;
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 1.125em;
+  height: 1.125em;
+  line-height: 1.125em;
+  color: #656565;
+  cursor: pointer;
+  text-indent: -0.065em;
+  z-index: 3
+}
+.h5p-popup-dialog .h5p-close:hover:after,
+.h5p-popup-dialog .h5p-close:focus:after {
+  color: #454545;
+}
+.h5p-popup-dialog .h5p-close:active:after {
+  color: #252525;
+}
+.h5p-poopup-dialog h2 {
+  margin: 0.25em 0 0.5em;
+}
+.h5p-popup-dialog h3 {
+  margin: 0.75em 0 0.25em;
+}
+.h5p-popup-dialog dl {
+  margin: 0.25em 0 0.75em;
+}
+.h5p-popup-dialog dt {
+  float: left;
+  margin: 0 0.75em 0 0;
+}
+.h5p-popup-dialog dt:after {
+  content: ':';
+}
+.h5p-popup-dialog dd {
+  margin: 0;
+}
+.h5p-expander {
+  cursor: pointer;
+  font-size: 1.125em;
+  outline: none;
+  margin: 0.5em 0 0;
+  display: inline-block;
+}
+.h5p-expander:before {
+  content: "+";
+  width: 1em;
+  display: inline-block;
+  font-weight: bold;
+}
+.h5p-expander.h5p-open:before {
+  content: "-";
+  text-indent: 0.125em;
+}
+.h5p-expander:hover,
+.h5p-expander:focus {
+  color: #303030;
+}
+.h5p-expander:active {
+  color: #202020;
+}
+.h5p-expander-content {
+  display: none;
+}
+.h5p-expander-content p {
+  margin: 0.5em 0;
+}
+.h5p-content-copyrights {
+  border-left: 0.25em solid #d0d0d0;
+  margin-left: 0.25em;
+  padding-left: 0.25em;
+}
+.h5p-throbber {
+  background: url('../images/throbber.gif?ver=1.2.1') 10px center no-repeat;
+  padding-left: 38px;
+  min-height: 30px;
+  line-height: 30px;
+}
+.h5p-dialog-ok-button {
+  cursor: default;
+  float: right;
+  outline: none;
+  border: 2px solid #ccc;
+  padding: 0.25em 0.75em 0.125em;
+  background: #eee;
+}
+.h5p-dialog-ok-button:hover,
+.h5p-dialog-ok-button:focus {
+  background: #fafafa;
+}
+.h5p-dialog-ok-button:active {
+  background: #eeffee;
+}
+.h5p-big-button {
+  line-height: 1.25;
+  display: block;
+  position: relative;
+  cursor: pointer;
+  width: 100%;
+  padding: 1em 1em 1em 3.75em;
+  text-align: left;
+  border: 1px solid #dedede;
+  background: linear-gradient(#ffffff, #f1f1f2);
+  border-radius: 0.25em;
+}
+.h5p-big-button:before {
+  font-family: 'h5p';
+  content: "\e893";
+  line-height: 1;
+  font-size: 3em;
+  color: #2747f7;
+  position: absolute;
+  left: 0.125em;
+  top: 0.125em;
+}
+.h5p-copy-button:before {
+  content: "\e905";
+}
+.h5p-big-button:hover {
+  border: 1px solid #2747f7;
+  background: #eff1fe;
+}
+.h5p-big-button:active {
+  border: 1px solid #dedede;
+  background: #dfe4fe;
+}
+.h5p-button-title {
+  color: #2747f7;
+  font-size: 15px;
+  font-weight: bold;
+  margin-bottom: 0.5em;
+}
+.h5p-button-description {
+  color: #757575;
+}
+.h5p-horizontal-line-text {
+  border-top: 1px solid #dadada;
+  line-height: 1;
+  color: #474747;
+  text-align: center;
+  position: relative;
+  margin: 1.25em 0;
+}
+.h5p-horizontal-line-text > span {
+  background: white;
+  padding: 0.5em;
+  position: absolute;
+  top: -1em;
+  left: 50%;
+  transform: translateX(-50%);
+}
+.h5p-toast {
+  font-size: 0.75em;
+  background-color: rgba(0, 0, 0, 0.9);
+  color: #fff;
+  z-index: 110;
+  position: absolute;
+  padding: 0 0.5em;
+  line-height: 2;
+  border-radius: 4px;
+  white-space: nowrap;
+  pointer-events: none;
+  top: 0;
+  opacity: 1;
+  visibility: visible;
+  transition: opacity 1s;
+}
+.h5p-toast-disabled {
+  opacity: 0;
+  visibility: hidden;
+}
+
+
+/* This is loaded as part of Core and not Editor since this needs to be outside the editor iframe */
+.h5peditor-semi-fullscreen {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 101;
+}
+iframe.h5peditor-semi-fullscreen {
+  background: #fff;
+  z-index: 100001;
+}
+
+.h5p-content.using-mouse *:not(textarea):focus {
+  outline: none !important;
+}

From fb898f6f05c1465a06dab262512caa3a1dbe7f06 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 22 Nov 2019 11:28:32 +0100
Subject: [PATCH 181/257] MOBILE-2235 h5p: Save content and create player

---
 src/assets/lang/en.json                       |   66 +
 .../h5p/components/h5p-player/h5p-player.ts   |   34 +-
 src/core/h5p/lang/en.json                     |   70 +-
 src/core/h5p/providers/h5p.ts                 | 1607 ++++++++++++++++-
 src/core/h5p/providers/utils.ts               |  343 +++-
 src/providers/file.ts                         |   15 +
 6 files changed, 2112 insertions(+), 23 deletions(-)

diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index e3d599345..0b7468465 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1550,7 +1550,73 @@
     "core.group": "Group",
     "core.groupsseparate": "Separate groups",
     "core.groupsvisible": "Visible groups",
+    "core.h5p.author": "Author",
+    "core.h5p.by": "by",
+    "core.h5p.cancellabel": "Cancel",
+    "core.h5p.ccattribution": "Attribution (CC BY)",
+    "core.h5p.ccattributionnc": "Attribution-NonCommercial (CC BY-NC)",
+    "core.h5p.ccattributionncnd": "Attribution-NonCommercial-NoDerivs (CC BY-NC-ND)",
+    "core.h5p.ccattributionncsa": "Attribution-NonCommercial-ShareAlike (CC BY-NC-SA)",
+    "core.h5p.ccattributionnd": "Attribution-NoDerivs (CC BY-ND)",
+    "core.h5p.ccattributionsa": "Attribution-ShareAlike (CC BY-SA)",
+    "core.h5p.changelog": "Changelog",
+    "core.h5p.close": "Close",
+    "core.h5p.confirmdialogbody": "Please confirm that you wish to proceed. This action is not reversible.",
+    "core.h5p.confirmdialogheader": "Confirm action",
+    "core.h5p.confirmlabel": "Confirm",
+    "core.h5p.connectionLost": "Connection lost. Results will be stored and sent when you regain connection.",
+    "core.h5p.connectionReestablished": "Connection reestablished.",
+    "core.h5p.contentCopied": "Content is copied to the clipboard",
+    "core.h5p.contentchanged": "This content has changed since you last used it.",
+    "core.h5p.contenttype": "Content Type",
+    "core.h5p.copyright": "Rights of use",
+    "core.h5p.copyrightstring": "Copyright",
+    "core.h5p.copyrighttitle": "View copyright information for this content.",
+    "core.h5p.disablefullscreen": "Disable fullscreen",
+    "core.h5p.download": "Download",
+    "core.h5p.downloadtitle": "Download this content as a H5P file.",
+    "core.h5p.embed": "Embed",
+    "core.h5p.embedtitle": "View the embed code for this content.",
+    "core.h5p.fullscreen": "Fullscreen",
+    "core.h5p.h5ptitle": "Visit H5P.org to check out more cool content.",
+    "core.h5p.hideadvanced": "Hide advanced",
+    "core.h5p.license": "License",
+    "core.h5p.licenseCC010": "CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
+    "core.h5p.licenseCC10": "1.0 Generic",
+    "core.h5p.licenseCC20": "2.0 Generic",
+    "core.h5p.licenseCC25": "2.5 Generic",
+    "core.h5p.licenseCC30": "3.0 Unported",
+    "core.h5p.licenseCC40": "4.0 International",
+    "core.h5p.licenseGPL": "General Public License",
+    "core.h5p.licenseV1": "Version 1",
+    "core.h5p.licenseV2": "Version 2",
+    "core.h5p.licenseV3": "Version 3",
+    "core.h5p.licenseextras": "License Extras",
+    "core.h5p.nocopyright": "No copyright information available for this content.",
+    "core.h5p.offlineDialogBody": "We were unable to send information about your completion of this task. Please check your internet connection.",
+    "core.h5p.offlineDialogHeader": "Your connection to the server was lost",
+    "core.h5p.offlineDialogRetryButtonLabel": "Retry now",
+    "core.h5p.offlineDialogRetryMessage": "Retrying in :num....",
+    "core.h5p.offlineSuccessfulSubmit": "Successfully submitted results.",
+    "core.h5p.pd": "Public Domain",
+    "core.h5p.pdm": "Public Domain Mark (PDM)",
     "core.h5p.play": "Play H5P",
+    "core.h5p.resizescript": "Include this script on your website if you want dynamic sizing of the embedded content:",
+    "core.h5p.resubmitScores": "Attempting to submit stored results.",
+    "core.h5p.reuse": "Reuse",
+    "core.h5p.reuseContent": "Reuse Content",
+    "core.h5p.reuseDescription": "Reuse this content.",
+    "core.h5p.showadvanced": "Show advanced",
+    "core.h5p.showless": "Show less",
+    "core.h5p.showmore": "Show more",
+    "core.h5p.size": "Size",
+    "core.h5p.source": "Source",
+    "core.h5p.startingover": "You'll be starting over.",
+    "core.h5p.sublevel": "Sublevel",
+    "core.h5p.thumbnail": "Thumbnail",
+    "core.h5p.title": "Title",
+    "core.h5p.undisclosed": "Undisclosed",
+    "core.h5p.year": "Year",
     "core.hasdatatosync": "This {{$a}} has offline data to be synchronised.",
     "core.help": "Help",
     "core.hide": "Hide",
diff --git a/src/core/h5p/components/h5p-player/h5p-player.ts b/src/core/h5p/components/h5p-player/h5p-player.ts
index e7ad45ce6..0627e89d6 100644
--- a/src/core/h5p/components/h5p-player/h5p-player.ts
+++ b/src/core/h5p/components/h5p-player/h5p-player.ts
@@ -16,6 +16,7 @@ import { Component, Input, ElementRef, OnInit, OnDestroy, OnChanges, SimpleChang
 import { CoreAppProvider } from '@providers/app';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreFilepoolProvider } from '@providers/filepool';
+import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
@@ -23,6 +24,7 @@ import { CoreUrlUtilsProvider } from '@providers/utils/url';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreH5PProvider } from '@core/h5p/providers/h5p';
 import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
+import { CoreConstants } from '@core/constants';
 
 /**
  * Component to render an H5P package.
@@ -47,8 +49,10 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
     protected siteCanDownload: boolean;
     protected observer;
     protected urlParams;
+    protected logger;
 
-    constructor(public elementRef: ElementRef,
+    constructor(loggerProvider: CoreLoggerProvider,
+            public elementRef: ElementRef,
             protected sitesProvider: CoreSitesProvider,
             protected urlUtils: CoreUrlUtilsProvider,
             protected utils: CoreUtilsProvider,
@@ -60,6 +64,7 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
             protected domUtils: CoreDomUtilsProvider,
             protected pluginFileDelegate: CorePluginFileDelegate) {
 
+        this.logger = loggerProvider.getInstance('CoreH5PPlayerComponent');
         this.siteId = sitesProvider.getCurrentSiteId();
         this.siteCanDownload = this.sitesProvider.getCurrentSite().canDownloadFiles();
     }
@@ -92,11 +97,30 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
 
         this.loading = true;
 
-        // @TODO: Check if package is downloaded and use the local player if so.
+        let promise;
 
-        // Get auto-login URL so the user is automatically authenticated.
-        this.sitesProvider.getCurrentSite().getAutoLoginUrl(this.src, false).then((url) => {
-            this.playerSrc = url;
+        if (this.canDownload && (this.state == CoreConstants.DOWNLOADED || this.state == CoreConstants.OUTDATED)) {
+            // Package is downloaded, use the local URL.
+            promise = this.h5pProvider.getContentIndexFileUrl(this.urlParams.url).catch((error) => {
+                // It seems there was something wrong when creating the index file. Delete the package?
+                this.logger.error('Error loading downloaded index:', error, this.src);
+            });
+        } else {
+            promise = Promise.resolve();
+        }
+
+        promise.then((url) => {
+            if (url) {
+                // Local package.
+                this.playerSrc = url;
+            } else {
+                // Get auto-login URL so the user is automatically authenticated.
+                return this.sitesProvider.getCurrentSite().getAutoLoginUrl(this.src, false).then((url) => {
+                    // Add the preventredirect param so the user can authenticate.
+                    this.playerSrc = this.urlUtils.addParamsToUrl(url, {preventredirect: false});
+                });
+            }
+        }).finally(() => {
             this.loading = false;
             this.showPackage = true;
         });
diff --git a/src/core/h5p/lang/en.json b/src/core/h5p/lang/en.json
index 954fa438a..0cffba19a 100644
--- a/src/core/h5p/lang/en.json
+++ b/src/core/h5p/lang/en.json
@@ -1,3 +1,69 @@
 {
-    "play": "Play H5P"
-}
\ No newline at end of file
+    "author": "Author",
+    "by": "by",
+    "cancellabel": "Cancel",
+    "ccattribution": "Attribution (CC BY)",
+    "ccattributionnc": "Attribution-NonCommercial (CC BY-NC)",
+    "ccattributionncnd": "Attribution-NonCommercial-NoDerivs (CC BY-NC-ND)",
+    "ccattributionncsa": "Attribution-NonCommercial-ShareAlike (CC BY-NC-SA)",
+    "ccattributionnd": "Attribution-NoDerivs (CC BY-ND)",
+    "ccattributionsa": "Attribution-ShareAlike (CC BY-SA)",
+    "changelog": "Changelog",
+    "close": "Close",
+    "confirmdialogbody": "Please confirm that you wish to proceed. This action is not reversible.",
+    "confirmdialogheader": "Confirm action",
+    "confirmlabel": "Confirm",
+    "connectionLost": "Connection lost. Results will be stored and sent when you regain connection.",
+    "connectionReestablished": "Connection reestablished.",
+    "contentCopied": "Content is copied to the clipboard",
+    "contentchanged": "This content has changed since you last used it.",
+    "contenttype": "Content Type",
+    "copyright": "Rights of use",
+    "copyrightstring": "Copyright",
+    "copyrighttitle": "View copyright information for this content.",
+    "disablefullscreen": "Disable fullscreen",
+    "download": "Download",
+    "downloadtitle": "Download this content as a H5P file.",
+    "embed": "Embed",
+    "embedtitle": "View the embed code for this content.",
+    "fullscreen": "Fullscreen",
+    "h5ptitle": "Visit H5P.org to check out more cool content.",
+    "hideadvanced": "Hide advanced",
+    "license": "License",
+    "licenseCC010": "CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
+    "licenseCC10": "1.0 Generic",
+    "licenseCC20": "2.0 Generic",
+    "licenseCC25": "2.5 Generic",
+    "licenseCC30": "3.0 Unported",
+    "licenseCC40": "4.0 International",
+    "licenseGPL": "General Public License",
+    "licenseV1": "Version 1",
+    "licenseV2": "Version 2",
+    "licenseV3": "Version 3",
+    "licenseextras": "License Extras",
+    "nocopyright": "No copyright information available for this content.",
+    "offlineDialogBody": "We were unable to send information about your completion of this task. Please check your internet connection.",
+    "offlineDialogHeader": "Your connection to the server was lost",
+    "offlineDialogRetryButtonLabel": "Retry now",
+    "offlineDialogRetryMessage": "Retrying in :num....",
+    "offlineSuccessfulSubmit": "Successfully submitted results.",
+    "pd": "Public Domain",
+    "pdm": "Public Domain Mark (PDM)",
+    "play": "Play H5P",
+    "resizescript": "Include this script on your website if you want dynamic sizing of the embedded content:",
+    "resubmitScores": "Attempting to submit stored results.",
+    "reuse": "Reuse",
+    "reuseContent": "Reuse Content",
+    "reuseDescription": "Reuse this content.",
+    "showadvanced": "Show advanced",
+    "showless": "Show less",
+    "showmore": "Show more",
+    "size": "Size",
+    "source": "Source",
+    "startingover": "You'll be starting over.",
+    "sublevel": "Sublevel",
+    "thumbnail": "Thumbnail",
+    "title": "Title",
+    "undisclosed": "Undisclosed",
+    "year": "Year"
+}
diff --git a/src/core/h5p/providers/h5p.ts b/src/core/h5p/providers/h5p.ts
index 012689ff8..57d674897 100644
--- a/src/core/h5p/providers/h5p.ts
+++ b/src/core/h5p/providers/h5p.ts
@@ -15,12 +15,15 @@
 import { Injectable } from '@angular/core';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreFileProvider } from '@providers/file';
+import { CoreFilepoolProvider } from '@providers/filepool';
 import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider, CoreSiteSchema } from '@providers/sites';
 import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { CoreWSExternalWarning, CoreWSExternalFile } from '@providers/ws';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
 import { CoreMimetypeUtilsProvider } from '@providers/utils/mimetype';
+import { CoreUrlUtilsProvider } from '@providers/utils/url';
+import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreH5PUtilsProvider } from './utils';
 
 /**
@@ -29,9 +32,48 @@ import { CoreH5PUtilsProvider } from './utils';
 @Injectable()
 export class CoreH5PProvider {
 
+    static STYLES = [
+        'styles/h5p.css',
+        'styles/h5p-confirmation-dialog.css',
+        'styles/h5p-core-button.css'
+    ];
+    static SCRIPTS = [
+        'js/jquery.js',
+        'js/h5p.js',
+        'js/h5p-event-dispatcher.js',
+        'js/h5p-x-api-event.js',
+        'js/h5p-x-api.js',
+        'js/h5p-content-type.js',
+        'js/h5p-confirmation-dialog.js',
+        'js/h5p-action-bar.js',
+        'js/request-queue.js',
+    ];
+    static ADMIN_SCRIPTS = [
+        'js/jquery.js',
+        'js/h5p-utils.js',
+    ];
+
+    // Disable flags
+    static DISABLE_NONE = 0;
+    static DISABLE_FRAME = 1;
+    static DISABLE_DOWNLOAD = 2;
+    static DISABLE_EMBED = 4;
+    static DISABLE_COPYRIGHT = 8;
+    static DISABLE_ABOUT = 16;
+
+    static DISPLAY_OPTION_FRAME = 'frame';
+    static DISPLAY_OPTION_DOWNLOAD = 'export';
+    static DISPLAY_OPTION_EMBED = 'embed';
+    static DISPLAY_OPTION_COPYRIGHT = 'copyright';
+    static DISPLAY_OPTION_ABOUT = 'icon';
+    static DISPLAY_OPTION_COPY = 'copy';
+
     protected CONTENT_TABLE = 'h5p_content'; // H5P content.
     protected LIBRARIES_TABLE = 'h5p_libraries'; // Installed libraries.
     protected LIBRARY_DEPENDENCIES_TABLE = 'h5p_library_dependencies'; // Library dependencies.
+    protected CONTENTS_LIBRARIES_TABLE = 'h5p_contents_libraries'; // Which library is used in which content.
+    protected LIBRARIES_CACHEDASSETS_TABLE = 'h5p_libraries_cachedassets'; // H5P cached library assets.
+    protected aggregateAssets = true; // Save all the assets from one package into a single file.
 
     protected siteSchema: CoreSiteSchema = {
         name: 'CoreH5PProvider',
@@ -65,6 +107,11 @@ export class CoreH5PProvider {
                         type: 'TEXT',
                         notNull: true
                     },
+                    {
+                        name: 'fileurl',
+                        type: 'TEXT',
+                        notNull: true
+                    },
                     {
                         name: 'filtered',
                         type: 'TEXT'
@@ -177,6 +224,63 @@ export class CoreH5PProvider {
                         notNull: true
                     }
                 ]
+            },
+            {
+                name: this.CONTENTS_LIBRARIES_TABLE,
+                columns: [
+                    {
+                        name: 'id',
+                        type: 'INTEGER',
+                        primaryKey: true,
+                        autoIncrement: true
+                    },
+                    {
+                        name: 'h5pid',
+                        type: 'INTEGER',
+                        notNull: true
+                    },
+                    {
+                        name: 'libraryid',
+                        type: 'INTEGER',
+                        notNull: true
+                    },
+                    {
+                        name: 'dependencytype',
+                        type: 'TEXT',
+                        notNull: true
+                    },
+                    {
+                        name: 'dropcss',
+                        type: 'INTEGER',
+                        notNull: true
+                    },
+                    {
+                        name: 'weight',
+                        type: 'INTEGER',
+                        notNull: true
+                    }
+                ]
+            },
+            {
+                name: this.LIBRARIES_CACHEDASSETS_TABLE,
+                columns: [
+                    {
+                        name: 'id',
+                        type: 'INTEGER',
+                        primaryKey: true,
+                        autoIncrement: true
+                    },
+                    {
+                        name: 'libraryid',
+                        type: 'INTEGER',
+                        notNull: true
+                    },
+                    {
+                        name: 'hash',
+                        type: 'TEXT',
+                        notNull: true
+                    }
+                ]
             }
         ]
     };
@@ -191,7 +295,10 @@ export class CoreH5PProvider {
             private textUtils: CoreTextUtilsProvider,
             private fileProvider: CoreFileProvider,
             private mimeUtils: CoreMimetypeUtilsProvider,
-            private h5pUtils: CoreH5PUtilsProvider) {
+            private h5pUtils: CoreH5PUtilsProvider,
+            private filepoolProvider: CoreFilepoolProvider,
+            private utils: CoreUtilsProvider,
+            private urlUtils: CoreUrlUtilsProvider) {
 
         this.logger = logger.getInstance('CoreH5PProvider');
 
@@ -204,6 +311,48 @@ export class CoreH5PProvider {
         });
     }
 
+    /**
+     * Will concatenate all JavaScrips and Stylesheets into two files in order to improve page performance.
+     *
+     * @param files A set of all the assets required for content to display.
+     * @param key Hashed key for cached asset.
+     * @param folderName Name of the folder of the H5P package.
+     * @param siteId The site ID.
+     * @return Promise resolved when done.
+     */
+    protected cacheAssets(files: {scripts: CoreH5PDependencyAsset[], styles: CoreH5PDependencyAsset[]}, key: string,
+            folderName: string, siteId: string): Promise<any> {
+
+        const promises = [];
+
+        for (const type in files) {
+            const assets: CoreH5PDependencyAsset[] = files[type];
+
+            if (!assets || !assets.length) {
+                continue;
+            }
+
+            // Create new file for cached assets.
+            const fileName = key + '.' + (type == 'scripts' ? 'js' : 'css'),
+                path = this.textUtils.concatenatePaths(this.getCachedAssetsFolderPath(folderName, siteId), fileName);
+
+            // Store concatenated content.
+            promises.push(this.concatenateFiles(assets, type).then((content) => {
+                return this.fileProvider.writeFile(path, content);
+            }).then(() => {
+                // Now update the files data.
+                files[type] = [
+                    {
+                        path: this.textUtils.concatenatePaths(this.getCachedAssetsFolderName(), fileName),
+                        version: ''
+                    }
+                ];
+            }));
+        }
+
+        return Promise.all(promises);
+    }
+
     /**
      * Returns whether or not WS to get trusted H5P file is available.
      *
@@ -252,6 +401,157 @@ export class CoreH5PProvider {
         });
     }
 
+    /**
+     * Adds all files of a type into one file.
+     *
+     * @param assets A list of files.
+     * @param type The type of files in assets. Either 'scripts' or 'styles'
+     * @return Promise resolved with all of the files content in one string.
+     */
+    protected concatenateFiles(assets: CoreH5PDependencyAsset[], type: string): Promise<string> {
+        let content = '',
+            promise = Promise.resolve(); // Use a chain of promises so the order is kept.
+
+        assets.forEach((asset) => {
+
+            promise = promise.then(() => {
+                return this.fileProvider.readFile(asset.path);
+            }).then((fileContent: string) => {
+                if (type == 'scripts') {
+                    content += fileContent + ';\n';
+                } else {
+                    // Rewrite relative URLs used inside stylesheets.
+                    const matches = fileContent.match(/url\([\'"]?([^"\')]+)[\'"]?\)/ig),
+                        assetPath = asset.path.replace(/(^\/|\/$)/g, ''), // Path without start/end slashes.
+                        treated = {};
+
+                    if (matches && matches.length) {
+                        matches.forEach((match) => {
+                            let url = match.replace(/(url\([\'"]?|[\'"]?\)$)/i, '');
+
+                            if (treated[url] || url.match(/^(data:|([a-z0-9]+:)?\/)/i)) {
+                                return; // Not relative or already treated, skip.
+                            }
+
+                            treated[url] = url;
+
+                            /* Find "../" in the URL. If it exists, we have to remove "../" and switch the last folder in the
+                               filepath for the first folder in the url.
+                               For instance:
+                               Path: /H5P.Question-1.4/styles/
+                               Url: ../images/plus-one.svg
+                               We want this: H5P.Question-1.4/images/ITEMID/minus-one.svg. */
+                            if (url.match(/^\.\.\//)) {
+                                const pathSplit = assetPath.split('/'),
+                                    urlSplit = url.split('/').filter((i) => {
+                                        return i; // Remove empty values.
+                                    });
+
+                                // Remove the first element: ../.
+                                urlSplit.unshift();
+
+                                // Put the url's first folder into the asset path.
+                                pathSplit[pathSplit.length - 1] = urlSplit[0];
+                                urlSplit.shift();
+
+                                // Create the new URL and replace it in the file contents.
+                                url = '/' + pathSplit.join('/') + '/' + urlSplit.join('/');
+
+                                fileContent = fileContent.replace(new RegExp(this.textUtils.escapeForRegex(match), 'g'),
+                                        'url("' + url + '")');
+                            }
+                        });
+                    }
+
+                    content += fileContent + '\n';
+                }
+            });
+        });
+
+        return promise.then(() => {
+            return content;
+        });
+    }
+
+    /**
+     * Create the index.html to render an H5P package.
+     *
+     * @param id Content ID.
+     * @param h5pUrl The URL of the H5P file.
+     * @param content Content data.
+     * @param embedType Embed type. The app will always use 'iframe'.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the URL of the index file.
+     */
+    createContentIndex(id: number, h5pUrl: string, content: CoreH5PContentData, embedType: string, siteId?: string)
+            : Promise<string> {
+
+        return this.sitesProvider.getSite(siteId).then((site) => {
+
+            const disable = typeof content.disable != 'undefined' && content.disable != null ?
+                    content.disable : CoreH5PProvider.DISABLE_NONE,
+                displayOptions = this.getDisplayOptionsForView(disable, id),
+                contentId = this.getContentId(id),
+                basePath = this.fileProvider.getBasePathInstant(),
+                contentUrl = this.textUtils.concatenatePaths(basePath, this.getContentFolderPath(content.folderName, site.getId()));
+
+            // Create the settings needed for the content.
+            const contentSettings = {
+                library: this.libraryToString(content.library),
+                fullScreen: content.library.fullscreen,
+                exportUrl: '', // We'll never display the download button, so we don't need the exportUrl.
+                embedCode: this.getEmbedCode(site.getURL(), h5pUrl, displayOptions[CoreH5PProvider.DISPLAY_OPTION_EMBED]),
+                resizeCode: this.getResizeCode(),
+                title: content.slug,
+                displayOptions: displayOptions,
+                url: this.getEmbedUrl(site.getURL(), h5pUrl),
+                contentUrl: contentUrl,
+                metadata: content.metadata,
+                contentUserData: {
+                    0: {
+                        state: '{}'
+                    }
+                }
+            };
+
+            // Get the core H5P assets, needed by the H5P classes to render the H5P content.
+            return this.getAssets(id, content, embedType, site.getId()).then((result) => {
+                result.settings.contents[contentId] = Object.assign(result.settings.contents[contentId], contentSettings);
+
+                const indexPath = this.getContentIndexPath(content.folderName, siteId);
+                let html = '<html><head><title>' + content.title + '</title>' +
+                        '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">';
+
+                // @todo: Load the embed.js to allow communication with the parent window.
+                // $PAGE->requires->js(new moodle_url('/h5p/js/embed.js'));
+
+                // Include the required CSS.
+                result.cssRequires.forEach((cssUrl) => {
+                    html += '<link rel="stylesheet" type="text/css" href="' + cssUrl + '">';
+                });
+
+                // Add the settings.
+                html += '<script type="text/javascript">var H5PIntegration = ' + JSON.stringify(result.settings) + '</script>';
+
+                html += '</head><body>';
+
+                // Include the required JS at the beginning of the body, like Moodle web does.
+                result.jsRequires.forEach((jsUrl) => {
+                    html += '<script type="text/javascript" src="' + jsUrl + '"></script>';
+                });
+
+                html += '<div class="h5p-iframe-wrapper">' +
+                        '<iframe id="h5p-iframe-' + id + '" class="h5p-iframe" data-content-id="' + id + '"' +
+                            'style="height:1px; min-width: 100%" src="about:blank"></iframe>' +
+                        '</div></body>';
+
+                return this.fileProvider.writeFile(indexPath, html);
+            }).then((fileEntry) => {
+                return fileEntry.toURL();
+            });
+        });
+    }
+
     /**
      * Delete all the H5P data from the DB of a certain site.
      *
@@ -263,11 +563,56 @@ export class CoreH5PProvider {
             return Promise.all([
                 db.deleteRecords(this.CONTENT_TABLE),
                 db.deleteRecords(this.LIBRARIES_TABLE),
-                db.deleteRecords(this.LIBRARY_DEPENDENCIES_TABLE)
+                db.deleteRecords(this.LIBRARY_DEPENDENCIES_TABLE),
+                db.deleteRecords(this.CONTENTS_LIBRARIES_TABLE)
             ]);
         });
     }
 
+    /**
+     * Delete cached assets from DB and filesystem.
+     *
+     * @param libraryId Library identifier.
+     * @param folderName Name of the folder of the H5P package.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    protected deleteCachedAssets(libraryId: number, folderName: string, siteId?: string): Promise<any> {
+
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            const db = site.getDb(),
+                cachedAssetsFolder = this.getCachedAssetsFolderPath(folderName, site.getId());
+
+            // Get all the hashes that use this library.
+            return db.getRecords(this.LIBRARIES_CACHEDASSETS_TABLE, {libraryid: libraryId}).then((entries) => {
+                // Delete the files with these hashes.
+                const promises = [],
+                    hashes = [];
+
+                entries.forEach((entry) => {
+                    hashes.push(entry.hash);
+
+                    ['js', 'css'].forEach((type) => {
+                        const path = this.textUtils.concatenatePaths(cachedAssetsFolder, entry.hash + '.' + type);
+
+                        promises.push(this.fileProvider.removeFile(path).catch(() => {
+                            // Ignore errors, maybe there's no cached asset of this type.
+                        }));
+                    });
+                });
+
+                // Also, delete the index.html file.
+                promises.push(this.fileProvider.removeFile(this.getContentIndexPath(folderName, site.getId())).catch(() => {
+                    // Ignore errors.
+                }));
+
+                return Promise.all(promises).then(() => {
+                    return db.deleteRecordsList(this.LIBRARIES_CACHEDASSETS_TABLE, 'hash', hashes);
+                });
+            });
+        });
+    }
+
     /**
      * Delete content data from DB.
      *
@@ -276,9 +621,17 @@ export class CoreH5PProvider {
      * @return Promise resolved when done.
      */
     deleteContentData(id: number, siteId?: string): Promise<any> {
-        return this.sitesProvider.getSiteDb(siteId).then((db) => {
+        const promises = [];
+
+        // Delete the content data.
+        promises.push(this.sitesProvider.getSiteDb(siteId).then((db) => {
             return db.deleteRecords(this.CONTENT_TABLE, {id: id});
-        });
+        }));
+
+        // Remove content library dependencies.
+        promises.push(this.deleteLibraryUsage(id, siteId));
+
+        return Promise.all(promises);
     }
 
     /**
@@ -319,6 +672,19 @@ export class CoreH5PProvider {
         return this.fileProvider.removeDir(this.getLibraryFolderPath(libraryData, siteId, folderName));
     }
 
+    /**
+     * Delete what libraries a content item is using.
+     *
+     * @param id Package ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    deleteLibraryUsage(id: number, siteId?: string): Promise<any> {
+        return this.sitesProvider.getSiteDb(siteId).then((db) => {
+            return db.deleteRecords(this.CONTENTS_LIBRARIES_TABLE, {h5pid: id});
+        });
+    }
+
     /**
      * Extract an H5P file. Some of this code was copied from the isValidPackage function in Moodle's H5PValidator.
      * This function won't validate most things because it should've been done by the server already.
@@ -350,7 +716,7 @@ export class CoreH5PProvider {
                 const content: any = {};
 
                 // Save the libraries that were processed.
-                return this.saveLibraries(data.librariesJsonData, siteId).then(() => {
+                return this.saveLibraries(data.librariesJsonData, folderName, siteId).then(() => {
                     // Now treat contents.
 
                     // Find main library version
@@ -368,7 +734,7 @@ export class CoreH5PProvider {
                     // Save the content data in DB.
                     content.params = JSON.stringify(data.contentJsonData);
 
-                    return this.saveContentData(content, folderName, siteId);
+                    return this.saveContentData(content, folderName, fileUrl, siteId);
                 }).then(() => {
                     // Save the content files in their right place.
                     const contentPath = this.textUtils.concatenatePaths(destFolder, 'content');
@@ -386,9 +752,374 @@ export class CoreH5PProvider {
                     return this.fileProvider.removeDir(destFolder).catch(() => {
                         // Ignore errors, it will be deleted eventually.
                     });
+                }).then(() => {
+                    // Create the content player.
+
+                    return this.loadContentData(content.id, undefined, siteId).then((contentData) => {
+                        const embedType = this.h5pUtils.determineEmbedType(contentData.embedType, contentData.library.embedTypes);
+
+                        return this.createContentIndex(content.id, fileUrl, contentData, embedType, siteId);
+                    });
+                });
+            });
+        });
+    }
+
+    /**
+     * Filter content run parameters and rebuild content dependency cache.
+     *
+     * @param content Content data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the filtered params, resolved with null if error.
+     */
+    filterParameters(content: CoreH5PContentData, siteId?: string): Promise<string> {
+        siteId = siteId || this.sitesProvider.getCurrentSiteId();
+
+        if (content.filtered) {
+            return Promise.resolve(content.filtered);
+        }
+
+        if (typeof content.library == 'undefined' || typeof content.params == 'undefined') {
+            return Promise.resolve(null);
+        }
+
+        const dependencies = {}, // In web, dependencies are built by the validator.
+            params = {
+                library: this.libraryToString(content.library),
+                params: this.textUtils.parseJSON(content.params, false)
+            };
+
+        if (!params.params) {
+            return null;
+        }
+
+        // Get the main library data.
+        return this.loadLibrary(content.library.name, content.library.majorVersion, content.library.minorVersion, siteId)
+                .then((library) => {
+
+            library.semantics = this.textUtils.parseJSON(library.semantics, '');
+
+            const depKey = 'preloaded-' + library.machineName;
+            let nextWeight;
+
+            if (!dependencies[depKey]) {
+                dependencies[depKey] = {
+                    library: library,
+                    type: 'preloaded'
+                };
+            }
+
+            // Get the whole library dependency tree.
+            return this.findLibraryDependencies(dependencies, library, 1, false, siteId).then((weight) => {
+                nextWeight = weight;
+                dependencies[depKey].weight = nextWeight++;
+
+                // Handle addons.
+                return this.loadAddons(siteId);
+            }).then((addons) => {
+                // Get the dependencies of all the addons. Use a chain of promises to calculate the weight properly.
+                let promise = Promise.resolve();
+
+                addons.forEach((addon) => {
+                    const addTo = this.textUtils.parseJSON(addon.addTo, null);
+
+                    if (addTo && addTo.content && addTo.content.types && addTo.content.types.length) {
+                        for (let i = 0; i < addTo.content.types.length; i++) {
+                            const type = addTo.content.types[i];
+
+                            if (type && type.text && type.text.regex &&
+                                    this.h5pUtils.textAddonMatches(params.params, type.text.regex)) {
+
+                                const addonDepKey = 'preloaded-' + addon.machineName;
+                                dependencies[addonDepKey] = {
+                                    library: addon,
+                                    type: 'preloaded'
+                                };
+
+                                promise = promise.then(() => {
+                                    return this.findLibraryDependencies(dependencies, addon, nextWeight).then((weight) => {
+                                        nextWeight = weight;
+                                        dependencies[addonDepKey].weight = nextWeight++;
+                                    });
+                                });
+
+                                break;
+                            }
+                        }
+                    }
                 });
 
-                // @todo: Load content? It's done in the player construct.
+                return promise;
+            }).then(() => {
+                // Update content dependencies.
+                content.dependencies = dependencies;
+
+                const paramsStr = JSON.stringify(params.params);
+
+                // Sometimes the parameters are filtered before content has been created
+                if (content.id) {
+                    // Update library usage.
+                    return this.deleteLibraryUsage(content.id, siteId).catch(() => {
+                        // Ignore errors.
+                    }).then(() => {
+                        return this.saveLibraryUsage(content.id, content.dependencies, siteId);
+                    }).then(() => {
+                        if (!content.slug) {
+                            content.slug = this.h5pUtils.slugify(content.title);
+                        }
+
+                        // Cache.
+                        return this.updateContentFields(content.id, {filtered: paramsStr}, siteId).then(() => {
+                            return paramsStr;
+                        });
+                    });
+                }
+
+                return paramsStr;
+            });
+        }).catch(() => {
+            return null;
+        });
+    }
+
+    /**
+     * Recursive. Goes through the dependency tree for the given library and
+     * adds all the dependencies to the given array in a flat format.
+     *
+     * @param dependencies Object where to save the dependencies.
+     * @param library The library to find all dependencies for.
+     * @param nextWeight An integer determining the order of the libraries when they are loaded.
+     * @param editor Used internally to force all preloaded sub dependencies of an editor dependency to be editor dependencies.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the next weight.
+     */
+    findLibraryDependencies(dependencies: {[key: string]: CoreH5PContentDepsTreeDependency},
+            library: CoreH5PLibraryData | CoreH5PLibraryAddonData, nextWeight: number = 1, editor: boolean = false,
+            siteId?: string): Promise<number> {
+
+        siteId = siteId || this.sitesProvider.getCurrentSiteId();
+
+        let promise = Promise.resolve(); // We need to create a chain of promises to calculate the weight properly.
+
+        ['dynamic', 'preloaded', 'editor'].forEach((type) => {
+            const property = type + 'Dependencies';
+
+            if (!library[property]) {
+                return; // Skip, no such dependencies.
+            }
+
+            if (type === 'preloaded' && editor) {
+                // All preloaded dependencies of an editor library is set to editor.
+                type = 'editor';
+            }
+
+            library[property].forEach((dependency: CoreH5PLibraryBasicData) => {
+                const dependencyKey = type + '-' + dependency.machineName;
+                if (dependencies[dependencyKey]) {
+                    return; // Skip, already have this.
+                }
+
+                promise = promise.then(() => {
+                    // Get the dependency library data and its subdependencies.
+                    return this.loadLibrary(dependency.machineName, dependency.majorVersion, dependency.minorVersion, siteId)
+                        .then((dependencyLibrary) => {
+
+                        dependencies[dependencyKey] = {
+                            library: dependencyLibrary,
+                            type: type
+                        };
+
+                        // Get all its subdependencies.
+                        return this.findLibraryDependencies(dependencies, dependencyLibrary, nextWeight, type === 'editor', siteId);
+                    }).then((weight) => {
+                        nextWeight = weight;
+                        dependencies[dependencyKey].weight = nextWeight++;
+                    });
+                });
+            });
+        });
+
+        return promise.then(() => {
+            return nextWeight;
+        });
+    }
+
+    /**
+     * Get the assets of a package.
+     *
+     * @param id Content id.
+     * @param content Content data.
+     * @param embedType Embed type.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the assets.
+     */
+    protected getAssets(id: number, content: CoreH5PContentData, embedType: string, siteId?: string)
+            : Promise<{settings: any, cssRequires: string[], jsRequires: string[]}> {
+
+        siteId = siteId || this.sitesProvider.getCurrentSiteId();
+
+        const cssRequires = [],
+              jsRequires = [],
+              contentId = this.getContentId(id);
+        let settings;
+
+        return this.getCoreSettings(id, siteId).then((coreSettings) => {
+            settings = coreSettings;
+
+            settings.core = {
+              styles: [],
+              scripts: []
+            };
+            settings.loadedJs = [];
+            settings.loadedCss = [];
+
+            const libUrl = this.getCoreH5PPath(),
+                relPath = this.urlUtils.removeProtocolAndWWW(libUrl);
+
+            // Add core stylesheets.
+            CoreH5PProvider.STYLES.forEach((style) => {
+                settings.core.styles.push(relPath + style);
+                cssRequires.push(libUrl + style);
+            });
+
+            // Add core JavaScript.
+            this.getScripts().forEach((script) => {
+                settings.core.scripts.push(script);
+                jsRequires.push(script);
+            });
+
+            /* The filterParameters function should be called before getting the dependency files because it rebuilds content
+               dependency cache. */
+            return this.filterParameters(content, siteId);
+        }).then((params) => {
+            settings.contents = settings.contents || {};
+            settings.contents[contentId] = settings.contents[contentId] || {};
+            settings.contents[contentId].jsonContent = params;
+
+            return this.getContentDependencyFiles(id, content.folderName, siteId);
+        }).then((files) => {
+
+            // H5P checks the embedType in here, but we'll always use iframe so there's no need to do it.
+            // JavaScripts and stylesheets will be loaded through h5p.js.
+            settings.contents[contentId].scripts = this.h5pUtils.getAssetsUrls(files.scripts);
+            settings.contents[contentId].styles = this.h5pUtils.getAssetsUrls(files.styles);
+
+            return {
+                settings: settings,
+                cssRequires: cssRequires,
+                jsRequires: jsRequires
+            };
+        });
+    }
+
+    /**
+     * Will check if there are cache assets available for content.
+     *
+     * @param key Hashed key for cached asset
+     * @param folderName Name of the folder of the H5P package.
+     * @param siteId The site ID.
+     * @return Promise resolved with the files.
+     */
+    getCachedAssets(key: string, folderName: string, siteId: string)
+            : Promise<{scripts?: CoreH5PDependencyAsset[], styles?: CoreH5PDependencyAsset[]}> {
+
+        const files: {scripts?: CoreH5PDependencyAsset[], styles?: CoreH5PDependencyAsset[]} = {},
+            promises = [],
+            cachedAssetsName = this.getCachedAssetsFolderName(),
+            jsPath = this.textUtils.concatenatePaths(cachedAssetsName, key + '.js'),
+            cssPath = this.textUtils.concatenatePaths(cachedAssetsName, key + '.css');
+        let found = false;
+
+        promises.push(this.fileProvider.getFileSize(jsPath).then((size) => {
+            if (size > 0) {
+                found = true;
+                files.scripts = [
+                    {
+                        path: jsPath,
+                        version: ''
+                    }
+                ];
+            }
+        }).catch(() => {
+            // Not found.
+        }));
+
+        promises.push(this.fileProvider.getFileSize(cssPath).then((size) => {
+            if (size > 0) {
+                found = true;
+                files.styles = [
+                    {
+                        path: cssPath,
+                        version: ''
+                    }
+                ];
+            }
+        }).catch(() => {
+            // Not found.
+        }));
+
+        return Promise.all(promises).then(() => {
+            return found ? files : null;
+        });
+    }
+
+    /**
+     * Get folder name of the content cached assets.
+     *
+     * @return Name.
+     */
+    getCachedAssetsFolderName(): string {
+        return 'cachedassets';
+    }
+
+    /**
+     * Get relative path to a content cached assets.
+     *
+     * @param folderName Name of the folder of the content the assets belong to.
+     * @param siteId Site ID.
+     * @return Path.
+     */
+    getCachedAssetsFolderPath(folderName: string, siteId: string): string {
+        return this.textUtils.concatenatePaths(this.getContentFolderPath(folderName, siteId), this.getCachedAssetsFolderName());
+    }
+
+    /**
+     * Get the identifier for the H5P content. This identifier is different than the ID stored in the DB.
+     *
+     * @param id Package ID.
+     * @return Content identifier.
+     */
+    protected getContentId(id: number): string {
+        return 'cid-' + id;
+    }
+
+    /**
+     * Get conent data from DB.
+     *
+     * @param id Content ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the content data.
+     */
+    protected getContentData(id: number, siteId?: string): Promise<CoreH5PContentDBData> {
+        return this.sitesProvider.getSiteDb(siteId).then((db) => {
+            return db.getRecord(this.CONTENT_TABLE, {id: id});
+        });
+    }
+
+    /**
+     * Get conent data from DB.
+     *
+     * @param fileUrl H5P file URL.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the content data.
+     */
+    protected getContentDataByUrl(fileUrl: string, siteId?: string): Promise<CoreH5PContentDBData> {
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            const db = site.getDb();
+
+            return this.getContentFolderNameByUrl(fileUrl, site.getId()).then((folderName) => {
+
+                return db.getRecord(this.CONTENT_TABLE, {foldername: folderName});
             });
         });
     }
@@ -401,7 +1132,339 @@ export class CoreH5PProvider {
      * @return Folder path.
      */
     getContentFolderPath(folderName: string, siteId: string): string {
-        return this.textUtils.concatenatePaths(this.fileProvider.getSiteFolder(siteId), 'h5p/packages/' + folderName + '/content');
+        return this.textUtils.concatenatePaths(this.getExternalH5PFolderPath(siteId), 'packages/' + folderName + '/content');
+    }
+
+    /**
+     * Get the content index file.
+     *
+     * @param fileUrl URL of the H5P package.
+     * @param siteId The site ID. If not defined, current site.
+     * @return Promise resolved with the file URL if exists, rejected otherwise.
+     */
+    getContentIndexFileUrl(fileUrl: string, siteId?: string): Promise<string> {
+        siteId = siteId || this.sitesProvider.getCurrentSiteId();
+
+        return this.getContentFolderNameByUrl(fileUrl, siteId).then((folderName) => {
+            return this.fileProvider.getFile(this.getContentIndexPath(folderName, siteId));
+        }).then((file) => {
+            return file.toURL();
+        });
+    }
+
+    /**
+     * Get the path to a content index.
+     *
+     * @param folderName Name of the folder of the H5P package.
+     * @param siteId The site ID.
+     * @return Folder path.
+     */
+    getContentIndexPath(folderName: string, siteId: string): string {
+        return this.textUtils.concatenatePaths(this.getContentFolderPath(folderName, siteId), 'index.html');
+    }
+
+    /**
+     * Get a content folder name given the package URL.
+     *
+     * @param fileUrl Package URL.
+     * @param siteId Site ID.
+     * @return Promise resolved with the folder name.
+     */
+    getContentFolderNameByUrl(fileUrl: string, siteId: string): Promise<string> {
+        return this.filepoolProvider.getFilePathByUrl(siteId, fileUrl).then((path) => {
+
+            const fileAndDir = this.fileProvider.getFileAndDirectoryFromPath(path);
+
+            return this.mimeUtils.removeExtension(fileAndDir.name);
+        });
+    }
+
+    /**
+     * Get the path to the folder that contains the H5P core libraries.
+     *
+     * @return Folder path.
+     */
+    getCoreH5PPath(): string {
+        return this.textUtils.concatenatePaths(this.fileProvider.getWWWPath(), '/h5p/');
+    }
+
+    /**
+     * Get the settings needed by the H5P library.
+     *
+     * @param id The H5P content ID.
+     * @param siteId The site ID. If not defined, current site.
+     * @return Promise resolved with the settings.
+     */
+    getCoreSettings(id: number, siteId?: string): Promise<any> {
+
+        return this.sitesProvider.getSite(siteId).then((site) => {
+
+            const basePath = this.fileProvider.getBasePathInstant(),
+                ajaxPaths: any = {};
+            ajaxPaths.xAPIResult = '';
+            ajaxPaths.contentUserData = '';
+
+            return {
+                baseUrl: this.fileProvider.getWWWPath(),
+                url: this.textUtils.concatenatePaths(basePath, this.getExternalH5PFolderPath(site.getId())),
+                urlLibraries: this.textUtils.concatenatePaths(basePath, this.getLibrariesFolderPath(site.getId())),
+                postUserStatistics: false,
+                ajax: ajaxPaths,
+                saveFreq: false,
+                siteUrl: site.getURL(),
+                l10n: {
+                    H5P: this.h5pUtils.getLocalization()
+                },
+                user: [],
+                hubIsEnabled: false,
+                reportingIsEnabled: false,
+                crossorigin: null,
+                libraryConfig: null,
+                pluginCacheBuster: '',
+                libraryUrl: this.textUtils.concatenatePaths(this.getCoreH5PPath(), 'js')
+            };
+        });
+    }
+
+    /**
+     * Finds library dependencies files of a certain package.
+     *
+     * @param id Content id.
+     * @param folderName Name of the folder of the content.
+     * @param siteId The site ID. If not defined, current site.
+     * @return Promise resolved with the files.
+     */
+    protected getContentDependencyFiles(id: number, folderName: string, siteId?: string)
+            : Promise<{scripts: CoreH5PDependencyAsset[], styles: CoreH5PDependencyAsset[]}> {
+
+        return this.loadContentDependencies(id, 'preloaded', siteId).then((dependencies) => {
+            return this.getDependenciesFiles(dependencies, folderName, this.getExternalH5PFolderPath(siteId), siteId);
+        });
+    }
+
+    /**
+     * Get all dependency assets of the given type.
+     *
+     * @param dependency The dependency.
+     * @param type Type of assets to get.
+     * @param assets Array where to store the assets.
+     * @param prefix Make paths relative to another dir.
+     */
+    protected getDependencyAssets(dependency: CoreH5PContentDependencyData, type: string, assets: CoreH5PDependencyAsset[],
+            prefix: string = ''): void {
+
+        // Check if dependency has any files of this type
+        if (!dependency[type] || dependency[type][0] === '') {
+            return;
+        }
+
+        // Check if we should skip CSS.
+        if (type === 'preloadedCss' && this.utils.isTrueOrOne(dependency.dropCss)) {
+            return;
+        }
+
+        for (const key in dependency[type]) {
+            const file = dependency[type][key];
+
+            assets.push({
+                path: prefix + '/' + dependency.path + '/' + (typeof file != 'string' ? file.path : file).trim(),
+                version: dependency.version
+            });
+        }
+    }
+
+    /**
+     * Return file paths for all dependencies files.
+     *
+     * @param dependencies The dependencies to get the files.
+     * @param folderName Name of the folder of the content.
+     * @param prefix Make paths relative to another dir.
+     * @param siteId The site ID. If not defined, current site.
+     * @return Promise resolved with the files.
+     */
+    protected getDependenciesFiles(dependencies: {[machineName: string]: CoreH5PContentDependencyData}, folderName: string,
+            prefix: string = '', siteId?: string): Promise<{scripts: CoreH5PDependencyAsset[], styles: CoreH5PDependencyAsset[]}> {
+
+        // Build files list for assets.
+        const files = {
+                scripts: <CoreH5PDependencyAsset[]> [],
+                styles: <CoreH5PDependencyAsset[]> []
+            };
+
+        // Avoid caching empty files.
+        if (!Object.keys(dependencies).length) {
+            return Promise.resolve(files);
+        }
+
+        let promise,
+            cachedAssetsHash;
+
+        if (this.aggregateAssets) {
+            // Get aggregated files for assets.
+            cachedAssetsHash = this.h5pUtils.getDependenciesHash(dependencies);
+
+            promise = this.getCachedAssets(cachedAssetsHash, folderName, siteId);
+        } else {
+            promise = Promise.resolve(null);
+        }
+
+        return promise.then((cachedAssets) => {
+            if (cachedAssets) {
+                // Cached assets found, return them.
+                return Object.assign(files, cachedAssets);
+            }
+
+            // No cached assets, use content dependencies.
+            for (const key in dependencies) {
+                const dependency = dependencies[key];
+
+                if (!dependency.path) {
+                    dependency.path = this.getDependencyPath(dependency);
+                    dependency.preloadedJs = (<string> dependency.preloadedJs).split(',');
+                    dependency.preloadedCss = (<string> dependency.preloadedCss).split(',');
+                }
+
+                dependency.version = '?ver=' + dependency.majorVersion + '.' + dependency.minorVersion + '.' +
+                        dependency.patchVersion;
+
+                this.getDependencyAssets(dependency, 'preloadedJs', files.scripts, prefix);
+                this.getDependencyAssets(dependency, 'preloadedCss', files.styles, prefix);
+            }
+
+            if (this.aggregateAssets) {
+                // Aggregate and store assets.
+                return this.cacheAssets(files, cachedAssetsHash, folderName, siteId).then(() => {
+                    // Keep track of which libraries have been cached in case they are updated.
+                    return this.saveCachedAssets(cachedAssetsHash, dependencies, siteId);
+                }).then(() => {
+                    return files;
+                });
+            }
+
+            return files;
+        });
+    }
+
+    /**
+     * Get the path to the dependency.
+     *
+     * @param dependency Dependency library.
+     * @return The path to the dependency library
+     */
+    protected getDependencyPath(dependency: CoreH5PContentDependencyData): string {
+        return 'libraries/' + dependency.machineName + '-' + dependency.majorVersion + '.' + dependency.minorVersion;
+    }
+
+    /**
+     * Get the paths to the content dependencies.
+     *
+     * @param id The H5P content ID.
+     * @param siteId The site ID. If not defined, current site.
+     * @return Promise resolved with an object containing the path of each content dependency.
+     */
+    getDependencyRoots(id: number, siteId?: string): Promise<{[libString: string]: string}> {
+        siteId = siteId || this.sitesProvider.getCurrentSiteId();
+
+        const roots = {};
+
+        return this.loadContentDependencies(id, undefined, siteId).then((dependencies) => {
+
+            for (const machineName in dependencies) {
+                const dependency = dependencies[machineName],
+                    folderName = this.libraryToString(dependency, true);
+
+                roots[folderName] = this.getLibraryFolderPath(dependency, siteId, folderName);
+            }
+
+            return roots;
+        });
+    }
+
+    /**
+     * Convert display options to an object.
+     *
+     * @param disable Display options as a number.
+     * @return Display options as object.
+     */
+    getDisplayOptionsAsObject(disable: number): CoreH5PDisplayOptions {
+        const displayOptions: CoreH5PDisplayOptions = {};
+
+        // tslint:disable: no-bitwise
+        displayOptions[CoreH5PProvider.DISPLAY_OPTION_FRAME] = !(disable & CoreH5PProvider.DISABLE_FRAME);
+        displayOptions[CoreH5PProvider.DISPLAY_OPTION_DOWNLOAD] = !(disable & CoreH5PProvider.DISABLE_DOWNLOAD);
+        displayOptions[CoreH5PProvider.DISPLAY_OPTION_EMBED] = !(disable & CoreH5PProvider.DISABLE_EMBED);
+        displayOptions[CoreH5PProvider.DISPLAY_OPTION_COPYRIGHT] = !(disable & CoreH5PProvider.DISABLE_COPYRIGHT);
+        displayOptions[CoreH5PProvider.DISPLAY_OPTION_ABOUT] = !!this.getOption(CoreH5PProvider.DISPLAY_OPTION_ABOUT, true);
+
+        return displayOptions;
+    }
+
+    /**
+     * Determine display option visibility when viewing H5P
+     *
+     * @param disable The display options as a number.
+     * @param id Package ID.
+     * @return Display options as object.
+     */
+    getDisplayOptionsForView(disable: number, id: number): CoreH5PDisplayOptions {
+        const displayOptions = this.getDisplayOptionsAsObject(disable);
+
+        if (this.getOption(CoreH5PProvider.DISPLAY_OPTION_FRAME, true) == false) {
+            displayOptions[CoreH5PProvider.DISPLAY_OPTION_FRAME] = false;
+        } else {
+            displayOptions[CoreH5PProvider.DISPLAY_OPTION_DOWNLOAD] = this.setDisplayOptionOverrides(
+                    CoreH5PProvider.DISPLAY_OPTION_DOWNLOAD, CoreH5PPermission.DOWNLOAD_H5P, id,
+                    displayOptions[CoreH5PProvider.DISPLAY_OPTION_DOWNLOAD]);
+
+            displayOptions[CoreH5PProvider.DISPLAY_OPTION_EMBED] = this.setDisplayOptionOverrides(
+                    CoreH5PProvider.DISPLAY_OPTION_EMBED, CoreH5PPermission.EMBED_H5P, id,
+                    displayOptions[CoreH5PProvider.DISPLAY_OPTION_EMBED]);
+
+            if (this.getOption(CoreH5PProvider.DISPLAY_OPTION_COPYRIGHT, true) == false) {
+                displayOptions[CoreH5PProvider.DISPLAY_OPTION_COPYRIGHT] = false;
+            }
+        }
+
+        displayOptions[CoreH5PProvider.DISPLAY_OPTION_COPY] = this.hasPermission(CoreH5PPermission.COPY_H5P, id);
+
+        return displayOptions;
+    }
+
+    /**
+     * Embed code for settings.
+     *
+     * @param siteUrl The site URL.
+     * @param h5pUrl The URL of the .h5p file.
+     * @param embedEnabled Whether the option to embed the H5P content is enabled.
+     * @return The HTML code to reuse this H5P content in a different place.
+     */
+    protected getEmbedCode(siteUrl: string, h5pUrl: string, embedEnabled?: boolean): string {
+        if (!embedEnabled) {
+            return '';
+        }
+
+        return '<iframe src="' + this.getEmbedUrl(siteUrl, h5pUrl) + '" allowfullscreen="allowfullscreen"></iframe>';
+    }
+
+    /**
+     * Get the encoded URL for embeding an H5P content.
+     *
+     * @param siteUrl The site URL.
+     * @param h5pUrl The URL of the .h5p file.
+     * @return The embed URL.
+     */
+    protected getEmbedUrl(siteUrl: string, h5pUrl: string): string {
+        return this.textUtils.concatenatePaths(siteUrl, '/h5p/embed.php') + '?url=' + h5pUrl;
+    }
+
+    /**
+     * Get path to the folder containing H5P files extracted from packages.
+     *
+     * @param siteId The site ID.
+     * @return Folder path.
+     */
+    getExternalH5PFolderPath(siteId: string): string {
+        return this.textUtils.concatenatePaths(this.fileProvider.getSiteFolder(siteId), 'h5p');
     }
 
     /**
@@ -514,6 +1577,19 @@ export class CoreH5PProvider {
         return this.getLibrary(libraryData.machineName, libraryData.majorVersion, libraryData.minorVersion, siteId);
     }
 
+    /**
+     * Get a library data stored in DB by ID.
+     *
+     * @param id Library ID.
+     * @param siteId The site ID. If not defined, current site.
+     * @return Promise resolved with the library data, rejected if not found.
+     */
+    protected getLibraryById(id: number, siteId?: string): Promise<CoreH5PLibraryDBData> {
+        return this.sitesProvider.getSiteDb(siteId).then((db) => {
+            return db.getRecord(this.LIBRARIES_TABLE, {id: id});
+        });
+    }
+
     /**
      * Get a library ID. If not found, return null.
      *
@@ -551,7 +1627,7 @@ export class CoreH5PProvider {
      * @return Folder path.
      */
     getLibrariesFolderPath(siteId: string): string {
-        return this.textUtils.concatenatePaths(this.fileProvider.getSiteFolder(siteId), 'h5p/lib');
+        return this.textUtils.concatenatePaths(this.getExternalH5PFolderPath(siteId), 'libraries');
     }
 
     /**
@@ -570,6 +1646,44 @@ export class CoreH5PProvider {
         return this.textUtils.concatenatePaths(this.getLibrariesFolderPath(siteId), folderName);
     }
 
+    /**
+     * Get the default behaviour for the display option defined.
+     *
+     * @param name Identifier for the setting.
+     * @param defaultValue Optional default value if settings is not set.
+     * @return Return the value for this display option.
+     */
+    getOption(name: string, defaultValue: any = false): any {
+        // For now, all them are disabled by default, so only will be rendered when defined in the displayoptions DB field.
+        return 2; // CONTROLLED_BY_AUTHOR_DEFAULT_OFF.
+    }
+
+    /**
+     * Resizing script for settings.
+     *
+     * @return The HTML code with the resize script.
+     */
+    protected getResizeCode(): string {
+        // @todo return '<script src="' +  + '"></script>';
+        return '';
+    }
+
+    /**
+     * Get core JavaScript files.
+     *
+     * @return array The array containg urls of the core JavaScript files:
+     */
+    getScripts(): string[] {
+        const libUrl = this.getCoreH5PPath(),
+            urls = [];
+
+        CoreH5PProvider.SCRIPTS.forEach((script) => {
+            urls.push(libUrl + script);
+        });
+
+        return urls;
+    }
+
     /**
      * Get a trusted H5P file.
      *
@@ -636,6 +1750,17 @@ export class CoreH5PProvider {
         return this.ROOT_CACHE_KEY + 'trustedH5PFile:';
     }
 
+    /**
+     * Check whether the user has permission to execute an action.
+     *
+     * @param permission Permission to check.
+     * @param id H5P package id.
+     * @return Whether the user has permission to execute an action.
+     */
+    hasPermission(permission: number, id: number): boolean {
+        return true;
+    }
+
     /**
      * Invalidates all trusted H5P file WS calls.
      *
@@ -673,6 +1798,196 @@ export class CoreH5PProvider {
                 libraryData.majorVersion + '.' + libraryData.minorVersion;
     }
 
+    /**
+     * Load addon libraries.
+     *
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the addon libraries.
+     */
+    loadAddons(siteId?: string): Promise<CoreH5PLibraryAddonData[]> {
+        return this.sitesProvider.getSiteDb(siteId).then((db) => {
+
+            const query = 'SELECT l1.id AS libraryId, l1.machinename AS machineName, ' +
+                            'l1.majorversion AS majorVersion, l1.minorversion AS minorVersion, ' +
+                            'l1.patchversion AS patchVersion, l1.addto AS addTo, ' +
+                            'l1.preloadedjs AS preloadedJs, l1.preloadedcss AS preloadedCss ' +
+                        'FROM ' + this.LIBRARIES_TABLE + ' l1 ' +
+                        'JOIN ' + this.LIBRARIES_TABLE + ' l2 ON l1.machinename = l2.machinename AND (' +
+                            'l1.majorversion < l2.majorversion OR (l1.majorversion = l2.majorversion AND ' +
+                            'l1.minorversion < l2.minorversion)) ' +
+                        'WHERE l1.addto IS NOT NULL AND l2.machinename IS NULL';
+
+            return db.execute(query).then((result) => {
+                const addons = [];
+
+                for (let i = 0; i < result.rows.length; i++) {
+                    addons.push(result.rows.item(i));
+                }
+
+                return addons;
+            });
+        });
+    }
+
+    /**
+     * Load content data from DB.
+     *
+     * @param id Content ID.
+     * @param fileUrl H5P file URL. Required if id is not provided.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the content data.
+     */
+    protected loadContentData(id?: number, fileUrl?: string, siteId?: string): Promise<CoreH5PContentData> {
+        let promise: Promise<CoreH5PContentDBData>;
+
+        if (id) {
+            promise = this.getContentData(id, siteId);
+        } else if (fileUrl) {
+            promise = this.getContentDataByUrl(fileUrl, siteId);
+        } else {
+            promise = Promise.reject(null);
+        }
+
+        return promise.then((contentData) => {
+
+            // Load the main library data.
+            return this.getLibraryById(contentData.mainlibraryid, siteId).then((libData) => {
+
+                // Map the values to the names used by the H5P core (it's the same Moodle web does).
+                return {
+                    id: contentData.id,
+                    params: contentData.jsoncontent,
+                    // The embedtype will be always set to 'iframe' to prevent conflicts with JS and CSS.
+                    embedType: 'iframe',
+                    disable: contentData.displayoptions,
+                    folderName: contentData.foldername,
+                    title: libData.title,
+                    slug: this.h5pUtils.slugify(libData.title) + '-' + contentData.id,
+                    filtered: contentData.filtered,
+                    libraryMajorVersion: libData.majorversion,
+                    libraryMinorVersion: libData.minorversion,
+                    metadata: {
+                        license: 'U' // Stop "invalid selected option in select" for old content without license chosen.
+                    },
+                    library: {
+                        id: libData.id,
+                        name: libData.machinename,
+                        majorVersion: libData.majorversion,
+                        minorVersion: libData.minorversion,
+                        embedTypes: libData.embedtypes,
+                        fullscreen: libData.fullscreen
+                    }
+                };
+            });
+        });
+    }
+
+    /**
+     * Load dependencies for the given content of the given type.
+     *
+     * @param id Content ID.
+     * @param type The dependency type.
+     * @return Content dependencies, indexed by machine name.
+     */
+    loadContentDependencies(id: number, type?: string, siteId?: string)
+            : Promise<{[machineName: string]: CoreH5PContentDependencyData}> {
+
+        return this.sitesProvider.getSiteDb(siteId).then((db) => {
+            let query = 'SELECT hl.id AS libraryId, hl.machinename AS machineName, ' +
+                            'hl.majorversion AS majorVersion, hl.minorversion AS minorVersion, ' +
+                            'hl.patchversion AS patchVersion, hl.preloadedcss AS preloadedCss, ' +
+                            'hl.preloadedjs AS preloadedJs, hcl.dropcss AS dropCss, ' +
+                            'hcl.dependencytype as dependencyType ' +
+                        'FROM ' + this.CONTENTS_LIBRARIES_TABLE + ' hcl ' +
+                        'JOIN ' + this.LIBRARIES_TABLE + ' hl ON hcl.libraryid = hl.id ' +
+                        'WHERE hcl.h5pid = ?';
+            const queryArgs = [];
+            queryArgs.push(id);
+
+            if (type) {
+                query += ' AND hcl.dependencytype = ?';
+                queryArgs.push(type);
+            }
+
+            query += ' ORDER BY hcl.weight';
+
+            return db.execute(query, queryArgs).then((result) => {
+                const dependencies = {};
+
+                for (let i = 0; i < result.rows.length; i++) {
+                    const dependency = result.rows.item(i);
+
+                    dependencies[dependency.machineName] = dependency;
+                }
+
+                return dependencies;
+            });
+        });
+    }
+
+    /**
+     * Loads a library and its dependencies.
+     *
+     * @param machineName The library's machine name.
+     * @param majorVersion The library's major version.
+     * @param minorVersion The library's minor version.
+     * @param siteId The site ID. If not defined, current site.
+     * @return Promise resolved with the library data.
+     */
+    loadLibrary(machineName: string, majorVersion: number, minorVersion: number, siteId?: string): Promise<CoreH5PLibraryData> {
+
+        // First get the library data from DB.
+        return this.getLibrary(machineName, majorVersion, minorVersion, siteId).then((library) => {
+            const libraryData: CoreH5PLibraryData = {
+                libraryId: library.id,
+                title: library.title,
+                machineName: library.machinename,
+                majorVersion: library.majorversion,
+                minorVersion: library.minorversion,
+                patchVersion: library.patchversion,
+                runnable: library.runnable,
+                fullscreen: library.fullscreen,
+                embedTypes: library.embedtypes,
+                preloadedJs: library.preloadedjs,
+                preloadedCss: library.preloadedcss,
+                dropLibraryCss: library.droplibrarycss,
+                semantics: library.semantics,
+                preloadedDependencies: [],
+                dynamicDependencies: [],
+                editorDependencies: []
+            };
+
+            // Now get the dependencies.
+            const sql = 'SELECT hl.id, hl.machinename, hl.majorversion, hl.minorversion, hll.dependencytype ' +
+                    'FROM ' + this.LIBRARY_DEPENDENCIES_TABLE + ' hll ' +
+                    'JOIN ' + this.LIBRARIES_TABLE + ' hl ON hll.requiredlibraryid = hl.id ' +
+                    'WHERE hll.libraryid = ? ' +
+                    'ORDER BY hl.id ASC';
+
+            const sqlParams = [
+                library.id
+            ];
+
+            return this.sitesProvider.getSiteDb(siteId).then((db) => {
+                return db.execute(sql, sqlParams).then((result) => {
+
+                    for (let i = 0; i < result.rows.length; i++) {
+                        const dependency = result.rows.item(i),
+                            key = dependency.dependencytype + 'Dependencies';
+
+                        libraryData[key].push({
+                            machineName: dependency.machinename,
+                            majorVersion: dependency.majorversion,
+                            minorVersion: dependency.minorversion
+                        });
+                    }
+
+                    return libraryData;
+                });
+            });
+        });
+    }
+
     /**
      * Process libraries from an H5P library, getting the required data to save them.
      * This code was copied from the isValidPackage function in Moodle's H5PValidator.
@@ -727,14 +2042,44 @@ export class CoreH5PProvider {
         });
     }
 
+    /**
+     * Stores hash keys for cached assets, aggregated JavaScripts and stylesheets, and connects it to libraries so that we
+     * know which cache file to delete when a library is updated.
+     *
+     * @param key Hash key for the given libraries.
+     * @param libraries List of dependencies used to create the key
+     * @param siteId The site ID.
+     * @return Promise resolved when done.
+     */
+    protected saveCachedAssets(hash: string, dependencies: {[machineName: string]: CoreH5PContentDependencyData},
+            siteId?: string): Promise<any> {
+
+        return this.sitesProvider.getSiteDb(siteId).then((db) => {
+            const promises = [];
+
+            for (const key in dependencies) {
+                const data = {
+                        hash: key,
+                        libraryid: dependencies[key].libraryId
+                    };
+
+                promises.push(db.insertRecord(this.LIBRARIES_CACHEDASSETS_TABLE, data));
+            }
+
+            return Promise.all(promises);
+        });
+    }
+
     /**
      * Save content data in DB and clear cache.
      *
      * @param content Content to save.
      * @param folderName The name of the folder that contains the H5P.
+     * @param fileUrl The online URL of the package.
+     * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with content ID.
      */
-    protected saveContentData(content: any, folderName: string, siteId?: string): Promise<number> {
+    protected saveContentData(content: any, folderName: string, fileUrl: string, siteId?: string): Promise<number> {
         // Save in DB.
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
 
@@ -744,7 +2089,8 @@ export class CoreH5PProvider {
                 mainlibraryid: content.library.libraryId,
                 timemodified: Date.now(),
                 filtered: null,
-                foldername: folderName
+                foldername: folderName,
+                fileurl: fileUrl
             };
 
             if (typeof content.id != 'undefined') {
@@ -791,10 +2137,13 @@ export class CoreH5PProvider {
      * Save libraries. This code is based on the saveLibraries function from Moodle's H5PStorage.
      *
      * @param librariesJsonData Data about libraries.
+     * @param folderName Name of the folder of the H5P package.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    protected saveLibraries(librariesJsonData: any, siteId?: string): Promise<any> {
+    protected saveLibraries(librariesJsonData: any, folderName: string, siteId?: string): Promise<any> {
+        siteId = siteId || this.sitesProvider.getCurrentSiteId();
+
         const libraryIds = [];
 
         // First of all, try to create the dir where the libraries are stored. This way we don't have to do it for each lib.
@@ -839,7 +2188,10 @@ export class CoreH5PProvider {
                             });
                         });
                     }).then(() => {
-                        // @todo: Remove cached asses that use this library.
+                        // Remove cached assets that use this library.
+                        if (this.aggregateAssets && typeof libraryData.libraryId != 'undefined') {
+                            return this.deleteCachedAssets(libraryData.libraryId, folderName, siteId);
+                        }
                     });
                 }));
             }
@@ -1002,6 +2354,77 @@ export class CoreH5PProvider {
         });
     }
 
+    /**
+     * Saves what libraries the content uses.
+     *
+     * @param id Id identifying the package.
+     * @param librariesInUse List of libraries the content uses.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    saveLibraryUsage(id: number, librariesInUse: {[key: string]: CoreH5PContentDepsTreeDependency}, siteId?: string)
+            : Promise<any> {
+
+        return this.sitesProvider.getSiteDb(siteId).then((db) => {
+            // Calculate the CSS to drop.
+            const dropLibraryCssList = {},
+                promises = [];
+
+            for (const key in librariesInUse) {
+                const dependency = librariesInUse[key];
+
+                if (dependency.library.dropLibraryCss) {
+                    const split = dependency.library.dropLibraryCss.split(', ');
+
+                    split.forEach((css) => {
+                        dropLibraryCssList[css] = css;
+                    });
+                }
+            }
+
+            for (const key in librariesInUse) {
+                const dependency = librariesInUse[key],
+                    data = {
+                        h5pid: id,
+                        libraryId: dependency.library.libraryId,
+                        dependencytype: dependency.type,
+                        dropcss: dropLibraryCssList[dependency.library.machineName] ? 1 : 0,
+                        weight: dependency.weight
+                    };
+
+                promises.push(db.insertRecord(this.CONTENTS_LIBRARIES_TABLE, data));
+            }
+
+            return Promise.all(promises);
+        });
+
+    }
+
+    /**
+     * Helper function used to figure out embed and download behaviour.
+     *
+     * @param optionName The option name.
+     * @param permission The permission.
+     * @param id The package ID.
+     * @param value Default value.
+     * @return The value to use.
+     */
+    setDisplayOptionOverrides(optionName: string, permission: number, id: number, value: boolean): boolean {
+        const behaviour = this.getOption(optionName, CoreH5PDisplayOptionBehaviour.ALWAYS_SHOW);
+
+        // If never show globally, force hide
+        if (behaviour == CoreH5PDisplayOptionBehaviour.NEVER_SHOW) {
+            value = false;
+        } else if (behaviour == CoreH5PDisplayOptionBehaviour.ALWAYS_SHOW) {
+            // If always show or permissions say so, force show
+            value = true;
+        } else if (behaviour == CoreH5PDisplayOptionBehaviour.CONTROLLED_BY_PERMISSIONS) {
+            value = this.hasPermission(permission, id);
+        }
+
+        return value;
+    }
+
     /**
      * Treat an H5P url before sending it to WS.
      *
@@ -1016,8 +2439,60 @@ export class CoreH5PProvider {
 
         return url;
     }
+
+    /**
+     * This will update selected fields on the given content.
+     *
+     * @param id Content identifier.
+     * @param fields Object with the fields to update.
+     * @param siteId Site ID. If not defined, current site.
+     */
+    protected updateContentFields(id: number, fields: any, siteId?: string): Promise<any> {
+
+        return this.sitesProvider.getSiteDb(siteId).then((db) => {
+            const data = Object.assign(fields);
+            delete data.slug; // Slug isn't stored in DB.
+
+            return db.updateRecords(this.CONTENT_TABLE, data, {id: id});
+        });
+    }
 }
 
+/**
+ * Display options behaviour constants.
+ */
+export class CoreH5PDisplayOptionBehaviour {
+    static NEVER_SHOW = 0;
+    static CONTROLLED_BY_AUTHOR_DEFAULT_ON = 1;
+    static CONTROLLED_BY_AUTHOR_DEFAULT_OFF = 2;
+    static ALWAYS_SHOW = 3;
+    static CONTROLLED_BY_PERMISSIONS = 4;
+}
+
+/**
+ * Permission constants.
+ */
+export class CoreH5PPermission {
+    static DOWNLOAD_H5P = 0;
+    static EMBED_H5P = 1;
+    static CREATE_RESTRICTED = 2;
+    static UPDATE_LIBRARIES = 3;
+    static INSTALL_RECOMMENDED = 4;
+    static COPY_H5P = 4;
+}
+
+/**
+ * Display options as object.
+ */
+export type CoreH5PDisplayOptions = {
+    frame?: boolean;
+    export?: boolean;
+    embed?: boolean;
+    copyright?: boolean;
+    icon?: boolean;
+    copy?: boolean;
+};
+
 /**
  * Options for core_h5p_get_trusted_h5p_file.
  */
@@ -1036,6 +2511,14 @@ export type CoreH5PGetTrustedH5PFileResult = {
     warnings: CoreWSExternalWarning[]; // List of warnings.
 };
 
+/**
+ * Dependency asset.
+ */
+export type CoreH5PDependencyAsset = {
+    path: string; // Path to the asset.
+    version: string; // Dependency version.
+};
+
 /**
  * Content data stored in DB.
  */
@@ -1045,11 +2528,109 @@ export type CoreH5PContentDBData = {
     mainlibraryid: number; // The library we first instantiate for this node.
     displayoptions: number; // H5P Button display options.
     foldername: string; // Name of the folder that contains the contents.
+    fileurl: string; // The online URL of the H5P package.
     filtered: string; // Filtered version of json_content.
     timecreated: number; // Time created.
     timemodified: number; // Time modified.
 };
 
+/**
+ * Content data, including main library data.
+ */
+export type CoreH5PContentData = {
+    id: number; // The id of the content.
+    params: string; // The content in json format.
+    embedType: string; // Embed type to use.
+    disable: number; // H5P Button display options.
+    folderName: string; // Name of the folder that contains the contents.
+    title: string; // Main library's title.
+    slug: string; // Lib title and ID slugified.
+    filtered: string; // Filtered version of json_content.
+    libraryMajorVersion: number; // Main library's major version.
+    libraryMinorVersion: number; // Main library's minor version.
+    metadata: any; // Content metadata.
+    library: { // Main library data.
+        id: number; // The id of the library.
+        name: string; // The library machine name.
+        majorVersion: number; // Major version.
+        minorVersion: number; // Minor version.
+        embedTypes: string; // List of supported embed types.
+        fullscreen: number; // Display fullscreen button.
+    };
+    dependencies?: {[key: string]: CoreH5PContentDepsTreeDependency}; // Dependencies. Calculated in filterParameters.
+};
+
+/**
+ * Content dependency data.
+ */
+export type CoreH5PContentDependencyData = {
+    libraryId: number; // The id of the library if it is an existing library.
+    machineName: string; // The library machineName.
+    majorVersion: number; // The The library's majorVersion.
+    minorVersion: number; // The The library's minorVersion.
+    patchVersion: number; // The The library's patchVersion.
+    preloadedJs?: string | string[]; // Comma separated string with js file paths. If already parsed, list of paths.
+    preloadedCss?: string | string[]; // Comma separated string with css file paths. If already parsed, list of paths.
+    dropCss?: string; // CSV of machine names.
+    dependencyType: string; // The dependency type.
+    path?: string; // Path to the dependency. Calculated in getDependenciesFiles.
+    version?: string; // Version of the dependency. Calculated in getDependenciesFiles.
+};
+
+/**
+ * Data for each content dependency in the dependency tree.
+ */
+export type CoreH5PContentDepsTreeDependency = {
+    library: CoreH5PLibraryData; // Library data.
+    type: string; // Dependency type.
+    weight?: number; // An integer determining the order of the libraries when they are loaded.
+};
+
+/**
+ * Library data.
+ */
+export type CoreH5PLibraryData = {
+    libraryId: number; // The id of the library.
+    title: string; // The human readable name of this library.
+    machineName: string; // The library machine name.
+    majorVersion: number; // Major version.
+    minorVersion: number; // Minor version.
+    patchVersion: number; // Patch version.
+    runnable: number; // Can this library be started by the module? I.e. not a dependency.
+    fullscreen: number; // Display fullscreen button.
+    embedTypes: string; // List of supported embed types.
+    preloadedJs?: string; // Comma separated list of scripts to load.
+    preloadedCss?: string; // Comma separated list of stylesheets to load.
+    dropLibraryCss?: string; // List of libraries that should not have CSS included if this library is used. Comma separated list.
+    semantics?: any; // The semantics definition. If it's a string, it's in json format.
+    preloadedDependencies: CoreH5PLibraryBasicData[]; // Dependencies.
+    dynamicDependencies: CoreH5PLibraryBasicData[]; // Dependencies.
+    editorDependencies: CoreH5PLibraryBasicData[]; // Dependencies.
+};
+
+/**
+ * Library basic data.
+ */
+export type CoreH5PLibraryBasicData = {
+    machineName: string; // The library machine name.
+    majorVersion: number; // Major version.
+    minorVersion: number; // Minor version.
+};
+
+/**
+ * "Addon" data (library).
+ */
+export type CoreH5PLibraryAddonData = {
+    libraryId: number; // The id of the library.
+    machineName: string; // The library machine name.
+    majorVersion: number; // Major version.
+    minorVersion: number; // Minor version.
+    patchVersion: number; // Patch version.
+    preloadedJs?: string; // Comma separated list of scripts to load.
+    preloadedCss?: string; // Comma separated list of stylesheets to load.
+    addTo?: string; // Plugin configuration data.
+};
+
 /**
  * Library data stored in DB.
  */
diff --git a/src/core/h5p/providers/utils.ts b/src/core/h5p/providers/utils.ts
index 3a36071cb..9c568acac 100644
--- a/src/core/h5p/providers/utils.ts
+++ b/src/core/h5p/providers/utils.ts
@@ -13,6 +13,10 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import { CoreTextUtilsProvider } from '@providers/utils/text';
+import { CoreH5PContentDependencyData, CoreH5PDependencyAsset } from './h5p';
+import { Md5 } from 'ts-md5/dist/md5';
 
 /**
  * Utils service with helper functions for H5P.
@@ -20,9 +24,120 @@ import { Injectable } from '@angular/core';
 @Injectable()
 export class CoreH5PUtilsProvider {
 
-    constructor() {
-        // Nothing to do.
-    }
+    // Map to slugify characters.
+    protected SLUGIFY_MAP = {
+        æ: 'ae',
+        ø: 'oe',
+        ö: 'o',
+        ó: 'o',
+        ô: 'o',
+        Ò: 'oe',
+        Õ: 'o',
+        Ý: 'o',
+        ý: 'y',
+        ÿ: 'y',
+        ā: 'y',
+        ă: 'a',
+        ą: 'a',
+        œ: 'a',
+        å: 'a',
+        ä: 'a',
+        á: 'a',
+        à: 'a',
+        â: 'a',
+        ã: 'a',
+        ç: 'c',
+        ć: 'c',
+        ĉ: 'c',
+        ċ: 'c',
+        č: 'c',
+        é: 'e',
+        è: 'e',
+        ê: 'e',
+        ë: 'e',
+        í: 'i',
+        ì: 'i',
+        î: 'i',
+        ï: 'i',
+        ú: 'u',
+        ñ: 'n',
+        ü: 'u',
+        ù: 'u',
+        û: 'u',
+        ß: 'es',
+        ď: 'd',
+        đ: 'd',
+        ē: 'e',
+        ĕ: 'e',
+        ė: 'e',
+        ę: 'e',
+        ě: 'e',
+        ĝ: 'g',
+        ğ: 'g',
+        ġ: 'g',
+        ģ: 'g',
+        ĥ: 'h',
+        ħ: 'h',
+        ĩ: 'i',
+        ī: 'i',
+        ĭ: 'i',
+        į: 'i',
+        ı: 'i',
+        ij: 'ij',
+        ĵ: 'j',
+        ķ: 'k',
+        ĺ: 'l',
+        ļ: 'l',
+        ľ: 'l',
+        ŀ: 'l',
+        ł: 'l',
+        ń: 'n',
+        ņ: 'n',
+        ň: 'n',
+        ʼn: 'n',
+        ō: 'o',
+        ŏ: 'o',
+        ő: 'o',
+        ŕ: 'r',
+        ŗ: 'r',
+        ř: 'r',
+        ś: 's',
+        ŝ: 's',
+        ş: 's',
+        š: 's',
+        ţ: 't',
+        ť: 't',
+        ŧ: 't',
+        ũ: 'u',
+        ū: 'u',
+        ŭ: 'u',
+        ů: 'u',
+        ű: 'u',
+        ų: 'u',
+        ŵ: 'w',
+        ŷ: 'y',
+        ź: 'z',
+        ż: 'z',
+        ž: 'z',
+        ſ: 's',
+        ƒ: 'f',
+        ơ: 'o',
+        ư: 'u',
+        ǎ: 'a',
+        ǐ: 'i',
+        ǒ: 'o',
+        ǔ: 'u',
+        ǖ: 'u',
+        ǘ: 'u',
+        ǚ: 'u',
+        ǜ: 'u',
+        ǻ: 'a',
+        ǽ: 'ae',
+        ǿ: 'oe'
+    };
+
+    constructor(private translate: TranslateService,
+            private textUtils: CoreTextUtilsProvider) { }
 
     /**
      * The metadataSettings field in libraryJson uses 1 for true and 0 for false.
@@ -43,6 +158,161 @@ export class CoreH5PUtilsProvider {
         return JSON.stringify(metadataSettings);
     }
 
+    /**
+     * Determine the correct embed type to use.
+     *
+     * @param Embed type of the content.
+     * @param Embed type of the main library.
+     * @return Either 'div' or 'iframe'.
+     */
+    determineEmbedType(contentEmbedType: string, libraryEmbedTypes: string): string {
+        // Detect content embed type.
+        let embedType = contentEmbedType.toLowerCase().indexOf('div') != -1 ? 'div' : 'iframe';
+
+        if (libraryEmbedTypes) {
+            // Check that embed type is available for library
+            const embedTypes = libraryEmbedTypes.toLowerCase();
+
+            if (embedTypes.indexOf(embedType) == -1) {
+                // Not available, pick default.
+                embedType = embedTypes.indexOf('div') != -1 ? 'div' : 'iframe';
+            }
+        }
+
+        return embedType;
+    }
+
+    /**
+     * Combines path with version.
+     *
+     * @param assets List of assets to get their URLs.
+     * @param assetsFolderPath The path of the folder where the assets are.
+     * @return List of urls.
+     */
+    getAssetsUrls(assets: CoreH5PDependencyAsset[], assetsFolderPath: string = ''): string[] {
+        const urls = [];
+
+        assets.forEach((asset) => {
+            let url = asset.path;
+
+            // Add URL prefix if not external.
+            if (asset.path.indexOf('://') == -1 && assetsFolderPath) {
+                url = this.textUtils.concatenatePaths(assetsFolderPath, url);
+            }
+
+            // Add version if set.
+            if (asset.version) {
+                url += asset.version;
+            }
+
+            urls.push(url);
+        });
+
+        return urls;
+    }
+
+    /**
+     * Get the hash of a list of dependencies.
+     *
+     * @param dependencies Dependencies.
+     * @return Hash.
+     */
+    getDependenciesHash(dependencies: {[machineName: string]: CoreH5PContentDependencyData}): string {
+        // Build hash of dependencies.
+        const toHash = [];
+
+        // Use unique identifier for each library version.
+        for (const name in dependencies) {
+            const dep = dependencies[name];
+            toHash.push(dep.machineName + '-' + dep.majorVersion + '.' + dep.minorVersion + '.' + dep.patchVersion);
+        }
+
+        // Sort in case the same dependencies comes in a different order.
+        toHash.sort((a, b) => {
+            return a.localeCompare(b);
+        });
+
+        // Calculate hash.
+        return <string> Md5.hashAsciiStr(toHash.join(''));
+    }
+
+    /**
+     * Provide localization for the Core JS.
+     *
+     * @return Object with the translations.
+     */
+    getLocalization(): any {
+        return {
+            fullscreen: this.translate.instant('core.h5p.fullscreen'),
+            disableFullscreen: this.translate.instant('core.h5p.disablefullscreen'),
+            download: this.translate.instant('core.h5p.download'),
+            copyrights: this.translate.instant('core.h5p.copyright'),
+            embed: this.translate.instant('core.h5p.embed'),
+            size: this.translate.instant('core.h5p.size'),
+            showAdvanced: this.translate.instant('core.h5p.showadvanced'),
+            hideAdvanced: this.translate.instant('core.h5p.hideadvanced'),
+            advancedHelp: this.translate.instant('core.h5p.resizescript'),
+            copyrightInformation: this.translate.instant('core.h5p.copyright'),
+            close: this.translate.instant('core.h5p.close'),
+            title: this.translate.instant('core.h5p.title'),
+            author: this.translate.instant('core.h5p.author'),
+            year: this.translate.instant('core.h5p.year'),
+            source: this.translate.instant('core.h5p.source'),
+            license: this.translate.instant('core.h5p.license'),
+            thumbnail: this.translate.instant('core.h5p.thumbnail'),
+            noCopyrights: this.translate.instant('core.h5p.nocopyright'),
+            reuse: this.translate.instant('core.h5p.reuse'),
+            reuseContent: this.translate.instant('core.h5p.reuseContent'),
+            reuseDescription: this.translate.instant('core.h5p.reuseDescription'),
+            downloadDescription: this.translate.instant('core.h5p.downloadtitle'),
+            copyrightsDescription: this.translate.instant('core.h5p.copyrighttitle'),
+            embedDescription: this.translate.instant('core.h5p.embedtitle'),
+            h5pDescription: this.translate.instant('core.h5p.h5ptitle'),
+            contentChanged: this.translate.instant('core.h5p.contentchanged'),
+            startingOver: this.translate.instant('core.h5p.startingover'),
+            by: this.translate.instant('core.h5p.by'),
+            showMore: this.translate.instant('core.h5p.showmore'),
+            showLess: this.translate.instant('core.h5p.showless'),
+            subLevel: this.translate.instant('core.h5p.sublevel'),
+            confirmDialogHeader: this.translate.instant('core.h5p.confirmdialogheader'),
+            confirmDialogBody: this.translate.instant('core.h5p.confirmdialogbody'),
+            cancelLabel: this.translate.instant('core.h5p.cancellabel'),
+            confirmLabel: this.translate.instant('core.h5p.confirmlabel'),
+            licenseU: this.translate.instant('core.h5p.undisclosed'),
+            licenseCCBY: this.translate.instant('core.h5p.ccattribution'),
+            licenseCCBYSA: this.translate.instant('core.h5p.ccattributionsa'),
+            licenseCCBYND: this.translate.instant('core.h5p.ccattributionnd'),
+            licenseCCBYNC: this.translate.instant('core.h5p.ccattributionnc'),
+            licenseCCBYNCSA: this.translate.instant('core.h5p.ccattributionncsa'),
+            licenseCCBYNCND: this.translate.instant('core.h5p.ccattributionncnd'),
+            licenseCC40: this.translate.instant('core.h5p.licenseCC40'),
+            licenseCC30: this.translate.instant('core.h5p.licenseCC30'),
+            licenseCC25: this.translate.instant('core.h5p.licenseCC25'),
+            licenseCC20: this.translate.instant('core.h5p.licenseCC20'),
+            licenseCC10: this.translate.instant('core.h5p.licenseCC10'),
+            licenseGPL: this.translate.instant('core.h5p.licenseGPL'),
+            licenseV3: this.translate.instant('core.h5p.licenseV3'),
+            licenseV2: this.translate.instant('core.h5p.licenseV2'),
+            licenseV1: this.translate.instant('core.h5p.licenseV1'),
+            licensePD: this.translate.instant('core.h5p.pd'),
+            licenseCC010: this.translate.instant('core.h5p.licenseCC010'),
+            licensePDM: this.translate.instant('core.h5p.pdm'),
+            licenseC: this.translate.instant('core.h5p.copyrightstring'),
+            contentType: this.translate.instant('core.h5p.contenttype'),
+            licenseExtras: this.translate.instant('core.h5p.licenseextras'),
+            changes: this.translate.instant('core.h5p.changelog'),
+            contentCopied: this.translate.instant('core.h5p.contentCopied'),
+            connectionLost: this.translate.instant('core.h5p.connectionLost'),
+            connectionReestablished: this.translate.instant('core.h5p.connectionReestablished'),
+            resubmitScores: this.translate.instant('core.h5p.resubmitScores'),
+            offlineDialogHeader: this.translate.instant('core.h5p.offlineDialogHeader'),
+            offlineDialogBody: this.translate.instant('core.h5p.offlineDialogBody'),
+            offlineDialogRetryMessage: this.translate.instant('core.h5p.offlineDialogRetryMessage'),
+            offlineDialogRetryButtonLabel: this.translate.instant('core.h5p.offlineDialogRetryButtonLabel'),
+            offlineSuccessfulSubmit: this.translate.instant('core.h5p.offlineSuccessfulSubmit'),
+        };
+    }
+
     /**
      * Convert list of library parameter values to csv.
      *
@@ -68,4 +338,71 @@ export class CoreH5PUtilsProvider {
 
         return '';
     }
+
+    /**
+     * Convert strings of text into simple kebab case slugs. Based on H5PCore::slugify.
+     *
+     * @param input The string to slugify.
+     * @return Slugified text.
+     */
+    slugify(input: string): string {
+        input = input || '';
+
+        input = input.toLowerCase();
+
+        // Replace common chars.
+        let newInput = '';
+        for (let i = 0; i < input.length; i++) {
+            const char = input[i];
+
+            newInput += this.SLUGIFY_MAP[char] || char;
+        }
+
+        // Replace everything else.
+        newInput = newInput.replace(/[^a-z0-9]/g, '-');
+
+        // Prevent double hyphen
+        newInput = newInput.replace(/-{2,}/g, '-');
+
+        // Prevent hyphen in beginning or end.
+        newInput = newInput.replace(/(^-+|-+$)/g, '');
+
+        // Prevent too long slug.
+        if (newInput.length > 91) {
+            newInput = newInput.substr(0, 92);
+        }
+
+        // Prevent empty slug
+        if (newInput === '') {
+            newInput = 'interactive';
+        }
+
+        return newInput;
+    }
+
+    /**
+     * Determine if params contain any match.
+     *
+     * @param params Parameters.
+     * @param pattern Regular expression to identify pattern.
+     * @return True if params matches pattern.
+     */
+    textAddonMatches(params: any, pattern: string): boolean {
+
+        if (typeof params == 'string') {
+            if (params.match(pattern)) {
+                return true;
+            }
+        } else if (typeof params == 'object') {
+            for (const key in params) {
+                const value = params[key];
+
+                if (this.textAddonMatches(value, pattern)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/src/providers/file.ts b/src/providers/file.ts
index dd48837c3..915ac5a36 100644
--- a/src/providers/file.ts
+++ b/src/providers/file.ts
@@ -1239,4 +1239,19 @@ export class CoreFileProvider {
     isFileInAppFolder(path: string): boolean {
         return path.indexOf(this.basePath) != -1;
     }
+
+    /**
+     * Get the full path to the www folder at runtime.
+     *
+     * @return Path.
+     */
+    getWWWPath(): string {
+        const position = window.location.href.indexOf('index.html');
+
+        if (position != -1) {
+            return window.location.href.substr(0, position);
+        }
+
+        return window.location.href;
+    }
 }

From ea2aa48d77202d5171f9cbb3742cf18ecc53e246 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 25 Nov 2019 09:19:26 +0100
Subject: [PATCH 182/257] MOBILE-2235 h5p: Include resizer scripts

---
 src/core/filter/providers/delegate.ts         |   1 +
 src/core/h5p/assets/moodle/js/embed.js        | 155 ++++++++++++++++++
 .../h5p-player/core-h5p-player.html           |   3 +-
 .../h5p/components/h5p-player/h5p-player.ts   |  13 ++
 src/core/h5p/providers/h5p.ts                 |  22 ++-
 src/providers/utils/dom.ts                    |   2 +-
 6 files changed, 188 insertions(+), 8 deletions(-)
 create mode 100644 src/core/h5p/assets/moodle/js/embed.js

diff --git a/src/core/filter/providers/delegate.ts b/src/core/filter/providers/delegate.ts
index d712ffb31..642a454ca 100644
--- a/src/core/filter/providers/delegate.ts
+++ b/src/core/filter/providers/delegate.ts
@@ -188,6 +188,7 @@ export class CoreFilterDelegate extends CoreDelegate {
                 }
 
                 promise = promise.then(() => {
+
                     return Promise.resolve(this.executeFunctionOnEnabled(filter.filter, 'handleHtml',
                             [container, filter, options, viewContainerRef, component, componentId, siteId])).catch((error) => {
                         this.logger.error('Error handling HTML' + filter.filter, error);
diff --git a/src/core/h5p/assets/moodle/js/embed.js b/src/core/h5p/assets/moodle/js/embed.js
new file mode 100644
index 000000000..6135db2e5
--- /dev/null
+++ b/src/core/h5p/assets/moodle/js/embed.js
@@ -0,0 +1,155 @@
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/* global H5PEmbedCommunicator:true */
+/**
+ * When embedded the communicator helps talk to the parent page.
+ * This is a copy of the H5P.communicator, which we need to communicate in this context
+ *
+ * @type {H5PEmbedCommunicator}
+ * @module     core_h5p
+ * @copyright  2019 Joubel AS <contact@joubel.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+H5PEmbedCommunicator = (function() {
+    /**
+     * @class
+     * @private
+     */
+    function Communicator() {
+        var self = this;
+
+        // Maps actions to functions.
+        var actionHandlers = {};
+
+        // Register message listener.
+        window.addEventListener('message', function receiveMessage(event) {
+            if (window.parent !== event.source || event.data.context !== 'h5p') {
+                return; // Only handle messages from parent and in the correct context.
+            }
+
+            if (actionHandlers[event.data.action] !== undefined) {
+                actionHandlers[event.data.action](event.data);
+            }
+        }, false);
+
+        /**
+         * Register action listener.
+         *
+         * @param {string} action What you are waiting for
+         * @param {function} handler What you want done
+         */
+        self.on = function(action, handler) {
+            actionHandlers[action] = handler;
+        };
+
+        /**
+         * Send a message to the all mighty father.
+         *
+         * @param {string} action
+         * @param {Object} [data] payload
+         */
+        self.send = function(action, data) {
+            if (data === undefined) {
+                data = {};
+            }
+            data.context = 'h5p';
+            data.action = action;
+
+            // Parent origin can be anything.
+            window.parent.postMessage(data, '*');
+        };
+    }
+
+    return (window.postMessage && window.addEventListener ? new Communicator() : undefined);
+})();
+
+document.onreadystatechange = function() {
+    // Wait for instances to be initialize.
+    if (document.readyState !== 'complete') {
+        return;
+    }
+
+    // Check for H5P iFrame.
+    var iFrame = document.querySelector('.h5p-iframe');
+    if (!iFrame || !iFrame.contentWindow) {
+        return;
+    }
+    var H5P = iFrame.contentWindow.H5P;
+
+    // Check for H5P instances.
+    if (!H5P || !H5P.instances || !H5P.instances[0]) {
+        return;
+    }
+
+    var resizeDelay;
+    var instance = H5P.instances[0];
+    var parentIsFriendly = false;
+
+    // Handle that the resizer is loaded after the iframe.
+    H5PEmbedCommunicator.on('ready', function() {
+        H5PEmbedCommunicator.send('hello');
+    });
+
+    // Handle hello message from our parent window.
+    H5PEmbedCommunicator.on('hello', function() {
+        // Initial setup/handshake is done.
+        parentIsFriendly = true;
+
+        // Hide scrollbars for correct size.
+        iFrame.contentDocument.body.style.overflow = 'hidden';
+
+        document.body.classList.add('h5p-resizing');
+
+        // Content need to be resized to fit the new iframe size.
+        H5P.trigger(instance, 'resize');
+    });
+
+    // When resize has been prepared tell parent window to resize.
+    H5PEmbedCommunicator.on('resizePrepared', function() {
+        H5PEmbedCommunicator.send('resize', {
+            scrollHeight: iFrame.contentDocument.body.scrollHeight
+        });
+    });
+
+    H5PEmbedCommunicator.on('resize', function() {
+        H5P.trigger(instance, 'resize');
+    });
+
+    H5P.on(instance, 'resize', function() {
+        if (H5P.isFullscreen) {
+            return; // Skip iframe resize.
+        }
+
+        // Use a delay to make sure iframe is resized to the correct size.
+        clearTimeout(resizeDelay);
+        resizeDelay = setTimeout(function() {
+            // Only resize if the iframe can be resized.
+            if (parentIsFriendly) {
+                H5PEmbedCommunicator.send('prepareResize',
+                    {
+                        scrollHeight: iFrame.contentDocument.body.scrollHeight,
+                        clientHeight: iFrame.contentDocument.body.clientHeight
+                    }
+                );
+            } else {
+                H5PEmbedCommunicator.send('hello');
+            }
+        }, 0);
+    });
+
+    // Trigger initial resize for instance.
+    H5P.trigger(instance, 'resize');
+};
diff --git a/src/core/h5p/components/h5p-player/core-h5p-player.html b/src/core/h5p/components/h5p-player/core-h5p-player.html
index 2fb1e9989..3cfd58ccb 100644
--- a/src/core/h5p/components/h5p-player/core-h5p-player.html
+++ b/src/core/h5p/components/h5p-player/core-h5p-player.html
@@ -9,4 +9,5 @@
         <core-download-refresh [status]="state" [enabled]="canDownload" [loading]="calculating" [canTrustDownload]="true" (action)="download()"></core-download-refresh>
     </div>
 </div>
-<core-iframe *ngIf="showPackage" [src]="playerSrc" iframeHeight="230px"></core-iframe>
+<core-iframe *ngIf="showPackage" [src]="playerSrc" iframeHeight="auto"></core-iframe>
+<script *ngIf="resizeScript && showPackage" type="text/javascript" [src]="resizeScript"></script>
diff --git a/src/core/h5p/components/h5p-player/h5p-player.ts b/src/core/h5p/components/h5p-player/h5p-player.ts
index 0627e89d6..ccc5b5325 100644
--- a/src/core/h5p/components/h5p-player/h5p-player.ts
+++ b/src/core/h5p/components/h5p-player/h5p-player.ts
@@ -99,6 +99,8 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
 
         let promise;
 
+        this.addResizerScript();
+
         if (this.canDownload && (this.state == CoreConstants.DOWNLOADED || this.state == CoreConstants.OUTDATED)) {
             // Package is downloaded, use the local URL.
             promise = this.h5pProvider.getContentIndexFileUrl(this.urlParams.url).catch((error) => {
@@ -154,6 +156,17 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
         });
     }
 
+    /**
+     * Add the resizer script if it hasn't been added already.
+     */
+    protected addResizerScript(): void {
+        const script = document.createElement('script');
+        script.id = 'core-h5p-resizer-script';
+        script.type = 'text/javascript';
+        script.src = this.h5pProvider.getResizerScriptUrl();
+        document.head.appendChild(script);
+    }
+
     /**
      * Check if the package can be downloaded.
      */
diff --git a/src/core/h5p/providers/h5p.ts b/src/core/h5p/providers/h5p.ts
index 57d674897..d92f398a7 100644
--- a/src/core/h5p/providers/h5p.ts
+++ b/src/core/h5p/providers/h5p.ts
@@ -522,20 +522,22 @@ export class CoreH5PProvider {
                 let html = '<html><head><title>' + content.title + '</title>' +
                         '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">';
 
-                // @todo: Load the embed.js to allow communication with the parent window.
-                // $PAGE->requires->js(new moodle_url('/h5p/js/embed.js'));
-
                 // Include the required CSS.
                 result.cssRequires.forEach((cssUrl) => {
                     html += '<link rel="stylesheet" type="text/css" href="' + cssUrl + '">';
                 });
 
                 // Add the settings.
-                html += '<script type="text/javascript">var H5PIntegration = ' + JSON.stringify(result.settings) + '</script>';
+                html += '<script type="text/javascript">var H5PIntegration = ' +
+                        JSON.stringify(result.settings).replace(/\//g, '\\/') + '</script>';
 
                 html += '</head><body>';
 
                 // Include the required JS at the beginning of the body, like Moodle web does.
+                // Load the embed.js to allow communication with the parent window.
+                html += '<script type="text/javascript" src="' +
+                        this.textUtils.concatenatePaths(this.getCoreH5PPath(), 'moodle/js/embed.js') + '"></script>';
+
                 result.jsRequires.forEach((jsUrl) => {
                     html += '<script type="text/javascript" src="' + jsUrl + '"></script>';
                 });
@@ -1664,8 +1666,16 @@ export class CoreH5PProvider {
      * @return The HTML code with the resize script.
      */
     protected getResizeCode(): string {
-        // @todo return '<script src="' +  + '"></script>';
-        return '';
+        return '<script src="' + this.getResizerScriptUrl() + '"></script>';
+    }
+
+    /**
+     * Get the URL to the resizer script.
+     *
+     * @return URL.
+     */
+    getResizerScriptUrl(): string {
+        return this.textUtils.concatenatePaths(this.getCoreH5PPath(), 'js/h5p-resizer.js');
     }
 
     /**
diff --git a/src/providers/utils/dom.ts b/src/providers/utils/dom.ts
index 37bb85907..18dec5369 100644
--- a/src/providers/utils/dom.ts
+++ b/src/providers/utils/dom.ts
@@ -385,7 +385,7 @@ export class CoreDomUtilsProvider {
      * @return Formatted size. If size is not valid, returns an empty string.
      */
     formatPixelsSize(size: any): string {
-        if (typeof size == 'string' && (size.indexOf('px') > -1 || size.indexOf('%') > -1)) {
+        if (typeof size == 'string' && (size.indexOf('px') > -1 || size.indexOf('%') > -1 || size == 'auto' || size == 'initial')) {
             // It seems to be a valid size.
             return size;
         }

From d5e12fb1367bfc88c32985d19fc8e57f7e89f7c4 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 25 Nov 2019 15:05:49 +0100
Subject: [PATCH 183/257] MOBILE-2235 h5p: Delete index files when updating
 libs

---
 .../h5p/components/h5p-player/h5p-player.ts   | 19 +++-
 src/core/h5p/providers/h5p.ts                 | 87 ++++++++++++++++---
 src/core/h5p/providers/pluginfile-handler.ts  |  1 +
 src/providers/plugin-file-delegate.ts         |  1 +
 4 files changed, 92 insertions(+), 16 deletions(-)

diff --git a/src/core/h5p/components/h5p-player/h5p-player.ts b/src/core/h5p/components/h5p-player/h5p-player.ts
index ccc5b5325..b4058b4dd 100644
--- a/src/core/h5p/components/h5p-player/h5p-player.ts
+++ b/src/core/h5p/components/h5p-player/h5p-player.ts
@@ -15,6 +15,7 @@
 import { Component, Input, ElementRef, OnInit, OnDestroy, OnChanges, SimpleChange } from '@angular/core';
 import { CoreAppProvider } from '@providers/app';
 import { CoreEventsProvider } from '@providers/events';
+import { CoreFileProvider } from '@providers/file';
 import { CoreFilepoolProvider } from '@providers/filepool';
 import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider } from '@providers/sites';
@@ -62,7 +63,8 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
             protected eventsProvider: CoreEventsProvider,
             protected appProvider: CoreAppProvider,
             protected domUtils: CoreDomUtilsProvider,
-            protected pluginFileDelegate: CorePluginFileDelegate) {
+            protected pluginFileDelegate: CorePluginFileDelegate,
+            protected fileProvider: CoreFileProvider) {
 
         this.logger = loggerProvider.getInstance('CoreH5PPlayerComponent');
         this.siteId = sitesProvider.getCurrentSiteId();
@@ -103,8 +105,19 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
 
         if (this.canDownload && (this.state == CoreConstants.DOWNLOADED || this.state == CoreConstants.OUTDATED)) {
             // Package is downloaded, use the local URL.
-            promise = this.h5pProvider.getContentIndexFileUrl(this.urlParams.url).catch((error) => {
-                // It seems there was something wrong when creating the index file. Delete the package?
+            promise = this.h5pProvider.getContentIndexFileUrl(this.urlParams.url, this.siteId).catch(() => {
+
+                // Index file doesn't exist, probably deleted because a lib was updated. Try to create it again.
+                return this.filepoolProvider.getInternalUrlByUrl(this.siteId, this.urlParams.url).then((path) => {
+                    return this.fileProvider.getFile(path);
+                }).then((file) => {
+                    return this.h5pProvider.extractH5PFile(this.urlParams.url, file, this.siteId);
+                }).then(() => {
+                    // File treated. Try to get the index file URL again.
+                    return this.h5pProvider.getContentIndexFileUrl(this.urlParams.url, this.siteId);
+                });
+            }).catch((error) => {
+                // Still failing. Delete the H5P package?
                 this.logger.error('Error loading downloaded index:', error, this.src);
             });
         } else {
diff --git a/src/core/h5p/providers/h5p.ts b/src/core/h5p/providers/h5p.ts
index d92f398a7..dde10e3d3 100644
--- a/src/core/h5p/providers/h5p.ts
+++ b/src/core/h5p/providers/h5p.ts
@@ -25,6 +25,7 @@ import { CoreMimetypeUtilsProvider } from '@providers/utils/mimetype';
 import { CoreUrlUtilsProvider } from '@providers/utils/url';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreH5PUtilsProvider } from './utils';
+import { FileEntry } from '@ionic-native/file';
 
 /**
  * Service to provide H5P functionalities.
@@ -279,6 +280,11 @@ export class CoreH5PProvider {
                         name: 'hash',
                         type: 'TEXT',
                         notNull: true
+                    },
+                    {
+                        name: 'foldername',
+                        type: 'TEXT',
+                        notNull: true
                     }
                 ]
             }
@@ -566,7 +572,8 @@ export class CoreH5PProvider {
                 db.deleteRecords(this.CONTENT_TABLE),
                 db.deleteRecords(this.LIBRARIES_TABLE),
                 db.deleteRecords(this.LIBRARY_DEPENDENCIES_TABLE),
-                db.deleteRecords(this.CONTENTS_LIBRARIES_TABLE)
+                db.deleteRecords(this.CONTENTS_LIBRARIES_TABLE),
+                db.deleteRecords(this.LIBRARIES_CACHEDASSETS_TABLE)
             ]);
         });
     }
@@ -575,15 +582,13 @@ export class CoreH5PProvider {
      * Delete cached assets from DB and filesystem.
      *
      * @param libraryId Library identifier.
-     * @param folderName Name of the folder of the H5P package.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
-    protected deleteCachedAssets(libraryId: number, folderName: string, siteId?: string): Promise<any> {
+    protected deleteCachedAssets(libraryId: number, siteId?: string): Promise<any> {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
-            const db = site.getDb(),
-                cachedAssetsFolder = this.getCachedAssetsFolderPath(folderName, site.getId());
+            const db = site.getDb();
 
             // Get all the hashes that use this library.
             return db.getRecords(this.LIBRARIES_CACHEDASSETS_TABLE, {libraryid: libraryId}).then((entries) => {
@@ -594,6 +599,8 @@ export class CoreH5PProvider {
                 entries.forEach((entry) => {
                     hashes.push(entry.hash);
 
+                    const cachedAssetsFolder = this.getCachedAssetsFolderPath(entry.foldername, site.getId());
+
                     ['js', 'css'].forEach((type) => {
                         const path = this.textUtils.concatenatePaths(cachedAssetsFolder, entry.hash + '.' + type);
 
@@ -603,11 +610,6 @@ export class CoreH5PProvider {
                     });
                 });
 
-                // Also, delete the index.html file.
-                promises.push(this.fileProvider.removeFile(this.getContentIndexPath(folderName, site.getId())).catch(() => {
-                    // Ignore errors.
-                }));
-
                 return Promise.all(promises).then(() => {
                     return db.deleteRecordsList(this.LIBRARIES_CACHEDASSETS_TABLE, 'hash', hashes);
                 });
@@ -636,6 +638,45 @@ export class CoreH5PProvider {
         return Promise.all(promises);
     }
 
+    /**
+     * Delete content indexes from filesystem.
+     *
+     * @param libraryId Library identifier.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    protected deleteContentIndexesForLibrary(libraryId: number, siteId?: string): Promise<any> {
+
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            const db = site.getDb();
+
+            // Get the folder names of all the packages that use this library.
+            const query = 'SELECT DISTINCT hc.foldername ' +
+                        'FROM ' + this.CONTENTS_LIBRARIES_TABLE + ' hcl ' +
+                        'JOIN ' + this.CONTENT_TABLE + ' hc ON hcl.h5pid = hc.id ' +
+                        'WHERE hcl.libraryid = ?',
+                queryArgs = [];
+
+            queryArgs.push(libraryId);
+
+            return db.execute(query, queryArgs).then((result) => {
+                const promises = [];
+
+                for (let i = 0; i < result.rows.length; i++) {
+                    const entry = result.rows.item(i);
+
+                    // Delete the index.html file.
+                    promises.push(this.fileProvider.removeFile(this.getContentIndexPath(entry.foldername, site.getId()))
+                            .catch(() => {
+                        // Ignore errors.
+                    }));
+                }
+
+                return Promise.all(promises);
+            });
+        });
+    }
+
     /**
      * Delete library data from DB.
      *
@@ -1796,6 +1837,27 @@ export class CoreH5PProvider {
         });
     }
 
+    /**
+     * Performs actions required when a library has been installed.
+     *
+     * @param libraryId ID of library that was installed.
+     * @param siteId Site ID.
+     * @return Promise resolved when done.
+     */
+    protected libraryInstalled(libraryId: number, siteId: string): Promise<any> {
+        const promises = [];
+
+        // Remove all indexes of contents that use this library.
+        promises.push(this.deleteContentIndexesForLibrary(libraryId, siteId));
+
+        if (this.aggregateAssets) {
+            // Remove cached assets that use this library.
+            promises.push(this.deleteCachedAssets(libraryId, siteId));
+        }
+
+        return this.utils.allPromises(promises);
+    }
+
     /**
      * Writes library data as string on the form {machineName} {majorVersion}.{minorVersion}.
      *
@@ -2198,9 +2260,8 @@ export class CoreH5PProvider {
                             });
                         });
                     }).then(() => {
-                        // Remove cached assets that use this library.
-                        if (this.aggregateAssets && typeof libraryData.libraryId != 'undefined') {
-                            return this.deleteCachedAssets(libraryData.libraryId, folderName, siteId);
+                        if (typeof libraryData.libraryId != 'undefined') {
+                            return this.libraryInstalled(libraryData.libraryId, siteId);
                         }
                     });
                 }));
diff --git a/src/core/h5p/providers/pluginfile-handler.ts b/src/core/h5p/providers/pluginfile-handler.ts
index a7787a3f0..fed35e88e 100644
--- a/src/core/h5p/providers/pluginfile-handler.ts
+++ b/src/core/h5p/providers/pluginfile-handler.ts
@@ -21,6 +21,7 @@ import { CoreUrlUtilsProvider } from '@providers/utils/url';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreH5PProvider } from './h5p';
 import { CoreWSExternalFile } from '@providers/ws';
+import { FileEntry } from '@ionic-native/file';
 
 /**
  * Handler to treat H5P files.
diff --git a/src/providers/plugin-file-delegate.ts b/src/providers/plugin-file-delegate.ts
index b1c33e1f0..6ff96e5c3 100644
--- a/src/providers/plugin-file-delegate.ts
+++ b/src/providers/plugin-file-delegate.ts
@@ -15,6 +15,7 @@
 import { Injectable } from '@angular/core';
 import { CoreLoggerProvider } from './logger';
 import { CoreWSExternalFile } from '@providers/ws';
+import { FileEntry } from '@ionic-native/file';
 
 /**
  * Interface that all plugin file handlers must implement.

From ad716ce07ef6845831bd3d85dc71edad3020b668 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 25 Nov 2019 16:08:58 +0100
Subject: [PATCH 184/257] MOBILE-2235 h5p: Delete content data if original file
 is deleted

---
 src/core/h5p/providers/h5p.ts                | 36 ++++++++++++++++++++
 src/core/h5p/providers/pluginfile-handler.ts | 13 +++++++
 src/providers/filepool.ts                    | 21 +++++++++++-
 src/providers/plugin-file-delegate.ts        | 30 +++++++++++++++-
 4 files changed, 98 insertions(+), 2 deletions(-)

diff --git a/src/core/h5p/providers/h5p.ts b/src/core/h5p/providers/h5p.ts
index dde10e3d3..6dc9f3814 100644
--- a/src/core/h5p/providers/h5p.ts
+++ b/src/core/h5p/providers/h5p.ts
@@ -617,6 +617,27 @@ export class CoreH5PProvider {
         });
     }
 
+    /**
+     * Delete all package content data.
+     *
+     * @param fileUrl File URL.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    deleteContentByUrl(fileUrl: string, siteId?: string): Promise<any> {
+        siteId = siteId || this.sitesProvider.getCurrentSiteId();
+
+        return this.getContentDataByUrl(fileUrl, siteId).then((data) => {
+            const promises = [];
+
+            promises.push(this.deleteContentData(data.id, siteId));
+
+            promises.push(this.deleteContentFolder(data.foldername, siteId));
+
+            return this.utils.allPromises(promises);
+        });
+    }
+
     /**
      * Delete content data from DB.
      *
@@ -638,6 +659,17 @@ export class CoreH5PProvider {
         return Promise.all(promises);
     }
 
+    /**
+     * Deletes a content folder from the file system.
+     *
+     * @param folderName Folder name of the content.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    deleteContentFolder(folderName: string, siteId?: string): Promise<any> {
+        return this.fileProvider.removeDir(this.getContentFolderPath(folderName, siteId));
+    }
+
     /**
      * Delete content indexes from filesystem.
      *
@@ -1160,9 +1192,13 @@ export class CoreH5PProvider {
         return this.sitesProvider.getSite(siteId).then((site) => {
             const db = site.getDb();
 
+            // Try to use the folder name, it should be more reliable than the URL.
             return this.getContentFolderNameByUrl(fileUrl, site.getId()).then((folderName) => {
 
                 return db.getRecord(this.CONTENT_TABLE, {foldername: folderName});
+            }, () => {
+                // Cannot get folder name, the h5p file was probably deleted. Just use the URL.
+                return db.getRecord(this.CONTENT_TABLE, {fileurl: fileUrl});
             });
         });
     }
diff --git a/src/core/h5p/providers/pluginfile-handler.ts b/src/core/h5p/providers/pluginfile-handler.ts
index fed35e88e..71b82053d 100644
--- a/src/core/h5p/providers/pluginfile-handler.ts
+++ b/src/core/h5p/providers/pluginfile-handler.ts
@@ -48,6 +48,19 @@ export class CoreH5PPluginFileHandler implements CorePluginFileHandler {
         return this.h5pProvider.getTrustedH5PFile(file.fileurl, {}, false, siteId);
     }
 
+    /**
+     * React to a file being deleted.
+     *
+     * @param fileUrl The file URL used to download the file.
+     * @param path The path of the deleted file.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    fileDeleted(fileUrl: string, path: string, siteId?: string): Promise<any> {
+        // If an h5p file is deleted, remove the contents folder.
+        return this.h5pProvider.deleteContentByUrl(fileUrl, siteId);
+    }
+
     /**
      * Given an HTML element, get the URLs of the files that should be downloaded and weren't treated by
      * CoreDomUtilsProvider.extractDownloadableFilesFromHtml.
diff --git a/src/providers/filepool.ts b/src/providers/filepool.ts
index ddea2ddbb..5ad03bead 100644
--- a/src/providers/filepool.ts
+++ b/src/providers/filepool.ts
@@ -2646,7 +2646,22 @@ export class CoreFilepoolProvider {
     protected removeFileById(siteId: string, fileId: string): Promise<any> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
             // Get the path to the file first since it relies on the file object stored in the pool.
-            return Promise.resolve(this.getFilePath(siteId, fileId)).then((path) => {
+            // Don't use getFilePath to prevent performing 2 DB requests.
+            let path = this.getFilepoolFolderPath(siteId) + '/' + fileId,
+                fileUrl;
+
+            return this.hasFileInPool(siteId, fileId).then((entry) => {
+                fileUrl = entry.url;
+
+                if (entry.extension) {
+                    path += '.' + entry.extension;
+                }
+
+                return path;
+            }).catch(() => {
+                // If file not found, use the path without extension.
+                return path;
+            }).then((path) => {
                 const promises = [];
 
                 // Remove entry from filepool store.
@@ -2668,6 +2683,10 @@ export class CoreFilepoolProvider {
 
                 return Promise.all(promises).then(() => {
                     this.notifyFileDeleted(siteId, fileId);
+
+                    return this.pluginFileDelegate.fileDeleted(fileUrl, path, siteId).catch((error) => {
+                        // Ignore errors.
+                    });
                 });
             });
         });
diff --git a/src/providers/plugin-file-delegate.ts b/src/providers/plugin-file-delegate.ts
index 6ff96e5c3..01aea603e 100644
--- a/src/providers/plugin-file-delegate.ts
+++ b/src/providers/plugin-file-delegate.ts
@@ -57,6 +57,16 @@ export interface CorePluginFileHandler {
      */
     canDownloadFile?(file: CoreWSExternalFile, siteId?: string): Promise<CoreWSExternalFile>;
 
+    /**
+     * React to a file being deleted.
+     *
+     * @param fileUrl The file URL used to download the file.
+     * @param path The path of the deleted file.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    fileDeleted?(fileUrl: string, path: string, siteId?: string): Promise<any>;
+
     /**
      * Given an HTML element, get the URLs of the files that should be downloaded and weren't treated by
      * CoreDomUtilsProvider.extractDownloadableFilesFromHtml.
@@ -139,6 +149,24 @@ export class CorePluginFileDelegate {
         return Promise.resolve(file);
     }
 
+    /**
+     * React to a file being deleted.
+     *
+     * @param fileUrl The file URL used to download the file.
+     * @param path The path of the deleted file.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    fileDeleted(fileUrl: string, path: string, siteId?: string): Promise<any> {
+        const handler = this.getHandlerForFile({fileurl: fileUrl});
+
+        if (handler && handler.fileDeleted) {
+            return handler.fileDeleted(fileUrl, path, siteId);
+        }
+
+        return Promise.resolve();
+    }
+
     /**
      * Get the handler for a certain pluginfile url.
      *
@@ -310,7 +338,7 @@ export class CorePluginFileDelegate {
     treatDownloadedFile(fileUrl: string, file: FileEntry, siteId?: string): Promise<any> {
         const handler = this.getHandlerForFile({fileurl: fileUrl});
 
-        if (handler && handler.getFileSize) {
+        if (handler && handler.treatDownloadedFile) {
             return handler.treatDownloadedFile(fileUrl, file, siteId);
         }
 

From 5903975e8cdb6eb63dbaecf48c1cebfeeff7fc0e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 26 Nov 2019 08:49:59 +0100
Subject: [PATCH 185/257] MOBILE-2235 h5p: Handle display options

---
 .../h5p/assets/moodle/js/displayoptions.js    |  35 ++++++
 .../h5p/components/h5p-player/h5p-player.ts   |   4 +-
 src/core/h5p/providers/h5p.ts                 | 107 +++++++++++++-----
 src/providers/utils/url.ts                    |  10 +-
 4 files changed, 124 insertions(+), 32 deletions(-)
 create mode 100644 src/core/h5p/assets/moodle/js/displayoptions.js

diff --git a/src/core/h5p/assets/moodle/js/displayoptions.js b/src/core/h5p/assets/moodle/js/displayoptions.js
new file mode 100644
index 000000000..59088886d
--- /dev/null
+++ b/src/core/h5p/assets/moodle/js/displayoptions.js
@@ -0,0 +1,35 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/**
+ * Handle display options included in the URL and put them in the H5PIntegration object if it exists.
+ */
+
+if (window.H5PIntegration && window.H5PIntegration.contents && location.search) {
+    var contentData = window.H5PIntegration.contents[Object.keys(window.H5PIntegration.contents)[0]];
+
+    if (contentData) {
+        contentData.displayOptions = contentData.displayOptions || {};
+
+        var search = location.search.replace(/^\?/, ''),
+            split = search.split('&');
+
+        split.forEach(function(param) {
+            var nameAndValue = param.split('=');
+            if (nameAndValue.length == 2) {
+                contentData.displayOptions[nameAndValue[0]] = nameAndValue[1] === '1' || nameAndValue[1] === 'true';
+            }
+        });
+    }
+}
diff --git a/src/core/h5p/components/h5p-player/h5p-player.ts b/src/core/h5p/components/h5p-player/h5p-player.ts
index b4058b4dd..1a1cc7fb1 100644
--- a/src/core/h5p/components/h5p-player/h5p-player.ts
+++ b/src/core/h5p/components/h5p-player/h5p-player.ts
@@ -105,7 +105,7 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
 
         if (this.canDownload && (this.state == CoreConstants.DOWNLOADED || this.state == CoreConstants.OUTDATED)) {
             // Package is downloaded, use the local URL.
-            promise = this.h5pProvider.getContentIndexFileUrl(this.urlParams.url, this.siteId).catch(() => {
+            promise = this.h5pProvider.getContentIndexFileUrl(this.urlParams.url, this.urlParams, this.siteId).catch(() => {
 
                 // Index file doesn't exist, probably deleted because a lib was updated. Try to create it again.
                 return this.filepoolProvider.getInternalUrlByUrl(this.siteId, this.urlParams.url).then((path) => {
@@ -114,7 +114,7 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
                     return this.h5pProvider.extractH5PFile(this.urlParams.url, file, this.siteId);
                 }).then(() => {
                     // File treated. Try to get the index file URL again.
-                    return this.h5pProvider.getContentIndexFileUrl(this.urlParams.url, this.siteId);
+                    return this.h5pProvider.getContentIndexFileUrl(this.urlParams.url, this.urlParams, this.siteId);
                 });
             }).catch((error) => {
                 // Still failing. Delete the H5P package?
diff --git a/src/core/h5p/providers/h5p.ts b/src/core/h5p/providers/h5p.ts
index 6dc9f3814..e6c9e76e9 100644
--- a/src/core/h5p/providers/h5p.ts
+++ b/src/core/h5p/providers/h5p.ts
@@ -100,7 +100,7 @@ export class CoreH5PProvider {
                         notNull: true
                     },
                     {
-                        name: 'displayoptions',
+                        name: 'displayoptions', // Not used right now, but we keep the field to be consistent with Moodle web.
                         type: 'INTEGER'
                     },
                     {
@@ -494,10 +494,7 @@ export class CoreH5PProvider {
 
         return this.sitesProvider.getSite(siteId).then((site) => {
 
-            const disable = typeof content.disable != 'undefined' && content.disable != null ?
-                    content.disable : CoreH5PProvider.DISABLE_NONE,
-                displayOptions = this.getDisplayOptionsForView(disable, id),
-                contentId = this.getContentId(id),
+            const contentId = this.getContentId(id),
                 basePath = this.fileProvider.getBasePathInstant(),
                 contentUrl = this.textUtils.concatenatePaths(basePath, this.getContentFolderPath(content.folderName, site.getId()));
 
@@ -506,10 +503,10 @@ export class CoreH5PProvider {
                 library: this.libraryToString(content.library),
                 fullScreen: content.library.fullscreen,
                 exportUrl: '', // We'll never display the download button, so we don't need the exportUrl.
-                embedCode: this.getEmbedCode(site.getURL(), h5pUrl, displayOptions[CoreH5PProvider.DISPLAY_OPTION_EMBED]),
+                embedCode: this.getEmbedCode(site.getURL(), h5pUrl, true),
                 resizeCode: this.getResizeCode(),
                 title: content.slug,
-                displayOptions: displayOptions,
+                displayOptions: {},
                 url: this.getEmbedUrl(site.getURL(), h5pUrl),
                 contentUrl: contentUrl,
                 metadata: content.metadata,
@@ -537,6 +534,10 @@ export class CoreH5PProvider {
                 html += '<script type="text/javascript">var H5PIntegration = ' +
                         JSON.stringify(result.settings).replace(/\//g, '\\/') + '</script>';
 
+                // Add our own script to handle the display options.
+                html += '<script type="text/javascript" src="' +
+                        this.textUtils.concatenatePaths(this.getCoreH5PPath(), 'moodle/js/displayoptions.js') + '"></script>';
+
                 html += '</head><body>';
 
                 // Include the required JS at the beginning of the body, like Moodle web does.
@@ -1218,17 +1219,26 @@ export class CoreH5PProvider {
      * Get the content index file.
      *
      * @param fileUrl URL of the H5P package.
+     * @param urlParams URL params.
      * @param siteId The site ID. If not defined, current site.
      * @return Promise resolved with the file URL if exists, rejected otherwise.
      */
-    getContentIndexFileUrl(fileUrl: string, siteId?: string): Promise<string> {
+    getContentIndexFileUrl(fileUrl: string, urlParams?: {[name: string]: string}, siteId?: string): Promise<string> {
         siteId = siteId || this.sitesProvider.getCurrentSiteId();
 
         return this.getContentFolderNameByUrl(fileUrl, siteId).then((folderName) => {
             return this.fileProvider.getFile(this.getContentIndexPath(folderName, siteId));
         }).then((file) => {
             return file.toURL();
+        }).then((url) => {
+            // Add display options to the URL.
+            return this.getContentDataByUrl(fileUrl, siteId).then((data) => {
+                const options = this.validateDisplayOptions(this.getDisplayOptionsFromUrlParams(urlParams), data.id);
+
+                return this.urlUtils.addParamsToUrl(url, options, undefined, true);
+            });
         });
+
     }
 
     /**
@@ -1486,25 +1496,31 @@ export class CoreH5PProvider {
      * @return Display options as object.
      */
     getDisplayOptionsForView(disable: number, id: number): CoreH5PDisplayOptions {
-        const displayOptions = this.getDisplayOptionsAsObject(disable);
+        return this.validateDisplayOptions(this.getDisplayOptionsAsObject(disable), id);
+    }
 
-        if (this.getOption(CoreH5PProvider.DISPLAY_OPTION_FRAME, true) == false) {
-            displayOptions[CoreH5PProvider.DISPLAY_OPTION_FRAME] = false;
-        } else {
-            displayOptions[CoreH5PProvider.DISPLAY_OPTION_DOWNLOAD] = this.setDisplayOptionOverrides(
-                    CoreH5PProvider.DISPLAY_OPTION_DOWNLOAD, CoreH5PPermission.DOWNLOAD_H5P, id,
-                    displayOptions[CoreH5PProvider.DISPLAY_OPTION_DOWNLOAD]);
+    /**
+     * Get display options from a URL params.
+     *
+     * @param params URL params.
+     * @return Display options as object.
+     */
+    getDisplayOptionsFromUrlParams(params: {[name: string]: string}): CoreH5PDisplayOptions {
+        const displayOptions: CoreH5PDisplayOptions = {};
 
-            displayOptions[CoreH5PProvider.DISPLAY_OPTION_EMBED] = this.setDisplayOptionOverrides(
-                    CoreH5PProvider.DISPLAY_OPTION_EMBED, CoreH5PPermission.EMBED_H5P, id,
-                    displayOptions[CoreH5PProvider.DISPLAY_OPTION_EMBED]);
-
-            if (this.getOption(CoreH5PProvider.DISPLAY_OPTION_COPYRIGHT, true) == false) {
-                displayOptions[CoreH5PProvider.DISPLAY_OPTION_COPYRIGHT] = false;
-            }
+        if (!params) {
+            return displayOptions;
         }
 
-        displayOptions[CoreH5PProvider.DISPLAY_OPTION_COPY] = this.hasPermission(CoreH5PPermission.COPY_H5P, id);
+        displayOptions[CoreH5PProvider.DISPLAY_OPTION_DOWNLOAD] =
+                this.utils.isTrueOrOne(params[CoreH5PProvider.DISPLAY_OPTION_DOWNLOAD]);
+        displayOptions[CoreH5PProvider.DISPLAY_OPTION_EMBED] =
+                this.utils.isTrueOrOne(params[CoreH5PProvider.DISPLAY_OPTION_EMBED]);
+        displayOptions[CoreH5PProvider.DISPLAY_OPTION_COPYRIGHT] =
+                this.utils.isTrueOrOne(params[CoreH5PProvider.DISPLAY_OPTION_COPYRIGHT]);
+        displayOptions[CoreH5PProvider.DISPLAY_OPTION_FRAME] = displayOptions[CoreH5PProvider.DISPLAY_OPTION_DOWNLOAD] ||
+                displayOptions[CoreH5PProvider.DISPLAY_OPTION_EMBED] || displayOptions[CoreH5PProvider.DISPLAY_OPTION_COPYRIGHT];
+        displayOptions[CoreH5PProvider.DISPLAY_OPTION_ABOUT] = !!this.getOption(CoreH5PProvider.DISPLAY_OPTION_ABOUT, true);
 
         return displayOptions;
     }
@@ -1734,7 +1750,7 @@ export class CoreH5PProvider {
      */
     getOption(name: string, defaultValue: any = false): any {
         // For now, all them are disabled by default, so only will be rendered when defined in the displayoptions DB field.
-        return 2; // CONTROLLED_BY_AUTHOR_DEFAULT_OFF.
+        return CoreH5PDisplayOptionBehaviour.CONTROLLED_BY_AUTHOR_DEFAULT_OFF; // CONTROLLED_BY_AUTHOR_DEFAULT_OFF.
     }
 
     /**
@@ -1845,7 +1861,8 @@ export class CoreH5PProvider {
      * @return Whether the user has permission to execute an action.
      */
     hasPermission(permission: number, id: number): boolean {
-        return true;
+        // H5P capabilities have not been introduced.
+        return null;
     }
 
     /**
@@ -1967,7 +1984,7 @@ export class CoreH5PProvider {
                     params: contentData.jsoncontent,
                     // The embedtype will be always set to 'iframe' to prevent conflicts with JS and CSS.
                     embedType: 'iframe',
-                    disable: contentData.displayoptions,
+                    disable: null,
                     folderName: contentData.foldername,
                     title: libData.title,
                     slug: this.h5pUtils.slugify(libData.title) + '-' + contentData.id,
@@ -2193,7 +2210,7 @@ export class CoreH5PProvider {
 
             const data: any = {
                 jsoncontent: content.params,
-                displayoptions: content.disable,
+                displayoptions: null,
                 mainlibraryid: content.library.libraryId,
                 timemodified: Date.now(),
                 filtered: null,
@@ -2563,6 +2580,40 @@ export class CoreH5PProvider {
             return db.updateRecords(this.CONTENT_TABLE, data, {id: id});
         });
     }
+
+    /**
+     * Validate display options, updating them if needed.
+     *
+     * @param displayOptions The display options to validate.
+     * @param id Package ID.
+     */
+    validateDisplayOptions(displayOptions: CoreH5PDisplayOptions, id: number): CoreH5PDisplayOptions {
+
+        // Never allow downloading in the app.
+        displayOptions[CoreH5PProvider.DISPLAY_OPTION_DOWNLOAD] = false;
+
+        // Embed - force setting it if always on or always off. In web, this is done when storing in DB.
+        const embed = this.getOption(CoreH5PProvider.DISPLAY_OPTION_EMBED, CoreH5PDisplayOptionBehaviour.ALWAYS_SHOW);
+        if (embed == CoreH5PDisplayOptionBehaviour.ALWAYS_SHOW || embed == CoreH5PDisplayOptionBehaviour.NEVER_SHOW) {
+            displayOptions[CoreH5PProvider.DISPLAY_OPTION_EMBED] = (embed == CoreH5PDisplayOptionBehaviour.ALWAYS_SHOW);
+        }
+
+        if (this.getOption(CoreH5PProvider.DISPLAY_OPTION_FRAME, true) == false) {
+            displayOptions[CoreH5PProvider.DISPLAY_OPTION_FRAME] = false;
+        } else {
+            displayOptions[CoreH5PProvider.DISPLAY_OPTION_EMBED] = this.setDisplayOptionOverrides(
+                    CoreH5PProvider.DISPLAY_OPTION_EMBED, CoreH5PPermission.EMBED_H5P, id,
+                    displayOptions[CoreH5PProvider.DISPLAY_OPTION_EMBED]);
+
+            if (this.getOption(CoreH5PProvider.DISPLAY_OPTION_COPYRIGHT, true) == false) {
+                displayOptions[CoreH5PProvider.DISPLAY_OPTION_COPYRIGHT] = false;
+            }
+        }
+
+        displayOptions[CoreH5PProvider.DISPLAY_OPTION_COPY] = this.hasPermission(CoreH5PPermission.COPY_H5P, id);
+
+        return displayOptions;
+    }
 }
 
 /**
@@ -2633,7 +2684,7 @@ export type CoreH5PContentDBData = {
     id: number; // The id of the content.
     jsoncontent: string; // The content in json format.
     mainlibraryid: number; // The library we first instantiate for this node.
-    displayoptions: number; // H5P Button display options.
+    displayoptions: number; // H5P Button display options. Not used right now.
     foldername: string; // Name of the folder that contains the contents.
     fileurl: string; // The online URL of the H5P package.
     filtered: string; // Filtered version of json_content.
diff --git a/src/providers/utils/url.ts b/src/providers/utils/url.ts
index d2e9e0d47..c04240a6c 100644
--- a/src/providers/utils/url.ts
+++ b/src/providers/utils/url.ts
@@ -50,13 +50,19 @@ export class CoreUrlUtilsProvider {
      * @param url URL to add the params to.
      * @param params Object with the params to add.
      * @param anchor Anchor text if needed.
+     * @param boolToNumber Whether to convert bools to 1 or 0.
      * @return URL with params.
      */
-    addParamsToUrl(url: string, params?: {[key: string]: any}, anchor?: string): string {
+    addParamsToUrl(url: string, params?: {[key: string]: any}, anchor?: string, boolToNumber?: boolean): string {
         let separator = url.indexOf('?') != -1 ? '&' : '?';
 
         for (const key in params) {
-            const value = params[key];
+            let value = params[key];
+
+            if (boolToNumber && typeof value == 'boolean') {
+                // Convert booleans to 1 or 0.
+                value = value ? 1 : 0;
+            }
 
             // Ignore objects.
             if (typeof value != 'object') {

From 3da7c99fd83be54ed1ca5b7be271963653368e5c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 26 Nov 2019 09:42:28 +0100
Subject: [PATCH 186/257] MOBILE-2235 h5p: Download in background after play

---
 .../h5p/components/h5p-player/h5p-player.ts   | 29 +++++++++++++++++++
 src/providers/filepool.ts                     | 12 +++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/core/h5p/components/h5p-player/h5p-player.ts b/src/core/h5p/components/h5p-player/h5p-player.ts
index 1a1cc7fb1..11a5901fc 100644
--- a/src/core/h5p/components/h5p-player/h5p-player.ts
+++ b/src/core/h5p/components/h5p-player/h5p-player.ts
@@ -138,6 +138,13 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
         }).finally(() => {
             this.loading = false;
             this.showPackage = true;
+
+            if (this.canDownload && (this.state == CoreConstants.OUTDATED || this.state == CoreConstants.NOT_DOWNLOADED)) {
+                // Download the package in background if the size is low.
+                this.downloadInBg().catch((error) => {
+                    this.logger.error('Error downloading H5P in background', error);
+                });
+            }
         });
     }
 
@@ -169,6 +176,28 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
         });
     }
 
+    /**
+     * Download the H5P in background if the size is low.
+     *
+     * @return Promise resolved when done.
+     */
+    protected downloadInBg(): Promise<any> {
+        if (this.urlParams && this.src && this.siteCanDownload && this.h5pProvider.canGetTrustedH5PFileInSite() &&
+                this.appProvider.isOnline()) {
+
+            // Get the file size.
+            return this.pluginFileDelegate.getFileSize({fileurl: this.urlParams.url}, this.siteId).then((size) => {
+
+                if (this.filepoolProvider.shouldDownload(size)) {
+                    // Download the file in background.
+                    this.filepoolProvider.addToQueueByUrl(this.siteId, this.urlParams.url, this.component, this.componentId);
+                }
+            });
+        }
+
+        return Promise.resolve();
+    }
+
     /**
      * Add the resizer script if it hasn't been added already.
      */
diff --git a/src/providers/filepool.ts b/src/providers/filepool.ts
index 5ad03bead..dca0d1e89 100644
--- a/src/providers/filepool.ts
+++ b/src/providers/filepool.ts
@@ -772,7 +772,7 @@ export class CoreFilepoolProvider {
                         return this.addToQueueByUrl(siteId, fileUrl, component, componentId, timemodified, undefined, undefined,
                                 0, options, revision, true);
                     }
-                } else if (size <= this.DOWNLOAD_THRESHOLD || (isWifi && size <= this.WIFI_DOWNLOAD_THRESHOLD)) {
+                } else if (this.shouldDownload(size)) {
                     return this.addToQueueByUrl(siteId, fileUrl, component, componentId, timemodified, undefined, undefined, 0,
                             options, revision, true);
                 }
@@ -2779,6 +2779,16 @@ export class CoreFilepoolProvider {
         });
     }
 
+    /**
+     * Check if a file should be downloaded based on its size.
+     *
+     * @param size File size.
+     * @return Whether file should be downloaded.
+     */
+    shouldDownload(size: number): boolean {
+        return size <= this.DOWNLOAD_THRESHOLD || (this.appProvider.isWifi() && size <= this.WIFI_DOWNLOAD_THRESHOLD);
+    }
+
     /**
      * Convenience function to check if a file should be downloaded before opening it.
      *

From 56faa66adcff8d42976ec40b3cea4c417ac9c4ce Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 28 Nov 2019 12:26:20 +0100
Subject: [PATCH 187/257] MOBILE-2235 h5p: Implement and use content validator

---
 scripts/langindex.json                        |   88 ++
 src/assets/lang/en.json                       |   22 +
 src/core/h5p/classes/content-validator.ts     | 1324 +++++++++++++++++
 .../h5p/components/h5p-player/h5p-player.ts   |    6 +-
 src/core/h5p/lang/en.json                     |   24 +-
 src/core/h5p/providers/h5p.ts                 |  291 ++--
 src/core/h5p/providers/utils.ts               |   21 +
 src/providers/utils/utils.ts                  |    8 +-
 8 files changed, 1642 insertions(+), 142 deletions(-)
 create mode 100644 src/core/h5p/classes/content-validator.ts

diff --git a/scripts/langindex.json b/scripts/langindex.json
index f6be29269..70f4eb012 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1552,6 +1552,94 @@
   "core.group": "moodle",
   "core.groupsseparate": "moodle",
   "core.groupsvisible": "moodle",
+  "core.h5p.additionallicenseinfo": "h5p",
+  "core.h5p.author": "h5p",
+  "core.h5p.authorcomments": "h5p",
+  "core.h5p.authorcommentsdescription": "h5p",
+  "core.h5p.authorname": "h5p",
+  "core.h5p.authorrole": "h5p",
+  "core.h5p.by": "h5p",
+  "core.h5p.cancellabel": "h5p",
+  "core.h5p.ccattribution": "h5p",
+  "core.h5p.ccattributionnc": "h5p",
+  "core.h5p.ccattributionncnd": "h5p",
+  "core.h5p.ccattributionncsa": "h5p",
+  "core.h5p.ccattributionnd": "h5p",
+  "core.h5p.ccattributionsa": "h5p",
+  "core.h5p.ccpdd": "h5p",
+  "core.h5p.changedby": "h5p",
+  "core.h5p.changedescription": "h5p",
+  "core.h5p.changelog": "h5p",
+  "core.h5p.changeplaceholder": "h5p",
+  "core.h5p.close": "h5p",
+  "core.h5p.confirmdialogbody": "h5p",
+  "core.h5p.confirmdialogheader": "h5p",
+  "core.h5p.confirmlabel": "h5p",
+  "core.h5p.connectionLost": "h5p",
+  "core.h5p.connectionReestablished": "h5p",
+  "core.h5p.contentCopied": "h5p",
+  "core.h5p.contentchanged": "h5p",
+  "core.h5p.contenttype": "h5p",
+  "core.h5p.copyright": "h5p",
+  "core.h5p.copyrightinfo": "h5p",
+  "core.h5p.copyrightstring": "h5p",
+  "core.h5p.copyrighttitle": "h5p",
+  "core.h5p.creativecommons": "h5p",
+  "core.h5p.date": "h5p",
+  "core.h5p.disablefullscreen": "h5p",
+  "core.h5p.download": "h5p",
+  "core.h5p.downloadtitle": "h5p",
+  "core.h5p.editor": "h5p",
+  "core.h5p.embed": "h5p",
+  "core.h5p.embedtitle": "h5p",
+  "core.h5p.fullscreen": "h5p",
+  "core.h5p.gpl": "h5p",
+  "core.h5p.h5ptitle": "h5p",
+  "core.h5p.hideadvanced": "h5p",
+  "core.h5p.license": "h5p",
+  "core.h5p.licenseCC010": "h5p",
+  "core.h5p.licenseCC010U": "h5p",
+  "core.h5p.licenseCC10": "h5p",
+  "core.h5p.licenseCC20": "h5p",
+  "core.h5p.licenseCC25": "h5p",
+  "core.h5p.licenseCC30": "h5p",
+  "core.h5p.licenseCC40": "h5p",
+  "core.h5p.licenseGPL": "h5p",
+  "core.h5p.licenseV1": "h5p",
+  "core.h5p.licenseV2": "h5p",
+  "core.h5p.licenseV3": "h5p",
+  "core.h5p.licensee": "h5p",
+  "core.h5p.licenseextras": "h5p",
+  "core.h5p.licenseversion": "h5p",
+  "core.h5p.nocopyright": "h5p",
+  "core.h5p.offlineDialogBody": "h5p",
+  "core.h5p.offlineDialogHeader": "h5p",
+  "core.h5p.offlineDialogRetryButtonLabel": "h5p",
+  "core.h5p.offlineDialogRetryMessage": "h5p",
+  "core.h5p.offlineSuccessfulSubmit": "h5p",
+  "core.h5p.originator": "h5p",
+  "core.h5p.pd": "h5p",
+  "core.h5p.pddl": "h5p",
+  "core.h5p.pdm": "h5p",
+  "core.h5p.resizescript": "h5p",
+  "core.h5p.resubmitScores": "h5p",
+  "core.h5p.reuse": "h5p",
+  "core.h5p.reuseContent": "h5p",
+  "core.h5p.reuseDescription": "h5p",
+  "core.h5p.showadvanced": "h5p",
+  "core.h5p.showless": "h5p",
+  "core.h5p.showmore": "h5p",
+  "core.h5p.size": "h5p",
+  "core.h5p.source": "h5p",
+  "core.h5p.startingover": "h5p",
+  "core.h5p.sublevel": "h5p",
+  "core.h5p.thumbnail": "h5p",
+  "core.h5p.title": "h5p",
+  "core.h5p.undisclosed": "h5p",
+  "core.h5p.year": "h5p",
+  "core.h5p.years": "h5p",
+  "core.h5p.yearsfrom": "h5p",
+  "core.h5p.yearsto": "h5p",
   "core.hasdatatosync": "local_moodlemobileapp",
   "core.help": "moodle",
   "core.hide": "moodle",
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 0b7468465..5a3093332 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1550,7 +1550,12 @@
     "core.group": "Group",
     "core.groupsseparate": "Separate groups",
     "core.groupsvisible": "Visible groups",
+    "core.h5p.additionallicenseinfo": "Any additional information about the license",
     "core.h5p.author": "Author",
+    "core.h5p.authorcomments": "Author comments",
+    "core.h5p.authorcommentsdescription": "Comments for the editor of the content. (This text will not be published as a part of the copyright info.)",
+    "core.h5p.authorname": "Author's name",
+    "core.h5p.authorrole": "Author's role",
     "core.h5p.by": "by",
     "core.h5p.cancellabel": "Cancel",
     "core.h5p.ccattribution": "Attribution (CC BY)",
@@ -1559,7 +1564,11 @@
     "core.h5p.ccattributionncsa": "Attribution-NonCommercial-ShareAlike (CC BY-NC-SA)",
     "core.h5p.ccattributionnd": "Attribution-NoDerivs (CC BY-ND)",
     "core.h5p.ccattributionsa": "Attribution-ShareAlike (CC BY-SA)",
+    "core.h5p.ccpdd": "Public Domain Dedication (CC0)",
+    "core.h5p.changedby": "Changed by",
+    "core.h5p.changedescription": "Description of change",
     "core.h5p.changelog": "Changelog",
+    "core.h5p.changeplaceholder": "Photo cropped, text changed, etc.",
     "core.h5p.close": "Close",
     "core.h5p.confirmdialogbody": "Please confirm that you wish to proceed. This action is not reversible.",
     "core.h5p.confirmdialogheader": "Confirm action",
@@ -1570,18 +1579,24 @@
     "core.h5p.contentchanged": "This content has changed since you last used it.",
     "core.h5p.contenttype": "Content Type",
     "core.h5p.copyright": "Rights of use",
+    "core.h5p.copyrightinfo": "Copyright information",
     "core.h5p.copyrightstring": "Copyright",
     "core.h5p.copyrighttitle": "View copyright information for this content.",
+    "core.h5p.creativecommons": "Creative Commons",
+    "core.h5p.date": "Date",
     "core.h5p.disablefullscreen": "Disable fullscreen",
     "core.h5p.download": "Download",
     "core.h5p.downloadtitle": "Download this content as a H5P file.",
+    "core.h5p.editor": "Editor",
     "core.h5p.embed": "Embed",
     "core.h5p.embedtitle": "View the embed code for this content.",
     "core.h5p.fullscreen": "Fullscreen",
+    "core.h5p.gpl": "General Public License v3",
     "core.h5p.h5ptitle": "Visit H5P.org to check out more cool content.",
     "core.h5p.hideadvanced": "Hide advanced",
     "core.h5p.license": "License",
     "core.h5p.licenseCC010": "CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
+    "core.h5p.licenseCC010U": "CC0 1.0 Universal",
     "core.h5p.licenseCC10": "1.0 Generic",
     "core.h5p.licenseCC20": "2.0 Generic",
     "core.h5p.licenseCC25": "2.5 Generic",
@@ -1591,14 +1606,18 @@
     "core.h5p.licenseV1": "Version 1",
     "core.h5p.licenseV2": "Version 2",
     "core.h5p.licenseV3": "Version 3",
+    "core.h5p.licensee": "Licensee",
     "core.h5p.licenseextras": "License Extras",
+    "core.h5p.licenseversion": "License version",
     "core.h5p.nocopyright": "No copyright information available for this content.",
     "core.h5p.offlineDialogBody": "We were unable to send information about your completion of this task. Please check your internet connection.",
     "core.h5p.offlineDialogHeader": "Your connection to the server was lost",
     "core.h5p.offlineDialogRetryButtonLabel": "Retry now",
     "core.h5p.offlineDialogRetryMessage": "Retrying in :num....",
     "core.h5p.offlineSuccessfulSubmit": "Successfully submitted results.",
+    "core.h5p.originator": "Originator",
     "core.h5p.pd": "Public Domain",
+    "core.h5p.pddl": "Public Domain Dedication and Licence",
     "core.h5p.pdm": "Public Domain Mark (PDM)",
     "core.h5p.play": "Play H5P",
     "core.h5p.resizescript": "Include this script on your website if you want dynamic sizing of the embedded content:",
@@ -1617,6 +1636,9 @@
     "core.h5p.title": "Title",
     "core.h5p.undisclosed": "Undisclosed",
     "core.h5p.year": "Year",
+    "core.h5p.years": "Year(s)",
+    "core.h5p.yearsfrom": "Years (from)",
+    "core.h5p.yearsto": "Years (to)",
     "core.hasdatatosync": "This {{$a}} has offline data to be synchronised.",
     "core.help": "Help",
     "core.hide": "Hide",
diff --git a/src/core/h5p/classes/content-validator.ts b/src/core/h5p/classes/content-validator.ts
new file mode 100644
index 000000000..18ae59dc3
--- /dev/null
+++ b/src/core/h5p/classes/content-validator.ts
@@ -0,0 +1,1324 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { CoreTextUtilsProvider } from '@providers/utils/text';
+import { CoreUtilsProvider } from '@providers/utils/utils';
+import { CoreH5PProvider, CoreH5PLibraryData, CoreH5PLibraryAddonData, CoreH5PContentDepsTreeDependency } from '../providers/h5p';
+import { CoreH5PUtilsProvider } from '../providers/utils';
+import { TranslateService } from '@ngx-translate/core';
+
+/**
+ * Equivalent to Moodle's H5PContentValidator, but without some of the validations.
+ * It's also used to build the dependency list.
+ */
+export class CoreH5PContentValidator {
+    protected static ALLOWED_STYLEABLE_TAGS = ['span', 'p', 'div', 'h1', 'h2', 'h3', 'td'];
+
+    protected typeMap = {
+        text:  'validateText',
+        number:  'validateNumber',
+        boolean:  'validateBoolean',
+        list:  'validateList',
+        group:  'validateGroup',
+        file:  'validateFile',
+        image:  'validateImage',
+        video:  'validateVideo',
+        audio:  'validateAudio',
+        select:  'validateSelect',
+        library:  'validateLibrary',
+    };
+
+    protected nextWeight = 1;
+    protected libraries: {[libString: string]: CoreH5PLibraryData} = {};
+    protected dependencies: {[key: string]: CoreH5PContentDepsTreeDependency} = {};
+    protected relativePathRegExp = /^((\.\.\/){1,2})(.*content\/)?(\d+|editor)\/(.+)$/;
+    protected allowedHtml: {[tag: string]: any} = {};
+    protected allowedStyles: RegExp[];
+    protected metadataSemantics: any[];
+    protected copyrightSemantics: any;
+
+    constructor(protected h5pProvider: CoreH5PProvider,
+            protected h5pUtils: CoreH5PUtilsProvider,
+            protected textUtils: CoreTextUtilsProvider,
+            protected utils: CoreUtilsProvider,
+            protected translate: TranslateService,
+            protected siteId: string) { }
+
+    /**
+     * Add Addon library.
+     *
+     * @param library The addon library to add.
+     * @return Promise resolved when done.
+     */
+    addon(library: CoreH5PLibraryAddonData): Promise<void> {
+        const depKey = 'preloaded-' + library.machineName;
+
+        this.dependencies[depKey] = {
+            library: library,
+            type: 'preloaded'
+        };
+
+        return this.h5pProvider.findLibraryDependencies(this.dependencies, library, this.nextWeight).then((weight) => {
+            this.nextWeight = weight;
+            this.dependencies[depKey].weight = this.nextWeight++;
+        });
+    }
+
+    /**
+     * Get the flat dependency tree.
+     *
+     * @return array
+     */
+    getDependencies(): {[key: string]: CoreH5PContentDepsTreeDependency} {
+        return this.dependencies;
+    }
+
+    /**
+     * Validate metadata
+     *
+     * @param metadata Metadata.
+     * @return Promise resolved with metadata validated & filtered.
+     */
+    validateMetadata(metadata: any): Promise<any> {
+        const semantics = this.getMetadataSemantics();
+        const group = this.utils.clone(metadata || {});
+
+        // Stop complaining about "invalid selected option in select" for old content without license chosen.
+        if (typeof group.license == 'undefined') {
+            group.license = 'U';
+        }
+
+        return this.validateGroup(group, {type: 'group', fields: semantics}, false);
+    }
+
+    /**
+     * Validate given text value against text semantics.
+     *
+     * @param text Text to validate.
+     * @param semantics Semantics.
+     * @return Validated text.
+     */
+    validateText(text: string, semantics: any): string {
+        if (typeof text != 'string') {
+            text = '';
+        }
+
+        if (semantics.tags) {
+            // Not testing for empty array allows us to use the 4 defaults without specifying them in semantics.
+            let tags = ['div', 'span', 'p', 'br'].concat(semantics.tags);
+
+            // Add related tags for table etc.
+            if (tags.indexOf('table') != -1) {
+                tags = tags.concat(['tr', 'td', 'th', 'colgroup', 'thead', 'tbody', 'tfoot']);
+            }
+            if (tags.indexOf('b') != -1) {
+                tags.push('strong');
+            }
+            if (tags.indexOf('i') != -1) {
+                tags.push('em');
+            }
+            if (tags.indexOf('ul') != -1 || tags.indexOf('ol') != -1) {
+                tags.push('li');
+            }
+            if (tags.indexOf('del') != -1 || tags.indexOf('strike') != -1) {
+                tags.push('s');
+            }
+
+            tags = this.utils.uniqueArray(tags);
+
+            // Determine allowed style tags
+            const stylePatterns: RegExp[] = [];
+            // All styles must be start to end patterns (^...$)
+            if (semantics.font) {
+                if (semantics.font.size) {
+                    stylePatterns.push(/^font-size: *[0-9.]+(em|px|%) *;?$/i);
+                }
+                if (semantics.font.family) {
+                    stylePatterns.push(/^font-family: *[-a-z0-9," ]+;?$/i);
+                }
+                if (semantics.font.color) {
+                    stylePatterns.push(/^color: *(#[a-f0-9]{3}[a-f0-9]{3}?|rgba?\([0-9, ]+\)) *;?$/i);
+                }
+                if (semantics.font.background) {
+                    stylePatterns.push(/^background-color: *(#[a-f0-9]{3}[a-f0-9]{3}?|rgba?\([0-9, ]+\)) *;?$/i);
+                }
+                if (semantics.font.spacing) {
+                    stylePatterns.push(/^letter-spacing: *[0-9.]+(em|px|%) *;?$/i);
+                }
+                if (semantics.font.height) {
+                    stylePatterns.push(/^line-height: *[0-9.]+(em|px|%|) *;?$/i);
+                }
+            }
+
+            // Alignment is allowed for all wysiwyg texts
+            stylePatterns.push(/^text-align: *(center|left|right);?$/i);
+
+            // Strip invalid HTML tags.
+            text = this.filterXss(text, tags, stylePatterns);
+        } else {
+            // Filter text to plain text.
+            text = this.textUtils.escapeHTML(text);
+        }
+
+        // Check if string is within allowed length.
+        if (typeof semantics.maxLength != 'undefined') {
+            text = text.substr(0, semantics.maxLength);
+        }
+
+        return text;
+    }
+
+    /**
+     * Validates content files
+     *
+     * @param contentPath The path containing content files to validate.
+     * @param isLibrary Whether it's a library.
+     * @return True if all files are valid.
+     */
+    validateContentFiles(contentPath: string, isLibrary: boolean = false): boolean {
+        // Nothing to do, already checked by Moodle.
+        return true;
+    }
+
+    /**
+     * Validate given value against number semantics.
+     *
+     * @param num Number to validate.
+     * @param semantics Semantics.
+     * @return Validated number.
+     */
+    validateNumber(num: any, semantics: any): number {
+        // Validate that num is indeed a number.
+        num = Number(num);
+        if (isNaN(num)) {
+            num = 0;
+        }
+        // Check if number is within valid bounds. Move within bounds if not.
+        if (typeof semantics.min != 'undefined' && num < semantics.min) {
+            num = semantics.min;
+        }
+        if (typeof semantics.max != 'undefined' && num > semantics.max) {
+            num = semantics.max;
+        }
+        // Check if number is within allowed bounds even if step value is set.
+        if (typeof semantics.step != 'undefined') {
+            const testNumber = num - (typeof semantics.min != 'undefined' ? semantics.min : 0),
+                rest = testNumber % semantics.step;
+            if (rest !== 0) {
+                num -= rest;
+            }
+        }
+        // Check if number has proper number of decimals.
+        if (typeof semantics.decimals != 'undefined') {
+            num = num.toFixed(semantics.decimals);
+        }
+
+        return num;
+    }
+
+    /**
+     * Validate given value against boolean semantics.
+     *
+     * @param bool Boolean to check.
+     * @return Validated bool.
+     */
+    validateBoolean(bool: boolean): boolean {
+        return !!bool;
+    }
+
+    /**
+     * Validate select values.
+     *
+     * @param select Values to validate.
+     * @param semantics Semantics.
+     * @return Validated select.
+     */
+    validateSelect(select: any, semantics: any): any {
+        const optional = semantics.optional,
+            options = {};
+        let strict = false;
+
+        if (semantics.options && semantics.options.length) {
+            // We have a strict set of options to choose from.
+            strict = true;
+
+            semantics.options.forEach((option) => {
+                // Support optgroup - just flatten options into one.
+                if (option.type == 'optgroup') {
+                    option.options.forEach((subOption) => {
+                        options[subOption.value] = true;
+                    });
+                } else if (option.value) {
+                    options[option.value] = true;
+                }
+            });
+        }
+
+        if (semantics.multiple) {
+            // Multi-choice generates array of values. Test each one against valid options, if we are strict.
+            for (const key in select) {
+                const value = select[key];
+
+                if (strict && !optional && !options[value]) {
+                    delete select[key];
+                } else {
+                    select[key] = this.textUtils.escapeHTML(value);
+                }
+            }
+        } else {
+            // Single mode. If we get an array in here, we chop off the first element and use that instead.
+            if (Array.isArray(select)) {
+                select = select[0];
+            }
+
+            if (strict && !optional && !options[select]) {
+                select = semantics.options[0].value;
+            }
+            select = this.textUtils.escapeHTML(select);
+        }
+
+        return select;
+    }
+
+    /**
+     * Validate given list value against list semantics.
+     * Will recurse into validating each item in the list according to the type.
+     *
+     * @param list List to validate.
+     * @param semantics Semantics.
+     * @return Validated list.
+     */
+    validateList(list: any, semantics: any): Promise<any[]> {
+        const field = semantics.field,
+            fn = this[this.typeMap[field.type]].bind(this);
+        let promise = Promise.resolve(), // Use a chain of promises so the order is kept.
+            keys = Object.keys(list);
+
+        // Check that list is not longer than allowed length.
+        if (typeof semantics.max != 'undefined') {
+            keys = keys.slice(0, semantics.max);
+        }
+
+        // Validate each element in list.
+        keys.forEach((key) => {
+            if (isNaN(parseInt(key, 10))) {
+                // It's an object and the key isn't an integer. Delete it.
+                delete list[key];
+            } else {
+                promise = promise.then(() => {
+                    return Promise.resolve(fn(list[key], field)).then((val) => {
+                        if (val === null) {
+                            list.splice(key, 1);
+                        } else {
+                            list[key] = val;
+                        }
+                    });
+                });
+            }
+        });
+
+        return promise.then(() => {
+
+            if (!Array.isArray(list)) {
+                list = this.utils.objectToArray(list);
+            }
+
+            if (!list.length) {
+                return null;
+            }
+
+            return list;
+        });
+    }
+
+    /**
+     * Validate a file like object, such as video, image, audio and file.
+     *
+     * @param file File to validate.
+     * @param semantics Semantics.
+     * @param typeValidKeys List of valid keys.
+     * @return Promise resolved with the validated file.
+     */
+    protected validateFilelike(file: any, semantics: any, typeValidKeys: string[] = []): Promise<any> {
+        // Do not allow to use files from other content folders.
+        const matches = file.path.match(this.relativePathRegExp);
+        if (matches && matches.length) {
+            file.path = matches[5];
+        }
+
+        // Remove temporary files suffix.
+        if (file.path.substr(-4, 4) === '#tmp') {
+            file.path = file.path.substr(0, file.path.length - 4);
+        }
+
+        // Make sure path and mime does not have any special chars
+        file.path = this.textUtils.escapeHTML(file.path);
+        if (file.mime) {
+            file.mime = this.textUtils.escapeHTML(file.mime);
+        }
+
+        // Remove attributes that should not exist, they may contain JSON escape code.
+        let validKeys = ['path', 'mime', 'copyright'].concat(typeValidKeys);
+        if (semantics.extraAttributes) {
+            validKeys = validKeys.concat(semantics.extraAttributes);
+        }
+        validKeys = this.utils.uniqueArray(validKeys);
+
+        this.filterParams(file, validKeys);
+
+        if (typeof file.width != 'undefined') {
+            file.width = parseInt(file.width, 10);
+        }
+
+        if (typeof file.height != 'undefined') {
+            file.height = parseInt(file.height, 10);
+        }
+
+        if (file.codecs) {
+            file.codecs = this.textUtils.escapeHTML(file.codecs);
+        }
+
+        if (typeof file.bitrate != 'undefined') {
+            file.bitrate = parseInt(file.bitrate, 10);
+        }
+
+        if (typeof file.quality != 'undefined') {
+            if (file.quality === null || typeof file.quality.level == 'undefined' || typeof file.quality.label == 'undefined') {
+                delete file.quality;
+            } else {
+                this.filterParams(file.quality, ['level', 'label']);
+                file.quality.level = parseInt(file.quality.level);
+                file.quality.label = this.textUtils.escapeHTML(file.quality.label);
+            }
+        }
+
+        if (typeof file.copyright != 'undefined') {
+            return this.validateGroup(file.copyright, this.getCopyrightSemantics()).then(() => {
+                return file;
+            });
+        }
+
+        return Promise.resolve(file);
+    }
+
+    /**
+     * Validate given file data.
+     *
+     * @param file File.
+     * @param semantics Semantics.
+     * @return Promise resolved with the validated file.
+     */
+    validateFile(file: any, semantics: any): Promise<any> {
+        return this.validateFilelike(file, semantics);
+    }
+
+    /**
+     * Validate given image data.
+     *
+     * @param image Image.
+     * @param semantics Semantics.
+     * @return Promise resolved with the validated file.
+     */
+    validateImage(image: any, semantics: any): Promise<any> {
+        return this.validateFilelike(image, semantics, ['width', 'height', 'originalImage']);
+    }
+
+    /**
+     * Validate given video data.
+     *
+     * @param video Video.
+     * @param semantics Semantics.
+     * @return Promise resolved with the validated file.
+     */
+    validateVideo(video: any, semantics: any): Promise<any> {
+        let promise = Promise.resolve(); // Use a chain of promises so the order is kept.
+
+        for (const key in video) {
+            promise = promise.then(() => {
+                return this.validateFilelike(video[key], semantics, ['width', 'height', 'codecs', 'quality', 'bitrate']);
+            });
+        }
+
+        return promise.then(() => {
+            return video;
+        });
+    }
+
+    /**
+     * Validate given audio data.
+     *
+     * @param audio Audio.
+     * @param semantics Semantics.
+     * @return Promise resolved with the validated file.
+     */
+    validateAudio(audio: any, semantics: any): Promise<any> {
+        let promise = Promise.resolve(); // Use a chain of promises so the order is kept.
+
+        for (const key in audio) {
+            promise = promise.then(() => {
+                return this.validateFilelike(audio[key], semantics);
+            });
+        }
+
+        return promise.then(() => {
+            return audio;
+        });
+    }
+
+    /**
+     * Validate given group value against group semantics.
+     * Will recurse into validating each group member.
+     *
+     * @param group Group.
+     * @param semantics Semantics.
+     * @param flatten Whether to flatten.
+     */
+    validateGroup(group: any, semantics: any, flatten: boolean = true): Promise<any> {
+        // Groups with just one field are compressed in the editor to only output he child content.
+
+        const isSubContent = semantics.isSubContent === true;
+
+        if (semantics.fields.length == 1 && flatten && !isSubContent) {
+            const field = semantics.fields[0],
+                fn = this[this.typeMap[field.type]].bind(this);
+
+            return Promise.resolve(fn(group, field));
+        } else {
+            let promise = Promise.resolve(); // Use a chain of promises so the order is kept.
+
+            for (const key in group) {
+                // If subContentId is set, keep value
+                if (isSubContent && key == 'subContentId') {
+                    continue;
+                }
+
+                // Find semantics for name=$key
+                let found = false,
+                    fn = null,
+                    field = null;
+
+                for (let i = 0; i < semantics.fields.length; i++) {
+                    field = semantics.fields[i];
+
+                    if (field.name == key) {
+                        if (semantics.optional) {
+                            field.optional = true;
+                        }
+                        fn = this[this.typeMap[field.type]].bind(this);
+                        found = true;
+                        break;
+                    }
+                }
+
+                if (found && fn) {
+                    promise = promise.then(() => {
+                        return Promise.resolve(fn(group[key], field)).then((val) => {
+                            group[key] = val;
+                            if (val === null) {
+                                delete group[key];
+                            }
+                        });
+                    });
+                } else {
+                    // Something exists in content that does not have a corresponding semantics field. Remove it.
+                    delete group.key;
+                }
+            }
+
+            return promise.then(() => {
+                return group;
+            });
+        }
+    }
+
+    /**
+     * Validate given library value against library semantics.
+     * Check if provided library is within allowed options.
+     * Will recurse into validating the library's semantics too.
+     *
+     * @param value Value.
+     * @param semantics Semantics.
+     * @return Promise resolved when done.
+     */
+    validateLibrary(value: any, semantics: any): Promise<any> {
+        if (!value.library) {
+            return Promise.resolve();
+        }
+
+        let promise;
+
+        if (!this.libraries[value.library]) {
+            const libSpec = this.h5pUtils.libraryFromString(value.library);
+
+            promise = this.h5pProvider.loadLibrary(libSpec.machineName, libSpec.majorVersion, libSpec.minorVersion, this.siteId)
+                    .then((library) => {
+                this.libraries[value.library] = library;
+
+                return library;
+            });
+        } else {
+            promise = Promise.resolve(this.libraries[value.library]);
+        }
+
+        return promise.then((library) => {
+            // Validate parameters.
+            return this.validateGroup(value.params, {type: 'group', fields: library.semantics}, false).then((validated) => {
+
+                value.params = validated;
+
+                // Validate subcontent's metadata
+                if (value.metadata) {
+                    return this.validateMetadata(value.metadata).then((res) => {
+                        value.metadata = res;
+                    });
+                }
+            }).then(() => {
+
+                let validKeys = ['library', 'params', 'subContentId', 'metadata'];
+                if (semantics.extraAttributes) {
+                    validKeys = this.utils.uniqueArray(validKeys.concat(semantics.extraAttributes));
+                }
+
+                this.filterParams(value, validKeys);
+
+                if (value.subContentId &&
+                        !value.subContentId.match(/^\{?[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}\}?$/)) {
+                    delete value.subContentId;
+                }
+
+                // Find all dependencies for this library.
+                const depKey = 'preloaded-' + library.machineName;
+                if (!this.dependencies[depKey]) {
+                    this.dependencies[depKey] = {
+                        library: library,
+                        type: 'preloaded'
+                    };
+
+                    return this.h5pProvider.findLibraryDependencies(this.dependencies, library, this.nextWeight).then((weight) => {
+                        this.nextWeight = weight;
+                        this.dependencies[depKey].weight = this.nextWeight++;
+
+                        return value;
+                    });
+                } else {
+                    return value;
+                }
+            });
+        });
+    }
+
+    /**
+     * Check params for a whitelist of allowed properties.
+     *
+     * @param params Object to filter.
+     * @param whitelist List of keys to keep.
+     */
+    filterParams(params: any, whitelist: string[]): void {
+        for (const key in params) {
+            if (whitelist.indexOf(key) == -1) {
+                delete params[key];
+            }
+        }
+    }
+
+    /**
+     * Filters HTML to prevent cross-site-scripting (XSS) vulnerabilities.
+     * Based on kses by Ulf Harnhammar, see http://sourceforge.net/projects/kses.
+     *
+     * @param str The string with raw HTML in it.
+     * @param allowedTags An array of allowed tags.
+     * @param allowedStyles Allowed styles.
+     * @return An XSS safe version of the string.
+     */
+    protected filterXss(str: string, allowedTags?: string[], allowedStyles?: RegExp[]): string {
+        if (!str || typeof str != 'string') {
+            return str;
+        }
+
+        allowedTags = allowedTags || ['a', 'em', 'strong', 'cite', 'blockquote', 'code', 'ul', 'ol', 'li', 'dl', 'dt', 'dd'];
+
+        this.allowedStyles = allowedStyles;
+
+        // Store the text format.
+        this.filterXssSplit(allowedTags, true);
+
+        // Remove Netscape 4 JS entities.
+        str = str.replace(/&\s*\{[^}]*(\}\s*;?|$)/g, '');
+
+        // Defuse all HTML entities.
+        str = str.replace(/&/g, '&amp;');
+
+        // Change back only well-formed entities in our whitelist:
+        // Decimal numeric entities.
+        str = str.replace(/&amp;#([0-9]+;)/g, '&#$1');
+        // Hexadecimal numeric entities.
+        str = str.replace(/&amp;#[Xx]0*((?:[0-9A-Fa-f]{2})+;)/g, '&#x$1');
+        // Named entities.
+        str = str.replace(/&amp;([A-Za-z][A-Za-z0-9]*;)/g, '&$1');
+
+        const matches = str.match(/(<(?=[^a-zA-Z!\/])|<!--.*?-->|<[^>]*(>|$)|>)/g);
+        if (matches && matches.length) {
+            matches.forEach((match) => {
+                str = str.replace(match, this.filterXssSplit([match]));
+            });
+        }
+
+        return str;
+    }
+
+    /**
+     * Processes an HTML tag.
+     *
+     * @param m An array with various meaning depending on the value of store.
+     *   If store is TRUE then the array contains the allowed tags.
+     *   If store is FALSE then the array has one element, the HTML tag to process.
+     * @param store Whether to store m.
+     * @return string If the element isn't allowed, an empty string. Otherwise, the cleaned up version of the HTML element.
+     */
+    protected filterXssSplit(m: string[], store: boolean = false): string {
+
+        if (store) {
+            this.allowedHtml = this.utils.arrayToObject(m);
+
+            return '';
+        }
+
+        const str = m[0];
+
+        if (str.substr(0, 1) != '<') {
+            // We matched a lone ">" character.
+            return '&gt;';
+        } else if (str.length == 1) {
+            // We matched a lone "<" character.
+            return '&lt;';
+        }
+
+        const matches = str.match(/^<\s*(\/\s*)?([a-zA-Z0-9\-]+)([^>]*)>?|(<!--.*?-->)$/);
+        if (!matches) {
+            // Seriously malformed.
+            return '';
+        }
+
+        const slash = matches[1] ? matches[1].trim() : '',
+            attrList = matches[3] || '',
+            comment = matches[4] || '';
+        let elem = matches[2] || '';
+
+        if (comment) {
+            elem = '!--';
+        }
+
+        if (!this.allowedHtml[elem.toLowerCase()]) {
+            // Disallowed HTML element.
+            return '';
+        }
+
+        if (comment) {
+            return comment;
+        }
+
+        if (slash != '') {
+            return '</$elem>';
+        }
+
+        // Is there a closing XHTML slash at the end of the attributes?
+        const newAttrList = attrList.replace(/(\s?)\/\s*$/g, '$1'),
+           xhtmlSlash = attrList != newAttrList ? ' /' : '';
+
+        // Clean up attributes.
+        let attr2 = this.filterXssAttributes(newAttrList,
+                (CoreH5PContentValidator.ALLOWED_STYLEABLE_TAGS.indexOf(elem) != -1 ? this.allowedStyles : null)).join(' ');
+        attr2 = attr2.replace(/[<>]/g, '');
+        attr2 = attr2.length ? ' ' + attr2 : '';
+
+        return '<' + elem + attr2 + xhtmlSlash + '>';
+    }
+
+    /**
+     * Processes a string of HTML attributes.
+     *
+     * @param attr HTML attributes.
+     * @param allowedStyles Allowed styles.
+     * @return Cleaned up version of the HTML attributes.
+     */
+    protected filterXssAttributes(attr: string, allowedStyles?: RegExp[]): string[] {
+        const attrArr = [];
+        let mode = 0,
+        attrName = '',
+        skip = false;
+
+        while (attr.length != 0) {
+            // Was the last operation successful?
+            let working = 0,
+                matches,
+                thisVal;
+
+            switch (mode) {
+                case 0:
+                    // Attribute name, href for instance.
+                    matches = attr.match(/^([-a-zA-Z]+)/);
+                    if (matches && matches.length > 1) {
+                        attrName = matches[1].toLowerCase();
+                        skip = (attrName == 'style' || attrName.substr(0, 2) == 'on');
+                        working = mode = 1;
+                        attr = attr.replace(/^[-a-zA-Z]+/, '');
+                    }
+                    break;
+
+                case 1:
+                    // Equals sign or valueless ("selected").
+                    if (attr.match(/^\s*=\s*/)) {
+                        working = 1;
+                        mode = 2;
+                        attr = attr.replace(/^\s*=\s*/, '');
+                        break;
+                    }
+
+                    if (attr.match(/^\s+/)) {
+                        working = 1;
+                        mode = 0;
+                        if (!skip) {
+                            attrArr.push(attrName);
+                        }
+                        attr = attr.replace(/^\s+/, '');
+                    }
+                    break;
+
+                case 2:
+                    // Attribute value, a URL after href= for instance.
+                    matches = attr.match(/^"([^"]*)"(\s+|$)/);
+                    if (matches && matches.length > 1) {
+                        if (allowedStyles && attrName === 'style') {
+                            // Allow certain styles.
+                            for (let i = 0; i < allowedStyles.length; i++) {
+                                const pattern = allowedStyles[i];
+                                if (matches[1].match(pattern)) {
+                                    // All patterns are start to end patterns, and CKEditor adds one span per style.
+                                    attrArr.push('style="' + matches[1] + '"');
+                                    break;
+                                }
+                            }
+                            break;
+                        }
+
+                        thisVal = this.filterXssBadProtocol(matches[1]);
+
+                        if (!skip) {
+                            attrArr.push(attrName + '="' + thisVal + '"');
+                        }
+                        working = 1;
+                        mode = 0;
+                        attr = attr.replace(/^"[^"]*"(\s+|$)/, '');
+                        break;
+                    }
+
+                    matches = attr.match(/^'([^']*)'(\s+|$)/);
+                    if (matches && matches.length > 1) {
+                        thisVal = this.filterXssBadProtocol(matches[1]);
+
+                        if (!skip) {
+                            attrArr.push(attrName + '="' + thisVal + '"');
+                        }
+                        working = 1;
+                        mode = 0;
+                        attr = attr.replace(/^'[^']*'(\s+|$)/, '');
+                        break;
+                    }
+
+                    matches = attr.match(/^([^\s\"']+)(\s+|$)/);
+                    if (matches && matches.length > 1) {
+                        thisVal = this.filterXssBadProtocol(matches[1]);
+
+                        if (!skip) {
+                            attrArr.push(attrName + '="' + thisVal + '"');
+                        }
+                        working = 1;
+                        mode = 0;
+                        attr = attr.replace(/^([^\s\"']+)(\s+|$)/, '');
+                    }
+                    break;
+
+                default:
+            }
+
+            if (working == 0) {
+                // Not well formed; remove and try again.
+                attr = attr.replace(/^("[^"]*("|$)|\'[^\']*(\'|$)||\S)*\s*/, '');
+                mode = 0;
+            }
+        }
+
+        // The attribute list ends with a valueless attribute like "selected".
+        if (mode == 1 && !skip) {
+            attrArr.push(attrName);
+        }
+
+        return attrArr;
+    }
+
+    /**
+     * Processes an HTML attribute value and strips dangerous protocols from URLs.
+     *
+     * @param str The string with the attribute value.
+     * @param decode Whether to decode entities in the $string.
+     * @return Cleaned up and HTML-escaped version of $string.
+     */
+    filterXssBadProtocol(str: string, decode: boolean = true): string {
+        // Get the plain text representation of the attribute value (i.e. its meaning).
+        if (decode) {
+            str = this.textUtils.decodeHTMLEntities(str);
+        }
+
+        return this.textUtils.escapeHTML(this.stripDangerousProtocols(str));
+    }
+
+    /**
+     * Strips dangerous protocols (e.g. 'javascript:') from a URI.
+     *
+     * @param uri A plain-text URI that might contain dangerous protocols.
+     * @return A plain-text URI stripped of dangerous protocols.
+     */
+    protected stripDangerousProtocols(uri: string): string {
+
+        const allowedProtocols = {
+                ftp: true,
+                http: true,
+                https: true,
+                mailto: true
+            };
+        let before;
+
+        // Iteratively remove any invalid protocol found.
+        do {
+            before = uri;
+            const colonPos = uri.indexOf(':');
+
+            if (colonPos > 0) {
+                // We found a colon, possibly a protocol. Verify.
+                const protocol = uri.substr(0, colonPos);
+                // If a colon is preceded by a slash, question mark or hash, it cannot possibly be part of the URL scheme.
+                // This must be a relative URL, which inherits the (safe) protocol of the base document.
+                if (protocol.match(/[/?#]/)) {
+                    break;
+                }
+                // Check if this is a disallowed protocol.
+                if (!allowedProtocols[protocol.toLowerCase()]) {
+                    uri = uri.substr(colonPos + 1);
+                }
+            }
+        } while (before != uri);
+
+        return uri;
+    }
+
+    /**
+     * Get metadata semantics.
+     *
+     * @return Semantics.
+     */
+    getMetadataSemantics(): any[] {
+
+        if (this.metadataSemantics) {
+            return this.metadataSemantics;
+        }
+
+        const ccVersions = this.getCCVersions();
+
+        this.metadataSemantics = [
+            {
+                name: 'title',
+                type: 'text',
+                label: this.translate.instant('core.h5p.title'),
+                placeholder: 'La Gioconda'
+            },
+            {
+                name: 'license',
+                type: 'select',
+                label: this.translate.instant('core.h5p.license'),
+                default: 'U',
+                options: [
+                    {
+                        value: 'U',
+                        label: this.translate.instant('core.h5p.undisclosed')
+                    },
+                    {
+                        type: 'optgroup',
+                        label: this.translate.instant('core.h5p.creativecommons'),
+                        options: [
+                            {
+                                value: 'CC BY',
+                                label: this.translate.instant('core.h5p.ccattribution'),
+                                versions: ccVersions
+                            },
+                            {
+                                value: 'CC BY-SA',
+                                label: this.translate.instant('core.h5p.ccattributionsa'),
+                                versions: ccVersions
+                            },
+                            {
+                                value: 'CC BY-ND',
+                                label: this.translate.instant('core.h5p.ccattributionnd'),
+                                versions: ccVersions
+                            },
+                            {
+                                value: 'CC BY-NC',
+                                label: this.translate.instant('core.h5p.ccattributionnc'),
+                                versions: ccVersions
+                            },
+                            {
+                                value: 'CC BY-NC-SA',
+                                label: this.translate.instant('core.h5p.ccattributionncsa'),
+                                versions: ccVersions
+                            },
+                            {
+                                value: 'CC BY-NC-ND',
+                                label: this.translate.instant('core.h5p.ccattributionncnd'),
+                                versions: ccVersions
+                            },
+                            {
+                                value: 'CC0 1.0',
+                                label: this.translate.instant('core.h5p.ccpdd')
+                            },
+                            {
+                                value: 'CC PDM',
+                                label: this.translate.instant('core.h5p.pdm')
+                            },
+                        ]
+                    },
+                    {
+                        value: 'GNU GPL',
+                        label: this.translate.instant('core.h5p.gpl')
+                    },
+                    {
+                        value: 'PD',
+                        label: this.translate.instant('core.h5p.pd')
+                    },
+                    {
+                        value: 'ODC PDDL',
+                        label: this.translate.instant('core.h5p.pddl')
+                    },
+                    {
+                        value: 'C',
+                        label: this.translate.instant('core.h5p.copyrightstring')
+                    }
+                ]
+            },
+            {
+                name: 'licenseVersion',
+                type: 'select',
+                label: this.translate.instant('core.h5p.licenseversion'),
+                options: ccVersions,
+                optional: true
+            },
+            {
+                name: 'yearFrom',
+                type: 'number',
+                label: this.translate.instant('core.h5p.yearsfrom'),
+                placeholder: '1991',
+                min: '-9999',
+                max: '9999',
+                optional: true
+            },
+            {
+                name: 'yearTo',
+                type: 'number',
+                label: this.translate.instant('core.h5p.yearsto'),
+                placeholder: '1992',
+                min: '-9999',
+                max: '9999',
+                optional: true
+            },
+            {
+                name: 'source',
+                type: 'text',
+                label: this.translate.instant('core.h5p.source'),
+                placeholder: 'https://',
+                optional: true
+            },
+            {
+                name: 'authors',
+                type: 'list',
+                field: {
+                    name: 'author',
+                    type: 'group',
+                    fields: [
+                        {
+                            label: this.translate.instant('core.h5p.authorname'),
+                            name: 'name',
+                            optional: true,
+                            type: 'text'
+                        },
+                        {
+                            name: 'role',
+                            type: 'select',
+                            label: this.translate.instant('core.h5p.authorrole'),
+                            default: 'Author',
+                            options: [
+                                {
+                                    value: 'Author',
+                                    label: this.translate.instant('core.h5p.author')
+                                },
+                                {
+                                    value: 'Editor',
+                                    label: this.translate.instant('core.h5p.editor')
+                                },
+                                {
+                                    value: 'Licensee',
+                                    label: this.translate.instant('core.h5p.licensee')
+                                },
+                                {
+                                    value: 'Originator',
+                                    label: this.translate.instant('core.h5p.originator')
+                                }
+                            ]
+                        }
+                    ]
+                }
+            },
+            {
+                name: 'licenseExtras',
+                type: 'text',
+                widget: 'textarea',
+                label: this.translate.instant('core.h5p.licenseextras'),
+                optional: true,
+                description: this.translate.instant('core.h5p.additionallicenseinfo')
+            },
+            {
+                name: 'changes',
+                type: 'list',
+                field: {
+                    name: 'change',
+                    type: 'group',
+                    label: this.translate.instant('core.h5p.changelog'),
+                    fields: [
+                        {
+                            name: 'date',
+                            type: 'text',
+                            label: this.translate.instant('core.h5p.date'),
+                            optional: true
+                        },
+                        {
+                            name: 'author',
+                            type: 'text',
+                            label: this.translate.instant('core.h5p.changedby'),
+                            optional: true
+                        },
+                        {
+                            name: 'log',
+                            type: 'text',
+                            widget: 'textarea',
+                            label: this.translate.instant('core.h5p.changedescription'),
+                            placeholder: this.translate.instant('core.h5p.changeplaceholder'),
+                            optional: true
+                        }
+                    ]
+                }
+            },
+            {
+                name: 'authorComments',
+                type: 'text',
+                widget: 'textarea',
+                label: this.translate.instant('core.h5p.authorcomments'),
+                description: this.translate.instant('core.h5p.authorcommentsdescription'),
+                optional: true
+            },
+            {
+                name: 'contentType',
+                type: 'text',
+                widget: 'none'
+            },
+            {
+                name: 'defaultLanguage',
+                type: 'text',
+                widget: 'none'
+            }
+        ];
+
+        return this.metadataSemantics;
+    }
+
+    /**
+     * Get copyright semantics.
+     *
+     * @return Semantics.
+     */
+    getCopyrightSemantics(): any {
+
+        if (this.copyrightSemantics) {
+            return this.copyrightSemantics;
+        }
+
+        const ccVersions = this.getCCVersions();
+
+        this.copyrightSemantics = {
+            name: 'copyright',
+            type: 'group',
+            label: this.translate.instant('core.h5p.copyrightinfo'),
+            fields: [
+                {
+                    name: 'title',
+                    type: 'text',
+                    label: this.translate.instant('core.h5p.title'),
+                    placeholder: 'La Gioconda',
+                    optional: true
+                },
+                {
+                    name: 'author',
+                    type: 'text',
+                    label: this.translate.instant('core.h5p.author'),
+                    placeholder: 'Leonardo da Vinci',
+                    optional: true
+                },
+                {
+                    name: 'year',
+                    type: 'text',
+                    label: this.translate.instant('core.h5p.years'),
+                    placeholder: '1503 - 1517',
+                    optional: true
+                },
+                {
+                    name: 'source',
+                    type: 'text',
+                    label: this.translate.instant('core.h5p.source'),
+                    placeholder: 'http://en.wikipedia.org/wiki/Mona_Lisa',
+                    optional: true,
+                    regexp: {
+                        pattern: '^http[s]?://.+',
+                        modifiers: 'i'
+                    }
+                },
+                {
+                    name: 'license',
+                    type: 'select',
+                    label: this.translate.instant('core.h5p.license'),
+                    default: 'U',
+                    options: [
+                        {
+                            value: 'U',
+                            label: this.translate.instant('core.h5p.undisclosed')
+                        },
+                        {
+                            value: 'CC BY',
+                            label: this.translate.instant('core.h5p.ccattribution'),
+                            versions: ccVersions
+                        },
+                        {
+                            value: 'CC BY-SA',
+                            label: this.translate.instant('core.h5p.ccattributionsa'),
+                            versions: ccVersions
+                        },
+                        {
+                            value: 'CC BY-ND',
+                            label: this.translate.instant('core.h5p.ccattributionnd'),
+                            versions: ccVersions
+                        },
+                        {
+                            value: 'CC BY-NC',
+                            label: this.translate.instant('core.h5p.ccattributionnc'),
+                            versions: ccVersions
+                        },
+                        {
+                            value: 'CC BY-NC-SA',
+                            label: this.translate.instant('core.h5p.ccattributionncsa'),
+                            versions: ccVersions
+                        },
+                        {
+                            value: 'CC BY-NC-ND',
+                            label: this.translate.instant('core.h5p.ccattributionncnd'),
+                            versions: ccVersions
+                        },
+                        {
+                            value: 'GNU GPL',
+                            label: this.translate.instant('core.h5p.licenseGPL'),
+                            versions: [
+                                {
+                                    value: 'v3',
+                                    label: this.translate.instant('core.h5p.licenseV3')
+                                },
+                                {
+                                    value: 'v2',
+                                    label: this.translate.instant('core.h5p.licenseV2')
+                                },
+                                {
+                                    value: 'v1',
+                                    label: this.translate.instant('core.h5p.licenseV1')
+                                }
+                            ]
+                        },
+                        {
+                            value: 'PD',
+                            label: this.translate.instant('core.h5p.pd'),
+                            versions: [
+                                {
+                                    value: '-',
+                                    label: '-'
+                                },
+                                {
+                                    value: 'CC0 1.0',
+                                    label: this.translate.instant('core.h5p.licenseCC010U')
+                                },
+                                {
+                                    value: 'CC PDM',
+                                    label: this.translate.instant('core.h5p.pdm')
+                                }
+                            ]
+                        },
+                        {
+                            value: 'C',
+                            label: this.translate.instant('core.h5p.copyrightstring')
+                        }
+                    ]
+                },
+                {
+                    name: 'version',
+                    type: 'select',
+                    label: this.translate.instant('core.h5p.licenseversion'),
+                    options: []
+                }
+            ]
+        };
+
+        return this.copyrightSemantics;
+    }
+
+    /**
+     * Get CC versions for semantics.
+     *
+     * @return CC versions.
+     */
+    protected getCCVersions(): any[] {
+        return [
+            {
+                value: '4.0',
+                label: this.translate.instant('core.h5p.licenseCC40')
+            },
+            {
+                value: '3.0',
+                label: this.translate.instant('core.h5p.licenseCC30')
+            },
+            {
+                value: '2.5',
+                label: this.translate.instant('core.h5p.licenseCC25')
+            },
+            {
+                value: '2.0',
+                label: this.translate.instant('core.h5p.licenseCC20')
+            },
+            {
+                value: '1.0',
+                label: this.translate.instant('core.h5p.licenseCC10')
+            }
+        ];
+    }
+}
diff --git a/src/core/h5p/components/h5p-player/h5p-player.ts b/src/core/h5p/components/h5p-player/h5p-player.ts
index 11a5901fc..f13b33073 100644
--- a/src/core/h5p/components/h5p-player/h5p-player.ts
+++ b/src/core/h5p/components/h5p-player/h5p-player.ts
@@ -129,8 +129,12 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
                 // Local package.
                 this.playerSrc = url;
             } else {
+                // Never allow downloading in the app. This will only work if the user is allowed to change the params.
+                const src = this.src && this.src.replace(CoreH5PProvider.DISPLAY_OPTION_DOWNLOAD + '=1',
+                        CoreH5PProvider.DISPLAY_OPTION_DOWNLOAD + '=0');
+
                 // Get auto-login URL so the user is automatically authenticated.
-                return this.sitesProvider.getCurrentSite().getAutoLoginUrl(this.src, false).then((url) => {
+                return this.sitesProvider.getCurrentSite().getAutoLoginUrl(src, false).then((url) => {
                     // Add the preventredirect param so the user can authenticate.
                     this.playerSrc = this.urlUtils.addParamsToUrl(url, {preventredirect: false});
                 });
diff --git a/src/core/h5p/lang/en.json b/src/core/h5p/lang/en.json
index 0cffba19a..a85304502 100644
--- a/src/core/h5p/lang/en.json
+++ b/src/core/h5p/lang/en.json
@@ -1,5 +1,10 @@
 {
+    "additionallicenseinfo": "Any additional information about the license",
     "author": "Author",
+    "authorcomments": "Author comments",
+    "authorcommentsdescription": "Comments for the editor of the content. (This text will not be published as a part of the copyright info.)",
+    "authorname": "Author's name",
+    "authorrole": "Author's role",
     "by": "by",
     "cancellabel": "Cancel",
     "ccattribution": "Attribution (CC BY)",
@@ -8,7 +13,11 @@
     "ccattributionncsa": "Attribution-NonCommercial-ShareAlike (CC BY-NC-SA)",
     "ccattributionnd": "Attribution-NoDerivs (CC BY-ND)",
     "ccattributionsa": "Attribution-ShareAlike (CC BY-SA)",
+    "ccpdd": "Public Domain Dedication (CC0)",
+    "changedby": "Changed by",
+    "changedescription": "Description of change",
     "changelog": "Changelog",
+    "changeplaceholder": "Photo cropped, text changed, etc.",
     "close": "Close",
     "confirmdialogbody": "Please confirm that you wish to proceed. This action is not reversible.",
     "confirmdialogheader": "Confirm action",
@@ -19,18 +28,24 @@
     "contentchanged": "This content has changed since you last used it.",
     "contenttype": "Content Type",
     "copyright": "Rights of use",
+    "copyrightinfo": "Copyright information",
     "copyrightstring": "Copyright",
     "copyrighttitle": "View copyright information for this content.",
+    "creativecommons": "Creative Commons",
+    "date": "Date",
     "disablefullscreen": "Disable fullscreen",
     "download": "Download",
     "downloadtitle": "Download this content as a H5P file.",
+    "editor": "Editor",
     "embed": "Embed",
     "embedtitle": "View the embed code for this content.",
     "fullscreen": "Fullscreen",
+    "gpl": "General Public License v3",
     "h5ptitle": "Visit H5P.org to check out more cool content.",
     "hideadvanced": "Hide advanced",
     "license": "License",
     "licenseCC010": "CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
+    "licenseCC010U": "CC0 1.0 Universal",
     "licenseCC10": "1.0 Generic",
     "licenseCC20": "2.0 Generic",
     "licenseCC25": "2.5 Generic",
@@ -40,14 +55,18 @@
     "licenseV1": "Version 1",
     "licenseV2": "Version 2",
     "licenseV3": "Version 3",
+    "licensee": "Licensee",
     "licenseextras": "License Extras",
+    "licenseversion": "License version",
     "nocopyright": "No copyright information available for this content.",
     "offlineDialogBody": "We were unable to send information about your completion of this task. Please check your internet connection.",
     "offlineDialogHeader": "Your connection to the server was lost",
     "offlineDialogRetryButtonLabel": "Retry now",
     "offlineDialogRetryMessage": "Retrying in :num....",
     "offlineSuccessfulSubmit": "Successfully submitted results.",
+    "originator": "Originator",
     "pd": "Public Domain",
+    "pddl": "Public Domain Dedication and Licence",
     "pdm": "Public Domain Mark (PDM)",
     "play": "Play H5P",
     "resizescript": "Include this script on your website if you want dynamic sizing of the embedded content:",
@@ -65,5 +84,8 @@
     "thumbnail": "Thumbnail",
     "title": "Title",
     "undisclosed": "Undisclosed",
-    "year": "Year"
+    "year": "Year",
+    "years": "Year(s)",
+    "yearsfrom": "Years (from)",
+    "yearsto": "Years (to)"
 }
diff --git a/src/core/h5p/providers/h5p.ts b/src/core/h5p/providers/h5p.ts
index e6c9e76e9..adb3f4fbd 100644
--- a/src/core/h5p/providers/h5p.ts
+++ b/src/core/h5p/providers/h5p.ts
@@ -25,6 +25,8 @@ import { CoreMimetypeUtilsProvider } from '@providers/utils/mimetype';
 import { CoreUrlUtilsProvider } from '@providers/utils/url';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreH5PUtilsProvider } from './utils';
+import { CoreH5PContentValidator } from '../classes/content-validator';
+import { TranslateService } from '@ngx-translate/core';
 import { FileEntry } from '@ionic-native/file';
 
 /**
@@ -304,7 +306,8 @@ export class CoreH5PProvider {
             private h5pUtils: CoreH5PUtilsProvider,
             private filepoolProvider: CoreFilepoolProvider,
             private utils: CoreUtilsProvider,
-            private urlUtils: CoreUrlUtilsProvider) {
+            private urlUtils: CoreUrlUtilsProvider,
+            private translate: TranslateService) {
 
         this.logger = logger.getInstance('CoreH5PProvider');
 
@@ -415,6 +418,7 @@ export class CoreH5PProvider {
      * @return Promise resolved with all of the files content in one string.
      */
     protected concatenateFiles(assets: CoreH5PDependencyAsset[], type: string): Promise<string> {
+        const basePath = this.fileProvider.getBasePathInstant();
         let content = '',
             promise = Promise.resolve(); // Use a chain of promises so the order is kept.
 
@@ -433,39 +437,42 @@ export class CoreH5PProvider {
 
                     if (matches && matches.length) {
                         matches.forEach((match) => {
-                            let url = match.replace(/(url\([\'"]?|[\'"]?\)$)/i, '');
+                            let url = match.replace(/(url\(['"]?|['"]?\)$)/ig, '');
 
                             if (treated[url] || url.match(/^(data:|([a-z0-9]+:)?\/)/i)) {
                                 return; // Not relative or already treated, skip.
                             }
 
+                            const pathSplit = assetPath.split('/');
                             treated[url] = url;
 
                             /* Find "../" in the URL. If it exists, we have to remove "../" and switch the last folder in the
-                               filepath for the first folder in the url.
-                               For instance:
-                               Path: /H5P.Question-1.4/styles/
-                               Url: ../images/plus-one.svg
-                               We want this: H5P.Question-1.4/images/ITEMID/minus-one.svg. */
+                               filepath for the first folder in the url. */
                             if (url.match(/^\.\.\//)) {
-                                const pathSplit = assetPath.split('/'),
-                                    urlSplit = url.split('/').filter((i) => {
+                                const urlSplit = url.split('/').filter((i) => {
                                         return i; // Remove empty values.
                                     });
 
-                                // Remove the first element: ../.
-                                urlSplit.unshift();
+                                // Remove the file name from the asset path.
+                                pathSplit.pop();
+
+                                // Remove the first element from the file URL: ../ .
+                                urlSplit.shift();
 
                                 // Put the url's first folder into the asset path.
                                 pathSplit[pathSplit.length - 1] = urlSplit[0];
                                 urlSplit.shift();
 
                                 // Create the new URL and replace it in the file contents.
-                                url = '/' + pathSplit.join('/') + '/' + urlSplit.join('/');
+                                url = pathSplit.join('/') + '/' + urlSplit.join('/');
 
-                                fileContent = fileContent.replace(new RegExp(this.textUtils.escapeForRegex(match), 'g'),
-                                        'url("' + url + '")');
+                            } else {
+                                pathSplit[pathSplit.length - 1] = url; // Put the whole path to the end of the asset path.
+                                url = pathSplit.join('/');
                             }
+
+                            fileContent = fileContent.replace(new RegExp(this.textUtils.escapeForRegex(match), 'g'),
+                                        'url("' + this.textUtils.concatenatePaths(basePath, url) + '")');
                         });
                     }
 
@@ -510,11 +517,11 @@ export class CoreH5PProvider {
                 url: this.getEmbedUrl(site.getURL(), h5pUrl),
                 contentUrl: contentUrl,
                 metadata: content.metadata,
-                contentUserData: {
-                    0: {
+                contentUserData: [
+                    {
                         state: '{}'
                     }
-                }
+                ]
             };
 
             // Get the core H5P assets, needed by the H5P classes to render the H5P content.
@@ -859,8 +866,7 @@ export class CoreH5PProvider {
             return Promise.resolve(null);
         }
 
-        const dependencies = {}, // In web, dependencies are built by the validator.
-            params = {
+        const params = {
                 library: this.libraryToString(content.library),
                 params: this.textUtils.parseJSON(content.params, false)
             };
@@ -869,90 +875,65 @@ export class CoreH5PProvider {
             return null;
         }
 
-        // Get the main library data.
-        return this.loadLibrary(content.library.name, content.library.majorVersion, content.library.minorVersion, siteId)
-                .then((library) => {
+        const validator = new CoreH5PContentValidator(this, this.h5pUtils, this.textUtils, this.utils, this.translate, siteId);
 
-            library.semantics = this.textUtils.parseJSON(library.semantics, '');
+        // Validate the main library and its dependencies.
+        return validator.validateLibrary(params, {options: [params.library]}).then(() => {
 
-            const depKey = 'preloaded-' + library.machineName;
-            let nextWeight;
+            // Handle addons.
+            return this.loadAddons(siteId);
+        }).then((addons) => {
+            // Validate addons. Use a chain of promises to calculate the weight properly.
+            let promise = Promise.resolve();
 
-            if (!dependencies[depKey]) {
-                dependencies[depKey] = {
-                    library: library,
-                    type: 'preloaded'
-                };
-            }
+            addons.forEach((addon) => {
+                const addTo = addon.addTo;
 
-            // Get the whole library dependency tree.
-            return this.findLibraryDependencies(dependencies, library, 1, false, siteId).then((weight) => {
-                nextWeight = weight;
-                dependencies[depKey].weight = nextWeight++;
+                if (addTo && addTo.content && addTo.content.types && addTo.content.types.length) {
+                    for (let i = 0; i < addTo.content.types.length; i++) {
+                        const type = addTo.content.types[i];
 
-                // Handle addons.
-                return this.loadAddons(siteId);
-            }).then((addons) => {
-                // Get the dependencies of all the addons. Use a chain of promises to calculate the weight properly.
-                let promise = Promise.resolve();
+                        if (type && type.text && type.text.regex &&
+                                this.h5pUtils.textAddonMatches(params.params, type.text.regex)) {
 
-                addons.forEach((addon) => {
-                    const addTo = this.textUtils.parseJSON(addon.addTo, null);
+                            promise = promise.then(() => {
+                                return validator.addon(addon);
+                            });
 
-                    if (addTo && addTo.content && addTo.content.types && addTo.content.types.length) {
-                        for (let i = 0; i < addTo.content.types.length; i++) {
-                            const type = addTo.content.types[i];
-
-                            if (type && type.text && type.text.regex &&
-                                    this.h5pUtils.textAddonMatches(params.params, type.text.regex)) {
-
-                                const addonDepKey = 'preloaded-' + addon.machineName;
-                                dependencies[addonDepKey] = {
-                                    library: addon,
-                                    type: 'preloaded'
-                                };
-
-                                promise = promise.then(() => {
-                                    return this.findLibraryDependencies(dependencies, addon, nextWeight).then((weight) => {
-                                        nextWeight = weight;
-                                        dependencies[addonDepKey].weight = nextWeight++;
-                                    });
-                                });
-
-                                break;
-                            }
+                            // An addon shall only be added once.
+                            break;
                         }
                     }
-                });
-
-                return promise;
-            }).then(() => {
-                // Update content dependencies.
-                content.dependencies = dependencies;
-
-                const paramsStr = JSON.stringify(params.params);
-
-                // Sometimes the parameters are filtered before content has been created
-                if (content.id) {
-                    // Update library usage.
-                    return this.deleteLibraryUsage(content.id, siteId).catch(() => {
-                        // Ignore errors.
-                    }).then(() => {
-                        return this.saveLibraryUsage(content.id, content.dependencies, siteId);
-                    }).then(() => {
-                        if (!content.slug) {
-                            content.slug = this.h5pUtils.slugify(content.title);
-                        }
-
-                        // Cache.
-                        return this.updateContentFields(content.id, {filtered: paramsStr}, siteId).then(() => {
-                            return paramsStr;
-                        });
-                    });
                 }
-
-                return paramsStr;
             });
+
+            return promise;
+        }).then(() => {
+            // Update content dependencies.
+            content.dependencies = validator.getDependencies();
+
+            const paramsStr = JSON.stringify(params.params);
+
+            // Sometimes the parameters are filtered before content has been created
+            if (content.id) {
+                // Update library usage.
+                return this.deleteLibraryUsage(content.id, siteId).catch(() => {
+                    // Ignore errors.
+                }).then(() => {
+                    return this.saveLibraryUsage(content.id, content.dependencies, siteId);
+                }).then(() => {
+                    if (!content.slug) {
+                        content.slug = this.h5pUtils.slugify(content.title);
+                    }
+
+                    // Cache.
+                    return this.updateContentFields(content.id, {filtered: paramsStr}, siteId).then(() => {
+                        return paramsStr;
+                    });
+                });
+            }
+
+            return paramsStr;
         }).catch(() => {
             return null;
         });
@@ -990,12 +971,13 @@ export class CoreH5PProvider {
             }
 
             library[property].forEach((dependency: CoreH5PLibraryBasicData) => {
-                const dependencyKey = type + '-' + dependency.machineName;
-                if (dependencies[dependencyKey]) {
-                    return; // Skip, already have this.
-                }
 
                 promise = promise.then(() => {
+                    const dependencyKey = type + '-' + dependency.machineName;
+                    if (dependencies[dependencyKey]) {
+                        return; // Skip, already have this.
+                    }
+
                     // Get the dependency library data and its subdependencies.
                     return this.loadLibrary(dependency.machineName, dependency.majorVersion, dependency.minorVersion, siteId)
                         .then((dependencyLibrary) => {
@@ -1424,7 +1406,7 @@ export class CoreH5PProvider {
                 // Aggregate and store assets.
                 return this.cacheAssets(files, cachedAssetsHash, folderName, siteId).then(() => {
                     // Keep track of which libraries have been cached in case they are updated.
-                    return this.saveCachedAssets(cachedAssetsHash, dependencies, siteId);
+                    return this.saveCachedAssets(cachedAssetsHash, dependencies, folderName, siteId);
                 }).then(() => {
                     return files;
                 });
@@ -1652,12 +1634,12 @@ export class CoreH5PProvider {
             }
 
             return db.getRecords(this.LIBRARIES_TABLE, conditions);
-        }).then((libraries) => {
+        }).then((libraries): any => {
             if (!libraries.length) {
                 return Promise.reject(null);
             }
 
-            return libraries[0];
+            return this.parseLibDBData(libraries[0]);
         });
     }
 
@@ -1681,7 +1663,9 @@ export class CoreH5PProvider {
      */
     protected getLibraryById(id: number, siteId?: string): Promise<CoreH5PLibraryDBData> {
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
-            return db.getRecord(this.LIBRARIES_TABLE, {id: id});
+            return db.getRecord(this.LIBRARIES_TABLE, {id: id}).then((library) => {
+                return this.parseLibDBData(library);
+            });
         });
     }
 
@@ -1946,7 +1930,7 @@ export class CoreH5PProvider {
                 const addons = [];
 
                 for (let i = 0; i < result.rows.length; i++) {
-                    addons.push(result.rows.item(i));
+                    addons.push(this.parseLibAddonData(result.rows.item(i)));
                 }
 
                 return addons;
@@ -1963,6 +1947,8 @@ export class CoreH5PProvider {
      * @return Promise resolved with the content data.
      */
     protected loadContentData(id?: number, fileUrl?: string, siteId?: string): Promise<CoreH5PContentData> {
+        siteId = siteId || this.sitesProvider.getCurrentSiteId();
+
         let promise: Promise<CoreH5PContentDBData>;
 
         if (id) {
@@ -1978,31 +1964,35 @@ export class CoreH5PProvider {
             // Load the main library data.
             return this.getLibraryById(contentData.mainlibraryid, siteId).then((libData) => {
 
-                // Map the values to the names used by the H5P core (it's the same Moodle web does).
-                return {
-                    id: contentData.id,
-                    params: contentData.jsoncontent,
-                    // The embedtype will be always set to 'iframe' to prevent conflicts with JS and CSS.
-                    embedType: 'iframe',
-                    disable: null,
-                    folderName: contentData.foldername,
-                    title: libData.title,
-                    slug: this.h5pUtils.slugify(libData.title) + '-' + contentData.id,
-                    filtered: contentData.filtered,
-                    libraryMajorVersion: libData.majorversion,
-                    libraryMinorVersion: libData.minorversion,
-                    metadata: {
-                        license: 'U' // Stop "invalid selected option in select" for old content without license chosen.
-                    },
-                    library: {
-                        id: libData.id,
-                        name: libData.machinename,
-                        majorVersion: libData.majorversion,
-                        minorVersion: libData.minorversion,
-                        embedTypes: libData.embedtypes,
-                        fullscreen: libData.fullscreen
-                    }
-                };
+                // Validate metadata.
+                const validator = new CoreH5PContentValidator(this, this.h5pUtils, this.textUtils, this.utils, this.translate,
+                            siteId);
+
+                // Validate empty metadata, like Moodle web does.
+                return validator.validateMetadata({}).then((metadata) => {
+                    // Map the values to the names used by the H5P core (it's the same Moodle web does).
+                    return {
+                        id: contentData.id,
+                        params: contentData.jsoncontent,
+                        embedType: 'iframe', // Always use iframe.
+                        disable: null,
+                        folderName: contentData.foldername,
+                        title: libData.title,
+                        slug: this.h5pUtils.slugify(libData.title) + '-' + contentData.id,
+                        filtered: contentData.filtered,
+                        libraryMajorVersion: libData.majorversion,
+                        libraryMinorVersion: libData.minorversion,
+                        metadata: metadata,
+                        library: {
+                            id: libData.id,
+                            name: libData.machinename,
+                            majorVersion: libData.majorversion,
+                            minorVersion: libData.minorversion,
+                            embedTypes: libData.embedtypes,
+                            fullscreen: libData.fullscreen
+                        }
+                    };
+                });
             });
         });
     }
@@ -2113,6 +2103,31 @@ export class CoreH5PProvider {
         });
     }
 
+    /**
+     * Parse library addon data.
+     *
+     * @param library Library addon data.
+     * @return Parsed library.
+     */
+    parseLibAddonData(library: any): CoreH5PLibraryAddonData {
+        library.addto = this.textUtils.parseJSON(library.addto, null);
+
+        return library;
+    }
+
+    /**
+     * Parse library DB data.
+     *
+     * @param library Library DB data.
+     * @return Parsed library.
+     */
+    parseLibDBData(library: any): CoreH5PLibraryDBData {
+        library.semantics = this.textUtils.parseJSON(library.semantics, null);
+        library.addto = this.textUtils.parseJSON(library.addto, null);
+
+        return library;
+    }
+
     /**
      * Process libraries from an H5P library, getting the required data to save them.
      * This code was copied from the isValidPackage function in Moodle's H5PValidator.
@@ -2172,12 +2187,13 @@ export class CoreH5PProvider {
      * know which cache file to delete when a library is updated.
      *
      * @param key Hash key for the given libraries.
-     * @param libraries List of dependencies used to create the key
+     * @param libraries List of dependencies used to create the key.
+     * @param folderName The name of the folder that contains the H5P.
      * @param siteId The site ID.
      * @return Promise resolved when done.
      */
     protected saveCachedAssets(hash: string, dependencies: {[machineName: string]: CoreH5PContentDependencyData},
-            siteId?: string): Promise<any> {
+            folderName: string, siteId?: string): Promise<any> {
 
         return this.sitesProvider.getSiteDb(siteId).then((db) => {
             const promises = [];
@@ -2185,7 +2201,8 @@ export class CoreH5PProvider {
             for (const key in dependencies) {
                 const data = {
                         hash: key,
-                        libraryid: dependencies[key].libraryId
+                        libraryid: dependencies[key].libraryId,
+                        foldername: folderName
                     };
 
                 promises.push(db.insertRecord(this.LIBRARIES_CACHEDASSETS_TABLE, data));
@@ -2279,7 +2296,7 @@ export class CoreH5PProvider {
             for (const libString in librariesJsonData) {
                 const libraryData = librariesJsonData[libString];
 
-                // Find local library identifier
+                // Find local library identifier.
                 promises.push(this.getLibraryByData(libraryData).catch(() => {
                     // Not found.
                 }).then((dbData) => {
@@ -2422,7 +2439,7 @@ export class CoreH5PProvider {
                     preloadedjs: preloadedJS,
                     preloadedcss: preloadedCSS,
                     droplibrarycss: dropLibraryCSS,
-                    semantics: libraryData.semantics,
+                    semantics: typeof libraryData.semantics != 'undefined' ? JSON.stringify(libraryData.semantics) : null,
                     addto: typeof libraryData.addTo != 'undefined' ? JSON.stringify(libraryData.addTo) : null,
                 };
 
@@ -2497,8 +2514,8 @@ export class CoreH5PProvider {
             for (const key in librariesInUse) {
                 const dependency = librariesInUse[key];
 
-                if (dependency.library.dropLibraryCss) {
-                    const split = dependency.library.dropLibraryCss.split(', ');
+                if ((<CoreH5PLibraryData> dependency.library).dropLibraryCss) {
+                    const split = (<CoreH5PLibraryData> dependency.library).dropLibraryCss.split(', ');
 
                     split.forEach((css) => {
                         dropLibraryCssList[css] = css;
@@ -2739,7 +2756,7 @@ export type CoreH5PContentDependencyData = {
  * Data for each content dependency in the dependency tree.
  */
 export type CoreH5PContentDepsTreeDependency = {
-    library: CoreH5PLibraryData; // Library data.
+    library: CoreH5PLibraryData | CoreH5PLibraryAddonData; // Library data.
     type: string; // Dependency type.
     weight?: number; // An integer determining the order of the libraries when they are loaded.
 };
@@ -2786,7 +2803,7 @@ export type CoreH5PLibraryAddonData = {
     patchVersion: number; // Patch version.
     preloadedJs?: string; // Comma separated list of scripts to load.
     preloadedCss?: string; // Comma separated list of stylesheets to load.
-    addTo?: string; // Plugin configuration data.
+    addTo?: any; // Plugin configuration data.
 };
 
 /**
@@ -2805,8 +2822,8 @@ export type CoreH5PLibraryDBData = {
     preloadedjs?: string; // Comma separated list of scripts to load.
     preloadedcss?: string; // Comma separated list of stylesheets to load.
     droplibrarycss?: string; // List of libraries that should not have CSS included if this library is used. Comma separated list.
-    semantics?: string; // The semantics definition in json format.
-    addto?: string; // Plugin configuration data.
+    semantics?: any; // The semantics definition.
+    addto?: any; // Plugin configuration data.
 };
 
 /**
diff --git a/src/core/h5p/providers/utils.ts b/src/core/h5p/providers/utils.ts
index 9c568acac..026b2b9b7 100644
--- a/src/core/h5p/providers/utils.ts
+++ b/src/core/h5p/providers/utils.ts
@@ -313,6 +313,27 @@ export class CoreH5PUtilsProvider {
         };
     }
 
+    /**
+     * Parses library data from a string on the form {machineName} {majorVersion}.{minorVersion}.
+     *
+     * @param libraryString On the form {machineName} {majorVersion}.{minorVersion}
+     * @return Object with keys machineName, majorVersion and minorVersion. Null if string is not parsable.
+     */
+    libraryFromString(libraryString: string): {machineName: string, majorVersion: number, minorVersion: number} {
+
+        const matches = libraryString.match(/^([\w0-9\-\.]{1,255})[\-\ ]([0-9]{1,5})\.([0-9]{1,5})$/i);
+
+        if (matches && matches.length >= 4) {
+            return {
+                machineName: matches[1],
+                majorVersion: Number(matches[2]),
+                minorVersion: Number(matches[3])
+            };
+        }
+
+        return null;
+    }
+
     /**
      * Convert list of library parameter values to csv.
      *
diff --git a/src/providers/utils/utils.ts b/src/providers/utils/utils.ts
index c4f051645..624371ac1 100644
--- a/src/providers/utils/utils.ts
+++ b/src/providers/utils/utils.ts
@@ -135,17 +135,19 @@ export class CoreUtilsProvider {
 
     /**
      * Converts an array of objects to an object, using a property of each entry as the key.
+     * It can also be used to convert an array of strings to an object where the keys are the elements of the array.
      * E.g. [{id: 10, name: 'A'}, {id: 11, name: 'B'}] => {10: {id: 10, name: 'A'}, 11: {id: 11, name: 'B'}}
      *
      * @param array The array to convert.
-     * @param propertyName The name of the property to use as the key.
+     * @param propertyName The name of the property to use as the key. If not provided, the whole item will be used.
      * @param result Object where to put the properties. If not defined, a new object will be created.
      * @return The object.
      */
-    arrayToObject(array: any[], propertyName: string, result?: any): any {
+    arrayToObject(array: any[], propertyName?: string, result?: any): any {
         result = result || {};
         array.forEach((entry) => {
-            result[entry[propertyName]] = entry;
+            const key = propertyName ? entry[propertyName] : entry;
+            result[key] = entry;
         });
 
         return result;

From 69e4fdd036f3f8a2c4117fcf04171a1af2bd616e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 28 Nov 2019 17:51:22 +0100
Subject: [PATCH 188/257] MOBILE-2235 iframe: Fix clicks in deep iframe links

---
 src/providers/utils/iframe.ts | 106 +++++++++++++++++++++-------------
 1 file changed, 67 insertions(+), 39 deletions(-)

diff --git a/src/providers/utils/iframe.ts b/src/providers/utils/iframe.ts
index f02aea2b6..e60c19b58 100644
--- a/src/providers/utils/iframe.ts
+++ b/src/providers/utils/iframe.ts
@@ -319,58 +319,86 @@ export class CoreIframeUtilsProvider {
             while (el && el.tagName !== 'A') {
                 el = el.parentElement;
             }
-            if (!el || el.tagName !== 'A') {
-                return;
-            }
-            const link = <HTMLAnchorElement> el;
 
-            const scheme = this.urlUtils.getUrlScheme(link.href);
-            if (!link.href || (scheme && scheme == 'javascript')) {
-                // Links with no URL and Javascript links are ignored.
+            const link = <CoreIframeHTMLAnchorElement> el;
+            if (!link || link.treated) {
                 return;
             }
 
-            if (scheme && scheme != 'file' && scheme != 'filesystem') {
-                // Scheme suggests it's an external resource.
-                event.preventDefault();
+            // Add click listener to the link, this way if the iframe has added a listener to the link it will be executed first.
+            link.treated = true;
+            link.addEventListener('click', this.linkClicked.bind(this, element, link));
+        }, {
+            capture: true // Use capture to fix this listener not called if the element clicked is too deep in the DOM.
+        });
+    }
 
-                const frameSrc = element.src || element.data,
-                    frameScheme = this.urlUtils.getUrlScheme(frameSrc);
+    /**
+     * A link inside a frame was clicked.
+     *
+     * @param element Frame element.
+     * @param link Link clicked.
+     * @param event Click event.
+     */
+    protected linkClicked(element: HTMLFrameElement | HTMLObjectElement, link: HTMLAnchorElement, event: Event): void {
+        if (event.defaultPrevented) {
+            // Event already prevented by some other code.
+            return;
+        }
 
-                // If the frame is not local, check the target to identify how to treat the link.
-                if (frameScheme && frameScheme != 'file' && frameScheme != 'filesystem' &&
-                        (!link.target || link.target == '_self')) {
-                    // Load the link inside the frame itself.
-                    if (element.tagName.toLowerCase() == 'object') {
-                        element.setAttribute('data', link.href);
-                    } else {
-                        element.setAttribute('src', link.href);
-                    }
+        const scheme = this.urlUtils.getUrlScheme(link.href);
+        if (!link.href || (scheme && scheme == 'javascript')) {
+            // Links with no URL and Javascript links are ignored.
+            return;
+        }
 
-                    return;
-                }
+        if (scheme && scheme != 'file' && scheme != 'filesystem') {
+            // Scheme suggests it's an external resource.
+            event.preventDefault();
 
-                // The frame is local or the link needs to be opened in a new window. Open in browser.
-                if (!this.sitesProvider.isLoggedIn()) {
-                    this.utils.openInBrowser(link.href);
-                } else {
-                    this.sitesProvider.getCurrentSite().openInBrowserWithAutoLoginIfSameSite(link.href);
-                }
-            } else if (link.target == '_parent' || link.target == '_top' || link.target == '_blank') {
-                // Opening links with _parent, _top or _blank can break the app. We'll open it in InAppBrowser.
-                event.preventDefault();
-                this.utils.openFile(link.href).catch((error) => {
-                    this.domUtils.showErrorModal(error);
-                });
-            } else if (this.platform.is('ios') && (!link.target || link.target == '_self')) {
-                // In cordova ios 4.1.0 links inside iframes stopped working. We'll manually treat them.
-                event.preventDefault();
+            const frameSrc = (<HTMLFrameElement> element).src || (<HTMLObjectElement> element).data,
+                frameScheme = this.urlUtils.getUrlScheme(frameSrc);
+
+            // If the frame is not local, check the target to identify how to treat the link.
+            if (frameScheme && frameScheme != 'file' && frameScheme != 'filesystem' &&
+                    (!link.target || link.target == '_self')) {
+                // Load the link inside the frame itself.
                 if (element.tagName.toLowerCase() == 'object') {
                     element.setAttribute('data', link.href);
                 } else {
                     element.setAttribute('src', link.href);
                 }
+
+                return;
             }
-        });
+
+            // The frame is local or the link needs to be opened in a new window. Open in browser.
+            if (!this.sitesProvider.isLoggedIn()) {
+                this.utils.openInBrowser(link.href);
+            } else {
+                this.sitesProvider.getCurrentSite().openInBrowserWithAutoLoginIfSameSite(link.href);
+            }
+        } else if (link.target == '_parent' || link.target == '_top' || link.target == '_blank') {
+            // Opening links with _parent, _top or _blank can break the app. We'll open it in InAppBrowser.
+            event.preventDefault();
+            this.utils.openFile(link.href).catch((error) => {
+                this.domUtils.showErrorModal(error);
+            });
+        } else if (this.platform.is('ios') && (!link.target || link.target == '_self')) {
+            // In cordova ios 4.1.0 links inside iframes stopped working. We'll manually treat them.
+            event.preventDefault();
+            if (element.tagName.toLowerCase() == 'object') {
+                element.setAttribute('data', link.href);
+            } else {
+                element.setAttribute('src', link.href);
+            }
+        }
     }
 }
+
+/**
+ * Subtype of HTMLAnchorElement, with some calculated data.
+ */
+type CoreIframeHTMLAnchorElement = HTMLAnchorElement & {
+    treated?: boolean; // Whether the element has been treated already.
+};

From 1a2ea9485f5b55c31cf44cbb19d2eb861237a924 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 4 Dec 2019 13:36:43 +0100
Subject: [PATCH 189/257] MOBILE-2235 h5p: Fix check download for external h5p
 packages

---
 src/core/h5p/components/h5p-player/h5p-player.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/core/h5p/components/h5p-player/h5p-player.ts b/src/core/h5p/components/h5p-player/h5p-player.ts
index f13b33073..daffc9570 100644
--- a/src/core/h5p/components/h5p-player/h5p-player.ts
+++ b/src/core/h5p/components/h5p-player/h5p-player.ts
@@ -26,6 +26,7 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreH5PProvider } from '@core/h5p/providers/h5p';
 import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
 import { CoreConstants } from '@core/constants';
+import { CoreSite } from '@classes/site';
 
 /**
  * Component to render an H5P package.
@@ -46,6 +47,7 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
     canDownload: boolean;
     calculating = true;
 
+    protected site: CoreSite;
     protected siteId: string;
     protected siteCanDownload: boolean;
     protected observer;
@@ -67,7 +69,8 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
             protected fileProvider: CoreFileProvider) {
 
         this.logger = loggerProvider.getInstance('CoreH5PPlayerComponent');
-        this.siteId = sitesProvider.getCurrentSiteId();
+        this.site = sitesProvider.getCurrentSite();
+        this.siteId = this.site.getId();
         this.siteCanDownload = this.sitesProvider.getCurrentSite().canDownloadFiles();
     }
 
@@ -82,7 +85,7 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
      * Detect changes on input properties.
      */
     ngOnChanges(changes: {[name: string]: SimpleChange}): void {
-        // If it's already playing and the src changes, don't change the player src, the user could lose data.
+        // If it's already playing there's no need to check if it can be downloaded.
         if (changes.src && !this.showPackage) {
             this.checkCanDownload();
         }
@@ -220,7 +223,7 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
         this.observer && this.observer.off();
         this.urlParams = this.urlUtils.extractUrlParams(this.src);
 
-        if (this.src && this.siteCanDownload && this.h5pProvider.canGetTrustedH5PFileInSite()) {
+        if (this.src && this.siteCanDownload && this.h5pProvider.canGetTrustedH5PFileInSite() && this.site.containsUrl(this.src)) {
 
             this.calculating = true;
 

From 5dae06ff8106615657f35fcefa5f8ff7b51bdadb Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 4 Dec 2019 13:37:00 +0100
Subject: [PATCH 190/257] MOBILE-2235 h5p: Fix issues identified during
 PeerReview

---
 scripts/langindex.json                        |   1 +
 .../mod/scorm/providers/prefetch-handler.ts   |   5 -
 .../h5p/components/h5p-player/h5p-player.ts   |  16 +-
 src/core/h5p/providers/h5p.ts                 | 137 +++++++-----------
 src/core/h5p/providers/pluginfile-handler.ts  |  24 +--
 src/providers/file.ts                         |  23 ++-
 src/providers/filepool.ts                     |   2 +-
 src/providers/plugin-file-delegate.ts         |  96 ++++++------
 src/providers/utils/dom.ts                    |   2 +-
 9 files changed, 141 insertions(+), 165 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 70f4eb012..2b696380e 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1620,6 +1620,7 @@
   "core.h5p.originator": "h5p",
   "core.h5p.pd": "h5p",
   "core.h5p.pddl": "h5p",
+  "core.h5p.play": "local_moodlemobileapp",
   "core.h5p.pdm": "h5p",
   "core.h5p.resizescript": "h5p",
   "core.h5p.resubmitScores": "h5p",
diff --git a/src/addon/mod/scorm/providers/prefetch-handler.ts b/src/addon/mod/scorm/providers/prefetch-handler.ts
index 7c6dcccde..0d3756312 100644
--- a/src/addon/mod/scorm/providers/prefetch-handler.ts
+++ b/src/addon/mod/scorm/providers/prefetch-handler.ts
@@ -172,11 +172,6 @@ export class AddonModScormPrefetchHandler extends CoreCourseActivityPrefetchHand
                 return this.filepoolProvider.downloadUrl(siteId, packageUrl, true, this.component, scorm.coursemodule,
                         undefined, this.downloadProgress.bind(this, true, onProgress));
             }
-        }).then(() => {
-            // Remove the destination folder to prevent having old unused files.
-            return this.fileProvider.removeDir(dirPath).catch(() => {
-                // Ignore errors, it might have failed because the folder doesn't exist.
-            });
         }).then(() => {
             // Get the ZIP file path.
             return this.filepoolProvider.getFilePathByUrl(siteId, packageUrl);
diff --git a/src/core/h5p/components/h5p-player/h5p-player.ts b/src/core/h5p/components/h5p-player/h5p-player.ts
index daffc9570..f4c0f70d7 100644
--- a/src/core/h5p/components/h5p-player/h5p-player.ts
+++ b/src/core/h5p/components/h5p-player/h5p-player.ts
@@ -148,7 +148,7 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
 
             if (this.canDownload && (this.state == CoreConstants.OUTDATED || this.state == CoreConstants.NOT_DOWNLOADED)) {
                 // Download the package in background if the size is low.
-                this.downloadInBg().catch((error) => {
+                this.attemptDownloadInBg().catch((error) => {
                     this.logger.error('Error downloading H5P in background', error);
                 });
             }
@@ -188,7 +188,7 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
      *
      * @return Promise resolved when done.
      */
-    protected downloadInBg(): Promise<any> {
+    protected attemptDownloadInBg(): Promise<any> {
         if (this.urlParams && this.src && this.siteCanDownload && this.h5pProvider.canGetTrustedH5PFileInSite() &&
                 this.appProvider.isOnline()) {
 
@@ -225,8 +225,6 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
 
         if (this.src && this.siteCanDownload && this.h5pProvider.canGetTrustedH5PFileInSite() && this.site.containsUrl(this.src)) {
 
-            this.calculating = true;
-
             this.calculateState();
 
             // Listen for changes in the state.
@@ -238,19 +236,21 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
                 // An error probably means the file cannot be downloaded or we cannot check it (offline).
             });
 
-            return;
+        } else {
+            this.calculating = false;
+            this.canDownload = false;
         }
 
-        this.calculating = false;
-        this.canDownload = false;
     }
 
     /**
-     * Calcuñate state of the file.
+     * Calculate state of the file.
      *
      * @param fileUrl The H5P file URL.
      */
     protected calculateState(): void {
+        this.calculating = true;
+
         // Get the status of the file.
         this.filepoolProvider.getFileStateByUrl(this.siteId, this.urlParams.url).then((state) => {
             this.canDownload = true;
diff --git a/src/core/h5p/providers/h5p.ts b/src/core/h5p/providers/h5p.ts
index adb3f4fbd..6750e226c 100644
--- a/src/core/h5p/providers/h5p.ts
+++ b/src/core/h5p/providers/h5p.ts
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
-import { CoreEventsProvider } from '@providers/events';
 import { CoreFileProvider } from '@providers/file';
 import { CoreFilepoolProvider } from '@providers/filepool';
 import { CoreLoggerProvider } from '@providers/logger';
@@ -81,6 +80,10 @@ export class CoreH5PProvider {
     protected siteSchema: CoreSiteSchema = {
         name: 'CoreH5PProvider',
         version: 1,
+        canBeCleared: [
+            this.CONTENT_TABLE, this.LIBRARIES_TABLE, this.LIBRARY_DEPENDENCIES_TABLE, this.CONTENTS_LIBRARIES_TABLE,
+            this.LIBRARIES_CACHEDASSETS_TABLE
+        ],
         tables: [
             {
                 name: this.CONTENT_TABLE,
@@ -101,10 +104,6 @@ export class CoreH5PProvider {
                         type: 'INTEGER',
                         notNull: true
                     },
-                    {
-                        name: 'displayoptions', // Not used right now, but we keep the field to be consistent with Moodle web.
-                        type: 'INTEGER'
-                    },
                     {
                         name: 'foldername',
                         type: 'TEXT',
@@ -293,12 +292,11 @@ export class CoreH5PProvider {
         ]
     };
 
-    protected ROOT_CACHE_KEY = 'mmH5P:';
+    protected ROOT_CACHE_KEY = 'CoreH5P:';
 
     protected logger;
 
     constructor(logger: CoreLoggerProvider,
-            eventsProvider: CoreEventsProvider,
             private sitesProvider: CoreSitesProvider,
             private textUtils: CoreTextUtilsProvider,
             private fileProvider: CoreFileProvider,
@@ -312,12 +310,6 @@ export class CoreH5PProvider {
         this.logger = logger.getInstance('CoreH5PProvider');
 
         this.sitesProvider.registerSiteSchema(this.siteSchema);
-
-        eventsProvider.on(CoreEventsProvider.SITE_STORAGE_DELETED, (data) => {
-            this.deleteAllData(data.siteId).catch((error) => {
-                this.logger.error('Error deleting all H5P data from site.', error);
-            });
-        });
     }
 
     /**
@@ -568,24 +560,6 @@ export class CoreH5PProvider {
         });
     }
 
-    /**
-     * Delete all the H5P data from the DB of a certain site.
-     *
-     * @param siteId Site ID.
-     * @return Promise resolved when done.
-     */
-    protected deleteAllData(siteId: string): Promise<any> {
-        return this.sitesProvider.getSiteDb(siteId).then((db) => {
-            return Promise.all([
-                db.deleteRecords(this.CONTENT_TABLE),
-                db.deleteRecords(this.LIBRARIES_TABLE),
-                db.deleteRecords(this.LIBRARY_DEPENDENCIES_TABLE),
-                db.deleteRecords(this.CONTENTS_LIBRARIES_TABLE),
-                db.deleteRecords(this.LIBRARIES_CACHEDASSETS_TABLE)
-            ]);
-        });
-    }
-
     /**
      * Delete cached assets from DB and filesystem.
      *
@@ -784,14 +758,8 @@ export class CoreH5PProvider {
         const folderName = this.mimeUtils.removeExtension(file.name),
             destFolder = this.textUtils.concatenatePaths(CoreFileProvider.TMPFOLDER, 'h5p/' + folderName);
 
-        // Make sure the dest dir doesn't exist already.
-        return this.fileProvider.removeDir(destFolder).catch(() => {
-            // Ignore errors.
-        }).then(() => {
-            return this.fileProvider.createDir(destFolder);
-        }).then(() => {
-            return this.fileProvider.unzipFile(file.toURL(), destFolder);
-        }).then(() => {
+        // Unzip the file.
+        return this.fileProvider.unzipFile(file.toURL(), destFolder).then(() => {
             // Read the contents of the unzipped dir.
             return this.fileProvider.getDirectoryContents(destFolder);
         }).then((contents) => {
@@ -830,11 +798,6 @@ export class CoreH5PProvider {
                             return Promise.reject(error);
                         });
                     });
-                }).then(() => {
-                    // Remove tmp folder.
-                    return this.fileProvider.removeDir(destFolder).catch(() => {
-                        // Ignore errors, it will be deleted eventually.
-                    });
                 }).then(() => {
                     // Create the content player.
 
@@ -843,6 +806,11 @@ export class CoreH5PProvider {
 
                         return this.createContentIndex(content.id, fileUrl, contentData, embedType, siteId);
                     });
+                }).finally(() => {
+                    // Remove tmp folder.
+                    return this.fileProvider.removeDir(destFolder).catch(() => {
+                        // Ignore errors, it will be deleted eventually.
+                    });
                 });
             });
         });
@@ -1002,6 +970,40 @@ export class CoreH5PProvider {
         });
     }
 
+    /**
+     * Validate and fix display options, updating them if needed.
+     *
+     * @param displayOptions The display options to validate.
+     * @param id Package ID.
+     */
+    fixDisplayOptions(displayOptions: CoreH5PDisplayOptions, id: number): CoreH5PDisplayOptions {
+
+        // Never allow downloading in the app.
+        displayOptions[CoreH5PProvider.DISPLAY_OPTION_DOWNLOAD] = false;
+
+        // Embed - force setting it if always on or always off. In web, this is done when storing in DB.
+        const embed = this.getOption(CoreH5PProvider.DISPLAY_OPTION_EMBED, CoreH5PDisplayOptionBehaviour.ALWAYS_SHOW);
+        if (embed == CoreH5PDisplayOptionBehaviour.ALWAYS_SHOW || embed == CoreH5PDisplayOptionBehaviour.NEVER_SHOW) {
+            displayOptions[CoreH5PProvider.DISPLAY_OPTION_EMBED] = (embed == CoreH5PDisplayOptionBehaviour.ALWAYS_SHOW);
+        }
+
+        if (!this.getOption(CoreH5PProvider.DISPLAY_OPTION_FRAME, true)) {
+            displayOptions[CoreH5PProvider.DISPLAY_OPTION_FRAME] = false;
+        } else {
+            displayOptions[CoreH5PProvider.DISPLAY_OPTION_EMBED] = this.setDisplayOptionOverrides(
+                    CoreH5PProvider.DISPLAY_OPTION_EMBED, CoreH5PPermission.EMBED_H5P, id,
+                    displayOptions[CoreH5PProvider.DISPLAY_OPTION_EMBED]);
+
+            if (this.getOption(CoreH5PProvider.DISPLAY_OPTION_COPYRIGHT, true) == false) {
+                displayOptions[CoreH5PProvider.DISPLAY_OPTION_COPYRIGHT] = false;
+            }
+        }
+
+        displayOptions[CoreH5PProvider.DISPLAY_OPTION_COPY] = this.hasPermission(CoreH5PPermission.COPY_H5P, id);
+
+        return displayOptions;
+    }
+
     /**
      * Get the assets of a package.
      *
@@ -1215,7 +1217,7 @@ export class CoreH5PProvider {
         }).then((url) => {
             // Add display options to the URL.
             return this.getContentDataByUrl(fileUrl, siteId).then((data) => {
-                const options = this.validateDisplayOptions(this.getDisplayOptionsFromUrlParams(urlParams), data.id);
+                const options = this.fixDisplayOptions(this.getDisplayOptionsFromUrlParams(urlParams), data.id);
 
                 return this.urlUtils.addParamsToUrl(url, options, undefined, true);
             });
@@ -1478,7 +1480,7 @@ export class CoreH5PProvider {
      * @return Display options as object.
      */
     getDisplayOptionsForView(disable: number, id: number): CoreH5PDisplayOptions {
-        return this.validateDisplayOptions(this.getDisplayOptionsAsObject(disable), id);
+        return this.fixDisplayOptions(this.getDisplayOptionsAsObject(disable), id);
     }
 
     /**
@@ -1733,8 +1735,8 @@ export class CoreH5PProvider {
      * @return Return the value for this display option.
      */
     getOption(name: string, defaultValue: any = false): any {
-        // For now, all them are disabled by default, so only will be rendered when defined in the displayoptions DB field.
-        return CoreH5PDisplayOptionBehaviour.CONTROLLED_BY_AUTHOR_DEFAULT_OFF; // CONTROLLED_BY_AUTHOR_DEFAULT_OFF.
+        // For now, all them are disabled by default, so only will be rendered when defined in the display options.
+        return CoreH5PDisplayOptionBehaviour.CONTROLLED_BY_AUTHOR_DEFAULT_OFF;
     }
 
     /**
@@ -1776,7 +1778,7 @@ export class CoreH5PProvider {
      *
      * @param url The file URL.
      * @param options Options.
-     * @param ignoreCache Whether to ignore cache..
+     * @param ignoreCache Whether to ignore cache.
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with the file data.
      */
@@ -2135,7 +2137,6 @@ export class CoreH5PProvider {
      *
      * @param fileUrl The file URL used to download the file.
      * @param file The file entry of the downloaded file.
-     * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved when done.
      */
     protected processH5PFiles(destFolder: string, entries: (DirectoryEntry | FileEntry)[])
@@ -2227,7 +2228,6 @@ export class CoreH5PProvider {
 
             const data: any = {
                 jsoncontent: content.params,
-                displayoptions: null,
                 mainlibraryid: content.library.libraryId,
                 timemodified: Date.now(),
                 filtered: null,
@@ -2597,40 +2597,6 @@ export class CoreH5PProvider {
             return db.updateRecords(this.CONTENT_TABLE, data, {id: id});
         });
     }
-
-    /**
-     * Validate display options, updating them if needed.
-     *
-     * @param displayOptions The display options to validate.
-     * @param id Package ID.
-     */
-    validateDisplayOptions(displayOptions: CoreH5PDisplayOptions, id: number): CoreH5PDisplayOptions {
-
-        // Never allow downloading in the app.
-        displayOptions[CoreH5PProvider.DISPLAY_OPTION_DOWNLOAD] = false;
-
-        // Embed - force setting it if always on or always off. In web, this is done when storing in DB.
-        const embed = this.getOption(CoreH5PProvider.DISPLAY_OPTION_EMBED, CoreH5PDisplayOptionBehaviour.ALWAYS_SHOW);
-        if (embed == CoreH5PDisplayOptionBehaviour.ALWAYS_SHOW || embed == CoreH5PDisplayOptionBehaviour.NEVER_SHOW) {
-            displayOptions[CoreH5PProvider.DISPLAY_OPTION_EMBED] = (embed == CoreH5PDisplayOptionBehaviour.ALWAYS_SHOW);
-        }
-
-        if (this.getOption(CoreH5PProvider.DISPLAY_OPTION_FRAME, true) == false) {
-            displayOptions[CoreH5PProvider.DISPLAY_OPTION_FRAME] = false;
-        } else {
-            displayOptions[CoreH5PProvider.DISPLAY_OPTION_EMBED] = this.setDisplayOptionOverrides(
-                    CoreH5PProvider.DISPLAY_OPTION_EMBED, CoreH5PPermission.EMBED_H5P, id,
-                    displayOptions[CoreH5PProvider.DISPLAY_OPTION_EMBED]);
-
-            if (this.getOption(CoreH5PProvider.DISPLAY_OPTION_COPYRIGHT, true) == false) {
-                displayOptions[CoreH5PProvider.DISPLAY_OPTION_COPYRIGHT] = false;
-            }
-        }
-
-        displayOptions[CoreH5PProvider.DISPLAY_OPTION_COPY] = this.hasPermission(CoreH5PPermission.COPY_H5P, id);
-
-        return displayOptions;
-    }
 }
 
 /**
@@ -2701,7 +2667,6 @@ export type CoreH5PContentDBData = {
     id: number; // The id of the content.
     jsoncontent: string; // The content in json format.
     mainlibraryid: number; // The library we first instantiate for this node.
-    displayoptions: number; // H5P Button display options. Not used right now.
     foldername: string; // Name of the folder that contains the contents.
     fileurl: string; // The online URL of the H5P package.
     filtered: string; // Filtered version of json_content.
diff --git a/src/core/h5p/providers/pluginfile-handler.ts b/src/core/h5p/providers/pluginfile-handler.ts
index 71b82053d..a152945c0 100644
--- a/src/core/h5p/providers/pluginfile-handler.ts
+++ b/src/core/h5p/providers/pluginfile-handler.ts
@@ -37,17 +37,6 @@ export class CoreH5PPluginFileHandler implements CorePluginFileHandler {
             protected fileProvider: CoreFileProvider,
             protected h5pProvider: CoreH5PProvider) { }
 
-    /**
-     * Check whether a file can be downloaded. If so, return the file to download.
-     *
-     * @param file The file data.
-     * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with the file to use. Rejected if cannot download.
-     */
-    canDownloadFile(file: CoreWSExternalFile, siteId?: string): Promise<CoreWSExternalFile> {
-        return this.h5pProvider.getTrustedH5PFile(file.fileurl, {}, false, siteId);
-    }
-
     /**
      * React to a file being deleted.
      *
@@ -61,6 +50,17 @@ export class CoreH5PPluginFileHandler implements CorePluginFileHandler {
         return this.h5pProvider.deleteContentByUrl(fileUrl, siteId);
     }
 
+    /**
+     * Check whether a file can be downloaded. If so, return the file to download.
+     *
+     * @param file The file data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the file to use. Rejected if cannot download.
+     */
+    getDownloadableFile(file: CoreWSExternalFile, siteId?: string): Promise<CoreWSExternalFile> {
+        return this.h5pProvider.getTrustedH5PFile(file.fileurl, {}, false, siteId);
+    }
+
     /**
      * Given an HTML element, get the URLs of the files that should be downloaded and weren't treated by
      * CoreDomUtilsProvider.extractDownloadableFilesFromHtml.
@@ -68,7 +68,7 @@ export class CoreH5PPluginFileHandler implements CorePluginFileHandler {
      * @param container Container where to get the URLs from.
      * @return {string[]} List of URLs.
      */
-    getDownloadableFiles(container: HTMLElement): string[] {
+    getDownloadableFilesFromHTML(container: HTMLElement): string[] {
         const iframes = <HTMLIFrameElement[]> Array.from(container.querySelectorAll('iframe.h5p-iframe'));
         const urls = [];
 
diff --git a/src/providers/file.ts b/src/providers/file.ts
index 915ac5a36..9dedaedbf 100644
--- a/src/providers/file.ts
+++ b/src/providers/file.ts
@@ -762,7 +762,7 @@ export class CoreFileProvider {
      * @return Promise resolved when the entry is moved.
      */
     moveDir(originalPath: string, newPath: string, destDirExists?: boolean): Promise<any> {
-        return this.moveFileOrDir(originalPath, newPath, true);
+        return this.moveFileOrDir(originalPath, newPath, true, destDirExists);
     }
 
     /**
@@ -775,7 +775,7 @@ export class CoreFileProvider {
      * @return Promise resolved when the entry is moved.
      */
     moveFile(originalPath: string, newPath: string, destDirExists?: boolean): Promise<any> {
-        return this.moveFileOrDir(originalPath, newPath, false);
+        return this.moveFileOrDir(originalPath, newPath, false, destDirExists);
     }
 
     /**
@@ -991,11 +991,26 @@ export class CoreFileProvider {
      * @param destFolder Path to the destination folder. If not defined, a new folder will be created with the
      *                   same location and name as the ZIP file (without extension).
      * @param onProgress Function to call on progress.
+     * @param recreateDir Delete the dest directory before unzipping. Defaults to true.
      * @return Promise resolved when the file is unzipped.
      */
-    unzipFile(path: string, destFolder?: string, onProgress?: Function): Promise<any> {
+    unzipFile(path: string, destFolder?: string, onProgress?: Function, recreateDir: boolean = true): Promise<any> {
         // Get the source file.
-        return this.getFile(path).then((fileEntry) => {
+        let fileEntry: FileEntry;
+
+        return this.getFile(path).then((fe) => {
+            fileEntry = fe;
+
+            if (destFolder && recreateDir) {
+                // Make sure the dest dir doesn't exist already.
+                return this.removeDir(destFolder).catch(() => {
+                    // Ignore errors.
+                }).then(() => {
+                    // Now create the dir, otherwise if any of the ancestor dirs doesn't exist the unzip would fail.
+                    return this.createDir(destFolder);
+                });
+            }
+        }).then(() => {
             // If destFolder is not set, use same location as ZIP file. We need to use absolute paths (including basePath).
             destFolder = this.addBasePathIfNeeded(destFolder || this.mimeUtils.removeExtension(path));
 
diff --git a/src/providers/filepool.ts b/src/providers/filepool.ts
index dca0d1e89..07058ee71 100644
--- a/src/providers/filepool.ts
+++ b/src/providers/filepool.ts
@@ -1339,7 +1339,7 @@ export class CoreFilepoolProvider {
      */
     protected fixPluginfileURL(siteId: string, fileUrl: string, timemodified: number = 0): Promise<CoreWSExternalFile> {
 
-        return this.pluginFileDelegate.canDownloadFile({fileurl: fileUrl, timemodified: timemodified}).then((file) => {
+        return this.pluginFileDelegate.getDownloadableFile({fileurl: fileUrl, timemodified: timemodified}).then((file) => {
 
             return this.sitesProvider.getSite(siteId).then((site) => {
                 return site.checkAndFixPluginfileURL(file.fileurl);
diff --git a/src/providers/plugin-file-delegate.ts b/src/providers/plugin-file-delegate.ts
index 01aea603e..f5582a28a 100644
--- a/src/providers/plugin-file-delegate.ts
+++ b/src/providers/plugin-file-delegate.ts
@@ -48,15 +48,6 @@ export interface CorePluginFileHandler {
      */
     getComponentRevisionReplace?(args: string[]): string;
 
-    /**
-     * Check whether a file can be downloaded. If so, return the file to download.
-     *
-     * @param file The file data.
-     * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with the file to use. Rejected if cannot download.
-     */
-    canDownloadFile?(file: CoreWSExternalFile, siteId?: string): Promise<CoreWSExternalFile>;
-
     /**
      * React to a file being deleted.
      *
@@ -67,6 +58,15 @@ export interface CorePluginFileHandler {
      */
     fileDeleted?(fileUrl: string, path: string, siteId?: string): Promise<any>;
 
+    /**
+     * Check whether a file can be downloaded. If so, return the file to download.
+     *
+     * @param file The file data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the file to use. Rejected if cannot download.
+     */
+    getDownloadableFile?(file: CoreWSExternalFile, siteId?: string): Promise<CoreWSExternalFile>;
+
     /**
      * Given an HTML element, get the URLs of the files that should be downloaded and weren't treated by
      * CoreDomUtilsProvider.extractDownloadableFilesFromHtml.
@@ -74,7 +74,7 @@ export interface CorePluginFileHandler {
      * @param container Container where to get the URLs from.
      * @return {string[]} List of URLs.
      */
-    getDownloadableFiles?(container: HTMLElement): string[];
+    getDownloadableFilesFromHTML?(container: HTMLElement): string[];
 
     /**
      * Get a file size.
@@ -116,39 +116,6 @@ export class CorePluginFileDelegate {
         this.logger = logger.getInstance('CorePluginFileDelegate');
     }
 
-    /**
-     * Check whether a file can be downloaded. If so, return the file to download.
-     *
-     * @param file The file data.
-     * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with the file to use. Rejected if cannot download.
-     */
-    canDownloadFile(file: CoreWSExternalFile, siteId?: string): Promise<CoreWSExternalFile> {
-        const handler = this.getHandlerForFile(file);
-
-        return this.canHandlerDownloadFile(file, handler, siteId);
-    }
-
-    /**
-     * Check whether a file can be downloaded. If so, return the file to download.
-     *
-     * @param file The file data.
-     * @param handler The handler to use.
-     * @param siteId Site ID. If not defined, current site.
-     * @return Promise resolved with the file to use. Rejected if cannot download.
-     */
-    protected canHandlerDownloadFile(file: CoreWSExternalFile, handler: CorePluginFileHandler, siteId?: string)
-            : Promise<CoreWSExternalFile> {
-
-        if (handler && handler.canDownloadFile) {
-            return handler.canDownloadFile(file, siteId).then((newFile) => {
-                return newFile || file;
-            });
-        }
-
-        return Promise.resolve(file);
-    }
-
     /**
      * React to a file being deleted.
      *
@@ -167,6 +134,39 @@ export class CorePluginFileDelegate {
         return Promise.resolve();
     }
 
+    /**
+     * Check whether a file can be downloaded. If so, return the file to download.
+     *
+     * @param file The file data.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the file to use. Rejected if cannot download.
+     */
+    getDownloadableFile(file: CoreWSExternalFile, siteId?: string): Promise<CoreWSExternalFile> {
+        const handler = this.getHandlerForFile(file);
+
+        return this.getHandlerDownloadableFile(file, handler, siteId);
+    }
+
+    /**
+     * Check whether a file can be downloaded. If so, return the file to download.
+     *
+     * @param file The file data.
+     * @param handler The handler to use.
+     * @param siteId Site ID. If not defined, current site.
+     * @return Promise resolved with the file to use. Rejected if cannot download.
+     */
+    protected getHandlerDownloadableFile(file: CoreWSExternalFile, handler: CorePluginFileHandler, siteId?: string)
+            : Promise<CoreWSExternalFile> {
+
+        if (handler && handler.getDownloadableFile) {
+            return handler.getDownloadableFile(file, siteId).then((newFile) => {
+                return newFile || file;
+            });
+        }
+
+        return Promise.resolve(file);
+    }
+
     /**
      * Get the handler for a certain pluginfile url.
      *
@@ -201,14 +201,14 @@ export class CorePluginFileDelegate {
      * @param container Container where to get the URLs from.
      * @return List of URLs.
      */
-    getDownloadableFiles(container: HTMLElement): string[] {
+    getDownloadableFilesFromHTML(container: HTMLElement): string[] {
         let files = [];
 
         for (const component in this.handlers) {
             const handler = this.handlers[component];
 
-            if (handler && handler.getDownloadableFiles) {
-                files = files.concat(handler.getDownloadableFiles(container));
+            if (handler && handler.getDownloadableFilesFromHTML) {
+                files = files.concat(handler.getDownloadableFilesFromHTML(container));
             }
         }
 
@@ -256,8 +256,8 @@ export class CorePluginFileDelegate {
         const handler = this.getHandlerForFile(file);
 
         // First of all check if file can be downloaded.
-        return this.canHandlerDownloadFile(file, handler, siteId).then((canDownload) => {
-            if (!canDownload) {
+        return this.getHandlerDownloadableFile(file, handler, siteId).then((file) => {
+            if (!file) {
                 return 0;
             }
 
diff --git a/src/providers/utils/dom.ts b/src/providers/utils/dom.ts
index 18dec5369..564b889c2 100644
--- a/src/providers/utils/dom.ts
+++ b/src/providers/utils/dom.ts
@@ -286,7 +286,7 @@ export class CoreDomUtilsProvider {
         }
 
         // Now get other files from plugin file handlers.
-        urls = urls.concat(this.pluginFileDelegate.getDownloadableFiles(element));
+        urls = urls.concat(this.pluginFileDelegate.getDownloadableFilesFromHTML(element));
 
         return urls;
     }

From 40fc0e2b0080169462bb85d820d05a060c2eb4ce Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 4 Dec 2019 13:27:41 +0100
Subject: [PATCH 191/257] MOBILE-2235 core: Use isStateDownloaded where it
 should

---
 src/components/file/file.ts                    |  2 +-
 src/core/course/providers/helper.ts            |  2 +-
 .../providers/module-prefetch-delegate.ts      | 18 ++++++++++++------
 .../h5p/components/h5p-player/h5p-player.ts    |  6 ++++--
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/components/file/file.ts b/src/components/file/file.ts
index b8e7a7965..57c509107 100644
--- a/src/components/file/file.ts
+++ b/src/components/file/file.ts
@@ -169,7 +169,7 @@ export class CoreFileComponent implements OnInit, OnDestroy {
         }
 
         if (!this.appProvider.isOnline() && (!openAfterDownload || (openAfterDownload &&
-                !(this.state === CoreConstants.DOWNLOADED || this.state === CoreConstants.OUTDATED)))) {
+                !this.fileHelper.isStateDownloaded(this.state)))) {
             this.domUtils.showErrorModal('core.networkerrormsg', true);
 
             return;
diff --git a/src/core/course/providers/helper.ts b/src/core/course/providers/helper.ts
index 82b9d03d6..9cfb9385c 100644
--- a/src/core/course/providers/helper.ts
+++ b/src/core/course/providers/helper.ts
@@ -1089,7 +1089,7 @@ export class CoreCourseHelperProvider {
 
         // Get the time it was downloaded (if it was downloaded).
         promises.push(this.filepoolProvider.getPackageData(siteId, component, module.id).then((data) => {
-            if (data && data.downloadTime && (data.status == CoreConstants.OUTDATED || data.status == CoreConstants.DOWNLOADED)) {
+            if (data && data.downloadTime && this.fileHelper.isStateDownloaded(data.status)) {
                 const now = this.timeUtils.timestamp();
                 moduleInfo.downloadTime = data.downloadTime;
                 if (now - data.downloadTime < 7 * 86400) {
diff --git a/src/core/course/providers/module-prefetch-delegate.ts b/src/core/course/providers/module-prefetch-delegate.ts
index 58cda1d91..6e05b283b 100644
--- a/src/core/course/providers/module-prefetch-delegate.ts
+++ b/src/core/course/providers/module-prefetch-delegate.ts
@@ -27,6 +27,7 @@ import { CoreConstants } from '../../constants';
 import { Md5 } from 'ts-md5/dist/md5';
 import { Subject, BehaviorSubject, Subscription } from 'rxjs';
 import { CoreDelegate, CoreDelegateHandler } from '@classes/delegate';
+import { CoreFileHelperProvider } from '@providers/file-helper';
 
 /**
  * Progress of downloading a list of modules.
@@ -258,10 +259,15 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
         }
     } = {};
 
-    constructor(loggerProvider: CoreLoggerProvider, protected sitesProvider: CoreSitesProvider, private utils: CoreUtilsProvider,
-            private courseProvider: CoreCourseProvider, private filepoolProvider: CoreFilepoolProvider,
-            private timeUtils: CoreTimeUtilsProvider, private fileProvider: CoreFileProvider,
-            protected eventsProvider: CoreEventsProvider) {
+    constructor(loggerProvider: CoreLoggerProvider,
+            protected sitesProvider: CoreSitesProvider,
+            protected utils: CoreUtilsProvider,
+            protected courseProvider: CoreCourseProvider,
+            protected filepoolProvider: CoreFilepoolProvider,
+            protected timeUtils: CoreTimeUtilsProvider,
+            protected fileProvider: CoreFileProvider,
+            protected eventsProvider: CoreEventsProvider,
+            protected fileHelper: CoreFileHelperProvider) {
         super('CoreCourseModulePrefetchDelegate', loggerProvider, sitesProvider, eventsProvider);
 
         this.sitesProvider.registerSiteSchema(this.siteSchema);
@@ -881,7 +887,7 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
             const packageId = this.filepoolProvider.getPackageId(handler.component, module.id),
                 status = this.statusCache.getValue(packageId, 'status');
 
-            if (typeof status != 'undefined' && status != CoreConstants.DOWNLOADED && status != CoreConstants.OUTDATED) {
+            if (typeof status != 'undefined' && !this.fileHelper.isStateDownloaded(status)) {
                 // Module isn't downloaded, just return the status.
                 return Promise.resolve({
                     status: status
@@ -927,7 +933,7 @@ export class CoreCourseModulePrefetchDelegate extends CoreDelegate {
         return this.sitesProvider.getSite(siteId).then((site) => {
             // Get the status and download time of the module.
             return this.getModuleStatusAndDownloadTime(module, courseId).then((data) => {
-                if (data.status != CoreConstants.DOWNLOADED && data.status != CoreConstants.OUTDATED) {
+                if (!this.fileHelper.isStateDownloaded(data.status)) {
                     // Not downloaded, no updates.
                     return {};
                 }
diff --git a/src/core/h5p/components/h5p-player/h5p-player.ts b/src/core/h5p/components/h5p-player/h5p-player.ts
index f4c0f70d7..1166c0136 100644
--- a/src/core/h5p/components/h5p-player/h5p-player.ts
+++ b/src/core/h5p/components/h5p-player/h5p-player.ts
@@ -25,6 +25,7 @@ import { CoreUrlUtilsProvider } from '@providers/utils/url';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreH5PProvider } from '@core/h5p/providers/h5p';
 import { CorePluginFileDelegate } from '@providers/plugin-file-delegate';
+import { CoreFileHelperProvider } from '@providers/file-helper';
 import { CoreConstants } from '@core/constants';
 import { CoreSite } from '@classes/site';
 
@@ -66,7 +67,8 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
             protected appProvider: CoreAppProvider,
             protected domUtils: CoreDomUtilsProvider,
             protected pluginFileDelegate: CorePluginFileDelegate,
-            protected fileProvider: CoreFileProvider) {
+            protected fileProvider: CoreFileProvider,
+            protected fileHelper: CoreFileHelperProvider) {
 
         this.logger = loggerProvider.getInstance('CoreH5PPlayerComponent');
         this.site = sitesProvider.getCurrentSite();
@@ -106,7 +108,7 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
 
         this.addResizerScript();
 
-        if (this.canDownload && (this.state == CoreConstants.DOWNLOADED || this.state == CoreConstants.OUTDATED)) {
+        if (this.canDownload && this.fileHelper.isStateDownloaded(this.state)) {
             // Package is downloaded, use the local URL.
             promise = this.h5pProvider.getContentIndexFileUrl(this.urlParams.url, this.urlParams, this.siteId).catch(() => {
 

From e0849668e3818e3018349baba2170c8535c95dad Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 9 Dec 2019 15:34:08 +0100
Subject: [PATCH 192/257] MOBILE-2235 h5p: Support and use isEnabled function
 in file delegate

---
 .../folder/providers/pluginfile-handler.ts    |  9 +++
 .../mod/forum/providers/prefetch-handler.ts   |  2 +-
 .../glossary/providers/prefetch-handler.ts    |  2 +-
 .../mod/imscp/providers/pluginfile-handler.ts |  9 +++
 .../mod/lesson/providers/prefetch-handler.ts  |  3 +-
 .../mod/page/providers/pluginfile-handler.ts  |  9 +++
 .../mod/quiz/providers/prefetch-handler.ts    |  2 +-
 .../resource/providers/pluginfile-handler.ts  |  9 +++
 .../mod/scorm/providers/pluginfile-handler.ts |  9 +++
 src/classes/delegate.ts                       | 12 ++--
 .../course/classes/module-prefetch-handler.ts |  4 +-
 src/core/course/providers/helper.ts           |  6 +-
 src/core/h5p/providers/pluginfile-handler.ts  | 11 ++-
 src/core/question/providers/helper.ts         |  2 +-
 src/providers/filepool.ts                     | 53 +++++++++++++++
 src/providers/plugin-file-delegate.ts         | 67 +++++--------------
 src/providers/utils/dom.ts                    | 17 +++--
 upgrade.txt                                   |  4 ++
 18 files changed, 160 insertions(+), 70 deletions(-)

diff --git a/src/addon/mod/folder/providers/pluginfile-handler.ts b/src/addon/mod/folder/providers/pluginfile-handler.ts
index cc4190e0b..35e816d94 100644
--- a/src/addon/mod/folder/providers/pluginfile-handler.ts
+++ b/src/addon/mod/folder/providers/pluginfile-handler.ts
@@ -47,4 +47,13 @@ export class AddonModFolderPluginFileHandler implements CorePluginFileHandler {
         // Component + Filearea + Revision
         return '/mod_folder/content/0/';
     }
+
+    /**
+     * Whether or not the handler is enabled on a site level.
+     *
+     * @return Whether or not the handler is enabled on a site level.
+     */
+    isEnabled(): boolean | Promise<boolean> {
+        return true;
+    }
 }
diff --git a/src/addon/mod/forum/providers/prefetch-handler.ts b/src/addon/mod/forum/providers/prefetch-handler.ts
index 2f1e05b5d..743d99b97 100644
--- a/src/addon/mod/forum/providers/prefetch-handler.ts
+++ b/src/addon/mod/forum/providers/prefetch-handler.ts
@@ -96,7 +96,7 @@ export class AddonModForumPrefetchHandler extends CoreCourseActivityPrefetchHand
             if (getInlineFiles && post.messageinlinefiles && post.messageinlinefiles.length) {
                 files = files.concat(post.messageinlinefiles);
             } else if (post.message && !getInlineFiles) {
-                files = files.concat(this.domUtils.extractDownloadableFilesFromHtmlAsFakeFileObjects(post.message));
+                files = files.concat(this.filepoolProvider.extractDownloadableFilesFromHtmlAsFakeFileObjects(post.message));
             }
         });
 
diff --git a/src/addon/mod/glossary/providers/prefetch-handler.ts b/src/addon/mod/glossary/providers/prefetch-handler.ts
index 34a94b142..590294ad7 100644
--- a/src/addon/mod/glossary/providers/prefetch-handler.ts
+++ b/src/addon/mod/glossary/providers/prefetch-handler.ts
@@ -93,7 +93,7 @@ export class AddonModGlossaryPrefetchHandler extends CoreCourseActivityPrefetchH
             if (getInlineFiles && entry.definitioninlinefiles && entry.definitioninlinefiles.length) {
                 files = files.concat(entry.definitioninlinefiles);
             } else if (entry.definition && !getInlineFiles) {
-                files = files.concat(this.domUtils.extractDownloadableFilesFromHtmlAsFakeFileObjects(entry.definition));
+                files = files.concat(this.filepoolProvider.extractDownloadableFilesFromHtmlAsFakeFileObjects(entry.definition));
             }
         });
 
diff --git a/src/addon/mod/imscp/providers/pluginfile-handler.ts b/src/addon/mod/imscp/providers/pluginfile-handler.ts
index d67c455a3..4d283a90e 100644
--- a/src/addon/mod/imscp/providers/pluginfile-handler.ts
+++ b/src/addon/mod/imscp/providers/pluginfile-handler.ts
@@ -54,4 +54,13 @@ export class AddonModImscpPluginFileHandler implements CorePluginFileHandler {
         // Component + Filearea + Revision
         return '/mod_imscp/' + args[2] + '/0/';
     }
+
+    /**
+     * Whether or not the handler is enabled on a site level.
+     *
+     * @return Whether or not the handler is enabled on a site level.
+     */
+    isEnabled(): boolean | Promise<boolean> {
+        return true;
+    }
 }
diff --git a/src/addon/mod/lesson/providers/prefetch-handler.ts b/src/addon/mod/lesson/providers/prefetch-handler.ts
index f0732535e..46ef36db2 100644
--- a/src/addon/mod/lesson/providers/prefetch-handler.ts
+++ b/src/addon/mod/lesson/providers/prefetch-handler.ts
@@ -419,7 +419,8 @@ export class AddonModLessonPrefetchHandler extends CoreCourseActivityPrefetchHan
                                         return;
                                     }
                                     answerPage.answerdata.answers.forEach((answer) => {
-                                        files.push(...this.domUtils.extractDownloadableFilesFromHtmlAsFakeFileObjects(answer[0]));
+                                        files.push(...this.filepoolProvider.extractDownloadableFilesFromHtmlAsFakeFileObjects(
+                                                answer[0]));
                                     });
                                 });
 
diff --git a/src/addon/mod/page/providers/pluginfile-handler.ts b/src/addon/mod/page/providers/pluginfile-handler.ts
index c17e6b626..1c93e3e21 100644
--- a/src/addon/mod/page/providers/pluginfile-handler.ts
+++ b/src/addon/mod/page/providers/pluginfile-handler.ts
@@ -47,4 +47,13 @@ export class AddonModPagePluginFileHandler implements CorePluginFileHandler {
         // Component + Filearea + Revision
         return '/mod_page/content/0/';
     }
+
+    /**
+     * Whether or not the handler is enabled on a site level.
+     *
+     * @return Whether or not the handler is enabled on a site level.
+     */
+    isEnabled(): boolean | Promise<boolean> {
+        return true;
+    }
 }
diff --git a/src/addon/mod/quiz/providers/prefetch-handler.ts b/src/addon/mod/quiz/providers/prefetch-handler.ts
index fdd66c7e5..0040dd8e8 100644
--- a/src/addon/mod/quiz/providers/prefetch-handler.ts
+++ b/src/addon/mod/quiz/providers/prefetch-handler.ts
@@ -126,7 +126,7 @@ export class AddonModQuizPrefetchHandler extends CoreCourseActivityPrefetchHandl
                                 files = files.concat(feedback.feedbackinlinefiles);
                             } else if (feedback.feedbacktext && !getInlineFiles) {
                                 files = files.concat(
-                                    this.domUtils.extractDownloadableFilesFromHtmlAsFakeFileObjects(feedback.feedbacktext));
+                                    this.filepoolProvider.extractDownloadableFilesFromHtmlAsFakeFileObjects(feedback.feedbacktext));
                             }
                     }));
                 }
diff --git a/src/addon/mod/resource/providers/pluginfile-handler.ts b/src/addon/mod/resource/providers/pluginfile-handler.ts
index b0b41368d..f9179a955 100644
--- a/src/addon/mod/resource/providers/pluginfile-handler.ts
+++ b/src/addon/mod/resource/providers/pluginfile-handler.ts
@@ -47,4 +47,13 @@ export class AddonModResourcePluginFileHandler implements CorePluginFileHandler
         // Component + Filearea + Revision
         return '/mod_resource/content/0/';
     }
+
+    /**
+     * Whether or not the handler is enabled on a site level.
+     *
+     * @return Whether or not the handler is enabled on a site level.
+     */
+    isEnabled(): boolean | Promise<boolean> {
+        return true;
+    }
 }
diff --git a/src/addon/mod/scorm/providers/pluginfile-handler.ts b/src/addon/mod/scorm/providers/pluginfile-handler.ts
index ccb1a3a6b..6cd13e393 100644
--- a/src/addon/mod/scorm/providers/pluginfile-handler.ts
+++ b/src/addon/mod/scorm/providers/pluginfile-handler.ts
@@ -47,4 +47,13 @@ export class AddonModScormPluginFileHandler implements CorePluginFileHandler {
         // Component + Filearea + Revision
         return '/mod_scorm/content/0/';
     }
+
+    /**
+     * Whether or not the handler is enabled on a site level.
+     *
+     * @return Whether or not the handler is enabled on a site level.
+     */
+    isEnabled(): boolean | Promise<boolean> {
+        return true;
+    }
 }
diff --git a/src/classes/delegate.ts b/src/classes/delegate.ts
index db31ff907..e342c1e62 100644
--- a/src/classes/delegate.ts
+++ b/src/classes/delegate.ts
@@ -237,14 +237,16 @@ export class CoreDelegate {
      * @return True when registered, false if already registered.
      */
     registerHandler(handler: CoreDelegateHandler): boolean {
-        if (typeof this.handlers[handler[this.handlerNameProperty]] !== 'undefined') {
+        const key = handler[this.handlerNameProperty] || handler.name;
+
+        if (typeof this.handlers[key] !== 'undefined') {
             this.logger.log(`Handler '${handler[this.handlerNameProperty]}' already registered`);
 
             return false;
         }
 
         this.logger.log(`Registered handler '${handler[this.handlerNameProperty]}'`);
-        this.handlers[handler[this.handlerNameProperty]] = handler;
+        this.handlers[key] = handler;
 
         return true;
     }
@@ -282,10 +284,12 @@ export class CoreDelegate {
         }).then((enabled: boolean) => {
             // Check that site hasn't changed since the check started.
             if (this.sitesProvider.getCurrentSiteId() === siteId) {
+                const key = handler[this.handlerNameProperty] || handler.name;
+
                 if (enabled) {
-                    this.enabledHandlers[handler[this.handlerNameProperty]] = handler;
+                    this.enabledHandlers[key] = handler;
                 } else {
-                    delete this.enabledHandlers[handler[this.handlerNameProperty]];
+                    delete this.enabledHandlers[key];
                 }
             }
         }).finally(() => {
diff --git a/src/core/course/classes/module-prefetch-handler.ts b/src/core/course/classes/module-prefetch-handler.ts
index 0448dcd33..815cbf5c4 100644
--- a/src/core/course/classes/module-prefetch-handler.ts
+++ b/src/core/course/classes/module-prefetch-handler.ts
@@ -195,12 +195,12 @@ export class CoreCourseModulePrefetchHandlerBase implements CoreCourseModulePref
             if (typeof instance.introfiles != 'undefined') {
                 return instance.introfiles;
             } else if (instance.intro) {
-                return this.domUtils.extractDownloadableFilesFromHtmlAsFakeFileObjects(instance.intro);
+                return this.filepoolProvider.extractDownloadableFilesFromHtmlAsFakeFileObjects(instance.intro);
             }
         }
 
         if (module.description) {
-            return this.domUtils.extractDownloadableFilesFromHtmlAsFakeFileObjects(module.description);
+            return this.filepoolProvider.extractDownloadableFilesFromHtmlAsFakeFileObjects(module.description);
         }
 
         return [];
diff --git a/src/core/course/providers/helper.ts b/src/core/course/providers/helper.ts
index 9cfb9385c..0501ba682 100644
--- a/src/core/course/providers/helper.ts
+++ b/src/core/course/providers/helper.ts
@@ -438,7 +438,7 @@ export class CoreCourseHelperProvider {
             sizePromise = this.prefetchDelegate.getDownloadSize(section.modules, courseId);
 
             // Check if the section has embedded files in the description.
-            haveEmbeddedFiles = this.domUtils.extractDownloadableFilesFromHtml(section.summary).length > 0;
+            haveEmbeddedFiles = this.filepoolProvider.extractDownloadableFilesFromHtml(section.summary).length > 0;
         } else {
             const promises = [],
                 results = {
@@ -454,7 +454,7 @@ export class CoreCourseHelperProvider {
                     }));
 
                     // Check if the section has embedded files in the description.
-                    if (!haveEmbeddedFiles && this.domUtils.extractDownloadableFilesFromHtml(s.summary).length > 0) {
+                    if (!haveEmbeddedFiles && this.filepoolProvider.extractDownloadableFilesFromHtml(s.summary).length > 0) {
                         haveEmbeddedFiles = true;
                     }
                 }
@@ -1449,7 +1449,7 @@ export class CoreCourseHelperProvider {
         }));
 
         // Download the files in the section description.
-        const introFiles = this.domUtils.extractDownloadableFilesFromHtmlAsFakeFileObjects(section.summary),
+        const introFiles = this.filepoolProvider.extractDownloadableFilesFromHtmlAsFakeFileObjects(section.summary),
             siteId = this.sitesProvider.getCurrentSiteId();
 
         promises.push(this.filepoolProvider.addFilesToQueue(siteId, introFiles, CoreCourseProvider.COMPONENT, courseId)
diff --git a/src/core/h5p/providers/pluginfile-handler.ts b/src/core/h5p/providers/pluginfile-handler.ts
index a152945c0..13657fc2d 100644
--- a/src/core/h5p/providers/pluginfile-handler.ts
+++ b/src/core/h5p/providers/pluginfile-handler.ts
@@ -63,7 +63,7 @@ export class CoreH5PPluginFileHandler implements CorePluginFileHandler {
 
     /**
      * Given an HTML element, get the URLs of the files that should be downloaded and weren't treated by
-     * CoreDomUtilsProvider.extractDownloadableFilesFromHtml.
+     * CoreFilepoolProvider.extractDownloadableFilesFromHtml.
      *
      * @param container Container where to get the URLs from.
      * @return {string[]} List of URLs.
@@ -103,6 +103,15 @@ export class CoreH5PPluginFileHandler implements CorePluginFileHandler {
         });
     }
 
+    /**
+     * Whether or not the handler is enabled on a site level.
+     *
+     * @return Whether or not the handler is enabled on a site level.
+     */
+    isEnabled(): boolean | Promise<boolean> {
+        return this.h5pProvider.canGetTrustedH5PFileInSite();
+    }
+
     /**
      * Check whether the file should be treated by this handler. It is used in functions where the component isn't used.
      *
diff --git a/src/core/question/providers/helper.ts b/src/core/question/providers/helper.ts
index 4b7da5ea3..0cb77a0b0 100644
--- a/src/core/question/providers/helper.ts
+++ b/src/core/question/providers/helper.ts
@@ -516,7 +516,7 @@ export class CoreQuestionHelperProvider {
      */
     prefetchQuestionFiles(question: any, component?: string, componentId?: string | number, siteId?: string, usageId?: number)
             : Promise<any> {
-        const urls = this.domUtils.extractDownloadableFilesFromHtml(question.html);
+        const urls = this.filepoolProvider.extractDownloadableFilesFromHtml(question.html);
 
         if (!component) {
             component = CoreQuestionProvider.COMPONENT;
diff --git a/src/providers/filepool.ts b/src/providers/filepool.ts
index 07058ee71..9e8fa5790 100644
--- a/src/providers/filepool.ts
+++ b/src/providers/filepool.ts
@@ -1239,6 +1239,59 @@ export class CoreFilepoolProvider {
         }
     }
 
+    /**
+     * Extract the downloadable URLs from an HTML code.
+     *
+     * @param html HTML code.
+     * @return List of file urls.
+     */
+    extractDownloadableFilesFromHtml(html: string): string[] {
+        let urls = [],
+            elements;
+
+        const element = this.domUtils.convertToElement(html);
+        elements = element.querySelectorAll('a, img, audio, video, source, track');
+
+        for (let i = 0; i < elements.length; i++) {
+            const element = elements[i];
+            let url = element.tagName === 'A' ? element.href : element.src;
+
+            if (url && this.urlUtils.isDownloadableUrl(url) && urls.indexOf(url) == -1) {
+                urls.push(url);
+            }
+
+            // Treat video poster.
+            if (element.tagName == 'VIDEO' && element.getAttribute('poster')) {
+                url = element.getAttribute('poster');
+                if (url && this.urlUtils.isDownloadableUrl(url) && urls.indexOf(url) == -1) {
+                    urls.push(url);
+                }
+            }
+        }
+
+        // Now get other files from plugin file handlers.
+        urls = urls.concat(this.pluginFileDelegate.getDownloadableFilesFromHTML(element));
+
+        return urls;
+    }
+
+    /**
+     * Extract the downloadable URLs from an HTML code and returns them in fake file objects.
+     *
+     * @param html HTML code.
+     * @return List of fake file objects with file URLs.
+     */
+    extractDownloadableFilesFromHtmlAsFakeFileObjects(html: string): any[] {
+        const urls = this.extractDownloadableFilesFromHtml(html);
+
+        // Convert them to fake file objects.
+        return urls.map((url) => {
+            return {
+                fileurl: url
+            };
+        });
+    }
+
     /**
      * Fill Missing Extension In the File Object if needed.
      * This is to migrate from old versions.
diff --git a/src/providers/plugin-file-delegate.ts b/src/providers/plugin-file-delegate.ts
index f5582a28a..17354d4b5 100644
--- a/src/providers/plugin-file-delegate.ts
+++ b/src/providers/plugin-file-delegate.ts
@@ -13,18 +13,17 @@
 // limitations under the License.
 
 import { Injectable } from '@angular/core';
+import { CoreEventsProvider } from './events';
 import { CoreLoggerProvider } from './logger';
+import { CoreSitesProvider } from './sites';
 import { CoreWSExternalFile } from '@providers/ws';
 import { FileEntry } from '@ionic-native/file';
+import { CoreDelegate, CoreDelegateHandler } from '@classes/delegate';
 
 /**
  * Interface that all plugin file handlers must implement.
  */
-export interface CorePluginFileHandler {
-    /**
-     * A name to identify the handler.
-     */
-    name: string;
+export interface CorePluginFileHandler extends CoreDelegateHandler {
 
     /**
      * The "component" of the handler. It should match the "component" of pluginfile URLs.
@@ -69,7 +68,7 @@ export interface CorePluginFileHandler {
 
     /**
      * Given an HTML element, get the URLs of the files that should be downloaded and weren't treated by
-     * CoreDomUtilsProvider.extractDownloadableFilesFromHtml.
+     * CoreFilepoolProvider.extractDownloadableFilesFromHtml.
      *
      * @param container Container where to get the URLs from.
      * @return {string[]} List of URLs.
@@ -108,12 +107,13 @@ export interface CorePluginFileHandler {
  * Delegate to register pluginfile information handlers.
  */
 @Injectable()
-export class CorePluginFileDelegate {
-    protected logger;
-    protected handlers: { [s: string]: CorePluginFileHandler } = {};
+export class CorePluginFileDelegate extends CoreDelegate {
+    protected handlerNameProperty = 'component';
 
-    constructor(logger: CoreLoggerProvider) {
-        this.logger = logger.getInstance('CorePluginFileDelegate');
+    constructor(loggerProvider: CoreLoggerProvider,
+            sitesProvider: CoreSitesProvider,
+            eventsProvider: CoreEventsProvider) {
+        super('CorePluginFileDelegate', loggerProvider, sitesProvider, eventsProvider);
     }
 
     /**
@@ -167,18 +167,6 @@ export class CorePluginFileDelegate {
         return Promise.resolve(file);
     }
 
-    /**
-     * Get the handler for a certain pluginfile url.
-     *
-     * @param component Component of the plugin.
-     * @return Handler. Undefined if no handler found for the plugin.
-     */
-    protected getPluginHandler(component: string): CorePluginFileHandler {
-        if (typeof this.handlers[component] != 'undefined') {
-            return this.handlers[component];
-        }
-    }
-
     /**
      * Get the RegExp of the component and filearea described in the URL.
      *
@@ -187,7 +175,7 @@ export class CorePluginFileDelegate {
      */
     getComponentRevisionRegExp(args: string[]): RegExp {
         // Get handler based on component (args[1]).
-        const handler = this.getPluginHandler(args[1]);
+        const handler = <CorePluginFileHandler> this.getHandler(args[1], true);
 
         if (handler && handler.getComponentRevisionRegExp) {
             return handler.getComponentRevisionRegExp(args);
@@ -196,7 +184,7 @@ export class CorePluginFileDelegate {
 
     /**
      * Given an HTML element, get the URLs of the files that should be downloaded and weren't treated by
-     * CoreDomUtilsProvider.extractDownloadableFilesFromHtml.
+     * CoreFilepoolProvider.extractDownloadableFilesFromHtml.
      *
      * @param container Container where to get the URLs from.
      * @return List of URLs.
@@ -204,8 +192,8 @@ export class CorePluginFileDelegate {
     getDownloadableFilesFromHTML(container: HTMLElement): string[] {
         let files = [];
 
-        for (const component in this.handlers) {
-            const handler = this.handlers[component];
+        for (const component in this.enabledHandlers) {
+            const handler = <CorePluginFileHandler> this.enabledHandlers[component];
 
             if (handler && handler.getDownloadableFilesFromHTML) {
                 files = files.concat(handler.getDownloadableFilesFromHTML(container));
@@ -278,8 +266,8 @@ export class CorePluginFileDelegate {
      * @return Handler.
      */
     protected getHandlerForFile(file: CoreWSExternalFile): CorePluginFileHandler {
-        for (const component in this.handlers) {
-            const handler = this.handlers[component];
+        for (const component in this.enabledHandlers) {
+            const handler = <CorePluginFileHandler> this.enabledHandlers[component];
 
             if (handler && handler.shouldHandleFile && handler.shouldHandleFile(file)) {
                 return handler;
@@ -287,25 +275,6 @@ export class CorePluginFileDelegate {
         }
     }
 
-    /**
-     * Register a handler.
-     *
-     * @param handler The handler to register.
-     * @return True if registered successfully, false otherwise.
-     */
-    registerHandler(handler: CorePluginFileHandler): boolean {
-        if (typeof this.handlers[handler.component || handler.name] !== 'undefined') {
-            this.logger.log(`Handler '${handler.component}' already registered`);
-
-            return false;
-        }
-
-        this.logger.log(`Registered handler '${handler.component}'`);
-        this.handlers[handler.component || handler.name] = handler;
-
-        return true;
-    }
-
     /**
      * Removes the revision number from a file URL.
      *
@@ -315,7 +284,7 @@ export class CorePluginFileDelegate {
      */
     removeRevisionFromUrl(url: string, args: string[]): string {
         // Get handler based on component (args[1]).
-        const handler = this.getPluginHandler(args[1]);
+        const handler = <CorePluginFileHandler> this.getHandler(args[1], true);
 
         if (handler && handler.getComponentRevisionRegExp && handler.getComponentRevisionReplace) {
             const revisionRegex = handler.getComponentRevisionRegExp(args);
diff --git a/src/providers/utils/dom.ts b/src/providers/utils/dom.ts
index 564b889c2..6bc976dd6 100644
--- a/src/providers/utils/dom.ts
+++ b/src/providers/utils/dom.ts
@@ -22,7 +22,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { CoreTextUtilsProvider } from './text';
 import { CoreAppProvider } from '../app';
 import { CoreConfigProvider } from '../config';
-import { CorePluginFileDelegate } from '../plugin-file-delegate';
+import { CoreLoggerProvider } from '../logger';
 import { CoreUrlUtilsProvider } from './url';
 import { CoreFileProvider } from '@providers/file';
 import { CoreConstants } from '@core/constants';
@@ -62,6 +62,7 @@ export class CoreDomUtilsProvider {
     protected lastInstanceId = 0;
     protected debugDisplay = false; // Whether to display debug messages. Store it in a variable to make it synchronous.
     protected displayedAlerts = {}; // To prevent duplicated alerts.
+    protected logger;
 
     constructor(private translate: TranslateService,
             private loadingCtrl: LoadingController,
@@ -76,7 +77,9 @@ export class CoreDomUtilsProvider {
             private sanitizer: DomSanitizer,
             private popoverCtrl: PopoverController,
             private fileProvider: CoreFileProvider,
-            private pluginFileDelegate: CorePluginFileDelegate) {
+            loggerProvider: CoreLoggerProvider) {
+
+        this.logger = loggerProvider.getInstance('CoreDomUtilsProvider');
 
         // Check if debug messages should be displayed.
         configProvider.get(CoreConstants.SETTINGS_DEBUG_DISPLAY, false).then((debugDisplay) => {
@@ -260,9 +263,13 @@ export class CoreDomUtilsProvider {
      *
      * @param html HTML code.
      * @return List of file urls.
+     * @deprecated since 3.8. Use CoreFilepoolProvider.extractDownloadableFilesFromHtml instead.
      */
     extractDownloadableFilesFromHtml(html: string): string[] {
-        let urls = [];
+        this.logger.error('The function extractDownloadableFilesFromHtml has been moved to CoreFilepoolProvider.' +
+                ' Please use that function instead of this one.');
+
+        const urls = [];
         let elements;
 
         const element = this.convertToElement(html);
@@ -285,9 +292,6 @@ export class CoreDomUtilsProvider {
             }
         }
 
-        // Now get other files from plugin file handlers.
-        urls = urls.concat(this.pluginFileDelegate.getDownloadableFilesFromHTML(element));
-
         return urls;
     }
 
@@ -296,6 +300,7 @@ export class CoreDomUtilsProvider {
      *
      * @param html HTML code.
      * @return List of fake file objects with file URLs.
+     * @deprecated since 3.8. Use CoreFilepoolProvider.extractDownloadableFilesFromHtmlAsFakeFileObjects instead.
      */
     extractDownloadableFilesFromHtmlAsFakeFileObjects(html: string): any[] {
         const urls = this.extractDownloadableFilesFromHtml(html);
diff --git a/upgrade.txt b/upgrade.txt
index 6599608e6..75333c0c4 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -1,6 +1,10 @@
 This files describes API changes in the Moodle Mobile app,
 information provided here is intended especially for developers.
 
+=== 3.8.0 ===
+
+- CoreDomUtilsProvider.extractDownloadableFilesFromHtml and CoreDomUtilsProvider.extractDownloadableFilesFromHtmlAsFakeFileObjects have been deprecated. Please use CoreFilepoolProvider.extractDownloadableFilesFromHtml and CoreFilepoolProvider.extractDownloadableFilesFromHtmlAsFakeFileObjects. We had to move them to prevent a circular dependency.
+
 === 3.7.1 ===
 
 - CoreGroupsProvider.getActivityAllowedGroups and CoreGroupsProvider.getActivityAllowedGroupsIfEnabled now return the full response of core_group_get_activity_allowed_groups instead of just the groups.

From 96ccb97ed05ddc98a89766e7904dec412c9a1aa0 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 10 Dec 2019 09:08:00 +0100
Subject: [PATCH 193/257] MOBILE-3247 survey: Fix issues with last 2 questions
 in survey

This was a regression caused by MOBILE-3109
---
 src/addon/mod/survey/providers/helper.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addon/mod/survey/providers/helper.ts b/src/addon/mod/survey/providers/helper.ts
index 69807e090..dc2836b01 100644
--- a/src/addon/mod/survey/providers/helper.ts
+++ b/src/addon/mod/survey/providers/helper.ts
@@ -110,7 +110,7 @@ export class AddonModSurveyHelperProvider {
 
                     return;
                 }
-            } else if (q1.multi && q1.multi.length === 0) {
+            } else if (q1.multiArray && q1.multiArray.length === 0) {
                 // It's a single question.
                 q1.name = 'q' + q1.id;
                 q1.num = num++;

From 6e5f8319e4c1f505e7ad12238c9ce3da93b907ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 10 Dec 2019 12:13:55 +0100
Subject: [PATCH 194/257] MOBILE-3213 lang: Use a variable to determine minimum
 version

---
 scripts/langindex.json      |  2 +-
 src/assets/lang/en.json     |  5 ++---
 src/classes/site.ts         |  4 +++-
 src/core/login/lang/en.json |  3 +--
 src/lang/en.json            |  2 +-
 src/providers/sites.ts      | 19 +++++++++++--------
 src/providers/ws.ts         |  5 +++--
 7 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 2b696380e..d5a8c1769 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1620,8 +1620,8 @@
   "core.h5p.originator": "h5p",
   "core.h5p.pd": "h5p",
   "core.h5p.pddl": "h5p",
-  "core.h5p.play": "local_moodlemobileapp",
   "core.h5p.pdm": "h5p",
+  "core.h5p.play": "local_moodlemobileapp",
   "core.h5p.resizescript": "h5p",
   "core.h5p.resubmitScores": "h5p",
   "core.h5p.reuse": "h5p",
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 5a3093332..93693ba6f 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1328,7 +1328,7 @@
     "core.back": "Back",
     "core.block.blocks": "Blocks",
     "core.cancel": "Cancel",
-    "core.cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle 3.1 or later.",
+    "core.cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle {{$a}} or later.",
     "core.cannotdownloadfiles": "File downloading is disabled. Please contact your site administrator.",
     "core.captureaudio": "Record audio",
     "core.capturedimage": "Taken picture.",
@@ -1670,7 +1670,6 @@
     "core.login.changepasswordinstructions": "You cannot change your password in the app. Please click the following button to open the site in a web browser to change your password. Take into account you need to close the browser after changing the password as you will not be redirected to the app.",
     "core.login.changepasswordlogoutinstructions": "If you prefer to change site or log out, please click the following button:",
     "core.login.changepasswordreconnectinstructions": "Click the following button to reconnect to the site. (Take into account that if you didn't change your password successfully, you would return to the previous screen).",
-    "core.login.checksiteversion": "Check that your site uses Moodle 3.1 or later.",
     "core.login.confirmdeletesite": "Are you sure you want to delete the site {{sitename}}?",
     "core.login.connect": "Connect!",
     "core.login.connecttomoodle": "Connect to Moodle",
@@ -1700,7 +1699,7 @@
     "core.login.invalidaccount": "Please check your login details or ask your site administrator to check the site configuration.",
     "core.login.invaliddate": "Invalid date",
     "core.login.invalidemail": "Invalid email address",
-    "core.login.invalidmoodleversion": "<p>Invalid Moodle site version. The Moodle app only supports Moodle systems 3.1 onwards.</p>\n<p>You can contact your site administrators and ask them to update their Moodle system.</p>\n<p>\"Site Administrators\" are the people who manages the Moodle at your school/university/company or learning organisation. If you don't know how to contact them, please contact your teachers/trainers.</p>",
+    "core.login.invalidmoodleversion": "<p>Invalid Moodle site version. The Moodle app only supports Moodle systems {{$a}} onwards.</p>\n<p>You can contact your site administrators and ask them to update their Moodle system.</p>\n<p>\"Site Administrators\" are the people who manages the Moodle at your school/university/company or learning organisation. If you don't know how to contact them, please contact your teachers/trainers.</p>",
     "core.login.invalidsite": "The site URL is invalid.",
     "core.login.invalidtime": "Invalid time",
     "core.login.invalidurl": "Invalid URL specified",
diff --git a/src/classes/site.ts b/src/classes/site.ts
index 574f6be44..e7776a33c 100644
--- a/src/classes/site.ts
+++ b/src/classes/site.ts
@@ -212,6 +212,7 @@ export class CoreSite {
         3.6: 2018120300,
         3.7: 2019052000
     };
+    static MINIMUM_MOODLE_VERSION = 3.1;
 
     // Possible cache update frequencies.
     protected UPDATE_FREQUENCIES = [
@@ -657,7 +658,8 @@ export class CoreSite {
         const promise = this.getFromCache(method, data, preSets, false, originalData).catch(() => {
             if (preSets.forceOffline) {
                 // Don't call the WS, just fail.
-                return Promise.reject(this.wsProvider.createFakeWSError('core.cannotconnect', true));
+                return Promise.reject(this.wsProvider.createFakeWSError('core.cannotconnect', true,
+                    {$a: CoreSite.MINIMUM_MOODLE_VERSION}));
             }
 
             // Call the WS.
diff --git a/src/core/login/lang/en.json b/src/core/login/lang/en.json
index 0e7cbf3cf..fe816b435 100644
--- a/src/core/login/lang/en.json
+++ b/src/core/login/lang/en.json
@@ -2,7 +2,6 @@
     "auth_email": "Email-based self-registration",
     "authenticating": "Authenticating",
     "cancel": "Cancel",
-    "checksiteversion": "Check that your site uses Moodle 3.1 or later.",
     "changepassword": "Change password",
     "changepasswordbutton": "Open the change password page",
     "changepasswordhelp": "If you have problems changing your password, please contact your site administrator. \"Site Administrators\" are the people who manages the Moodle at your school/university/company or learning organisation. If you don't know how to contact them, please contact your teachers/trainers.",
@@ -38,7 +37,7 @@
     "invalidaccount": "Please check your login details or ask your site administrator to check the site configuration.",
     "invaliddate": "Invalid date",
     "invalidemail": "Invalid email address",
-    "invalidmoodleversion": "<p>Invalid Moodle site version. The Moodle app only supports Moodle systems 3.1 onwards.</p>\n<p>You can contact your site administrators and ask them to update their Moodle system.</p>\n<p>\"Site Administrators\" are the people who manages the Moodle at your school/university/company or learning organisation. If you don't know how to contact them, please contact your teachers/trainers.</p>",
+    "invalidmoodleversion": "<p>Invalid Moodle site version. The Moodle app only supports Moodle systems {{$a}} onwards.</p>\n<p>You can contact your site administrators and ask them to update their Moodle system.</p>\n<p>\"Site Administrators\" are the people who manages the Moodle at your school/university/company or learning organisation. If you don't know how to contact them, please contact your teachers/trainers.</p>",
     "invalidsite": "The site URL is invalid.",
     "invalidtime": "Invalid time",
     "invalidurl": "Invalid URL specified",
diff --git a/src/lang/en.json b/src/lang/en.json
index bb56a4a34..4701fe667 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -12,7 +12,7 @@
     "areyousure": "Are you sure?",
     "back": "Back",
     "cancel": "Cancel",
-    "cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle 3.1 or later.",
+    "cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle {{$a}} or later.",
     "cannotdownloadfiles": "File downloading is disabled. Please contact your site administrator.",
     "captureaudio": "Record audio",
     "capturedimage": "Taken picture.",
diff --git a/src/providers/sites.ts b/src/providers/sites.ts
index 857a52058..0dafd3e3c 100644
--- a/src/providers/sites.ts
+++ b/src/providers/sites.ts
@@ -371,7 +371,7 @@ export class CoreSitesProvider {
                     } else if (this.textUtils.getErrorMessageFromError(secondError)) {
                         return Promise.reject(secondError);
                     } else {
-                        return this.translate.instant('core.cannotconnect');
+                        return this.translate.instant('core.cannotconnect', {$a: CoreSite.MINIMUM_MOODLE_VERSION});
                     }
                 });
             });
@@ -463,7 +463,8 @@ export class CoreSitesProvider {
                                         error.error = this.translate.instant('core.login.sitehasredirect');
                                     } else {
                                         // We can't be sure if there is a redirect or not. Display cannot connect error.
-                                        error.error = this.translate.instant('core.cannotconnect');
+                                        error.error = this.translate.instant('core.cannotconnect',
+                                            {$a: CoreSite.MINIMUM_MOODLE_VERSION});
                                     }
 
                                     return Promise.reject(error);
@@ -508,7 +509,7 @@ export class CoreSitesProvider {
         return this.http.post(siteUrl + '/login/token.php', {}).timeout(this.wsProvider.getRequestTimeout()).toPromise()
                 .catch(() => {
             // Default error messages are kinda bad, return our own message.
-            return Promise.reject({error: this.translate.instant('core.cannotconnect')});
+            return Promise.reject({error: this.translate.instant('core.cannotconnect', {$a: CoreSite.MINIMUM_MOODLE_VERSION})});
         }).then((data: any) => {
 
             if (data.errorcode && (data.errorcode == 'enablewsdescription' || data.errorcode == 'requirecorrectaccess')) {
@@ -550,7 +551,7 @@ export class CoreSitesProvider {
 
         return promise.then((data: any): any => {
             if (typeof data == 'undefined') {
-                return Promise.reject(this.translate.instant('core.cannotconnect'));
+                return Promise.reject(this.translate.instant('core.cannotconnect', {$a: CoreSite.MINIMUM_MOODLE_VERSION}));
             } else {
                 if (typeof data.token != 'undefined') {
                     return { token: data.token, siteUrl: siteUrl, privateToken: data.privatetoken };
@@ -582,7 +583,7 @@ export class CoreSitesProvider {
                 }
             }
         }, () => {
-            return Promise.reject(this.translate.instant('core.cannotconnect'));
+            return Promise.reject(this.translate.instant('core.cannotconnect', {$a: CoreSite.MINIMUM_MOODLE_VERSION}));
         });
     }
 
@@ -676,7 +677,8 @@ export class CoreSitesProvider {
      */
     protected treatInvalidAppVersion(result: number, siteUrl: string, siteId?: string): Promise<any> {
         let errorCode,
-            errorKey;
+            errorKey,
+            translateParams;
 
         switch (result) {
             case this.MOODLE_APP:
@@ -690,6 +692,7 @@ export class CoreSitesProvider {
             default:
                 errorCode = 'invalidmoodleversion';
                 errorKey = 'core.login.invalidmoodleversion';
+                translateParams = {$a: CoreSite.MINIMUM_MOODLE_VERSION};
         }
 
         let promise;
@@ -702,7 +705,7 @@ export class CoreSitesProvider {
 
         return promise.then(() => {
            return Promise.reject({
-                error: this.translate.instant(errorKey),
+                error: this.translate.instant(errorKey, translateParams),
                 errorcode: errorCode,
                 loggedout: true
             });
@@ -757,7 +760,7 @@ export class CoreSitesProvider {
         }
 
         const version31 = 2016052300,
-            release31 = '3.1';
+            release31 = CoreSite.MINIMUM_MOODLE_VERSION;
 
         // Try to validate by version.
         if (info.version) {
diff --git a/src/providers/ws.ts b/src/providers/ws.ts
index e98455c4a..cf8aa1ef8 100644
--- a/src/providers/ws.ts
+++ b/src/providers/ws.ts
@@ -315,11 +315,12 @@ export class CoreWSProvider {
      *
      * @param message The message to include in the error.
      * @param needsTranslate If the message needs to be translated.
+     * @param translateParams Translation params, if needed.
      * @return Fake WS error.
      */
-    createFakeWSError(message: string, needsTranslate?: boolean): CoreWSError {
+    createFakeWSError(message: string, needsTranslate?: boolean, translateParams?: {}): CoreWSError {
         if (needsTranslate) {
-            message = this.translate.instant(message);
+            message = this.translate.instant(message, translateParams);
         }
 
         return {

From 49d33fb9e4cb4288a8b92591fc1bfb0b3dfbd2c9 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 10 Dec 2019 13:29:20 +0100
Subject: [PATCH 195/257] MOBILE-3213 h5p: Fix resize in h5p.org packages

---
 .../h5p-player/core-h5p-player.html           |  2 +-
 .../h5p/components/h5p-player/h5p-player.ts   | 22 +++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/core/h5p/components/h5p-player/core-h5p-player.html b/src/core/h5p/components/h5p-player/core-h5p-player.html
index 3cfd58ccb..e98b6ab63 100644
--- a/src/core/h5p/components/h5p-player/core-h5p-player.html
+++ b/src/core/h5p/components/h5p-player/core-h5p-player.html
@@ -9,5 +9,5 @@
         <core-download-refresh [status]="state" [enabled]="canDownload" [loading]="calculating" [canTrustDownload]="true" (action)="download()"></core-download-refresh>
     </div>
 </div>
-<core-iframe *ngIf="showPackage" [src]="playerSrc" iframeHeight="auto"></core-iframe>
+<core-iframe *ngIf="showPackage" [src]="playerSrc" iframeHeight="auto" (loaded)="sendHello($event)"></core-iframe>
 <script *ngIf="resizeScript && showPackage" type="text/javascript" [src]="resizeScript"></script>
diff --git a/src/core/h5p/components/h5p-player/h5p-player.ts b/src/core/h5p/components/h5p-player/h5p-player.ts
index 1166c0136..359be26cc 100644
--- a/src/core/h5p/components/h5p-player/h5p-player.ts
+++ b/src/core/h5p/components/h5p-player/h5p-player.ts
@@ -106,8 +106,6 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
 
         let promise;
 
-        this.addResizerScript();
-
         if (this.canDownload && this.fileHelper.isStateDownloaded(this.state)) {
             // Package is downloaded, use the local URL.
             promise = this.h5pProvider.getContentIndexFileUrl(this.urlParams.url, this.urlParams, this.siteId).catch(() => {
@@ -145,6 +143,7 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
                 });
             }
         }).finally(() => {
+            this.addResizerScript();
             this.loading = false;
             this.showPackage = true;
 
@@ -211,6 +210,11 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
      * Add the resizer script if it hasn't been added already.
      */
     protected addResizerScript(): void {
+        if (document.head.querySelector('#core-h5p-resizer-script') != null) {
+            // Script already added, don't add it again.
+            return;
+        }
+
         const script = document.createElement('script');
         script.id = 'core-h5p-resizer-script';
         script.type = 'text/javascript';
@@ -264,6 +268,20 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
         });
     }
 
+    /**
+     * Send hello to the H5P iframe.
+     *
+     * @param iframe The iframe.
+     */
+    sendHello(iframe?: HTMLIFrameElement): void {
+        const ready = {
+            context: 'h5p',
+            action: 'ready'
+        };
+
+        iframe.contentWindow.postMessage(ready, '*');
+    }
+
     /**
      * Component destroyed.
      */

From 0824045e9af4face19b09a36acf1a141adf0dc63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 10 Dec 2019 15:11:20 +0100
Subject: [PATCH 196/257] MOBILE-3213 lang: Fix minimum version type

---
 src/classes/site.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/classes/site.ts b/src/classes/site.ts
index e7776a33c..845a9496f 100644
--- a/src/classes/site.ts
+++ b/src/classes/site.ts
@@ -212,7 +212,7 @@ export class CoreSite {
         3.6: 2018120300,
         3.7: 2019052000
     };
-    static MINIMUM_MOODLE_VERSION = 3.1;
+    static MINIMUM_MOODLE_VERSION = '3.1';
 
     // Possible cache update frequencies.
     protected UPDATE_FREQUENCIES = [

From b427c8a52aa6b52461e8cdc692cf610215009b9a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 10 Dec 2019 16:20:06 +0100
Subject: [PATCH 197/257] MOBILE-3213 h5p: Support fullscreen in H5P iframe

---
 config.xml                                              | 7 -------
 src/components/iframe/core-iframe.html                  | 2 +-
 src/components/iframe/iframe.ts                         | 4 ++++
 src/core/h5p/components/h5p-player/core-h5p-player.html | 2 +-
 src/core/h5p/components/h5p-player/h5p-player.scss      | 2 +-
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/config.xml b/config.xml
index d7439c757..89d2f5b5e 100644
--- a/config.xml
+++ b/config.xml
@@ -79,18 +79,11 @@
         <icon background="@color/background" density="xhdpi" foreground="resources/android/icon/xhdpi-foreground.png" src="resources/android/icon/drawable-xhdpi-icon.png" />
         <icon background="@color/background" density="xxhdpi" foreground="resources/android/icon/xxhdpi-foreground.png" src="resources/android/icon/drawable-xxhdpi-icon.png" />
         <icon background="@color/background" density="xxxhdpi" foreground="resources/android/icon/xxxhdpi-foreground.png" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
-
-        <!--
-            This should be added by the file-opener2 plugin, but it's not working at the moment. This can be removed
-            once the following issue is resolved and the plugin is updated to include the fix:
-            https://github.com/pwlin/cordova-plugin-file-opener2/issues/246
-        -->
         <config-file parent="/manifest/application" target="AndroidManifest.xml">
             <provider android:authorities="${applicationId}.opener.provider" android:exported="false" android:grantUriPermissions="true" android:name="io.github.pwlin.cordova.plugins.fileopener2.FileProvider">
                 <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/opener_paths" />
             </provider>
         </config-file>
-
     </platform>
     <platform name="ios">
         <resource-file src="GoogleService-Info.plist" />
diff --git a/src/components/iframe/core-iframe.html b/src/components/iframe/core-iframe.html
index 7bdeac425..9e5f98ae6 100644
--- a/src/components/iframe/core-iframe.html
+++ b/src/components/iframe/core-iframe.html
@@ -1,5 +1,5 @@
 <div [class.core-loading-container]="loading" [ngStyle]="{'width': iframeWidth, 'height': iframeHeight}">
-    <iframe #iframe [hidden]="loading" class="core-iframe" [ngStyle]="{'width': iframeWidth, 'height': iframeHeight}" [src]="safeUrl"></iframe>
+    <iframe #iframe [hidden]="loading" class="core-iframe" [ngStyle]="{'width': iframeWidth, 'height': iframeHeight}" [src]="safeUrl" [attr.allowfullscreen]="allowFullscreen ? 'allowfullscreen' : null"></iframe>
     <span class="core-loading-spinner">
         <ion-spinner *ngIf="loading"></ion-spinner>
     </span>
diff --git a/src/components/iframe/iframe.ts b/src/components/iframe/iframe.ts
index f6517fde6..516012a8f 100644
--- a/src/components/iframe/iframe.ts
+++ b/src/components/iframe/iframe.ts
@@ -21,6 +21,7 @@ import { CoreLoggerProvider } from '@providers/logger';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreUrlUtilsProvider } from '@providers/utils/url';
 import { CoreIframeUtilsProvider } from '@providers/utils/iframe';
+import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 
 @Component({
@@ -33,6 +34,7 @@ export class CoreIframeComponent implements OnInit, OnChanges {
     @Input() src: string;
     @Input() iframeWidth: string;
     @Input() iframeHeight: string;
+    @Input() allowFullscreen: boolean | string;
     @Output() loaded?: EventEmitter<HTMLIFrameElement> = new EventEmitter<HTMLIFrameElement>();
     loading: boolean;
     safeUrl: SafeResourceUrl;
@@ -46,6 +48,7 @@ export class CoreIframeComponent implements OnInit, OnChanges {
             protected sanitizer: DomSanitizer,
             protected navCtrl: NavController,
             protected urlUtils: CoreUrlUtilsProvider,
+            protected utils: CoreUtilsProvider,
             @Optional() protected svComponent: CoreSplitViewComponent) {
 
         this.logger = logger.getInstance('CoreIframe');
@@ -60,6 +63,7 @@ export class CoreIframeComponent implements OnInit, OnChanges {
 
         this.iframeWidth = this.domUtils.formatPixelsSize(this.iframeWidth) || '100%';
         this.iframeHeight = this.domUtils.formatPixelsSize(this.iframeHeight) || '100%';
+        this.allowFullscreen = this.utils.isTrueOrOne(this.allowFullscreen);
 
         // Show loading only with external URLs.
         this.loading = !this.src || !!this.src.match(/^https?:\/\//i);
diff --git a/src/core/h5p/components/h5p-player/core-h5p-player.html b/src/core/h5p/components/h5p-player/core-h5p-player.html
index e98b6ab63..22981316f 100644
--- a/src/core/h5p/components/h5p-player/core-h5p-player.html
+++ b/src/core/h5p/components/h5p-player/core-h5p-player.html
@@ -9,5 +9,5 @@
         <core-download-refresh [status]="state" [enabled]="canDownload" [loading]="calculating" [canTrustDownload]="true" (action)="download()"></core-download-refresh>
     </div>
 </div>
-<core-iframe *ngIf="showPackage" [src]="playerSrc" iframeHeight="auto" (loaded)="sendHello($event)"></core-iframe>
+<core-iframe *ngIf="showPackage" [src]="playerSrc" iframeHeight="auto" [allowFullscreen]="true" (loaded)="sendHello($event)"></core-iframe>
 <script *ngIf="resizeScript && showPackage" type="text/javascript" [src]="resizeScript"></script>
diff --git a/src/core/h5p/components/h5p-player/h5p-player.scss b/src/core/h5p/components/h5p-player/h5p-player.scss
index 8a4875ac9..e4ccc242d 100644
--- a/src/core/h5p/components/h5p-player/h5p-player.scss
+++ b/src/core/h5p/components/h5p-player/h5p-player.scss
@@ -10,7 +10,7 @@ ion-app.app-root core-h5p-player {
         background: url('../assets/img/icons/h5p.svg') center top 25px / 100px auto no-repeat $core-h5p-placeholder-bg-color;
         color: $core-h5p-placeholder-text-color;
 
-        .icon {
+        .icon:not([color="success"]) {
             color: $core-h5p-placeholder-text-color;
         }
 

From 2846e6838a9abd6c14c4fbb662ba732b8c0e9eb1 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 10 Dec 2019 17:06:04 +0100
Subject: [PATCH 198/257] MOBILE-2159 geolocation: Improve error message when
 permission is denied

---
 src/addon/mod/data/fields/latlong/component/latlong.ts | 10 ++++++++++
 src/addon/mod/data/lang/en.json                        |  1 +
 src/assets/lang/en.json                                |  1 +
 3 files changed, 12 insertions(+)

diff --git a/src/addon/mod/data/fields/latlong/component/latlong.ts b/src/addon/mod/data/fields/latlong/component/latlong.ts
index 767487e9d..013c4586e 100644
--- a/src/addon/mod/data/fields/latlong/component/latlong.ts
+++ b/src/addon/mod/data/fields/latlong/component/latlong.ts
@@ -117,9 +117,19 @@ export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginCo
             this.form.controls['f_' + this.field.id + '_0'].setValue(result.coords.latitude);
             this.form.controls['f_' + this.field.id + '_1'].setValue(result.coords.longitude);
         }).catch((error) => {
+            if (this.isPositionError(error) && error.code === error.PERMISSION_DENIED) {
+                this.domUtils.showErrorModal('addon.mod_data.locationpermissiondenied', true);
+
+                return;
+            }
+
             this.domUtils.showErrorModalDefault(error,  'Error getting location');
         }).finally(() => {
             modal.dismiss();
         });
     }
+
+    protected isPositionError(error?: any): error is PositionError {
+        return error && 'code' in error && 'PERMISSION_DENIED' in error;
+    }
 }
diff --git a/src/addon/mod/data/lang/en.json b/src/addon/mod/data/lang/en.json
index 54de61215..de89c6bca 100644
--- a/src/addon/mod/data/lang/en.json
+++ b/src/addon/mod/data/lang/en.json
@@ -22,6 +22,7 @@
     "foundrecords": "Found records: {{$a.num}}/{{$a.max}} (<a href=\"{{$a.reseturl}}\">Reset filters</a>)",
     "gettinglocation": "Getting location",
     "latlongboth": "Both latitude and longitude are required.",
+    "locationpermissiondenied": "Permission to access your location has been denied.",
     "menuchoose": "Choose...",
     "modulenameplural": "Databases",
     "more": "More",
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 93693ba6f..e0fb0fd71 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -501,6 +501,7 @@
     "addon.mod_data.foundrecords": "Found records: {{$a.num}}/{{$a.max}} (<a href=\"{{$a.reseturl}}\">Reset filters</a>)",
     "addon.mod_data.gettinglocation": "Getting location",
     "addon.mod_data.latlongboth": "Both latitude and longitude are required.",
+    "addon.mod_data.locationpermissiondenied": "Permission to access your location has been denied.",
     "addon.mod_data.menuchoose": "Choose...",
     "addon.mod_data.modulenameplural": "Databases",
     "addon.mod_data.more": "More",

From 74362d2abab22e9799a8dd31db140c4f0728a534 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 10 Dec 2019 17:23:26 +0100
Subject: [PATCH 199/257] MOBILE-2159 geolocation: Add new message key to
 langindex.json

---
 scripts/langindex.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index d5a8c1769..5200cc6d6 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -502,6 +502,7 @@
   "addon.mod_data.foundrecords": "data",
   "addon.mod_data.gettinglocation": "local_moodlemobileapp",
   "addon.mod_data.latlongboth": "data",
+  "addon.mod_data.locationpermissiondenied": "local_moodlemobileapp",
   "addon.mod_data.menuchoose": "data",
   "addon.mod_data.modulenameplural": "data",
   "addon.mod_data.more": "data",

From 8d30c0be97e6d205bba14764217441ce1234b95d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 11 Dec 2019 08:21:20 +0100
Subject: [PATCH 200/257] MOBILE-3213 core: Run script that removes types from
 JSDoc

---
 .../block/myoverview/components/myoverview/myoverview.ts    | 2 +-
 src/addon/calendar/pages/list/list.ts                       | 2 --
 src/addon/mod/data/fields/latlong/component/latlong.ts      | 2 +-
 src/addon/mod/forum/providers/forum.ts                      | 2 +-
 src/classes/site.ts                                         | 2 +-
 src/core/course/providers/helper.ts                         | 2 +-
 src/core/filter/providers/default-filter.ts                 | 2 +-
 src/core/filter/providers/delegate.ts                       | 2 +-
 src/core/h5p/classes/content-validator.ts                   | 4 ++--
 src/core/h5p/providers/pluginfile-handler.ts                | 2 +-
 src/providers/app.ts                                        | 2 +-
 src/providers/plugin-file-delegate.ts                       | 2 +-
 src/providers/utils/text.ts                                 | 6 +++---
 13 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/addon/block/myoverview/components/myoverview/myoverview.ts b/src/addon/block/myoverview/components/myoverview/myoverview.ts
index 26c82500a..b6f062542 100644
--- a/src/addon/block/myoverview/components/myoverview/myoverview.ts
+++ b/src/addon/block/myoverview/components/myoverview/myoverview.ts
@@ -327,7 +327,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem
     /**
      * Set selected courses filter.
      *
-     * @param {string} filter Filter name to set.
+     * @param filter Filter name to set.
      */
     protected setCourseFilter(filter: string): void {
         this.selectedFilter = filter;
diff --git a/src/addon/calendar/pages/list/list.ts b/src/addon/calendar/pages/list/list.ts
index a9857a2cf..250c9054b 100644
--- a/src/addon/calendar/pages/list/list.ts
+++ b/src/addon/calendar/pages/list/list.ts
@@ -437,8 +437,6 @@ export class AddonCalendarListPage implements OnDestroy {
         });
     }
 
-    /**
-     */
     protected filterEvents(): void {
         this.filteredEvents = this.calendarHelper.getFilteredEvents(this.events, this.filter, this.categories);
     }
diff --git a/src/addon/mod/data/fields/latlong/component/latlong.ts b/src/addon/mod/data/fields/latlong/component/latlong.ts
index 767487e9d..2e154961e 100644
--- a/src/addon/mod/data/fields/latlong/component/latlong.ts
+++ b/src/addon/mod/data/fields/latlong/component/latlong.ts
@@ -101,7 +101,7 @@ export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginCo
     /**
      * Get user location.
      *
-     * @param {Event} $event The event.
+     * @param $event The event.
      */
     getLocation(event: Event): void {
         event.preventDefault();
diff --git a/src/addon/mod/forum/providers/forum.ts b/src/addon/mod/forum/providers/forum.ts
index 2b354bfb8..a852c2aec 100644
--- a/src/addon/mod/forum/providers/forum.ts
+++ b/src/addon/mod/forum/providers/forum.ts
@@ -600,7 +600,7 @@ export class AddonModForumProvider {
      * @param siteId Site ID. If not defined, current site.
      * @return Promise resolved with an object with:
      *         - discussions: List of discussions. Note that for every discussion in the list discussion.id is the main post ID but
-     *             discussion ID is discussion.discussion.
+     *         discussion ID is discussion.discussion.
      *         - canLoadMore: True if there may be more discussions to load.
      */
     getDiscussions(forumId: number, sortOrder?: number, page: number = 0, forceCache?: boolean, siteId?: string): Promise<any> {
diff --git a/src/classes/site.ts b/src/classes/site.ts
index 574f6be44..5d738185b 100644
--- a/src/classes/site.ts
+++ b/src/classes/site.ts
@@ -1903,7 +1903,7 @@ export class CoreSite {
      * Get a certain cache expiration delay.
      *
      * @param updateFrequency The update frequency of the entry.
-     * @return {number} Expiration delay.
+     * @return Expiration delay.
      */
     getExpirationDelay(updateFrequency?: number): number {
         let expirationDelay = this.UPDATE_FREQUENCIES[updateFrequency] || this.UPDATE_FREQUENCIES[CoreSite.FREQUENCY_USUALLY];
diff --git a/src/core/course/providers/helper.ts b/src/core/course/providers/helper.ts
index 0501ba682..ffbc281b5 100644
--- a/src/core/course/providers/helper.ts
+++ b/src/core/course/providers/helper.ts
@@ -1127,7 +1127,7 @@ export class CoreCourseHelperProvider {
      * @param courseId Course ID. If not defined we'll try to retrieve it from the site.
      * @param sectionId Section the module belongs to. If not defined we'll try to retrieve it from the site.
      * @param useModNameToGetModule If true, the app will retrieve all modules of this type with a single WS call. This reduces the
-     *                number of WS calls, but it isn't recommended for modules that can return a lot of contents.
+     *                              number of WS calls, but it isn't recommended for modules that can return a lot of contents.
      * @param modParams Params to pass to the module
      * @param navCtrl NavController for adding new pages to the current history. Optional for legacy support, but
      *                generates a warning if omitted.
diff --git a/src/core/filter/providers/default-filter.ts b/src/core/filter/providers/default-filter.ts
index f5f307500..aec2580e1 100644
--- a/src/core/filter/providers/default-filter.ts
+++ b/src/core/filter/providers/default-filter.ts
@@ -65,7 +65,7 @@ export class CoreFilterDefaultHandler implements CoreFilterHandler {
     /**
      * Whether or not the handler is enabled on a site level.
      *
-     * @return {boolean|Promise<boolean>} Whether or not the handler is enabled on a site level.
+     * @return Whether or not the handler is enabled on a site level.
      */
     isEnabled(): boolean | Promise<boolean> {
         return true;
diff --git a/src/core/filter/providers/delegate.ts b/src/core/filter/providers/delegate.ts
index 642a454ca..fef46c423 100644
--- a/src/core/filter/providers/delegate.ts
+++ b/src/core/filter/providers/delegate.ts
@@ -236,7 +236,7 @@ export class CoreFilterDelegate extends CoreDelegate {
      * @param filter Filter to check.
      * @param options Options passed to the filters.
      * @param site Site. If not defined, current site.
-     * @return {Promise<boolean>} Promise resolved with true: whether the filter should be applied.
+     * @return Promise resolved with true: whether the filter should be applied.
      */
     shouldBeApplied(filters: CoreFilterFilter[], options: CoreFilterFormatTextOptions, site?: CoreSite): Promise<boolean> {
         // Wait for filters to be initialized.
diff --git a/src/core/h5p/classes/content-validator.ts b/src/core/h5p/classes/content-validator.ts
index 18ae59dc3..3d4baac9f 100644
--- a/src/core/h5p/classes/content-validator.ts
+++ b/src/core/h5p/classes/content-validator.ts
@@ -681,8 +681,8 @@ export class CoreH5PContentValidator {
      * Processes an HTML tag.
      *
      * @param m An array with various meaning depending on the value of store.
-     *   If store is TRUE then the array contains the allowed tags.
-     *   If store is FALSE then the array has one element, the HTML tag to process.
+     *          If store is TRUE then the array contains the allowed tags.
+     *          If store is FALSE then the array has one element, the HTML tag to process.
      * @param store Whether to store m.
      * @return string If the element isn't allowed, an empty string. Otherwise, the cleaned up version of the HTML element.
      */
diff --git a/src/core/h5p/providers/pluginfile-handler.ts b/src/core/h5p/providers/pluginfile-handler.ts
index 13657fc2d..3a38e6381 100644
--- a/src/core/h5p/providers/pluginfile-handler.ts
+++ b/src/core/h5p/providers/pluginfile-handler.ts
@@ -66,7 +66,7 @@ export class CoreH5PPluginFileHandler implements CorePluginFileHandler {
      * CoreFilepoolProvider.extractDownloadableFilesFromHtml.
      *
      * @param container Container where to get the URLs from.
-     * @return {string[]} List of URLs.
+     * @return List of URLs.
      */
     getDownloadableFilesFromHTML(container: HTMLElement): string[] {
         const iframes = <HTMLIFrameElement[]> Array.from(container.querySelectorAll('iframe.h5p-iframe'));
diff --git a/src/providers/app.ts b/src/providers/app.ts
index 7aa6a6a70..f2071b076 100644
--- a/src/providers/app.ts
+++ b/src/providers/app.ts
@@ -164,7 +164,7 @@ export class CoreAppProvider {
     /**
      * Returns whether the user agent is controlled by automation. I.e. Behat testing.
      *
-     * @return {boolean} True if the user agent is controlled by automation, false otherwise.
+     * @return True if the user agent is controlled by automation, false otherwise.
      */
     static isAutomated(): boolean {
         return !!navigator.webdriver;
diff --git a/src/providers/plugin-file-delegate.ts b/src/providers/plugin-file-delegate.ts
index 17354d4b5..469518698 100644
--- a/src/providers/plugin-file-delegate.ts
+++ b/src/providers/plugin-file-delegate.ts
@@ -71,7 +71,7 @@ export interface CorePluginFileHandler extends CoreDelegateHandler {
      * CoreFilepoolProvider.extractDownloadableFilesFromHtml.
      *
      * @param container Container where to get the URLs from.
-     * @return {string[]} List of URLs.
+     * @return List of URLs.
      */
     getDownloadableFilesFromHTML?(container: HTMLElement): string[];
 
diff --git a/src/providers/utils/text.ts b/src/providers/utils/text.ts
index 0a858127e..d4826c942 100644
--- a/src/providers/utils/text.ts
+++ b/src/providers/utils/text.ts
@@ -78,8 +78,8 @@ export class CoreTextUtilsProvider {
     /**
      * Add ending slash from a path or URL.
      *
-     * @param {string} text Text to treat.
-     * @return {string} Treated text.
+     * @param text Text to treat.
+     * @return Treated text.
      */
     addEndingSlash(text: string): string {
         if (!text) {
@@ -742,7 +742,7 @@ export class CoreTextUtilsProvider {
      * @param replace The value to put inside the string.
      * @param start The index where to start putting the new string. If negative, it will count from the end of the string.
      * @param length Length of the portion of string which is to be replaced. If negative, it represents the number of characters
-     *                      from the end of string at which to stop replacing. If not provided, replace until the end of the string.
+     *               from the end of string at which to stop replacing. If not provided, replace until the end of the string.
      * @return Treated string.
      */
     substrReplace(str: string, replace: string, start: number, length?: number): string {

From f675a790ea6b958df223869a6a7f343515a03cd6 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 11 Dec 2019 08:52:38 +0100
Subject: [PATCH 201/257] MOBILE-3213 core: Lock plugin and libraries versions

---
 config.xml        |  44 ++++++------
 package-lock.json | 176 +++++++++++++--------------------------------
 package.json      | 178 +++++++++++++++++++++++-----------------------
 3 files changed, 161 insertions(+), 237 deletions(-)

diff --git a/config.xml b/config.xml
index 89d2f5b5e..5c29845ee 100644
--- a/config.xml
+++ b/config.xml
@@ -141,36 +141,36 @@
         <splash height="2436" src="resources/ios/splash/Default-2436h.png" width="1125" />
         <splash height="1125" src="resources/ios/splash/Default-Landscape-2436h.png" width="2436" />
     </platform>
-    <plugin name="com-darryncampbell-cordova-plugin-intent" spec="^1.1.8" />
-    <plugin name="cordova-android-support-gradle-release" spec="^3.0.1">
+    <plugin name="com-darryncampbell-cordova-plugin-intent" spec="1.3.0" />
+    <plugin name="cordova-android-support-gradle-release" spec="3.0.1">
         <variable name="ANDROID_SUPPORT_VERSION" value="27.1.0" />
     </plugin>
-    <plugin name="cordova-clipboard" spec="^1.3.0" />
-    <plugin name="cordova-plugin-badge" spec="^0.8.8" />
-    <plugin name="cordova-plugin-camera" spec="^4.1.0" />
-    <plugin name="cordova-plugin-customurlscheme" spec="^4.4.0">
+    <plugin name="cordova-clipboard" spec="1.3.0" />
+    <plugin name="cordova-plugin-badge" spec="0.8.8" />
+    <plugin name="cordova-plugin-camera" spec="4.1.0" />
+    <plugin name="cordova-plugin-customurlscheme" spec="4.4.0">
         <variable name="URL_SCHEME" value="moodlemobile" />
     </plugin>
-    <plugin name="cordova-plugin-device" spec="^2.0.3" />
-    <plugin name="cordova-plugin-file" spec="^6.0.2" />
+    <plugin name="cordova-plugin-device" spec="2.0.3" />
+    <plugin name="cordova-plugin-file" spec="6.0.2" />
     <plugin name="cordova-plugin-file-opener2" spec="2.2.1" />
-    <plugin name="cordova-plugin-file-transfer" spec="^1.7.1" />
-    <plugin name="cordova-plugin-geolocation" spec="^4.0.2">
+    <plugin name="cordova-plugin-file-transfer" spec="1.7.1" />
+    <plugin name="cordova-plugin-geolocation" spec="4.0.2">
         <variable name="GEOLOCATION_USAGE_DESCRIPTION" value="We need your location so you can attach it as part of your submissions." />
     </plugin>
-    <plugin name="cordova-plugin-globalization" spec="^1.11.0" />
-    <plugin name="cordova-plugin-inappbrowser" spec="^3.1.0" />
-    <plugin name="cordova-plugin-ionic-keyboard" spec="^2.1.3" />
+    <plugin name="cordova-plugin-globalization" spec="1.11.0" />
+    <plugin name="cordova-plugin-inappbrowser" spec="3.1.0" />
+    <plugin name="cordova-plugin-ionic-keyboard" spec="2.2.0" />
     <plugin name="cordova-plugin-local-notification" spec="https://github.com/moodlemobile/cordova-plugin-local-notification.git#moodle" />
-    <plugin name="cordova-plugin-media-capture" spec="^3.0.3" />
-    <plugin name="cordova-plugin-network-information" spec="^2.0.2" />
-    <plugin name="cordova-plugin-screen-orientation" spec="^3.0.2" />
-    <plugin name="cordova-plugin-splashscreen" spec="^5.0.3" />
-    <plugin name="cordova-plugin-statusbar" spec="^2.4.3" />
-    <plugin name="cordova-plugin-whitelist" spec="^1.3.4" />
-    <plugin name="cordova-plugin-zip" spec="^3.1.0" />
-    <plugin name="cordova-sqlite-storage" spec="^3.4.0" />
-    <plugin name="nl.kingsquare.cordova.background-audio" spec="^1.0.1" />
+    <plugin name="cordova-plugin-media-capture" spec="3.0.3" />
+    <plugin name="cordova-plugin-network-information" spec="2.0.2" />
+    <plugin name="cordova-plugin-screen-orientation" spec="3.0.2" />
+    <plugin name="cordova-plugin-splashscreen" spec="5.0.3" />
+    <plugin name="cordova-plugin-statusbar" spec="2.4.3" />
+    <plugin name="cordova-plugin-whitelist" spec="1.3.4" />
+    <plugin name="cordova-plugin-zip" spec="3.1.0" />
+    <plugin name="cordova-sqlite-storage" spec="3.4.0" />
+    <plugin name="nl.kingsquare.cordova.background-audio" spec="1.0.1" />
     <plugin name="phonegap-plugin-push" spec="https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v3">
         <variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
         <variable name="FCM_VERSION" value="17.5.+" />
diff --git a/package-lock.json b/package-lock.json
index 2b45e89dd..3c9f1767d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -503,8 +503,7 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -525,14 +524,12 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -547,20 +544,17 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -677,8 +671,7 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "ini": {
               "version": "1.3.5",
@@ -690,7 +683,6 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -705,7 +697,6 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -713,14 +704,12 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -739,7 +728,6 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -820,8 +808,7 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -833,7 +820,6 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -919,8 +905,7 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -956,7 +941,6 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -976,7 +960,6 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -1020,14 +1003,12 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         },
@@ -2650,9 +2631,9 @@
       "dev": true
     },
     "com-darryncampbell-cordova-plugin-intent": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/com-darryncampbell-cordova-plugin-intent/-/com-darryncampbell-cordova-plugin-intent-1.1.7.tgz",
-      "integrity": "sha512-e+CIaOTpZ7r178tmCijZcm/o5nJIWVnQaUrwm5xwX1zc5zutVCtz1oH3xqq6gzNk05C9i7n96xdenODHMYpiMw=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/com-darryncampbell-cordova-plugin-intent/-/com-darryncampbell-cordova-plugin-intent-1.3.0.tgz",
+      "integrity": "sha512-JXslndd4UiRHmirGZrwrHZHczoZ5sxM7zAylm4bPX7ZDwD4FdCHhILgDA8AeaG8wc11e0A7OEAFo0Esgc0M4yA=="
     },
     "combined-stream": {
       "version": "1.0.6",
@@ -3176,9 +3157,9 @@
       "integrity": "sha512-YqrZfYgbGTS20SFID0mrRxud312VH072QVlFonCAkPgtGg1Svy7lELOCNFd+KU7t4mVtZeTEjZPEeefvjaetwQ=="
     },
     "cordova-plugin-ionic-keyboard": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.1.3.tgz",
-      "integrity": "sha512-6ucQ6FdlLdBm8kJfFnzozmBTjru/0xekHP/dAhjoCZggkGRlgs8TsUJFkxa/bV+qi7Dlo50JjmpE4UMWAO+aOQ=="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.2.0.tgz",
+      "integrity": "sha512-yDUG+9ieKVRitq5mGlNxjaZh/MgEhFFIgTIPhqSbUaQ8UuZbawy5mhJAVClqY97q8/rcQtL6dCDa7x2sEtCLcA=="
     },
     "cordova-plugin-local-notification": {
       "version": "git+https://github.com/moodlemobile/cordova-plugin-local-notification.git#c7430c4f4f8b8c82d051aea49d87da0b4f6a8b1e",
@@ -5243,8 +5224,7 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5262,13 +5242,11 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5281,18 +5259,15 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5395,8 +5370,7 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5406,7 +5380,6 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5419,20 +5392,17 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5449,7 +5419,6 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5528,8 +5497,7 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5539,7 +5507,6 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5615,8 +5582,7 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5646,7 +5612,6 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5664,7 +5629,6 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5703,13 +5667,11 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         }
       }
     },
@@ -6136,8 +6098,7 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -6158,14 +6119,12 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -6180,20 +6139,17 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -6310,8 +6266,7 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "ini": {
               "version": "1.3.5",
@@ -6323,7 +6278,6 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -6338,7 +6292,6 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -6346,14 +6299,12 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -6372,7 +6323,6 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -6453,8 +6403,7 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -6466,7 +6415,6 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -6552,8 +6500,7 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -6589,7 +6536,6 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -6609,7 +6555,6 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -6653,14 +6598,12 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         },
@@ -12926,8 +12869,7 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -12948,14 +12890,12 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -12970,20 +12910,17 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -13100,8 +13037,7 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "ini": {
               "version": "1.3.5",
@@ -13113,7 +13049,6 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -13128,7 +13063,6 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -13136,14 +13070,12 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -13162,7 +13094,6 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -13243,8 +13174,7 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -13256,7 +13186,6 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -13342,8 +13271,7 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -13379,7 +13307,6 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -13399,7 +13326,6 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -13443,14 +13369,12 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         },
diff --git a/package.json b/package.json
index 8544d10eb..3d9213173 100644
--- a/package.json
+++ b/package.json
@@ -40,106 +40,106 @@
     "windows.store": "npx electron-windows-store --input-directory .\\desktop\\dist\\win-unpacked --output-directory .\\desktop\\store -a .\\resources\\desktop -m .\\desktop\\assets\\windows\\AppXManifest.xml --package-version 0.0.0.0 --package-name MoodleDesktop"
   },
   "dependencies": {
-    "@angular/animations": "^5.2.10",
-    "@angular/common": "^5.2.10",
-    "@angular/compiler": "^5.2.10",
-    "@angular/compiler-cli": "^5.2.10",
-    "@angular/core": "^5.2.10",
-    "@angular/forms": "^5.2.10",
-    "@angular/http": "^5.2.10",
-    "@angular/platform-browser": "^5.2.10",
-    "@angular/platform-browser-dynamic": "^5.2.10",
-    "@ionic-native/badge": "^4.17.0",
-    "@ionic-native/camera": "^4.17.0",
-    "@ionic-native/clipboard": "^4.17.0",
-    "@ionic-native/core": "^4.11.0",
-    "@ionic-native/device": "^4.17.0",
-    "@ionic-native/file": "^4.17.0",
-    "@ionic-native/file-opener": "^4.17.0",
-    "@ionic-native/file-transfer": "^4.17.0",
+    "@angular/animations": "5.2.10",
+    "@angular/common": "5.2.10",
+    "@angular/compiler": "5.2.10",
+    "@angular/compiler-cli": "5.2.10",
+    "@angular/core": "5.2.10",
+    "@angular/forms": "5.2.10",
+    "@angular/http": "5.2.10",
+    "@angular/platform-browser": "5.2.10",
+    "@angular/platform-browser-dynamic": "5.2.10",
+    "@ionic-native/badge": "4.17.0",
+    "@ionic-native/camera": "4.17.0",
+    "@ionic-native/clipboard": "4.17.0",
+    "@ionic-native/core": "4.11.0",
+    "@ionic-native/device": "4.17.0",
+    "@ionic-native/file": "4.17.0",
+    "@ionic-native/file-opener": "4.17.0",
+    "@ionic-native/file-transfer": "4.17.0",
     "@ionic-native/geolocation": "4.17.0",
-    "@ionic-native/globalization": "^4.17.0",
-    "@ionic-native/in-app-browser": "^4.17.0",
-    "@ionic-native/keyboard": "^4.17.0",
-    "@ionic-native/local-notifications": "^4.17.0",
-    "@ionic-native/media-capture": "^4.17.0",
-    "@ionic-native/network": "^4.17.0",
-    "@ionic-native/push": "^4.17.0",
-    "@ionic-native/screen-orientation": "^4.17.0",
-    "@ionic-native/splash-screen": "^4.17.0",
-    "@ionic-native/sqlite": "^4.17.0",
-    "@ionic-native/status-bar": "^4.17.0",
-    "@ionic-native/web-intent": "^4.17.0",
-    "@ionic-native/zip": "^4.17.0",
-    "@ngx-translate/core": "^8.0.0",
-    "@ngx-translate/http-loader": "^2.0.1",
-    "@types/cordova": "^0.0.34",
-    "@types/cordova-plugin-file-transfer": "^0.0.3",
-    "@types/cordova-plugin-globalization": "^0.0.3",
-    "@types/cordova-plugin-network-information": "^0.0.3",
-    "@types/node": "^8.10.19",
-    "@types/promise.prototype.finally": "^2.0.2",
-    "ajv": "^6.10.2",
-    "chart.js": "^2.7.2",
-    "com-darryncampbell-cordova-plugin-intent": "^1.1.7",
+    "@ionic-native/globalization": "4.17.0",
+    "@ionic-native/in-app-browser": "4.17.0",
+    "@ionic-native/keyboard": "4.17.0",
+    "@ionic-native/local-notifications": "4.17.0",
+    "@ionic-native/media-capture": "4.17.0",
+    "@ionic-native/network": "4.17.0",
+    "@ionic-native/push": "4.17.0",
+    "@ionic-native/screen-orientation": "4.17.0",
+    "@ionic-native/splash-screen": "4.17.0",
+    "@ionic-native/sqlite": "4.17.0",
+    "@ionic-native/status-bar": "4.17.0",
+    "@ionic-native/web-intent": "4.17.0",
+    "@ionic-native/zip": "4.17.0",
+    "@ngx-translate/core": "8.0.0",
+    "@ngx-translate/http-loader": "2.0.1",
+    "@types/cordova": "0.0.34",
+    "@types/cordova-plugin-file-transfer": "0.0.3",
+    "@types/cordova-plugin-globalization": "0.0.3",
+    "@types/cordova-plugin-network-information": "0.0.3",
+    "@types/node": "8.10.19",
+    "@types/promise.prototype.finally": "2.0.2",
+    "ajv": "6.10.2",
+    "chart.js": "2.7.2",
+    "com-darryncampbell-cordova-plugin-intent": "1.3.0",
     "cordova": "9.0.0",
     "cordova-android": "8.0.0",
-    "cordova-android-support-gradle-release": "^3.0.1",
-    "cordova-clipboard": "^1.3.0",
+    "cordova-android-support-gradle-release": "3.0.1",
+    "cordova-clipboard": "1.3.0",
     "cordova-ios": "5.0.1",
-    "cordova-plugin-badge": "^0.8.8",
-    "cordova-plugin-camera": "^4.1.0",
-    "cordova-plugin-customurlscheme": "^4.4.0",
-    "cordova-plugin-device": "^2.0.3",
-    "cordova-plugin-file": "^6.0.2",
-    "cordova-plugin-file-opener2": "^2.2.1",
-    "cordova-plugin-file-transfer": "^1.7.1",
-    "cordova-plugin-geolocation": "^4.0.2",
-    "cordova-plugin-globalization": "^1.11.0",
-    "cordova-plugin-inappbrowser": "^3.1.0",
-    "cordova-plugin-ionic-keyboard": "^2.1.3",
+    "cordova-plugin-badge": "0.8.8",
+    "cordova-plugin-camera": "4.1.0",
+    "cordova-plugin-customurlscheme": "4.4.0",
+    "cordova-plugin-device": "2.0.3",
+    "cordova-plugin-file": "6.0.2",
+    "cordova-plugin-file-opener2": "2.2.1",
+    "cordova-plugin-file-transfer": "1.7.1",
+    "cordova-plugin-geolocation": "4.0.2",
+    "cordova-plugin-globalization": "1.11.0",
+    "cordova-plugin-inappbrowser": "3.1.0",
+    "cordova-plugin-ionic-keyboard": "2.2.0",
     "cordova-plugin-local-notification": "git+https://github.com/moodlemobile/cordova-plugin-local-notification.git#moodle",
-    "cordova-plugin-media-capture": "^3.0.3",
-    "cordova-plugin-network-information": "^2.0.2",
-    "cordova-plugin-screen-orientation": "^3.0.2",
-    "cordova-plugin-splashscreen": "^5.0.3",
-    "cordova-plugin-statusbar": "^2.4.3",
-    "cordova-plugin-whitelist": "^1.3.4",
-    "cordova-plugin-zip": "^3.1.0",
-    "cordova-sqlite-storage": "^3.4.0",
-    "cordova-support-google-services": "^1.2.1",
-    "es6-promise-plugin": "^4.2.2",
-    "font-awesome": "^4.7.0",
+    "cordova-plugin-media-capture": "3.0.3",
+    "cordova-plugin-network-information": "2.0.2",
+    "cordova-plugin-screen-orientation": "3.0.2",
+    "cordova-plugin-splashscreen": "5.0.3",
+    "cordova-plugin-statusbar": "2.4.3",
+    "cordova-plugin-whitelist": "1.3.4",
+    "cordova-plugin-zip": "3.1.0",
+    "cordova-sqlite-storage": "3.4.0",
+    "cordova-support-google-services": "1.2.1",
+    "es6-promise-plugin": "4.2.2",
+    "font-awesome": "4.7.0",
     "ionic-angular": "3.9.3",
-    "ionicons": "^3.0.0",
-    "jszip": "^3.1.5",
+    "ionicons": "3.0.0",
+    "jszip": "3.1.5",
     "mathjax": "2.7.2",
-    "moment": "^2.22.2",
-    "nl.kingsquare.cordova.background-audio": "^1.0.1",
-    "phonegap-plugin-multidex": "^1.0.0",
+    "moment": "2.22.2",
+    "nl.kingsquare.cordova.background-audio": "1.0.1",
+    "phonegap-plugin-multidex": "1.0.0",
     "phonegap-plugin-push": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v3",
-    "promise.prototype.finally": "^3.1.0",
-    "rxjs": "^5.5.11",
-    "sw-toolbox": "^3.6.0",
-    "ts-md5": "^1.2.4",
-    "web-animations-js": "^2.3.1",
-    "zone.js": "^0.8.26"
+    "promise.prototype.finally": "3.1.0",
+    "rxjs": "5.5.11",
+    "sw-toolbox": "3.6.0",
+    "ts-md5": "1.2.4",
+    "web-animations-js": "2.3.1",
+    "zone.js": "0.8.26"
   },
   "devDependencies": {
     "@ionic/app-scripts": "3.2.2",
-    "electron-builder-lib": "^20.23.1",
-    "electron-rebuild": "^1.8.1",
+    "electron-builder-lib": "20.23.1",
+    "electron-rebuild": "1.8.1",
     "gulp": "4.0.2",
-    "gulp-clip-empty-files": "^0.1.2",
-    "gulp-concat": "^2.6.1",
-    "gulp-flatten": "^0.4.0",
-    "gulp-rename": "^1.3.0",
-    "gulp-slash": "^1.1.3",
-    "gulp-util": "^3.0.8",
-    "node-loader": "^0.6.0",
-    "through": "^2.3.8",
-    "typescript": "^2.6.2",
-    "webpack-merge": "^4.1.2"
+    "gulp-clip-empty-files": "0.1.2",
+    "gulp-concat": "2.6.1",
+    "gulp-flatten": "0.4.0",
+    "gulp-rename": "1.3.0",
+    "gulp-slash": "1.1.3",
+    "gulp-util": "3.0.8",
+    "node-loader": "0.6.0",
+    "through": "2.3.8",
+    "typescript": "2.6.2",
+    "webpack-merge": "4.1.2"
   },
   "browser": {
     "electron": false
@@ -243,4 +243,4 @@
       "deleteAppDataOnUninstall": true
     }
   }
-}
\ No newline at end of file
+}

From 3d67ee62dee58afdabd194fa318e57094fabc5d1 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 11 Dec 2019 10:18:21 +0100
Subject: [PATCH 202/257] MOBILE-2159 geolocation: Replace type guard with
 simpler code

---
 src/addon/mod/data/fields/latlong/component/latlong.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/addon/mod/data/fields/latlong/component/latlong.ts b/src/addon/mod/data/fields/latlong/component/latlong.ts
index 013c4586e..e322abf07 100644
--- a/src/addon/mod/data/fields/latlong/component/latlong.ts
+++ b/src/addon/mod/data/fields/latlong/component/latlong.ts
@@ -117,7 +117,7 @@ export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginCo
             this.form.controls['f_' + this.field.id + '_0'].setValue(result.coords.latitude);
             this.form.controls['f_' + this.field.id + '_1'].setValue(result.coords.longitude);
         }).catch((error) => {
-            if (this.isPositionError(error) && error.code === error.PERMISSION_DENIED) {
+            if (this.isPermissionDeniedError(error)) {
                 this.domUtils.showErrorModal('addon.mod_data.locationpermissiondenied', true);
 
                 return;
@@ -129,7 +129,7 @@ export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginCo
         });
     }
 
-    protected isPositionError(error?: any): error is PositionError {
-        return error && 'code' in error && 'PERMISSION_DENIED' in error;
+    protected isPermissionDeniedError(error?: any): boolean {
+        return error && 'code' in error && 'PERMISSION_DENIED' in error && error.code === error.PERMISSION_DENIED;
     }
 }

From 5337c77b7e042a8386474009df88156134d75071 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 10 Dec 2019 13:39:55 +0100
Subject: [PATCH 203/257] MOBILE-3245 grades: Fix course data population in
 grades

---
 src/core/course/providers/helper.ts   |  4 +-
 src/core/courses/providers/courses.ts | 11 +++--
 src/core/courses/providers/helper.ts  |  2 +-
 src/core/grades/providers/helper.ts   | 58 ++++++++++++++++++++-------
 src/providers/sites.ts                | 32 ++++++++++++++-
 5 files changed, 84 insertions(+), 23 deletions(-)

diff --git a/src/core/course/providers/helper.ts b/src/core/course/providers/helper.ts
index 82b9d03d6..580971705 100644
--- a/src/core/course/providers/helper.ts
+++ b/src/core/course/providers/helper.ts
@@ -919,7 +919,7 @@ export class CoreCourseHelperProvider {
             const totalOffline = offlineCompletions.length;
             let loaded = 0;
 
-            offlineCompletions = this.utils.arrayToObject(offlineCompletions, 'cmid');
+            const offlineCompletionsMap = this.utils.arrayToObject(offlineCompletions, 'cmid');
 
             // Load the offline data in the modules.
             for (let i = 0; i < sections.length; i++) {
@@ -931,7 +931,7 @@ export class CoreCourseHelperProvider {
 
                 for (let j = 0; j < section.modules.length; j++) {
                     const module = section.modules[j],
-                        offlineCompletion = offlineCompletions[module.id];
+                        offlineCompletion = offlineCompletionsMap[module.id];
 
                     if (offlineCompletion && typeof module.completiondata != 'undefined' &&
                             offlineCompletion.timecompleted >= module.completiondata.timecompleted * 1000) {
diff --git a/src/core/courses/providers/courses.ts b/src/core/courses/providers/courses.ts
index 226dca101..f869e467a 100644
--- a/src/core/courses/providers/courses.ts
+++ b/src/core/courses/providers/courses.ts
@@ -15,7 +15,7 @@
 import { Injectable } from '@angular/core';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreLoggerProvider } from '@providers/logger';
-import { CoreSitesProvider } from '@providers/sites';
+import { CoreSitesProvider, ReadingStrategy } from '@providers/sites';
 import { CoreSite } from '@classes/site';
 
 /**
@@ -774,18 +774,21 @@ export class CoreCoursesProvider {
      * @param siteId Site to get the courses from. If not defined, use current site.
      * @return Promise resolved with the courses.
      */
-    getUserCourses(preferCache?: boolean, siteId?: string): Promise<any[]> {
+    getUserCourses(preferCache?: boolean, siteId?: string, strategy?: ReadingStrategy): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
 
             const userId = site.getUserId(),
                 data: any = {
                     userid: userId
                 },
+                strategyPreSets = strategy
+                    ? this.sitesProvider.getReadingStrategyPreSets(strategy)
+                    : { omitExpires: !!preferCache },
                 preSets = {
                     cacheKey: this.getUserCoursesCacheKey(),
                     getCacheUsingCacheKey: true,
-                    omitExpires: !!preferCache,
-                    updateFrequency: CoreSite.FREQUENCY_RARELY
+                    updateFrequency: CoreSite.FREQUENCY_RARELY,
+                    ...strategyPreSets,
                 };
 
             if (site.isVersionGreaterEqualThan('3.7')) {
diff --git a/src/core/courses/providers/helper.ts b/src/core/courses/providers/helper.ts
index 0d98fe61e..30e3ab092 100644
--- a/src/core/courses/providers/helper.ts
+++ b/src/core/courses/providers/helper.ts
@@ -107,7 +107,7 @@ export class CoreCoursesHelperProvider {
             return Promise.resolve();
         }
 
-        let coursesInfo = [],
+        let coursesInfo = {},
             courseInfoAvailable = false;
 
         const site = this.sitesProvider.getCurrentSite(),
diff --git a/src/core/grades/providers/helper.ts b/src/core/grades/providers/helper.ts
index 236f05cc8..889523c56 100644
--- a/src/core/grades/providers/helper.ts
+++ b/src/core/grades/providers/helper.ts
@@ -15,7 +15,7 @@
 import { Injectable } from '@angular/core';
 import { NavController } from 'ionic-angular';
 import { CoreLoggerProvider } from '@providers/logger';
-import { CoreSitesProvider } from '@providers/sites';
+import { CoreSitesProvider, ReadingStrategy } from '@providers/sites';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
 import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreGradesProvider } from './grades';
@@ -198,22 +198,50 @@ export class CoreGradesHelperProvider {
      * @param grades Grades to get the data for.
      * @return Promise always resolved. Resolve param is the formatted grades.
      */
-    getGradesCourseData(grades: any): Promise<any> {
-        // Using cache for performance reasons.
-        return this.coursesProvider.getUserCourses(true).then((courses) => {
-            const indexedCourses = {};
-            courses.forEach((course) => {
-                indexedCourses[course.id] = course;
-            });
+    async getGradesCourseData(grades: any[]): Promise<any> {
+        // Obtain courses from cache to prevent network requests.
+        const courses = await this.coursesProvider.getUserCourses(undefined, undefined, ReadingStrategy.OnlyCache);
 
-            grades.forEach((grade) => {
-                if (typeof indexedCourses[grade.courseid] != 'undefined') {
-                    grade.courseFullName = indexedCourses[grade.courseid].fullname;
-                }
-            });
+        const coursesMap = this.utils.arrayToObject(courses, 'id');
+        const coursesWereMissing = this.addCourseData(grades, coursesMap);
 
-            return grades;
-        });
+        // If any course wasn't found, make a network request.
+        if (coursesWereMissing) {
+            const coursesPromise = this.coursesProvider.isGetCoursesByFieldAvailable()
+                ? this.coursesProvider.getCoursesByField('ids', grades.map((grade) => grade.courseid))
+                : this.coursesProvider.getUserCourses(undefined, undefined, ReadingStrategy.PreferNetwork);
+
+            const courses = await coursesPromise;
+
+            const coursesMap = this.utils.arrayToObject(courses, 'id');
+
+            this.addCourseData(grades, coursesMap);
+        }
+
+        return grades.filter((grade) => grade.courseFullName !== undefined);
+    }
+
+    /**
+     * Adds course data to grades.
+     *
+     * @param grades Array of grades to populate.
+     * @param courses HashMap of courses to read data from.
+     * @return Boolean indicating if some courses were not found.
+     */
+    protected addCourseData(grades: any[], courses: any): boolean {
+        let someCoursesAreMissing = false;
+
+        for (const grade of grades) {
+            if (!(grade.courseid in courses)) {
+                someCoursesAreMissing = true;
+
+                continue;
+            }
+
+            grade.courseFullName = courses[grade.courseid].fullname;
+        }
+
+        return someCoursesAreMissing;
     }
 
     /**
diff --git a/src/providers/sites.ts b/src/providers/sites.ts
index 857a52058..0094d7096 100644
--- a/src/providers/sites.ts
+++ b/src/providers/sites.ts
@@ -26,7 +26,7 @@ import { CoreUtilsProvider } from './utils/utils';
 import { CoreWSProvider } from './ws';
 import { CoreConstants } from '@core/constants';
 import { CoreConfigConstants } from '../configconstants';
-import { CoreSite } from '@classes/site';
+import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
 import { SQLiteDB, SQLiteDBTableSchema } from '@classes/sqlitedb';
 import { Md5 } from 'ts-md5/dist/md5';
 import { WP_PROVIDER } from '@app/app.module';
@@ -158,6 +158,12 @@ export interface CoreSiteSchema {
     migrate?(db: SQLiteDB, oldVersion: number, siteId: string): Promise<any> | void;
 }
 
+export const enum ReadingStrategy {
+    OnlyCache,
+    PreferCache,
+    PreferNetwork,
+}
+
 /*
  * Service to manage and interact with sites.
  * It allows creating tables in the databases of all sites. Each service or component should be responsible of creating
@@ -1730,4 +1736,28 @@ export class CoreSitesProvider {
 
         return reset;
     }
+
+    /**
+     * Returns presets for a given reading strategy.
+     *
+     * @param strategy Reading strategy.
+     * @return PreSets options object.
+     */
+    getReadingStrategyPreSets(strategy: ReadingStrategy): CoreSiteWSPreSets {
+        switch (strategy) {
+            case ReadingStrategy.PreferCache:
+                return {
+                    omitExpires: true,
+                };
+            case ReadingStrategy.OnlyCache:
+                return {
+                    omitExpires: true,
+                    forceOffline: true,
+                };
+            case ReadingStrategy.PreferNetwork:
+            default:
+                return {};
+        }
+    }
+
 }

From cb4c666cb78830cd0f000dacdc2b6f0f75898519 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 11 Dec 2019 11:47:00 +0100
Subject: [PATCH 204/257] MOBILE-3213 h5p: Send a resize event instead of a
 ready event

---
 .../h5p/components/h5p-player/core-h5p-player.html |  2 +-
 src/core/h5p/components/h5p-player/h5p-player.ts   | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/core/h5p/components/h5p-player/core-h5p-player.html b/src/core/h5p/components/h5p-player/core-h5p-player.html
index 22981316f..bdd88f6c4 100644
--- a/src/core/h5p/components/h5p-player/core-h5p-player.html
+++ b/src/core/h5p/components/h5p-player/core-h5p-player.html
@@ -9,5 +9,5 @@
         <core-download-refresh [status]="state" [enabled]="canDownload" [loading]="calculating" [canTrustDownload]="true" (action)="download()"></core-download-refresh>
     </div>
 </div>
-<core-iframe *ngIf="showPackage" [src]="playerSrc" iframeHeight="auto" [allowFullscreen]="true" (loaded)="sendHello($event)"></core-iframe>
+<core-iframe *ngIf="showPackage" [src]="playerSrc" iframeHeight="auto" [allowFullscreen]="true" (loaded)="iframeLoaded()"></core-iframe>
 <script *ngIf="resizeScript && showPackage" type="text/javascript" [src]="resizeScript"></script>
diff --git a/src/core/h5p/components/h5p-player/h5p-player.ts b/src/core/h5p/components/h5p-player/h5p-player.ts
index 359be26cc..4804c4dbf 100644
--- a/src/core/h5p/components/h5p-player/h5p-player.ts
+++ b/src/core/h5p/components/h5p-player/h5p-player.ts
@@ -269,17 +269,11 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
     }
 
     /**
-     * Send hello to the H5P iframe.
-     *
-     * @param iframe The iframe.
+     * H5P iframe has been loaded.
      */
-    sendHello(iframe?: HTMLIFrameElement): void {
-        const ready = {
-            context: 'h5p',
-            action: 'ready'
-        };
-
-        iframe.contentWindow.postMessage(ready, '*');
+    iframeLoaded(): void {
+        // Send a resize event to the window so H5P package recalculates the size.
+        window.dispatchEvent(new Event('resize'));
     }
 
     /**

From 36a070d98f98d17155609c36b0cad139fe6b0a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 11 Dec 2019 13:26:57 +0100
Subject: [PATCH 205/257] MOBILE-3213 tabs: Add border on side placement

---
 src/components/ion-tabs/ion-tabs.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/ion-tabs/ion-tabs.scss b/src/components/ion-tabs/ion-tabs.scss
index ec2e85b66..5088c5969 100644
--- a/src/components/ion-tabs/ion-tabs.scss
+++ b/src/components/ion-tabs/ion-tabs.scss
@@ -35,6 +35,7 @@ ion-app.app-root core-ion-tabs {
             width: $core-sidetab-size;
             height: 100%;
             flex-direction: column;
+            @include border-end(0.55px, solid, rgba(0, 0, 0, 0.3));
             .tab-button {
                 width: 100%;
                 .tab-badge.badge {

From accb83b3394b52d6897a391f36b7aa9c65efebe2 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 11 Dec 2019 13:32:00 +0100
Subject: [PATCH 206/257] MOBILE-3245 grades: Fix network methods calls when
 populating grades

---
 src/core/grades/providers/helper.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/core/grades/providers/helper.ts b/src/core/grades/providers/helper.ts
index 889523c56..ae8cc9071 100644
--- a/src/core/grades/providers/helper.ts
+++ b/src/core/grades/providers/helper.ts
@@ -200,15 +200,22 @@ export class CoreGradesHelperProvider {
      */
     async getGradesCourseData(grades: any[]): Promise<any> {
         // Obtain courses from cache to prevent network requests.
-        const courses = await this.coursesProvider.getUserCourses(undefined, undefined, ReadingStrategy.OnlyCache);
+        let coursesWereMissing;
 
-        const coursesMap = this.utils.arrayToObject(courses, 'id');
-        const coursesWereMissing = this.addCourseData(grades, coursesMap);
+        try {
+            const courses = await this.coursesProvider.getUserCourses(undefined, undefined, ReadingStrategy.OnlyCache);
+
+            const coursesMap = this.utils.arrayToObject(courses, 'id');
+
+            coursesWereMissing = this.addCourseData(grades, coursesMap);
+        } catch (error) {
+            coursesWereMissing = true;
+        }
 
         // If any course wasn't found, make a network request.
         if (coursesWereMissing) {
             const coursesPromise = this.coursesProvider.isGetCoursesByFieldAvailable()
-                ? this.coursesProvider.getCoursesByField('ids', grades.map((grade) => grade.courseid))
+                ? this.coursesProvider.getCoursesByField('ids', grades.map((grade) => grade.courseid).join(','))
                 : this.coursesProvider.getUserCourses(undefined, undefined, ReadingStrategy.PreferNetwork);
 
             const courses = await coursesPromise;

From 5ba3c03d91f021fb660201d1b864c2dd550ef523 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 11 Dec 2019 13:33:31 +0100
Subject: [PATCH 207/257] MOBILE-3245 naming: Prefix ReadingStrategy name with
 CoreSites

---
 src/core/courses/providers/courses.ts |  4 ++--
 src/core/grades/providers/helper.ts   |  6 +++---
 src/providers/sites.ts                | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/core/courses/providers/courses.ts b/src/core/courses/providers/courses.ts
index f869e467a..b0529d926 100644
--- a/src/core/courses/providers/courses.ts
+++ b/src/core/courses/providers/courses.ts
@@ -15,7 +15,7 @@
 import { Injectable } from '@angular/core';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreLoggerProvider } from '@providers/logger';
-import { CoreSitesProvider, ReadingStrategy } from '@providers/sites';
+import { CoreSitesProvider, CoreSitesReadingStrategy } from '@providers/sites';
 import { CoreSite } from '@classes/site';
 
 /**
@@ -774,7 +774,7 @@ export class CoreCoursesProvider {
      * @param siteId Site to get the courses from. If not defined, use current site.
      * @return Promise resolved with the courses.
      */
-    getUserCourses(preferCache?: boolean, siteId?: string, strategy?: ReadingStrategy): Promise<any[]> {
+    getUserCourses(preferCache?: boolean, siteId?: string, strategy?: CoreSitesReadingStrategy): Promise<any[]> {
         return this.sitesProvider.getSite(siteId).then((site) => {
 
             const userId = site.getUserId(),
diff --git a/src/core/grades/providers/helper.ts b/src/core/grades/providers/helper.ts
index ae8cc9071..7bdfc7b67 100644
--- a/src/core/grades/providers/helper.ts
+++ b/src/core/grades/providers/helper.ts
@@ -15,7 +15,7 @@
 import { Injectable } from '@angular/core';
 import { NavController } from 'ionic-angular';
 import { CoreLoggerProvider } from '@providers/logger';
-import { CoreSitesProvider, ReadingStrategy } from '@providers/sites';
+import { CoreSitesProvider, CoreSitesReadingStrategy } from '@providers/sites';
 import { CoreCoursesProvider } from '@core/courses/providers/courses';
 import { CoreCourseProvider } from '@core/course/providers/course';
 import { CoreGradesProvider } from './grades';
@@ -203,7 +203,7 @@ export class CoreGradesHelperProvider {
         let coursesWereMissing;
 
         try {
-            const courses = await this.coursesProvider.getUserCourses(undefined, undefined, ReadingStrategy.OnlyCache);
+            const courses = await this.coursesProvider.getUserCourses(undefined, undefined, CoreSitesReadingStrategy.OnlyCache);
 
             const coursesMap = this.utils.arrayToObject(courses, 'id');
 
@@ -216,7 +216,7 @@ export class CoreGradesHelperProvider {
         if (coursesWereMissing) {
             const coursesPromise = this.coursesProvider.isGetCoursesByFieldAvailable()
                 ? this.coursesProvider.getCoursesByField('ids', grades.map((grade) => grade.courseid).join(','))
-                : this.coursesProvider.getUserCourses(undefined, undefined, ReadingStrategy.PreferNetwork);
+                : this.coursesProvider.getUserCourses(undefined, undefined, CoreSitesReadingStrategy.PreferNetwork);
 
             const courses = await coursesPromise;
 
diff --git a/src/providers/sites.ts b/src/providers/sites.ts
index 0094d7096..3458aaefd 100644
--- a/src/providers/sites.ts
+++ b/src/providers/sites.ts
@@ -158,7 +158,7 @@ export interface CoreSiteSchema {
     migrate?(db: SQLiteDB, oldVersion: number, siteId: string): Promise<any> | void;
 }
 
-export const enum ReadingStrategy {
+export const enum CoreSitesReadingStrategy {
     OnlyCache,
     PreferCache,
     PreferNetwork,
@@ -1743,18 +1743,18 @@ export class CoreSitesProvider {
      * @param strategy Reading strategy.
      * @return PreSets options object.
      */
-    getReadingStrategyPreSets(strategy: ReadingStrategy): CoreSiteWSPreSets {
+    getReadingStrategyPreSets(strategy: CoreSitesReadingStrategy): CoreSiteWSPreSets {
         switch (strategy) {
-            case ReadingStrategy.PreferCache:
+            case CoreSitesReadingStrategy.PreferCache:
                 return {
                     omitExpires: true,
                 };
-            case ReadingStrategy.OnlyCache:
+            case CoreSitesReadingStrategy.OnlyCache:
                 return {
                     omitExpires: true,
                     forceOffline: true,
                 };
-            case ReadingStrategy.PreferNetwork:
+            case CoreSitesReadingStrategy.PreferNetwork:
             default:
                 return {};
         }

From 4c09231e14663376de197f774f0d92123299cab9 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 11 Dec 2019 15:24:41 +0100
Subject: [PATCH 208/257] MOBILE-3213 core: Don't use tokenpluginfile for
 customcert

---
 src/classes/site.ts        |  7 ++-----
 src/providers/utils/url.ts | 27 +++++++++++++++++++++------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/classes/site.ts b/src/classes/site.ts
index 5d738185b..11312b0d1 100644
--- a/src/classes/site.ts
+++ b/src/classes/site.ts
@@ -1923,8 +1923,8 @@ export class CoreSite {
      * @return Promise resolved with boolean: whether it works or not.
      */
     checkTokenPluginFile(url: string): Promise<boolean> {
-        if (!this.infos || !this.infos.userprivateaccesskey) {
-            // No access key, cannot use tokenpluginfile.
+        if (!this.urlUtils.canUseTokenPluginFile(url, this.siteUrl, this.infos && this.infos.userprivateaccesskey)) {
+            // Cannot use tokenpluginfile.
             return Promise.resolve(false);
         } else if (typeof this.tokenPluginFileWorks != 'undefined') {
             // Already checked.
@@ -1935,9 +1935,6 @@ export class CoreSite {
         } else if (!this.appProvider.isOnline()) {
             // Not online, cannot check it. Assume it's working, but don't save the result.
             return Promise.resolve(true);
-        } else if (!this.urlUtils.isPluginFileUrl(url)) {
-            // Not a pluginfile URL, ignore it.
-            return Promise.resolve(false);
         }
 
         url = this.fixPluginfileURL(url);
diff --git a/src/providers/utils/url.ts b/src/providers/utils/url.ts
index c04240a6c..4cb7b8cce 100644
--- a/src/providers/utils/url.ts
+++ b/src/providers/utils/url.ts
@@ -89,6 +89,22 @@ export class CoreUrlUtilsProvider {
         return '<a href="' + url + '">' + text + '</a>';
     }
 
+    /**
+     * Check whether we can use tokenpluginfile.php endpoint for a certain URL.
+     *
+     * @param url URL to check.
+     * @param siteUrl The URL of the site the URL belongs to.
+     * @param accessKey User access key for tokenpluginfile.
+     * @return Whether tokenpluginfile.php can be used.
+     */
+    canUseTokenPluginFile(url: string, siteUrl: string, accessKey?: string): boolean {
+        // Do not use tokenpluginfile if site doesn't use slash params, the URL doesn't work.
+        // Also, only use it for "core" pluginfile endpoints. Some plugins can implement their own endpoint (like customcert).
+        return accessKey && !url.match(/[\&?]file=/) && (
+                url.indexOf(this.textUtils.concatenatePaths(siteUrl, 'pluginfile.php')) === 0 ||
+                url.indexOf(this.textUtils.concatenatePaths(siteUrl, 'webservice/pluginfile.php')) === 0);
+    }
+
     /**
      * Extracts the parameters from a URL and stores them in an object.
      *
@@ -151,8 +167,10 @@ export class CoreUrlUtilsProvider {
 
         url = url.replace(/&amp;/g, '&');
 
+        const canUseTokenPluginFile = accessKey && this.canUseTokenPluginFile(url, siteUrl, accessKey);
+
         // First check if we need to fix this url or is already fixed.
-        if (!accessKey && url.indexOf('token=') != -1) {
+        if (!canUseTokenPluginFile && url.indexOf('token=') != -1) {
             return url;
         }
 
@@ -161,11 +179,8 @@ export class CoreUrlUtilsProvider {
             return url;
         }
 
-        const hasSlashParams = !url.match(/[\&?]file=/);
-
-        if (accessKey && hasSlashParams) {
-            // We have the user access key, use tokenpluginfile.php.
-            // Do not use it without slash params, the URL doesn't work.
+        if (canUseTokenPluginFile) {
+            // Use tokenpluginfile.php.
             url = url.replace(/(\/webservice)?\/pluginfile\.php/, '/tokenpluginfile.php/' + accessKey);
 
             return url;

From 07b32226bdfde46c886b682368cd845180b10c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 11 Dec 2019 15:46:05 +0100
Subject: [PATCH 209/257] MOBILE-3213 resource: Fix resource icon set

---
 src/addon/mod/resource/providers/module-handler.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/addon/mod/resource/providers/module-handler.ts b/src/addon/mod/resource/providers/module-handler.ts
index 5b0d8686e..735bcae53 100644
--- a/src/addon/mod/resource/providers/module-handler.ts
+++ b/src/addon/mod/resource/providers/module-handler.ts
@@ -222,12 +222,11 @@ export class AddonModResourceModuleHandler implements CoreCourseModuleHandler {
                     }
                 }
 
-                if (resourceData.icon == '') {
-                    resourceData.icon = this.courseProvider.getModuleIconSrc(this.modName, module.modicon);
-                }
                 resourceData.extra += extra.join(' ');
-            } else {
-                // No files, just set the icon.
+            }
+
+            // No previously set, just set the icon.
+            if (resourceData.icon == '') {
                 resourceData.icon = this.courseProvider.getModuleIconSrc(this.modName, module.modicon);
             }
 

From ee4bf2944c9df7ad52abcd21d69fa231d152bbb2 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 12 Dec 2019 09:26:40 +0100
Subject: [PATCH 210/257] MOBILE-3213 core: Fix exception when invalidate site
 plugin content

---
 src/core/siteplugins/providers/siteplugins.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/siteplugins/providers/siteplugins.ts b/src/core/siteplugins/providers/siteplugins.ts
index 6ebcef76a..7b3b9c03b 100644
--- a/src/core/siteplugins/providers/siteplugins.ts
+++ b/src/core/siteplugins/providers/siteplugins.ts
@@ -336,6 +336,8 @@ export class CoreSitePluginsProvider {
      */
     invalidateCallWS(method: string, data: any, preSets?: CoreSiteWSPreSets, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
+            preSets = preSets || {};
+
             return site.invalidateWsCacheForKey(preSets.cacheKey || this.getCallWSCacheKey(method, data));
         });
     }

From ef268e032cb1dfad32faee007078dfb2ae5a4dbf Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 12 Dec 2019 11:03:40 +0100
Subject: [PATCH 211/257] MOBILE-3213 core: Revert keyboard plugin to 2.1.3

The 2.2.0 version causes the input text to be behind the keyboard when sending messages.
---
 config.xml        | 2 +-
 package-lock.json | 6 +++---
 package.json      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config.xml b/config.xml
index 5c29845ee..ed799b098 100644
--- a/config.xml
+++ b/config.xml
@@ -160,7 +160,7 @@
     </plugin>
     <plugin name="cordova-plugin-globalization" spec="1.11.0" />
     <plugin name="cordova-plugin-inappbrowser" spec="3.1.0" />
-    <plugin name="cordova-plugin-ionic-keyboard" spec="2.2.0" />
+    <plugin name="cordova-plugin-ionic-keyboard" spec="2.1.3" />
     <plugin name="cordova-plugin-local-notification" spec="https://github.com/moodlemobile/cordova-plugin-local-notification.git#moodle" />
     <plugin name="cordova-plugin-media-capture" spec="3.0.3" />
     <plugin name="cordova-plugin-network-information" spec="2.0.2" />
diff --git a/package-lock.json b/package-lock.json
index 3c9f1767d..15de2157d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3157,9 +3157,9 @@
       "integrity": "sha512-YqrZfYgbGTS20SFID0mrRxud312VH072QVlFonCAkPgtGg1Svy7lELOCNFd+KU7t4mVtZeTEjZPEeefvjaetwQ=="
     },
     "cordova-plugin-ionic-keyboard": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.2.0.tgz",
-      "integrity": "sha512-yDUG+9ieKVRitq5mGlNxjaZh/MgEhFFIgTIPhqSbUaQ8UuZbawy5mhJAVClqY97q8/rcQtL6dCDa7x2sEtCLcA=="
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.1.3.tgz",
+      "integrity": "sha512-6ucQ6FdlLdBm8kJfFnzozmBTjru/0xekHP/dAhjoCZggkGRlgs8TsUJFkxa/bV+qi7Dlo50JjmpE4UMWAO+aOQ=="
     },
     "cordova-plugin-local-notification": {
       "version": "git+https://github.com/moodlemobile/cordova-plugin-local-notification.git#c7430c4f4f8b8c82d051aea49d87da0b4f6a8b1e",
diff --git a/package.json b/package.json
index 3d9213173..28d6cc054 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "cordova-plugin-geolocation": "4.0.2",
     "cordova-plugin-globalization": "1.11.0",
     "cordova-plugin-inappbrowser": "3.1.0",
-    "cordova-plugin-ionic-keyboard": "2.2.0",
+    "cordova-plugin-ionic-keyboard": "2.1.3",
     "cordova-plugin-local-notification": "git+https://github.com/moodlemobile/cordova-plugin-local-notification.git#moodle",
     "cordova-plugin-media-capture": "3.0.3",
     "cordova-plugin-network-information": "2.0.2",

From 4727194f5446a2f3749ffbcd493131b33e8b77ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 12 Dec 2019 13:19:47 +0100
Subject: [PATCH 212/257] MOBILE-3213 scripts: Detect wrong 2.4 version on
 langs

---
 scripts/lang_functions.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/lang_functions.php b/scripts/lang_functions.php
index af1e2ab3b..0fa57b1f4 100644
--- a/scripts/lang_functions.php
+++ b/scripts/lang_functions.php
@@ -232,6 +232,10 @@ function build_lang($lang, $keys) {
             // Prevent double.
             $text = str_replace(array('{{{', '}}}'), array('{{', '}}'), $text);
         } else {
+            // @TODO: Remove that line when core.cannotconnect and core.login.invalidmoodleversion are completelly changed to use $a
+            if (($key == 'core.cannotconnect' || $key == 'core.login.invalidmoodleversion') && strpos($text, '2.4') != false) {
+                $text = str_replace('2.4', '{{$a}}', $text);
+            }
             $local++;
         }
 

From 9e9b4bcbbe9b5cdea8e25ffdb056f5563a0e4d4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 12 Dec 2019 13:20:03 +0100
Subject: [PATCH 213/257] MOBILE-3213 strings: Have a better CLI interface

---
 scripts/lang_functions.php | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/scripts/lang_functions.php b/scripts/lang_functions.php
index 0fa57b1f4..7765841ca 100644
--- a/scripts/lang_functions.php
+++ b/scripts/lang_functions.php
@@ -58,6 +58,7 @@ function build_languages($languages, $keys, $added_langs = []) {
 }
 
 function get_langindex_keys() {
+    $local = 0;
     // Process the index file, just once.
     $keys = file_get_contents('langindex.json');
     $keys = (array) json_decode($keys);
@@ -67,6 +68,7 @@ function get_langindex_keys() {
         if ($value == 'local_moodlemobileapp') {
             $map->file = $value;
             $map->string = $key;
+            $local++;
         } else {
             $exp = explode('/', $value, 2);
             $map->file = $exp[0];
@@ -87,7 +89,7 @@ function get_langindex_keys() {
     }
 
     $total = count($keys);
-    echo "Total strings to translate $total\n";
+    echo "Total strings to translate $total ($local local)\n";
 
     return $keys;
 }
@@ -248,7 +250,11 @@ function build_lang($lang, $keys) {
 
     $success = count($translations);
     $percentage = floor($success/$total * 100);
-    echo "\t\t$success of $total -> $percentage% ($local local)\n";
+    $bar = progressbar($percentage);
+    if (strlen($lang) <= 2 && !$parent) {
+        echo "\t";
+    }
+    echo "\t\t$success of $total -> $percentage% $bar ($local local)\n";
 
     if ($lang == 'en') {
         generate_local_moodlemobileapp($keys, $translations);
@@ -258,6 +264,11 @@ function build_lang($lang, $keys) {
     return true;
 }
 
+function progressbar($percentage) {
+    $done = $percentage/10;
+    return "\t".str_repeat('=', $done) . str_repeat('-', 10-$done);
+}
+
 function detect_lang($lang, $keys) {
     $langfoldername = get_langfolder($lang);
     if (!$langfoldername) {
@@ -275,12 +286,14 @@ function detect_lang($lang, $keys) {
         return false;
     }
 
-    echo "Checking $lang";
+    $title = $lang;
     if ($parent != "" && $parent != $lang) {
-        echo " ($parent)";
+        $title .= " ($parent)";
     }
     $langname = $string['thislanguage'];
-    echo " ".$langname." -D";
+    $title .= " ".$langname." -D";
+
+
 
     // Add the translation to the array.
     foreach ($keys as $key => $value) {
@@ -304,7 +317,10 @@ function detect_lang($lang, $keys) {
     }
 
     $percentage = floor($success/$total * 100);
-    echo "\t\t$success of $total -> $percentage% ($local local)";
+    $bar = progressbar($percentage);
+
+    echo "Checking ".$title.str_repeat("\t", 7 - floor(mb_strlen($title, 'UTF-8')/8));
+    echo "\t$success of $total -> $percentage% $bar ($local local)";
     if (($percentage > 75 && $local > 50) || ($percentage > 50 && $local > 75)) {
         echo " \t DETECTED\n";
         return true;

From 86785a42887c92766a4c1324bf40d483d3be2450 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 12 Dec 2019 16:10:54 +0100
Subject: [PATCH 214/257] MOBILE-3232 filters: Disable mathjax options menu

---
 src/addon/filter/mathjaxloader/providers/handler.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/addon/filter/mathjaxloader/providers/handler.ts b/src/addon/filter/mathjaxloader/providers/handler.ts
index 0ef005bc7..beb3a1cb0 100644
--- a/src/addon/filter/mathjaxloader/providers/handler.ts
+++ b/src/addon/filter/mathjaxloader/providers/handler.ts
@@ -51,11 +51,7 @@ export class AddonFilterMathJaxLoaderHandler extends CoreFilterDefaultHandler {
                 "[a11y]/accessibility-menu.js"
             ],
             jax: ["input/TeX","input/MathML","output/SVG"],
-            menuSettings: {
-                zoom: "Double-Click",
-                mpContext: true,
-                mpMouse: true
-            },
+            showMathMenu: false,
             errorSettings: { message: ["!"] },
             skipStartupTypeset: true,
             messageStyle: "none"

From b74381c62687ea9ee19d8e116fcd32b8334becda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 12 Dec 2019 16:40:47 +0100
Subject: [PATCH 215/257] MOBILE-3213 folder: Fix opening subfolders

---
 src/addon/mod/folder/components/index/index.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/addon/mod/folder/components/index/index.ts b/src/addon/mod/folder/components/index/index.ts
index ae0bcfae0..573b4dfb6 100644
--- a/src/addon/mod/folder/components/index/index.ts
+++ b/src/addon/mod/folder/components/index/index.ts
@@ -34,7 +34,6 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
     component = AddonModFolderProvider.COMPONENT;
     canGetFolder: boolean;
     contents: any;
-    moduleContents: any;
 
     constructor(injector: Injector, private folderProvider: AddonModFolderProvider, private courseProvider: CoreCourseProvider,
             private appProvider: CoreAppProvider, private folderHelper: AddonModFolderHelperProvider) {
@@ -51,7 +50,7 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
 
         if (this.path) {
             // Subfolder. Use module param.
-            this.showModuleData(this.module);
+            this.showModuleData(this.module, this.module.contents);
             this.loaded = true;
             this.refreshIcon = 'refresh';
         } else {
@@ -81,16 +80,16 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
      * Convenience function to set scope data using module.
      * @param module Module to show.
      */
-    protected showModuleData(module: any): void {
+    protected showModuleData(module: any, folderContents: any): void {
         this.description = module.intro || module.description;
 
         this.dataRetrieved.emit(module);
 
         if (this.path) {
             // Subfolder.
-            this.contents = this.moduleContents;
+            this.contents = folderContents;
         } else {
-            this.contents = this.folderHelper.formatContents(this.moduleContents);
+            this.contents = this.folderHelper.formatContents(folderContents);
         }
     }
 
@@ -101,12 +100,13 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
      * @return Promise resolved when done.
      */
     protected fetchContent(refresh?: boolean): Promise<any> {
-        let promise;
+        let promise,
+            folderContents = this.module.contents;
 
         if (this.canGetFolder) {
             promise = this.folderProvider.getFolder(this.courseId, this.module.id).then((folder) => {
                 return this.courseProvider.loadModuleContents(this.module, this.courseId).then(() => {
-                    this.moduleContents = this.module.contents;
+                    folderContents = this.module.contents;
 
                     return folder;
                 });
@@ -118,14 +118,14 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
                     folder.contents = this.module.contents;
                 }
                 this.module = folder;
-                this.moduleContents = folder.contents;
+                folderContents = folder.contents;
 
                 return folder;
             });
         }
 
         return promise.then((folder) => {
-            this.showModuleData(folder);
+            this.showModuleData(folder, folderContents);
         }).finally(() => {
             this.fillContextMenu(refresh);
         });

From 34b6ab1fe1dbe1ceb88333e3309d83dfa8018cbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 12 Dec 2019 17:06:37 +0100
Subject: [PATCH 216/257] MOBILE-3213 workshop: Dimme submit task when not
 possible

---
 .../components/index/addon-mod-workshop-index.html        | 6 +++---
 src/addon/mod/workshop/components/index/index.ts          | 8 +++++++-
 src/addon/mod/workshop/pages/phase/phase.html             | 2 +-
 src/addon/mod/workshop/pages/phase/phase.ts               | 2 ++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
index 7d398d32c..3ce7e2c32 100644
--- a/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -18,14 +18,14 @@
             <h2 stacked text-wrap>{{ phases[workshop.phase].title }}</h2>
         </a>
         <ng-container *ngIf="phases && phases[workshop.phase] && phases[workshop.phase].tasks && phases[workshop.phase].tasks.length">
-            <a ion-item text-wrap *ngFor="let task of phases[workshop.phase].tasks" (click)="runTask(task)" detail-none>
+            <a ion-item text-wrap *ngFor="let task of phases[workshop.phase].tasks" [class.item-dimmed]="task.code == 'submit' && !showSubmit" (click)="runTask(task)" detail-none>
                 <ion-icon item-start name="radio-button-off" *ngIf="task.completed == null"></ion-icon>
                 <ion-icon item-start name="close-circle" color="danger" *ngIf="task.completed == ''"></ion-icon>
                 <ion-icon item-start name="information-circle" color="info" *ngIf="task.completed == 'info'"></ion-icon>
                 <ion-icon item-start name="checkmark-circle" color="success" *ngIf="task.completed == '1'"></ion-icon>
 
                 <h2>{{task.title}}</h2>
-                <p *ngIf="task.details">{{ task.details }}</p>
+                <p *ngIf="task.details" [innerHTML]="task.details"></p>
                 <ion-icon item-end *ngIf="task.link && task.code != 'submit'" name="open"></ion-icon>
             </a>
         </ng-container>
@@ -94,7 +94,7 @@
 
         <!-- Show only on current phase -->
         <ng-container *ngIf="workshop.phase == workshopPhases.PHASE_SUBMISSION">
-            <ion-item text-wrap *ngIf="canSubmit && ((access.creatingsubmissionallowed && !submission) || (access.modifyingsubmissionallowed && submission))">
+            <ion-item text-wrap *ngIf="showSubmit">
                 <button ion-button icon-start block *ngIf="access.creatingsubmissionallowed && !submission" (click)="gotoSubmit()">
                     <ion-icon name="add"></ion-icon>
                     {{ 'addon.mod_workshop.createsubmission' | translate }}
diff --git a/src/addon/mod/workshop/components/index/index.ts b/src/addon/mod/workshop/components/index/index.ts
index 23d5fc00f..ebef564d2 100644
--- a/src/addon/mod/workshop/components/index/index.ts
+++ b/src/addon/mod/workshop/components/index/index.ts
@@ -49,6 +49,7 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
         visibleGroups: false
     };
     canSubmit = false;
+    showSubmit = false;
     canAssess = false;
     hasNextPage = false;
 
@@ -303,7 +304,8 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
             const modal = this.modalCtrl.create('AddonModWorkshopPhaseInfoPage', {
                     phases: this.utils.objectToArray(this.phases),
                     workshopPhase: this.workshop.phase,
-                    externalUrl: this.externalUrl
+                    externalUrl: this.externalUrl,
+                    showSubmit: this.showSubmit
                 });
             modal.onDidDismiss((goSubmit) => {
                 goSubmit && this.gotoSubmit();
@@ -338,6 +340,10 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
         this.canSubmit = this.workshopHelper.canSubmit(this.workshop, this.access,
             this.phases[AddonModWorkshopProvider.PHASE_SUBMISSION].tasks);
 
+        this.showSubmit = this.workshop.phase == AddonModWorkshopProvider.PHASE_SUBMISSION && this.canSubmit &&
+            ((this.access.creatingsubmissionallowed && !this.submission) ||
+                (this.access.modifyingsubmissionallowed && this.submission));
+
         const promises = [];
 
         if (this.canSubmit) {
diff --git a/src/addon/mod/workshop/pages/phase/phase.html b/src/addon/mod/workshop/pages/phase/phase.html
index 855bc23f9..912348a3e 100644
--- a/src/addon/mod/workshop/pages/phase/phase.html
+++ b/src/addon/mod/workshop/pages/phase/phase.html
@@ -20,7 +20,7 @@
                 {{ 'addon.mod_workshop.switchphase' + phase.code | translate }}
                 <ion-icon item-end name="open"></ion-icon>
             </a>
-            <a ion-item text-wrap *ngFor="let task of phase.tasks" [class.item-dimmed]="phase.code != workshopPhase" (click)="runTask(task)" detail-none>
+            <a ion-item text-wrap *ngFor="let task of phase.tasks" [class.item-dimmed]="phase.code != workshopPhase || (task.code == 'submit' && !showSubmit)" (click)="runTask(task)" detail-none>
                 <ion-icon item-start name="radio-button-off" *ngIf="task.completed == null"></ion-icon>
                 <ion-icon item-start name="close-circle" color="danger" *ngIf="task.completed == ''"></ion-icon>
                 <ion-icon item-start name="information-circle" color="info" *ngIf="task.completed == 'info'"></ion-icon>
diff --git a/src/addon/mod/workshop/pages/phase/phase.ts b/src/addon/mod/workshop/pages/phase/phase.ts
index 5ea13890f..8006680a6 100644
--- a/src/addon/mod/workshop/pages/phase/phase.ts
+++ b/src/addon/mod/workshop/pages/phase/phase.ts
@@ -27,10 +27,12 @@ import { CoreUtilsProvider } from '@providers/utils/utils';
 export class AddonModWorkshopPhaseInfoPage {
     phases: any;
     workshopPhase: number;
+    showSubmit: boolean;
 
     constructor(params: NavParams, private viewCtrl: ViewController, private utils: CoreUtilsProvider) {
         this.phases = params.get('phases');
         this.workshopPhase = params.get('workshopPhase');
+        this.showSubmit = params.get('showSubmit');
         const externalUrl = params.get('externalUrl');
 
         // Treat phases.

From 7cfb0a8c9d7f877c9dd7d9f229c8f91cd589a41e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 12 Dec 2019 17:43:40 +0100
Subject: [PATCH 217/257] MOBILE-3213 text: Fix check html is blank

---
 .../mod/workshop/pages/edit-submission/edit-submission.ts      | 3 ++-
 src/providers/utils/text.ts                                    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/addon/mod/workshop/pages/edit-submission/edit-submission.ts b/src/addon/mod/workshop/pages/edit-submission/edit-submission.ts
index 5c67457c5..10864c6ee 100644
--- a/src/addon/mod/workshop/pages/edit-submission/edit-submission.ts
+++ b/src/addon/mod/workshop/pages/edit-submission/edit-submission.ts
@@ -328,7 +328,8 @@ export class AddonModWorkshopEditSubmissionPage implements OnInit, OnDestroy {
 
         const noText = this.textUtils.htmlIsBlank(inputData.content);
         const noFiles = !inputData.attachmentfiles.length;
-        if (this.textRequired && noText || this.fileRequired && noFiles || noText && noFiles) {
+
+        if ((this.textRequired && noText) || (this.fileRequired && noFiles) || (noText && noFiles)) {
             this.domUtils.showAlertTranslated('core.notice', 'addon.mod_workshop.submissionrequiredcontent');
 
             return Promise.reject(null);
diff --git a/src/providers/utils/text.ts b/src/providers/utils/text.ts
index d4826c942..0f1202161 100644
--- a/src/providers/utils/text.ts
+++ b/src/providers/utils/text.ts
@@ -516,7 +516,7 @@ export class CoreTextUtilsProvider {
 
         this.template.innerHTML = content;
 
-        return this.template.textContent === '' && this.template.content.querySelector('img, object, hr') === null;
+        return this.template.content.textContent == '' && this.template.content.querySelector('img, object, hr') === null;
     }
 
     /**

From 211de7ce4b51a0133300166c76fd77e92673aa46 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 12 Dec 2019 17:46:48 +0100
Subject: [PATCH 218/257] MOBILE-3040 submission: Hide reusing submission
 button if it was empty

---
 .../assign/classes/base-submission-handler.ts | 11 ++++++++++
 .../addon-mod-assign-submission.html          |  2 +-
 .../components/submission/submission.ts       |  3 +++
 src/addon/mod/assign/providers/helper.ts      | 15 ++++++++++++++
 .../assign/providers/submission-delegate.ts   | 20 +++++++++++++++++++
 .../submission/file/providers/handler.ts      | 13 ++++++++++++
 .../onlinetext/providers/handler.ts           | 14 +++++++++++++
 7 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/src/addon/mod/assign/classes/base-submission-handler.ts b/src/addon/mod/assign/classes/base-submission-handler.ts
index 95ab92636..6d147d882 100644
--- a/src/addon/mod/assign/classes/base-submission-handler.ts
+++ b/src/addon/mod/assign/classes/base-submission-handler.ts
@@ -44,6 +44,17 @@ export class AddonModAssignBaseSubmissionHandler implements AddonModAssignSubmis
         return false;
     }
 
+    /**
+     * Check if a plugin has no data.
+     *
+     * @param assign The assignment.
+     * @param plugin The plugin object.
+     * @return Whether the plugin is empty.
+     */
+    isEmpty(assign: AddonModAssignAssign, plugin: AddonModAssignPlugin): boolean {
+        return true;
+    }
+
     /**
      * Should clear temporary data for a cancelled submission.
      *
diff --git a/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html
index 3d236da4b..e4cb512e5 100644
--- a/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -73,7 +73,7 @@
                         <a ion-button block text-wrap color="primary" *ngIf="!hasOffline && (!userSubmission || !userSubmission.status || userSubmission.status == statusNew)" (click)="goToEdit()">{{ 'addon.mod_assign.addsubmission' | translate }}</a>
                         <!-- If reopened, show addfromprevious and addnewattempt. -->
                         <ng-container *ngIf="!hasOffline && userSubmission && userSubmission.status == statusReopened">
-                            <a ion-button block text-wrap color="primary" (click)="copyPrevious()">{{ 'addon.mod_assign.addnewattemptfromprevious' | translate }}</a>
+                            <a *ngIf="!isPreviousAttemptEmpty" ion-button block text-wrap color="primary" (click)="copyPrevious()">{{ 'addon.mod_assign.addnewattemptfromprevious' | translate }}</a>
                             <a ion-button block text-wrap color="primary" (click)="goToEdit()">{{ 'addon.mod_assign.addnewattempt' | translate }}</a>
                         </ng-container>
                         <!-- Else show editsubmission. -->
diff --git a/src/addon/mod/assign/components/submission/submission.ts b/src/addon/mod/assign/components/submission/submission.ts
index 865c37ae6..9c231cabf 100644
--- a/src/addon/mod/assign/components/submission/submission.ts
+++ b/src/addon/mod/assign/components/submission/submission.ts
@@ -103,6 +103,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
     protected siteId: string; // Current site ID.
     protected currentUserId: number; // Current user ID.
     protected previousAttempt: AddonModAssignSubmissionPreviousAttempt; // The previous attempt.
+    protected isPreviousAttemptEmpty: boolean; // Whether the previous attempt contains an empty submission.
     protected submissionStatusAvailable: boolean; // Whether we were able to retrieve the submission status.
     protected originalGrades: any = {}; // Object with the original grade data, to check for changes.
     protected isDestroyed: boolean; // Whether the component has been destroyed.
@@ -373,6 +374,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
         let isBlind = !!this.blindId;
 
         this.previousAttempt = undefined;
+        this.isPreviousAttemptEmpty = true;
 
         if (!this.submitId) {
             this.submitId = this.currentUserId;
@@ -428,6 +430,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
                     return a.attemptnumber - b.attemptnumber;
                 });
                 this.previousAttempt = previousAttempts[previousAttempts.length - 1];
+                this.isPreviousAttemptEmpty = this.assignHelper.isSubmissionEmpty(this.assign, this.previousAttempt.submission);
             }
 
             // Treat last attempt.
diff --git a/src/addon/mod/assign/providers/helper.ts b/src/addon/mod/assign/providers/helper.ts
index afea6aae7..37d6ed427 100644
--- a/src/addon/mod/assign/providers/helper.ts
+++ b/src/addon/mod/assign/providers/helper.ts
@@ -181,6 +181,21 @@ export class AddonModAssignHelperProvider {
         return Promise.all(promises);
     }
 
+    /**
+     * Check if a submission has no content.
+     *
+     * @param assign Assignment object.
+     * @param submission Submission to inspect.
+     * @return Whether the submission is empty.
+     */
+    isSubmissionEmpty(assign: AddonModAssignAssign, submission?: AddonModAssignSubmission): boolean {
+        if (!submission) {
+            return true;
+        }
+
+        return !!submission.plugins.find((plugin) => this.submissionDelegate.isPluginEmpty(assign, plugin));
+    }
+
     /**
      * List the participants for a single assignment, with some summary info about their submissions.
      *
diff --git a/src/addon/mod/assign/providers/submission-delegate.ts b/src/addon/mod/assign/providers/submission-delegate.ts
index 673955cb1..89e29e5cf 100644
--- a/src/addon/mod/assign/providers/submission-delegate.ts
+++ b/src/addon/mod/assign/providers/submission-delegate.ts
@@ -43,6 +43,15 @@ export interface AddonModAssignSubmissionHandler extends CoreDelegateHandler {
     canEditOffline?(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
             plugin: AddonModAssignPlugin): boolean | Promise<boolean>;
 
+    /**
+     * Check if a plugin has no data.
+     *
+     * @param assign The assignment.
+     * @param plugin The plugin object.
+     * @return Whether the plugin is empty.
+     */
+    isEmpty?(assign: AddonModAssignAssign, plugin: AddonModAssignPlugin): boolean;
+
     /**
      * Should clear temporary data for a cancelled submission.
      *
@@ -368,6 +377,17 @@ export class AddonModAssignSubmissionDelegate extends CoreDelegate {
         return Promise.resolve(this.executeFunctionOnEnabled(pluginType, 'isEnabledForEdit'));
     }
 
+    /**
+     * Check if a plugin has no data.
+     *
+     * @param assign The assignment.
+     * @param plugin The plugin object.
+     * @return Whether the plugin is empty.
+     */
+    isPluginEmpty(assign: AddonModAssignAssign, plugin: AddonModAssignPlugin): boolean {
+        return this.executeFunctionOnEnabled(plugin.type, 'isEmpty', [assign, plugin]);
+    }
+
     /**
      * Prefetch any required data for a submission plugin.
      *
diff --git a/src/addon/mod/assign/submission/file/providers/handler.ts b/src/addon/mod/assign/submission/file/providers/handler.ts
index 8ff4f6599..3966b526f 100644
--- a/src/addon/mod/assign/submission/file/providers/handler.ts
+++ b/src/addon/mod/assign/submission/file/providers/handler.ts
@@ -61,6 +61,19 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
         return true;
     }
 
+    /**
+     * Check if a plugin has no data.
+     *
+     * @param assign The assignment.
+     * @param plugin The plugin object.
+     * @return Whether the plugin is empty.
+     */
+    isEmpty(assign: AddonModAssignAssign, plugin: AddonModAssignPlugin): boolean {
+        const files = this.assignProvider.getSubmissionPluginAttachments(plugin);
+
+        return files.length === 0;
+    }
+
     /**
      * Should clear temporary data for a cancelled submission.
      *
diff --git a/src/addon/mod/assign/submission/onlinetext/providers/handler.ts b/src/addon/mod/assign/submission/onlinetext/providers/handler.ts
index bc800d716..18bee29fa 100644
--- a/src/addon/mod/assign/submission/onlinetext/providers/handler.ts
+++ b/src/addon/mod/assign/submission/onlinetext/providers/handler.ts
@@ -54,6 +54,20 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
         return false;
     }
 
+    /**
+     * Check if a plugin has no data.
+     *
+     * @param assign The assignment.
+     * @param plugin The plugin object.
+     * @return Whether the plugin is empty.
+     */
+    isEmpty(assign: AddonModAssignAssign, plugin: AddonModAssignPlugin): boolean {
+        const text = this.assignProvider.getSubmissionPluginText(plugin, true),
+            files = this.assignProvider.getSubmissionPluginAttachments(plugin);
+
+        return text.length === 0 && files.length === 0;
+    }
+
     /**
      * This function will be called when the user wants to create a new submission based on the previous one.
      * It should add to pluginData the data to send to server based in the data in plugin (previous attempt).

From 28d9954b96f7a51d1a99a18c148f7a53ab8541bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 12 Dec 2019 18:01:13 +0100
Subject: [PATCH 219/257] MOBILE-3213 forum: Revert part of MOBILE-3218 to link
 discussions

---
 src/addon/mod/forum/providers/discussion-link-handler.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/addon/mod/forum/providers/discussion-link-handler.ts b/src/addon/mod/forum/providers/discussion-link-handler.ts
index 67e87c4cd..e884b6545 100644
--- a/src/addon/mod/forum/providers/discussion-link-handler.ts
+++ b/src/addon/mod/forum/providers/discussion-link-handler.ts
@@ -45,11 +45,8 @@ export class AddonModForumDiscussionLinkHandler extends CoreContentLinksHandlerB
             CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
         data = data || {};
 
-        if (!data.instance) {
-            // Without the forumId discussions cannot be loaded (from link).
-
-            return [];
-        }
+        // On 3.6 downwards, it will open the discussion but without knowing the lock status of the discussion.
+        // However canreply will be false.
 
         return [{
             action: (siteId, navCtrl?): void => {

From 4209dd139330f0f22df1a194137aff2ae2a2a48d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 12 Dec 2019 12:15:44 +0100
Subject: [PATCH 220/257] MOBILE-3213 notes: Fix HTML not rendered in notes

---
 src/addon/notes/components/list/addon-notes-list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addon/notes/components/list/addon-notes-list.html b/src/addon/notes/components/list/addon-notes-list.html
index 903727ec3..0409e6aae 100644
--- a/src/addon/notes/components/list/addon-notes-list.html
+++ b/src/addon/notes/components/list/addon-notes-list.html
@@ -53,7 +53,7 @@
                         <ion-icon name="trash"></ion-icon>
                     </button>
                 </ion-item>
-                <ion-item text-wrap>{{ note.content }}</ion-item>
+                <ion-item text-wrap><core-format-text [text]="note.content" [filter]="false"></core-format-text></ion-item>
             </ion-card>
         </ion-list>
 

From 268e45ef09c3052928e370e1a0457818d13d5e1d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 12 Dec 2019 13:12:17 +0100
Subject: [PATCH 221/257] MOBILE-3213 badges: Don't show alignment if broken

---
 .../pages/issued-badge/issued-badge.html      |  2 +-
 src/addon/badges/providers/badges.ts          | 26 ++++++++++++-------
 .../entries/addon-blog-entries.html           |  2 +-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/addon/badges/pages/issued-badge/issued-badge.html b/src/addon/badges/pages/issued-badge/issued-badge.html
index 75ee12adf..ec4dc0e4f 100644
--- a/src/addon/badges/pages/issued-badge/issued-badge.html
+++ b/src/addon/badges/pages/issued-badge/issued-badge.html
@@ -156,7 +156,7 @@
                 <h2>{{ 'addon.badges.relatedbages' | translate}}</h2>
             </ion-item-divider>
             <ion-item text-wrap *ngFor="let relatedBadge of badge.relatedbadges">
-                <h2><{{ relatedBadge.name }}</h2>
+                <h2>{{ relatedBadge.name }}</h2>
             </ion-item>
             <ion-item text-wrap *ngIf="badge.relatedbadges.length == 0">
                 <h2>{{ 'addon.badges.norelated' | translate}}</h2>
diff --git a/src/addon/badges/providers/badges.ts b/src/addon/badges/providers/badges.ts
index bfb70431e..bce298dc4 100644
--- a/src/addon/badges/providers/badges.ts
+++ b/src/addon/badges/providers/badges.ts
@@ -91,6 +91,12 @@ export class AddonBadgesProvider {
                     // In 3.7, competencies was renamed to alignment. Rename the property in 3.6 too.
                     response.badges.forEach((badge) => {
                         badge.alignment = badge.alignment || badge.competencies;
+
+                        // Check that the alignment is valid, they were broken in 3.7.
+                        if (badge.alignment && badge.alignment[0] && typeof badge.alignment[0].targetname == 'undefined') {
+                            // If any badge lacks targetname it means they are affected by the Moodle bug, don't display them.
+                            delete badge.alignment;
+                        }
                     });
 
                     return response.badges;
@@ -175,20 +181,20 @@ export type AddonBadgesUserBadge = {
     alignment?: { // @since 3.7. Calculated by the app for 3.6 sites. Badge alignments.
         id?: number; // Alignment id.
         badgeid?: number; // Badge id.
-        targetName?: string; // Target name.
-        targetUrl?: string; // Target URL.
-        targetDescription?: string; // Target description.
-        targetFramework?: string; // Target framework.
-        targetCode?: string; // Target code.
+        targetname?: string; // Target name.
+        targeturl?: string; // Target URL.
+        targetdescription?: string; // Target description.
+        targetframework?: string; // Target framework.
+        targetcode?: string; // Target code.
     }[];
     competencies?: { // @deprecated from 3.7. @since 3.6. In 3.7 it was renamed to alignment.
         id?: number; // Alignment id.
         badgeid?: number; // Badge id.
-        targetName?: string; // Target name.
-        targetUrl?: string; // Target URL.
-        targetDescription?: string; // Target description.
-        targetFramework?: string; // Target framework.
-        targetCode?: string; // Target code.
+        targetname?: string; // Target name.
+        targeturl?: string; // Target URL.
+        targetdescription?: string; // Target description.
+        targetframework?: string; // Target framework.
+        targetcode?: string; // Target code.
     }[];
     relatedbadges?: { // @since 3.6. Related badges.
         id: number; // Badge id.
diff --git a/src/addon/blog/components/entries/addon-blog-entries.html b/src/addon/blog/components/entries/addon-blog-entries.html
index 557bf3ed3..a77b45b2f 100644
--- a/src/addon/blog/components/entries/addon-blog-entries.html
+++ b/src/addon/blog/components/entries/addon-blog-entries.html
@@ -5,7 +5,7 @@
     <core-loading [hideUntil]="loaded" class="core-loading-center">
         <ion-item *ngIf="showMyEntriesToggle">
             <ion-label>{{ 'addon.blog.showonlyyourentries' | translate }}</ion-label>
-            <ion-toggle [(ngModel)]="onlyMyEntries" (ionChange)="onlyMyEntriesToggleChanged(onlyMyEntries)">></ion-toggle>
+            <ion-toggle [(ngModel)]="onlyMyEntries" (ionChange)="onlyMyEntriesToggleChanged(onlyMyEntries)"></ion-toggle>
         </ion-item>
         <core-empty-box *ngIf="entries && entries.length == 0" icon="fa-newspaper-o" [message]="'addon.blog.noentriesyet' | translate"></core-empty-box>
         <ng-container *ngFor="let entry of entries">

From 72a2b571cdc20dbf881b86b43df8138a45624ada Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 13 Dec 2019 08:30:54 +0100
Subject: [PATCH 222/257] MOBILE-3213 folder: Fix PTR in folder

---
 src/addon/mod/folder/components/index/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addon/mod/folder/components/index/index.ts b/src/addon/mod/folder/components/index/index.ts
index 573b4dfb6..922ec3836 100644
--- a/src/addon/mod/folder/components/index/index.ts
+++ b/src/addon/mod/folder/components/index/index.ts
@@ -105,7 +105,7 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
 
         if (this.canGetFolder) {
             promise = this.folderProvider.getFolder(this.courseId, this.module.id).then((folder) => {
-                return this.courseProvider.loadModuleContents(this.module, this.courseId).then(() => {
+                return this.courseProvider.loadModuleContents(this.module, this.courseId, undefined, false, refresh).then(() => {
                     folderContents = this.module.contents;
 
                     return folder;

From 5053274a85964bf6781afae8c6023e52cc44c38a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 13 Dec 2019 09:26:04 +0100
Subject: [PATCH 223/257] MOBILE-3213 resource: Fix PTR on mod resource

---
 src/core/course/providers/helper.ts | 85 ++++++++++++++++++-----------
 1 file changed, 54 insertions(+), 31 deletions(-)

diff --git a/src/core/course/providers/helper.ts b/src/core/course/providers/helper.ts
index ffbc281b5..1f393b487 100644
--- a/src/core/course/providers/helper.ts
+++ b/src/core/course/providers/helper.ts
@@ -661,7 +661,6 @@ export class CoreCourseHelperProvider {
 
         const mainFile = files[0],
             fileUrl = this.fileHelper.getFileUrl(mainFile),
-            timemodified = this.fileHelper.getFileTimemodified(mainFile),
             result = {
                 fixedUrl: undefined,
                 path: undefined,
@@ -678,48 +677,23 @@ export class CoreCourseHelperProvider {
                 return this.filepoolProvider.getPackageStatus(siteId, component, componentId).then((status) => {
                     result.status = status;
 
-                    const isWifi = this.appProvider.isWifi(),
-                        isOnline = this.appProvider.isOnline();
-
                     if (status === CoreConstants.DOWNLOADED) {
                         // Get the local file URL.
                         return this.filepoolProvider.getInternalUrlByUrl(siteId, fileUrl).catch((error) => {
-                            // File not found, mark the module as not downloaded and reject.
+                            // File not found, mark the module as not downloaded and try again.
                             return this.filepoolProvider.storePackageStatus(siteId, CoreConstants.NOT_DOWNLOADED, component,
                                     componentId).then(() => {
 
-                                return Promise.reject(error);
+                                return this.downloadModuleWithMainFile(module, courseId, fixedUrl, files, status, component,
+                                        componentId, siteId);
                             });
                         });
                     } else if (status === CoreConstants.DOWNLOADING && !this.appProvider.isDesktop()) {
                         // Return the online URL.
                         return fixedUrl;
                     } else {
-                        if (!isOnline && status === CoreConstants.NOT_DOWNLOADED) {
-                            // Not downloaded and we're offline, reject.
-                            return Promise.reject(this.translate.instant('core.networkerrormsg'));
-                        }
-
-                        return this.filepoolProvider.shouldDownloadBeforeOpen(fixedUrl, mainFile.filesize).then(() => {
-                            // Download and then return the local URL.
-                            return this.downloadModule(module, courseId, component, componentId, files, siteId).then(() => {
-                                return this.filepoolProvider.getInternalUrlByUrl(siteId, fileUrl);
-                            });
-                        }, () => {
-                            // Start the download if in wifi, but return the URL right away so the file is opened.
-                            if (isWifi) {
-                                this.downloadModule(module, courseId, component, componentId, files, siteId);
-                            }
-
-                            if (!this.fileHelper.isStateDownloaded(status) || isOnline) {
-                                // Not downloaded or online, return the online URL.
-                                return fixedUrl;
-                            } else {
-                                // Outdated but offline, so we return the local URL. Use getUrlByUrl so it's added to the queue.
-                                return this.filepoolProvider.getUrlByUrl(siteId, fileUrl, component, componentId, timemodified,
-                                        false, false, mainFile);
-                            }
-                        });
+                        return this.downloadModuleWithMainFile(module, courseId, fixedUrl, files, status, component, componentId,
+                                siteId);
                     }
                 }).then((path) => {
                     result.path = path;
@@ -735,6 +709,55 @@ export class CoreCourseHelperProvider {
         });
     }
 
+    /**
+     * Convenience function to download a module that has a main file and return the local file's path and other info.
+     * This is meant for modules like mod_resource.
+     *
+     * @param module The module to download.
+     * @param courseId The course ID of the module.
+     * @param fixedUrl Main file's fixed URL.
+     * @param files List of files of the module.
+     * @param status The package status.
+     * @param component The component to link the files to.
+     * @param componentId An ID to use in conjunction with the component.
+     * @param siteId The site ID. If not defined, current site.
+     * @return Promise resolved when done.
+     */
+    protected downloadModuleWithMainFile(module: any, courseId: number, fixedUrl: string, files: any[], status: string,
+            component?: string, componentId?: string | number, siteId?: string): Promise<string> {
+
+        const isOnline = this.appProvider.isOnline();
+        const mainFile = files[0];
+        const fileUrl = this.fileHelper.getFileUrl(mainFile);
+        const timemodified = this.fileHelper.getFileTimemodified(mainFile);
+
+        if (!isOnline && status === CoreConstants.NOT_DOWNLOADED) {
+            // Not downloaded and we're offline, reject.
+            return Promise.reject(this.translate.instant('core.networkerrormsg'));
+        }
+
+        return this.filepoolProvider.shouldDownloadBeforeOpen(fixedUrl, mainFile.filesize).then(() => {
+            // Download and then return the local URL.
+            return this.downloadModule(module, courseId, component, componentId, files, siteId).then(() => {
+                return this.filepoolProvider.getInternalUrlByUrl(siteId, fileUrl);
+            });
+        }, () => {
+            // Start the download if in wifi, but return the URL right away so the file is opened.
+            if (this.appProvider.isWifi()) {
+                this.downloadModule(module, courseId, component, componentId, files, siteId);
+            }
+
+            if (!this.fileHelper.isStateDownloaded(status) || isOnline) {
+                // Not downloaded or online, return the online URL.
+                return fixedUrl;
+            } else {
+                // Outdated but offline, so we return the local URL. Use getUrlByUrl so it's added to the queue.
+                return this.filepoolProvider.getUrlByUrl(siteId, fileUrl, component, componentId, timemodified,
+                        false, false, mainFile);
+            }
+        });
+    }
+
     /**
      * Convenience function to download a module.
      *

From 63bff7c4f84afa9bc7f82c7ecda0f65abf29c839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 13 Dec 2019 10:29:10 +0100
Subject: [PATCH 224/257] MOBILE-3213 forum: Fix discussion links when nested
 view is on

---
 .../mod/forum/pages/discussion/discussion.ts   | 18 +++++++++++-------
 .../forum/providers/discussion-link-handler.ts |  2 +-
 src/addon/mod/forum/providers/forum.ts         |  9 ++-------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/addon/mod/forum/pages/discussion/discussion.ts b/src/addon/mod/forum/pages/discussion/discussion.ts
index cc4cd42f6..e49b8684d 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.ts
+++ b/src/addon/mod/forum/pages/discussion/discussion.ts
@@ -326,10 +326,17 @@ export class AddonModForumDiscussionPage implements OnDestroy {
         }).then(() => {
             let posts = offlineReplies.concat(onlinePosts);
 
+            const startingPost = this.forumProvider.extractStartingPost(posts);
+            if (startingPost) {
+                // Update discussion data from first post.
+                this.discussion = Object.assign(this.discussion || {}, startingPost);
+            }
+
             // If sort type is nested, normal sorting is disabled and nested posts will be displayed.
             if (this.sort == 'nested') {
                 // Sort first by creation date to make format tree work.
                 this.forumProvider.sortDiscussionPosts(posts, 'ASC');
+
                 posts = this.utils.formatTree(posts, 'parent', 'id', this.discussion.id);
             } else {
                 // Set default reply subject.
@@ -364,7 +371,7 @@ export class AddonModForumDiscussionPage implements OnDestroy {
                     }
                 }));
 
-                // Fetch the discussion if not passed as parameter.
+                // The discussion object was not passed as parameter and there is no starting post. Should not happen.
                 if (!this.discussion) {
                     promises.push(this.loadDiscussion(this.forumId, this.discussionId));
                 }
@@ -373,12 +380,9 @@ export class AddonModForumDiscussionPage implements OnDestroy {
             }).catch(() => {
                 // Ignore errors.
             }).then(() => {
-                const startingPost = this.forumProvider.extractStartingPost(posts);
-                if (startingPost) {
-                    // Update discussion data from first post.
-                    this.discussion = Object.assign(this.discussion || {}, startingPost);
-                } else if (!this.discussion) {
-                    // The discussion object was not passed as parameter and there is no starting post.
+
+                if (!this.discussion) {
+                    // The discussion object was not passed as parameter and there is no starting post. Should not happen.
                     return Promise.reject('Invalid forum discussion.');
                 }
 
diff --git a/src/addon/mod/forum/providers/discussion-link-handler.ts b/src/addon/mod/forum/providers/discussion-link-handler.ts
index e884b6545..546e477f0 100644
--- a/src/addon/mod/forum/providers/discussion-link-handler.ts
+++ b/src/addon/mod/forum/providers/discussion-link-handler.ts
@@ -51,7 +51,7 @@ export class AddonModForumDiscussionLinkHandler extends CoreContentLinksHandlerB
         return [{
             action: (siteId, navCtrl?): void => {
                 const pageParams: any = {
-                    courseId: courseId || parseInt(params.courseid, 10) || parseInt(params.cid, 10),
+                    courseId: courseId || parseInt(params.courseid, 10) || parseInt(params.cid, 10) || undefined,
                     discussionId: parseInt(params.d, 10),
                     cmId: data.cmid && parseInt(data.cmid, 10),
                     forumId: data.instance && parseInt(data.instance, 10)
diff --git a/src/addon/mod/forum/providers/forum.ts b/src/addon/mod/forum/providers/forum.ts
index a852c2aec..96fd64ce1 100644
--- a/src/addon/mod/forum/providers/forum.ts
+++ b/src/addon/mod/forum/providers/forum.ts
@@ -278,14 +278,9 @@ export class AddonModForumProvider {
      * @return Starting post or undefined if not found.
      */
     extractStartingPost(posts: any[]): any {
-        // Check the last post first, since they'll usually be ordered by create time.
-        for (let i = posts.length - 1; i >= 0; i--) {
-            if (posts[i].parent == 0) {
-                return posts.splice(i, 1).pop(); // Remove it from the array.
-            }
-        }
+        const index = posts.findIndex((post) => post.parent == 0);
 
-        return undefined;
+        return index >= 0 ? posts.splice(index, 1).pop() : undefined;
     }
 
     /**

From 438ae42a169ba6e3885e64797b95901628519fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 13 Dec 2019 11:10:28 +0100
Subject: [PATCH 225/257] MOBILE-3213 style: Fix some darkmode styles

---
 src/app/app.scss                                      | 5 +++++
 src/components/rich-text-editor/rich-text-editor.scss | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app/app.scss b/src/app/app.scss
index a77cf58e8..6e71d9caf 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -367,6 +367,9 @@ ion-app.app-root {
     color: $black;
     border-radius: 5px;
     background: rgba(255, 255, 255, .5);
+    @include darkmode() {
+      background-color: rgba(0, 0, 0, .5);
+    }
     text-align: center;
 
     width: 32px;
@@ -376,6 +379,8 @@ ion-app.app-root {
     font-size: 24px;
     ion-icon {
       font-size: 24px;
+
+
     }
   }
 
diff --git a/src/components/rich-text-editor/rich-text-editor.scss b/src/components/rich-text-editor/rich-text-editor.scss
index d4ba94b06..e2dd2ac07 100644
--- a/src/components/rich-text-editor/rich-text-editor.scss
+++ b/src/components/rich-text-editor/rich-text-editor.scss
@@ -7,7 +7,7 @@ ion-app.app-root core-rich-text-editor {
     display: flex;
     flex-direction: column;
     @include darkmode() {
-        background-color: $black;
+        background-color: $gray-darker;
     }
 
     .core-rte-editor, .core-textarea {
@@ -17,7 +17,7 @@ ion-app.app-root core-rich-text-editor {
         resize: none;
         background-color: $white;
         @include darkmode() {
-            background-color: $black;
+            background-color: $gray-darker;
             color: $white;
         }
     }

From 9ee135e0b59504ddf20c3ff0fa6da402cca24c90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 13 Dec 2019 12:13:33 +0100
Subject: [PATCH 226/257] MOBILE-3213 settings: Hide space usage values when
 loading

---
 src/core/settings/pages/space-usage/space-usage.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/settings/pages/space-usage/space-usage.html b/src/core/settings/pages/space-usage/space-usage.html
index a21f0208d..f4d247a89 100644
--- a/src/core/settings/pages/space-usage/space-usage.html
+++ b/src/core/settings/pages/space-usage/space-usage.html
@@ -12,8 +12,8 @@
             <h2 text-wrap><core-format-text [text]="site.siteName" clean="true" [siteId]="site.id"></core-format-text></h2>
             <p text-wrap>{{ site.fullName }}</p>
             <div item-end>
-                <p>{{ site.spaceUsage | coreBytesToSize }}</p>
-                <p>{{ 'core.settings.entriesincache' | translate: { $a: site.cacheEntries } }}</p>
+                <p *ngIf="site.spaceUsage != null" text-end>{{ site.spaceUsage | coreBytesToSize }}</p>
+                <p *ngIf="site.cacheEntries != null" text-end>{{ 'core.settings.entriesincache' | translate: { $a: site.cacheEntries } }}</p>
             </div>
             <button ion-button icon-only clear color="danger" item-end (click)="deleteSiteStorage(site)" [hidden]="!site.spaceUsage > '0' && !site.cacheEntries > '0'" [attr.aria-label]="'core.settings.deletesitefilestitle' | translate">
                 <ion-icon name="trash"></ion-icon>

From 4ecb148c192d39a2fc25ddf33b88c371059a7011 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 13 Dec 2019 12:30:07 +0100
Subject: [PATCH 227/257] MOBILE-3213 ios: Fix RTE toolbar in iOS 12+

---
 src/components/rich-text-editor/rich-text-editor.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/rich-text-editor/rich-text-editor.ts b/src/components/rich-text-editor/rich-text-editor.ts
index 83d4baaef..d4367e509 100644
--- a/src/components/rich-text-editor/rich-text-editor.ts
+++ b/src/components/rich-text-editor/rich-text-editor.ts
@@ -180,18 +180,19 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
                 if (this.platform.is('android')) {
                     // In Android we ignore the keyboard height because it is not part of the web view.
                     height = this.domUtils.getContentHeight(this.content) - this.getSurroundingHeight(this.element);
-                } else if (this.platform.is('ios') && this.kbHeight > 0) {
-                    // Keyboard open in iOS.
-                    // In this case, the header disappears or is scrollable, so we need to adjust the calculations.
+                } else if (this.platform.is('ios') && this.kbHeight > 0 && this.platform.version().major < 12) {
+                    // Keyboard open in iOS 11 or previous. The window height changes when the keyboard is open.
                     height = window.innerHeight - this.getSurroundingHeight(this.element);
 
                     if (this.element.getBoundingClientRect().top < 40) {
                         // In iOS sometimes the editor is placed below the status bar. Move the scroll a bit so it doesn't happen.
                         window.scrollTo(window.scrollX, window.scrollY - 40);
                     }
+
                 } else {
                     // Header is fixed, use the content to calculate the editor height.
                     height = this.domUtils.getContentHeight(this.content) - this.kbHeight - this.getSurroundingHeight(this.element);
+
                 }
 
                 if (height > this.minHeight) {
@@ -549,12 +550,14 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
     }
 
     /**
-     * Hide the toolbar.
+     * Hide the toolbar in phone mode.
      */
     hideToolbar($event: any): void {
         this.stopBubble($event);
 
-        this.toolbarHidden = true;
+        if (this.isPhone) {
+            this.toolbarHidden = true;
+        }
     }
 
     /**

From 1d8cf13348b34d49cd639fe0ad5c0969f1434377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 13 Dec 2019 13:22:44 +0100
Subject: [PATCH 228/257] MOBILE-3213 course: Pass section on activities block

---
 .../pages/list-mod-type/list-mod-type.html    |  8 +++---
 .../pages/list-mod-type/list-mod-type.ts      | 25 ++++++++-----------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/core/course/pages/list-mod-type/list-mod-type.html b/src/core/course/pages/list-mod-type/list-mod-type.html
index 39678efed..eeb723d8a 100644
--- a/src/core/course/pages/list-mod-type/list-mod-type.html
+++ b/src/core/course/pages/list-mod-type/list-mod-type.html
@@ -8,11 +8,13 @@
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="loaded">
-        <core-empty-box *ngIf="!modules || !modules.length" icon="qr-scanner" [message]="'core.course.nocontentavailable' | translate"></core-empty-box>
+        <core-empty-box *ngIf="!sections || !sections.length" icon="qr-scanner" [message]="'core.course.nocontentavailable' | translate"></core-empty-box>
 
         <ion-list>
-            <ng-container *ngFor="let module of modules">
-                <core-course-module *ngIf="module.visibleoncoursepage !== 0" [module]="module" [courseId]="courseId" [downloadEnabled]="downloadEnabled"></core-course-module>
+            <ng-container text-wrap *ngFor="let section of sections" >
+                <ng-container *ngFor="let module of section.modules">
+                    <core-course-module *ngIf="module.visibleoncoursepage !== 0" [module]="module" [section]="section" [courseId]="courseId" [downloadEnabled]="downloadEnabled"></core-course-module>
+                </ng-container>
             </ng-container>
         </ion-list>
     </core-loading>
diff --git a/src/core/course/pages/list-mod-type/list-mod-type.ts b/src/core/course/pages/list-mod-type/list-mod-type.ts
index 42700fa85..aa2c218f7 100644
--- a/src/core/course/pages/list-mod-type/list-mod-type.ts
+++ b/src/core/course/pages/list-mod-type/list-mod-type.ts
@@ -31,7 +31,7 @@ import { CoreConstants } from '@core/constants';
 })
 export class CoreCourseListModTypePage {
 
-    modules = [];
+    sections = [];
     title: string;
     loaded = false;
     downloadEnabled = false;
@@ -69,17 +69,15 @@ export class CoreCourseListModTypePage {
         // Get all the modules in the course.
         return this.courseProvider.getSections(this.courseId, false, true).then((sections) => {
 
-            this.modules = [];
-
-            sections.forEach((section) => {
+            this.sections = sections.filter((section) => {
                 if (!section.modules) {
-                    return;
+                    return false;
                 }
 
-                section.modules.forEach((mod) => {
+                section.modules = section.modules.filter((mod) => {
                     if (mod.uservisible === false || !this.courseProvider.moduleHasView(mod)) {
                         // Ignore this module.
-                        return;
+                        return false;
                     }
 
                     if (this.modName === 'resources') {
@@ -90,21 +88,18 @@ export class CoreCourseListModTypePage {
                         }
 
                         if (this.archetypes[mod.modname] == CoreConstants.MOD_ARCHETYPE_RESOURCE) {
-                            this.modules.push(mod);
+                            return true;
                         }
 
                     } else if (mod.modname == this.modName) {
-                        this.modules.push(mod);
+                        return true;
                     }
                 });
+
+                return section.modules.length > 0;
             });
 
-            // Get the handler data for the modules.
-            const fakeSection = {
-                visible: 1,
-                modules: this.modules
-            };
-            this.courseHelper.addHandlerDataForModules([fakeSection], this.courseId);
+            this.courseHelper.addHandlerDataForModules(this.sections, this.courseId);
         }).catch((error) => {
             this.domUtils.showErrorModalDefault(error, 'Error getting data');
         });

From eaeff7e2b70ae803b67318ddf741ae16f3806cdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 13 Dec 2019 14:20:55 +0100
Subject: [PATCH 229/257] MOBILE-3213 lesson: Show lesson menu as a lateral
 modal

---
 src/addon/mod/lesson/pages/player/player.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/addon/mod/lesson/pages/player/player.ts b/src/addon/mod/lesson/pages/player/player.ts
index 4d9859d42..c29ad99b5 100644
--- a/src/addon/mod/lesson/pages/player/player.ts
+++ b/src/addon/mod/lesson/pages/player/player.ts
@@ -101,7 +101,11 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy {
         // Create the navigation modal.
         this.menuModal = modalCtrl.create('AddonModLessonMenuModalPage', {
             page: this
-        });
+        }, { cssClass: 'core-modal-lateral',
+            showBackdrop: true,
+            enableBackdropDismiss: true,
+            enterAnimation: 'core-modal-lateral-transition',
+            leaveAnimation: 'core-modal-lateral-transition' });
     }
 
     /**

From f454ed291f9639d09313c20cf684dd6c09f2f7c5 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 13 Dec 2019 15:11:18 +0100
Subject: [PATCH 230/257] MOBILE-3213 feedback: Fix question name not filtered

---
 src/addon/mod/feedback/pages/form/form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addon/mod/feedback/pages/form/form.html b/src/addon/mod/feedback/pages/form/form.html
index 189131ab6..adb569d88 100644
--- a/src/addon/mod/feedback/pages/form/form.html
+++ b/src/addon/mod/feedback/pages/form/form.html
@@ -17,7 +17,7 @@
                     <ion-item text-wrap *ngIf="item.typ != 'pagebreak'" [color]="item.dependitem > 0 ? 'light' : ''" [class.core-danger-item]="item.isEmpty || item.hasError">
                         <ion-label *ngIf="item.name" [core-mark-required]="item.required" stacked>
                             <span *ngIf="feedback.autonumbering && item.itemnumber">{{item.itemnumber}}. </span>
-                            <core-format-text [component]="component" [componentId]="componentId" [text]="item.name" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
+                            <core-format-text [component]="component" [componentId]="componentId" [text]="item.name" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId" [wsNotFiltered]="true"></core-format-text>
                             <span *ngIf="item.postfix" class="addon-mod_feedback-postfix">{{item.postfix}}</span>
                         </ion-label>
                         <div item-content class="addon-mod_feedback-form-content" *ngIf="item.template">

From efa962aab307183af73d2882acafc0e9d714d917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 13 Dec 2019 16:18:48 +0100
Subject: [PATCH 231/257] MOBILE-3213 survey: Invalidate survey after sync

---
 src/addon/mod/survey/providers/sync.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/addon/mod/survey/providers/sync.ts b/src/addon/mod/survey/providers/sync.ts
index 0733baf8d..2f43c7f28 100644
--- a/src/addon/mod/survey/providers/sync.ts
+++ b/src/addon/mod/survey/providers/sync.ts
@@ -202,9 +202,11 @@ export class AddonModSurveySyncProvider extends CoreCourseActivitySyncBaseProvid
                 });
             }).then(() => {
                 if (courseId) {
-                    // Data has been sent to server, update survey data.
-                    return this.courseProvider.getModuleBasicInfoByInstance(surveyId, 'survey', siteId).then((module) => {
-                        return this.prefetchAfterUpdate(module, courseId, undefined, siteId);
+                    return this.surveyProvider.invalidateSurveyData(courseId, siteId).then(() => {
+                        // Data has been sent to server, update survey data.
+                        return this.courseProvider.getModuleBasicInfoByInstance(surveyId, 'survey', siteId).then((module) => {
+                            return this.prefetchAfterUpdate(module, courseId, undefined, siteId);
+                        });
                     }).catch(() => {
                         // Ignore errors.
                     });

From af38ef23831daf4db3baddf8b2853cf5e3b8d531 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 13 Dec 2019 18:42:23 +0100
Subject: [PATCH 232/257] MOBILE-3213 assign: Fix not refreshed after copy
 previous submission

---
 src/addon/mod/assign/providers/assign.ts | 42 ++++++++++++++++--------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/addon/mod/assign/providers/assign.ts b/src/addon/mod/assign/providers/assign.ts
index 34c02701d..2ab77ae3a 100644
--- a/src/addon/mod/assign/providers/assign.ts
+++ b/src/addon/mod/assign/providers/assign.ts
@@ -119,6 +119,25 @@ export class AddonModAssignProvider {
         return assign.submissiondrafts;
     }
 
+    /**
+     * Fix some submission status params.
+     *
+     * @param site Site to use.
+     * @param userId User Id (empty for current user).
+     * @param groupId Group Id (empty for all participants).
+     * @param isBlind If blind marking is enabled or not.
+     * @return Object with fixed params.
+     */
+    protected fixSubmissionStatusParams(site: CoreSite, userId?: number, groupId?: number, isBlind?: boolean)
+            : {userId: number, groupId: number, isBlind: boolean} {
+
+        return {
+            isBlind: !userId ? false : !!isBlind,
+            groupId: site.isVersionGreaterEqualThan('3.5') ? groupId || 0 : 0,
+            userId: userId || site.getUserId(),
+        };
+    }
+
     /**
      * Get an assignment by course module ID.
      *
@@ -502,24 +521,23 @@ export class AddonModAssignProvider {
     getSubmissionStatus(assignId: number, userId?: number, groupId?: number, isBlind?: boolean, filter: boolean = true,
             ignoreCache?: boolean, siteId?: string): Promise<AddonModAssignGetSubmissionStatusResult> {
 
-        userId = userId || 0;
-
         return this.sitesProvider.getSite(siteId).then((site) => {
-            groupId = site.isVersionGreaterEqualThan('3.5') ? groupId || 0 : 0;
+            const fixedParams = this.fixSubmissionStatusParams(site, userId, groupId, isBlind);
 
             const params = {
                     assignid: assignId,
-                    userid: userId
+                    userid: fixedParams.userId
                 },
                 preSets: CoreSiteWSPreSets = {
-                    cacheKey: this.getSubmissionStatusCacheKey(assignId, userId, groupId, isBlind),
+                    cacheKey: this.getSubmissionStatusCacheKey(assignId, fixedParams.userId, fixedParams.groupId,
+                            fixedParams.isBlind),
                     getCacheUsingCacheKey: true, // We use the cache key to take isBlind into account.
                     filter: filter,
                     rewriteurls: filter
                 };
 
-            if (groupId) {
-                params['groupid'] = groupId;
+            if (fixedParams.groupId) {
+                params['groupid'] = fixedParams.groupId;
             }
 
             if (ignoreCache) {
@@ -578,11 +596,6 @@ export class AddonModAssignProvider {
      * @return Cache key.
      */
     protected getSubmissionStatusCacheKey(assignId: number, userId: number, groupId?: number, isBlind?: boolean): string {
-        if (!userId) {
-            isBlind = false;
-            userId = this.sitesProvider.getCurrentSiteUserId();
-        }
-
         return this.getSubmissionsCacheKey(assignId) + ':' + userId + ':' + (isBlind ? 1 : 0) + ':' + groupId;
     }
 
@@ -809,7 +822,10 @@ export class AddonModAssignProvider {
     invalidateSubmissionStatusData(assignId: number, userId?: number, groupId?: number, isBlind?: boolean, siteId?: string):
             Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
-            return site.invalidateWsCacheForKey(this.getSubmissionStatusCacheKey(assignId, userId, groupId, isBlind));
+            const fixedParams = this.fixSubmissionStatusParams(site, userId, groupId, isBlind);
+
+            return site.invalidateWsCacheForKey(this.getSubmissionStatusCacheKey(assignId, fixedParams.userId,
+                    fixedParams.groupId, fixedParams.isBlind));
         });
     }
 

From 067de295621f8eb326bd351134069f83b7b96dc0 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 16 Dec 2019 09:08:11 +0100
Subject: [PATCH 233/257] MOBILE-3040 submission: Ignore files to determine if
 online text is empty

---
 .../mod/assign/submission/onlinetext/providers/handler.ts   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/addon/mod/assign/submission/onlinetext/providers/handler.ts b/src/addon/mod/assign/submission/onlinetext/providers/handler.ts
index 18bee29fa..9275206bd 100644
--- a/src/addon/mod/assign/submission/onlinetext/providers/handler.ts
+++ b/src/addon/mod/assign/submission/onlinetext/providers/handler.ts
@@ -62,10 +62,10 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
      * @return Whether the plugin is empty.
      */
     isEmpty(assign: AddonModAssignAssign, plugin: AddonModAssignPlugin): boolean {
-        const text = this.assignProvider.getSubmissionPluginText(plugin, true),
-            files = this.assignProvider.getSubmissionPluginAttachments(plugin);
+        const text = this.assignProvider.getSubmissionPluginText(plugin, true);
 
-        return text.length === 0 && files.length === 0;
+        // If the text is empty, we can ignore files because they won't be visible anyways.
+        return text.trim().length === 0;
     }
 
     /**

From 826c9a0f309b19dcc7be5566630119a79d06ecd7 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 16 Dec 2019 12:40:47 +0100
Subject: [PATCH 234/257] MOBILE-3213 files: Refactor files size calculation to
 avoid network requests

---
 .../submission/file/providers/handler.ts      | 69 +++----------------
 .../onlinetext/providers/handler.ts           | 34 +++------
 src/providers/file-helper.ts                  | 63 ++++++++++++++++-
 3 files changed, 79 insertions(+), 87 deletions(-)

diff --git a/src/addon/mod/assign/submission/file/providers/handler.ts b/src/addon/mod/assign/submission/file/providers/handler.ts
index 8ff4f6599..6a459dadd 100644
--- a/src/addon/mod/assign/submission/file/providers/handler.ts
+++ b/src/addon/mod/assign/submission/file/providers/handler.ts
@@ -14,11 +14,8 @@
 // limitations under the License.
 
 import { Injectable, Injector } from '@angular/core';
-import { CoreFileProvider } from '@providers/file';
 import { CoreFileSessionProvider } from '@providers/file-session';
-import { CoreFilepoolProvider } from '@providers/filepool';
-import { CoreSitesProvider } from '@providers/sites';
-import { CoreWSProvider } from '@providers/ws';
+import { CoreFileHelperProvider } from '@providers/file-helper';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreFileUploaderProvider } from '@core/fileuploader/providers/fileuploader';
 import {
@@ -39,11 +36,10 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
     name = 'AddonModAssignSubmissionFileHandler';
     type = 'file';
 
-    constructor(private sitesProvider: CoreSitesProvider, private wsProvider: CoreWSProvider,
-        private assignProvider: AddonModAssignProvider, private assignOfflineProvider: AddonModAssignOfflineProvider,
+    constructor(private assignProvider: AddonModAssignProvider, private assignOfflineProvider: AddonModAssignOfflineProvider,
         private assignHelper: AddonModAssignHelperProvider, private fileSessionProvider: CoreFileSessionProvider,
-        private fileUploaderProvider: CoreFileUploaderProvider, private filepoolProvider: CoreFilepoolProvider,
-        private fileProvider: CoreFileProvider, private utils: CoreUtilsProvider) { }
+        private fileUploaderProvider: CoreFileUploaderProvider, private fileHelper: CoreFileHelperProvider,
+        private utils: CoreUtilsProvider) { }
 
     /**
      * Whether the plugin can be edited in offline for existing submissions. In general, this should return false if the
@@ -157,24 +153,9 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
      * @return The size (or promise resolved with size).
      */
     getSizeForCopy(assign: AddonModAssignAssign, plugin: AddonModAssignPlugin): number | Promise<number> {
-        const files = this.assignProvider.getSubmissionPluginAttachments(plugin),
-            promises = [];
-        let totalSize = 0;
+        const files = this.assignProvider.getSubmissionPluginAttachments(plugin);
 
-        files.forEach((file) => {
-            promises.push(this.wsProvider.getRemoteFileSize(file.fileurl).then((size) => {
-                if (size == -1) {
-                    // Couldn't determine the size, reject.
-                    return Promise.reject(null);
-                }
-
-                totalSize += size;
-            }));
-        });
-
-        return Promise.all(promises).then(() => {
-            return totalSize;
-        });
+        return this.fileHelper.getTotalFilesSize(files);
     }
 
     /**
@@ -188,45 +169,11 @@ export class AddonModAssignSubmissionFileHandler implements AddonModAssignSubmis
      */
     getSizeForEdit(assign: AddonModAssignAssign, submission: AddonModAssignSubmission,
             plugin: AddonModAssignPlugin, inputData: any): number | Promise<number> {
-        const siteId = this.sitesProvider.getCurrentSiteId();
-
         // Check if there's any change.
         if (this.hasDataChanged(assign, submission, plugin, inputData)) {
-            const files = this.fileSessionProvider.getFiles(AddonModAssignProvider.COMPONENT, assign.id),
-                promises = [];
-            let totalSize = 0;
+            const files = this.fileSessionProvider.getFiles(AddonModAssignProvider.COMPONENT, assign.id);
 
-            files.forEach((file) => {
-                if (file.filename && !file.name) {
-                    // It's a remote file. First check if we have the file downloaded since it's more reliable.
-                    promises.push(this.filepoolProvider.getFilePathByUrl(siteId, file.fileurl).then((path) => {
-                        return this.fileProvider.getFile(path).then((fileEntry) => {
-                            return this.fileProvider.getFileObjectFromFileEntry(fileEntry);
-                        }).then((file) => {
-                            totalSize += file.size;
-                        });
-                    }).catch(() => {
-                        // Error getting the file, maybe it's not downloaded. Get remote size.
-                        return this.wsProvider.getRemoteFileSize(file.fileurl).then((size) => {
-                            if (size == -1) {
-                                // Couldn't determine the size, reject.
-                                return Promise.reject(null);
-                            }
-
-                            totalSize += size;
-                        });
-                    }));
-                } else if (file.name) {
-                    // It's a local file, get its size.
-                    promises.push(this.fileProvider.getFileObjectFromFileEntry(file).then((file) => {
-                        totalSize += file.size;
-                    }));
-                }
-            });
-
-            return Promise.all(promises).then(() => {
-                return totalSize;
-            });
+            return this.fileHelper.getTotalFilesSize(files);
         } else {
             // Nothing has changed, we won't upload any file.
             return 0;
diff --git a/src/addon/mod/assign/submission/onlinetext/providers/handler.ts b/src/addon/mod/assign/submission/onlinetext/providers/handler.ts
index bc800d716..77e0ec4e4 100644
--- a/src/addon/mod/assign/submission/onlinetext/providers/handler.ts
+++ b/src/addon/mod/assign/submission/onlinetext/providers/handler.ts
@@ -16,7 +16,7 @@
 import { Injectable, Injector } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { CoreSitesProvider } from '@providers/sites';
-import { CoreWSProvider } from '@providers/ws';
+import { CoreFileHelperProvider } from '@providers/file-helper';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
 import {
     AddonModAssignProvider, AddonModAssignAssign, AddonModAssignSubmission, AddonModAssignPlugin
@@ -34,9 +34,10 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
     name = 'AddonModAssignSubmissionOnlineTextHandler';
     type = 'onlinetext';
 
-    constructor(private translate: TranslateService, private sitesProvider: CoreSitesProvider, private wsProvider: CoreWSProvider,
-        private textUtils: CoreTextUtilsProvider, private assignProvider: AddonModAssignProvider,
-        private assignOfflineProvider: AddonModAssignOfflineProvider, private assignHelper: AddonModAssignHelperProvider) { }
+    constructor(private translate: TranslateService, private sitesProvider: CoreSitesProvider,
+        private fileHelper: CoreFileHelperProvider,  private textUtils: CoreTextUtilsProvider,
+        private assignProvider: AddonModAssignProvider, private assignOfflineProvider: AddonModAssignOfflineProvider,
+        private assignHelper: AddonModAssignHelperProvider) { }
 
     /**
      * Whether the plugin can be edited in offline for existing submissions. In general, this should return false if the
@@ -124,30 +125,13 @@ export class AddonModAssignSubmissionOnlineTextHandler implements AddonModAssign
      * @param plugin The plugin object.
      * @return The size (or promise resolved with size).
      */
-    getSizeForCopy(assign: AddonModAssignAssign, plugin: AddonModAssignPlugin): number | Promise<number> {
+    async getSizeForCopy(assign: AddonModAssignAssign, plugin: AddonModAssignPlugin): Promise<number> {
         const text = this.assignProvider.getSubmissionPluginText(plugin, true),
-            files = this.assignProvider.getSubmissionPluginAttachments(plugin),
-            promises = [];
-        let totalSize = text.length;
+            files = this.assignProvider.getSubmissionPluginAttachments(plugin);
 
-        if (!files.length) {
-            return totalSize;
-        }
+        const filesSize = await this.fileHelper.getTotalFilesSize(files);
 
-        files.forEach((file) => {
-            promises.push(this.wsProvider.getRemoteFileSize(file.fileurl).then((size) => {
-                if (size == -1) {
-                    // Couldn't determine the size, reject.
-                    return Promise.reject(null);
-                }
-
-                totalSize += size;
-            }));
-        });
-
-        return Promise.all(promises).then(() => {
-            return totalSize;
-        });
+        return text.length + filesSize;
     }
 
     /**
diff --git a/src/providers/file-helper.ts b/src/providers/file-helper.ts
index a9fc44c1e..73daa59b3 100644
--- a/src/providers/file-helper.ts
+++ b/src/providers/file-helper.ts
@@ -18,6 +18,7 @@ import { CoreAppProvider } from './app';
 import { CoreFileProvider } from './file';
 import { CoreFilepoolProvider } from './filepool';
 import { CoreSitesProvider } from './sites';
+import { CoreWSProvider } from './ws';
 import { CoreUtilsProvider } from './utils/utils';
 import { CoreConstants } from '@core/constants';
 
@@ -29,7 +30,7 @@ export class CoreFileHelperProvider {
 
     constructor(private fileProvider: CoreFileProvider, private filepoolProvider: CoreFilepoolProvider,
             private sitesProvider: CoreSitesProvider, private appProvider: CoreAppProvider, private translate: TranslateService,
-            private utils: CoreUtilsProvider) { }
+            private utils: CoreUtilsProvider, private wsProvider: CoreWSProvider) { }
 
     /**
      * Convenience function to open a file, downloading it if needed.
@@ -273,4 +274,64 @@ export class CoreFileHelperProvider {
 
         return false;
     }
+
+    /**
+     * Calculate the total size of the given files.
+     *
+     * @param files The files to check.
+     * @return Total files size.
+     */
+    async getTotalFilesSize(files: any[]): Promise<number> {
+        let totalSize = 0;
+
+        for (const file of files) {
+            totalSize += await this.getFileSize(file);
+        }
+
+        return totalSize;
+    }
+
+    /**
+     * Calculate the file size.
+     *
+     * @param file The file to check.
+     * @return File size.
+     */
+    async getFileSize(file: any): Promise<number> {
+        if (file.filesize) {
+            return file.filesize;
+        }
+
+        // If it's a remote file. First check if we have the file downloaded since it's more reliable.
+        if (file.filename && !file.name) {
+            try {
+                const siteId = this.sitesProvider.getCurrentSiteId();
+
+                const path = await this.filepoolProvider.getFilePathByUrl(siteId, file.fileurl);
+                const fileEntry = await this.fileProvider.getFile(path);
+                const fileObject = await this.fileProvider.getFileObjectFromFileEntry(fileEntry);
+
+                return fileObject.size;
+            } catch (error) {
+                // Error getting the file, maybe it's not downloaded. Get remote size.
+                const size = await this.wsProvider.getRemoteFileSize(file.fileurl);
+
+                if (size === -1) {
+                    throw new Error('Couldn\'t determine file size: ' + file.fileurl);
+                }
+
+                return size;
+            }
+        }
+
+        // If it's a local file, get its size.
+        if (file.name) {
+            const fileObject = await this.fileProvider.getFileObjectFromFileEntry(file);
+
+            return fileObject.size;
+        }
+
+        throw new Error('Couldn\'t determine file size: ' + file.fileurl);
+    }
+
 }

From 75ea013503be6126d38fe63df335add0e233a311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 16 Dec 2019 12:33:04 +0100
Subject: [PATCH 235/257] MOBILE-3213 course: Fix section selector padding

---
 src/core/course/components/format/core-course-format.html | 2 +-
 src/core/course/components/format/format.scss             | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/course/components/format/core-course-format.html b/src/core/course/components/format/core-course-format.html
index 07b21f6db..453928f72 100644
--- a/src/core/course/components/format/core-course-format.html
+++ b/src/core/course/components/format/core-course-format.html
@@ -11,7 +11,7 @@
         <core-loading [hideUntil]="loaded">
             <!-- Section selector. -->
             <core-dynamic-component [component]="sectionSelectorComponent" [data]="data">
-                <div text-wrap *ngIf="displaySectionSelector && sections && sections.length" padding class="clearfix" ion-row justify-content-between class="safe-padding-horizontal" [class.core-section-download]="downloadEnabled">
+                <div text-wrap *ngIf="displaySectionSelector && sections && sections.length" padding class="clearfix" ion-row justify-content-between class="safe-padding-horizontal core-button-selector-row" [class.core-section-download]="downloadEnabled">
                     <button float-start ion-button icon-start icon-end (click)="showSectionSelector($event)" color="light" class="core-button-select button-no-uppercase" ion-col [attr.aria-label]="('core.course.sections' | translate) + ': ' + (selectedSection && (selectedSection.formattedName || selectedSection.name))" aria-haspopup="true" [attr.aria-expanded]="sectionSelectorExpanded" aria-controls="core-course-section-selector" id="core-course-section-button">
                         <core-icon name="fa-folder"></core-icon>
                         <span class="core-button-select-text">{{selectedSection && (selectedSection.formattedName || selectedSection.name) || 'core.course.sections' | translate }}</span>
diff --git a/src/core/course/components/format/format.scss b/src/core/course/components/format/format.scss
index 34684e29c..dfbbc4033 100644
--- a/src/core/course/components/format/format.scss
+++ b/src/core/course/components/format/format.scss
@@ -64,6 +64,10 @@ ion-app.app-root core-course-format {
         @include padding(null, 0, null, null);
     }
 
+    .core-button-selector-row {
+        @include safe-area-padding-start($content-padding !important, $content-padding);
+    }
+
     .core-course-section-nav-buttons {
         .button-inner core-format-text {
             white-space: nowrap;

From 5fa8f61d9d8bdcb82d7d1bcb3e66ccb2114155bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 16 Dec 2019 15:37:54 +0100
Subject: [PATCH 236/257] MOBILE-3213 scorm: Fix unzip using emulator

---
 src/core/emulator/providers/zip.ts | 2 +-
 src/providers/file.ts              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/emulator/providers/zip.ts b/src/core/emulator/providers/zip.ts
index 3170023ad..1c3af04a7 100644
--- a/src/core/emulator/providers/zip.ts
+++ b/src/core/emulator/providers/zip.ts
@@ -88,7 +88,7 @@ export class ZipMock extends Zip {
             const destParent = destination.substring(0, source.lastIndexOf('/')),
                 destFolderName = destination.substr(source.lastIndexOf('/') + 1);
 
-            return this.file.createDir(destParent, destFolderName, false);
+            return this.file.createDir(destParent, destFolderName, true);
         }).then(() => {
 
             const promises = [],
diff --git a/src/providers/file.ts b/src/providers/file.ts
index 9dedaedbf..07d1628f5 100644
--- a/src/providers/file.ts
+++ b/src/providers/file.ts
@@ -1017,7 +1017,7 @@ export class CoreFileProvider {
             return this.zip.unzip(fileEntry.toURL(), destFolder, onProgress);
         }).then((result) => {
             if (result == -1) {
-                return Promise.reject(null);
+                return Promise.reject('Unzip failed.');
             }
         });
     }

From 2c7f4200cf974f2bae02bf90c29148edfa1d42c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 16 Dec 2019 15:38:26 +0100
Subject: [PATCH 237/257] MOBILE-3213 scorm: Use new fontawesome icons on TOC

---
 .../index/addon-mod-scorm-index.html          |   4 +-
 .../mod/scorm/components/index/index.scss     |  14 ++--
 src/addon/mod/scorm/pages/toc/toc.html        |   6 +-
 src/addon/mod/scorm/pages/toc/toc.module.ts   |   2 +
 src/addon/mod/scorm/providers/scorm.ts        |  79 +++++++++++++-----
 src/assets/img/scorm/asset.gif                | Bin 178 -> 0 bytes
 src/assets/img/scorm/browsed.gif              | Bin 105 -> 0 bytes
 src/assets/img/scorm/completed.gif            | Bin 190 -> 0 bytes
 src/assets/img/scorm/failed.gif               | Bin 190 -> 0 bytes
 src/assets/img/scorm/incomplete.gif           | Bin 597 -> 0 bytes
 src/assets/img/scorm/notattempted.gif         | Bin 79 -> 0 bytes
 src/assets/img/scorm/passed.gif               | Bin 190 -> 0 bytes
 src/assets/img/scorm/suspend.gif              | Bin 362 -> 0 bytes
 src/components/icon/icon.ts                   |   1 +
 14 files changed, 73 insertions(+), 33 deletions(-)
 delete mode 100644 src/assets/img/scorm/asset.gif
 delete mode 100644 src/assets/img/scorm/browsed.gif
 delete mode 100644 src/assets/img/scorm/completed.gif
 delete mode 100644 src/assets/img/scorm/failed.gif
 delete mode 100644 src/assets/img/scorm/incomplete.gif
 delete mode 100644 src/assets/img/scorm/notattempted.gif
 delete mode 100644 src/assets/img/scorm/passed.gif
 delete mode 100644 src/assets/img/scorm/suspend.gif

diff --git a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
index 265323472..15299f5f6 100644
--- a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -95,9 +95,9 @@
                     <!-- If data shown doesn't belong to last attempt, show a warning. -->
                     <p *ngIf="attemptToContinue">{{ 'addon.mod_scorm.dataattemptshown' | translate:{number: attemptToContinue} }}</p>
                     <p>{{ currentOrganization.title }}</p>
-                    <div *ngFor="let sco of toc" class="core-padding-{{sco.level}}">
+                    <div *ngFor="let sco of toc" class="core-padding-{{sco.level}} addon-mod_scorm-type-{{sco.scormtype}}">
                         <p *ngIf="sco.isvisible">
-                            <img [src]="sco.image.url" [alt]="sco.image.description" />
+                            <core-icon [name]="sco.image.icon" [label]="sco.image.description" item-start></core-icon>
                             <a *ngIf="sco.prereq && sco.launch" (click)="open($event, sco.id)"><core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></a>
                             <span *ngIf="!sco.prereq || !sco.launch"><core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></span>
                             <span *ngIf="accessInfo && accessInfo.canviewscores && sco.score_raw">({{ 'addon.mod_scorm.score' | translate }}: {{sco.score_raw}})</span>
diff --git a/src/addon/mod/scorm/components/index/index.scss b/src/addon/mod/scorm/components/index/index.scss
index 67f01dcb6..763ae6067 100644
--- a/src/addon/mod/scorm/components/index/index.scss
+++ b/src/addon/mod/scorm/components/index/index.scss
@@ -1,9 +1,13 @@
-ion-app.app-root addon-mod-scorm-index {
-
+ion-app.app-root addon-mod-scorm-index,
+ion-app.app-root page-addon-mod-scorm-toc {
     .addon-mod_scorm-toc {
-        img {
-            width: auto;
-            display: inline;
+        // Hide all non sco icons using css to maintain padding.
+        ion-icon {
+            opacity: 0;
+        }
+
+        .addon-mod_scorm-type-sco ion-icon {
+            opacity: 1
         }
     }
 }
diff --git a/src/addon/mod/scorm/pages/toc/toc.html b/src/addon/mod/scorm/pages/toc/toc.html
index 0cff8c294..0ce9163f0 100644
--- a/src/addon/mod/scorm/pages/toc/toc.html
+++ b/src/addon/mod/scorm/pages/toc/toc.html
@@ -10,7 +10,7 @@
 </ion-header>
 <ion-content>
     <nav>
-        <ion-list>
+        <ion-list class="addon-mod_scorm-toc">
             <ion-item text-wrap *ngIf="attemptToContinue">
                 <p>{{ 'addon.mod_scorm.dataattemptshown' | translate:{number: attemptToContinue} }}</p>
             </ion-item>
@@ -23,8 +23,8 @@
 
             <!-- List of SCOs. -->
             <ng-container *ngFor="let sco of toc">
-                <a *ngIf="sco.isvisible" ion-item text-wrap [ngClass]="'core-padding-' + sco.level" [class.core-nav-item-selected]="selected == sco.id" (click)="loadSco(sco)" [attr.disabled]="!sco.prereq || !sco.launch ? true : null" [attr.detail-none]="!sco.prereq || !sco.launch ? true : null">
-                    <img [src]="sco.image.url" [alt]="sco.image.description" />
+                <a *ngIf="sco.isvisible" ion-item text-wrap [ngClass]="'core-padding-' + sco.level + ' addon-mod_scorm-type-' + sco.scormtype" [class.core-nav-item-selected]="selected == sco.id" [class]="" (click)="loadSco(sco)" [attr.disabled]="!sco.prereq || !sco.launch ? true : null" [attr.detail-none]="!sco.prereq || !sco.launch ? true : null">
+                    <core-icon [name]="sco.image.icon" [label]="sco.image.description" item-start></core-icon>
                     <core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId"></core-format-text>
                     <span *ngIf="accessInfo && accessInfo.canviewscores && sco.score_raw">({{ 'addon.mod_scorm.score' | translate }}: {{sco.score_raw}})</span>
                 </a>
diff --git a/src/addon/mod/scorm/pages/toc/toc.module.ts b/src/addon/mod/scorm/pages/toc/toc.module.ts
index 0a0197203..fec325aeb 100644
--- a/src/addon/mod/scorm/pages/toc/toc.module.ts
+++ b/src/addon/mod/scorm/pages/toc/toc.module.ts
@@ -16,6 +16,7 @@ import { NgModule } from '@angular/core';
 import { IonicPageModule } from 'ionic-angular';
 import { TranslateModule } from '@ngx-translate/core';
 import { CoreDirectivesModule } from '@directives/directives.module';
+import { CoreComponentsModule } from '@components/components.module';
 import { AddonModScormTocPage } from './toc';
 
 @NgModule({
@@ -24,6 +25,7 @@ import { AddonModScormTocPage } from './toc';
     ],
     imports: [
         CoreDirectivesModule,
+        CoreComponentsModule,
         IonicPageModule.forChild(AddonModScormTocPage),
         TranslateModule.forChild()
     ],
diff --git a/src/addon/mod/scorm/providers/scorm.ts b/src/addon/mod/scorm/providers/scorm.ts
index 2592cbb25..a8424dc3f 100644
--- a/src/addon/mod/scorm/providers/scorm.ts
+++ b/src/addon/mod/scorm/providers/scorm.ts
@@ -106,6 +106,22 @@ export class AddonModScormProvider {
         'b': 'browsed',
         'n': 'notattempted'
     };
+    protected static STATUS_TO_ICON = {
+        assetc: 'fa-file-archive-o',
+        asset: 'fa-file-archive-o',
+        browsed: 'fa-book',
+        completed: 'fa-check-square-o',
+        failed: 'fa-times',
+        incomplete: 'fa-pencil-square-o',
+        minus: 'fa-minus',
+        notattempted: 'fa-square-o',
+        passed: 'fa-check',
+        plus: 'fa-plus',
+        popdown: 'fa-window-close-o',
+        popup: 'fa-window-restore',
+        suspend: 'fa-pause',
+        wait: 'fa-clock-o',
+    };
 
     protected ROOT_CACHE_KEY = 'mmaModScorm:';
     protected logger;
@@ -1048,39 +1064,56 @@ export class AddonModScormProvider {
      * @param incomplete Whether the SCORM is incomplete.
      * @return Image URL and description.
      */
-    getScoStatusIcon(sco: any, incomplete?: boolean): {url: string, description: string} {
+    getScoStatusIcon(sco: any, incomplete?: boolean): {icon: string, description: string} {
         let imageName = '',
             descName = '',
-            status;
+            suspendedStr = '';
 
-        if (sco.scormtype == 'sco') {
-            // Not an asset, calculate image using status.
-            status = sco.status;
-            if (this.VALID_STATUSES.indexOf(status) < 0) {
-                // Status empty or not valid, use 'notattempted'.
-                status = 'notattempted';
-            }
+        const status = sco.status;
 
-            if (!incomplete) {
-                // Check if SCO is completed or not. If SCORM is incomplete there's no need to check SCO.
-                incomplete = this.isStatusIncomplete(status);
-            }
+        if (sco.isvisible) {
+            if (this.VALID_STATUSES.indexOf(status) >= 0) {
+                if (sco.scormtype == 'sco') {
+                    imageName = status;
+                    descName = status;
+                } else {
+                    imageName = 'asset';
+                    descName = 'assetlaunched';
+                }
 
-            if (incomplete && sco.exitvalue == 'suspend') {
-                imageName = 'suspend';
-                descName = 'suspended';
+                if (!incomplete) {
+                    // Check if SCO is completed or not. If SCORM is incomplete there's no need to check SCO.
+                    incomplete = this.isStatusIncomplete(status);
+                }
+
+                if (incomplete && sco.exitvalue == 'suspend') {
+                    imageName = 'suspend';
+                    suspendedStr = ' - ' + this.translate.instant('addon.mod_scorm.suspended');
+                }
             } else {
-                imageName = sco.status;
-                descName = sco.status;
+                incomplete = true;
+
+                if (sco.scormtype == 'sco') {
+                    // Status empty or not valid, use 'notattempted'.
+                    imageName = 'notattempted';
+                } else {
+                    imageName = 'asset';
+                }
+                descName = imageName;
             }
-        } else {
-            imageName = 'asset';
-            descName = (!sco.status || sco.status == 'notattempted') ? 'asset' : 'assetlaunched';
         }
 
+        if (imageName == '') {
+            imageName = 'notattempted';
+            descName = 'notattempted';
+            suspendedStr = '';
+        }
+
+        sco.incomplete = incomplete;
+
         return {
-            url: 'assets/img/scorm/' + imageName + '.gif',
-            description: this.translate.instant('addon.mod_scorm.' + descName)
+            icon: AddonModScormProvider.STATUS_TO_ICON[imageName],
+            description: this.translate.instant('addon.mod_scorm.' + descName) + suspendedStr
         };
     }
 
diff --git a/src/assets/img/scorm/asset.gif b/src/assets/img/scorm/asset.gif
deleted file mode 100644
index 09fa56516f57b56f918c07d2829942c768c53044..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 178
zcmZ?wbhEHb6krfw_{_`j|Ns9pKy>E+%rpPffN17_V<1ZV&j3WmGZ~E27#NHhkbvS(
z7FH1kUIrbI7|09;miP@PHN7QGf{$z!oAWT0wY-OSanYPtK|BT<IvDQo@JwlK<S}>1
z6MD>1ad2S^qtgisPYK4r9fdkhGu}T~EILI~>a75S{yOH_hSq@!d<SI@9hj!_?Bg?r
PGafoIT3no3f(+IG<m^9Z

diff --git a/src/assets/img/scorm/browsed.gif b/src/assets/img/scorm/browsed.gif
deleted file mode 100644
index ea5e0408199b7b23ed6034b1ea6c48fe9eee6718..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 105
zcmZ?wbhEHb6krfw_{hxg|Nnmm1|R|f#h)y!A`Hw7Iv@^6o`K0~PXEg616+5k6;3E`
z61&QE#5Ku*NnXt@rBZ6)uBrzTr!&H57w>%)GAo-mZtkKFS6Bat*>a`m#LG+{Rt9ST
DK2s#`

diff --git a/src/assets/img/scorm/completed.gif b/src/assets/img/scorm/completed.gif
deleted file mode 100644
index 536191528d7c913387d5799feb1c6486981f6aa0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 190
zcmZ?wbhEHb6krfw_{_`j|Ns9p|IYxy%>OfIo|&0;CM|7dn(-N9<C(?`GZ`4t7#NHh
zkb&Y)7FH1kUIrbIAjk{`mh1^rJZJ6Y6<EZ*C_>mH+CVb6!E<r~Cu>yXq(T9$wQqPf
zzp*){x?n*@04t+IMWjfc+GC;37ANMlF(llYQ=`_Zd;QP{IlEK3lXV;w7Cb6#W-Pvc
f<nd0;!fVG2c^EY0D=HhAgX+a??YMjT1sSXXF*`yi

diff --git a/src/assets/img/scorm/failed.gif b/src/assets/img/scorm/failed.gif
deleted file mode 100644
index d3ca677721f06ec034cff662729f9f37f23bba64..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 190
zcmZ?wbhEHb6krfw_{`1l9|+Ez`9E{!|FpFK#>W2{7|t*-%w%9lV_-05zycJ1vapIU
za5LzD<UnRHuw)1DFizWR*0G^YUWU!%&@;h%(`w@cHmp6uHNE6cTjBlAMKO(s8v+y-
zXfPajzeqxgd%+T+$puo;C!Z>D{AO7u);QsT&;px;-U5ZWy76rpzbA9>w_Hkj5EFl6
YLZu2v8GA!eYCaQ(tz9oyk066J0AS5O<^TWy

diff --git a/src/assets/img/scorm/incomplete.gif b/src/assets/img/scorm/incomplete.gif
deleted file mode 100644
index fe2c6ea9d4d4d0f83396f9751617241d03392bc5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 597
zcmcK1TT9ac9Eb6r;HD1EdB|mLxj92!+w!ba+dOS!P3LK=&CNC45+VwMqOL;x&)lL2
zM5xHfY*RL=Ofj`>O+z9PA}R=41%VoMl^9Z2-|$8BynxTmqt$7u6g^zx(vFL;^8>%v
zvHcBOU-0V_ey(A237gB<h+-px^)O;S#Qca&;NvJhjNtt+-rdAoFWwAd?Fv>eVf8Xz
zU&O2PSUH22eOPuOYDd(87u|?-A!0?ug0LB(;|QNX$b^s)&pWW#hQ(Ga7_iWSc|GQv
z@l1y~4d&FCZNO|DW>k1ui)jU(RNzr5rsSBCB6t`<2?B)(<YO`qlezHcz%PK0kMS&w
zrQ<$#;T#3~C~%4<T;zAs!(JM5&^<ei+UagL-LcVaD~(v_hKa5lX{enB40N`hPOHdK
zO}0wvEFqng)P*F;rmPf7P9P4O5?S=068(*5Ws-}eyZ-JIN|@<)4KVJ(t3w{IH;$8>
zkrwaiwRU!BZymFobUNK;KEJS}ys9F1Z(<L_ZY>at3u=@~MUl9RNo|oz4@e}HbxlpB
zMuw}Ci}oEUuWe{ltJ;`7%`(}3+0oDSU$sn9d%jR8|1PgqmKhi_9o*t=XJ-}{ce-r?
zK@Kk^g)RLv-M|qQr7JHK^*mULOFdL;7L{rGSs7ftPgp<R$h+nY8+F4gp0qsuV|P+K
G)%*hyXXJPQ

diff --git a/src/assets/img/scorm/notattempted.gif b/src/assets/img/scorm/notattempted.gif
deleted file mode 100644
index 7dbb43be50f6f4c10411fc63bf67dd119fb621ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 79
zcmZ?wbhEHb6krfw_`t;Q|Nnmm1_s5SEUY37Obj|eHc(uEfq_YFO8?5!Z}Xexge+p%
ibnoFi{t|Y!tfY`xaZ>AEYED=meW=K{x$LMogEat?NE&zm

diff --git a/src/assets/img/scorm/passed.gif b/src/assets/img/scorm/passed.gif
deleted file mode 100644
index 536191528d7c913387d5799feb1c6486981f6aa0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 190
zcmZ?wbhEHb6krfw_{_`j|Ns9p|IYxy%>OfIo|&0;CM|7dn(-N9<C(?`GZ`4t7#NHh
zkb&Y)7FH1kUIrbIAjk{`mh1^rJZJ6Y6<EZ*C_>mH+CVb6!E<r~Cu>yXq(T9$wQqPf
zzp*){x?n*@04t+IMWjfc+GC;37ANMlF(llYQ=`_Zd;QP{IlEK3lXV;w7Cb6#W-Pvc
f<nd0;!fVG2c^EY0D=HhAgX+a??YMjT1sSXXF*`yi

diff --git a/src/assets/img/scorm/suspend.gif b/src/assets/img/scorm/suspend.gif
deleted file mode 100644
index 35e8413f9f0f79303ef3c519c98c254f24039495..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 362
zcmZ?wbhEHb6krfw_^QGH1iN=LgoiU6I55%Jn4z)JapT6S>S~7f?;rgC&mbno;N`_o
zRAhMJ!pbL47?P7!otzkE&Sc==V7PmiAt*@l{{6!xB@9kZ0yl3mC@HZ_oEY@_HA817
z!<jP-0s;(aX$)#=3=0>ge)+;+WW))wjM_l)Ckv|xg9?KV$Y7A47}(k!CKY(p*a#d^
z34FXzV?Hy}iVr?+%v>sh2i`h~aWb)N@C{PxJl|}S!mTaj{-~gE@|!9CN{K6{xAJpI
zS99}}rErL_2v;j{u`wv}s&KIINHX<Q%S)Dv3kk_7$jeq&3o<a5b11V&EUV^|ms51=
g;1LpF7nI@Vl3caTSyVv$82{G#ZLw$0I5JoR0LblCAOHXW

diff --git a/src/components/icon/icon.ts b/src/components/icon/icon.ts
index ffe497983..9bab34f9b 100644
--- a/src/components/icon/icon.ts
+++ b/src/components/icon/icon.ts
@@ -82,6 +82,7 @@ export class CoreIconComponent implements OnChanges, OnDestroy {
         !this.ariaLabel && this.newElement.setAttribute('aria-hidden', 'true');
         !this.ariaLabel && this.newElement.setAttribute('role', 'presentation');
         this.ariaLabel && this.newElement.setAttribute('aria-label', this.ariaLabel);
+        this.ariaLabel && this.newElement.setAttribute('title', this.ariaLabel);
 
         const attrs = this.element.attributes;
         for (let i = attrs.length - 1; i >= 0; i--) {

From e5dc0037098d795795fc6072b986b6616bf95d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 16 Dec 2019 16:23:47 +0100
Subject: [PATCH 238/257] MOBILE-3213 scorm: Fix offline attempt alignment

---
 .../mod/scorm/components/index/addon-mod-scorm-index.html     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
index 15299f5f6..c7f421705 100644
--- a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -51,8 +51,8 @@
                     <h3>{{ 'addon.mod_scorm.gradeforattempt' | translate }} {{attempt.number}}</h3>
                     <p item-content *ngIf="attempt.grade != -1">{{ attempt.grade }}</p>
                     <p item-content *ngIf="attempt.grade == -1">{{ 'addon.mod_scorm.cannotcalculategrade' | translate }}</p>
-                    <p item-content *ngIf="scorm.maxattempt == 0 || attempt.number <= scorm.maxattempt">{{ 'addon.mod_scorm.offlineattemptnote' | translate }}</p>
-                    <p item-content *ngIf="scorm.maxattempt != 0 && attempt.number > scorm.maxattempt">{{ 'addon.mod_scorm.offlineattemptovermax' | translate }}</p>
+                    <p *ngIf="scorm.maxattempt == 0 || attempt.number <= scorm.maxattempt">{{ 'addon.mod_scorm.offlineattemptnote' | translate }}</p>
+                    <p *ngIf="scorm.maxattempt != 0 && attempt.number > scorm.maxattempt">{{ 'addon.mod_scorm.offlineattemptovermax' | translate }}</p>
                 </ion-item>
                 <ion-item text-wrap *ngIf="scorm.displayattemptstatus && scorm.gradeMethodReadable">
                     <h3>{{ 'addon.mod_scorm.grademethod' | translate }}</h3>

From ece5905b36d44a7eddc3335c273c8e31cfff2951 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 16 Dec 2019 16:24:12 +0100
Subject: [PATCH 239/257] MOBILE-3213 data: Log activity view in more cases

---
 src/addon/mod/data/components/index/index.ts | 42 ++++++++++++++------
 src/addon/mod/data/pages/entry/entry.ts      | 27 +++++++++++--
 2 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/src/addon/mod/data/components/index/index.ts b/src/addon/mod/data/components/index/index.ts
index 0b3e22870..af1ab14b6 100644
--- a/src/addon/mod/data/components/index/index.ts
+++ b/src/addon/mod/data/components/index/index.ts
@@ -124,18 +124,8 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
         this.selectedGroup = this.group || 0;
 
         this.loadContent(false, true).then(() => {
-            if (!this.data || !this.data.id) {
-                return;
-            }
-
-            this.dataProvider.logView(this.data.id, this.data.name).then(() => {
-                this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
-            }).catch(() => {
-                // Ignore errors.
-            });
+            return this.logView(true);
         });
-
-        // Setup search modal.
     }
 
     /**
@@ -362,7 +352,10 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
         this.loaded = false;
         this.search.page = page;
 
-        return this.fetchEntriesData().catch((message) => {
+        return this.fetchEntriesData().then(() => {
+            // Log activity view for coherence with Moodle web.
+            return this.logView();
+        }).catch((message) => {
             this.domUtils.showErrorModalDefault(message, 'core.course.errorgetmodule', true);
         }).finally(() => {
             this.loaded = true;
@@ -392,7 +385,10 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
         this.selectedGroup = groupId;
         this.search.page = 0;
 
-        return this.fetchEntriesData().catch((message) => {
+        return this.fetchEntriesData().then(() => {
+            // Log activity view for coherence with Moodle web.
+            return this.logView();
+        }).catch((message) => {
             this.domUtils.showErrorModalDefault(message, 'core.course.errorgetmodule', true);
 
             return Promise.reject(null);
@@ -454,6 +450,26 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
         return result.updated;
     }
 
+    /**
+     * Log viewing the activity.
+     *
+     * @param checkCompletion Whether to check completion.
+     * @return Promise resolved when done.
+     */
+    protected logView(checkCompletion?: boolean): Promise<any> {
+        if (!this.data || !this.data.id) {
+            return Promise.resolve();
+        }
+
+        return this.dataProvider.logView(this.data.id, this.data.name).then(() => {
+            if (checkCompletion) {
+                this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
+            }
+        }).catch(() => {
+            // Ignore errors, the user could be offline.
+        });
+    }
+
     /**
      * Component being destroyed.
      */
diff --git a/src/addon/mod/data/pages/entry/entry.ts b/src/addon/mod/data/pages/entry/entry.ts
index 8bbf7207f..ed8e2a84e 100644
--- a/src/addon/mod/data/pages/entry/entry.ts
+++ b/src/addon/mod/data/pages/entry/entry.ts
@@ -96,7 +96,9 @@ export class AddonModDataEntryPage implements OnDestroy {
      */
     ionViewDidLoad(): void {
         this.commentsEnabled = !this.commentsProvider.areCommentsDisabledInSite();
-        this.fetchEntryData();
+        this.fetchEntryData().then(() => {
+            this.logView();
+        });
 
         // Refresh data if this discussion is synchronized automatically.
         this.syncObserver = this.eventsProvider.on(AddonModDataSyncProvider.AUTO_SYNCED, (data) => {
@@ -199,7 +201,9 @@ export class AddonModDataEntryPage implements OnDestroy {
         this.entry = null;
         this.entryLoaded = false;
 
-        return this.fetchEntryData();
+        return this.fetchEntryData().then(() => {
+            this.logView();
+        });
     }
 
     /**
@@ -258,7 +262,9 @@ export class AddonModDataEntryPage implements OnDestroy {
         this.entryId = null;
         this.entryLoaded = false;
 
-        return this.fetchEntryData();
+        return this.fetchEntryData().then(() => {
+            this.logView();
+        });
     }
 
     /**
@@ -363,6 +369,21 @@ export class AddonModDataEntryPage implements OnDestroy {
         this.dataProvider.invalidateEntryData(this.data.id, this.entryId);
     }
 
+    /**
+     * Log viewing the activity.
+     *
+     * @return Promise resolved when done.
+     */
+    protected logView(): Promise<any> {
+        if (!this.data || !this.data.id) {
+            return Promise.resolve();
+        }
+
+        return this.dataProvider.logView(this.data.id, this.data.name).catch(() => {
+            // Ignore errors, the user could be offline.
+        });
+    }
+
     /**
      * Component being destroyed.
      */

From 67b5deb5bc554178cc83ad6c245e0a093e51165c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 16 Dec 2019 16:31:59 +0100
Subject: [PATCH 240/257] MOBILE-3213 survey: Fix tablet view of the form

---
 .../components/index/addon-mod-survey-index.html   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/addon/mod/survey/components/index/addon-mod-survey-index.html b/src/addon/mod/survey/components/index/addon-mod-survey-index.html
index ba98f38ae..42c41ddd0 100644
--- a/src/addon/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addon/mod/survey/components/index/addon-mod-survey-index.html
@@ -39,8 +39,8 @@
             <div *ngIf="question.multiArray && question.multiArray.length" [attr.padding-top]="index == 1">
                 <h3 padding-horizontal>{{ question.text }}</h3>
                 <ion-grid no-padding>
-                    <ion-row no-padding align-items-center class="hidden-phone">
-                        <ion-col col-7>
+                    <ion-row no-padding nowrap align-items-center class="hidden-phone">
+                        <ion-col col-6>
                             <div padding>{{ 'addon.mod_survey.responses' | translate }}</div>
                         </ion-col>
                         <ion-col text-center *ngFor="let option of question.optionsArray">
@@ -56,7 +56,7 @@
             <!-- Subquestion -->
             <ion-grid no-padding *ngIf="question.parent !== 0" text-wrap [class.even]="isEven">
                 <ion-row no-padding nowrap align-items-center radio-group [(ngModel)]="answers[question.name]" [required]="question.required">
-                    <ion-col col-7>
+                    <ion-col col-6>
                         <ion-label padding-horizontal [core-mark-required]="question.required" id="addon-mod_survey-{{question.name}}"><strong>{{question.num}}.</strong> {{ question.text }}</ion-label>
                     </ion-col>
 
@@ -77,13 +77,13 @@
             <ng-container *ngIf="(!question.multiArray || question.multiArray.length == 0) && question.parent === 0">
                 <ion-grid no-padding text-wrap *ngIf="question.type > 0" [class.even]="isEven">
                     <ion-row no-padding align-items-center>
-                        <ion-col col-7>
+                        <ion-col col-6>
                             <ion-label [core-mark-required]="question.required" padding-horizontal id="addon-mod_survey-{{question.name}}"><strong>{{question.num}}.</strong> {{ question.text }}</ion-label>
                         </ion-col>
-                        <ion-col col-5>
+                        <ion-col col-6>
                             <ion-select padding [(ngModel)]="answers[question.name]" [attr.aria-labelledby]="'addon-mod_survey-'+question.name" interface="action-sheet" [required]="question.required">
-                            <ion-option *ngFor="let option of question.optionsArray; let value=index;" [value]="value">{{option}}</ion-option>
-                        </ion-select>
+                                <ion-option *ngFor="let option of question.optionsArray; let value=index;" [value]="value">{{option}}</ion-option>
+                            </ion-select>
                         </ion-col>
                     </ion-row>
                 </ion-grid>

From a6e68c71760f49f81bd0d783437d7a68c4a71c8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 16 Dec 2019 17:20:48 +0100
Subject: [PATCH 241/257] MOBILE-3213 survey: Check question is required to
 disable the submission

---
 src/addon/mod/survey/components/index/index.ts | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/addon/mod/survey/components/index/index.ts b/src/addon/mod/survey/components/index/index.ts
index dfa6696c3..633957845 100644
--- a/src/addon/mod/survey/components/index/index.ts
+++ b/src/addon/mod/survey/components/index/index.ts
@@ -163,13 +163,10 @@ export class AddonModSurveyIndexComponent extends CoreCourseModuleMainActivityCo
      * @return If answers are valid
      */
     isValidResponse(): boolean {
-        for (const x in this.answers) {
-            if (this.answers[x] === -1) {
-                return false;
-            }
-        }
-
-        return true;
+        return !this.questions.some((question) => {
+            return question.required && question.name &&
+                (question.type === 0 ? this.answers[question.name] == '' : parseInt(this.answers[question.name], 10) === -1);
+        });
     }
 
     /**

From 3d5041de7cc7e72b88ad4a2341540a8877cb479b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 17 Dec 2019 10:01:09 +0100
Subject: [PATCH 242/257] MOBILE-3213 ios: Add timestamp to some files in iOS

---
 .../fileuploader/providers/fileuploader.ts    | 17 ++++++++-----
 src/core/fileuploader/providers/helper.ts     | 25 +++++++++++--------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/core/fileuploader/providers/fileuploader.ts b/src/core/fileuploader/providers/fileuploader.ts
index 520e5e631..a061b8e29 100644
--- a/src/core/fileuploader/providers/fileuploader.ts
+++ b/src/core/fileuploader/providers/fileuploader.ts
@@ -150,20 +150,25 @@ export class CoreFileUploaderProvider {
      * @return Options.
      */
     getCameraUploadOptions(uri: string, isFromAlbum?: boolean): CoreFileUploaderOptions {
-        const extension = this.mimeUtils.getExtension(uri),
-            mimetype = this.mimeUtils.getMimeType(extension),
-            isIOS = this.platform.is('ios'),
-            options: CoreFileUploaderOptions = {
+        const extension = this.mimeUtils.guessExtensionFromUrl(uri);
+        const mimetype = this.mimeUtils.getMimeType(extension);
+        const isIOS = this.platform.is('ios');
+        const options: CoreFileUploaderOptions = {
                 deleteAfterUpload: !isFromAlbum,
                 mimeType: mimetype
             };
+        const fileName = this.fileProvider.getFileAndDirectoryFromPath(uri).name;
 
         if (isIOS && (mimetype == 'image/jpeg' || mimetype == 'image/png')) {
             // In iOS, the pictures can have repeated names, even if they come from the album.
-            options.fileName = 'image_' + this.timeUtils.readableTimestamp() + '.' + extension;
+            // Add a timestamp to the filename to make it unique.
+            const split = fileName.split('.');
+            split[0] += '_' + this.timeUtils.readableTimestamp();
+
+            options.fileName = split.join('.');
         } else {
             // Use the same name that the file already has.
-            options.fileName = this.fileProvider.getFileAndDirectoryFromPath(uri).name;
+            options.fileName = fileName;
         }
 
         if (isFromAlbum) {
diff --git a/src/core/fileuploader/providers/helper.ts b/src/core/fileuploader/providers/helper.ts
index b812f8014..fb1ac27a0 100644
--- a/src/core/fileuploader/providers/helper.ts
+++ b/src/core/fileuploader/providers/helper.ts
@@ -128,10 +128,12 @@ export class CoreFileUploaderHelperProvider {
      * @param defaultExt Defaut extension to use if the file doesn't have any.
      * @return Promise resolved with the copied file.
      */
-    protected copyToTmpFolder(path: string, shouldDelete: boolean, maxSize?: number, defaultExt?: string): Promise<any> {
-        let fileName = this.fileProvider.getFileAndDirectoryFromPath(path).name,
-            promise,
-            fileTooLarge;
+    protected copyToTmpFolder(path: string, shouldDelete: boolean, maxSize?: number, defaultExt?: string,
+            options?: CoreFileUploaderOptions): Promise<any> {
+
+        const fileName = (options && options.fileName) || this.fileProvider.getFileAndDirectoryFromPath(path).name;
+        let promise;
+        let fileTooLarge;
 
         // Check that size isn't too large.
         if (typeof maxSize != 'undefined' && maxSize != -1) {
@@ -154,9 +156,6 @@ export class CoreFileUploaderHelperProvider {
             }
 
             // File isn't too large.
-            // Picking an image from album in Android adds a timestamp at the end of the file. Delete it.
-            fileName = fileName.replace(/(\.[^\.]*)\?[^\.]*$/, '$1');
-
             // Get a unique name in the folder to prevent overriding another file.
             return this.fileProvider.getUniqueNameInFolder(CoreFileProvider.TMPFOLDER, fileName, defaultExt);
         }).then((newName) => {
@@ -468,11 +467,13 @@ export class CoreFileUploaderHelperProvider {
                 path = 'file://' + path;
             }
 
+            const options = this.fileUploaderProvider.getMediaUploadOptions(media);
+
             if (upload) {
-                return this.uploadFile(path, maxSize, true, this.fileUploaderProvider.getMediaUploadOptions(media));
+                return this.uploadFile(path, maxSize, true, options);
             } else {
                 // Copy or move the file to our temporary folder.
-                return this.copyToTmpFolder(path, true, maxSize);
+                return this.copyToTmpFolder(path, true, maxSize, undefined, options);
             }
         }, (error) => {
             const defaultError = isAudio ? 'core.fileuploader.errorcapturingaudio' : 'core.fileuploader.errorcapturingvideo';
@@ -552,11 +553,13 @@ export class CoreFileUploaderHelperProvider {
                 return Promise.reject(error);
             }
 
+            const options = this.fileUploaderProvider.getCameraUploadOptions(path, fromAlbum);
+
             if (upload) {
-                return this.uploadFile(path, maxSize, true, this.fileUploaderProvider.getCameraUploadOptions(path, fromAlbum));
+                return this.uploadFile(path, maxSize, true, options);
             } else {
                 // Copy or move the file to our temporary folder.
-                return this.copyToTmpFolder(path, !fromAlbum, maxSize, 'jpg');
+                return this.copyToTmpFolder(path, !fromAlbum, maxSize, 'jpg', options);
             }
         }, (error) => {
             const defaultError = fromAlbum ? 'core.fileuploader.errorgettingimagealbum' : 'core.fileuploader.errorcapturingimage';

From 89e90624b3d283fad034bead99360d512653c822 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 16 Dec 2019 15:44:31 +0100
Subject: [PATCH 243/257] MOBILE-3213 files: Improve download message with 0
 bytes.

---
 scripts/langindex.json       | 1 +
 src/assets/lang/en.json      | 1 +
 src/core/course/lang/en.json | 1 +
 src/providers/utils/dom.ts   | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 5200cc6d6..ed6b18340 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1393,6 +1393,7 @@
   "core.course.confirmdeletemodulefiles": "local_moodlemobileapp",
   "core.course.confirmdownload": "local_moodlemobileapp",
   "core.course.confirmdownloadunknownsize": "local_moodlemobileapp",
+  "core.course.confirmdownloadzerosize": "local_moodlemobileapp",
   "core.course.confirmlimiteddownload": "local_moodlemobileapp",
   "core.course.confirmpartialdownloadsize": "local_moodlemobileapp",
   "core.course.contents": "local_moodlemobileapp",
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index e0fb0fd71..2256cf466 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1391,6 +1391,7 @@
     "core.course.confirmdeletemodulefiles": "Are you sure you want to delete these files?",
     "core.course.confirmdownload": "You are about to download {{size}}.{{availableSpace}} Are you sure you want to continue?",
     "core.course.confirmdownloadunknownsize": "It was not possible to calculate the size of the download.{{availableSpace}} Are you sure you want to continue?",
+    "core.course.confirmdownloadzerosize": "You are about to start downloading.{{availableSpace}} Are you sure you want to continue?",
     "core.course.confirmlimiteddownload": "You are not currently connected to Wi-Fi. ",
     "core.course.confirmpartialdownloadsize": "You are about to download <strong>at least</strong> {{size}}.{{availableSpace}} Are you sure you want to continue?",
     "core.course.contents": "Contents",
diff --git a/src/core/course/lang/en.json b/src/core/course/lang/en.json
index 2d2d0156f..2fe5518e9 100644
--- a/src/core/course/lang/en.json
+++ b/src/core/course/lang/en.json
@@ -8,6 +8,7 @@
     "confirmdeletemodulefiles": "Are you sure you want to delete these files?",
     "confirmdownload": "You are about to download {{size}}.{{availableSpace}} Are you sure you want to continue?",
     "confirmdownloadunknownsize": "It was not possible to calculate the size of the download.{{availableSpace}} Are you sure you want to continue?",
+    "confirmdownloadzerosize": "You are about to start downloading.{{availableSpace}} Are you sure you want to continue?",
     "confirmpartialdownloadsize": "You are about to download <strong>at least</strong> {{size}}.{{availableSpace}} Are you sure you want to continue?",
     "confirmlimiteddownload": "You are not currently connected to Wi-Fi. ",
     "contents": "Contents",
diff --git a/src/providers/utils/dom.ts b/src/providers/utils/dom.ts
index 6bc976dd6..91e4b7ad1 100644
--- a/src/providers/utils/dom.ts
+++ b/src/providers/utils/dom.ts
@@ -200,7 +200,7 @@ export class CoreDomUtilsProvider {
                     { size: readableSize, availableSpace: availableSpace }));
             } else if (alwaysConfirm || size.size >= wifiThreshold ||
                 (this.appProvider.isNetworkAccessLimited() && size.size >= limitedThreshold)) {
-                message = message || 'core.course.confirmdownload';
+                message = message || (size.size === 0 ? 'core.course.confirmdownloadzerosize' : 'core.course.confirmdownload');
 
                 return this.showConfirm(wifiPrefix + this.translate.instant(message,
                     { size: readableSize, availableSpace: availableSpace }));

From b44a4ae4644126b5f713887607dd4d41f3169817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 17 Dec 2019 10:48:43 +0100
Subject: [PATCH 244/257] MOBILE-3213 styles: Dark mode fixes

---
 src/addon/mod/forum/components/post/post.scss |  4 ++++
 .../forum/pages/discussion/discussion.scss    |  2 +-
 .../mod/wiki/components/index/index.scss      | 19 +++++++++++++++++++
 src/app/app.scss                              |  4 ++--
 src/theme/dark.scss                           |  7 ++++---
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/addon/mod/forum/components/post/post.scss b/src/addon/mod/forum/components/post/post.scss
index 995dc2f13..96f1b39dd 100644
--- a/src/addon/mod/forum/components/post/post.scss
+++ b/src/addon/mod/forum/components/post/post.scss
@@ -2,6 +2,10 @@ ion-app.app-root addon-mod-forum-post .addon-mod_forum-post {
     background-color: $white;
     border-bottom: 1px solid $list-md-border-color;
 
+    @include darkmode() {
+        background-color: $core-dark-item-bg-color;
+    }
+
     .addon-forum-star {
         color: $core-star-color;
     }
diff --git a/src/addon/mod/forum/pages/discussion/discussion.scss b/src/addon/mod/forum/pages/discussion/discussion.scss
index 54d9b1f0c..fcc1213fd 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.scss
+++ b/src/addon/mod/forum/pages/discussion/discussion.scss
@@ -2,7 +2,7 @@ ion-app.app-root page-addon-mod-forum-discussion {
     .highlight .card-header .item {
         background-color: $gray-lighter;
         @include darkmode() {
-            background-color: $black;
+            background-color: $gray-dark;
         }
     }
 
diff --git a/src/addon/mod/wiki/components/index/index.scss b/src/addon/mod/wiki/components/index/index.scss
index 4e4fcb283..a19821b4f 100644
--- a/src/addon/mod/wiki/components/index/index.scss
+++ b/src/addon/mod/wiki/components/index/index.scss
@@ -4,6 +4,11 @@ $addon-mod-wiki-toc-title-color:      $gray-darker !default;
 $addon-mod-wiki-toc-border-color:     $gray-dark !default;
 $addon-mod-wiki-toc-background-color: $gray-light !default;
 
+$addon-mod-wiki-dark-toc-title-color:      $white !default;
+$addon-mod-wiki-dark-toc-border-color:     $gray-dark !default;
+$addon-mod-wiki-dark-toc-background-color: $gray-darker !default;
+$addon-mod-wiki-dark-newentry-link-color: $red-light !default;
+
 ion-app.app-root addon-mod-wiki-index {
     background-color: $white;
     @include darkmode() {
@@ -28,6 +33,17 @@ ion-app.app-root addon-mod-wiki-index {
         a {
             color: $link-color;
         }
+
+        @include darkmode() {
+            border: 1px solid $addon-mod-wiki-dark-toc-border-color;
+            background: $addon-mod-wiki-dark-toc-background-color;
+            p {
+                color: $core-dark-text-color !important;
+            }
+            a {
+                color: $core-dark-link-color;
+            }
+        }
         margin: 16px;
         padding: 8px;
     }
@@ -55,6 +71,9 @@ ion-app.app-root addon-mod-wiki-index {
     .wiki_newentry {
         color: $addon-mod-wiki-newentry-link-color;
         font-style: italic;
+        @include darkmode() {
+            color: $addon-mod-wiki-dark-newentry-link-color !important;
+        }
     }
 
     /* Hide edit section links */
diff --git a/src/app/app.scss b/src/app/app.scss
index 6e71d9caf..75f830591 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -500,7 +500,7 @@ ion-app.app-root {
   @include darkmode() {
     ion-select.core-button-select,
     .core-button-select {
-      background-color: $core-dark-item-divider-bg-color;
+      background-color: $core-dark-item-bg-color;
 
 
       &.select-md,
@@ -509,7 +509,7 @@ ion-app.app-root {
       &.button-ios,
       &.select-wp,
       &.button-wp {
-        background: $core-dark-item-divider-bg-color;
+        background: $core-dark-item-bg-color;
       }
     }
   }
diff --git a/src/theme/dark.scss b/src/theme/dark.scss
index fe18c049a..0e034de87 100644
--- a/src/theme/dark.scss
+++ b/src/theme/dark.scss
@@ -3,8 +3,8 @@ $core-dark-text-secondary-color: $gray-light !default;
 $core-dark-link-color: $blue-light !default;
 
 $core-dark-item-bg-color: $gray-darker !default;
-$core-dark-item-divider-bg-color: $black !default;
-$core-dark-background-color: $gray-dark !default;
+$core-dark-item-divider-bg-color: $gray-dark !default;
+$core-dark-background-color: $black !default;
 
 // Login.
 $core-dark-login-page-background-color: radial-gradient(white, $gray-dark) !default;
@@ -31,7 +31,8 @@ ion-app.app-root .ion-page {
     .item,
     .item-select,
     ion-card,
-    .card-header {
+    .card-header,
+    .card-content {
         color: $core-dark-text-color;
         background-color: $core-dark-item-bg-color;
 

From 5690fafe20e78ffd0519025052c871f946482b2e Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 17 Dec 2019 10:26:42 +0100
Subject: [PATCH 245/257] MOBILE-3040 submission: Fix isSubmissionEmpty logic

---
 src/addon/mod/assign/providers/helper.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/addon/mod/assign/providers/helper.ts b/src/addon/mod/assign/providers/helper.ts
index 37d6ed427..7cea16eef 100644
--- a/src/addon/mod/assign/providers/helper.ts
+++ b/src/addon/mod/assign/providers/helper.ts
@@ -193,7 +193,15 @@ export class AddonModAssignHelperProvider {
             return true;
         }
 
-        return !!submission.plugins.find((plugin) => this.submissionDelegate.isPluginEmpty(assign, plugin));
+        for (const plugin of submission.plugins) {
+            // If any plugin is not empty, we consider that the submission is not empty either.
+            if (!this.submissionDelegate.isPluginEmpty(assign, plugin)) {
+                return false;
+            }
+        }
+
+        // If all the plugins were empty (or there were no plugins), we consider the submission to be empty.
+        return true;
     }
 
     /**

From 8a6063f00aab86d2799d1744332cbef8b0e8960c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 17 Dec 2019 11:15:17 +0100
Subject: [PATCH 246/257] MOBILE-3213 forum: Check user preferences on sort

---
 .../mod/forum/pages/discussion/discussion.ts  | 54 +++++++++++++------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/src/addon/mod/forum/pages/discussion/discussion.ts b/src/addon/mod/forum/pages/discussion/discussion.ts
index e49b8684d..48fa5d18a 100644
--- a/src/addon/mod/forum/pages/discussion/discussion.ts
+++ b/src/addon/mod/forum/pages/discussion/discussion.ts
@@ -22,6 +22,7 @@ import { CoreSitesProvider } from '@providers/sites';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreFileUploaderProvider } from '@core/fileuploader/providers/fileuploader';
+import { CoreUserProvider } from '@core/user/providers/user';
 import { CoreSplitViewComponent } from '@components/split-view/split-view';
 import { CoreRatingProvider, CoreRatingInfo } from '@core/rating/providers/rating';
 import { CoreRatingOfflineProvider } from '@core/rating/providers/offline';
@@ -57,7 +58,7 @@ export class AddonModForumDiscussionPage implements OnDestroy {
     isOnline: boolean;
     isSplitViewOn: boolean;
     postHasOffline: boolean;
-    sort: SortType = 'flat-oldest';
+    sort: SortType = 'nested';
     trackPosts: boolean;
     replyData = {
         replyingTo: 0,
@@ -96,19 +97,20 @@ export class AddonModForumDiscussionPage implements OnDestroy {
     constructor(navParams: NavParams,
             network: Network,
             zone: NgZone,
-            private appProvider: CoreAppProvider,
-            private eventsProvider: CoreEventsProvider,
-            private sitesProvider: CoreSitesProvider,
-            private domUtils: CoreDomUtilsProvider,
-            private utils: CoreUtilsProvider,
-            private translate: TranslateService,
-            private uploaderProvider: CoreFileUploaderProvider,
-            private forumProvider: AddonModForumProvider,
-            private forumOffline: AddonModForumOfflineProvider,
-            private forumHelper: AddonModForumHelperProvider,
-            private forumSync: AddonModForumSyncProvider,
-            private ratingOffline: CoreRatingOfflineProvider,
-            @Optional() private svComponent: CoreSplitViewComponent,
+            protected appProvider: CoreAppProvider,
+            protected eventsProvider: CoreEventsProvider,
+            protected sitesProvider: CoreSitesProvider,
+            protected domUtils: CoreDomUtilsProvider,
+            protected utils: CoreUtilsProvider,
+            protected translate: TranslateService,
+            protected uploaderProvider: CoreFileUploaderProvider,
+            protected forumProvider: AddonModForumProvider,
+            protected forumOffline: AddonModForumOfflineProvider,
+            protected forumHelper: AddonModForumHelperProvider,
+            protected forumSync: AddonModForumSyncProvider,
+            protected ratingOffline: CoreRatingOfflineProvider,
+            protected userProvider: CoreUserProvider,
+            @Optional() protected svComponent: CoreSplitViewComponent,
             protected navCtrl: NavController) {
         this.courseId = navParams.get('courseId');
         this.cmId = navParams.get('cmId');
@@ -134,7 +136,29 @@ export class AddonModForumDiscussionPage implements OnDestroy {
      * View loaded.
      */
     ionViewDidLoad(): void {
-        this.sitesProvider.getCurrentSite().getLocalSiteConfig('AddonModForumDiscussionSort', this.sort).then((value) => {
+        this.sitesProvider.getCurrentSite().getLocalSiteConfig('AddonModForumDiscussionSort').catch(() => {
+            this.userProvider.getUserPreference('forum_displaymode').catch(() => {
+                // Ignore errors.
+            }).then((value) => {
+                const sortValue = value && parseInt(value, 10);
+
+                switch (sortValue) {
+                    case 1:
+                        this.sort = 'flat-oldest';
+                        break;
+                    case -1:
+                        this.sort = 'flat-newest';
+                        break;
+                    case 3:
+                        this.sort = 'nested';
+                        break;
+                    case 2: // Threaded not implemented.
+                    default:
+                        // Not set, use default sort.
+                        // @TODO add fallback to $CFG->forum_displaymode.
+                }
+            });
+        }).then((value) => {
             this.sort = value;
         }).finally(() => {
             this.fetchPosts(true, false, true).then(() => {

From e92a615fd5d1c2690008a18b7f06b9a0852f6f6a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 17 Dec 2019 11:41:19 +0100
Subject: [PATCH 247/257] MOBILE-3213 h5p: Fix closing tag in content validator

---
 src/core/h5p/classes/content-validator.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/h5p/classes/content-validator.ts b/src/core/h5p/classes/content-validator.ts
index 3d4baac9f..146fb10c1 100644
--- a/src/core/h5p/classes/content-validator.ts
+++ b/src/core/h5p/classes/content-validator.ts
@@ -503,7 +503,7 @@ export class CoreH5PContentValidator {
                     continue;
                 }
 
-                // Find semantics for name=$key
+                // Find semantics for name=key.
                 let found = false,
                     fn = null,
                     field = null;
@@ -729,7 +729,7 @@ export class CoreH5PContentValidator {
         }
 
         if (slash != '') {
-            return '</$elem>';
+            return '</' + elem + '>';
         }
 
         // Is there a closing XHTML slash at the end of the attributes?
@@ -871,8 +871,8 @@ export class CoreH5PContentValidator {
      * Processes an HTML attribute value and strips dangerous protocols from URLs.
      *
      * @param str The string with the attribute value.
-     * @param decode Whether to decode entities in the $string.
-     * @return Cleaned up and HTML-escaped version of $string.
+     * @param decode Whether to decode entities in the str.
+     * @return Cleaned up and HTML-escaped version of str.
      */
     filterXssBadProtocol(str: string, decode: boolean = true): string {
         // Get the plain text representation of the attribute value (i.e. its meaning).

From efa25b857cc0a2c7bc70a7ec31e614a2a2f25a9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 17 Dec 2019 13:26:34 +0100
Subject: [PATCH 248/257] MOBILE-3213 courses: Check download courses on all
 related blocks

---
 .../addon-block-recentlyaccessedcourses.html      |  4 ++--
 .../recentlyaccessedcourses.ts                    | 15 +++++++++++++++
 .../addon-block-starredcourses.html               |  4 ++--
 .../components/starredcourses/starredcourses.ts   | 15 +++++++++++++++
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html b/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
index 7aadba0cb..aede44831 100644
--- a/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
+++ b/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html
@@ -1,6 +1,6 @@
 <ion-item-divider>
     <h2>{{ 'addon.block_recentlyaccessedcourses.pluginname' | translate }}</h2>
-    <div *ngIf="downloadEnabled && courses && courses.length > 1" class="core-button-spinner" item-end>
+    <div *ngIf="downloadCoursesEnabled && downloadEnabled && courses && courses.length > 1" class="core-button-spinner" item-end>
         <button *ngIf="prefetchCoursesData.icon && prefetchCoursesData.icon != 'spinner'" ion-button icon-only clear color="dark" (click)="prefetchCourses()">
             <core-icon [name]="prefetchCoursesData.icon"></core-icon>
         </button>
@@ -13,7 +13,7 @@
     <!-- List of courses. -->
      <div class="core-horizontal-scroll">
         <ng-container *ngFor="let course of courses">
-            <core-courses-course-progress [course]="course" class="core-recentlyaccessedcourses" [showDownload]="downloadEnabled"></core-courses-course-progress>
+            <core-courses-course-progress [course]="course" class="core-recentlyaccessedcourses" [showDownload]="downloadCourseEnabled && downloadEnabled"></core-courses-course-progress>
         </ng-container>
     </div>
 </core-loading>
diff --git a/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts b/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
index aa7dbdd02..4b61bfeb1 100644
--- a/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
+++ b/src/addon/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts
@@ -37,10 +37,13 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
         icon: '',
         badge: ''
     };
+    downloadCourseEnabled: boolean;
+    downloadCoursesEnabled: boolean;
 
     protected prefetchIconsInitialized = false;
     protected isDestroyed;
     protected coursesObserver;
+    protected updateSiteObserver;
     protected courseIds = [];
     protected fetchContentDefaultError = 'Error getting recent courses data.';
 
@@ -58,6 +61,17 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
      */
     ngOnInit(): void {
 
+        // Refresh the enabled flags if enabled.
+        this.downloadCourseEnabled = !this.coursesProvider.isDownloadCourseDisabledInSite();
+        this.downloadCoursesEnabled = !this.coursesProvider.isDownloadCoursesDisabledInSite();
+
+        // Refresh the enabled flags if site is updated.
+        this.updateSiteObserver = this.eventsProvider.on(CoreEventsProvider.SITE_UPDATED, () => {
+            this.downloadCourseEnabled = !this.coursesProvider.isDownloadCourseDisabledInSite();
+            this.downloadCoursesEnabled = !this.coursesProvider.isDownloadCoursesDisabledInSite();
+
+        }, this.sitesProvider.getCurrentSiteId());
+
         this.coursesObserver = this.eventsProvider.on(CoreCoursesProvider.EVENT_MY_COURSES_UPDATED, () => {
             this.refreshContent();
         }, this.sitesProvider.getCurrentSiteId());
@@ -154,5 +168,6 @@ export class AddonBlockRecentlyAccessedCoursesComponent extends CoreBlockBaseCom
     ngOnDestroy(): void {
         this.isDestroyed = true;
         this.coursesObserver && this.coursesObserver.off();
+        this.updateSiteObserver && this.updateSiteObserver.off();
     }
 }
diff --git a/src/addon/block/starredcourses/components/starredcourses/addon-block-starredcourses.html b/src/addon/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
index a6b1d49b7..af38133a9 100644
--- a/src/addon/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
+++ b/src/addon/block/starredcourses/components/starredcourses/addon-block-starredcourses.html
@@ -1,6 +1,6 @@
 <ion-item-divider>
     <h2>{{ 'addon.block_starredcourses.pluginname' | translate }}</h2>
-    <div *ngIf="downloadEnabled && courses && courses.length > 1" class="core-button-spinner" item-end>
+    <div *ngIf="downloadCoursesEnabled && downloadEnabled && courses && courses.length > 1" class="core-button-spinner" item-end>
         <button *ngIf="prefetchCoursesData.icon && prefetchCoursesData.icon != 'spinner'" ion-button icon-only clear color="dark" (click)="prefetchCourses()">
             <core-icon [name]="prefetchCoursesData.icon"></core-icon>
         </button>
@@ -13,7 +13,7 @@
     <!-- List of courses. -->
     <div class="core-horizontal-scroll">
         <ng-container *ngFor="let course of courses">
-            <core-courses-course-progress [course]="course" class="core-block_starredcourses" [showDownload]="downloadEnabled"></core-courses-course-progress>
+            <core-courses-course-progress [course]="course" class="core-block_starredcourses" [showDownload]="downloadCourseEnabled && downloadEnabled"></core-courses-course-progress>
         </ng-container>
     </div>
 </core-loading>
diff --git a/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts b/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts
index e5cabc99c..8acddb2a2 100644
--- a/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts
+++ b/src/addon/block/starredcourses/components/starredcourses/starredcourses.ts
@@ -37,10 +37,13 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
         icon: '',
         badge: ''
     };
+    downloadCourseEnabled: boolean;
+    downloadCoursesEnabled: boolean;
 
     protected prefetchIconsInitialized = false;
     protected isDestroyed;
     protected coursesObserver;
+    protected updateSiteObserver;
     protected courseIds = [];
     protected fetchContentDefaultError = 'Error getting starred courses data.';
 
@@ -58,6 +61,17 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
      */
     ngOnInit(): void {
 
+        // Refresh the enabled flags if enabled.
+        this.downloadCourseEnabled = !this.coursesProvider.isDownloadCourseDisabledInSite();
+        this.downloadCoursesEnabled = !this.coursesProvider.isDownloadCoursesDisabledInSite();
+
+        // Refresh the enabled flags if site is updated.
+        this.updateSiteObserver = this.eventsProvider.on(CoreEventsProvider.SITE_UPDATED, () => {
+            this.downloadCourseEnabled = !this.coursesProvider.isDownloadCourseDisabledInSite();
+            this.downloadCoursesEnabled = !this.coursesProvider.isDownloadCoursesDisabledInSite();
+
+        }, this.sitesProvider.getCurrentSiteId());
+
         this.coursesObserver = this.eventsProvider.on(CoreCoursesProvider.EVENT_MY_COURSES_UPDATED, () => {
             this.refreshContent();
         }, this.sitesProvider.getCurrentSiteId());
@@ -154,5 +168,6 @@ export class AddonBlockStarredCoursesComponent extends CoreBlockBaseComponent im
     ngOnDestroy(): void {
         this.isDestroyed = true;
         this.coursesObserver && this.coursesObserver.off();
+        this.updateSiteObserver && this.updateSiteObserver.off();
     }
 }

From 81d45266ca74de898545fa0b5f04f746c9a55a0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 17 Dec 2019 16:39:46 +0100
Subject: [PATCH 249/257] MOBILE-3213 styles: Fix styles on timeline block

---
 .../timeline/components/events/events.scss    | 29 +++++++++++++++++++
 src/theme/dark.scss                           |  1 +
 2 files changed, 30 insertions(+)

diff --git a/src/addon/block/timeline/components/events/events.scss b/src/addon/block/timeline/components/events/events.scss
index 76da48072..e284f0d24 100644
--- a/src/addon/block/timeline/components/events/events.scss
+++ b/src/addon/block/timeline/components/events/events.scss
@@ -14,3 +14,32 @@ ion-app.app-root addon-block-timeline-events {
         pointer-events: auto;
     }
 }
+
+ion-app.app-root core-courses-course-progress addon-block-timeline-events {
+    @include media-breakpoint-up(md) {
+        .hidden-tablet {
+            display: block !important;
+            opacity: 1 !important;
+            &.button[disabled] {
+                opacity: .4 !important;
+            }
+        }
+        .hidden-phone {
+            display: none !important;
+            opacity: 0 !important;
+        }
+    }
+    @include media-breakpoint-up(lg) {
+        .hidden-tablet {
+            display: none !important;
+            opacity: 0 !important;
+        }
+        .hidden-phone {
+            display: block !important;
+            opacity: 1 !important;
+            &.button[disabled] {
+                opacity: .4 !important;
+            }
+        }
+    }
+}
diff --git a/src/theme/dark.scss b/src/theme/dark.scss
index 0e034de87..01c373d06 100644
--- a/src/theme/dark.scss
+++ b/src/theme/dark.scss
@@ -25,6 +25,7 @@ ion-app.app-root .ion-page {
       color: $core-dark-link-color;
     }
 
+    .core-tabs-bar,
     .core-tabs-bar *,
     .core-tabs-bar .tab-slide,
     .ion-page,

From 82c0385fe5d523ebee308e006e5f286ca432ac91 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 17 Dec 2019 16:04:47 +0100
Subject: [PATCH 250/257] MOBILE-3213 core: Handle anchors when cleaning
 extensions

---
 src/providers/utils/mimetype.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/providers/utils/mimetype.ts b/src/providers/utils/mimetype.ts
index 19c54139c..c162f3dc7 100644
--- a/src/providers/utils/mimetype.ts
+++ b/src/providers/utils/mimetype.ts
@@ -68,7 +68,13 @@ export class CoreMimetypeUtilsProvider {
         }
 
         // If the extension has parameters, remove them.
-        const position = extension.indexOf('?');
+        let position = extension.indexOf('?');
+        if (position > -1) {
+            extension = extension.substr(0, position);
+        }
+
+        // If the extension has an anchor, remove it.
+        position = extension.indexOf('#');
         if (position > -1) {
             extension = extension.substr(0, position);
         }

From c255feeeefa3077439721535a32f8130c12efd07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 17 Dec 2019 17:07:40 +0100
Subject: [PATCH 251/257] MOBILE-3213 assign: Discard grade drafts after
 successful sync

---
 src/addon/mod/assign/providers/assign-sync.ts | 38 ++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/addon/mod/assign/providers/assign-sync.ts b/src/addon/mod/assign/providers/assign-sync.ts
index 41b43f74e..8b5bcfbb1 100644
--- a/src/addon/mod/assign/providers/assign-sync.ts
+++ b/src/addon/mod/assign/providers/assign-sync.ts
@@ -29,6 +29,7 @@ import { CoreSyncBaseProvider } from '@classes/base-sync';
 import { AddonModAssignProvider, AddonModAssignAssign } from './assign';
 import { AddonModAssignOfflineProvider } from './assign-offline';
 import { AddonModAssignSubmissionDelegate } from './submission-delegate';
+import { AddonModAssignFeedbackDelegate } from './feedback-delegate';
 
 /**
  * Data returned by an assign sync.
@@ -55,13 +56,22 @@ export class AddonModAssignSyncProvider extends CoreSyncBaseProvider {
 
     protected componentTranslate: string;
 
-    constructor(loggerProvider: CoreLoggerProvider, sitesProvider: CoreSitesProvider, appProvider: CoreAppProvider,
-            syncProvider: CoreSyncProvider, textUtils: CoreTextUtilsProvider, translate: TranslateService,
-            private courseProvider: CoreCourseProvider, private eventsProvider: CoreEventsProvider,
-            private assignProvider: AddonModAssignProvider, private assignOfflineProvider: AddonModAssignOfflineProvider,
-            private utils: CoreUtilsProvider, private submissionDelegate: AddonModAssignSubmissionDelegate,
-            private gradesHelper: CoreGradesHelperProvider, timeUtils: CoreTimeUtilsProvider,
-            private logHelper: CoreCourseLogHelperProvider) {
+    constructor(loggerProvider: CoreLoggerProvider,
+            sitesProvider: CoreSitesProvider,
+            appProvider: CoreAppProvider,
+            syncProvider: CoreSyncProvider,
+            textUtils: CoreTextUtilsProvider,
+            translate: TranslateService,
+            timeUtils: CoreTimeUtilsProvider,
+            protected courseProvider: CoreCourseProvider,
+            protected eventsProvider: CoreEventsProvider,
+            protected assignProvider: AddonModAssignProvider,
+            protected assignOfflineProvider: AddonModAssignOfflineProvider,
+            protected utils: CoreUtilsProvider,
+            protected submissionDelegate: AddonModAssignSubmissionDelegate,
+            protected feedbackDelegate: AddonModAssignFeedbackDelegate,
+            protected gradesHelper: CoreGradesHelperProvider,
+            protected logHelper: CoreCourseLogHelperProvider) {
 
         super('AddonModAssignSyncProvider', loggerProvider, sitesProvider, appProvider, syncProvider, textUtils, translate,
                 timeUtils);
@@ -403,9 +413,19 @@ export class AddonModAssignSyncProvider extends CoreSyncBaseProvider {
                 return this.assignProvider.submitGradingFormOnline(assign.id, userId, offlineData.grade, offlineData.attemptnumber,
                         offlineData.addattempt, offlineData.workflowstate, offlineData.applytoall, offlineData.outcomes,
                         offlineData.plugindata, siteId).then(() => {
+                    // Grades sent.
+                    // Discard grades drafts.
+                    const promises = [];
+                    if (status.feedback && status.feedback.plugins) {
+                        status.feedback.plugins.forEach((plugin) => {
+                            promises.push(this.feedbackDelegate.discardPluginFeedbackData(assign.id, userId, plugin, siteId));
+                        });
+                    }
 
-                    // Grades sent, update cached data. No need to block the user for this.
-                    this.assignProvider.getSubmissionStatus(assign.id, userId, undefined, false, true, true, siteId);
+                    // Update cached data.
+                    promises.push(this.assignProvider.getSubmissionStatus(assign.id, userId, undefined, false, true, true, siteId));
+
+                    return Promise.all(promises);
                 }).catch((error) => {
                     if (error && this.utils.isWebServiceError(error)) {
                         // The WebService has thrown an error, this means it cannot be submitted. Discard the offline data.

From a0cd139d9cadfabff1d5ff2c5e6e61c46e3dfc2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 18 Dec 2019 10:34:39 +0100
Subject: [PATCH 252/257] MOBILE-3213 workshop: Fix static definition

---
 src/addon/mod/workshop/providers/helper.ts   | 2 +-
 src/addon/mod/workshop/providers/workshop.ts | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/addon/mod/workshop/providers/helper.ts b/src/addon/mod/workshop/providers/helper.ts
index 66ae24140..ad82e99e9 100644
--- a/src/addon/mod/workshop/providers/helper.ts
+++ b/src/addon/mod/workshop/providers/helper.ts
@@ -68,7 +68,7 @@ export class AddonModWorkshopHelperProvider {
         const task = this.getTask(tasks, taskCode);
 
         if (task) {
-            return task.completed;
+            return !!task.completed;
         }
 
         // Task not found, assume true.
diff --git a/src/addon/mod/workshop/providers/workshop.ts b/src/addon/mod/workshop/providers/workshop.ts
index 866b321a8..ec8fc292e 100644
--- a/src/addon/mod/workshop/providers/workshop.ts
+++ b/src/addon/mod/workshop/providers/workshop.ts
@@ -33,9 +33,9 @@ export class AddonModWorkshopProvider {
     static PHASE_ASSESSMENT = 30;
     static PHASE_EVALUATION = 40;
     static PHASE_CLOSED = 50;
-    static EXAMPLES_VOLUNTARY: 0;
-    static EXAMPLES_BEFORE_SUBMISSION: 1;
-    static EXAMPLES_BEFORE_ASSESSMENT: 2;
+    static EXAMPLES_VOLUNTARY = 0;
+    static EXAMPLES_BEFORE_SUBMISSION = 1;
+    static EXAMPLES_BEFORE_ASSESSMENT = 2;
     static SUBMISSION_TYPE_DISABLED = 0;
     static SUBMISSION_TYPE_AVAILABLE = 1;
     static SUBMISSION_TYPE_REQUIRED = 2;

From 4601df6fc4385bb6c68eda7f56142d4b533171ae Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 18 Dec 2019 10:50:10 +0100
Subject: [PATCH 253/257] MOBILE-3213 data: Fix latlong geo links

---
 .../data/fields/latlong/component/latlong.ts  | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/addon/mod/data/fields/latlong/component/latlong.ts b/src/addon/mod/data/fields/latlong/component/latlong.ts
index 869f19c63..912f628d3 100644
--- a/src/addon/mod/data/fields/latlong/component/latlong.ts
+++ b/src/addon/mod/data/fields/latlong/component/latlong.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 import { Component } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
+import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
 import { Platform } from 'ionic-angular';
 import { Geolocation, GeolocationOptions } from '@ionic-native/geolocation';
 import { AddonModDataFieldPluginComponent } from '../../../classes/field-plugin-component';
@@ -30,8 +31,11 @@ export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginCo
     north: number;
     east: number;
 
-    constructor(protected fb: FormBuilder, private platform: Platform, private geolocation: Geolocation,
-            private domUtils: CoreDomUtilsProvider) {
+    constructor(protected fb: FormBuilder,
+            protected platform: Platform,
+            protected geolocation: Geolocation,
+            protected domUtils: CoreDomUtilsProvider,
+            protected sanitizer: DomSanitizer) {
         super(fb);
     }
 
@@ -58,16 +62,19 @@ export class AddonModDataFieldLatlongComponent extends AddonModDataFieldPluginCo
      * @param east Degrees East.
      * @return Link to maps depending on platform.
      */
-    getLatLongLink(north: number, east: number): string {
+    getLatLongLink(north: number, east: number): SafeUrl {
         if (north !== null || east !== null) {
-            const northFixed = north ? north.toFixed(4) : '0.0000',
-                eastFixed = east ? east.toFixed(4) : '0.0000';
+            const northFixed = north ? north.toFixed(4) : '0.0000';
+            const eastFixed = east ? east.toFixed(4) : '0.0000';
+            let url;
 
             if (this.platform.is('ios')) {
-                return 'http://maps.apple.com/?ll=' + northFixed + ',' + eastFixed + '&near=' + northFixed + ',' + eastFixed;
+                url = 'http://maps.apple.com/?ll=' + northFixed + ',' + eastFixed + '&near=' + northFixed + ',' + eastFixed;
+            } else {
+                url = 'geo:' + northFixed + ',' + eastFixed;
             }
 
-            return 'geo:' + northFixed + ',' + eastFixed;
+            return this.sanitizer.bypassSecurityTrustUrl(url);
         }
     }
 

From bd4db3ff014507bede7100095364a0d16495fe86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 18 Dec 2019 11:32:38 +0100
Subject: [PATCH 254/257] MOBILE-3213 database: Do not allow to set widths or
 heights

---
 src/addon/mod/data/components/index/index.ts |  4 +++-
 src/addon/mod/data/data.scss                 | 13 +++++++++++++
 src/addon/mod/data/providers/helper.ts       |  6 ++++--
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/addon/mod/data/components/index/index.ts b/src/addon/mod/data/components/index/index.ts
index af1ab14b6..ebd311e52 100644
--- a/src/addon/mod/data/components/index/index.ts
+++ b/src/addon/mod/data/components/index/index.ts
@@ -286,6 +286,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
 
                 let entriesHTML = this.dataHelper.getTemplate(this.data, 'listtemplateheader', this.fieldsArray);
 
+                console.error(entriesHTML);
                 // Get first entry from the whole list.
                 if (!this.search.searching || !this.firstEntry) {
                     this.firstEntry = this.entries[0].id;
@@ -305,7 +306,8 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
                 });
                 entriesHTML += this.dataHelper.getTemplate(this.data, 'listtemplatefooter', this.fieldsArray);
 
-                this.entriesRendered = entriesHTML;
+                this.entriesRendered = this.domUtils.fixHtml(entriesHTML);
+                console.error(entriesHTML);
 
                 // Pass the input data to the component.
                 this.jsData = {
diff --git a/src/addon/mod/data/data.scss b/src/addon/mod/data/data.scss
index 1bce48a43..f99ba5150 100644
--- a/src/addon/mod/data/data.scss
+++ b/src/addon/mod/data/data.scss
@@ -3,6 +3,7 @@
   white-space: normal;
   word-break: break-word;
   padding: $content-padding;
+  @include safe-area-padding-horizontal($content-padding !important, $content-padding !important);
   background-color: $white;
   border-top-width: 1px;
   border-bottom-width: 1px;
@@ -31,6 +32,18 @@
     @extend .col;
     min-height: auto;
   }
+
+  // Do not let block elements to define widths or heights.
+  address, article, aside, blockquote, canvas, dd, div, dl, dt, fieldset, figcaption, figure, footer, form, h1, h2, h3, h4, h5, h6,
+  header, hr, li, main, nav, noscript, ol, p, pre, section, table, tfoot, ul, video {
+    width: auto !important;
+    height: auto !important;
+    min-width: auto !important;
+    min-height: auto !important;
+    // Avoid having one entry over another.
+    max-height: none !important;
+
+  }
 }
 
 page-addon-mod-data-search,
diff --git a/src/addon/mod/data/providers/helper.ts b/src/addon/mod/data/providers/helper.ts
index f59e62e5d..2d48ef390 100644
--- a/src/addon/mod/data/providers/helper.ts
+++ b/src/addon/mod/data/providers/helper.ts
@@ -599,8 +599,10 @@ export class AddonModDataHelperProvider {
     getTemplate(data: any, type: string, fields: any[]): string {
         let template = data[type] || this.getDefaultTemplate(type, fields);
 
-        // Try to fix syntax errors so the template can be parsed by Angular.
-        template = this.domUtils.fixHtml(template);
+        if (type != 'listtemplateheader' && type != 'listtemplatefooter') {
+            // Try to fix syntax errors so the template can be parsed by Angular.
+            template = this.domUtils.fixHtml(template);
+        }
 
         // Add core-link directive to links.
         template = template.replace(/<a ([^>]*href="[^>]*)>/ig, (match, attributes) => {

From bed497d54d1cee15ec3b5451d163e1593ad855bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 18 Dec 2019 11:46:46 +0100
Subject: [PATCH 255/257] MOBILE-3213 style: Add position fallback

---
 src/theme/variables.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index ebab93935..8688e1339 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -474,6 +474,7 @@ $core-dd-question-colors: $white, $blue-light, #DCDCDC, #D8BFD8, #87CEFA, #DAA52
 }
 
 @mixin safe-area-position($top: null, $end: null, $bottom: null, $start: null) {
+  @include position-horizontal($start, $end);
   @include safe-position-horizontal($start, $end);
   top: $top;
   bottom: $bottom;

From 7a1b49cae12c3ef62e19140e41cb21667dd26756 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 18 Dec 2019 12:36:57 +0100
Subject: [PATCH 256/257] MOBILE-3213 workshop: Disable refreshers when inform

---
 .../mod/workshop/components/index/index.ts    |  1 +
 .../workshop/pages/assessment/assessment.html |  2 +-
 .../edit-submission/edit-submission.html      |  3 ---
 .../pages/edit-submission/edit-submission.ts  | 20 -------------------
 .../workshop/pages/submission/submission.html |  2 +-
 .../workshop/pages/submission/submission.ts   |  4 ++++
 6 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/src/addon/mod/workshop/components/index/index.ts b/src/addon/mod/workshop/components/index/index.ts
index ebef564d2..d14b2b04e 100644
--- a/src/addon/mod/workshop/components/index/index.ts
+++ b/src/addon/mod/workshop/components/index/index.ts
@@ -154,6 +154,7 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
                 promises.push(this.workshopProvider.invalidateReviewerAssesmentsData(this.workshop.id));
             }
             promises.push(this.workshopProvider.invalidateGradesData(this.workshop.id));
+            promises.push(this.workshopProvider.invalidateWorkshopWSData(this.workshop.id));
         }
 
         return Promise.all(promises);
diff --git a/src/addon/mod/workshop/pages/assessment/assessment.html b/src/addon/mod/workshop/pages/assessment/assessment.html
index 96b65ea32..76229b26a 100644
--- a/src/addon/mod/workshop/pages/assessment/assessment.html
+++ b/src/addon/mod/workshop/pages/assessment/assessment.html
@@ -9,7 +9,7 @@
     </ion-navbar>
 </ion-header>
 <ion-content>
-    <ion-refresher [enabled]="loaded" (ionRefresh)="refreshAssessment($event)">
+    <ion-refresher [enabled]="loaded" (ionRefresh)="refreshAssessment($event)" *ngIf="!evaluating">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="loaded">
diff --git a/src/addon/mod/workshop/pages/edit-submission/edit-submission.html b/src/addon/mod/workshop/pages/edit-submission/edit-submission.html
index c1530b1f2..71b1e535d 100644
--- a/src/addon/mod/workshop/pages/edit-submission/edit-submission.html
+++ b/src/addon/mod/workshop/pages/edit-submission/edit-submission.html
@@ -9,9 +9,6 @@
     </ion-navbar>
 </ion-header>
 <ion-content>
-    <ion-refresher [enabled]="loaded" (ionRefresh)="refreshSubmission($event)">
-        <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
-    </ion-refresher>
     <core-loading [hideUntil]="loaded">
         <form ion-list [formGroup]="editForm" *ngIf="workshop">
             <ion-item text-wrap>
diff --git a/src/addon/mod/workshop/pages/edit-submission/edit-submission.ts b/src/addon/mod/workshop/pages/edit-submission/edit-submission.ts
index 10864c6ee..816a29b46 100644
--- a/src/addon/mod/workshop/pages/edit-submission/edit-submission.ts
+++ b/src/addon/mod/workshop/pages/edit-submission/edit-submission.ts
@@ -274,26 +274,6 @@ export class AddonModWorkshopEditSubmissionPage implements OnInit, OnDestroy {
         return false;
     }
 
-    /**
-     * Pull to refresh.
-     *
-     * @param refresher Refresher.
-     */
-    refreshSubmission(refresher: any): void {
-        if (this.loaded) {
-            const promises = [];
-
-            promises.push(this.workshopProvider.invalidateSubmissionData(this.workshopId, this.submission.id));
-            promises.push(this.workshopProvider.invalidateSubmissionsData(this.workshopId));
-
-            Promise.all(promises).finally(() => {
-                return this.fetchSubmissionData();
-            }).finally(() => {
-                refresher.complete();
-            });
-        }
-    }
-
     /**
      * Save the submission.
      */
diff --git a/src/addon/mod/workshop/pages/submission/submission.html b/src/addon/mod/workshop/pages/submission/submission.html
index cb56ca01f..41fbecd1d 100644
--- a/src/addon/mod/workshop/pages/submission/submission.html
+++ b/src/addon/mod/workshop/pages/submission/submission.html
@@ -12,7 +12,7 @@
     </ion-navbar>
 </ion-header>
 <ion-content>
-    <ion-refresher [enabled]="loaded" (ionRefresh)="refreshSubmission($event)">
+    <ion-refresher [enabled]="loaded" (ionRefresh)="refreshSubmission($event)" *ngIf="!((assessmentId && access.assessingallowed) || canAddFeedback)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
     <core-loading [hideUntil]="loaded">
diff --git a/src/addon/mod/workshop/pages/submission/submission.ts b/src/addon/mod/workshop/pages/submission/submission.ts
index 464b2e3e3..3fb884e5f 100644
--- a/src/addon/mod/workshop/pages/submission/submission.ts
+++ b/src/addon/mod/workshop/pages/submission/submission.ts
@@ -373,6 +373,10 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
             promises.push(this.workshopProvider.invalidateAssessmentData(this.workshopId, this.assessmentId));
         }
 
+        if (this.assessmentUserId) {
+            promises.push(this.workshopProvider.invalidateReviewerAssesmentsData(this.workshopId, this.assessmentId));
+        }
+
         return Promise.all(promises).finally(() => {
             this.eventsProvider.trigger(AddonModWorkshopProvider.ASSESSMENT_INVALIDATED, this.siteId);
 

From 8b0b9082d279bd16af067a48b68b8dca288f7488 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 18 Dec 2019 14:02:16 +0100
Subject: [PATCH 257/257] MOBILE-3213 database: Remove console.error calls

---
 src/addon/mod/data/components/index/index.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/addon/mod/data/components/index/index.ts b/src/addon/mod/data/components/index/index.ts
index ebd311e52..b63f00ce0 100644
--- a/src/addon/mod/data/components/index/index.ts
+++ b/src/addon/mod/data/components/index/index.ts
@@ -286,7 +286,6 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
 
                 let entriesHTML = this.dataHelper.getTemplate(this.data, 'listtemplateheader', this.fieldsArray);
 
-                console.error(entriesHTML);
                 // Get first entry from the whole list.
                 if (!this.search.searching || !this.firstEntry) {
                     this.firstEntry = this.entries[0].id;
@@ -307,7 +306,6 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
                 entriesHTML += this.dataHelper.getTemplate(this.data, 'listtemplatefooter', this.fieldsArray);
 
                 this.entriesRendered = this.domUtils.fixHtml(entriesHTML);
-                console.error(entriesHTML);
 
                 // Pass the input data to the component.
                 this.jsData = {